Pārlūkot izejas kodu

【修改】退押审批、申请退押 合同金额

howie 2 gadi atpakaļ
vecāks
revīzija
5daa5fd759

+ 48 - 7
src/views/deposit_home/components/deposit-apply-surrender.vue

@@ -210,7 +210,11 @@
               show-overflow-tooltip
             >
               <template slot-scope="scope">
+                <template v-if="detailList.examineStatus !== 'WAIT'">
+                  {{ scope.row.contractQty }}
+                </template>
                 <el-input
+                  v-else
                   class="inpt"
                   v-model="scope.row.contractQty"
                   size="mini"
@@ -226,9 +230,11 @@
               show-overflow-tooltip
             >
               <template slot-scope="scope">
-
+                <template v-if="detailList.examineStatus !== 'WAIT'">
+                  {{ scope.row.contractPrice }}
+                </template>
                 <el-input
-
+                  v-else
                   class="inpt"
                   v-model="scope.row.contractPrice"
                   size="mini"
@@ -243,13 +249,20 @@
               show-overflow-tooltip
             >
               <template slot-scope="scope">
-                <el-input
+                <template v-if="detailList.examineStatus !== 'WAIT'">
+                  {{ comTotal(scope.row.contractQty,scope.row.contractPrice) }}
+                </template>
+                <div v-else>
+                  {{comTotal(scope.row.contractQty,scope.row.contractPrice)}}
+                </div>
+                <!-- <el-input
 
+                  readonly
                   class="inpt"
                   v-model="scope.row.contractAmount"
                   size="mini"
                   clearable
-                ></el-input>
+                ></el-input> -->
               </template>
             </el-table-column>
           <el-table-column
@@ -265,7 +278,20 @@
             prop="dataQty"
             min-width="160"
             show-overflow-tooltip
-          />
+          >
+            <template slot-scope="scope">
+              <template v-if="details.examineStatus !== 'SAVE'">
+                  {{ scope.row.dataQty }}
+                </template>
+                <el-input
+                  v-else
+                  class="inpt"
+                  v-model="scope.row.dataQty"
+                  size="mini"
+                  clearable
+                ></el-input>
+              </template>
+        </el-table-column>
           <el-table-column
             align="center"
             label="收差全额"
@@ -491,7 +517,13 @@ export default {
       details: {},
       restrictFilename: [
         '结算单', '合同', '明细表', '审核表', '收据', '发票', '照片','相片'
-      ]
+      ],
+      comTotal(){
+      return (qty,price)=>{
+        console.log(qty,price);
+        return Number(qty) * Number(price)
+      }
+    }
     }
   },
     computed:{
@@ -509,7 +541,7 @@ export default {
             }
         // item.number = (item.qty*100 - item.directTransferQty*100 - item.retiredQty*100) / 100;
         item.sums1 = ['orderHasSendQty', 'dataQty', 'qty',"hasSendQty","contractQty"]
-        item.sums2 = ['totalAmount', 'diffAmount', 'price','depositAmount',   "contractPrice",
+        item.sums2 = ['totalAmount', 'diffAmount', 'price','depositAmount',   "contractPrice","comTotal",
           "contractAmount",]
       })
       res.data.items = arr
@@ -527,6 +559,15 @@ export default {
         this.$errorMsg('请选择安装时间')
         return
       }
+
+      this.details.items.map(e=>{
+          e.contractAmount = e.contractQty * e.contractPrice
+          if (!e.contractAmount) {
+            return this.$errorMsg('合同单价、合同数量不能为空')
+          }
+      })
+
+
       this.fileList.forEach((el) => {
 
         if (this.details.dataList.length){

+ 31 - 6
src/views/deposit_home/components/refund_list-detail.vue

@@ -578,15 +578,19 @@
             >
               <template slot-scope="scope">
                 <template v-if="detailList.examineStatus !== 'WAIT'">
-                  {{ scope.row.contractAmount }}
+                  {{ comTotal(scope.row.contractQty,scope.row.contractPrice) }}
                 </template>
-                <el-input
-                  v-else
+                <div v-else>
+                  {{comTotal(scope.row.contractQty,scope.row.contractPrice)}}
+                </div>
+                <!-- <el-input
+
+                  readonly
                   class="inpt"
                   v-model="scope.row.contractAmount"
                   size="mini"
                   clearable
-                ></el-input>
+                ></el-input> -->
               </template>
             </el-table-column>
             <el-table-column
@@ -597,7 +601,7 @@
               show-overflow-tooltip
             >
             <template slot-scope="scope">
-                <template v-if="detailList.examineStatus !== 'WAIT'">
+                <template v-if="detailList.examineStatus !== 'SAVE'">
                   {{ scope.row.dataQty }}
                 </template>
                 <el-input
@@ -980,6 +984,7 @@ import {
   getDepositManageEdit,
   getCommonFileGetStream,
 } from "@/api/engin_deposit/refund_list";
+import ret from "bluebird/js/release/util";
 export default {
   props: {
     detailId: {
@@ -990,6 +995,12 @@ export default {
   components: { IMAGEUPLOAD },
   computed: {
     ...mapGetters(["name"]),
+    comTotal(){
+      return (qty,price)=>{
+        console.log(qty,price);
+        return Number(qty) * Number(price)
+      }
+    }
   },
   data() {
     return {
@@ -1069,6 +1080,13 @@ export default {
             this.$message.error("请选择安装时间");
             return;
           }
+          this.detailList.items.map(e=>{
+          e.contractAmount = e.contractQty * e.contractPrice
+          if (!e.contractAmount) {
+            return this.$errorMsg('合同单价、合同数量不能为空')
+          }
+      })
+
           let data = {
             ...this.detailList,
             checkBy: this.checkBy,
@@ -1130,6 +1148,13 @@ export default {
             this.$message.error("请选择安装时间");
             return;
           }
+          this.detailList.items.map(e=>{
+          e.contractAmount = e.contractQty * e.contractPrice
+          if (!e.contractAmount) {
+            return this.$errorMsg('合同单价、合同数量不能为空')
+          }
+      })
+
           let data = {
             ...this.detailList,
             checkBy: this.checkBy,
@@ -1195,7 +1220,7 @@ export default {
         }
         // item.number = (item.qty*100 - item.directTransferQty*100 - item.retiredQty*100) / 100;
         item.sums1 = ['orderHasSendQty', 'dataQty', 'qty',"hasSendQty","contractQty"]
-        item.sums2 = ['totalAmount', 'diffAmount', 'price','depositAmount',   "contractPrice",
+        item.sums2 = ['totalAmount', 'diffAmount', 'price','depositAmount',"contractPrice","comTotal",
           "contractAmount",]
       });
       res.data.items = arr;