no message

src/views/business/crm/order/form.vue

@@ -243,8 +243,10 @@
                           </el-form-item>
                         </el-col>
                         <el-col :span="4" style="padding-top: 18px">
-                          <el-form-item label="服务区间" v-if="item.timeVo != null && item.timeVo != undefined">
-                            <div>{{ item.timeVo.startTime.substr(0,item.timeVo.startTime.length - 3) }} ~ {{ item.timeVo.endTime.substr(0,item.timeVo.endTime.length - 3) }}</div>
+                          <el-form-item label="服务区间"
+                            v-if="item.timeVo != null && item.timeVo != undefined &&  type !== 'alterOrder'">
+                            <div>{{ item.timeVo.startTime.substr(0,item.timeVo.startTime.length - 3) }} ~ {{
+                              item.timeVo.endTime.substr(0,item.timeVo.endTime.length - 3) }}</div>
                           </el-form-item>
                         </el-col>
                         <el-col :span="4" style="padding-top: 18px" v-if="item.taskTypeId ==4">
@@ -253,8 +255,8 @@
                         <el-col :span="4" style="padding-top: 18px" v-if="item.taskTypeId ==4">
                           <el-form-item label="所属区">
                             <el-select v-if="editStatus" v-model="item.belongRegion" style="margin-right: 5px">
-                              <el-option v-for="item in belong_region" :key="item.value" :label="item.label"
-                                :value="item.id"></el-option>
+                              <el-option v-for="region in belong_region" :key="region.value" :label="region.label"
+                                :value="region.id"></el-option>
                             </el-select>
                             <span v-else>{{item.regionName}}</span>
                           </el-form-item>
@@ -923,6 +925,7 @@
     reset();
 
     visible.value = true;
+
     if (id) {
       Promise.all([initTaskTypes(), listSource(), getOrder(id)]).then((res) => {
         loopTasks.value = res[0].data.loopTasks;
@@ -949,6 +952,9 @@
       title.value = "添加订单信息";
     }
     getOption()
+
+
+
   }
   function getOption() {
     listLableNoPage().then(res => {
@@ -1017,10 +1023,11 @@
     loopDetails.value = [];
     onceDetails.value = [];
     type.value = "";
-    // console.log(form)
     proxy.resetForm("orderRef");
+    belong_region.value.forEach(item => {
+      item.id = Number(item.id)
+    })
   }
-
   /** 全屏缩放 */
   function handleScreen() {
     const dom = document.querySelector(

src/views/business/deduction/fileDialog.vue

@@ -12,7 +12,9 @@
             </div>
         </template>
         <div class="dialog-list-container">
-            <el-table ref="dbTable" :data="list" size="small" border header-row-class-name="list-header-row"
+            <img style="height: 148px; width: 148px" :src="`${baseUrl}/${form}`" class="avatar"
+                @click="openEvidience('form')" />
+            <!-- <el-table ref="dbTable" :data="list" size="small" border header-row-class-name="list-header-row"
                 row-class-name="list-row" @selection-change="handleSelectionChange">
                 <el-table-column type="selection" width="40" align="center" />
                 <el-table-column type="index" label="序号" width="46" align="center" />
@@ -23,12 +25,12 @@
                             }}</el-button>
                     </template>
                 </el-table-column>
-            </el-table>
+            </el-table> -->
 
 
 
 
-            <div  style="display: flex; justify-content: space-between; margin-top: 10px;margin-bottom: 10px;">
+            <div style="display: flex; justify-content: space-between; margin-top: 10px;margin-bottom: 10px;">
                 <div>
                     补传文件
                 </div>
@@ -96,6 +98,7 @@
         baseUrl: import.meta.env.VITE_APP_BASE_API,
         options: {}
     })
+    const form = ref();
     const { visible, list, query, selection, baseUrl, options, total } = toRefs(data)
     const supplementList = ref([])
     function open(arg) {
@@ -119,6 +122,8 @@
         list.value = list.value.filter(item => {
             return item.supplement != 1
         })
+        form.value = list.value[0].fileUrl
+
         supplementList.value = res.rows.filter(item => {
             return item.supplement === 1
         })
@@ -164,6 +169,10 @@
         }
 
     }
+    function openEvidience() {
+        
+        window.open(`${baseUrl.value}/${form.value}`);
+    }
     /**
      * 搜索 事件
      */

src/views/business/invoice/form.vue

@@ -552,7 +552,7 @@
             .confirm("您确认要反审核当前数据吗?")
             .then(() => {
                 visible.value = true;
-                form.value.status = 0
+                form.value.status = 1
                 updateInvoice(form.value).then(response => {
                     proxy.$modal.msgSuccess("修改成功");
                     visible.value = false;

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

@@ -1,6 +1,6 @@
 <template>
   <!-- 添加或修改菜单对话框 -->
-  <el-dialog title="个税信息111" v-model="visible" width="800px" append-to-body draggable @close="close"
+  <el-dialog title="个税信息" v-model="visible" width="800px" append-to-body draggable @close="close"
     :close-on-click-modal="false">
     <div v-loading="loading">
       <div style="padding: 8px 24px 16px 24px">

src/views/business/production/IndividualIncomeTaxIs/MemberDialog.vue

@@ -1,34 +1,14 @@
 <template>
   <!-- 添加或修改菜单对话框 -->
-  <el-dialog
-    title="工资信息"
-    v-model="visible"
-    width="800px"
-    append-to-body
-    draggable
-    :close-on-click-modal = "false"
-  >
+  <el-dialog title="工资信息" v-model="visible" width="800px" append-to-body draggable :close-on-click-modal="false">
     <div style="padding: 8px 24px 16px 24px">
       <el-form size="small" label-width="50px">
         <el-row :gutter="30">
           <el-col :span="24">
-            <el-table
-              ref="dbTable"
-              :data="detailList"
-              size="small"
-              border
-              max-height="400"
-              header-row-class-name="list-header-row"
-              row-class-name="list-row"
-              show-summary
-              :summary-method="getSummaries"
-            >
-              <el-table-column
-                type="index"
-                label="序号"
-                width="50"
-                align="center"
-              />
+            <el-table ref="dbTable" :data="detailList" size="small" border max-height="400"
+              header-row-class-name="list-header-row" row-class-name="list-row" show-summary
+              :summary-method="getSummaries">
+              <el-table-column type="index" label="序号" width="50" align="center" />
               <el-table-column label="员工姓名" width="80" align="center">
                 <template #default="scope">
                   <span>{{ scope.row.employeeName }}</span>
@@ -45,127 +25,64 @@
                   <span>{{}}</span>
                 </template>
               </el-table-column> -->
-              <el-table-column
-                label="应发工资"
-                width="80"
-                header-align="center"
-                align="right"
-                prop="planSalary"
-              >
+              <el-table-column label="应发工资" width="80" header-align="center" align="right" prop="planSalary">
                 <template #default="scope">
                   <span>{{ rowNum(scope.row.planSalary) }}</span>
                 </template>
               </el-table-column>
-              <el-table-column
-                label="实发工资"
-                width="80"
-                header-align="center"
-                align="right"
-                prop="actuallySalary"
-              >
+              <el-table-column label="实发工资" width="80" header-align="center" align="right" prop="actuallySalary">
                 <template #default="scope">
                   <span>{{ rowNum(scope.row.actuallySalary) }}</span>
                 </template>
               </el-table-column>
 
-              <el-table-column
-                label="奖金及其他"
-                width="100"
-                header-align="center"
-                align="right"
-                prop="bonusAmount"
-              >
+              <el-table-column label="奖金及其他" width="100" header-align="center" align="right" prop="bonusAmount">
                 <template #default="scope">
                   <span>{{ rowNum(scope.row.bonusAmount) }}</span>
                 </template>
               </el-table-column>
               <el-table-column label="社保" align="center">
-                <el-table-column
-                  label="养老保险"
-                  width="80"
-                  header-align="center"
-                  align="right"
-                  prop="endowmentInsurance"
-                >
+                <el-table-column label="养老保险" width="80" header-align="center" align="right" prop="endowmentInsurance">
                   <template #default="scope">
                     <span>{{ rowNum(scope.row.endowmentInsurance) }}</span>
                   </template>
                 </el-table-column>
-                <el-table-column
-                  label="医疗保险"
-                  width="80"
-                  header-align="center"
-                  align="right"
-                  prop="medicalInsurance"
-                >
+                <el-table-column label="医疗保险" width="80" header-align="center" align="right" prop="medicalInsurance">
                   <template #default="scope">
                     <span>{{ rowNum(scope.row.medicalInsurance) }}</span>
                   </template>
                 </el-table-column>
-                <el-table-column
-                  label="失业险"
-                  width="80"
-                  header-align="center"
-                  align="right"
-                  prop="unemploymentBenefit"
-                >
+                <el-table-column label="失业险" width="80" header-align="center" align="right" prop="unemploymentBenefit">
                   <template #default="scope">
                     <span>{{ rowNum(scope.row.unemploymentBenefit) }}</span>
                   </template>
                 </el-table-column>
-                <el-table-column
-                  label="大病险"
-                  width="80"
-                  header-align="center"
-                  align="right"
-                  prop="seriousIllnessInsurance"
-                >
+                <el-table-column label="大病险" width="80" header-align="center" align="right"
+                  prop="seriousIllnessInsurance">
                   <template #default="scope">
                     <span>{{ rowNum(scope.row.seriousIllnessInsurance) }}</span>
                   </template>
                 </el-table-column>
               </el-table-column>
-              <el-table-column
-                label="公积金"
-                width="80"
-                header-align="center"
-                align="right"
-                prop="housingFund"
-              >
+              <el-table-column label="公积金" width="80" header-align="center" align="right" prop="housingFund">
                 <template #default="scope">
                   <span>{{ rowNum(scope.row.housingFund) }}</span>
                 </template>
               </el-table-column>
-              <el-table-column
-                label="个税"
-                width="60"
-                header-align="center"
-                align="right"
-                prop="currentIndividualIncomeTax"
-              >
+              <el-table-column label="个税" width="60" header-align="center" align="right"
+                prop="currentIndividualIncomeTax">
                 <template #default="scope">
                   <span>{{
                     rowNum(scope.row.currentIndividualIncomeTax)
-                  }}</span>
+                    }}</span>
                 </template>
               </el-table-column>
-              <el-table-column
-                label="其它扣款"
-                width="80"
-                header-align="center"
-                align="right"
-                prop="otherCut"
-              >
+              <el-table-column label="其它扣款" width="80" header-align="center" align="right" prop="otherCut">
                 <template #default="scope">
                   <span>{{ rowNum(scope.row.otherCut) }}</span>
                 </template>
               </el-table-column>
-              <el-table-column
-                label="备注"
-                width="60"
-                align="center"
-                prop="accidentInsurance"
-              >
+              <el-table-column label="备注" width="60" align="center" prop="accidentInsurance">
                 <template #default="scope">
                   <span>{{ scope.row.accidentInsurance }}</span>
                 </template>
@@ -183,106 +100,111 @@
 
 
 <script setup>
-const { proxy } = getCurrentInstance();
-import { getSalaryDetail } from "@/api/business/production/detail";
-import { rowNum, numberToCurrencyNo } from "@/utils/index";
-
-/** 父组件传参 */
-const props = defineProps({
-  getList: {
-    type: Function,
-    default: () => {},
-  },
-});
-const { getList } = toRefs(props);
-/** 字典数组区 */
-const { develop_type } = proxy.useDict("develop_type");
-/** 表单抽屉 页变量 */
-const detailList = ref([]);
-const title = ref("");
-const loading = ref(false);
-const multiple = ref(true);
-const visible = ref(false);
-const editStatus = ref(false);
-const content = ref("");
-const isFullscreen = ref(false);
-const addDetailNum = ref(1);
-const currentMember = {};
-const provinces = ref(proxy.region.getProvinces());
-provinces.value.unshift({ code: "", name: "全部" });
-const cities = ref([]);
-const districts = ref([]);
-
-const sourceCategories = ref([]);
-
-const addType = ref(1);
-
-watch(addType, (value) => {
-  switch (value) {
-    case "1":
-      break;
-    case "2":
-      break;
-    default:
-      break;
-  }
-});
-
-const webHost = import.meta.env.VITE_APP_BASE_API;
-
-const followQuery = ref({});
-
-/***********************  表单页方法 ****************************/
-
-/** 抽屉打开 */
-function open(data) {
-  console.log("工资open");
-  getSalaryDetail(data).then((response) => {
-    if (response.data) {
-      detailList.value = response.data.details;
-      content.value = response.data.content;
+  const { proxy } = getCurrentInstance();
+  import { getSalaryDetail } from "@/api/business/production/detail";
+  import { rowNum, numberToCurrencyNo } from "@/utils/index";
+
+  /** 父组件传参 */
+  const props = defineProps({
+    getList: {
+      type: Function,
+      default: () => { },
+    },
+  });
+  const { getList } = toRefs(props);
+  /** 字典数组区 */
+  const { develop_type } = proxy.useDict("develop_type");
+  /** 表单抽屉 页变量 */
+  const detailList = ref([]);
+  const title = ref("");
+  const loading = ref(false);
+  const multiple = ref(true);
+  const visible = ref(false);
+  const editStatus = ref(false);
+  const content = ref("");
+  const isFullscreen = ref(false);
+  const addDetailNum = ref(1);
+  const currentMember = {};
+  const provinces = ref(proxy.region.getProvinces());
+  provinces.value.unshift({ code: "", name: "全部" });
+  const cities = ref([]);
+  const districts = ref([]);
+
+  const sourceCategories = ref([]);
+
+  const addType = ref(1);
+
+  watch(addType, (value) => {
+    switch (value) {
+      case "1":
+        break;
+      case "2":
+        break;
+      default:
+        break;
     }
-    visible.value = true;
   });
-}
 
-function getSummaries(param) {
-  const { columns, data } = param;
-  const sums = [];
-  columns.forEach((column, index) => {
-    if (index === 0) {
-      sums[index] = "合计";
-      return;
-    } else if (index === 1) {
-      sums[index] = "";
-      return;
-    }
-    const values = data.map((item) => Number(item[column.property]));
+  const webHost = import.meta.env.VITE_APP_BASE_API;
+
+  const followQuery = ref({});
+
+  /***********************  表单页方法 ****************************/
+
+  /** 抽屉打开 */
+  function open(data) {
+    console.log("工资open");
+    getSalaryDetail(data).then((response) => {
+      if (response.data) {
+        detailList.value = response.data.details;
+        detailList.value.forEach((item) => {
+          if (item.individualIncomeTaxConfirm != undefined && item.currentIndividualIncomeTax != null) {
+            item.currentIndividualIncomeTax = item.individualIncomeTaxConfirm;
+          }
+        })
+        content.value = response.data.content;
+      }
+      visible.value = true;
+    });
+  }
 
-    if (!values.every((value) => isNaN(value))) {
-      sums[index] = values.reduce((prev, curr) => {
-        const value = Number(curr);
-        if (!isNaN(value)) {
-          return (Number(prev) + Number(curr)).toFixed(2);
-        } else {
-          return Number(prev).toFixed(2);
-        }
-      }, 0);
-      sums[index] = numberToCurrencyNo(sums[index]);
-    } else {
-      sums[index] = "";
-    }
-  });
-  return sums;
-}
+  function getSummaries(param) {
+    const { columns, data } = param;
+    const sums = [];
+    columns.forEach((column, index) => {
+      if (index === 0) {
+        sums[index] = "合计";
+        return;
+      } else if (index === 1) {
+        sums[index] = "";
+        return;
+      }
+      const values = data.map((item) => Number(item[column.property]));
+
+      if (!values.every((value) => isNaN(value))) {
+        sums[index] = values.reduce((prev, curr) => {
+          const value = Number(curr);
+          if (!isNaN(value)) {
+            return (Number(prev) + Number(curr)).toFixed(2);
+          } else {
+            return Number(prev).toFixed(2);
+          }
+        }, 0);
+        sums[index] = numberToCurrencyNo(sums[index]);
+      } else {
+        sums[index] = "";
+      }
+    });
+    return sums;
+  }
 
-function init() {}
+  function init() { }
 
-// 暴露给父组件的方法
-defineExpose({
-  open,
-});
-init();
+  // 暴露给父组件的方法
+  defineExpose({
+    open,
+  });
+  init();
 </script>
 
 <style></style>

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

@@ -42,37 +42,6 @@
                     </div>
                     <div v-else>
                     </div>
-                    <!-- <el-upload
-                    v-if="!isView"
-                    action="#"
-                    :http-request="upload"
-                    :with-credentials="true"
-                    list-type="picture-card"
-                    :show-file-list="false"
-                    :file-list="files"
-                    multiple
-                  >
-                    <img
-                      v-if="
-                        emptyForm.evidenceFile != null &&
-                        emptyForm.evidenceFile !== ''
-                      "
-                      style="height: 148px; width: 148px"
-                      :src="`${baseUrl}/${emptyForm.evidenceFile}`"
-                      class="avatar"
-                    />
-                    <i v-else class="el-icon-plus avatar-uploader-icon" />
-                  </el-upload>
-                  <img
-                    v-else-if="
-                      emptyForm.evidenceFile != null &&
-                      emptyForm.evidenceFile !== ''
-                    "
-                    style="height: 148px; width: 148px"
-                    :src="`${baseUrl}/${emptyForm.evidenceFile}`"
-                    class="avatar"
-                    @click="openEvidience('evidenceFile')"
-                  /> -->
                   </el-form-item>
                 </div>
               </el-col>
@@ -208,12 +177,13 @@
       loadData(id);
     } else if (id == null || mainRow.detail.status == 3) {
       isView.value = true;
-      
+      currentMonth.value = monthInfo.value.year + monthInfo.value.month
       getInfoId(id);
     } else {
       console.log("修改");
       isView.value = false;
       isAdd.value = false;
+      currentMonth.value = monthInfo.value.year + monthInfo.value.month
       getInfoId(id);
     }
   }

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

@@ -1,34 +1,14 @@
 <template>
   <!-- 添加或修改菜单对话框 -->
-  <el-dialog
-    title="工资信息"
-    v-model="visible"
-    width="800px"
-    append-to-body
-    draggable
-    :close-on-click-modal = "false"
-  >
+  <el-dialog title="工资信息" v-model="visible" width="800px" append-to-body draggable :close-on-click-modal="false">
     <div style="padding: 8px 24px 16px 24px">
       <el-form size="small" label-width="50px">
         <el-row :gutter="30">
           <el-col :span="24">
-            <el-table
-              ref="dbTable"
-              :data="detailList"
-              size="small"
-              border
-              max-height="400"
-              header-row-class-name="list-header-row"
-              row-class-name="list-row"
-              show-summary
-              :summary-method="getSummaries"
-            >
-              <el-table-column
-                type="index"
-                label="序号"
-                width="50"
-                align="center"
-              />
+            <el-table ref="dbTable" :data="detailList" size="small" border max-height="400"
+              header-row-class-name="list-header-row" row-class-name="list-row" show-summary
+              :summary-method="getSummaries">
+              <el-table-column type="index" label="序号" width="50" align="center" />
               <el-table-column label="员工姓名" width="80" align="center">
                 <template #default="scope">
                   <span>{{ scope.row.employeeName }}</span>
@@ -45,127 +25,64 @@
                   <span>{{}}</span>
                 </template>
               </el-table-column> -->
-              <el-table-column
-                label="应发工资"
-                width="80"
-                header-align="center"
-                align="right"
-                prop="planSalary"
-              >
+              <el-table-column label="应发工资" width="80" header-align="center" align="right" prop="planSalary">
                 <template #default="scope">
                   <span>{{ rowNum(scope.row.planSalary) }}</span>
                 </template>
               </el-table-column>
-              <el-table-column
-                label="实发工资"
-                width="80"
-                header-align="center"
-                align="right"
-                prop="actuallySalary"
-              >
+              <el-table-column label="实发工资" width="80" header-align="center" align="right" prop="actuallySalary">
                 <template #default="scope">
                   <span>{{ rowNum(scope.row.actuallySalary) }}</span>
                 </template>
               </el-table-column>
 
-              <el-table-column
-                label="奖金及其他"
-                width="100"
-                header-align="center"
-                align="right"
-                prop="bonusAmount"
-              >
+              <el-table-column label="奖金及其他" width="100" header-align="center" align="right" prop="bonusAmount">
                 <template #default="scope">
                   <span>{{ rowNum(scope.row.bonusAmount) }}</span>
                 </template>
               </el-table-column>
               <el-table-column label="社保" align="center">
-                <el-table-column
-                  label="养老保险"
-                  width="80"
-                  header-align="center"
-                  align="right"
-                  prop="endowmentInsurance"
-                >
+                <el-table-column label="养老保险" width="80" header-align="center" align="right" prop="endowmentInsurance">
                   <template #default="scope">
                     <span>{{ rowNum(scope.row.endowmentInsurance) }}</span>
                   </template>
                 </el-table-column>
-                <el-table-column
-                  label="医疗保险"
-                  width="80"
-                  header-align="center"
-                  align="right"
-                  prop="medicalInsurance"
-                >
+                <el-table-column label="医疗保险" width="80" header-align="center" align="right" prop="medicalInsurance">
                   <template #default="scope">
                     <span>{{ rowNum(scope.row.medicalInsurance) }}</span>
                   </template>
                 </el-table-column>
-                <el-table-column
-                  label="失业险"
-                  width="80"
-                  header-align="center"
-                  align="right"
-                  prop="unemploymentBenefit"
-                >
+                <el-table-column label="失业险" width="80" header-align="center" align="right" prop="unemploymentBenefit">
                   <template #default="scope">
                     <span>{{ rowNum(scope.row.unemploymentBenefit) }}</span>
                   </template>
                 </el-table-column>
-                <el-table-column
-                  label="大病险"
-                  width="80"
-                  header-align="center"
-                  align="right"
-                  prop="seriousIllnessInsurance"
-                >
+                <el-table-column label="大病险" width="80" header-align="center" align="right"
+                  prop="seriousIllnessInsurance">
                   <template #default="scope">
                     <span>{{ rowNum(scope.row.seriousIllnessInsurance) }}</span>
                   </template>
                 </el-table-column>
               </el-table-column>
-              <el-table-column
-                label="公积金"
-                width="80"
-                header-align="center"
-                align="right"
-                prop="housingFund"
-              >
+              <el-table-column label="公积金" width="80" header-align="center" align="right" prop="housingFund">
                 <template #default="scope">
                   <span>{{ rowNum(scope.row.housingFund) }}</span>
                 </template>
               </el-table-column>
-              <el-table-column
-                label="个税"
-                width="60"
-                header-align="center"
-                align="right"
-                prop="currentIndividualIncomeTax"
-              >
+              <el-table-column label="个税" width="60" header-align="center" align="right"
+                prop="currentIndividualIncomeTax">
                 <template #default="scope">
                   <span>{{
                     rowNum(scope.row.currentIndividualIncomeTax)
-                  }}</span>
+                    }}</span>
                 </template>
               </el-table-column>
-              <el-table-column
-                label="其它扣款"
-                width="80"
-                header-align="center"
-                align="right"
-                prop="otherCut"
-              >
+              <el-table-column label="其它扣款" width="80" header-align="center" align="right" prop="otherCut">
                 <template #default="scope">
                   <span>{{ rowNum(scope.row.otherCut) }}</span>
                 </template>
               </el-table-column>
-              <el-table-column
-                label="备注"
-                width="60"
-                align="center"
-                prop="accidentInsurance"
-              >
+              <el-table-column label="备注" width="60" align="center" prop="accidentInsurance">
                 <template #default="scope">
                   <span>{{ scope.row.accidentInsurance }}</span>
                 </template>
@@ -183,106 +100,111 @@
 
 
 <script setup>
-const { proxy } = getCurrentInstance();
-import { getSalaryDetail } from "@/api/business/production/detail";
-import { rowNum, numberToCurrencyNo } from "@/utils/index";
-
-/** 父组件传参 */
-const props = defineProps({
-  getList: {
-    type: Function,
-    default: () => {},
-  },
-});
-const { getList } = toRefs(props);
-/** 字典数组区 */
-const { develop_type } = proxy.useDict("develop_type");
-/** 表单抽屉 页变量 */
-const detailList = ref([]);
-const title = ref("");
-const loading = ref(false);
-const multiple = ref(true);
-const visible = ref(false);
-const editStatus = ref(false);
-const content = ref("");
-const isFullscreen = ref(false);
-const addDetailNum = ref(1);
-const currentMember = {};
-const provinces = ref(proxy.region.getProvinces());
-provinces.value.unshift({ code: "", name: "全部" });
-const cities = ref([]);
-const districts = ref([]);
-
-const sourceCategories = ref([]);
-
-const addType = ref(1);
-
-watch(addType, (value) => {
-  switch (value) {
-    case "1":
-      break;
-    case "2":
-      break;
-    default:
-      break;
-  }
-});
-
-const webHost = import.meta.env.VITE_APP_BASE_API;
-
-const followQuery = ref({});
-
-/***********************  表单页方法 ****************************/
-
-/** 抽屉打开 */
-function open(data) {
-  console.log("工资open");
-  getSalaryDetail(data).then((response) => {
-    if (response.data) {
-      detailList.value = response.data.details;
-      content.value = response.data.content;
+  const { proxy } = getCurrentInstance();
+  import { getSalaryDetail } from "@/api/business/production/detail";
+  import { rowNum, numberToCurrencyNo } from "@/utils/index";
+
+  /** 父组件传参 */
+  const props = defineProps({
+    getList: {
+      type: Function,
+      default: () => { },
+    },
+  });
+  const { getList } = toRefs(props);
+  /** 字典数组区 */
+  const { develop_type } = proxy.useDict("develop_type");
+  /** 表单抽屉 页变量 */
+  const detailList = ref([]);
+  const title = ref("");
+  const loading = ref(false);
+  const multiple = ref(true);
+  const visible = ref(false);
+  const editStatus = ref(false);
+  const content = ref("");
+  const isFullscreen = ref(false);
+  const addDetailNum = ref(1);
+  const currentMember = {};
+  const provinces = ref(proxy.region.getProvinces());
+  provinces.value.unshift({ code: "", name: "全部" });
+  const cities = ref([]);
+  const districts = ref([]);
+
+  const sourceCategories = ref([]);
+
+  const addType = ref(1);
+
+  watch(addType, (value) => {
+    switch (value) {
+      case "1":
+        break;
+      case "2":
+        break;
+      default:
+        break;
     }
-    visible.value = true;
   });
-}
 
-function getSummaries(param) {
-  const { columns, data } = param;
-  const sums = [];
-  columns.forEach((column, index) => {
-    if (index === 0) {
-      sums[index] = "合计";
-      return;
-    } else if (index === 1) {
-      sums[index] = "";
-      return;
-    }
-    const values = data.map((item) => Number(item[column.property]));
+  const webHost = import.meta.env.VITE_APP_BASE_API;
+
+  const followQuery = ref({});
+
+  /***********************  表单页方法 ****************************/
+
+  /** 抽屉打开 */
+  function open(data) {
+    console.log("工资open");
+    getSalaryDetail(data).then((response) => {
+      if (response.data) {
+        detailList.value = response.data.details;
+        detailList.value.forEach((item) => {
+          if (item.currentIndividualIncomeTax != undefined && item.individualIncomeTaxConfirm != null) {
+            item.currentIndividualIncomeTax = item.individualIncomeTaxConfirm;
+          }
+        })
+        content.value = response.data.content;
+      }
+      visible.value = true;
+    });
+  }
 
-    if (!values.every((value) => isNaN(value))) {
-      sums[index] = values.reduce((prev, curr) => {
-        const value = Number(curr);
-        if (!isNaN(value)) {
-          return (Number(prev) + Number(curr)).toFixed(2);
-        } else {
-          return Number(prev).toFixed(2);
-        }
-      }, 0);
-      sums[index] = numberToCurrencyNo(sums[index]);
-    } else {
-      sums[index] = "";
-    }
-  });
-  return sums;
-}
+  function getSummaries(param) {
+    const { columns, data } = param;
+    const sums = [];
+    columns.forEach((column, index) => {
+      if (index === 0) {
+        sums[index] = "合计";
+        return;
+      } else if (index === 1) {
+        sums[index] = "";
+        return;
+      }
+      const values = data.map((item) => Number(item[column.property]));
+
+      if (!values.every((value) => isNaN(value))) {
+        sums[index] = values.reduce((prev, curr) => {
+          const value = Number(curr);
+          if (!isNaN(value)) {
+            return (Number(prev) + Number(curr)).toFixed(2);
+          } else {
+            return Number(prev).toFixed(2);
+          }
+        }, 0);
+        sums[index] = numberToCurrencyNo(sums[index]);
+      } else {
+        sums[index] = "";
+      }
+    });
+    return sums;
+  }
 
-function init() {}
+  function init() { }
 
-// 暴露给父组件的方法
-defineExpose({
-  open,
-});
-init();
+  // 暴露给父组件的方法
+  defineExpose({
+    open,
+  });
+  init();
 </script>
 
 <style></style>

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

@@ -367,10 +367,12 @@
     } else if (id == null) {
       isView.value = true;
       emptyForm.value = mainRow.detail;
+      currentMonth.value = monthInfo.value.year + monthInfo.value.month
     } else {
       emptyForm.value = mainRow.detail;
       isView.value = false;
       isAdd.value = false;
+      currentMonth.value = monthInfo.value.year + monthInfo.value.month
     }
 
     getTaxId(mainRow, id);

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

@@ -234,11 +234,13 @@
       isView.value = true;
       emptyForm.value = mainRow.detail;
       console.log("查看", emptyForm);
+      currentMonth.value = monthInfo.value.year + monthInfo.value.month
     } else {
       emptyForm.value = mainRow.detail;
       console.log("修改");
       isView.value = false;
       isAdd.value = false;
+      currentMonth.value = monthInfo.value.year + monthInfo.value.month
     }
     console.log(isView.value,2323);
     getTaxId(mainRow, id);

src/views/business/production/receiveTicket/form.vue

@@ -379,6 +379,8 @@ function loadData() {
       month: form.value.month,
     }),
   ]).then((res) => {
+    console.log(2323,res);
+    
     form.value = { ...proxy.deepClone(emptyForm), ...res[0].data };
     salaryDetail.value = res[1].data;
     if (form.value.status === 2 || form.value.status === 3) {