no message

src/api/business/production/detail.js

@@ -13,10 +13,10 @@ export function listDetail(query) {
 
 
 // 查询个税详情信息
-export function getInfo(id) {
+export function getInfo(id,year,month) {
   request.defaults.baseURL = '/ezhizao-yzbh-production'
   return request({
-    url: '/business/individualIncomeTaxDetail/' + id,
+    url: '/business/individualIncomeTaxDetail/' + id+'/'+year+'/'+month,
     method: 'get'
   })
 }

src/views/business/financial/collection/form.vue

@@ -281,18 +281,20 @@
             </el-col>
             <el-col :span="6">
               <el-form-item label="签单类型:" prop="isNew">
-                <el-radio-group v-model="form.isNew" disabled>
+                <el-radio-group v-model="form.isNew" disabled  v-if="editStatus">
                   <el-radio :label="0">新签</el-radio>
                   <el-radio :label="1">续签</el-radio>
                 </el-radio-group>
+                <span v-else>{{ form.isNew === 0 ? '新签' : '续签' }}</span>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="是否为项目:" prop="isProject" >
-                <el-radio-group v-model="form.isProject" :disabled="!editStatus">
+                <el-radio-group v-model="form.isProject" disabled  v-if="editStatus">
                   <el-radio :label="0">项目</el-radio>
                   <el-radio :label="1">非项目</el-radio>
                 </el-radio-group>
+                <span v-else>{{ form.isProject === 0 ? '项目' : '非项目' }}</span>
               </el-form-item>
             </el-col>
             <el-col :span="6">

src/views/business/production/IndividualIncomeTaxIsZero/FormDialog.vue

@@ -1,59 +1,48 @@
 <template>
   <!-- 添加或修改菜单对话框 -->
-  <el-dialog
-    title="个税信息"
-    v-model="visible"
-    width="800px"
-    append-to-body
-    draggable
-    @close="close"
-    :close-on-click-modal = "false"
-  >
-  <div v-loading="loading">
-    <div>
-      <div style="padding: 8px 24px 16px 24px">
-        <el-form size="small" label-width="110px">
-          <el-row :gutter="30">
-            <el-col :span="24">
-              <el-form-item label="客户名称">
-                <div>{{ currentMember }}</div>
-              </el-form-item>
-              <el-form-item label="所属月份">
-                <div>{{ year }}-{{ month }}</div>
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-divider />
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="备注：">
-                <el-input
-                  v-if="!isView"
-                  type="textarea"
-                  maxlength="200"
-                  show-word-limit
-                  rows="2"
-                  v-model="emptyForm.remark"
-                />
-                <span v-else-if="isView">{{ emptyForm.remark }}</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <div class="details-btns-container">
-                <el-form-item label="凭证文件" prop="evidenceFile" required>
-                  <dragUpload :accept="accept" style="width:100%" @file="upload"
-                  v-if="emptyForm.evidenceFile == null || emptyForm.evidenceFile == ''" />
-                <img v-else style="height: 148px; width: 148px" :src="`${baseUrl}/${emptyForm.evidenceFile}`"
-                  class="avatar" @click="openEvidience('evidenceFile')" />
-                  <div v-if="!isView">
-                    <el-icon :size="20" v-if="emptyForm.evidenceFile !== '' ||emptyForm.evidenceFile == null " @click="emptyForm.evidenceFile = ''"
-                    class="delete-button" >
-                    <Delete />
-                  </el-icon>
-                  </div>
-                  <div v-else>
-                  </div>
-                  <!-- <el-upload
+  <el-dialog title="个税信息" v-model="visible" width="800px" append-to-body draggable @close="close"
+    :close-on-click-modal="false">
+    <div v-loading="loading">
+      <div>
+        <div style="padding: 8px 24px 16px 24px">
+          <el-form size="small" label-width="110px">
+            <el-row :gutter="30">
+              <el-col :span="24">
+                <el-form-item label="客户名称">
+                  <div>{{ currentMember }}</div>
+                </el-form-item>
+                <el-form-item label="所属月份">
+                  <!-- <div>{{ year }}-{{ month }}</div> -->
+                  <el-date-picker v-model="currentMonth" type="month" placeholder="请选择时间" format="YYYY-MM"
+                    @change="changeMonthHandle" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-divider />
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="备注：">
+                  <el-input v-if="!isView" type="textarea" maxlength="200" show-word-limit rows="2"
+                    v-model="emptyForm.remark" />
+                  <span v-else-if="isView">{{ emptyForm.remark }}</span>
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <div class="details-btns-container">
+                  <el-form-item label="凭证文件" prop="evidenceFile" required>
+                    <dragUpload :accept="accept" style="width:100%" @file="upload"
+                      v-if="emptyForm.evidenceFile == null || emptyForm.evidenceFile == ''" />
+                    <img v-else style="height: 148px; width: 148px" :src="`${baseUrl}/${emptyForm.evidenceFile}`"
+                      class="avatar" @click="openEvidience('evidenceFile')" />
+                    <div v-if="!isView|| emptyForm.status !== 3">
+                      <el-icon :size="20" v-if="emptyForm.evidenceFile !== '' ||emptyForm.evidenceFile == null "
+                        @click="emptyForm.evidenceFile = ''" class="delete-button">
+                        <Delete />
+                      </el-icon>
+                    </div>
+                    <div v-else>
+                    </div>
+                    <!-- <el-upload
                     v-if="!isView"
                     action="#"
                     :http-request="upload"
@@ -84,292 +73,324 @@
                     class="avatar"
                     @click="openEvidience('evidenceFile')"
                   /> -->
-                </el-form-item>
-              </div>
-            </el-col>
-          </el-row>
-        </el-form>
+                  </el-form-item>
+                </div>
+              </el-col>
+            </el-row>
+          </el-form>
+        </div>
       </div>
-    </div>
-    <div class="form-btns-container" style="height: 40px" v-if="!isView">
-      <el-button
-        size="small"
-        icon="close"
-        style="float: right; margin-left: 12px; margin-right: 12px"
-        @click="close"
-      >
-        取消
+      <div class="form-btns-container" style="height: 40px">
+        <el-button size="small" icon="close" v-if="!isView || emptyForm.status !== 3"
+          style="float: right; margin-left: 12px; margin-right: 12px" @click="close">
+          取消
+        </el-button>
+        <el-button type="primary" size="small" v-if="!isView || emptyForm.status !== 3" icon="Finished"
+          style="float: right" @click="handleSave">
+          保存</el-button>
+        <el-button 
+        type="primary" size="small" 
+        style="float: right;" 
+        :disabled="emptyForm == null || emptyForm.status !== 3 " 
+        @click="turnBack(emptyForm)" v-hasPermi="['business:individualIncomeTaxDetail:saveDetail']">
+        退回
       </el-button>
-      <el-button
-        type="primary"
-        size="small"
-        icon="Finished"
-        style="float: right"
-        @click="handleSave"
-      >
-        保存</el-button
-      >
+      </div>
     </div>
-  </div>
   </el-dialog>
 </template>
 
 
 <script setup>
-const { proxy } = getCurrentInstance();
-/** 父组件传参 */
-const props = defineProps({
-  getList: {
-    type: Function,
-    default: () => {},
-  },
-});
-const { getList } = toRefs(props);
-/** 字典数组区 */
-const { develop_type } = proxy.useDict("develop_type");
-/** 表单抽屉 页变量 */
-const title = ref("");
-const loading = ref(false);
-const multiple = ref(true);
-const visible = ref(false);
-const editStatus = ref(false);
-const isFullscreen = ref(false);
-const addDetailNum = ref(1);
-const isAdd = ref(false);
-const isView = ref(false);
-const mainInfo = ref({});
-const monthInfo = ref({});
-const currentMember = ref({});
-const year = ref({});
-const month = ref({});
-const cities = ref([]);
-const districts = ref([]);
-const fileList = ref([]);
-const tenantId = ref(0);
-const sourceCategories = ref([]);
-
-const addType = ref(1);
+  const { proxy } = getCurrentInstance();
+  /** 父组件传参 */
+  const props = defineProps({
+    getList: {
+      type: Function,
+      default: () => { },
+    },
+    workOrderId: {
+      type: String,
+      default: () => { },
+    }
+  });
+  const { getList, workOrderId } = toRefs(props);
+  /** 字典数组区 */
+  const { develop_type } = proxy.useDict("develop_type");
+  /** 表单抽屉 页变量 */
+  const title = ref("");
+  const loading = ref(false);
+  const multiple = ref(true);
+  const visible = ref(false);
+  const editStatus = ref(false);
+  const isFullscreen = ref(false);
+  const addDetailNum = ref(1);
+  const isAdd = ref(false);
+  const isView = ref(false);
+  const mainInfo = ref({});
+  const monthInfo = ref({});
+  const currentMember = ref({});
+  const year = ref({});
+  const month = ref({});
+  const cities = ref([]);
+  const districts = ref([]);
+  const fileList = ref([]);
+  const tenantId = ref(0);
+  const sourceCategories = ref([]);
+  const currentMonth = ref(
+    proxy.moment().subtract(1, "month").format("YYYY-MM-01")
+  );
+  const addType = ref(1);
 
-const emptyForm = ref({
-  financialIndividualIncomeTaxId: null,
-  companyId: null,
-  parentId: "0",
-  name: "",
-  code: "",
-  receiveDate: proxy.moment().format("YYYY-MM-DD HH:mm:ss"),
-  receiveDateRange: proxy.moment().format("YYYY-MM-DD"),
-  receiveTimeRange: "08:00:00",
-  evidenceFile: "",
-  reportFile: "",
-  originalFileName: "",
-  status: null,
-  fileName: "",
-  files: [],
-  fileList: [],
-  amount: 0,
-  year: "",
-  month: "",
-});
+  const emptyForm = ref({
+    financialIndividualIncomeTaxId: null,
+    companyId: null,
+    parentId: "0",
+    name: "",
+    code: "",
+    receiveDate: proxy.moment().format("YYYY-MM-DD HH:mm:ss"),
+    receiveDateRange: proxy.moment().format("YYYY-MM-DD"),
+    receiveTimeRange: "08:00:00",
+    evidenceFile: "",
+    reportFile: "",
+    originalFileName: "",
+    status: null,
+    fileName: "",
+    files: [],
+    fileList: [],
+    amount: 0,
+    year: "",
+    month: "",
+  });
 
-watch(addType, (value) => {
-  switch (value) {
-    case "1":
-      break;
-    case "2":
-      break;
-    default:
-      break;
-  }
-});
+  watch(addType, (value) => {
+    switch (value) {
+      case "1":
+        break;
+      case "2":
+        break;
+      default:
+        break;
+    }
+  });
 
-import { uploadFile } from "@/api/tool/file";
-import {
-  addIndividualIncomeTaxDetail,
-  updateIndividualIncomeTaxDetail,
-} from "@/api/business/production/detailIsZero";
+  import { uploadFile } from "@/api/tool/file";
+  import {
+    addIndividualIncomeTaxDetail,
+    updateIndividualIncomeTaxDetail,
+  } from "@/api/business/production/detailIsZero";
   import dragUpload from "@/components/dragUpload"
-import { getInfo, getDetail } from "@/api/business/production/detail";
+  import { getInfo, getDetail } from "@/api/business/production/detail";
 
-import { ref } from "vue";
-// import { tr } from "element-plus/es/locale";
+  import { ref } from "vue";
+  // import { tr } from "element-plus/es/locale";
 
-// const webHost = import.meta.env.VITE_APP_BASE_API;
-const baseUrl = import.meta.env.VITE_APP_BASE_API;
+  // const webHost = import.meta.env.VITE_APP_BASE_API;
+  const baseUrl = import.meta.env.VITE_APP_BASE_API;
+  const parentId = ref(null);
+  const followQuery = ref({});
 
-const followQuery = ref({});
+  /***********************  表单页方法 ****************************/
 
-/***********************  表单页方法 ****************************/
+  /** 抽屉打开 */
+  function open(id, mainRow, monthItem) {
 
-/** 抽屉打开 */
-function open(id, mainRow, monthItem) {
-  visible.value = true;
-  tenantId.value = mainRow.tenantId;
-  mainInfo.value = mainRow;
-  monthInfo.value = monthItem;
-  console.log("id", id);
-  if (id == 0) {
-    isAdd.value = true;
-    isView.value = false;
-    loadData(id);
-  } else if (id == null || mainRow.detail.status == 3) {
-    isView.value = true;
-    console.log("查看");
-    getInfoId(id);
-  } else {
-    console.log("修改");
-    isView.value = false;
-    isAdd.value = false;
-    getInfoId(id);
+    visible.value = true;
+    tenantId.value = mainRow.tenantId;
+    mainInfo.value = mainRow;
+    monthInfo.value = monthItem;
+    parentId.value = id
+    console.log("id", id);
+    currentMonth.value = proxy.moment().subtract(1, "month").format("YYYY-MM-01")
+    if (id == 0) {
+      isAdd.value = true;
+      isView.value = false;
+      loadData(id);
+    } else if (id == null || mainRow.detail.status == 3) {
+      isView.value = true;
+      console.log("查看");
+      getInfoId(id);
+    } else {
+      console.log("修改");
+      isView.value = false;
+      isAdd.value = false;
+      getInfoId(id);
+    }
+  }
+  /** 退回按钮操作 */
+  function turnBack(row) {
+    loading.value = true
+    emptyForm.value.status = 1;
+    emptyForm.value.workOrderId = workOrderId;
+    emptyForm.value.year = proxy.moment(currentMonth.value).format("YYYY");
+    emptyForm.value.month = proxy.moment(currentMonth.value).format("MM");
+    console.log(emptyForm);
+    updateIndividualIncomeTaxDetail(emptyForm.value);
+    loading.value = false;
+    getList.value();
+    visible.value = false;
+  }
+  function getInfoId(id) {
+    getInfo(mainInfo.value.id, monthInfo.value.year, monthInfo.value.month).then((response) => {
+      console.log("response", response);
+      mainInfo.value.detail = response.data;
+      emptyForm.value = response.data;
+      loadData(id);
+    });
+  }
+  function changeMonthHandle(parentId) {
+    const year = proxy.moment(currentMonth.value).format("YYYY");
+    const month = proxy.moment(currentMonth.value).format("MM");
+    getInfo(mainInfo.value.id, year, month).then((response) => {
+      console.log("response", response);
+      mainInfo.value.detail = response.data;
+      emptyForm.value = response.data;
+      console.log(2323, emptyForm.value);
+      loadData(parentId);
+    });
   }
-}
 
-function getInfoId(id) {
-  getInfo(mainInfo.value.detail.id).then((response) => {
-    console.log("response", response);
-    mainInfo.value.detail = response.data;
-    emptyForm.value = response.data;
-    loadData(id);
-  });
-}
 
-function loadData(id) {
-  console.log("monthInfo", mainInfo.value);
-  year.value = monthInfo.value.year;
-  month.value = monthInfo.value.month;
-  currentMember.value = mainInfo.value.companyName;
-  emptyForm.value.financialIndividualIncomeTaxId = mainInfo.value.id;
-  emptyForm.value.workOrderId = mainInfo.value.workOrderId;
-  if (!isAdd.value) {
-    if (mainInfo.value.detail.evidenceFile != "") {
-      const file = {};
-      file.url = mainInfo.value.evidenceFile;
-      file.fileUrl = mainInfo.value.detail.evidenceFile;
-      file.originalFileName = mainInfo.value.detail.originalFileName;
-      fileList.value.push(file);
-      emptyForm.value.evidenceFile = mainInfo.value.detail.evidenceFile;
-      emptyForm.value.originalFileName = mainInfo.value.detail.originalFileName;
-      emptyForm.value.fileName = mainInfo.value.detail.fileName;
+  function loadData(id) {
+    console.log("monthInfo", mainInfo.value);
+    year.value = monthInfo.value.year;
+    month.value = monthInfo.value.month;
+    currentMember.value = mainInfo.value.companyName;
+    emptyForm.value.financialIndividualIncomeTaxId = mainInfo.value.id;
+    emptyForm.value.workOrderId = mainInfo.value.workOrderId;
+    if (!isAdd.value) {
+      if (mainInfo.value.detail.evidenceFile != "") {
+        const file = {};
+        file.url = mainInfo.value.evidenceFile;
+        file.fileUrl = mainInfo.value.detail.evidenceFile;
+        file.originalFileName = mainInfo.value.detail.originalFileName;
+        fileList.value.push(file);
+        emptyForm.value.evidenceFile = mainInfo.value.detail.evidenceFile;
+        emptyForm.value.originalFileName = mainInfo.value.detail.originalFileName;
+        emptyForm.value.fileName = mainInfo.value.detail.fileName;
+      }
     }
   }
-}
-
-function openEvidience() {
-  window.open(`${baseUrl}${emptyForm.value.evidenceFile}`);
-}
 
-function handleDelFile(index) {
-  fileList.value.splice(index, 1);
-  emptyForm.value.evidenceFile = "";
-  emptyForm.value.originalFileName = "";
-  emptyForm.value.fileName = "";
-}
+  function openEvidience() {
+    window.open(`${baseUrl}${emptyForm.value.evidenceFile}`);
+  }
 
-/**  保存 */
-function handleSave() {
-  if (
-    emptyForm.value.evidenceFile == null ||
-    emptyForm.value.evidenceFile === ""
-  ) {
-    proxy.$message.error("请上传凭证");
-    return;
+  function handleDelFile(index) {
+    fileList.value.splice(index, 1);
+    emptyForm.value.evidenceFile = "";
+    emptyForm.value.originalFileName = "";
+    emptyForm.value.fileName = "";
   }
-  loading.value = true
-  emptyForm.value.files = fileList.value;
-  emptyForm.value.year = year.value;
-  emptyForm.value.month = month.value;
-  emptyForm.value.status = 3;
-  if (isAdd.value) {
-    emptyForm.value.companyId = mainInfo.value.companyId;
-    addIndividualIncomeTaxDetail(emptyForm.value)
-      .then((res) => {
-        console.log(res);
-        proxy.$modal.msgSuccess("保存成功!");
-        visible.value = false;
 
-        getList.value();
-      })
-      .catch((err) => {
-        proxy.$modal.$modalMsgError(err);
-        console.log(err);
-      }).finally(() => {
-    loading.value = false
-  });
-  } else {
-    mainInfo.value.detail.status = 3;
-    mainInfo.value.detail.fileName = emptyForm.value.fileName;
-    mainInfo.value.detail.originalFileName = emptyForm.value.originalFileName;
-    mainInfo.value.detail.evidenceFile = emptyForm.value.evidenceFile;
-    console.log("保存修改");
-    console.log(mainInfo.value.detail);
-    updateIndividualIncomeTaxDetail(mainInfo.value.detail)
-      .then((res) => {
-        console.log(res);
-        proxy.$modal.msgSuccess("保存成功!");
-        visible.value = false;
+  /**  保存 */
+  function handleSave() {
+    if (
+      emptyForm.value.evidenceFile == null ||
+      emptyForm.value.evidenceFile === ""
+    ) {
+      proxy.$message.error("请上传凭证");
+      return;
+    }
+    loading.value = true
+    emptyForm.value.files = fileList.value;
+    emptyForm.value.year = proxy.moment(currentMonth.value).format("YYYY");
+    emptyForm.value.month = proxy.moment(currentMonth.value).format("MM");
+    emptyForm.value.status = 3;
+    console.log(emptyForm.value);
+    if (isAdd.value) {
+      emptyForm.value.companyId = mainInfo.value.companyId;
+      addIndividualIncomeTaxDetail(emptyForm.value)
+        .then((res) => {
+          console.log(res);
+          proxy.$modal.msgSuccess("保存成功!");
+          visible.value = false;
 
-        getList.value();
-      })
-      .catch((err) => {
-        proxy.$modal.$modalMsgError(err);
-        console.log(err);
-      }).finally(() => {
-    loading.value = false
-  });
+          getList.value();
+        })
+        .catch((err) => {
+          proxy.$modal.$modalMsgError(err);
+          console.log(err);
+        }).finally(() => {
+          loading.value = false
+        });
+    } else {
+      mainInfo.value.detail.status = 3;
+      mainInfo.value.detail.fileName = emptyForm.value.fileName;
+      mainInfo.value.detail.originalFileName = emptyForm.value.originalFileName;
+      mainInfo.value.detail.evidenceFile = emptyForm.value.evidenceFile;
+      console.log("保存修改");
+      console.log(mainInfo.value.detail);
+      updateIndividualIncomeTaxDetail(mainInfo.value.detail)
+        .then((res) => {
+          console.log(res);
+          proxy.$modal.msgSuccess("保存成功!");
+          visible.value = false;
+
+          getList.value();
+        })
+        .catch((err) => {
+          proxy.$modal.$modalMsgError(err);
+          console.log(err);
+        }).finally(() => {
+          loading.value = false
+        });
+    }
   }
-}
 
-/** 文件上传 */
-function upload(param) {
-  handleDelFile();
+  /** 文件上传 */
+  function upload(param) {
+    handleDelFile();
 
-  const formData = new FormData();
-  formData.append("file", param);
-  uploadFile(formData).then((res) => {
-    if (res.code === 200) {
-      const file = {};
-      file.fileName = res.newFileName;
-      file.url = res.url;
-      file.originalFileName = res.originalFilename;
-      file.fileUrl = res.fileName;
-      fileList.value.push(file);
-      emptyForm.value.evidenceFile = file.fileUrl;
-      emptyForm.value.originalFileName = res.originalFilename;
-      emptyForm.value.fileName = res.newFileName;
-    }
-  });
-}
+    const formData = new FormData();
+    formData.append("file", param);
+    uploadFile(formData).then((res) => {
+      if (res.code === 200) {
+        const file = {};
+        file.fileName = res.newFileName;
+        file.url = res.url;
+        file.originalFileName = res.originalFilename;
+        file.fileUrl = res.fileName;
+        fileList.value.push(file);
+        emptyForm.value.evidenceFile = file.fileUrl;
+        emptyForm.value.originalFileName = res.originalFilename;
+        emptyForm.value.fileName = res.newFileName;
+      }
+    });
+  }
 
-function uploadSuccess(res, field) {
-  if (res.code === 200) {
-    form[field] = res.data.fileUrl;
-  } else proxy.$modal.msg.error("文件上传失败");
-}
+  function uploadSuccess(res, field) {
+    if (res.code === 200) {
+      form[field] = res.data.fileUrl;
+    } else proxy.$modal.msg.error("文件上传失败");
+  }
 
-/** 关闭 */
-function close() {
-  visible.value = false;
-  emptyForm.value = {
-    financialIndividualIncomeTaxId: null,
-    companyId: null,
-    parentId: "0",
-    name: "",
-    code: "",
-    receiveDate: proxy.moment().format("YYYY-MM-DD HH:mm:ss"),
-    receiveDateRange: proxy.moment().format("YYYY-MM-DD"),
-    receiveTimeRange: "08:00:00",
-  };
-}
+  /** 关闭 */
+  function close() {
+    visible.value = false;
+    emptyForm.value = {
+      financialIndividualIncomeTaxId: null,
+      companyId: null,
+      parentId: "0",
+      name: "",
+      code: "",
+      receiveDate: proxy.moment().format("YYYY-MM-DD HH:mm:ss"),
+      receiveDateRange: proxy.moment().format("YYYY-MM-DD"),
+      receiveTimeRange: "08:00:00",
+    };
+  }
 
-function openEvidenceFile() {}
+  function openEvidenceFile() { }
 
-// 暴露给父组件的方法
-defineExpose({
-  open,
-});
+  // 暴露给父组件的方法
+  defineExpose({
+    open,
+  });
 </script>
 
 <style scoped>
   .delete-button {
     margin-left: 20px;
     cursor: pointer;
-  }</style>
+  }
+</style>

src/views/business/production/IndividualIncomeTaxIsZero/index.vue

@@ -53,7 +53,7 @@
       <!-- 列表区 -->
       <el-table v-loading="loading" :data="detailList" size="small" border height="100%"
         @selection-change="handleSelectionChange" >
-        <el-table-column type="selection" width="55" align="center" />
+        <!-- <el-table-column type="selection" width="55" align="center" /> -->
         <el-table-column label="客户名称" align="center" prop="companyName" min-width="250">
           <template #default="scope">
             <div style="display: flex; align-items: center; ">
@@ -149,14 +149,14 @@
           </template>
         </el-table-column>
         <el-table-column label="执行人" align="center" min-width="100" prop="serviceName" />
-        <el-table-column label="操作" align="center" min-width="80" fixed="right" class-name="small-padding fixed-width">
+        <!-- <el-table-column label="操作" align="center" min-width="80" fixed="right" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-button size="small" link type="primary" :disabled="
                 scope.row.detail == null || scope.row.detail.status !== 3
               " @click="turnBack(scope.row)"
               v-hasPermi="['business:individualIncomeTaxDetail:saveDetail']">退回</el-button>
           </template>
-        </el-table-column>
+        </el-table-column> -->
       </el-table>
 
       <!-- 分页 -->
@@ -165,7 +165,7 @@
 
       <!-- 表单 -->
       <MemberDialog ref="memberDialog" :get-list="getList"></MemberDialog>
-      <FormDialog ref="fromDialog" :get-list="getList"></FormDialog>
+      <FormDialog ref="fromDialog" :get-list="getList" :workOrderId = workOrderId></FormDialog>
       <!-- 更多搜索弹窗 -->
       <el-dialog title="更多搜索" v-model="moreSearch" width="620px" size="small" append-to-body draggable :close-on-click-modal = "false">
         <el-form ref="dictRef" size="small" label-width="100">
@@ -241,6 +241,8 @@
   const currentMonth = ref(
     proxy.moment().subtract(1, "month").format("YYYY-MM-01")
   );
+
+  const workOrderId = ref(null);
   const flag = ref(checkPermission(['business:nowage:person']))
   const activeName = flag.value ? ref('first') : ref('second');
   const data = reactive({
@@ -326,7 +328,7 @@
 
   /** 填写按钮操作 */
   function fillIn(row) {
-    console.log("填写按钮操作", queryParams.value.month);
+    workOrderId.value = row.workOrderId 
     if (row.detail == null) {
       openByPermission(0, row, {
         month: queryParams.value.month,
@@ -394,6 +396,7 @@
   }
   /** 退回按钮操作 */
   function turnBack(row) {
+    console.log(row);
     row.detail.status = 1;
     row.detail.workOrderId = row.workOrderId;
     console.log(row.detail);
@@ -430,7 +433,7 @@
       month: null,
       taxType: null,
       currentEmployeeName: null,
-      year: proxy.moment().subtract(1, "month").format("YYYY"),
+      year: proxy.moment().subtract(1, "year").format("YYYY"),
       month: proxy.moment().subtract(1, "month").format("MM"),
     };
     currentMonth.value = proxy.moment().subtract(1, "month").format("YYYY-MM-01");