bug修改

src/views/page/orderManage-sup/purOrderDelivery/deliveryDetail.vue

@@ -590,7 +590,7 @@
           <tr class="hang">
             <th align="left" :colspan="6" >合计</th>
             <td :colspan="12" align="left">
-              {{ moneySum }}
+              {{ mcsSum }}
             </td>
             <!-- <td align="center"> -->
               <!-- {{ numSum }} -->
@@ -599,7 +599,7 @@
           <tr class="hang">
             <th :colspan="6" align="left">发货金额（人民币）大写：</th>
             <td :colspan="12">
-              {{ moneySum | toChineseAmount }}
+              {{ mcsSum | toChineseAmount }}
             </td>
           </tr>
           <tr height="50px">
@@ -748,6 +748,7 @@ export default {
       },
       udidialog:false,
       udiData:[],
+      mcsSum:0
     };
   },
   created() {
@@ -1307,6 +1308,7 @@ export default {
         });
         throw new Error("同一产品的批号不能重复");
       }
+
       this.$refs.tabledata.validate((valid) => {
         if (valid) {
           this.$confirm("确认出库", "提示", {
@@ -1314,6 +1316,12 @@ export default {
             cancelButtonText: "取消",
             type: "warning",
           }).then(() => {
+            this.mcsSum = 0;
+            this.tableData.forEach((item) => {
+              let rowSum = 0;
+              rowSum = item.purcPric*item.convrat*item.delvCnt;
+              this.mcsSum+=rowSum
+            })
             this.printVisible = true;
           });
         } else {
@@ -1357,12 +1365,15 @@ export default {
         submitMcsDelvOrd(data2)
           .then((res) => {
             this.printVisible = false;
+            this.$message.success("出库成功")
             this.$router.push({
                 name: "purOrderDelivery",
                 query:{spdId:this.$route.query.spdId,activeName:this.$route.query.activeName}
             });
           })
           .catch((err) => {
+            this.$message.error("出库失败")
+
             // this.confirmLoadLoad = false;
           });
       });

src/views/page/orderManage-sup/purOrderDelivery/purchaseDetails.vue

@@ -629,7 +629,9 @@ export default {
                   });
                   this.listForm.dyntNo = "";
                 })
-                .catch((err) => {});
+                .catch((err) => {
+                  this.$message.error("出库失败")
+                });
             });
           }
         } else {

src/views/page/procurement-settlement/invoiceManage/index.vue

@@ -36,7 +36,12 @@
             <el-table-column label="对账单号" prop="stmtNo">
             </el-table-column>
             <el-table-column label="客户名称" prop="branchName"  />
-            <el-table-column label="对账类型" prop="isFas" />
+            <el-table-column label="对账类型" prop="isFas" >
+              <template #default="{ row }">
+                <span v-if="row.isFas == '0'">非集采</span>
+                <span v-if="row.isFas == '1'">集采</span>
+              </template>
+            </el-table-column>
             <el-table-column label="对账金额" prop="amt"  />
             <el-table-column label="对账周期" prop="stmtPrd" />
             <el-table-column label="状态" prop="stas" fixed="right">

src/views/page/procurement-settlement/paymentStatus/consumptionDetails.vue

@@ -152,7 +152,6 @@ import { selectSetlStmtDetlD } from "@/api/procurement-settlement/index";
 export default {
   components: {
     ylStep,
-    ylPagination,
     ylUpload,
   },
   data() {

src/views/page/procurement-settlement/paymentStatus/index.vue

@@ -36,7 +36,12 @@
             <el-table-column label="对账单号" prop="stmtNo">
             </el-table-column>
             <el-table-column label="客户名称" prop="branchName"  />
-            <el-table-column label="对账类型" prop="isFas" />
+            <el-table-column label="对账类型" prop="isFas" >
+              <template #default="{ row }">
+                <span v-if="row.isFas == '0'">非集采</span>
+                <span v-if="row.isFas == '1'">集采</span>
+              </template>
+            </el-table-column>
             <el-table-column label="对账金额" prop="amt"  />
             <el-table-column label="对账周期" prop="stmtPrd" />
             <el-table-column label="状态" prop="stas" fixed="right">

src/views/page/procurement-settlement/reconciliation/index.vue

@@ -36,7 +36,12 @@
             <el-table-column label="对账单号" prop="stmtNo">
             </el-table-column>
             <el-table-column label="客户名称" prop="branchName"  />
-            <el-table-column label="对账类型" prop="isFas"  />
+            <el-table-column label="对账类型" prop="isFas"  >
+              <template #default="{ row }">
+                <span v-if="row.isFas == '0'">非集采</span>
+                <span v-if="row.isFas == '1'">集采</span>
+              </template>
+            </el-table-column>
             <el-table-column label="对账金额" prop="amt" />
             <el-table-column label="对账周期" prop="stmtPrd" />
             <el-table-column label="状态" prop="stas" width="80" fixed="right">