Просмотр исходного кода

Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-wt into dev

xieyong 1 день назад
Родитель
Сommit
07d2adf84e
100 измененных файлов с 528 добавлено и 733 удалено
  1. 1 0
      src/BIZComponents/outdetails.vue
  2. 7 0
      src/BIZComponents/processSubmitDialog/components/parentList.vue
  3. 103 0
      src/components/ApprovalOpinion/index.vue
  4. 2 0
      src/main.js
  5. 4 8
      src/views/bpm/handleTask/components/EnergyPricingScheme/submit.vue
  6. 4 8
      src/views/bpm/handleTask/components/accidentReport/submit.vue
  7. 4 8
      src/views/bpm/handleTask/components/adjustNote/submit.vue
  8. 4 8
      src/views/bpm/handleTask/components/afterSales/submit.vue
  9. 4 8
      src/views/bpm/handleTask/components/allocate/submit.vue
  10. 4 4
      src/views/bpm/handleTask/components/bomApprover/submit.vue
  11. 4 8
      src/views/bpm/handleTask/components/bomApproverJSYY/submit.vue
  12. 4 8
      src/views/bpm/handleTask/components/bomApproverJSdevice/submit.vue
  13. 4 8
      src/views/bpm/handleTask/components/businessOpportunity/submit.vue
  14. 4 8
      src/views/bpm/handleTask/components/centralizedMeterReading/submit.vue
  15. 4 8
      src/views/bpm/handleTask/components/certificateQualifications/submit.vue
  16. 4 8
      src/views/bpm/handleTask/components/changeManage/submit.vue
  17. 4 8
      src/views/bpm/handleTask/components/changeManagement/submit.vue
  18. 4 8
      src/views/bpm/handleTask/components/commodityManagement/submit.vue
  19. 4 8
      src/views/bpm/handleTask/components/contact/submit.vue
  20. 7 0
      src/views/bpm/handleTask/components/contactQC/parentList.vue
  21. 4 8
      src/views/bpm/handleTask/components/contactQC/submit.vue
  22. 4 8
      src/views/bpm/handleTask/components/contractBook/contractChange/submit.vue
  23. 4 8
      src/views/bpm/handleTask/components/contractBook/submit.vue
  24. 4 8
      src/views/bpm/handleTask/components/cost/submit.vue
  25. 4 8
      src/views/bpm/handleTask/components/customApproval/submit.vue
  26. 4 8
      src/views/bpm/handleTask/components/cuttingPlan/submit.vue
  27. 4 8
      src/views/bpm/handleTask/components/demandApplication/submit.vue
  28. 4 8
      src/views/bpm/handleTask/components/doc/submit.vue
  29. 4 8
      src/views/bpm/handleTask/components/ehsEquipmentDisposal/submit.vue
  30. 4 8
      src/views/bpm/handleTask/components/entrust/submit.vue
  31. 4 8
      src/views/bpm/handleTask/components/equipmentDisposal/submit.vue
  32. 4 8
      src/views/bpm/handleTask/components/exceptionManagement/exceptionList/submit.vue
  33. 14 0
      src/views/bpm/handleTask/components/financialManage/components/customerListDialog.vue
  34. 4 8
      src/views/bpm/handleTask/components/financialManage/feeManage/feeApplication/submit.vue
  35. 4 8
      src/views/bpm/handleTask/components/financialManage/invoiceManage/submit.vue
  36. 4 8
      src/views/bpm/handleTask/components/financialManage/payableManage/submit.vue
  37. 4 8
      src/views/bpm/handleTask/components/financialManage/receivableManage/submit.vue
  38. 4 8
      src/views/bpm/handleTask/components/formCodeManagement/submit.vue
  39. 4 8
      src/views/bpm/handleTask/components/hiringApproval/submit.vue
  40. 4 8
      src/views/bpm/handleTask/components/hrContractManagement/submit.vue
  41. 4 8
      src/views/bpm/handleTask/components/ingredientOutbound/submit.vue
  42. 4 8
      src/views/bpm/handleTask/components/inoutBound/submit.vue
  43. 4 8
      src/views/bpm/handleTask/components/inquiryManage/submit.vue
  44. 4 8
      src/views/bpm/handleTask/components/inspectionProjectRequest/submit.vue
  45. 4 8
      src/views/bpm/handleTask/components/inspectionReportTemplate/submit.vue
  46. 4 8
      src/views/bpm/handleTask/components/inspectionStandard/submit.vue
  47. 4 8
      src/views/bpm/handleTask/components/inspectionTemplate/submit.vue
  48. 4 8
      src/views/bpm/handleTask/components/itemPublishApproval/submit.vue
  49. 4 8
      src/views/bpm/handleTask/components/itemReceipts/submit.vue
  50. 4 8
      src/views/bpm/handleTask/components/lossOverflowReport/submit.vue
  51. 3 7
      src/views/bpm/handleTask/components/maintenance/repair/submit.vue
  52. 4 8
      src/views/bpm/handleTask/components/marketManagem/submit.vue
  53. 4 8
      src/views/bpm/handleTask/components/materialPlan/submit.vue
  54. 7 11
      src/views/bpm/handleTask/components/measuringToolInspection/submit.vue
  55. 4 8
      src/views/bpm/handleTask/components/mesBatchRecordManage/submit.vue
  56. 4 8
      src/views/bpm/handleTask/components/mesWorkOrderChecklist/submit.vue
  57. 4 8
      src/views/bpm/handleTask/components/noticeIssuance/submit.vue
  58. 4 8
      src/views/bpm/handleTask/components/offerApproval/submit.vue
  59. 4 8
      src/views/bpm/handleTask/components/outBound/submit.vue
  60. 4 8
      src/views/bpm/handleTask/components/outsourcedWarehousing/submit.vue
  61. 5 9
      src/views/bpm/handleTask/components/outsourcedWarehousingNoProcurement/submit.vue
  62. 4 8
      src/views/bpm/handleTask/components/positionApplication/submit.vue
  63. 4 8
      src/views/bpm/handleTask/components/positionTransfer/submit.vue
  64. 4 8
      src/views/bpm/handleTask/components/prepayment/submit.vue
  65. 4 8
      src/views/bpm/handleTask/components/producePlan/submit.vue
  66. 4 8
      src/views/bpm/handleTask/components/productionWarehousing/submit.vue
  67. 4 8
      src/views/bpm/handleTask/components/project-manage/plan-manage/submit.vue
  68. 3 7
      src/views/bpm/handleTask/components/project-manage/project-initiation/submit.vue
  69. 4 8
      src/views/bpm/handleTask/components/project-manage/task-manage/submit.vue
  70. 4 8
      src/views/bpm/handleTask/components/project-manage/team-manage/submit.vue
  71. 4 8
      src/views/bpm/handleTask/components/purchaseNeedManage/submit.vue
  72. 4 8
      src/views/bpm/handleTask/components/purchaseOrder/accountstatement/submit.vue
  73. 7 0
      src/views/bpm/handleTask/components/purchaseOrder/accountstatement/supplierList.vue
  74. 5 9
      src/views/bpm/handleTask/components/purchaseOrder/invoice/submit.vue
  75. 4 8
      src/views/bpm/handleTask/components/purchaseOrder/invoiceConfirm/submit.vue
  76. 4 8
      src/views/bpm/handleTask/components/purchaseOrder/outSourceSend/submit.vue
  77. 4 8
      src/views/bpm/handleTask/components/purchaseOrder/outSourceSendCk/submit.vue
  78. 5 9
      src/views/bpm/handleTask/components/purchaseOrder/outsourceSendReturnGoods/submit.vue
  79. 5 9
      src/views/bpm/handleTask/components/purchaseOrder/returnGoods/submit.vue
  80. 4 8
      src/views/bpm/handleTask/components/purchaseOrder/submit.vue
  81. 5 9
      src/views/bpm/handleTask/components/purchasePlanManage/submit.vue
  82. 4 8
      src/views/bpm/handleTask/components/qualityReportApproval/submit.vue
  83. 7 0
      src/views/bpm/handleTask/components/quotation/parentList.vue
  84. 4 8
      src/views/bpm/handleTask/components/quotation/submit.vue
  85. 4 8
      src/views/bpm/handleTask/components/regularizationHandling/submit.vue
  86. 4 8
      src/views/bpm/handleTask/components/requirementOrderBlank/submit.vue
  87. 4 8
      src/views/bpm/handleTask/components/requirementOrderBorrow/submit.vue
  88. 5 9
      src/views/bpm/handleTask/components/requirementOrderPick/submit.vue
  89. 4 8
      src/views/bpm/handleTask/components/requirementOrderReturn/submit.vue
  90. 4 8
      src/views/bpm/handleTask/components/requirementPlanBlank/submit.vue
  91. 4 8
      src/views/bpm/handleTask/components/requirementPlanBorrow/submit.vue
  92. 4 8
      src/views/bpm/handleTask/components/requirementPlanPick/submit.vue
  93. 4 8
      src/views/bpm/handleTask/components/requirementPlanReturn/submit.vue
  94. 4 8
      src/views/bpm/handleTask/components/resignationApplication/submit.vue
  95. 4 8
      src/views/bpm/handleTask/components/resignationHandoverOrder/submit.vue
  96. 7 0
      src/views/bpm/handleTask/components/saleOrder/accountstatement/customerListDialog.vue
  97. 4 8
      src/views/bpm/handleTask/components/saleOrder/accountstatement/submit.vue
  98. 4 8
      src/views/bpm/handleTask/components/saleOrder/customerReturnGoods/submit.vue
  99. 5 9
      src/views/bpm/handleTask/components/saleOrder/entrustedReceive/submit.vue
  100. 5 9
      src/views/bpm/handleTask/components/saleOrder/entrustedReceiveReturnGoods/submit.vue

+ 1 - 0
src/BIZComponents/outdetails.vue

@@ -687,6 +687,7 @@
                     categoryCode: productItem.categoryCode,
                     bizNo: productItem.bizNo,
                     deliveryDetailId: productItem.deliveryDetailId,
+                    minPackingQuantity: productItem.minPackingQuantity,
                     materialDetailList: packingItem.materialDetailList.map(
                       (materialItem) => {
                         return {

+ 7 - 0
src/BIZComponents/processSubmitDialog/components/parentList.vue

@@ -107,6 +107,13 @@
             showOverflowTooltip: true,
             minWidth: 200
           },
+          {
+            prop: 'version',
+            label: '版本号',
+            align: 'center',
+            width: 80,
+            formatter: (_row, _column, cellValue) => `V${cellValue || 1}.0`
+          },
           {
             prop: 'serialNo',
             label: '客户代号',

+ 103 - 0
src/components/ApprovalOpinion/index.vue

@@ -0,0 +1,103 @@
+<template>
+  <div class="approval-opinion">
+    <el-radio-group v-model="opinionType" @change="handleTypeChange">
+      <el-radio label="agree">同意</el-radio>
+      <el-radio label="disagree">不同意</el-radio>
+      <el-radio label="custom">自定义</el-radio>
+    </el-radio-group>
+    <el-input
+      v-if="opinionType === 'custom'"
+      v-model="customOpinion"
+      type="textarea"
+      :rows="rows"
+      :maxlength="maxLength"
+      :show-word-limit="!!maxLength"
+      placeholder="请输入自定义审批意见"
+      @input="emitOpinion"
+    />
+  </div>
+</template>
+
+<script>
+  /** 流程审批意见三选一,向原有表单输出最终意见文本。 */
+  export default {
+    name: 'ApprovalOpinion',
+    props: {
+      value: {
+        type: String,
+        default: '同意'
+      },
+      rows: {
+        type: Number,
+        default: 3
+      },
+      maxLength: {
+        type: Number,
+        default: undefined
+      }
+    },
+    data() {
+      return {
+        opinionType: this.getOpinionType(this.value),
+        customOpinion: this.isPreset(this.value) ? '' : this.value || '',
+        selectedByUser: false
+      };
+    },
+    watch: {
+      value(value) {
+        if (this.opinionType === 'custom' && value === this.customOpinion) {
+          return;
+        }
+        const type = this.getOpinionType(value);
+        this.opinionType = type;
+        if (type === 'custom') {
+          this.customOpinion = value || '';
+        }
+      }
+    },
+    methods: {
+      isPreset(value) {
+        return value === '同意' || value === '不同意';
+      },
+      getOpinionType(value) {
+        if (value === '不同意') {
+          return 'disagree';
+        }
+        return value === '同意' ? 'agree' : 'custom';
+      },
+      /** 校验意见,并使默认意见与驳回操作一致。 */
+      validate(status) {
+        if (status === 0 && !this.selectedByUser && this.opinionType === 'agree') {
+          this.opinionType = 'disagree';
+          this.$emit('input', '不同意');
+        }
+        if (this.opinionType === 'custom' && !this.customOpinion.trim()) {
+          this.$message.warning('请输入自定义审批意见');
+          return false;
+        }
+        return true;
+      },
+      handleTypeChange(type) {
+        this.selectedByUser = true;
+        if (type === 'agree') {
+          this.$emit('input', '同意');
+          return;
+        }
+        if (type === 'disagree') {
+          this.$emit('input', '不同意');
+          return;
+        }
+        this.$emit('input', this.customOpinion);
+      },
+      emitOpinion() {
+        this.$emit('input', this.customOpinion);
+      }
+    }
+  };
+</script>
+
+<style scoped>
+  .approval-opinion .el-textarea {
+    margin-top: 10px;
+  }
+</style>

+ 2 - 0
src/main.js

@@ -35,6 +35,7 @@ import 'bpmn-js/dist/assets/bpmn-font/css/bpmn-embedded.css';
 import FormMaking from '../lib/vue-form-making/src/index';
 import '@/assets/font_icon/iconfont.css';
 import fileMain from '@/components/addDoc/index.vue';
+import ApprovalOpinion from '@/components/ApprovalOpinion';
 
 import './directives';
 import seekPage from '@/BIZComponents/seekPage';
@@ -52,6 +53,7 @@ Vue.use(elTableInfiniteScroll);
 Vue.component('HeaderTitle', HeaderTitle);
 Vue.component('fileMain', fileMain);
 Vue.component('processSubmitDialog', processSubmitDialog);
+Vue.component('ApprovalOpinion', ApprovalOpinion);
 
 const config = {
   number: 'BigNumber',

+ 4 - 8
src/views/bpm/handleTask/components/EnergyPricingScheme/submit.vue

@@ -2,7 +2,7 @@
   <el-col :span="16" :offset="6">
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
-        label="审批建议"
+        label="审批意见"
         style="margin-bottom: 20px"
         :rules="{
           required: true,
@@ -10,11 +10,7 @@
           trigger: 'change'
         }"
       >
-        <el-input
-          type="textarea"
-          v-model="form.reason"
-          placeholder="请输入审批建议"
-        />
+        <ApprovalOpinion ref="approvalOpinion" v-model="form.reason" />
       </el-form-item>
     </el-form>
     <div style="margin-left: 10%; margin-bottom: 20px; font-size: 14px">
@@ -23,7 +19,7 @@
         type="success"
         size="mini"
         v-click-once
-        @click="handleAudit(1)"
+        @click="$refs.approvalOpinion.validate(1) && handleAudit(1)"
         >通过
       </el-button>
 
@@ -32,7 +28,7 @@
         type="danger"
         size="mini"
         v-click-once
-        @click="handleAudit(0)"
+        @click="$refs.approvalOpinion.validate(0) && handleAudit(0)"
         >驳回
       </el-button>
       <el-dropdown

+ 4 - 8
src/views/bpm/handleTask/components/accidentReport/submit.vue

@@ -2,7 +2,7 @@
   <el-col :span="16" :offset="6">
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
-        label="审批建议"
+        label="审批意见"
         style="margin-bottom: 20px"
         :rules="{
           required: true,
@@ -10,11 +10,7 @@
           trigger: 'change'
         }"
       >
-        <el-input
-          type="textarea"
-          v-model="form.reason"
-          placeholder="请输入审批建议"
-        />
+        <ApprovalOpinion ref="approvalOpinion" v-model="form.reason" />
       </el-form-item>
     </el-form>
     <div style="margin-left: 10%; margin-bottom: 20px; font-size: 14px">
@@ -23,7 +19,7 @@
         type="success"
         size="mini"
         v-click-once
-        @click="handleAudit(1)"
+        @click="$refs.approvalOpinion.validate(1) && handleAudit(1)"
         >通过
       </el-button>
 
@@ -32,7 +28,7 @@
         type="danger"
         size="mini"
         v-click-once
-        @click="handleAudit(0)"
+        @click="$refs.approvalOpinion.validate(0) && handleAudit(0)"
         >驳回
       </el-button>
       <el-dropdown

+ 4 - 8
src/views/bpm/handleTask/components/adjustNote/submit.vue

@@ -2,7 +2,7 @@
   <el-col :span="16" :offset="6">
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
-        label="审批建议"
+        label="审批意见"
 
         style="margin-bottom: 20px"
         :rules="{
@@ -11,11 +11,7 @@
           trigger: 'change'
         }"
       >
-        <el-input
-          type="textarea"
-          v-model="form.reason"
-          placeholder="请输入审批建议"
-        />
+        <ApprovalOpinion ref="approvalOpinion" v-model="form.reason" />
       </el-form-item>
     </el-form>
     <div style="margin-left: 10%; margin-bottom: 20px; font-size: 14px">
@@ -24,7 +20,7 @@
         type="success"
         size="mini"
         v-click-once
-        @click="handleAudit(1)"
+        @click="$refs.approvalOpinion.validate(1) && handleAudit(1)"
         >通过
       </el-button>
       <el-button
@@ -32,7 +28,7 @@
         type="danger"
         size="mini"
         v-click-once
-        @click="handleAudit(0)"
+        @click="$refs.approvalOpinion.validate(0) && handleAudit(0)"
        
         >驳回
       </el-button>

+ 4 - 8
src/views/bpm/handleTask/components/afterSales/submit.vue

@@ -2,7 +2,7 @@
   <el-col :span="16" :offset="6">
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
-        label="审批建议"
+        label="审批意见"
         style="margin-bottom: 20px"
         :rules="{
           required: true,
@@ -10,11 +10,7 @@
           trigger: 'change'
         }"
       >
-        <el-input
-          type="textarea"
-          v-model="form.reason"
-          placeholder="请输入审批建议"
-        />
+        <ApprovalOpinion ref="approvalOpinion" v-model="form.reason" />
       </el-form-item>
     </el-form>
     <div style="margin-left: 10%; margin-bottom: 20px; font-size: 14px">
@@ -28,7 +24,7 @@
             outInData.verifyStatus == 2)
         "
         v-click-once
-        @click="handleAudit(1)"
+        @click="$refs.approvalOpinion.validate(1) && handleAudit(1)"
         >通过
       </el-button>
       <el-button
@@ -49,7 +45,7 @@
         type="danger"
         size="mini"
         v-click-once
-        @click="rejectTask(0)"
+        @click="$refs.approvalOpinion.validate(0) && rejectTask(0)"
         >驳回
       </el-button>
     </div>

+ 4 - 8
src/views/bpm/handleTask/components/allocate/submit.vue

@@ -2,7 +2,7 @@
   <el-col :span="16" :offset="6" v-loading="isSaveLoading">
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
-        label="审批建议"
+        label="审批意见"
         style="margin-bottom: 20px"
         :rules="{
           required: true,
@@ -10,11 +10,7 @@
           trigger: 'change'
         }"
       >
-        <el-input
-          type="textarea"
-          v-model="form.reason"
-          placeholder="请输入审批建议"
-        />
+        <ApprovalOpinion ref="approvalOpinion" v-model="form.reason" />
       </el-form-item>
     </el-form>
 
@@ -24,7 +20,7 @@
         type="success"
         size="mini"
         v-click-once
-        @click="handleAudit(1)"
+        @click="$refs.approvalOpinion.validate(1) && handleAudit(1)"
         :loading="isSaveLoading"
         >通过
       </el-button>
@@ -34,7 +30,7 @@
         type="danger"
         size="mini"
         v-click-once
-        @click="handleAudit(0)"
+        @click="$refs.approvalOpinion.validate(0) && handleAudit(0)"
         :loading="isSaveLoading"
         >驳回
       </el-button>

+ 4 - 4
src/views/bpm/handleTask/components/bomApprover/submit.vue

@@ -8,15 +8,15 @@
       }" -->
     <el-form label-width="100px" ref="formRef" :model="form">
 
-      <el-form-item label="审批建议"  style="margin-bottom: 20px">
-        <el-input type="textarea" v-model="form.reason" placeholder="请输入审批建议" />
+      <el-form-item label="审批意见"  style="margin-bottom: 20px">
+        <ApprovalOpinion ref="approvalOpinion" v-model="form.reason" />
       </el-form-item>
     </el-form>
     <div style="margin-left: 10%; margin-bottom: 20px; font-size: 14px">
-      <el-button icon="el-icon-edit-outline" type="success" size="mini" v-click-once @click="handleAudit(1)">通过
+      <el-button icon="el-icon-edit-outline" type="success" size="mini" v-click-once @click="$refs.approvalOpinion.validate(1) && handleAudit(1)">通过
       </el-button>
 
-      <el-button icon="el-icon-circle-close" type="danger" size="mini" v-click-once @click="handleAudit(0)">驳回
+      <el-button icon="el-icon-circle-close" type="danger" size="mini" v-click-once @click="$refs.approvalOpinion.validate(0) && handleAudit(0)">驳回
       </el-button>
 
 

+ 4 - 8
src/views/bpm/handleTask/components/bomApproverJSYY/submit.vue

@@ -3,7 +3,7 @@
   <el-col :span="16" :offset="6">
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
-        label="审批建议"
+        label="审批意见"
 
         style="margin-bottom: 20px"
         :rules="{
@@ -12,11 +12,7 @@
           trigger: 'change'
         }"
       >
-        <el-input
-          type="textarea"
-          v-model="form.reason"
-          placeholder="请输入审批建议"
-        />
+        <ApprovalOpinion ref="approvalOpinion" v-model="form.reason" />
       </el-form-item>
     </el-form>
     <div style="margin-left: 10%; margin-bottom: 20px; font-size: 14px">
@@ -25,7 +21,7 @@
         type="success"
         size="mini"
         v-click-once
-        @click="handleAudit(1)"
+        @click="$refs.approvalOpinion.validate(1) && handleAudit(1)"
         >通过
       </el-button>
 
@@ -34,7 +30,7 @@
         type="danger"
         size="mini"
         v-click-once
-        @click="handleAudit(0)"
+        @click="$refs.approvalOpinion.validate(0) && handleAudit(0)"
         >驳回
       </el-button>
     </div>

+ 4 - 8
src/views/bpm/handleTask/components/bomApproverJSdevice/submit.vue

@@ -3,7 +3,7 @@
   <el-col :span="16" :offset="6">
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
-        label="审批建议"
+        label="审批意见"
      
         style="margin-bottom: 20px"
         :rules="{
@@ -12,11 +12,7 @@
           trigger: 'change'
         }"
       >
-        <el-input
-          type="textarea"
-          v-model="form.reason"
-          placeholder="请输入审批建议"
-        />
+        <ApprovalOpinion ref="approvalOpinion" v-model="form.reason" />
       </el-form-item>
     </el-form>
     <div style="margin-left: 10%; margin-bottom: 20px; font-size: 14px">
@@ -25,7 +21,7 @@
         type="success"
         size="mini"
         v-click-once
-        @click="handleAudit(1)"
+        @click="$refs.approvalOpinion.validate(1) && handleAudit(1)"
         >通过
       </el-button>
 
@@ -34,7 +30,7 @@
         type="danger"
         size="mini"
         v-click-once
-        @click="handleAudit(0)"
+        @click="$refs.approvalOpinion.validate(0) && handleAudit(0)"
         >驳回
       </el-button>
     </div>

+ 4 - 8
src/views/bpm/handleTask/components/businessOpportunity/submit.vue

@@ -27,7 +27,7 @@
         </el-select>
       </el-form-item>
       <el-form-item
-        label="审批建议"
+        label="审批意见"
         style="margin-bottom: 20px"
         :rules="{
           required: true,
@@ -35,11 +35,7 @@
           trigger: 'change'
         }"
       >
-        <el-input
-          type="textarea"
-          v-model="form.reason"
-          placeholder="请输入审批建议"
-        />
+        <ApprovalOpinion ref="approvalOpinion" v-model="form.reason" />
       </el-form-item>
     </el-form>
     <div style="margin-left: 10%; margin-bottom: 20px; font-size: 14px">
@@ -48,7 +44,7 @@
         type="success"
         size="mini"
         v-click-once
-        @click="handleAudit(1)"
+        @click="$refs.approvalOpinion.validate(1) && handleAudit(1)"
         >通过
       </el-button>
       <!-- <el-button
@@ -64,7 +60,7 @@
         type="danger"
         size="mini"
         v-click-once
-        @click="handleAudit(0)"
+        @click="$refs.approvalOpinion.validate(0) && handleAudit(0)"
         v-if="!['starter', 'salesmanApprove'].includes(taskDefinitionKey)"
         >驳回
       </el-button>

+ 4 - 8
src/views/bpm/handleTask/components/centralizedMeterReading/submit.vue

@@ -2,7 +2,7 @@
   <el-col :span="16" :offset="6">
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
-        label="审批建议"
+        label="审批意见"
         style="margin-bottom: 20px"
         :rules="{
           required: true,
@@ -10,11 +10,7 @@
           trigger: 'change'
         }"
       >
-        <el-input
-          type="textarea"
-          v-model="form.reason"
-          placeholder="请输入审批建议"
-        />
+        <ApprovalOpinion ref="approvalOpinion" v-model="form.reason" />
       </el-form-item>
     </el-form>
     <div style="margin-left: 10%; margin-bottom: 20px; font-size: 14px">
@@ -23,7 +19,7 @@
         type="success"
         size="mini"
         v-click-once
-        @click="handleAudit(1)"
+        @click="$refs.approvalOpinion.validate(1) && handleAudit(1)"
         >通过
       </el-button>
 
@@ -32,7 +28,7 @@
         type="danger"
         size="mini"
         v-click-once
-        @click="handleAudit(0)"
+        @click="$refs.approvalOpinion.validate(0) && handleAudit(0)"
         >驳回
       </el-button>
       <el-dropdown

+ 4 - 8
src/views/bpm/handleTask/components/certificateQualifications/submit.vue

@@ -2,7 +2,7 @@
   <el-col :span="16" :offset="6">
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
-        label="审批建议"
+        label="审批意见"
         style="margin-bottom: 20px"
         :rules="{
           required: true,
@@ -10,11 +10,7 @@
           trigger: 'blur'
         }"
       >
-        <el-input
-          type="textarea"
-          v-model="form.reason"
-          placeholder="请输入审批建议"
-        />
+        <ApprovalOpinion ref="approvalOpinion" v-model="form.reason" />
       </el-form-item>
     </el-form>
     <div style="margin-left: 10%; margin-bottom: 20px; font-size: 14px">
@@ -23,7 +19,7 @@
         type="success"
         size="mini"
         v-click-once
-        @click="handleAudit(1)"
+        @click="$refs.approvalOpinion.validate(1) && handleAudit(1)"
         >通过
       </el-button>
       <el-button
@@ -31,7 +27,7 @@
         type="danger"
         size="mini"
         v-click-once
-        @click="handleAudit(0)"
+        @click="$refs.approvalOpinion.validate(0) && handleAudit(0)"
         >驳回
       </el-button>
 

+ 4 - 8
src/views/bpm/handleTask/components/changeManage/submit.vue

@@ -2,7 +2,7 @@
   <el-col :span="16" :offset="6">
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
-        label="审批建议"
+        label="审批意见"
 
         style="margin-bottom: 20px"
         :rules="{
@@ -11,11 +11,7 @@
           trigger: 'change'
         }"
       >
-        <el-input
-          type="textarea"
-          v-model="form.reason"
-          placeholder="请输入审批建议"
-        />
+        <ApprovalOpinion ref="approvalOpinion" v-model="form.reason" />
       </el-form-item>
     </el-form>
     <div style="margin-left: 10%; margin-bottom: 20px; font-size: 14px">
@@ -24,7 +20,7 @@
         type="success"
         size="mini"
         v-click-once
-        @click="handleAudit(1)"
+        @click="$refs.approvalOpinion.validate(1) && handleAudit(1)"
         >通过
       </el-button>
       <el-button
@@ -32,7 +28,7 @@
         type="danger"
         size="mini"
         v-click-once
-        @click="handleAudit(0)"
+        @click="$refs.approvalOpinion.validate(0) && handleAudit(0)"
        
         >驳回
       </el-button>

+ 4 - 8
src/views/bpm/handleTask/components/changeManagement/submit.vue

@@ -2,7 +2,7 @@
   <el-col :span="16" :offset="6">
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
-        label="审批建议"
+        label="审批意见"
         style="margin-bottom: 20px"
         :rules="{
           required: true,
@@ -10,11 +10,7 @@
           trigger: 'change'
         }"
       >
-        <el-input
-          type="textarea"
-          v-model="form.reason"
-          placeholder="请输入审批建议"
-        />
+        <ApprovalOpinion ref="approvalOpinion" v-model="form.reason" />
       </el-form-item>
     </el-form>
     <div style="margin-left: 10%; margin-bottom: 20px; font-size: 14px">
@@ -23,7 +19,7 @@
         type="success"
         size="mini"
         v-click-once
-        @click="handleAudit(1)"
+        @click="$refs.approvalOpinion.validate(1) && handleAudit(1)"
         >通过
       </el-button>
 
@@ -32,7 +28,7 @@
         type="danger"
         size="mini"
         v-click-once
-        @click="handleAudit(0)"
+        @click="$refs.approvalOpinion.validate(0) && handleAudit(0)"
         v-if="taskDefinitionKey != 'starter'"
         >驳回
       </el-button>

+ 4 - 8
src/views/bpm/handleTask/components/commodityManagement/submit.vue

@@ -2,7 +2,7 @@
   <el-col :span="16" :offset="6">
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
-        label="审批建议"
+        label="审批意见"
         style="margin-bottom: 20px"
         :rules="{
           required: true,
@@ -10,11 +10,7 @@
           trigger: 'blur'
         }"
       >
-        <el-input
-          type="textarea"
-          v-model="form.reason"
-          placeholder="请输入审批建议"
-        />
+        <ApprovalOpinion ref="approvalOpinion" v-model="form.reason" />
       </el-form-item>
     </el-form>
     <div style="margin-left: 10%; margin-bottom: 20px; font-size: 14px">
@@ -23,7 +19,7 @@
         type="success"
         size="mini"
         v-click-once
-        @click="handleAudit(1)"
+        @click="$refs.approvalOpinion.validate(1) && handleAudit(1)"
         >通过
       </el-button>
       <el-button
@@ -31,7 +27,7 @@
         type="danger"
         size="mini"
         v-click-once
-        @click="handleAudit(0)"
+        @click="$refs.approvalOpinion.validate(0) && handleAudit(0)"
         >驳回
       </el-button>
 

+ 4 - 8
src/views/bpm/handleTask/components/contact/submit.vue

@@ -2,7 +2,7 @@
   <el-col :span="16" :offset="6">
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
-        label="审批建议"
+        label="审批意见"
         style="margin-bottom: 20px"
         :rules="{
           required: true,
@@ -10,11 +10,7 @@
           trigger: 'blur'
         }"
       >
-        <el-input
-          type="textarea"
-          v-model="form.reason"
-          placeholder="请输入审批建议"
-        />
+        <ApprovalOpinion ref="approvalOpinion" v-model="form.reason" />
       </el-form-item>
     </el-form>
     <div style="margin-left: 10%; margin-bottom: 20px; font-size: 14px">
@@ -23,7 +19,7 @@
         type="success"
         size="mini"
         v-click-once
-        @click="handleAudit(1)"
+        @click="$refs.approvalOpinion.validate(1) && handleAudit(1)"
       >通过
       </el-button>
       <el-button
@@ -31,7 +27,7 @@
         type="danger"
         size="mini"
         v-click-once
-        @click="rejectTask(0)"
+        @click="$refs.approvalOpinion.validate(0) && rejectTask(0)"
       >驳回
       </el-button>
 

+ 7 - 0
src/views/bpm/handleTask/components/contactQC/parentList.vue

@@ -91,6 +91,13 @@ export default {
                     showOverflowTooltip: true,
                     minWidth: 200
                 },
+                {
+                    prop: 'version',
+                    label: '版本号',
+                    align: 'center',
+                    width: 80,
+                    formatter: (_row, _column, cellValue) => `V${cellValue || 1}.0`
+                },
                 {
                     prop: 'serialNo',
                     label: '客户代号',

+ 4 - 8
src/views/bpm/handleTask/components/contactQC/submit.vue

@@ -2,7 +2,7 @@
   <el-col :span="16" :offset="6">
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
-        label="审批建议"
+        label="审批意见"
 
         style="margin-bottom: 20px"
         :rules="{
@@ -11,11 +11,7 @@
           trigger: 'blur'
         }"
       >
-        <el-input
-          type="textarea"
-          v-model="form.reason"
-          placeholder="请输入审批建议"
-        />
+        <ApprovalOpinion ref="approvalOpinion" v-model="form.reason" />
       </el-form-item>
     </el-form>
     <div style="margin-left: 10%; margin-bottom: 20px; font-size: 14px">
@@ -24,7 +20,7 @@
         type="success"
         size="mini"
         v-click-once
-        @click="handleAudit(1)"
+        @click="$refs.approvalOpinion.validate(1) && handleAudit(1)"
       >通过
       </el-button>
       <el-button
@@ -32,7 +28,7 @@
         type="danger"
         size="mini"
         v-click-once
-        @click="handleAudit(0)"
+        @click="$refs.approvalOpinion.validate(0) && handleAudit(0)"
         v-if="!['starter', 'starterFillApprove'].includes(taskDefinitionKey)"
       >驳回
       </el-button>

+ 4 - 8
src/views/bpm/handleTask/components/contractBook/contractChange/submit.vue

@@ -2,7 +2,7 @@
   <el-col :span="16" :offset="6">
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
-        label="审批建议"
+        label="审批意见"
 
         style="margin-bottom: 20px"
         :rules="{
@@ -11,11 +11,7 @@
           trigger: 'change'
         }"
       >
-        <el-input
-          type="textarea"
-          v-model="form.reason"
-          placeholder="请输入审批建议"
-        />
+        <ApprovalOpinion ref="approvalOpinion" v-model="form.reason" />
       </el-form-item>
     </el-form>
     <div style="margin-left: 10%; margin-bottom: 20px; font-size: 14px">
@@ -24,7 +20,7 @@
         type="success"
         size="mini"
         v-click-once
-        @click="handleAudit(1)"
+        @click="$refs.approvalOpinion.validate(1) && handleAudit(1)"
         >通过
       </el-button>
       <el-button
@@ -32,7 +28,7 @@
         type="danger"
         size="mini"
         v-click-once
-        @click="handleAudit(0)"
+        @click="$refs.approvalOpinion.validate(0) && handleAudit(0)"
        
         >驳回
       </el-button>

+ 4 - 8
src/views/bpm/handleTask/components/contractBook/submit.vue

@@ -2,7 +2,7 @@
   <el-col :span="16" :offset="6">
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
-        label="审批建议"
+        label="审批意见"
 
         style="margin-bottom: 20px"
         :rules="{
@@ -11,11 +11,7 @@
           trigger: 'change'
         }"
       >
-        <el-input
-          type="textarea"
-          v-model="form.reason"
-          placeholder="请输入审批建议"
-        />
+        <ApprovalOpinion ref="approvalOpinion" v-model="form.reason" />
       </el-form-item>
     </el-form>
     <div style="margin-left: 10%; margin-bottom: 20px; font-size: 14px">
@@ -24,7 +20,7 @@
         type="success"
         size="mini"
         v-click-once
-        @click="handleAudit(1)"
+        @click="$refs.approvalOpinion.validate(1) && handleAudit(1)"
         >通过
       </el-button>
       <el-button
@@ -32,7 +28,7 @@
         type="danger"
         size="mini"
         v-click-once
-        @click="handleAudit(0)"
+        @click="$refs.approvalOpinion.validate(0) && handleAudit(0)"
         v-if="!['starter', 'starterFillApprove'].includes(taskDefinitionKey)"
         >驳回
       </el-button>

+ 4 - 8
src/views/bpm/handleTask/components/cost/submit.vue

@@ -2,7 +2,7 @@
   <el-col :span="16" :offset="6">
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
-        label="审批建议"
+        label="审批意见"
         style="margin-bottom: 20px"
         :rules="{
           required: true,
@@ -10,11 +10,7 @@
           trigger: 'change'
         }"
       >
-        <el-input
-          type="textarea"
-          v-model="form.reason"
-          placeholder="请输入审批建议"
-        />
+        <ApprovalOpinion ref="approvalOpinion" v-model="form.reason" />
       </el-form-item>
     </el-form>
     <div style="margin-left: 10%; margin-bottom: 20px; font-size: 14px">
@@ -28,7 +24,7 @@
           (taskDefinitionKey == 'wms_out' &&
             outInData.verifyStatus == 2)
         "
-        @click="handleAudit(1)"
+        @click="$refs.approvalOpinion.validate(1) && handleAudit(1)"
         >通过
       </el-button>
       <el-button
@@ -48,7 +44,7 @@
         icon="el-icon-circle-close"
         type="danger"
         size="mini"
-        @click="rejectTask(0)"
+        @click="$refs.approvalOpinion.validate(0) && rejectTask(0)"
         >驳回
       </el-button>
     </div>

+ 4 - 8
src/views/bpm/handleTask/components/customApproval/submit.vue

@@ -1,12 +1,8 @@
 <template>
   <el-col :span="16" :offset="6" v-loading="isSaveLoading">
     <el-form label-width="100px" ref="formRef" :model="form" :rules="rules">
-      <el-form-item label="审批建议" prop="reason" style="margin-bottom: 20px">
-        <el-input
-          type="textarea"
-          v-model="form.reason"
-          placeholder="请输入审批建议"
-        />
+      <el-form-item label="审批意见" prop="reason" style="margin-bottom: 20px">
+        <ApprovalOpinion ref="approvalOpinion" v-model="form.reason" />
       </el-form-item>
     </el-form>
     <div style="margin-left: 10%; margin-bottom: 20px; font-size: 14px">
@@ -16,7 +12,7 @@
         size="mini"
         v-click-once
         :loading="isSaveLoading"
-        @click="handleAudit(1)"
+        @click="$refs.approvalOpinion.validate(1) && handleAudit(1)"
         >通过
       </el-button>
 
@@ -26,7 +22,7 @@
         size="mini"
         v-click-once
         :loading="isSaveLoading"
-        @click="handleAudit(0)"
+        @click="$refs.approvalOpinion.validate(0) && handleAudit(0)"
         >驳回
       </el-button>
 

+ 4 - 8
src/views/bpm/handleTask/components/cuttingPlan/submit.vue

@@ -2,7 +2,7 @@
   <el-col :span="16" :offset="6">
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
-        label="审批建议"
+        label="审批意见"
  
         style="margin-bottom: 20px"
         :rules="{
@@ -11,11 +11,7 @@
           trigger: 'change'
         }"
       >
-        <el-input
-          type="textarea"
-          v-model="form.reason"
-          placeholder="请输入审批建议"
-        />
+        <ApprovalOpinion ref="approvalOpinion" v-model="form.reason" />
       </el-form-item>
     </el-form>
     <div style="margin-left: 10%; margin-bottom: 20px; font-size: 14px">
@@ -24,7 +20,7 @@
         type="success"
         size="mini"
         v-click-once
-        @click="handleAudit(1)"
+        @click="$refs.approvalOpinion.validate(1) && handleAudit(1)"
         >通过
       </el-button>
 
@@ -33,7 +29,7 @@
         type="danger"
         size="mini"
         v-click-once
-        @click="handleAudit(0)"
+        @click="$refs.approvalOpinion.validate(0) && handleAudit(0)"
         >驳回
       </el-button>
 

+ 4 - 8
src/views/bpm/handleTask/components/demandApplication/submit.vue

@@ -1,12 +1,8 @@
 <template>
   <el-col :span="16" :offset="6" v-loading="isSaveLoading">
     <el-form label-width="100px" ref="formRef" :model="form" :rules="rules">
-      <el-form-item label="审批建议" prop="reason" style="margin-bottom: 20px">
-        <el-input
-          type="textarea"
-          v-model="form.reason"
-          placeholder="请输入审批建议"
-        />
+      <el-form-item label="审批意见" prop="reason" style="margin-bottom: 20px">
+        <ApprovalOpinion ref="approvalOpinion" v-model="form.reason" />
       </el-form-item>
     </el-form>
     <div style="margin-left: 10%; margin-bottom: 20px; font-size: 14px">
@@ -16,7 +12,7 @@
         size="mini"
         v-click-once
         :loading="isSaveLoading"
-        @click="handleAudit(1)"
+        @click="$refs.approvalOpinion.validate(1) && handleAudit(1)"
         >通过
       </el-button>
       <el-button
@@ -25,7 +21,7 @@
         size="mini"
         v-click-once
         :loading="isSaveLoading"
-        @click="handleAudit(0)"
+        @click="$refs.approvalOpinion.validate(0) && handleAudit(0)"
         >驳回
       </el-button>
 

+ 4 - 8
src/views/bpm/handleTask/components/doc/submit.vue

@@ -2,7 +2,7 @@
   <el-col :span="16" :offset="6">
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
-        label="审批建议"
+        label="审批意见"
         style="margin-bottom: 20px"
         :rules="{
           required: true,
@@ -10,11 +10,7 @@
           trigger: 'change'
         }"
       >
-        <el-input
-          type="textarea"
-          v-model="form.reason"
-          placeholder="请输入审批建议"
-        />
+        <ApprovalOpinion ref="approvalOpinion" v-model="form.reason" />
       </el-form-item>
     </el-form>
     <div style="margin-left: 10%; margin-bottom: 20px; font-size: 14px">
@@ -24,7 +20,7 @@
         size="mini"
         v-click-once
         :loading="auditLoading"
-        @click="handleAudit(1)"
+        @click="$refs.approvalOpinion.validate(1) && handleAudit(1)"
         >通过
       </el-button>
 
@@ -34,7 +30,7 @@
         size="mini"
         v-click-once
         :loading="auditLoading"
-        @click="handleAudit(0)"
+        @click="$refs.approvalOpinion.validate(0) && handleAudit(0)"
         v-if="!['starter'].includes(taskDefinitionKey)"
         >驳回
       </el-button>

+ 4 - 8
src/views/bpm/handleTask/components/ehsEquipmentDisposal/submit.vue

@@ -2,7 +2,7 @@
   <el-col :span="16" :offset="6">
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
-        label="审批建议"
+        label="审批意见"
         style="margin-bottom: 20px"
         :rules="{
           required: true,
@@ -10,11 +10,7 @@
           trigger: 'change'
         }"
       >
-        <el-input
-          type="textarea"
-          v-model="form.reason"
-          placeholder="请输入审批建议"
-        />
+        <ApprovalOpinion ref="approvalOpinion" v-model="form.reason" />
       </el-form-item>
     </el-form>
     <div style="margin-left: 10%; margin-bottom: 20px; font-size: 14px">
@@ -23,7 +19,7 @@
         type="success"
         size="mini"
         v-click-once
-        @click="handleAudit(1)"
+        @click="$refs.approvalOpinion.validate(1) && handleAudit(1)"
         >通过
       </el-button>
 
@@ -32,7 +28,7 @@
         type="danger"
         size="mini"
         v-click-once
-        @click="handleAudit(0)"
+        @click="$refs.approvalOpinion.validate(0) && handleAudit(0)"
         v-if="taskDefinitionKey != 'starter'"
         >驳回
       </el-button>

+ 4 - 8
src/views/bpm/handleTask/components/entrust/submit.vue

@@ -10,7 +10,7 @@
       </el-form-item> -->
 
       <el-form-item
-        label="审批建议"
+        label="审批意见"
         style="margin-bottom: 20px"
         :rules="{
           required: true,
@@ -18,11 +18,7 @@
           trigger: 'change'
         }"
       >
-        <el-input
-          type="textarea"
-          v-model="form.reason"
-          placeholder="请输入审批建议"
-        />
+        <ApprovalOpinion ref="approvalOpinion" v-model="form.reason" />
       </el-form-item>
     </el-form>
     <div style="margin-left: 10%; margin-bottom: 20px; font-size: 14px">
@@ -31,7 +27,7 @@
         type="success"
         size="mini"
         v-click-once
-        @click="handleAudit(1)"
+        @click="$refs.approvalOpinion.validate(1) && handleAudit(1)"
         >通过
       </el-button>
       <!-- <el-button
@@ -47,7 +43,7 @@
         type="danger"
         size="mini"
         v-click-once
-        @click="handleAudit(0)"
+        @click="$refs.approvalOpinion.validate(0) && handleAudit(0)"
         >驳回
       </el-button>
       <!-- <el-dropdown

+ 4 - 8
src/views/bpm/handleTask/components/equipmentDisposal/submit.vue

@@ -2,7 +2,7 @@
   <el-col :span="16" :offset="6">
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
-        label="审批建议"
+        label="审批意见"
     
         style="margin-bottom: 20px"
         :rules="{
@@ -11,11 +11,7 @@
           trigger: 'change'
         }"
       >
-        <el-input
-          type="textarea"
-          v-model="form.reason"
-          placeholder="请输入审批建议"
-        />
+        <ApprovalOpinion ref="approvalOpinion" v-model="form.reason" />
       </el-form-item>
     </el-form>
     <div style="margin-left: 10%; margin-bottom: 20px; font-size: 14px">
@@ -24,7 +20,7 @@
         type="success"
         size="mini"
         v-click-once
-        @click="handleAudit(1)"
+        @click="$refs.approvalOpinion.validate(1) && handleAudit(1)"
         >通过
       </el-button>
 
@@ -33,7 +29,7 @@
         type="danger"
         size="mini"
         v-click-once
-        @click="handleAudit(0)"
+        @click="$refs.approvalOpinion.validate(0) && handleAudit(0)"
         v-if="taskDefinitionKey != 'starter'"
         >驳回
       </el-button>

+ 4 - 8
src/views/bpm/handleTask/components/exceptionManagement/exceptionList/submit.vue

@@ -33,7 +33,7 @@
       </el-form-item>
 
       <el-form-item
-        label="审批建议"
+        label="审批意见"
 
         style="margin-bottom: 20px"
         :rules="{
@@ -42,11 +42,7 @@
           trigger: 'change'
         }"
       >
-        <el-input
-          type="textarea"
-          v-model="form.reason"
-          placeholder="请输入审批建议"
-        />
+        <ApprovalOpinion ref="approvalOpinion" v-model="form.reason" />
       </el-form-item>
       <el-form-item
         v-if="taskDefinitionKey != 'starter'"
@@ -64,7 +60,7 @@
         type="success"
         size="mini"
         v-click-once
-        @click="handleAudit(1)"
+        @click="$refs.approvalOpinion.validate(1) && handleAudit(1)"
         v-if="form.exceptionDetermine != 1 || taskDefinitionKey == 'starter'"
         >通过
       </el-button>
@@ -82,7 +78,7 @@
         type="danger"
         size="mini"
         v-click-once
-        @click="handleAudit(0)"
+        @click="$refs.approvalOpinion.validate(0) && handleAudit(0)"
         v-if="taskDefinitionKey != 'starter'"
         >驳回
       </el-button>

+ 14 - 0
src/views/bpm/handleTask/components/financialManage/components/customerListDialog.vue

@@ -91,6 +91,13 @@ export default {
             showOverflowTooltip: true,
             minWidth: 200
           },
+          {
+            prop: 'version',
+            label: '版本号',
+            align: 'center',
+            width: 80,
+            formatter: (_row, _column, cellValue) => `V${cellValue || 1}.0`
+          },
           {
             prop: 'serialNo',
             label: '客户代号',
@@ -176,6 +183,13 @@ export default {
             showOverflowTooltip: true,
             minWidth: 200
           },
+          {
+            prop: 'version',
+            label: '版本号',
+            align: 'center',
+            width: 80,
+            formatter: (_row, _column, cellValue) => `V${cellValue || 1}.0`
+          },
           {
             prop: 'serialNo',
             label: '供应商代号',

+ 4 - 8
src/views/bpm/handleTask/components/financialManage/feeManage/feeApplication/submit.vue

@@ -2,7 +2,7 @@
   <el-col :span="16" :offset="6">
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
-        label="审批建议"
+        label="审批意见"
    
         style="margin-bottom: 20px"
         :rules="{
@@ -11,11 +11,7 @@
           trigger: 'change'
         }"
       >
-        <el-input
-          type="textarea"
-          v-model="form.reason"
-          placeholder="请输入审批建议"
-        />
+        <ApprovalOpinion ref="approvalOpinion" v-model="form.reason" />
       </el-form-item>
     </el-form>
     <div style="margin-left: 10%; margin-bottom: 20px; font-size: 14px">
@@ -24,7 +20,7 @@
         type="success"
         size="mini"
         v-click-once
-        @click="handleAudit(1)"
+        @click="$refs.approvalOpinion.validate(1) && handleAudit(1)"
       >通过
       </el-button>
       <el-button
@@ -32,7 +28,7 @@
         type="danger"
         size="mini"
         v-click-once
-        @click="handleAudit(0)"
+        @click="$refs.approvalOpinion.validate(0) && handleAudit(0)"
         v-if="!['starter'].includes(taskDefinitionKey)"
       >驳回
       </el-button>

+ 4 - 8
src/views/bpm/handleTask/components/financialManage/invoiceManage/submit.vue

@@ -2,7 +2,7 @@
   <el-col :span="16" :offset="6">
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
-        label="审批建议"
+        label="审批意见"
         style="margin-bottom: 20px"
         :rules="{
           required: true,
@@ -10,11 +10,7 @@
           trigger: 'change'
         }"
       >
-        <el-input
-          type="textarea"
-          v-model="form.reason"
-          placeholder="请输入审批建议"
-        />
+        <ApprovalOpinion ref="approvalOpinion" v-model="form.reason" />
       </el-form-item>
     </el-form>
     <div style="margin-left: 10%; margin-bottom: 20px; font-size: 14px">
@@ -24,7 +20,7 @@
         size="mini"
         v-click-once
         :loading="loading"
-        @click="handleAudit(1)"
+        @click="$refs.approvalOpinion.validate(1) && handleAudit(1)"
         >通过
       </el-button>
       <el-button
@@ -33,7 +29,7 @@
         size="mini"
         v-click-once
         :loading="loading"
-        @click="_approveTaskWithVariables(0)"
+        @click="$refs.approvalOpinion.validate(0) && _approveTaskWithVariables(0)"
         >驳回
       </el-button>
       <el-dropdown @command="(command) => handleCommand(command)" style="margin-left: 30px;">

+ 4 - 8
src/views/bpm/handleTask/components/financialManage/payableManage/submit.vue

@@ -2,7 +2,7 @@
   <el-col :span="16" :offset="6">
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
-        label="审批建议"
+        label="审批意见"
         prop="reason"
         style="margin-bottom: 20px"
         :rules="{
@@ -11,11 +11,7 @@
           trigger: 'change'
         }"
       >
-        <el-input
-          type="textarea"
-          v-model="form.reason"
-          placeholder="请输入审批建议"
-        />
+        <ApprovalOpinion ref="approvalOpinion" v-model="form.reason" />
       </el-form-item>
     </el-form>
     <div style="margin-left: 10%; margin-bottom: 20px; font-size: 14px">
@@ -24,7 +20,7 @@
         type="success"
         size="mini"
         v-click-once
-        @click="handleAudit(1)"
+        @click="$refs.approvalOpinion.validate(1) && handleAudit(1)"
       >通过
       </el-button>
       <el-button
@@ -32,7 +28,7 @@
         type="danger"
         size="mini"
         v-click-once
-        @click="handleAudit(0)"
+        @click="$refs.approvalOpinion.validate(0) && handleAudit(0)"
         v-if="!['starter'].includes(taskDefinitionKey)"
       >驳回
       </el-button>

+ 4 - 8
src/views/bpm/handleTask/components/financialManage/receivableManage/submit.vue

@@ -2,7 +2,7 @@
   <el-col :span="16" :offset="6">
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
-        label="审批建议"
+        label="审批意见"
         style="margin-bottom: 20px"
         :rules="{
           required: true,
@@ -10,11 +10,7 @@
           trigger: 'change'
         }"
       >
-        <el-input
-          type="textarea"
-          v-model="form.reason"
-          placeholder="请输入审批建议"
-        />
+        <ApprovalOpinion ref="approvalOpinion" v-model="form.reason" />
       </el-form-item>
     </el-form>
     <div style="margin-left: 10%; margin-bottom: 20px; font-size: 14px">
@@ -24,7 +20,7 @@
         size="mini"
         v-click-once
         :loading="saveLoading"
-        @click="handleAudit(1)"
+        @click="$refs.approvalOpinion.validate(1) && handleAudit(1)"
       >通过
       </el-button>
       <el-button
@@ -33,7 +29,7 @@
         size="mini"
         v-click-once
         :loading="saveLoading"
-        @click="handleAudit(0)"
+        @click="$refs.approvalOpinion.validate(0) && handleAudit(0)"
         v-if="!['starter'].includes(taskDefinitionKey)"
       >驳回
       </el-button>

+ 4 - 8
src/views/bpm/handleTask/components/formCodeManagement/submit.vue

@@ -2,7 +2,7 @@
   <el-col :span="16" :offset="6">
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
-        label="审批建议"
+        label="审批意见"
         style="margin-bottom: 20px"
         :rules="{
           required: true,
@@ -10,11 +10,7 @@
           trigger: 'change'
         }"
       >
-        <el-input
-          type="textarea"
-          v-model="form.reason"
-          placeholder="请输入审批建议"
-        />
+        <ApprovalOpinion ref="approvalOpinion" v-model="form.reason" />
       </el-form-item>
     </el-form>
     <div style="margin-left: 10%; margin-bottom: 20px; font-size: 14px">
@@ -23,7 +19,7 @@
         type="success"
         size="mini"
         v-click-once
-        @click="handleAudit(1)"
+        @click="$refs.approvalOpinion.validate(1) && handleAudit(1)"
         >通过
       </el-button>
 
@@ -32,7 +28,7 @@
         type="danger"
         size="mini"
         v-click-once
-        @click="handleAudit(0)"
+        @click="$refs.approvalOpinion.validate(0) && handleAudit(0)"
         >驳回
       </el-button>
       <el-dropdown

+ 4 - 8
src/views/bpm/handleTask/components/hiringApproval/submit.vue

@@ -2,7 +2,7 @@
   <el-col :span="16" :offset="6">
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
-        label="审批建议"
+        label="审批意见"
         style="margin-bottom: 20px"
         :rules="{
           required: true,
@@ -10,11 +10,7 @@
           trigger: 'change'
         }"
       >
-        <el-input
-          type="textarea"
-          v-model="form.reason"
-          placeholder="请输入审批建议"
-        />
+        <ApprovalOpinion ref="approvalOpinion" v-model="form.reason" />
       </el-form-item>
     </el-form>
 
@@ -25,7 +21,7 @@
         size="mini"
         :loading="isLoading"
         v-click-once
-        @click="handleAudit(1)"
+        @click="$refs.approvalOpinion.validate(1) && handleAudit(1)"
         >通过
       </el-button>
 
@@ -35,7 +31,7 @@
         size="mini"
         v-click-once
         :loading="isLoading"
-        @click="outApproveNotPass(0)"
+        @click="$refs.approvalOpinion.validate(0) && outApproveNotPass(0)"
         >驳回
       </el-button>
     </div>

+ 4 - 8
src/views/bpm/handleTask/components/hrContractManagement/submit.vue

@@ -2,7 +2,7 @@
   <el-col :span="16" :offset="6">
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
-        label="审批建议"
+        label="审批意见"
         style="margin-bottom: 20px"
         :rules="{
           required: true,
@@ -10,11 +10,7 @@
           trigger: 'change'
         }"
       >
-        <el-input
-          type="textarea"
-          v-model="form.reason"
-          placeholder="请输入审批建议"
-        />
+        <ApprovalOpinion ref="approvalOpinion" v-model="form.reason" />
       </el-form-item>
     </el-form>
     <div style="margin-left: 10%; margin-bottom: 20px; font-size: 14px">
@@ -24,7 +20,7 @@
         size="mini"
         :loading="isLoading"
         v-click-once
-        @click="handleAudit(1)"
+        @click="$refs.approvalOpinion.validate(1) && handleAudit(1)"
         >通过
       </el-button>
 
@@ -34,7 +30,7 @@
         size="mini"
         :loading="isLoading"
         v-click-once
-        @click="handleAudit(0)"
+        @click="$refs.approvalOpinion.validate(0) && handleAudit(0)"
         >驳回
       </el-button>
       <el-dropdown

+ 4 - 8
src/views/bpm/handleTask/components/ingredientOutbound/submit.vue

@@ -2,7 +2,7 @@
   <el-col :span="16" :offset="6">
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
-        label="审批建议"
+        label="审批意见"
         style="margin-bottom: 20px"
         :rules="{
           required: true,
@@ -10,11 +10,7 @@
           trigger: 'change'
         }"
       >
-        <el-input
-          type="textarea"
-          v-model="form.reason"
-          placeholder="请输入审批建议"
-        />
+        <ApprovalOpinion ref="approvalOpinion" v-model="form.reason" />
       </el-form-item>
     </el-form>
     <div style="margin-left: 10%; margin-bottom: 20px; font-size: 14px">
@@ -24,7 +20,7 @@
         size="mini"
         :loading="isLoading"
         v-click-once
-        @click="handleAudit(1)"
+        @click="$refs.approvalOpinion.validate(1) && handleAudit(1)"
         >通过
       </el-button>
       <el-button
@@ -32,7 +28,7 @@
         type="danger"
         size="mini"
         v-click-once
-        @click="handleAudit(0)"
+        @click="$refs.approvalOpinion.validate(0) && handleAudit(0)"
         >驳回
       </el-button>
 

+ 4 - 8
src/views/bpm/handleTask/components/inoutBound/submit.vue

@@ -2,7 +2,7 @@
   <el-col :span="16" :offset="6">
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
-        label="审批建议"
+        label="审批意见"
 
         style="margin-bottom: 20px"
         :rules="{
@@ -11,11 +11,7 @@
           trigger: 'change'
         }"
       >
-        <el-input
-          type="textarea"
-          v-model="form.reason"
-          placeholder="请输入审批建议"
-        />
+        <ApprovalOpinion ref="approvalOpinion" v-model="form.reason" />
       </el-form-item>
     </el-form>
 
@@ -26,7 +22,7 @@
         size="mini"
         :loading="isLoading"
         v-click-once
-        @click="handleAudit(1)"
+        @click="$refs.approvalOpinion.validate(1) && handleAudit(1)"
         >通过
       </el-button>
 
@@ -36,7 +32,7 @@
         size="mini"
         :loading="isLoading"
         v-click-once
-        @click="handleAudit(0)"
+        @click="$refs.approvalOpinion.validate(0) && handleAudit(0)"
         >驳回
       </el-button>
     </div>

+ 4 - 8
src/views/bpm/handleTask/components/inquiryManage/submit.vue

@@ -2,7 +2,7 @@
   <el-col :span="16" :offset="6">
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
-        label="审批建议"
+        label="审批意见"
    
         style="margin-bottom: 20px"
         :rules="{
@@ -11,11 +11,7 @@
           trigger: 'change'
         }"
       >
-        <el-input
-          type="textarea"
-          v-model="form.reason"
-          placeholder="请输入审批建议"
-        />
+        <ApprovalOpinion ref="approvalOpinion" v-model="form.reason" />
       </el-form-item>
     </el-form>
     <div style="margin-left: 10%; margin-bottom: 20px; font-size: 14px">
@@ -24,7 +20,7 @@
         type="success"
         size="mini"
         v-click-once
-        @click="handleAudit(1)"
+        @click="$refs.approvalOpinion.validate(1) && handleAudit(1)"
         >通过
       </el-button>
       <el-button
@@ -32,7 +28,7 @@
         type="danger"
         size="mini"
         v-click-once
-        @click="handleAudit(0)"
+        @click="$refs.approvalOpinion.validate(0) && handleAudit(0)"
      
         >驳回
       </el-button>

+ 4 - 8
src/views/bpm/handleTask/components/inspectionProjectRequest/submit.vue

@@ -2,7 +2,7 @@
   <el-col :span="16" :offset="6">
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
-        label="审批建议"
+        label="审批意见"
         style="margin-bottom: 20px"
         :rules="{
           required: true,
@@ -10,11 +10,7 @@
           trigger: 'change'
         }"
       >
-        <el-input
-          type="textarea"
-          v-model="form.reason"
-          placeholder="请输入审批建议"
-        />
+        <ApprovalOpinion ref="approvalOpinion" v-model="form.reason" />
       </el-form-item>
     </el-form>
     <div style="margin-left: 10%; margin-bottom: 20px; font-size: 14px">
@@ -24,7 +20,7 @@
         type="success"
         size="mini"
         v-click-once
-        @click="handleAudit(1)"
+        @click="$refs.approvalOpinion.validate(1) && handleAudit(1)"
         >通过
       </el-button>
 
@@ -34,7 +30,7 @@
         type="danger"
         size="mini"
         v-click-once
-        @click="rejectTask(0)"
+        @click="$refs.approvalOpinion.validate(0) && rejectTask(0)"
         >驳回
       </el-button>
     </div>

+ 4 - 8
src/views/bpm/handleTask/components/inspectionReportTemplate/submit.vue

@@ -2,7 +2,7 @@
   <el-col :span="16" :offset="6">
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
-        label="审批建议"
+        label="审批意见"
         style="margin-bottom: 20px"
         :rules="{
           required: true,
@@ -10,11 +10,7 @@
           trigger: 'change'
         }"
       >
-        <el-input
-          type="textarea"
-          v-model="form.reason"
-          placeholder="请输入审批建议"
-        />
+        <ApprovalOpinion ref="approvalOpinion" v-model="form.reason" />
       </el-form-item>
     </el-form>
     <div style="margin-left: 10%; margin-bottom: 20px; font-size: 14px">
@@ -23,7 +19,7 @@
         type="success"
         size="mini"
         v-click-once
-        @click="handleAudit(1)"
+        @click="$refs.approvalOpinion.validate(1) && handleAudit(1)"
         >通过
       </el-button>
 
@@ -32,7 +28,7 @@
         type="danger"
         size="mini"
         v-click-once
-        @click="rejectTask(0)"
+        @click="$refs.approvalOpinion.validate(0) && rejectTask(0)"
         >驳回
       </el-button>
     </div>

+ 4 - 8
src/views/bpm/handleTask/components/inspectionStandard/submit.vue

@@ -2,7 +2,7 @@
   <el-col :span="16" :offset="6">
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
-        label="审批建议"
+        label="审批意见"
         style="margin-bottom: 20px"
         :rules="{
           required: true,
@@ -10,11 +10,7 @@
           trigger: 'change'
         }"
       >
-        <el-input
-          type="textarea"
-          v-model="form.reason"
-          placeholder="请输入审批建议"
-        />
+        <ApprovalOpinion ref="approvalOpinion" v-model="form.reason" />
       </el-form-item>
     </el-form>
     <div style="margin-left: 10%; margin-bottom: 20px; font-size: 14px">
@@ -23,7 +19,7 @@
         type="success"
         size="mini"
         v-click-once
-        @click="handleAudit(1)"
+        @click="$refs.approvalOpinion.validate(1) && handleAudit(1)"
         >通过
       </el-button>
 
@@ -32,7 +28,7 @@
         type="danger"
         size="mini"
         v-click-once
-        @click="rejectTask(0)"
+        @click="$refs.approvalOpinion.validate(0) && rejectTask(0)"
         >驳回
       </el-button>
     </div>

+ 4 - 8
src/views/bpm/handleTask/components/inspectionTemplate/submit.vue

@@ -2,7 +2,7 @@
   <el-col :span="16" :offset="6">
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
-        label="审批建议"
+        label="审批意见"
         style="margin-bottom: 20px"
         :rules="{
           required: true,
@@ -10,11 +10,7 @@
           trigger: 'change'
         }"
       >
-        <el-input
-          type="textarea"
-          v-model="form.reason"
-          placeholder="请输入审批建议"
-        />
+        <ApprovalOpinion ref="approvalOpinion" v-model="form.reason" />
       </el-form-item>
     </el-form>
     <div style="margin-left: 10%; margin-bottom: 20px; font-size: 14px">
@@ -23,7 +19,7 @@
         type="success"
         size="mini"
         v-click-once
-        @click="handleAudit(1)"
+        @click="$refs.approvalOpinion.validate(1) && handleAudit(1)"
         >通过
       </el-button>
 
@@ -32,7 +28,7 @@
         type="danger"
         size="mini"
         v-click-once
-        @click="rejectTask(0)"
+        @click="$refs.approvalOpinion.validate(0) && rejectTask(0)"
         >驳回
       </el-button>
     </div>

+ 4 - 8
src/views/bpm/handleTask/components/itemPublishApproval/submit.vue

@@ -1,12 +1,8 @@
 <template>
   <el-col :span="16" :offset="6" v-loading="isSaveLoading">
     <el-form label-width="100px" ref="formRef" :model="form" :rules="rules">
-      <el-form-item label="审批建议" prop="reason" style="margin-bottom: 20px">
-        <el-input
-          type="textarea"
-          v-model="form.reason"
-          placeholder="请输入审批建议"
-        />
+      <el-form-item label="审批意见" prop="reason" style="margin-bottom: 20px">
+        <ApprovalOpinion ref="approvalOpinion" v-model="form.reason" />
       </el-form-item>
     </el-form>
     <div style="margin-left: 10%; margin-bottom: 20px; font-size: 14px">
@@ -16,7 +12,7 @@
         size="mini"
         v-click-once
         :loading="isSaveLoading"
-        @click="handleAudit(1)"
+        @click="$refs.approvalOpinion.validate(1) && handleAudit(1)"
         >通过
       </el-button>
 
@@ -26,7 +22,7 @@
         size="mini"
         v-click-once
         :loading="isSaveLoading"
-        @click="handleAudit(0)"
+        @click="$refs.approvalOpinion.validate(0) && handleAudit(0)"
         >驳回
       </el-button>
 

+ 4 - 8
src/views/bpm/handleTask/components/itemReceipts/submit.vue

@@ -2,7 +2,7 @@
   <el-col :span="16" :offset="6">
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
-        label="审批建议"
+        label="审批意见"
 
         style="margin-bottom: 20px"
         :rules="{
@@ -11,11 +11,7 @@
           trigger: 'blur'
         }"
       >
-        <el-input
-          type="textarea"
-          v-model="form.reason"
-          placeholder="请输入审批建议"
-        />
+        <ApprovalOpinion ref="approvalOpinion" v-model="form.reason" />
       </el-form-item>
     </el-form>
     <div style="margin-left: 10%; margin-bottom: 20px; font-size: 14px">
@@ -24,7 +20,7 @@
         type="success"
         size="mini"
         v-click-once
-        @click="handleAudit(1)"
+        @click="$refs.approvalOpinion.validate(1) && handleAudit(1)"
         >通过
       </el-button>
       <el-button
@@ -32,7 +28,7 @@
         type="danger"
         size="mini"
         v-click-once
-        @click="handleAudit(0)"
+        @click="$refs.approvalOpinion.validate(0) && handleAudit(0)"
         >驳回
       </el-button>
     </div>

+ 4 - 8
src/views/bpm/handleTask/components/lossOverflowReport/submit.vue

@@ -2,7 +2,7 @@
   <el-col :span="16" :offset="6">
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
-        label="审批建议"
+        label="审批意见"
 
         style="margin-bottom: 20px"
         :rules="{
@@ -11,11 +11,7 @@
           trigger: 'blur'
         }"
       >
-        <el-input
-          type="textarea"
-          v-model="form.reason"
-          placeholder="请输入审批建议"
-        />
+        <ApprovalOpinion ref="approvalOpinion" v-model="form.reason" />
       </el-form-item>
     </el-form>
     <div style="margin-left: 10%; margin-bottom: 20px; font-size: 14px">
@@ -24,7 +20,7 @@
         type="success"
         size="mini"
         v-click-once
-        @click="handleAudit(1)"
+        @click="$refs.approvalOpinion.validate(1) && handleAudit(1)"
         >通过
       </el-button>
       <el-button
@@ -32,7 +28,7 @@
         type="danger"
         size="mini"
         v-click-once
-        @click="handleAudit(0)"
+        @click="$refs.approvalOpinion.validate(0) && handleAudit(0)"
         >驳回
       </el-button>
     </div>

+ 3 - 7
src/views/bpm/handleTask/components/maintenance/repair/submit.vue

@@ -80,7 +80,7 @@
         </el-select>
       </el-form-item>
       <el-form-item
-        label="审批建议"
+        label="审批意见"
         style="margin-bottom: 20px"
         :rules="{
           required: true,
@@ -88,11 +88,7 @@
           trigger: 'change'
         }"
       >
-        <el-input
-          type="textarea"
-          v-model="form.reason"
-          placeholder="请输入审批建议"
-        />
+        <ApprovalOpinion ref="approvalOpinion" v-model="form.reason" />
       </el-form-item>
     </el-form>
     <div style="margin-left: 10%; margin-bottom: 20px; font-size: 14px">
@@ -101,7 +97,7 @@
         type="success"
         size="mini"
         v-click-once
-        @click="handleAudit(1)"
+        @click="$refs.approvalOpinion.validate(1) && handleAudit(1)"
         >通过
       </el-button>
       <!-- <el-button

+ 4 - 8
src/views/bpm/handleTask/components/marketManagem/submit.vue

@@ -2,7 +2,7 @@
   <el-col :span="16" :offset="6">
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
-        label="审批建议"
+        label="审批意见"
         style="margin-bottom: 20px"
         :rules="{
           required: true,
@@ -10,11 +10,7 @@
           trigger: 'change'
         }"
       >
-        <el-input
-          type="textarea"
-          v-model="form.reason"
-          placeholder="请输入审批建议"
-        />
+        <ApprovalOpinion ref="approvalOpinion" v-model="form.reason" />
       </el-form-item>
     </el-form>
     <div style="margin-left: 10%; margin-bottom: 20px; font-size: 14px">
@@ -23,7 +19,7 @@
         type="success"
         size="mini"
         v-click-once
-        @click="handleAudit(1)"
+        @click="$refs.approvalOpinion.validate(1) && handleAudit(1)"
         >通过
       </el-button>
 
@@ -32,7 +28,7 @@
         type="danger"
         size="mini"
         v-click-once
-        @click="handleAudit(0)"
+        @click="$refs.approvalOpinion.validate(0) && handleAudit(0)"
         v-if="!['starter'].includes(taskDefinitionKey)"
         >驳回
       </el-button>

+ 4 - 8
src/views/bpm/handleTask/components/materialPlan/submit.vue

@@ -27,7 +27,7 @@
         </el-select>
       </el-form-item> -->
       <el-form-item
-        label="审批建议"
+        label="审批意见"
         style="margin-bottom: 20px"
         :rules="{
           required: true,
@@ -35,11 +35,7 @@
           trigger: 'change'
         }"
       >
-        <el-input
-          type="textarea"
-          v-model="form.reason"
-          placeholder="请输入审批建议"
-        />
+        <ApprovalOpinion ref="approvalOpinion" v-model="form.reason" />
       </el-form-item>
     </el-form>
     <div style="margin-left: 10%; margin-bottom: 20px; font-size: 14px">
@@ -47,7 +43,7 @@
         icon="el-icon-edit-outline"
         type="success"
         size="mini"
-        @click="handleAudit(1)"
+        @click="$refs.approvalOpinion.validate(1) && handleAudit(1)"
         v-click-once
         >通过
       </el-button>
@@ -57,7 +53,7 @@
         type="danger"
         size="mini"
         v-click-once
-        @click="rejectTask(0)"
+        @click="$refs.approvalOpinion.validate(0) && rejectTask(0)"
         >驳回
       </el-button>
 

+ 7 - 11
src/views/bpm/handleTask/components/measuringToolInspection/submit.vue

@@ -1,12 +1,8 @@
 <template>
   <el-col :span="16" :offset="6">
     <el-form label-width="100px" ref="formRef" :model="form">
-      <el-form-item label="审批建议"  style="margin-bottom: 20px">
-        <el-input
-          type="textarea"
-          v-model="form.reason"
-          placeholder="请输入审批建议"
-        />
+      <el-form-item label="审批意见"  style="margin-bottom: 20px">
+        <ApprovalOpinion ref="approvalOpinion" v-model="form.reason" />
       </el-form-item>
     </el-form>
     <div style="margin-left: 10%; margin-bottom: 20px; font-size: 14px">
@@ -16,7 +12,7 @@
         size="mini"
         :loading="isSaveLoading"
         v-click-once
-        @click="submit"
+        @click="$refs.approvalOpinion.validate(1) && submit()"
         v-if="currentBtn === '上交'"
         >上交
       </el-button>
@@ -26,7 +22,7 @@
         size="mini"
         :loading="isSaveLoading"
         v-click-once
-        @click="submit"
+        @click="$refs.approvalOpinion.validate(1) && submit()"
         v-if="currentBtn === '接收'"
         >接收
       </el-button>
@@ -36,7 +32,7 @@
         size="mini"
         :loading="isSaveLoading"
         v-click-once
-        @click="submit"
+        @click="$refs.approvalOpinion.validate(1) && submit()"
         v-if="currentBtn === '检查'"
         >已检
       </el-button>
@@ -46,7 +42,7 @@
         size="mini"
         :loading="isSaveLoading"
         v-click-once
-        @click="submit"
+        @click="$refs.approvalOpinion.validate(1) && submit()"
         v-if="currentBtn === '发出'"
         >发出
       </el-button>
@@ -56,7 +52,7 @@
         size="mini"
         :loading="isSaveLoading"
         v-click-once
-        @click="submit(1)"
+        @click="$refs.approvalOpinion.validate(1) && submit(1)"
         v-if="['user_receive'].includes(this.taskDefinitionKey)"
         >报工
       </el-button>

+ 4 - 8
src/views/bpm/handleTask/components/mesBatchRecordManage/submit.vue

@@ -2,7 +2,7 @@
   <el-col :span="16" :offset="6">
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
-        label="审批建议"
+        label="审批意见"
 
         style="margin-bottom: 20px"
         :rules="{
@@ -11,11 +11,7 @@
           trigger: 'change'
         }"
       >
-        <el-input
-          type="textarea"
-          v-model="form.reason"
-          placeholder="请输入审批建议"
-        />
+        <ApprovalOpinion ref="approvalOpinion" v-model="form.reason" />
       </el-form-item>
     </el-form>
     <div style="margin-left: 10%; margin-bottom: 20px; font-size: 14px">
@@ -24,7 +20,7 @@
         type="success"
         size="mini"
         v-click-once
-        @click="handleAudit(1)"
+        @click="$refs.approvalOpinion.validate(1) && handleAudit(1)"
         >通过
       </el-button>
       <el-button
@@ -32,7 +28,7 @@
         type="danger"
         size="mini"
         v-click-once
-        @click="handleAudit(0)"
+        @click="$refs.approvalOpinion.validate(0) && handleAudit(0)"
 
         >驳回
       </el-button>

+ 4 - 8
src/views/bpm/handleTask/components/mesWorkOrderChecklist/submit.vue

@@ -2,7 +2,7 @@
   <el-col :span="16" :offset="6">
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
-        label="审批建议"
+        label="审批意见"
         style="margin-bottom: 20px"
         :rules="{
           required: true,
@@ -10,11 +10,7 @@
           trigger: 'change'
         }"
       >
-        <el-input
-          type="textarea"
-          v-model="form.reason"
-          placeholder="请输入审批建议"
-        />
+        <ApprovalOpinion ref="approvalOpinion" v-model="form.reason" />
       </el-form-item>
     </el-form>
     <div style="margin-left: 10%; margin-bottom: 20px; font-size: 14px">
@@ -23,7 +19,7 @@
         type="success"
         size="mini"
         v-click-once
-        @click="handleAudit(1)"
+        @click="$refs.approvalOpinion.validate(1) && handleAudit(1)"
         >通过
       </el-button>
       <el-button
@@ -31,7 +27,7 @@
         type="danger"
         size="mini"
         v-click-once
-        @click="handleAudit(0)"
+        @click="$refs.approvalOpinion.validate(0) && handleAudit(0)"
         >驳回
       </el-button>
 

+ 4 - 8
src/views/bpm/handleTask/components/noticeIssuance/submit.vue

@@ -2,7 +2,7 @@
   <el-col :span="16" :offset="6">
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
-        label="审批建议"
+        label="审批意见"
 
         style="margin-bottom: 20px"
         :rules="{
@@ -11,11 +11,7 @@
           trigger: 'change'
         }"
       >
-        <el-input
-          type="textarea"
-          v-model="form.reason"
-          placeholder="请输入审批建议"
-        />
+        <ApprovalOpinion ref="approvalOpinion" v-model="form.reason" />
       </el-form-item>
     </el-form>
     <div style="margin-left: 10%; margin-bottom: 20px; font-size: 14px">
@@ -24,7 +20,7 @@
         type="success"
         size="mini"
         v-click-once
-        @click="handleAudit(1)"
+        @click="$refs.approvalOpinion.validate(1) && handleAudit(1)"
         >通过
       </el-button>
       <el-button
@@ -32,7 +28,7 @@
         type="danger"
         size="mini"
         v-click-once
-        @click="handleAudit(0)"
+        @click="$refs.approvalOpinion.validate(0) && handleAudit(0)"
        
         >驳回
       </el-button>

+ 4 - 8
src/views/bpm/handleTask/components/offerApproval/submit.vue

@@ -2,7 +2,7 @@
   <el-col :span="16" :offset="6">
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
-        label="审批建议"
+        label="审批意见"
         style="margin-bottom: 20px"
         :rules="{
           required: true,
@@ -10,11 +10,7 @@
           trigger: 'change'
         }"
       >
-        <el-input
-          type="textarea"
-          v-model="form.reason"
-          placeholder="请输入审批建议"
-        />
+        <ApprovalOpinion ref="approvalOpinion" v-model="form.reason" />
       </el-form-item>
     </el-form>
     <div style="margin-left: 10%; margin-bottom: 20px; font-size: 14px">
@@ -23,7 +19,7 @@
         type="success"
         size="mini"
         v-click-once
-        @click="handleAudit(1)"
+        @click="$refs.approvalOpinion.validate(1) && handleAudit(1)"
         >通过
       </el-button>
 
@@ -32,7 +28,7 @@
         type="danger"
         size="mini"
         v-click-once
-        @click="handleAudit(0)"
+        @click="$refs.approvalOpinion.validate(0) && handleAudit(0)"
         >驳回
       </el-button>
       <el-dropdown

+ 4 - 8
src/views/bpm/handleTask/components/outBound/submit.vue

@@ -2,7 +2,7 @@
   <el-col :span="16" :offset="6">
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
-        label="审批建议"
+        label="审批意见"
         style="margin-bottom: 20px"
         :rules="{
           required: true,
@@ -10,11 +10,7 @@
           trigger: 'change'
         }"
       >
-        <el-input
-          type="textarea"
-          v-model="form.reason"
-          placeholder="请输入审批建议"
-        />
+        <ApprovalOpinion ref="approvalOpinion" v-model="form.reason" />
       </el-form-item>
     </el-form>
 
@@ -25,7 +21,7 @@
         size="mini"
         :loading="isLoading"
         v-click-once
-        @click="handleAudit(1)"
+        @click="$refs.approvalOpinion.validate(1) && handleAudit(1)"
         >通过
       </el-button>
 
@@ -35,7 +31,7 @@
         size="mini"
         v-click-once
         :loading="isLoading"
-        @click="outApproveNotPass(0)"
+        @click="$refs.approvalOpinion.validate(0) && outApproveNotPass(0)"
         >驳回
       </el-button>
     </div>

+ 4 - 8
src/views/bpm/handleTask/components/outsourcedWarehousing/submit.vue

@@ -2,7 +2,7 @@
   <el-col :span="16" :offset="6">
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
-        label="审批建议"
+        label="审批意见"
         style="margin-bottom: 20px"
         :rules="{
           required: true,
@@ -10,11 +10,7 @@
           trigger: 'change'
         }"
       >
-        <el-input
-          type="textarea"
-          v-model="form.reason"
-          placeholder="请输入审批建议"
-        />
+        <ApprovalOpinion ref="approvalOpinion" v-model="form.reason" />
       </el-form-item>
     </el-form>
 
@@ -24,7 +20,7 @@
         type="success"
         size="mini"
         v-click-once
-        @click="handleAudit2(1)"
+        @click="$refs.approvalOpinion.validate(1) && handleAudit2(1)"
         >通过
       </el-button>
 
@@ -33,7 +29,7 @@
         type="danger"
         size="mini"
         v-click-once
-        @click="handleAudit2(0)"
+        @click="$refs.approvalOpinion.validate(0) && handleAudit2(0)"
         >驳回
       </el-button>
     </div>

+ 5 - 9
src/views/bpm/handleTask/components/outsourcedWarehousingNoProcurement/submit.vue

@@ -27,7 +27,7 @@
         </el-select>
       </el-form-item>
       <el-form-item
-        label="审批建议"
+        label="审批意见"
 
         style="margin-bottom: 20px"
         :rules="{
@@ -36,11 +36,7 @@
           trigger: 'change'
         }"
       >
-        <el-input
-          type="textarea"
-          v-model="form.reason"
-          placeholder="请输入审批建议"
-        />
+        <ApprovalOpinion ref="approvalOpinion" v-model="form.reason" />
       </el-form-item>
     </el-form>
     <div style="margin-left: 10%; margin-bottom: 20px; font-size: 14px">
@@ -49,7 +45,7 @@
         type="success"
         size="mini"
         v-click-once
-        @click="handleAudit(1)"
+        @click="$refs.approvalOpinion.validate(1) && handleAudit(1)"
         v-if="
           !['storeManagerApprove'].includes(taskDefinitionKey) ||
           (['storeManagerApprove'].includes(taskDefinitionKey) &&
@@ -63,7 +59,7 @@
         size="mini"
         :loading="isSaveLoading"
         v-click-once
-        @click="storeManagerApprove"
+        @click="$refs.approvalOpinion.validate(1) && storeManagerApprove()"
         v-if="
           ['storeManagerApprove'].includes(taskDefinitionKey) &&
           activeComp == 'inoutBound' &&
@@ -76,7 +72,7 @@
         type="danger"
         size="mini"
         v-click-once
-        @click="handleAudit(0)"
+        @click="$refs.approvalOpinion.validate(0) && handleAudit(0)"
         v-if="
           !['starter', 'qualityInspectionFeedback', 'QCLeaderApprove'].includes(
             taskDefinitionKey

+ 4 - 8
src/views/bpm/handleTask/components/positionApplication/submit.vue

@@ -2,7 +2,7 @@
   <el-col :span="16" :offset="6">
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
-        label="审批建议"
+        label="审批意见"
         style="margin-bottom: 20px"
         :rules="{
           required: true,
@@ -10,11 +10,7 @@
           trigger: 'change'
         }"
       >
-        <el-input
-          type="textarea"
-          v-model="form.reason"
-          placeholder="请输入审批建议"
-        />
+        <ApprovalOpinion ref="approvalOpinion" v-model="form.reason" />
       </el-form-item>
     </el-form>
     <div style="margin-left: 10%; margin-bottom: 20px; font-size: 14px">
@@ -23,7 +19,7 @@
         type="success"
         size="mini"
         v-click-once
-        @click="handleAudit(1)"
+        @click="$refs.approvalOpinion.validate(1) && handleAudit(1)"
         >通过
       </el-button>
 
@@ -32,7 +28,7 @@
         type="danger"
         size="mini"
         v-click-once
-        @click="handleAudit(0)"
+        @click="$refs.approvalOpinion.validate(0) && handleAudit(0)"
         >驳回
       </el-button>
       <el-dropdown

+ 4 - 8
src/views/bpm/handleTask/components/positionTransfer/submit.vue

@@ -2,7 +2,7 @@
   <el-col :span="16" :offset="6">
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
-        label="审批建议"
+        label="审批意见"
         style="margin-bottom: 20px"
         :rules="{
           required: true,
@@ -10,11 +10,7 @@
           trigger: 'change'
         }"
       >
-        <el-input
-          type="textarea"
-          v-model="form.reason"
-          placeholder="请输入审批建议"
-        />
+        <ApprovalOpinion ref="approvalOpinion" v-model="form.reason" />
       </el-form-item>
     </el-form>
     <div style="margin-left: 10%; margin-bottom: 20px; font-size: 14px">
@@ -23,7 +19,7 @@
         type="success"
         size="mini"
         v-click-once
-        @click="handleAudit(1)"
+        @click="$refs.approvalOpinion.validate(1) && handleAudit(1)"
         >通过
       </el-button>
 
@@ -32,7 +28,7 @@
         type="danger"
         size="mini"
         v-click-once
-        @click="handleAudit(0)"
+        @click="$refs.approvalOpinion.validate(0) && handleAudit(0)"
         >驳回
       </el-button>
       <el-dropdown

+ 4 - 8
src/views/bpm/handleTask/components/prepayment/submit.vue

@@ -2,7 +2,7 @@
   <el-col :span="16" :offset="6">
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
-        label="审批建议"
+        label="审批意见"
         style="margin-bottom: 20px"
         :rules="{
           required: true,
@@ -10,11 +10,7 @@
           trigger: 'change'
         }"
       >
-        <el-input
-          type="textarea"
-          v-model="form.reason"
-          placeholder="请输入审批建议"
-        />
+        <ApprovalOpinion ref="approvalOpinion" v-model="form.reason" />
       </el-form-item>
     </el-form>
     <div style="margin-left: 10%; margin-bottom: 20px; font-size: 14px">
@@ -23,7 +19,7 @@
         type="success"
         size="mini"
         v-click-once
-        @click="handleAudit(1)"
+        @click="$refs.approvalOpinion.validate(1) && handleAudit(1)"
         >通过
       </el-button>
 
@@ -32,7 +28,7 @@
         type="danger"
         size="mini"
         v-click-once
-        @click="rejectTask(0)"
+        @click="$refs.approvalOpinion.validate(0) && rejectTask(0)"
         >驳回
       </el-button>
     </div>

+ 4 - 8
src/views/bpm/handleTask/components/producePlan/submit.vue

@@ -27,7 +27,7 @@
         </el-select>
       </el-form-item> -->
       <el-form-item
-        label="审批建议"
+        label="审批意见"
         style="margin-bottom: 20px"
         :rules="{
           required: true,
@@ -35,11 +35,7 @@
           trigger: 'change'
         }"
       >
-        <el-input
-          type="textarea"
-          v-model="form.reason"
-          placeholder="请输入审批建议"
-        />
+        <ApprovalOpinion ref="approvalOpinion" v-model="form.reason" />
       </el-form-item>
     </el-form>
     <div style="margin-left: 10%; margin-bottom: 20px; font-size: 14px">
@@ -48,7 +44,7 @@
         type="success"
         size="mini"
         v-click-once
-        @click="handleAudit(1)"
+        @click="$refs.approvalOpinion.validate(1) && handleAudit(1)"
         >通过
       </el-button>
       <!-- <el-button
@@ -64,7 +60,7 @@
         type="danger"
         size="mini"
         v-click-once
-        @click="handleAudit(0)"
+        @click="$refs.approvalOpinion.validate(0) && handleAudit(0)"
         v-if="!['starter'].includes(taskDefinitionKey)"
         >驳回
       </el-button>

+ 4 - 8
src/views/bpm/handleTask/components/productionWarehousing/submit.vue

@@ -2,7 +2,7 @@
   <el-col :span="16" :offset="6">
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
-        label="审批建议"
+        label="审批意见"
         style="margin-bottom: 20px"
         :rules="{
           required: true,
@@ -10,11 +10,7 @@
           trigger: 'change'
         }"
       >
-        <el-input
-          type="textarea"
-          v-model="form.reason"
-          placeholder="请输入审批建议"
-        />
+        <ApprovalOpinion ref="approvalOpinion" v-model="form.reason" />
       </el-form-item>
     </el-form>
     <div style="margin-left: 10%; margin-bottom: 20px; font-size: 14px">
@@ -23,7 +19,7 @@
         type="success"
         size="mini"
         v-click-once
-        @click="storeManagerApprove"
+        @click="$refs.approvalOpinion.validate(1) && storeManagerApprove()"
         >申请入库
       </el-button>
       <el-button
@@ -31,7 +27,7 @@
         type="danger"
         size="mini"
         v-click-once
-        @click="handleAudit(0)"
+        @click="$refs.approvalOpinion.validate(0) && handleAudit(0)"
         >驳回
       </el-button>
     </div>

+ 4 - 8
src/views/bpm/handleTask/components/project-manage/plan-manage/submit.vue

@@ -2,7 +2,7 @@
   <el-col :span="16" :offset="6">
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
-        label="审批建议"
+        label="审批意见"
         style="margin-bottom: 20px"
         :rules="{
           required: true,
@@ -10,11 +10,7 @@
           trigger: 'change'
         }"
       >
-        <el-input
-          type="textarea"
-          v-model="form.reason"
-          placeholder="请输入审批建议"
-        />
+        <ApprovalOpinion ref="approvalOpinion" v-model="form.reason" />
       </el-form-item>
     </el-form>
     <div style="margin-left: 10%; margin-bottom: 20px; font-size: 14px">
@@ -24,7 +20,7 @@
         type="success"
         size="mini"
         v-click-once
-        @click="handleAudit(1)"
+        @click="$refs.approvalOpinion.validate(1) && handleAudit(1)"
         >通过
       </el-button>
 
@@ -33,7 +29,7 @@
         type="danger"
         size="mini"
         v-click-once
-        @click="handleAudit(0)"
+        @click="$refs.approvalOpinion.validate(0) && handleAudit(0)"
         v-if="!['starter'].includes(taskDefinitionKey)"
         >驳回
       </el-button>

+ 3 - 7
src/views/bpm/handleTask/components/project-manage/project-initiation/submit.vue

@@ -2,7 +2,7 @@
   <el-col :span="16" :offset="6">
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
-        label="审批建议"
+        label="审批意见"
         style="margin-bottom: 20px"
         :rules="{
           required: true,
@@ -10,11 +10,7 @@
           trigger: 'change'
         }"
       >
-        <el-input
-          type="textarea"
-          v-model="form.reason"
-          placeholder="请输入审批建议"
-        />
+        <ApprovalOpinion ref="approvalOpinion" v-model="form.reason" />
       </el-form-item>
     </el-form>
     <div style="margin-left: 10%; margin-bottom: 20px; font-size: 14px">
@@ -33,7 +29,7 @@
         type="danger"
         size="mini"
         v-click-once
-        @click="handleAudit(0, $event)"
+        @click="$refs.approvalOpinion.validate(0) && handleAudit(0, $event)"
         v-if="!['starter'].includes(taskDefinitionKey)"
         >驳回
       </el-button>

+ 4 - 8
src/views/bpm/handleTask/components/project-manage/task-manage/submit.vue

@@ -2,7 +2,7 @@
   <el-col :span="16" :offset="6">
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
-        label="审批建议"
+        label="审批意见"
 
         style="margin-bottom: 20px"
         :rules="{
@@ -11,11 +11,7 @@
           trigger: 'change'
         }"
       >
-        <el-input
-          type="textarea"
-          v-model="form.reason"
-          placeholder="请输入审批建议"
-        />
+        <ApprovalOpinion ref="approvalOpinion" v-model="form.reason" />
       </el-form-item>
     </el-form>
     <div style="margin-left: 10%; margin-bottom: 20px; font-size: 14px">
@@ -24,7 +20,7 @@
         type="success"
         size="mini"
         v-click-once
-        @click="handleAudit(1)"
+        @click="$refs.approvalOpinion.validate(1) && handleAudit(1)"
       >通过
       </el-button>
 
@@ -33,7 +29,7 @@
         type="danger"
         size="mini"
         v-click-once
-        @click="handleAudit(0)"
+        @click="$refs.approvalOpinion.validate(0) && handleAudit(0)"
         v-if="!['starter'].includes(taskDefinitionKey)"
       >驳回
       </el-button>

+ 4 - 8
src/views/bpm/handleTask/components/project-manage/team-manage/submit.vue

@@ -2,7 +2,7 @@
   <el-col :span="16" :offset="6">
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
-        label="审批建议"
+        label="审批意见"
         style="margin-bottom: 20px"
         :rules="{
           required: true,
@@ -10,11 +10,7 @@
           trigger: 'change'
         }"
       >
-        <el-input
-          type="textarea"
-          v-model="form.reason"
-          placeholder="请输入审批建议"
-        />
+        <ApprovalOpinion ref="approvalOpinion" v-model="form.reason" />
       </el-form-item>
     </el-form>
     <div style="margin-left: 10%; margin-bottom: 20px; font-size: 14px">
@@ -23,7 +19,7 @@
         type="success"
         size="mini"
         v-click-once
-        @click="handleAudit(1)"
+        @click="$refs.approvalOpinion.validate(1) && handleAudit(1)"
       >通过
       </el-button>
 
@@ -32,7 +28,7 @@
         type="danger"
         size="mini"
         v-click-once
-        @click="handleAudit(0)"
+        @click="$refs.approvalOpinion.validate(0) && handleAudit(0)"
         v-if="!['starter'].includes(taskDefinitionKey)"
       >驳回
       </el-button>

+ 4 - 8
src/views/bpm/handleTask/components/purchaseNeedManage/submit.vue

@@ -2,7 +2,7 @@
   <el-col :span="16" :offset="6">
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
-        label="审批建议"
+        label="审批意见"
 
         style="margin-bottom: 20px"
         :rules="{
@@ -11,11 +11,7 @@
           trigger: 'change'
         }"
       >
-        <el-input
-          type="textarea"
-          v-model="form.reason"
-          placeholder="请输入审批建议"
-        />
+        <ApprovalOpinion ref="approvalOpinion" v-model="form.reason" />
       </el-form-item>
     </el-form>
     <div style="margin-left: 10%; margin-bottom: 20px; font-size: 14px">
@@ -24,7 +20,7 @@
         type="success"
         size="mini"
         v-click-once
-        @click="handleAudit(1)"
+        @click="$refs.approvalOpinion.validate(1) && handleAudit(1)"
         >通过
       </el-button>
 
@@ -33,7 +29,7 @@
         type="danger"
         size="mini"
         v-click-once
-        @click="handleAudit(0)"
+        @click="$refs.approvalOpinion.validate(0) && handleAudit(0)"
         v-if="!['starter'].includes(taskDefinitionKey)"
         >驳回
       </el-button>

+ 4 - 8
src/views/bpm/handleTask/components/purchaseOrder/accountstatement/submit.vue

@@ -2,7 +2,7 @@
   <el-col :span="16" :offset="6">
     <el-form label-width="100px"  :model="form">
       <el-form-item
-        label="审批建议"
+        label="审批意见"
         style="margin-bottom: 20px"
         :rules="{
           required: false,
@@ -10,11 +10,7 @@
           trigger: 'change'
         }"
       >
-        <el-input
-          type="textarea"
-          v-model="form.reason"
-          placeholder="请输入审批建议"
-        />
+        <ApprovalOpinion ref="approvalOpinion" v-model="form.reason" />
       </el-form-item>
     </el-form>
     <div style="margin-left: 10%; margin-bottom: 20px; font-size: 14px">
@@ -23,7 +19,7 @@
         type="success"
         size="mini"
         v-click-once
-        @click="handleAudit(1)"
+        @click="$refs.approvalOpinion.validate(1) && handleAudit(1)"
       >通过
       </el-button>
       <el-button
@@ -31,7 +27,7 @@
         type="danger"
         size="mini"
         v-click-once
-        @click="rejectTask(0)">驳回
+        @click="$refs.approvalOpinion.validate(0) && rejectTask(0)">驳回
       </el-button>
 
       <el-dropdown @command="(command) => handleCommand(command)" style="margin-left: 30px;">

+ 7 - 0
src/views/bpm/handleTask/components/purchaseOrder/accountstatement/supplierList.vue

@@ -83,6 +83,13 @@ export default {
               showOverflowTooltip: true,
               minWidth: 200
             },
+            {
+              prop: 'version',
+              label: '版本号',
+              align: 'center',
+              width: 80,
+              formatter: (_row, _column, cellValue) => `V${cellValue || 1}.0`
+            },
             {
               prop: 'serialNo',
               label: '供应商代号',

+ 5 - 9
src/views/bpm/handleTask/components/purchaseOrder/invoice/submit.vue

@@ -26,12 +26,8 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="审批建议"  style="margin-bottom: 20px">
-        <el-input
-          type="textarea"
-          v-model="form.reason"
-          placeholder="请输入审批建议"
-        />
+      <el-form-item label="审批意见"  style="margin-bottom: 20px">
+        <ApprovalOpinion ref="approvalOpinion" v-model="form.reason" />
       </el-form-item>
     </el-form>
     <div style="margin-left: 10%; margin-bottom: 20px; font-size: 14px">
@@ -40,7 +36,7 @@
         type="success"
         size="mini"
         v-click-once
-        @click="handleAudit(1)"
+        @click="$refs.approvalOpinion.validate(1) && handleAudit(1)"
         v-if="
           !['storeManagerApprove'].includes(taskDefinitionKey) ||
           (['storeManagerApprove'].includes(taskDefinitionKey) &&
@@ -54,7 +50,7 @@
         size="mini"
         v-click-once
         :loading="isSaveLoading"
-        @click="storeManagerApprove"
+        @click="$refs.approvalOpinion.validate(1) && storeManagerApprove()"
         v-if="
           ['storeManagerApprove'].includes(taskDefinitionKey) &&
           activeComp == 'inoutBound' &&
@@ -67,7 +63,7 @@
         type="danger"
         size="mini"
         v-click-once
-        @click="handleAudit(0)"
+        @click="$refs.approvalOpinion.validate(0) && handleAudit(0)"
         v-if="
           !['starter', 'qualityInspectionFeedback'].includes(
             taskDefinitionKey

+ 4 - 8
src/views/bpm/handleTask/components/purchaseOrder/invoiceConfirm/submit.vue

@@ -2,7 +2,7 @@
   <el-col :span="16" :offset="6">
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
-        label="审批建议"
+        label="审批意见"
         style="margin-bottom: 20px"
         :rules="{
           required: true,
@@ -10,11 +10,7 @@
           trigger: 'change'
         }"
       >
-        <el-input
-          type="textarea"
-          v-model="form.reason"
-          placeholder="请输入审批建议"
-        />
+        <ApprovalOpinion ref="approvalOpinion" v-model="form.reason" />
       </el-form-item>
     </el-form>
     <div style="margin-left: 10%; margin-bottom: 20px; font-size: 14px">
@@ -23,7 +19,7 @@
         type="success"
         size="mini"
         v-click-once
-        @click="_approveTaskWithVariables(1)"
+        @click="$refs.approvalOpinion.validate(1) && _approveTaskWithVariables(1)"
         >通过
       </el-button>
       <el-button
@@ -31,7 +27,7 @@
         type="danger"
         size="mini"
         v-click-once
-        @click="_approveTaskWithVariables(0)"
+        @click="$refs.approvalOpinion.validate(0) && _approveTaskWithVariables(0)"
         >驳回
       </el-button>
      

+ 4 - 8
src/views/bpm/handleTask/components/purchaseOrder/outSourceSend/submit.vue

@@ -2,7 +2,7 @@
   <el-col :span="16" :offset="6">
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
-        label="审批建议"
+        label="审批意见"
         style="margin-bottom: 20px"
         :rules="{
           required: true,
@@ -10,11 +10,7 @@
           trigger: 'change'
         }"
       >
-        <el-input
-          type="textarea"
-          v-model="form.reason"
-          placeholder="请输入审批建议"
-        />
+        <ApprovalOpinion ref="approvalOpinion" v-model="form.reason" />
       </el-form-item>
     </el-form>
     <div style="margin-left: 10%; margin-bottom: 20px; font-size: 14px">
@@ -24,7 +20,7 @@
         size="mini"
         :loading="isLoading"
         v-click-once
-        @click="handleAudit(1)"
+        @click="$refs.approvalOpinion.validate(1) && handleAudit(1)"
         >通过
       </el-button>
       <el-button
@@ -32,7 +28,7 @@
         type="danger"
         size="mini"
         v-click-once
-        @click="rejectTask(0)"
+        @click="$refs.approvalOpinion.validate(0) && rejectTask(0)"
         >驳回
       </el-button>
 

+ 4 - 8
src/views/bpm/handleTask/components/purchaseOrder/outSourceSendCk/submit.vue

@@ -2,7 +2,7 @@
   <el-col :span="16" :offset="6">
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
-        label="审批建议"
+        label="审批意见"
  
         style="margin-bottom: 20px"
         :rules="{
@@ -11,11 +11,7 @@
           trigger: 'change'
         }"
       >
-        <el-input
-          type="textarea"
-          v-model="form.reason"
-          placeholder="请输入审批建议"
-        />
+        <ApprovalOpinion ref="approvalOpinion" v-model="form.reason" />
       </el-form-item>
     </el-form>
     <div style="margin-left: 10%; margin-bottom: 20px; font-size: 14px">
@@ -25,7 +21,7 @@
         size="mini"
         :loading="isLoading"
         v-click-once
-        @click="handleAudit(1)"
+        @click="$refs.approvalOpinion.validate(1) && handleAudit(1)"
         >通过
       </el-button>
       <el-button
@@ -33,7 +29,7 @@
         type="danger"
         size="mini"
         v-click-once
-        @click="handleAudit(0)"
+        @click="$refs.approvalOpinion.validate(0) && handleAudit(0)"
         >驳回
       </el-button>
 

+ 5 - 9
src/views/bpm/handleTask/components/purchaseOrder/outsourceSendReturnGoods/submit.vue

@@ -2,7 +2,7 @@
   <el-col :span="16" :offset="6">
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
-        label="审批建议"
+        label="审批意见"
 
         style="margin-bottom: 20px"
         :rules="{
@@ -11,11 +11,7 @@
           trigger: 'change'
         }"
       >
-        <el-input
-          type="textarea"
-          v-model="form.reason"
-          placeholder="请输入审批建议"
-        />
+        <ApprovalOpinion ref="approvalOpinion" v-model="form.reason" />
       </el-form-item>
     </el-form>
     <div style="margin-left: 10%; margin-bottom: 20px; font-size: 14px">
@@ -25,7 +21,7 @@
         size="mini"
         v-click-once
         v-if="taskDefinitionKey != 'storeman'"
-        @click="handleAudit(1)"
+        @click="$refs.approvalOpinion.validate(1) && handleAudit(1)"
         >通过
       </el-button>
       <el-button
@@ -34,7 +30,7 @@
         size="mini"
         v-click-once
         :loading="isSaveLoading"
-        @click="storemanApprove"
+        @click="$refs.approvalOpinion.validate(1) && storemanApprove()"
         v-if="taskDefinitionKey == 'storeman' && activeComp == 'inoutBound'"
         >申请入库
       </el-button>
@@ -43,7 +39,7 @@
         type="danger"
         size="mini"
         v-click-once
-        @click="handleAudit(0)"
+        @click="$refs.approvalOpinion.validate(0) && handleAudit(0)"
         v-if="!['starter'].includes(taskDefinitionKey)"
         >驳回
       </el-button>

+ 5 - 9
src/views/bpm/handleTask/components/purchaseOrder/returnGoods/submit.vue

@@ -1,12 +1,8 @@
 <template>
   <el-col :span="16" :offset="6">
     <el-form label-width="100px" ref="formRef" :model="form" :rules="rules">
-      <el-form-item label="审批建议" prop="reason" style="margin-bottom: 20px">
-        <el-input
-          type="textarea"
-          v-model="form.reason"
-          placeholder="请输入审批建议"
-        />
+      <el-form-item label="审批意见" prop="reason" style="margin-bottom: 20px">
+        <ApprovalOpinion ref="approvalOpinion" v-model="form.reason" />
       </el-form-item>
     </el-form>
     <el-alert v-if="outInQueryError" :title="outInQueryError" type="error" :closable="false" />
@@ -22,7 +18,7 @@
             !outInQueryLoading && !outInQueryError &&
             outInData.verifyStatus == 2)
         "
-        @click="handleAudit(1)"
+        @click="$refs.approvalOpinion.validate(1) && handleAudit(1)"
         >通过
       </el-button>
       <el-button
@@ -31,7 +27,7 @@
         size="mini"
         :loading="isSaveLoading"
         v-click-once
-        @click="storemanApprove"
+        @click="$refs.approvalOpinion.validate(1) && storemanApprove()"
         v-if="
           ['storemanApprove'].includes(taskDefinitionKey) &&
           !outInQueryLoading && !outInQueryError &&
@@ -44,7 +40,7 @@
         type="danger"
         size="mini"
         v-click-once
-        @click="handleAudit(0)"
+        @click="$refs.approvalOpinion.validate(0) && handleAudit(0)"
 
         >驳回
       </el-button>

+ 4 - 8
src/views/bpm/handleTask/components/purchaseOrder/submit.vue

@@ -2,7 +2,7 @@
   <el-col :span="16" :offset="6">
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
-        label="审批建议"
+        label="审批意见"
 
         style="margin-bottom: 20px"
         :rules="{
@@ -11,11 +11,7 @@
           trigger: 'change'
         }"
       >
-        <el-input
-          type="textarea"
-          v-model="form.reason"
-          placeholder="请输入审批建议"
-        />
+        <ApprovalOpinion ref="approvalOpinion" v-model="form.reason" />
       </el-form-item>
     </el-form>
     <div style="margin-left: 10%; margin-bottom: 20px; font-size: 14px">
@@ -24,7 +20,7 @@
         type="success"
         size="mini"
         v-click-once
-        @click="handleAudit(1)"
+        @click="$refs.approvalOpinion.validate(1) && handleAudit(1)"
         >通过
       </el-button>
       <el-button
@@ -32,7 +28,7 @@
         type="danger"
         size="mini"
         v-click-once
-        @click="handleAudit(0)"
+        @click="$refs.approvalOpinion.validate(0) && handleAudit(0)"
         v-if="!['starter', 'starterFillApprove'].includes(taskDefinitionKey)"
         >驳回
       </el-button>

+ 5 - 9
src/views/bpm/handleTask/components/purchasePlanManage/submit.vue

@@ -41,7 +41,7 @@
         </el-select>
       </el-form-item>
       <el-form-item
-        label="审批建议"
+        label="审批意见"
         style="margin-bottom: 20px"
         :rules="{
           required: true,
@@ -49,11 +49,7 @@
           trigger: 'change'
         }"
       >
-        <el-input
-          type="textarea"
-          v-model="form.reason"
-          placeholder="请输入审批建议"
-        />
+        <ApprovalOpinion ref="approvalOpinion" v-model="form.reason" />
       </el-form-item>
     </el-form>
     <div style="margin-left: 10%; margin-bottom: 20px; font-size: 14px">
@@ -62,7 +58,7 @@
         type="success"
         size="mini"
         v-click-once
-        @click="handleAudit(1)"
+        @click="$refs.approvalOpinion.validate(1) && handleAudit(1)"
         v-if="!['storeManagerApprove'].includes(taskDefinitionKey)"
         >通过
       </el-button>
@@ -72,7 +68,7 @@
         size="mini"
         v-click-once
         :loading="isSaveLoading"
-        @click="storeManagerApprove"
+        @click="$refs.approvalOpinion.validate(1) && storeManagerApprove()"
         v-if="['storeManagerApprove'].includes(taskDefinitionKey)"
         >申请入库
       </el-button>
@@ -82,7 +78,7 @@
         type="danger"
         size="mini"
         v-click-once
-        @click="rejectTask(0)"
+        @click="$refs.approvalOpinion.validate(0) && rejectTask(0)"
         >驳回
       </el-button>
 

+ 4 - 8
src/views/bpm/handleTask/components/qualityReportApproval/submit.vue

@@ -1,12 +1,8 @@
 <template>
   <el-col :span="16" :offset="6">
     <el-form label-width="100px" ref="formRef" :model="form">
-      <el-form-item label="审批建议" style="margin-bottom: 20px">
-        <el-input
-          type="textarea"
-          v-model="form.reason"
-          placeholder="请输入审批建议"
-        />
+      <el-form-item label="审批意见" style="margin-bottom: 20px">
+        <ApprovalOpinion ref="approvalOpinion" v-model="form.reason" />
       </el-form-item>
     </el-form>
     <div style="margin-left: 10%; margin-bottom: 20px; font-size: 14px">
@@ -15,7 +11,7 @@
         type="success"
         size="mini"
         v-click-once
-        @click="handleAudit(1)"
+        @click="$refs.approvalOpinion.validate(1) && handleAudit(1)"
         v-if="!['storeManagerApprove'].includes(taskDefinitionKey)"
         >通过
       </el-button>
@@ -25,7 +21,7 @@
         type="danger"
         size="mini"
         v-click-once
-        @click="rejectTask(0)"
+        @click="$refs.approvalOpinion.validate(0) && rejectTask(0)"
         >驳回
       </el-button>
 

+ 7 - 0
src/views/bpm/handleTask/components/quotation/parentList.vue

@@ -105,6 +105,13 @@
             showOverflowTooltip: true,
             minWidth: 200
           },
+          {
+            prop: 'version',
+            label: '版本号',
+            align: 'center',
+            width: 80,
+            formatter: (_row, _column, cellValue) => `V${cellValue || 1}.0`
+          },
           {
             prop: 'serialNo',
             label: '客户代号',

+ 4 - 8
src/views/bpm/handleTask/components/quotation/submit.vue

@@ -27,7 +27,7 @@
         </el-select>
       </el-form-item> -->
       <el-form-item
-        label="审批建议"
+        label="审批意见"
 
         style="margin-bottom: 20px"
         :rules="{
@@ -36,11 +36,7 @@
           trigger: 'change'
         }"
       >
-        <el-input
-          type="textarea"
-          v-model="form.reason"
-          placeholder="请输入审批建议"
-        />
+        <ApprovalOpinion ref="approvalOpinion" v-model="form.reason" />
       </el-form-item>
     </el-form>
     <div style="margin-left: 10%; margin-bottom: 20px; font-size: 14px">
@@ -49,7 +45,7 @@
         type="success"
         size="mini"
         v-click-once
-        @click="handleAudit(1)"
+        @click="$refs.approvalOpinion.validate(1) && handleAudit(1)"
         >通过
       </el-button>
       <!-- <el-button
@@ -65,7 +61,7 @@
         type="danger"
         size="mini"
         v-click-once
-        @click="handleAudit(0)"
+        @click="$refs.approvalOpinion.validate(0) && handleAudit(0)"
         v-if="
           !['starter'].includes(
             taskDefinitionKey

+ 4 - 8
src/views/bpm/handleTask/components/regularizationHandling/submit.vue

@@ -27,7 +27,7 @@
         </el-select>
       </el-form-item> -->
       <el-form-item
-        label="审批建议"
+        label="审批意见"
 
         style="margin-bottom: 20px"
         :rules="{
@@ -36,11 +36,7 @@
           trigger: 'change'
         }"
       >
-        <el-input
-          type="textarea"
-          v-model="form.reason"
-          placeholder="请输入审批建议"
-        />
+        <ApprovalOpinion ref="approvalOpinion" v-model="form.reason" />
       </el-form-item>
     </el-form>
     <div style="margin-left: 10%; margin-bottom: 20px; font-size: 14px">
@@ -49,7 +45,7 @@
         type="success"
         size="mini"
         v-click-once
-        @click="handleAudit(1)"
+        @click="$refs.approvalOpinion.validate(1) && handleAudit(1)"
         >通过
       </el-button>
       <!-- <el-button
@@ -65,7 +61,7 @@
         type="danger"
         size="mini"
         v-click-once
-        @click="handleAudit(0)"
+        @click="$refs.approvalOpinion.validate(0) && handleAudit(0)"
         v-if="
           !['starter'].includes(
             taskDefinitionKey

+ 4 - 8
src/views/bpm/handleTask/components/requirementOrderBlank/submit.vue

@@ -27,7 +27,7 @@
         </el-select>
       </el-form-item> -->
       <el-form-item
-        label="审批建议"
+        label="审批意见"
         style="margin-bottom: 20px"
         :rules="{
           required: true,
@@ -35,11 +35,7 @@
           trigger: 'change'
         }"
       >
-        <el-input
-          type="textarea"
-          v-model="form.reason"
-          placeholder="请输入审批建议"
-        />
+        <ApprovalOpinion ref="approvalOpinion" v-model="form.reason" />
       </el-form-item>
     </el-form>
     <div style="margin-left: 10%; margin-bottom: 20px; font-size: 14px">
@@ -47,7 +43,7 @@
         icon="el-icon-edit-outline"
         type="success"
         size="mini"
-        @click="handleAudit(1)"
+        @click="$refs.approvalOpinion.validate(1) && handleAudit(1)"
         v-click-once
         >通过
       </el-button>
@@ -57,7 +53,7 @@
         type="danger"
         size="mini"
         v-click-once
-        @click="rejectTask(0)"
+        @click="$refs.approvalOpinion.validate(0) && rejectTask(0)"
         >驳回
       </el-button>
 

+ 4 - 8
src/views/bpm/handleTask/components/requirementOrderBorrow/submit.vue

@@ -27,7 +27,7 @@
         </el-select>
       </el-form-item> -->
       <el-form-item
-        label="审批建议"
+        label="审批意见"
         style="margin-bottom: 20px"
         :rules="{
           required: true,
@@ -35,11 +35,7 @@
           trigger: 'change'
         }"
       >
-        <el-input
-          type="textarea"
-          v-model="form.reason"
-          placeholder="请输入审批建议"
-        />
+        <ApprovalOpinion ref="approvalOpinion" v-model="form.reason" />
       </el-form-item>
     </el-form>
     <div style="margin-left: 10%; margin-bottom: 20px; font-size: 14px">
@@ -47,7 +43,7 @@
         icon="el-icon-edit-outline"
         type="success"
         size="mini"
-        @click="handleAudit(1)"
+        @click="$refs.approvalOpinion.validate(1) && handleAudit(1)"
         v-click-once
         >通过
       </el-button>
@@ -57,7 +53,7 @@
         type="danger"
         size="mini"
         v-click-once
-        @click="rejectTask(0)"
+        @click="$refs.approvalOpinion.validate(0) && rejectTask(0)"
         >驳回
       </el-button>
 

+ 5 - 9
src/views/bpm/handleTask/components/requirementOrderPick/submit.vue

@@ -27,7 +27,7 @@
         </el-select>
       </el-form-item> -->
       <el-form-item
-        label="审批建议"
+        label="审批意见"
         style="margin-bottom: 20px"
         :rules="{
           required: true,
@@ -35,11 +35,7 @@
           trigger: 'change'
         }"
       >
-        <el-input
-          type="textarea"
-          v-model="form.reason"
-          placeholder="请输入审批建议"
-        />
+        <ApprovalOpinion ref="approvalOpinion" v-model="form.reason" />
       </el-form-item>
     </el-form>
     <div style="margin-left: 10%; margin-bottom: 20px; font-size: 14px">
@@ -47,7 +43,7 @@
         icon="el-icon-edit-outline"
         type="success"
         size="mini"
-        @click="handleAudit(1)"
+        @click="$refs.approvalOpinion.validate(1) && handleAudit(1)"
         v-click-once
         v-if="taskDefinitionKey != 'apsStoreman'"
         >通过
@@ -59,7 +55,7 @@
         size="mini"
         :loading="isLoading"
         v-click-once
-        @click="handleAudit(1)"
+        @click="$refs.approvalOpinion.validate(1) && handleAudit(1)"
         v-if="taskDefinitionKey == 'apsStoreman'"
         >申请出库
       </el-button>
@@ -69,7 +65,7 @@
         type="danger"
         size="mini"
         v-click-once
-        @click="rejectTask(0)"
+        @click="$refs.approvalOpinion.validate(0) && rejectTask(0)"
         >驳回
       </el-button>
 

+ 4 - 8
src/views/bpm/handleTask/components/requirementOrderReturn/submit.vue

@@ -27,7 +27,7 @@
         </el-select>
       </el-form-item> -->
       <el-form-item
-        label="审批建议"
+        label="审批意见"
         style="margin-bottom: 20px"
         :rules="{
           required: true,
@@ -35,11 +35,7 @@
           trigger: 'change'
         }"
       >
-        <el-input
-          type="textarea"
-          v-model="form.reason"
-          placeholder="请输入审批建议"
-        />
+        <ApprovalOpinion ref="approvalOpinion" v-model="form.reason" />
       </el-form-item>
     </el-form>
     <div style="margin-left: 10%; margin-bottom: 20px; font-size: 14px">
@@ -47,7 +43,7 @@
         icon="el-icon-edit-outline"
         type="success"
         size="mini"
-        @click="handleAudit(1)"
+        @click="$refs.approvalOpinion.validate(1) && handleAudit(1)"
         v-click-once
         >通过
       </el-button>
@@ -57,7 +53,7 @@
         type="danger"
         size="mini"
         v-click-once
-        @click="rejectTask(0)"
+        @click="$refs.approvalOpinion.validate(0) && rejectTask(0)"
         >驳回
       </el-button>
 

+ 4 - 8
src/views/bpm/handleTask/components/requirementPlanBlank/submit.vue

@@ -27,7 +27,7 @@
         </el-select>
       </el-form-item> -->
       <el-form-item
-        label="审批建议"
+        label="审批意见"
         style="margin-bottom: 20px"
         :rules="{
           required: true,
@@ -35,11 +35,7 @@
           trigger: 'change'
         }"
       >
-        <el-input
-          type="textarea"
-          v-model="form.reason"
-          placeholder="请输入审批建议"
-        />
+        <ApprovalOpinion ref="approvalOpinion" v-model="form.reason" />
       </el-form-item>
     </el-form>
     <div style="margin-left: 10%; margin-bottom: 20px; font-size: 14px">
@@ -47,7 +43,7 @@
         icon="el-icon-edit-outline"
         type="success"
         size="mini"
-        @click="handleAudit(1)"
+        @click="$refs.approvalOpinion.validate(1) && handleAudit(1)"
         v-click-once
         >通过
       </el-button>
@@ -57,7 +53,7 @@
         type="danger"
         size="mini"
         v-click-once
-        @click="rejectTask(0)"
+        @click="$refs.approvalOpinion.validate(0) && rejectTask(0)"
         >驳回
       </el-button>
 

+ 4 - 8
src/views/bpm/handleTask/components/requirementPlanBorrow/submit.vue

@@ -27,7 +27,7 @@
         </el-select>
       </el-form-item> -->
       <el-form-item
-        label="审批建议"
+        label="审批意见"
         style="margin-bottom: 20px"
         :rules="{
           required: true,
@@ -35,11 +35,7 @@
           trigger: 'change'
         }"
       >
-        <el-input
-          type="textarea"
-          v-model="form.reason"
-          placeholder="请输入审批建议"
-        />
+        <ApprovalOpinion ref="approvalOpinion" v-model="form.reason" />
       </el-form-item>
     </el-form>
     <div style="margin-left: 10%; margin-bottom: 20px; font-size: 14px">
@@ -47,7 +43,7 @@
         icon="el-icon-edit-outline"
         type="success"
         size="mini"
-        @click="handleAudit(1)"
+        @click="$refs.approvalOpinion.validate(1) && handleAudit(1)"
         v-click-once
         >通过
       </el-button>
@@ -57,7 +53,7 @@
         type="danger"
         size="mini"
         v-click-once
-        @click="rejectTask(0)"
+        @click="$refs.approvalOpinion.validate(0) && rejectTask(0)"
         >驳回
       </el-button>
 

+ 4 - 8
src/views/bpm/handleTask/components/requirementPlanPick/submit.vue

@@ -27,7 +27,7 @@
         </el-select>
       </el-form-item> -->
       <el-form-item
-        label="审批建议"
+        label="审批意见"
         style="margin-bottom: 20px"
         :rules="{
           required: true,
@@ -35,11 +35,7 @@
           trigger: 'change'
         }"
       >
-        <el-input
-          type="textarea"
-          v-model="form.reason"
-          placeholder="请输入审批建议"
-        />
+        <ApprovalOpinion ref="approvalOpinion" v-model="form.reason" />
       </el-form-item>
     </el-form>
     <div style="margin-left: 10%; margin-bottom: 20px; font-size: 14px">
@@ -47,7 +43,7 @@
         icon="el-icon-edit-outline"
         type="success"
         size="mini"
-        @click="handleAudit(1)"
+        @click="$refs.approvalOpinion.validate(1) && handleAudit(1)"
         v-click-once
         >通过
       </el-button>
@@ -57,7 +53,7 @@
         type="danger"
         size="mini"
         v-click-once
-        @click="rejectTask(0)"
+        @click="$refs.approvalOpinion.validate(0) && rejectTask(0)"
         >驳回
       </el-button>
 

+ 4 - 8
src/views/bpm/handleTask/components/requirementPlanReturn/submit.vue

@@ -27,7 +27,7 @@
         </el-select>
       </el-form-item> -->
       <el-form-item
-        label="审批建议"
+        label="审批意见"
         style="margin-bottom: 20px"
         :rules="{
           required: true,
@@ -35,11 +35,7 @@
           trigger: 'change'
         }"
       >
-        <el-input
-          type="textarea"
-          v-model="form.reason"
-          placeholder="请输入审批建议"
-        />
+        <ApprovalOpinion ref="approvalOpinion" v-model="form.reason" />
       </el-form-item>
     </el-form>
     <div style="margin-left: 10%; margin-bottom: 20px; font-size: 14px">
@@ -47,7 +43,7 @@
         icon="el-icon-edit-outline"
         type="success"
         size="mini"
-        @click="handleAudit(1)"
+        @click="$refs.approvalOpinion.validate(1) && handleAudit(1)"
         v-click-once
         >通过
       </el-button>
@@ -57,7 +53,7 @@
         type="danger"
         size="mini"
         v-click-once
-        @click="rejectTask(0)"
+        @click="$refs.approvalOpinion.validate(0) && rejectTask(0)"
         >驳回
       </el-button>
 

+ 4 - 8
src/views/bpm/handleTask/components/resignationApplication/submit.vue

@@ -27,7 +27,7 @@
         </el-select>
       </el-form-item> -->
       <el-form-item
-        label="审批建议"
+        label="审批意见"
         style="margin-bottom: 20px"
         :rules="{
           required: true,
@@ -35,11 +35,7 @@
           trigger: 'change'
         }"
       >
-        <el-input
-          type="textarea"
-          v-model="form.reason"
-          placeholder="请输入审批建议"
-        />
+        <ApprovalOpinion ref="approvalOpinion" v-model="form.reason" />
       </el-form-item>
     </el-form>
     <div style="margin-left: 10%; margin-bottom: 20px; font-size: 14px">
@@ -47,7 +43,7 @@
         icon="el-icon-edit-outline"
         type="success"
         size="mini"
-        @click="handleAudit(1)"
+        @click="$refs.approvalOpinion.validate(1) && handleAudit(1)"
         v-click-once
         >通过
       </el-button>
@@ -57,7 +53,7 @@
         type="danger"
         size="mini"
         v-click-once
-        @click="rejectTask(0)"
+        @click="$refs.approvalOpinion.validate(0) && rejectTask(0)"
         >驳回
       </el-button>
 

+ 4 - 8
src/views/bpm/handleTask/components/resignationHandoverOrder/submit.vue

@@ -2,7 +2,7 @@
   <el-col :span="16" :offset="6">
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
-        label="审批建议"
+        label="审批意见"
         style="margin-bottom: 20px"
         :rules="{
           required: true,
@@ -10,11 +10,7 @@
           trigger: 'change'
         }"
       >
-        <el-input
-          type="textarea"
-          v-model="form.reason"
-          placeholder="请输入审批建议"
-        />
+        <ApprovalOpinion ref="approvalOpinion" v-model="form.reason" />
       </el-form-item>
     </el-form>
 
@@ -25,7 +21,7 @@
         size="mini"
         :loading="isLoading"
         v-click-once
-        @click="handleAudit(1)"
+        @click="$refs.approvalOpinion.validate(1) && handleAudit(1)"
         >通过
       </el-button>
 
@@ -35,7 +31,7 @@
         size="mini"
         v-click-once
         :loading="isLoading"
-        @click="outApproveNotPass(0)"
+        @click="$refs.approvalOpinion.validate(0) && outApproveNotPass(0)"
         >驳回
       </el-button>
     </div>

+ 7 - 0
src/views/bpm/handleTask/components/saleOrder/accountstatement/customerListDialog.vue

@@ -83,6 +83,13 @@ export default {
           showOverflowTooltip: true,
           minWidth: 200
         },
+        {
+          prop: 'version',
+          label: '版本号',
+          align: 'center',
+          width: 80,
+          formatter: (_row, _column, cellValue) => `V${cellValue || 1}.0`
+        },
         {
           prop: 'serialNo',
           label: '客户代号',

+ 4 - 8
src/views/bpm/handleTask/components/saleOrder/accountstatement/submit.vue

@@ -2,7 +2,7 @@
   <el-col :span="16" :offset="6">
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
-        label="审批建议"
+        label="审批意见"
         style="margin-bottom: 20px"
         :rules="{
           required: false,
@@ -10,11 +10,7 @@
           trigger: 'change'
         }"
       >
-        <el-input
-          type="textarea"
-          v-model="form.reason"
-          placeholder="请输入审批建议"
-        />
+        <ApprovalOpinion ref="approvalOpinion" v-model="form.reason" />
       </el-form-item>
     </el-form>
     <div style="margin-left: 10%; margin-bottom: 20px; font-size: 14px">
@@ -23,7 +19,7 @@
         type="success"
         size="mini"
         :loading="saveLoading"
-        @click="handleAudit(1)"
+        @click="$refs.approvalOpinion.validate(1) && handleAudit(1)"
         v-click-once
       >通过
       </el-button>
@@ -33,7 +29,7 @@
         size="mini"
         v-click-once
         :loading="saveLoading"
-        @click="rejectTask(0)">驳回
+        @click="$refs.approvalOpinion.validate(0) && rejectTask(0)">驳回
       </el-button>
 
       <el-dropdown @command="(command) => handleCommand(command)" style="margin-left: 30px;">

+ 4 - 8
src/views/bpm/handleTask/components/saleOrder/customerReturnGoods/submit.vue

@@ -36,12 +36,8 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="审批建议" style="margin-bottom: 20px">
-        <el-input
-          type="textarea"
-          v-model="form.reason"
-          placeholder="请输入审批建议"
-        />
+      <el-form-item label="审批意见" style="margin-bottom: 20px">
+        <ApprovalOpinion ref="approvalOpinion" v-model="form.reason" />
       </el-form-item>
     </el-form>
     <div style="margin-left: 10%; margin-bottom: 20px; font-size: 14px">
@@ -51,7 +47,7 @@
         size="mini"
         :loading="isLoading"
         v-click-once
-        @click="handleAudit(1)"
+        @click="$refs.approvalOpinion.validate(1) && handleAudit(1)"
         >通过
       </el-button>
 
@@ -61,7 +57,7 @@
         size="mini"
         v-click-once
         v-if="taskDefinitionKey !== 'stater'"
-        @click="rejectTask(0)"
+        @click="$refs.approvalOpinion.validate(0) && rejectTask(0)"
         >驳回
       </el-button>
 

+ 5 - 9
src/views/bpm/handleTask/components/saleOrder/entrustedReceive/submit.vue

@@ -27,7 +27,7 @@
         </el-select>
       </el-form-item>
       <el-form-item
-        label="审批建议"
+        label="审批意见"
         style="margin-bottom: 20px"
         :rules="{
           required: true,
@@ -35,11 +35,7 @@
           trigger: 'change'
         }"
       >
-        <el-input
-          type="textarea"
-          v-model="form.reason"
-          placeholder="请输入审批建议"
-        />
+        <ApprovalOpinion ref="approvalOpinion" v-model="form.reason" />
       </el-form-item>
     </el-form>
     <div style="margin-left: 10%; margin-bottom: 20px; font-size: 14px">
@@ -50,7 +46,7 @@
         :loading="isSaveLoading"
         v-click-once
         v-if="taskDefinitionKey != 'storeManagerApprove'"
-        @click="handleAudit(1)"
+        @click="$refs.approvalOpinion.validate(1) && handleAudit(1)"
         >通过
       </el-button>
       <el-button
@@ -61,7 +57,7 @@
         :loading="isSaveLoading"
         v-if="
           taskDefinitionKey == 'storeManagerApprove'"
-        @click="handleAudit(1)"
+        @click="$refs.approvalOpinion.validate(1) && handleAudit(1)"
         >申请入库
       </el-button>
       <el-button
@@ -69,7 +65,7 @@
         type="danger"
         size="mini"
         v-click-once
-        @click="rejectTask(0)"
+        @click="$refs.approvalOpinion.validate(0) && rejectTask(0)"
         v-if="!['starter'].includes(taskDefinitionKey)"
         >驳回
       </el-button>

+ 5 - 9
src/views/bpm/handleTask/components/saleOrder/entrustedReceiveReturnGoods/submit.vue

@@ -2,7 +2,7 @@
   <el-col :span="16" :offset="6">
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
-        label="审批建议"
+        label="审批意见"
         style="margin-bottom: 20px"
         :rules="{
           required: true,
@@ -10,11 +10,7 @@
           trigger: 'change'
         }"
       >
-        <el-input
-          type="textarea"
-          v-model="form.reason"
-          placeholder="请输入审批建议"
-        />
+        <ApprovalOpinion ref="approvalOpinion" v-model="form.reason" />
       </el-form-item>
     </el-form>
     <div style="margin-left: 10%; margin-bottom: 20px; font-size: 14px">
@@ -23,7 +19,7 @@
         type="success"
         size="mini"
         v-click-once
-        @click="handleAudit(1)"
+        @click="$refs.approvalOpinion.validate(1) && handleAudit(1)"
         v-if="taskDefinitionKey != 'storeman'"
         >通过
       </el-button>
@@ -34,7 +30,7 @@
         size="mini"
         v-click-once
         :loading="isLoading"
-        @click="storemanApprove"
+        @click="$refs.approvalOpinion.validate(1) && storemanApprove()"
         v-if="['storeman'].includes(taskDefinitionKey)"
         >申请出库
       </el-button>
@@ -43,7 +39,7 @@
         type="danger"
         size="mini"
         v-click-once
-        @click="handleAudit(0)"
+        @click="$refs.approvalOpinion.validate(0) && handleAudit(0)"
         >驳回
       </el-button>
       <el-dropdown

Некоторые файлы не были показаны из-за большого количества измененных файлов