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

.env

@@ -14,7 +14,7 @@ VUE_APP_VS = '6.0.0'
 VUE_APP_WITHCREDENTIALS = true
 
 # ajax请求超时时间
-VUE_APP_AJAX_TIMEOUT = 40000
+VUE_APP_AJAX_TIMEOUT = 400000
 # base api
 
 VUE_APP_BASE_API = ''

src/views/houseSelfCollect/inspectionManagementNew.vue

@@ -326,7 +326,7 @@
         <div class="grid-content bg-purple">
           <el-button v-if='statusTypetext=="复检"' @click='statustypechangelist(1)' :type="statusType==1?'primary':''">未复检</el-button>
           <el-button v-if='statusTypetext=="复检"' @click='statustypechangelist(2)' :type="statusType==2?'primary':''">已复检</el-button>
-          <el-table @cell-click='listclick' :data="inspect" style="width: 100%; margin-top: 20px" ref="inspect" border>
+          <el-table  highlight-current-row @cell-click='listclick' :data="inspect" style="width: 100%; margin-top: 20px" ref="inspect" border>
             <el-table-column prop="qualityNo" width="100" label="业务编号"></el-table-column>
             <el-table-column prop="carNumber" label="车牌号"></el-table-column>
             <el-table-column prop="status" label="状态">
@@ -351,7 +351,7 @@
           :total="deptBudgetTotal">
           </el-pagination>
       </div>
-      
+         <el-button @click="checkOk" v-if="statusTypetext=='复检'" type="primary">确认初检信息</el-button>
         <el-button @click="submit" type="primary">提交</el-button>
     </div>
     <el-dialog width="70%" class="table-content" center :visible.sync="isShowPrint" title="粮食质检单" @opened='opendBtn' @close="closeDialog"
@@ -379,7 +379,8 @@
     getcustomer,
     getDryGrainPrice,
     getinspectLookGoods,
-    getshippinginfo
+    getshippinginfo,
+    postCheck,
   } from '@/model/houseSelfCollect/index'
   import {
     pullDown,
@@ -497,7 +498,6 @@
         options1:[],
         editcar:false,
         isGetCost:'',
-        disabled1:false,
         carstatus:false,
         options2:[],
         tranCarInfoList:[],
@@ -956,6 +956,15 @@
             .then((response) => {
               console.log(response)
               this.deptBudgetList=response
+              if(this.statusTypetext=='复检'){
+                this.deptBudgetList.reGrade=response.grade
+                this.deptBudgetList.reWaterContent=response.waterContent
+                this.deptBudgetList.reImperfectGrain=response.imperfectGrain
+                this.deptBudgetList.reImpurity=response.impurity
+                this.deptBudgetList.reJiaorenli=response.jiaorenli
+                this.deptBudgetList.reBulkDensity=response.bulkDensity
+                this.deptBudgetList.reMildewGrain=response.mildewGrain
+              }
               this.deptBudgetList.warehouseInOutDetail={
                 grade:response.grade,
                 reGrade:response.reGrade,
@@ -1092,14 +1101,14 @@
         }
         if(this.serviceManagementType==3){
           var count=''
-          if(this.warehouseTradeCount<10){
-            count='000'+(this.warehouseTradeCount+1)
+          if(this.warehouseCount<10){
+            count='000'+(this.warehouseCount+1)
           }
-          if(this.warehouseTradeCount<100&&this.warehouseTradeCount>=10){
-            count='00'+(this.warehouseTradeCount+1)
+          if(this.warehouseCount<100&&this.warehouseCount>=10){
+            count='00'+(this.warehouseCount+1)
           }
-           if(this.warehouseTradeCount<1000&&this.warehouseTradeCount>=100){
-            count='0'+(this.warehouseTradeCount+1)
+           if(this.warehouseCount<1000&&this.warehouseCount>=100){
+            count='0'+(this.warehouseCount+1)
           }
           this.deptBudgetList.qualityNo='SGRK'+this.getTime()+this.warehouseNo+count
         }
@@ -1121,6 +1130,100 @@
             this.deptBudgetTotal = response.total
             // this.$forceUpdate();
           })
+      },
+       //确认初检信息
+      checkOk(){
+        this.$confirm('确定初检信息后，初检员不需要再次确认质检信息，是否确认提交', '提示', {
+              confirmButtonText: '确定',
+              cancelButtonText: '取消',
+              type: 'warning',
+            })
+            .then(() => {
+              postCheck(this.deptBudgetList)
+                .toPromise()
+                .then((response) => {
+                   postCheck({id:this.deptBudgetList.id,flag:2})
+                    .toPromise()
+                    .then((response) => {
+                      if(response == 'OK'){
+                      this.$message.success('提交成功')
+                      this.deptBudgetList={
+                        type: '潮粮',
+                        freight: 0,
+                        cost: '',
+                        addressUrl: '',
+                        tidalGrainPrice: 0,
+                        buckleWeightRatio: 0,
+                        natureOfGrainPurchase: '贸易粮',
+                        buckleMiscellaneous: 0,
+                        paramType: 1,
+                        warehouseInOutDetail: {
+                          grade:'',
+                          reGrade:'',
+                          imperfectGrain:'',
+                          reImperfectGrain:'',
+                          impurity:'',
+                          reImpurity:'',
+                          jiaorenli:'',
+                          reJiaorenli:'',
+                          bulkDensity:'',
+                          reBulkDensity:'',
+                          mildewGrain:'',
+                          reMildewGrain:'',
+                        },
+                        disablednotarize:false,
+                        deductionAmount: 0,
+                        deductionWeight: 0,
+                        grossWeight: 0,
+                        tare: 0,
+                        grade:'',
+                        inOutDate: '',
+                        netWeight:0,
+                        pureWeight:0,
+                        deductionWeight:0,
+                        waterContent:'',
+                        reWaterContent:'',
+                        reGrade:'',
+                        imperfectGrain:'',
+                        reImperfectGrain:'',
+                        impurity:'',
+                        reImpurity:'',
+                        jiaorenli:'',
+                        reJiaorenli:'',
+                        bulkDensity:'',
+                        reBulkDensity:'',
+                        reMemo:'',
+                        storageTagNo:'',
+                        mildewGrain:'',
+                        reMildewGrain:'',
+                        boxNo:'',
+                        boxNoOther:'',
+                        titleNo:'',
+                        titleNoOther:'',
+                      }
+                      if(this.serviceManagementType==3){
+                        var count=''
+                        if(this.warehouseCount<10){
+                          count='000'+(this.warehouseCount+1)
+                        }
+                        if(this.warehouseCount<100&&this.warehouseCount>=10){
+                          count='00'+(this.warehouseCount+1)
+                        }
+                        if(this.warehouseCount<1000&&this.warehouseCount>=100){
+                          count='0'+(this.warehouseCount+1)
+                        }
+                        this.deptBudgetList.qualityNo='SGRK'+this.getTime()+this.warehouseNo+count
+                      }
+                        this.getList()
+                        }else{
+                          this.$message.error('提交失败')
+                        }
+                    })
+                }).catch(() => {
+              return false
+            })
+        })
+
       },
       statustypechange(status){
         this.statusTypetext=status
@@ -1129,11 +1232,18 @@
           this.deptBudgetList.statusType=1
           this.statusType=this.deptBudgetList.statusType
           this.recheck=false
+          this.disablednotarize=false
+          this.goodsdisabled=false
+          this.disabled=false
+          this.disabled1=false
         }else if(status=='复检'){
           this.deptBudgetList.statusType=1
           this.recheck=true
           this.disabled2=true
-          this.statusType=0
+          this.statusType=1
+          this.goodsdisabled=true
+          this.disabled=true
+          this.disabled1=true
           this.isSelectType=true
         }else if(status=='确认'){
           this.deptBudgetList.statusType=3
@@ -1141,6 +1251,9 @@
           this.disablednotarize=true
           this.statusType=0
           this.disabled2=false
+          this.goodsdisabled=false
+          this.disabled=false
+          this.disabled1=false
         }
         
         this.getList()
@@ -2006,6 +2119,7 @@
             for (let i = 0; i < response.length; i++) {
               if (_wareHouse && response[i].warehouseName == _wareHouse.value) {
                 this.warehouseCount = response[i].count
+                console.log(response[i].tradeCount)
                 this.warehouseTradeCount = response[i].tradeCount
                 this.allowEdit = response[i].allowEdit
                 this.cangid = _wareHouse.warehouseId
@@ -2062,6 +2176,7 @@
         this.serviceManagementType=status
         if(status==3){
           //解决冲突别解决没了（注意）
+          this.outType='他运'
           this.warehouseTradeCount = '000' + Number(this.warehouseTradeCount + 1)
           this.deptBudgetList.qualityNo='SGRK'+this.getTime()+this.warehouseNo+this.warehouseTradeCount.substring(this.warehouseTradeCount.length - 4)
         }
@@ -2088,12 +2203,11 @@
         this.getList()
       },
       contractNoChange(e) {
+        // console.log(e)
         // 循环任务编号获取合同号
         for (let i = 0; i < this.taskNolist.length; i++) {
           if (this.taskNolist[i].inOutTaskNo == e) {
-            console.log(this.taskNolist[i])
             var data = this.taskNolist[i]
-
             if (this.taskNolist[i].contractNo) {
               this.deptBudgetList.contractNo = this.taskNolist[i].contractNo
             } else {
@@ -2111,10 +2225,11 @@
             this.deptBudgetList.goodsNameKey = this.outContractNo[i].goodsNameKey
             this.deptBudgetList.grade = this.outContractNo[i].grade
             if (this.outContractNo[i].inOutType == '采购入库') {
-              this.customerName=this.carNumberList[e].buyer
-              this.customerPhone=this.carNumberList[e].buyerPhone
-              this.warehouseCount = '000' + Number(this.warehouseCount + 1)
-              this.deptBudgetList.qualityNo='CGRK'+this.getTime()+this.warehouseNo+this.warehouseCount.substring(this.warehouseCount.length - 4)
+              this.customerName=this.outContractNo[i].buyer
+              this.customerPhone=this.outContractNo[i].buyerPhone
+              console.log(this.warehouseTradeCount)
+              this.warehouseTradeCount = '000' + Number(this.warehouseTradeCount + 1)
+              this.deptBudgetList.qualityNo='CGRK'+this.getTime()+this.warehouseNo+this.warehouseTradeCount.substring(this.warehouseTradeCount.length - 4)
               if (!this.outContractNo[i].unitContractPrice) {
                 this.deptBudgetList.tips = '卖方' + this.outContractNo[i].seller
               } else {
@@ -2123,8 +2238,8 @@
               this.deptBudgetList.inOutTypeKey = 1
             } else if (this.outContractNo[i].inOutType == '移库入库') {
               this.customerName=localStorage.getItem('ws-pf_compName')
-                this.warehouseCount = '000' + Number(this.warehouseCount + 1)
-              this.deptBudgetList.qualityNo='YKRK'+this.getTime()+this.warehouseNo+this.warehouseCount.substring(this.warehouseCount.length - 4)
+                this.warehouseTradeCount = '000' + Number(this.warehouseTradeCount + 1)
+              this.deptBudgetList.qualityNo='YKRK'+this.getTime()+this.warehouseNo+this.warehouseTradeCount.substring(this.warehouseTradeCount.length - 4)
               this.deptBudgetList.goodsName = data.goodsName
               this.deptBudgetList.goodsNameKey = data.goodsNameKey
               this.deptBudgetList.grade = data.grade
@@ -2428,7 +2543,10 @@
     width: 50%;
     border: none;
   }
-
+ .el-table__body tr.current-row>td{
+  background-color: #69A8EA !important;
+  color: #fff;
+}
   /deep/.ws-info-table .el-form-item .el-form-item__label {
     width: 30%;
     text-align: center;

src/views/houseSelfCollect/newWeighingManagement.vue

@@ -413,6 +413,7 @@
         checked: false,
         isShowPrintType:false,
         dialogDataList:[],
+        statusType:1,
         jjSelectPrintList:[],
         printSeparately:false,
       }
@@ -601,27 +602,35 @@
         this.status = status
         if (status == 2) {
           if (this.tpyeNo == 1) {
-            this.carList = this.carList1.filter(function(item) {
-              return item.status == '已称毛重'
-            })
+            this.statusType=1
+            this.getList( )
+            // this.carList = this.carList1.filter(function(item) {
+            //   return item.status == '已称毛重'
+            // })
           } else {
-            this.carList = this.carList1.filter(function(item) {
-              return item.status == '已称皮重'
-            })
+            this.statusType=3
+            this.getList( )
+            // this.carList = this.carList1.filter(function(item) {
+            //   return item.status == '已称皮重'
+            // })
           }
         } else {
           if (this.tpyeNo == 1) {
+            this.statusType=1
+            this.getList( )
             // this.mListTop.concat(this.mListBottom)
-            this.carList = this.carList1.filter(function(item) {
-              return item.status == '已质检'
-            })
+            // this.carList = this.carList1.filter(function(item) {
+            //   return item.status == '已质检'
+            // })
           } else {
-            this.carList = this.carList1.filter(function(item) {
-              return item.status == '已称毛重'
-            })
+            this.statusType=2
+            this.getList( )
+            // this.carList = this.carList1.filter(function(item) {
+            //   return item.status == '已称毛重'
+            // })
           }
         }
-        this.deptBudgetTotal = this.carList.length
+        // this.deptBudgetTotal = this.carList.length
       },
       handleSizeChange(val) {
         console.log(`每页 ${val} 条`)
@@ -636,12 +645,30 @@
           .then((response) => {
             this.purchasePriceList = response
           })
-
+          getweighingList({
+            compId: localStorage.getItem('ws-pf_compId'),
+            currentPage: this.currentPage,
+            pageSize: 9999,
+            searchKeyWord: '',
+            warehouseName: this.warehouseName,
+            managementType: 1,
+            serviceManagementType: this.inWarehouseType,
+            // statusType:1
+          })
+          .toPromise()
+          .then((response) => {
+            this.common.commonWeighingList = response.records
+            this.makeData()
+          })
+          .catch((response) => {
+            // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+          })
         getweighingList({
             compId: localStorage.getItem('ws-pf_compId'),
             currentPage: this.currentPage,
             pageSize: this.pageSize,
             searchKeyWord: '',
+            statusType:this.statusType,
             warehouseName: this.warehouseName,
             managementType: 1,
             serviceManagementType: this.inWarehouseType,
@@ -649,9 +676,8 @@
           })
           .toPromise()
           .then((response) => {
+            this.deptBudgetTotal =response.total
             this.weighingList = response.records
-            this.common.commonWeighingList = response.records
-            this.makeData()
           })
           .catch((response) => {
             // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
@@ -675,7 +701,7 @@
               _list[i].paymentManagement.approveStatus
             ) {
               continue
-            }
+            }y
           }
           if (_list[i].status == '已质检') {
             this.mListTop.push(_list[i])
@@ -1188,8 +1214,10 @@
               delete warehousing.qualityInspectionManagement
             }
             if (this.tpyeNo == 1) {
-              //毛检保存前进行校验
-              getamount({
+              // console.log(this.weighingList)
+              if(this.weighingList.customerNumberCard){
+                //毛检保存前进行校验
+                getamount({
                   compId: localStorage.getItem('ws-pf_compId'),
                   customerNumberCard: this.weighingList.customerNumberCard,
                   goodsName: this.weighingList.goodsName,
@@ -1249,7 +1277,8 @@
                               warehousing.deductionAmount *= 1000
                               warehousing.deductionWeight /= 1000
                               warehousing.statusFlag = 1
-                              warehousing.inOutFlag = 2
+                              warehousing.inOutFlag = 
+                              warehousing.id=warehousing.warehouseInOutId
                               addstorageputList(warehousing).toPromise().then((response) => {
                                 // if(response == "OK"){
                                 //   this.getList()
@@ -1264,22 +1293,60 @@
                     }
                   }
                 })
+              }else{
+                 grossWeight(this.weighingList)
+                  .toPromise()
+                  .then((response) => {
+                    if (this.reader) {
+                      this.reader.cancel()
+                    }
+                    this.$notify.success({
+                      title: '成功',
+                      message: '保存成功',
+                    })
+                    this.getList()
+                    //贸易入库需要再走入库接口
+                    if (this.inWarehouseType == 1) {
+                      warehousing.grossWeight /= 1000
+                      warehousing.tare /= 1000
+                      warehousing.netWeight /= 1000
+                      warehousing.pureWeight = 1000
+                      warehousing.deductionAmount *= 1000
+                      warehousing.deductionWeight /= 1000
+                      warehousing.statusFlag = 1
+                      warehousing.inOutFlag = 2
+                      delete warehousing.status
+                      warehousing.id=warehousing.warehouseInOutId
+                      addstorageputList(warehousing).toPromise().then((response) => {
+                        // if(response == "OK"){
+                        //   this.getList()
+                        // }
+                      })
+                    }
+                  })
+                  .catch((response) => {
+                    // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+                  })
+              }
             } else if (this.tpyeNo == 2) {
+              console.log(this.inWarehouseType )
               this.weighingList.warehouseId = this.cangid;
               this.weighingList.skinInspector = localStorage.getItem('ws-pf_staffName')
               tare(this.weighingList)
                 .toPromise()
                 .then((response) => {
-                  if (this.reader) {
-                    this.reader.cancel()
-                  }
+                  console.log(1111)
+                  // if (this.reader) {
+                  //   this.reader.cancel()
+                  // }
                   this.$notify.success({
                     title: '成功',
                     message: '保存成功',
                   })
                   this.idPrint = response
-                  this.isShowPrintType = true
-                  this.getList()
+                  // this.isShowPrintType = true
+                  // this.getList()
+                  
                   //贸易入库需要再走入库接口
                   if (this.inWarehouseType == 1) {
 
@@ -1295,8 +1362,10 @@
                       warehousing.deductionAmount = Number(warehousing.deductionAmount) * 1000
                       warehousing.deductionWeight /= 1000
                       warehousing.inOutFlag = 2
-                      that.inOutDate = Object.assign(inOutDate, warehousing)
-                      addstorageputList(inOutDate).toPromise().then((response) => {})
+                      warehousing.id=warehousing.warehouseInOutId
+                      // delete that.inOutDate.status
+                      that.inOutDate = Object.assign(that.inOutDate, warehousing)
+                      addstorageputList(that.inOutDate).toPromise().then((response) => {})
                     })
                   }
                 })

src/views/statisticalReport/stockPurchaseReceiptReportList.vue

@@ -70,7 +70,7 @@
           </div>
         </div>
       </el-row>
-      <el-table class="wenzi" :data="warehouseList.records" style="width: 100%; margin-top: 20px" ref="warehouseList"
+      <el-table class="wenzi" :data="warehouseList" style="width: 100%; margin-top: 20px" ref="warehouseList"
         border :summary-method="getSummaries" show-summary @row-click="handleRowClick"
         @selection-change="handleSelectionChange">
         <el-table-column :selectable="selectInit" type="selection" width="55"></el-table-column>
@@ -567,8 +567,8 @@
         this.amountNotPayable = 0
         this.money = this.money
         this.stockPurchaseReceiptReportList =
-          this.warehouseList.records[0].stockPurchaseReceiptReportList
-        this.amountEdPayable = this.warehouseList.records[0].amountEdPayable
+          this.warehouseList[0].stockPurchaseReceiptReportList
+        this.amountEdPayable = this.warehouseList[0].amountEdPayable
         this.paymentDate = this.paymentDate
         if (this.modification.length == 0) {
           this.$message.warning('请选择一条要付款的条目')
@@ -879,7 +879,7 @@
             this.payNotMoney = this.payNotMoney.toFixed(2)
             this.settlementWeight1 = this.settlementWeight1.toFixed(2)
             this.deptBudgetTotal = response.total
-            this.warehouseList = response
+            this.warehouseList = response.records
           })
       },
       getContractList() {
@@ -896,7 +896,7 @@
             this.option = this.contractNoList
             this.contractNo = this.option[0].contractNo
             this.contractchange(this.contractNo)
-            this.getList()
+            // this.getList()
           })
       },
       handleRemove(file) {

src/views/taskManagement/moveWarehouseTaskLook.vue

@@ -331,7 +331,7 @@ export default {
               this.$set(
                 this.weights[0],
                 'weightOut',
-                this.moveLookData[i].weight
+                this.moveLookData[i].completedQuantity
               )
             } else {
               // if (this.moveLookData[i].inOutType == '移库入库')
@@ -340,17 +340,23 @@ export default {
               this.$set(
                 this.weights[0],
                 'weightIn',
-                this.moveLookData[i].weight
+                this.moveLookData[i].completedQuantity
               )
               this.businessDescribe = this.moveLookData[i].businessDescribe
             }
             this.transportLoss = this.weightOut - this.weightIn
             this.goodsName = this.moveLookData[0].goodsName
             this.grade = this.moveLookData[0].grade
-            this.bulkDensity = this.moveLookData[0].bulkDensity
-            this.waterContent = this.moveLookData[0].waterContent
+            if(this.moveLookData[0].bulkDensity){
+              this.bulkDensity = this.moveLookData[0].bulkDensity
+            }
+            if(this.moveLookData[0].waterContent){
+              this.waterContent = this.moveLookData[0].waterContent
+            }
+            if(this.moveLookData[0].unitPrice){
+              this.unitPrice = this.moveLookData[0].unitPrice
+            }
             this.weight = this.moveLookData[0].weight
-            this.unitPrice = this.moveLookData[0].unitPrice
           }
           var num = 0
           for (var i = 0; i < this.enter.inOutWarehouseTaskList.length; i++) {  

src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue

@@ -1507,6 +1507,7 @@
 					this.flag = 0
 				} else if (this.dataList1.taskTypeKey == 3) {
 					this.disabled = true
+					this.gradestatus=false
 					this.dataList1.inOutType = '移库入库'
 					this.dataList1.inOutTypeKey = '3'
 					this.dataList.inOutType = '移库出库'