Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

src/views/houseSelfCollect/component/routers/route.js

@@ -151,7 +151,7 @@ const houseSelfCollectRouter = {
         shortcutEntrance: 'houseSelfCollect',
         module: 'acquisitionManagement.acquisitionPay',
         permissicon: [],
-        keepAlive: true
+        // keepAlive: true
       }
     },
     {
@@ -164,7 +164,7 @@ const houseSelfCollectRouter = {
         shortcutEntrance: 'settlement',
         module: 'acquisitionManagement.acquisitionPay.view',
         permissicon: [],
-        keepAlive: true
+        keepAlive: false
       },
       hidden: true
     },

src/views/houseSelfCollect/inspectionManagementNew.vue

@@ -998,7 +998,6 @@
                     inOutDate: new Date(),
                     netWeight: 0,
                     pureWeight: 0,
-                    deductionWeight: 0,
                     waterContent: '',
                     reWaterContent: '',
                     reGrade: '',
@@ -1084,7 +1083,6 @@
                 inOutDate: new Date(),
                 netWeight: 0,
                 pureWeight: 0,
-                deductionWeight: 0,
                 waterContent: '',
                 reWaterContent: '',
                 reGrade: '',
@@ -2179,7 +2177,6 @@
                             inOutDate: new Date(),
                             netWeight: 0,
                             pureWeight: 0,
-                            deductionWeight: 0,
                             waterContent: '',
                             reWaterContent: '',
                             reGrade: '',
@@ -2581,7 +2578,6 @@
               inOutDate: new Date(),
               netWeight: 0,
               pureWeight: 0,
-              deductionWeight: 0,
               waterContent: '',
               reWaterContent: '',
               reGrade: '',

src/views/houseSelfCollect/newWeighingManagement.vue

@@ -447,7 +447,7 @@
         pListTotal: [],
         submitAllow: false,
         id: '',
-        inOutDate: {},
+        inOutData: {},
         idPrint: '',
         ewCustomerOptions: [{
           value: '黑龙江利润元粮食贸易有限公司',
@@ -1265,7 +1265,7 @@
             }).then((response) => {
               //编辑接口
               if (this.inWarehouseType == 1) {
-                this.weighingList = this.inOutDate
+                this.weighingList = this.inOutData
                 this.weighingList.pictureAddress = response.data.url
                 tare(this.weighingList)
                   .toPromise()
@@ -1306,7 +1306,6 @@
 
       },
       print() {
-
         if (this.reader) {
           this.reader.cancel()
         }
@@ -1423,6 +1422,7 @@
               warehousing.baseId = this.cangid
               delete warehousing.qualityInspectionManagement
             }
+            // 毛重
             if (this.tpyeNo == 1) {
               // console.log(this.weighingList)
               if (this.weighingList.customerNumberCard) {
@@ -1477,7 +1477,6 @@
                                 title: '成功',
                                 message: '保存成功',
                               })
-                              this.getList()
                               //贸易入库需要再走入库接口
                               if (this.inWarehouseType == 1) {
                                 warehousing.grossWeight /= 1000
@@ -1495,6 +1494,8 @@
                                     this.getList()
                                   }
                                 })
+                              } else {
+                                this.getList()
                               }
                             })
                             .catch((response) => {
@@ -1515,7 +1516,6 @@
                       title: '成功',
                       message: '保存成功',
                     })
-                    this.getList()
                     //贸易入库需要再走入库接口
                     if (this.inWarehouseType == 1) {
                       warehousing.grossWeight /= 1000
@@ -1534,6 +1534,8 @@
                           this.getList()
                         }
                       })
+                    } else {
+                      this.getList()
                     }
                   })
                   .catch((response) => {
@@ -1541,92 +1543,135 @@
                   })
               }
             } else if (this.tpyeNo == 2) {
+              //皮重
+              // //皮重检斤保存
+              // let _url1 = process.env.VUE_APP_BASE_API + '/weighingManagement/api/editTare'
+              // //查看结算单
+              // let _url2 = process.env.VUE_APP_BASE_API + '/warehouseInOutInfo/getInfo'
+              // // 入库添加
+              // let _url3 = process.env.VUE_APP_BASE_API + '/warehouseInOutInfo/InOutWarehouse'
+
               console.log(this.inWarehouseType)
-              this.weighingList.warehouseId = this.cangid;
-              this.weighingList.skinInspector = localStorage.getItem('ws-pf_staffName')
-              tare(this.weighingList)
-                .toPromise()
-                .then((response) => {
-                  console.log(1111)
-                  // if (this.reader) {
-                  //   this.reader.cancel()
-                  // }
-                  this.$notify.success({
-                    title: '成功',
-                    message: '保存成功',
+               //贸易入库需要再走入库接口
+              if (this.inWarehouseType == 1) {
+                getsettleaccout({
+                  id: this.weighingList.warehouseInOutId
+                }).toPromise().then((response) => {
+                  that.inOutData = response
+                  that.$set(that.inOutData, 'statusFlag', 3)
+                  that.$set(that.inOutData, 'grossWeight', warehousing.grossWeight / 1000)
+                  that.$set(that.inOutData, 'tare', warehousing.tare / 1000)
+                  that.$set(that.inOutData, 'netWeight', warehousing.netWeight / 1000)
+                  // that.$set(that.inOutData,'pureWeight',warehousing.pureWeight /1000)
+                  that.$set(that.inOutData, 'deductionAmount', Number(warehousing.deductionAmount) * 1000)
+                  that.$set(that.inOutData, 'deductionWeight', warehousing.deductionWeight / 1000)
+                  that.$set(that.inOutData, 'inOutFlag', 2)
+                  // that.inOutDate = response
+                  // that.$set(that.inOutDate)
+                  // .statusFlag = 3
+                  // that.inOutDate.grossWeight=warehousing.grossWeight /1000
+                  // that.inOutDate.tare=warehousing.tare /1000
+                  // that.inOutDate.netWeight=warehousing.netWeight /1000
+                  // that.inOutDate.pureWeight=warehousing.pureWeight /1000
+                  // that.inOutDate.deductionAmount= Number(warehousing.deductionAmount) * 1000
+                  // that.inOutDate.deductionWeight=warehousing.deductionWeight /1000
+                  // that.inOutDate.inOutFlag = 2
+                  console.log(that.inOutData)
+
+                  // warehousing.statusFlag = 3
+                  // warehousing.grossWeight /= 1000
+                  // warehousing.tare /= 1000
+                  // warehousing.netWeight /= 1000
+                  // warehousing.pureWeight = 1000
+                  // warehousing.deductionAmount = Number(warehousing.deductionAmount) * 1000
+                  // warehousing.deductionWeight /= 1000
+                  // warehousing.inOutFlag = 2
+                  // console.log(that.weighingList)
+                  // warehousing.inOutTypeKey = that.weighingList.inOutTypeKey
+                  // warehousing.inOutType = that.weighingList.inOutType
+                  // warehousing.deductionAmount = that.weighingList.deductionAmount
+                  // warehousing.id = warehousing.warehouseInOutId
+                  // // delete that.inOutDate.status
+                  // that.inOutDate = Object.assign(that.inOutDate, warehousing)
+                  addstorageputList(that.inOutData).toPromise().then((response) => {
+                    this.weighingList.warehouseId = this.cangid;
+                    this.weighingList.skinInspector = localStorage.getItem('ws-pf_staffName')
+                    tare(this.weighingList)
+                      .toPromise()
+                      .then((response) => {
+                        console.log(1111)
+                        // if (this.reader) {
+                        //   this.reader.cancel()
+                        // }
+                        this.$notify.success({
+                          title: '成功',
+                          message: '保存成功',
+                        })
+                        this.idPrint = response
+                        if (this.weighingList.serviceManagementType == 1 && (this.warehouseName == '鲅鱼圈金信库' || this
+                            .warehouseName == '哈尔滨依兰库' || this
+                            .warehouseName == '白城内陆港')) {
+                          if (this.weighingList.seller && this.weighingList.buyer) {
+                            let cang = {}
+                            cang.value = this.weighingList.seller
+                            cang.label = this.weighingList.seller
+                            if (this.check(this.weighingList.seller, 1)) {
+                              this.ewCustomerOptions.push(cang)
+                            }
+                            let cang1 = {}
+                            cang1.value = this.weighingList.buyer
+                            cang1.label = this.weighingList.buyer
+                            if (this.check(this.weighingList.buyer, 2)) {
+                              this.companyNameEWOptions.push(cang1)
+                            }
+                          }
+                        }
+                        this.isShowPrintType = true
+                        this.getList()
+                      
+                      })
+                      .catch((response) => {})
                   })
-                  this.idPrint = response
-                  if (this.weighingList.serviceManagementType == 1 && (this.warehouseName == '鲅鱼圈金信库' || this
-                      .warehouseName == '哈尔滨依兰库' || this
-                      .warehouseName == '白城内陆港')) {
-                    if (this.weighingList.seller && this.weighingList.buyer) {
-                      let cang = {}
-                      cang.value = this.weighingList.seller
-                      cang.label = this.weighingList.seller
-                      if (this.check(this.weighingList.seller, 1)) {
-                        this.ewCustomerOptions.push(cang)
-                      }
-                      let cang1 = {}
-                      cang1.value = this.weighingList.buyer
-                      cang1.label = this.weighingList.buyer
-                      if (this.check(this.weighingList.buyer, 2)) {
-                        this.companyNameEWOptions.push(cang1)
+                  
+                })
+              } else {
+                tare(this.weighingList)
+                  .toPromise()
+                  .then((response) => {
+                    console.log(1111)
+                    // if (this.reader) {
+                    //   this.reader.cancel()
+                    // }
+                    this.$notify.success({
+                      title: '成功',
+                      message: '保存成功',
+                    })
+                    this.idPrint = response
+                    if (this.weighingList.serviceManagementType == 1 && (this.warehouseName == '鲅鱼圈金信库' || this
+                        .warehouseName == '哈尔滨依兰库' || this
+                        .warehouseName == '白城内陆港')) {
+                      if (this.weighingList.seller && this.weighingList.buyer) {
+                        let cang = {}
+                        cang.value = this.weighingList.seller
+                        cang.label = this.weighingList.seller
+                        if (this.check(this.weighingList.seller, 1)) {
+                          this.ewCustomerOptions.push(cang)
+                        }
+                        let cang1 = {}
+                        cang1.value = this.weighingList.buyer
+                        cang1.label = this.weighingList.buyer
+                        if (this.check(this.weighingList.buyer, 2)) {
+                          this.companyNameEWOptions.push(cang1)
+                        }
                       }
                     }
-                  }
-
-                  //贸易入库需要再走入库接口
-                  if (this.inWarehouseType == 1) {
-
-                    getsettleaccout({
-                      id: this.weighingList.warehouseInOutId
-                    }).toPromise().then((response) => {
-                      that.inOutDate = response
-                      that.$set(that.inOutDate, 'statusFlag', 3)
-                      that.$set(that.inOutDate, 'grossWeight', warehousing.grossWeight / 1000)
-                      that.$set(that.inOutDate, 'tare', warehousing.tare / 1000)
-                      that.$set(that.inOutDate, 'netWeight', warehousing.netWeight / 1000)
-                      // that.$set(that.inOutDate,'pureWeight',warehousing.pureWeight /1000)
-                      that.$set(that.inOutDate, 'deductionAmount', Number(warehousing.deductionAmount) * 1000)
-                      that.$set(that.inOutDate, 'deductionWeight', warehousing.deductionWeight / 1000)
-                      that.$set(that.inOutDate, 'inOutFlag', 2)
-                      // that.inOutDate = response
-                      // that.$set(that.inOutDate)
-                      // .statusFlag = 3
-                      // that.inOutDate.grossWeight=warehousing.grossWeight /1000
-                      // that.inOutDate.tare=warehousing.tare /1000
-                      // that.inOutDate.netWeight=warehousing.netWeight /1000
-                      // that.inOutDate.pureWeight=warehousing.pureWeight /1000
-                      // that.inOutDate.deductionAmount= Number(warehousing.deductionAmount) * 1000
-                      // that.inOutDate.deductionWeight=warehousing.deductionWeight /1000
-                      // that.inOutDate.inOutFlag = 2
-                      console.log(that.inOutDate)
-
-                      // warehousing.statusFlag = 3
-                      // warehousing.grossWeight /= 1000
-                      // warehousing.tare /= 1000
-                      // warehousing.netWeight /= 1000
-                      // warehousing.pureWeight = 1000
-                      // warehousing.deductionAmount = Number(warehousing.deductionAmount) * 1000
-                      // warehousing.deductionWeight /= 1000
-                      // warehousing.inOutFlag = 2
-                      // console.log(that.weighingList)
-                      // warehousing.inOutTypeKey = that.weighingList.inOutTypeKey
-                      // warehousing.inOutType = that.weighingList.inOutType
-                      // warehousing.deductionAmount = that.weighingList.deductionAmount
-                      // warehousing.id = warehousing.warehouseInOutId
-                      // // delete that.inOutDate.status
-                      // that.inOutDate = Object.assign(that.inOutDate, warehousing)
-                      addstorageputList(that.inOutDate).toPromise().then((response) => {})
-                      this.isShowPrintType = true
-                      this.getList()
-                    })
-                  } else {
                     this.isShowPrintType = true
                     this.getList()
-                  }
-                })
-                .catch((response) => {})
+                  
+                  })
+                  .catch((response) => {})
+              }
+              
             }
           })
           .catch(() => {

src/views/houseSelfCollect/paymentManagement.vue

@@ -476,13 +476,19 @@
         goodsName:"全部",
       }
     },
-    activated() {
+    mounted() {debugger
       this.userJurisdiction = getHp('acquisitionManagement.acquisitionPay.print')
-      
+
       this.getPassYearFormatDate()
       this.getWarehouse()
-      // this.getList()
     },
+    // activated() {
+    //   this.userJurisdiction = getHp('acquisitionManagement.acquisitionPay.print')
+
+    //   this.getPassYearFormatDate()
+    //   this.getWarehouse()
+    //   // this.getList()
+    // },
     updated() {
 
       this.$nextTick(() => {

src/views/houseSelfCollect/settlement.vue

@@ -313,7 +313,7 @@
         imgUrl: '',
       }
     },
-    activated() {
+    mounted() {
       this.types = this.$route.query.type
       if (this.types == 2) {
         this.disabled = true