Merge branch 'wyz' into 'test'

制作薪资单加取消理由

See merge request !173

src/views/payslip/wordReferenceSalary.vue

@@ -534,6 +534,12 @@ const personSaleryFormConfig = ref([
     label: '实发金额',
     label: '实发金额',
     inputType: 'decimalNumber'
     inputType: 'decimalNumber'
     // required: true,
     // required: true,
+  },
+  {
+    type: 'input',
+    prop: 'cancelRemark',
+    label: '取消理由',
+    visible: formData => formData.status === '6' && commonDialogType.value == 'view'
   }
   }
 ])
 ])
 //单个薪资单的表单配置
 //单个薪资单的表单配置