feat(发票管理): 添加已开票和未开票金额显示列

src/views/bpm/handleTask/components/financialManage/invoiceManage/components/addOrEditDialog.vue

@@ -154,7 +154,7 @@
               }
             ]"
           >
-            <fileMain v-model="form.files"></fileMain>
+            <fileMain v-model="form.files" @updateVal="getFiles"></fileMain>
           </el-form-item>
         </el-col>
       </el-row>
@@ -408,12 +408,24 @@
             label: this.form.type == 1 ? '计划收款金额' : '计划付款金额',
             align: 'center',
           },
+          {
+            width: 150,
+            prop: 'unInvoiceAmount',
+            label: '未开票金额',
+            align: 'center'
+          },
+          {
+            width: 150,
+            prop: 'invoicedAmount',
+            label: '已开票金额',
+            align: 'center'
+          },
           {
             width: 160,
             prop: 'invoiceAmount',
             label: '开票金额',
             align: 'center',
-            slot: 'invoiceAmount',
+            // slot: 'invoiceAmount',
             fixed: 'right'
           }
         ];
@@ -469,7 +481,7 @@
           accountingSubjectId: {
             required: true,
             message: '请选择',
-            trigger: 'change'
+            trigger: ['change', 'blur']
           },
           feeTypeId: { required: true, message: '请选择', trigger: 'change' },
           amount: { required: true, message: '请输入', trigger: 'blur' },
@@ -512,6 +524,12 @@
         if (!val) return (this.form.accountingSubjectName = '');
         let data = this.$refs.treeSelect?.$refs?.tree?.getCurrentNode() || {};
         this.form.accountingSubjectName = data.name;
+        this.$refs.form.validateField('accountingSubjectId');
+      },
+      getFiles(val) {
+        // this.form.files = val;
+        console.log(val, 'val');
+        this.$refs.form.validateField('files');
       },
       // 获取部门数据
       getDeptList() {

src/views/bpm/handleTask/components/financialManage/invoiceManage/components/detailDialog.vue

@@ -340,12 +340,24 @@
             label: this.form.type == 1 ? '计划收款金额' : '计划付款金额',
             align: 'center',
           },
+          {
+            width: 150,
+            prop: 'unInvoiceAmount',
+            label: '未开票金额',
+            align: 'center'
+          },
+          {
+            width: 150,
+            prop: 'invoicedAmount',
+            label: '已开票金额',
+            align: 'center'
+          },
           {
             width: 160,
             prop: 'invoiceAmount',
             label: '开票金额',
             align: 'center',
-            slot: 'invoiceAmount',
+            // slot: 'invoiceAmount',
             fixed: 'right'
           }
         ];
@@ -354,7 +366,7 @@
     data() {
       return {
         paymentTypeOp,
-        dialogType: '',
+        dialogType: 'view',
         form: {
           files: []
         }

src/views/bpm/handleTask/components/financialManage/invoiceManage/components/tableInfoNew.vue

@@ -68,7 +68,7 @@
                 }
               ]"
             > 
-              <span v-if="dialogType === 'view'">{{ scope.row.taxRate }}%</span>
+              <span v-if="dialogType === 'view'">{{ scope.row.taxRate }}</span>
               <el-input v-else v-model="scope.row.taxRate" type="number" @input="getNotaxSinglePrice(scope.row, idx, scope.$index)" style="width: 80%;"></el-input>%
             </el-form-item>
           </template>
@@ -196,6 +196,12 @@
             slot: 'invoiceAmount',
             align: 'center'
           },
+          {
+            minWidth: 150,
+            prop: 'invoicedAmount',
+            label: '已开票金额',
+            align: 'center'
+          },
           {
             minWidth: 150,
             prop: 'taxRate',

src/views/bpm/handleTask/components/purchasePlanManage/submit.vue

@@ -74,17 +74,6 @@
         v-if="['storeManagerApprove'].includes(taskDefinitionKey)"
         >申请入库
       </el-button>
-      <el-dropdown
-        @command="(command) => handleCommand(command)"
-        style="margin-left: 30px"
-      >
-        <span class="el-dropdown-link">
-          更多<i class="el-icon-arrow-down el-icon--right"></i>
-        </span>
-        <el-dropdown-menu slot="dropdown">
-          <el-dropdown-item command="cancel">作废</el-dropdown-item>
-        </el-dropdown-menu>
-      </el-dropdown>
 
       <el-button
         icon="el-icon-circle-close"
@@ -117,6 +106,18 @@
         @click="handleUpdateAssignee"
         >转办
       </el-button> -->
+
+      <el-dropdown
+        @command="(command) => handleCommand(command)"
+        style="margin-left: 30px"
+      >
+        <span class="el-dropdown-link">
+          更多<i class="el-icon-arrow-down el-icon--right"></i>
+        </span>
+        <el-dropdown-menu slot="dropdown">
+          <el-dropdown-item command="cancel">作废</el-dropdown-item>
+        </el-dropdown-menu>
+      </el-dropdown>
     </div>
   </el-col>
 </template>