Merge branch 'wyz' into 'test'

优化1

See merge request !174

src/views/payslip/electronicSalary.vue

@@ -18,7 +18,7 @@
 
 
       <!-- 列表区域 -->
       <!-- 列表区域 -->
       <template #table>
       <template #table>
-        <!-- 制作薪资单管理列表 -->
+        <!-- 电子薪资单管理列表 -->
         <el-table
         <el-table
           :data="tableData"
           :data="tableData"
           height="400"
           height="400"
@@ -532,6 +532,11 @@ const searchParams = ref({})
 const searchConfig = ref([
 const searchConfig = ref([
   {
   {
     type: 'input',
     type: 'input',
+    prop: 'salaryNo',
+    label: '发放编号'
+  },
+  {
+    type: 'input',
     prop: 'brokerName',
     prop: 'brokerName',
     label: '转介人'
     label: '转介人'
   },
   },
@@ -816,6 +821,13 @@ const formatStatus = (row, column) => {
 const detailDialogVisible = ref(false)
 const detailDialogVisible = ref(false)
 const electronicSalaryTableColumns = ref([
 const electronicSalaryTableColumns = ref([
   {
   {
+    prop: 'salaryNo',
+    label: '发放编号',
+    sortable: true,
+    width: '120',
+    formatter: row => row.salaryNo || '-'
+  },
+  {
     prop: 'status',
     prop: 'status',
     label: '薪资单状态',
     label: '薪资单状态',
     sortable: true,
     sortable: true,
@@ -866,11 +878,11 @@ const electronicSalaryTableColumns = ref([
   },
   },
 
 
   {
   {
-    prop: 'creatorName',
+    prop: 'remark',
     label: '备注',
     label: '备注',
     sortable: true,
     sortable: true,
     width: '150',
     width: '150',
-    formatter: row => row.creatorName || '-'
+    formatter: row => row.remark || '-'
   },
   },
   {
   {
     prop: 'creatorName',
     prop: 'creatorName',

src/views/payslip/wordReferenceSalary.vue

@@ -879,6 +879,11 @@ const searchParams = ref({})
 const searchConfig = ref([
 const searchConfig = ref([
   {
   {
     type: 'input',
     type: 'input',
+    prop: 'salaryNo',
+    label: '发放编号'
+  },
+  {
+    type: 'input',
     prop: 'brokerName',
     prop: 'brokerName',
     label: '转介人'
     label: '转介人'
   },
   },
@@ -910,13 +915,12 @@ const getOperateItems = row => {
   const items = []
   const items = []
 
 
   // 条件：isPart == 1 时不显示分期出账（使用宽松相等，兼容字符串 '1'）
   // 条件：isPart == 1 时不显示分期出账（使用宽松相等，兼容字符串 '1'）
-  // if (row.type == 1) {
-  //   items.push({ label: '设置状态', value: 'setStatus' })
-  //   items.push({ label: '更新数据', value: 'updateData' })
-  // }
+  if (row.status != '3' && row.status != '5') {
+    items.push({ label: '修改薪资单', value: 'salaryEdit' })
+  }
 
 
   // 始终显示的菜单项（保持原始顺序）
   // 始终显示的菜单项（保持原始顺序）
-  items.push({ label: '修改薪资单', value: 'salaryEdit' })
+
   items.push({ label: '查看薪资单', value: 'salaryView' })
   items.push({ label: '查看薪资单', value: 'salaryView' })
   items.push({ label: '取消薪资单', value: 'salaryCancel' })
   items.push({ label: '取消薪资单', value: 'salaryCancel' })
 
 
@@ -996,7 +1000,7 @@ const handleSingleAdd = () => {
   commonDialogTit.value = '增加薪资单'
   commonDialogTit.value = '增加薪资单'
   commonDialogType.value = 'add'
   commonDialogType.value = 'add'
   personSaleryFormModel.value = { apiSalaryRemittanceFzDTO: {} }
   personSaleryFormModel.value = { apiSalaryRemittanceFzDTO: {} }
-  salaryRemittanceDTOList.value = []
+  salaryRemittanceDTOList.value = [{}]
   setSignleSalaryFormStatus()
   setSignleSalaryFormStatus()
   detailDialogVisible.value = true
   detailDialogVisible.value = true
 }
 }
@@ -1195,13 +1199,13 @@ const workSalaryTableColumns = ref([
     fixed: 'left',
     fixed: 'left',
     formatter: row => row.salaryNo || '-'
     formatter: row => row.salaryNo || '-'
   },
   },
-  {
-    prop: 'salaryBizId',
-    label: '业务编号',
-    sortable: true,
-    width: '220',
-    formatter: row => row.salaryBizId || '-'
-  },
+  // {
+  //   prop: 'salaryBizId',
+  //   label: '业务编号',
+  //   sortable: true,
+  //   width: '220',
+  //   formatter: row => row.salaryBizId || '-'
+  // },
   {
   {
     prop: 'brokerName',
     prop: 'brokerName',
     label: '转介人',
     label: '转介人',