ccjgmwz преди 3 години
родител
ревизия
a52ee6d91a
променени са 2 файла, в които са добавени 5 реда и са изтрити 5 реда
  1. 3 3
      src/views/houseSelfCollect/paymentManagement.vue
  2. 2 2
      src/views/houseSelfCollect/weightCheck.vue

+ 3 - 3
src/views/houseSelfCollect/paymentManagement.vue

@@ -334,7 +334,7 @@ import download from '../../components/WsDownload/download'
         deptCircularPage: {},
         deptCircularPage: {},
         deptBudgetTotal: 0,
         deptBudgetTotal: 0,
         paymentForm: false,
         paymentForm: false,
-        searchType: "",
+        searchType: '',
         searchTypeText: '',
         searchTypeText: '',
         searchKeyWord: '',
         searchKeyWord: '',
         warehouseList: [],
         warehouseList: [],
@@ -503,8 +503,8 @@ this.$nextTick(() => {
         }
         }
         console.log('开票', data)
         console.log('开票', data)
         for(let i=0;i<this.modification.length;i++){
         for(let i=0;i<this.modification.length;i++){
-          if(this.modification[i].status!='全部付款'&&this.modification[i].status!='部分付款') {
-            this.$message.error('开票只能选择全部付款或部分付款!');
+          if(this.modification[i].status!='全部付款'&&this.modification[i].status!='部分付款'&&this.modification[i].status!='已通过') {
+            this.$message.error('开票只能选择全部付款或部分付款或已通过!');
               return
               return
           }
           }
         }
         }

+ 2 - 2
src/views/houseSelfCollect/weightCheck.vue

@@ -255,7 +255,7 @@
       this.weighingList.carNumber = this.$route.query.carNumber
       this.weighingList.carNumber = this.$route.query.carNumber
       this.weighingList.goodsName = this.$route.query.goodsName
       this.weighingList.goodsName = this.$route.query.goodsName
       this.weighingList.id = this.$route.query.id
       this.weighingList.id = this.$route.query.id
-      this.relationId = this.$route.query.relationId
+      // this.relationId = this.$route.query.relationId
       this.monitorUrl1 = this.$route.query.monitorUrl1
       this.monitorUrl1 = this.$route.query.monitorUrl1
       this.monitorUrl2 = this.$route.query.monitorUrl2
       this.monitorUrl2 = this.$route.query.monitorUrl2
       this.warehouseId = this.$route.query.warehouseId
       this.warehouseId = this.$route.query.warehouseId
@@ -752,7 +752,7 @@
                         )
                         )
                       } else {
                       } else {
                         //累计售粮没有超上限完成毛检保存
                         //累计售粮没有超上限完成毛检保存
-                        this.weighingList.relationId = this.relationId;
+                        // this.weighingList.relationId = this.relationId;
                         this.weighingList.secretaryWeigher = localStorage.getItem('ws-pf_staffName'),
                         this.weighingList.secretaryWeigher = localStorage.getItem('ws-pf_staffName'),
                           grossWeight(this.weighingList)
                           grossWeight(this.weighingList)
                           .toPromise()
                           .toPromise()