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

# Conflicts:
#	src/views/houseSelfCollect/newWeighingManagement.vue
#	src/views/houseSelfCollect/weightCheckRecord.vue

.env.production

@@ -4,8 +4,8 @@
 
 NODE_ENV = 'production'
 # base api
-VUE_APP_BASE_API = 'https://api2.eliangeyun.com'
-#VUE_APP_BASE_API = 'https://apitest.eliangeyun.com'
+#VUE_APP_BASE_API = 'https://api2.eliangeyun.com'
+VUE_APP_BASE_API = 'https://apitest.eliangeyun.com'
 
 # 微服务相关接口配置
 ## 任务消息

public/static/outWeightPrint.html

@@ -217,7 +217,6 @@
                     <div class="autograph">客户签名：</div>
                     <div class="autograph">司机签名：</div>
                 </div>
-                <div class="bottom-row3">扫一扫</div>
             </div>
         </div>
         <div class="small-content" v-if="smallContent">

src/views/outboundManagement/weighingManagementNew.vue

@@ -315,6 +315,7 @@
     getstaff,
     getReceiptTaskNo,
   } from '@/model/warehouse/index'
+  import axios from 'axios'
   import weightCheckPrint from './component/weightCheckPrint.vue'
   import inspectInfoPrint from './component/inspectInfoPrint.vue'
   import html2canvas from 'html2canvas'
@@ -366,6 +367,7 @@
         carstatus: false,
         carjudge: false,
         warehouseCount: 0,
+		warehouseCount1:0,
         warehouseNo: '',
         statusType: '3',
         warehouseType: 1,
@@ -491,6 +493,30 @@
                 .toPromise()
                 .then((response) => {
                   this.types = ''
+				  this.weighingList = {
+                            grossWeight: 0,
+                            tare: 0,
+                            tips: '',
+                            // contractNo:'',
+                            // inOutTaskNo:'',
+                            buckleMiscellaneous: 0,
+                            netWeight: 0,
+                            receivableWeighingFee: '',
+                            warehouseInOutDetail: {
+                              grade: '',
+                              imperfectGrain: '',
+                              impurity: '',
+                              jiaorenli: '',
+                              bulkDensity: '',
+                              mildewGrain: '',
+                            },
+                            qualityInspectionManagement: {
+                              boxNo: '暂无',
+                              boxNoOther: '暂无',
+                              titleNo: '暂无',
+                              titleNoOther: '暂无',
+                            },
+                          }
                   // this.inspect = []
                 })
             })
@@ -524,6 +550,30 @@
                   this.types = ''
                   // this.inspect = []
                   this.isShowPrint = false
+				  this.weighingList = {
+                            grossWeight: 0,
+                            tare: 0,
+                            tips: '',
+                            // contractNo:'',
+                            // inOutTaskNo:'',
+                            buckleMiscellaneous: 0,
+                            netWeight: 0,
+                            receivableWeighingFee: '',
+                            warehouseInOutDetail: {
+                              grade: '',
+                              imperfectGrain: '',
+                              impurity: '',
+                              jiaorenli: '',
+                              bulkDensity: '',
+                              mildewGrain: '',
+                            },
+                            qualityInspectionManagement: {
+                              boxNo: '暂无',
+                              boxNoOther: '暂无',
+                              titleNo: '暂无',
+                              titleNoOther: '暂无',
+                            },
+                          }
                 })
             })
             this.dialogTableVisible = true
@@ -555,11 +605,11 @@
           .toPromise()
           .then((response) => {
             this.weighingList = response
-            this.weighingList.grossWeight = this.weighingList.grossWeight * 1000
-            this.weighingList.tare = this.weighingList.tare * 1000
-            this.weighingList.netWeight = this.weighingList.netWeight * 1000
-            this.weighingList.buckleMiscellaneous =
-              this.weighingList.buckleMiscellaneous * 1000
+            // this.weighingList.grossWeight = this.weighingList.grossWeight * 1000
+            // this.weighingList.tare = this.weighingList.tare * 1000
+            // this.weighingList.netWeight = this.weighingList.netWeight * 1000
+            // this.weighingList.buckleMiscellaneous =
+            //   this.weighingList.buckleMiscellaneous * 1000
             this.weighingList.carNo =
               response.qualityInspectionManagement.carNumber
             this.weighingList.boxNo = response.boxNo
@@ -781,12 +831,20 @@
           .then(() => {
             this.weighingList.inOutFlag = 1
             this.weighingList.statusFlag = 3
-            this.weighingList.grossWeight = this.weighingList.grossWeight / 1000
+			if(this.weighingList.grossWeight){
+				this.weighingList.grossWeight = this.weighingList.grossWeight / 1000
+			}
+            
+			if(this.weighingList.netWeight){
+				this.weighingList.netWeight = this.weighingList.netWeight / 1000
+			}
             this.weighingList.tare = this.weighingList.tare / 1000
-            this.weighingList.netWeight = this.weighingList.netWeight / 1000
-            this.weighingList.buckleMiscellaneous =
-              this.weighingList.buckleMiscellaneous / 1000
+			if(this.weighingList.buckleMiscellaneous){
+				this.weighingList.buckleMiscellaneous = this.weighingList.buckleMiscellaneous / 1000
+			}
             if (this.tpyeNo == 1) {
+			//  this.weighingList.serviceManagementType=2
+			 this.weighingList.statusFlag = 1
               this.weighingList.relationId = this.relationId
               this.weighingList.warehouseId = this.warehouseId
               this.weighingList.baseId = this.warehouseId
@@ -796,6 +854,7 @@
                 addstorageputList(this.weighingList)
                   .toPromise()
                   .then((response) => {
+					this.weighingList.tare = this.weighingList.tare * 1000
                     this.weighingList.warehouseInOutId = response
                     tareEdit(this.weighingList)
                       .toPromise()
@@ -814,14 +873,8 @@
                           })
                           this.getList()
                           this.weighingList = response
-                          this.warehouseCount += 1
-                          this.weighingList.grossWeight =
-                            this.weighingList.grossWeight * 1000
-                          this.weighingList.tare = this.weighingList.tare * 1000
-                          this.weighingList.netWeight =
-                            this.weighingList.netWeight * 1000
-                          this.weighingList.buckleMiscellaneous =
-                            this.weighingList.buckleMiscellaneous * 1000
+                          this.warehouseCount = Number(this.warehouseCount)+ 1
+						  this.warehouseCount1 = Number(this.warehouseCount1)+ 1
                           this.inspect = JSON.parse(
                             JSON.stringify(this.weighingLis)
                           )
@@ -857,6 +910,8 @@
                     this.$notify.warning(response)
                   })
               } else {
+				  console.log(22222)
+				
                 this.weighingList.relationId = this.relationId
                 this.weighingList.warehouseId = this.warehouseId
                 this.weighingList.baseId = this.warehouseId
@@ -864,6 +919,7 @@
                 addstorageputList(this.weighingList)
                   .toPromise()
                   .then((response) => {
+					this.weighingList.tare = this.weighingList.tare * 1000
                     this.weighingList.warehouseInOutId = response
                     tareAdd(this.weighingList)
                       .toPromise()
@@ -874,14 +930,8 @@
                           .toPromise()
                           .then((response) => {
                             this.weighingList = response
-                            this.warehouseCount += 1
-                            this.weighingList.grossWeight =
-                              this.weighingList.grossWeight * 1000
-                            this.weighingList.tare = this.weighingList.tare * 1000
-                            this.weighingList.netWeight =
-                              this.weighingList.netWeight * 1000
-                            this.weighingList.buckleMiscellaneous =
-                              this.weighingList.buckleMiscellaneous * 1000
+                        	this.warehouseCount = Number(this.warehouseCount)+ 1
+							this.warehouseCount1 = Number(this.warehouseCount1)+ 1
                             this.inspect = JSON.parse(
                               JSON.stringify(this.weighingList)
                             )
@@ -963,6 +1013,7 @@
                   .catch((response) => {})
               }
             } else if (this.tpyeNo == 2) {
+				this.weighingList.serviceManagementType=2
               this.weighingList.secretaryWeigher =
                 localStorage.getItem('ws-pf_staffName')
               this.weighingList.warehouseId = this.warehouseId
@@ -970,6 +1021,13 @@
               addstorageputList(this.weighingList)
                 .toPromise()
                 .then((response) => {
+					this.weighingList.grossWeight =
+                        this.weighingList.grossWeight * 1000
+                      this.weighingList.tare = this.weighingList.tare * 1000
+                      this.weighingList.netWeight =
+                        this.weighingList.netWeight * 1000
+                      this.weighingList.buckleMiscellaneous =
+                        this.weighingList.buckleMiscellaneous * 1000
                   this.weighingList.warehouseInOutId = response
                   grossWeight(this.weighingList)
                     .toPromise()
@@ -986,14 +1044,8 @@
                         message: '提交成功',
                         type: 'success',
                       })
-                      this.weighingList.grossWeight =
-                        this.weighingList.grossWeight * 1000
-                      this.weighingList.tare = this.weighingList.tare * 1000
-                      this.weighingList.netWeight =
-                        this.weighingList.netWeight * 1000
-                      this.weighingList.buckleMiscellaneous =
-                        this.weighingList.buckleMiscellaneous * 1000
-                        debugger
+                      
+                        // debugger
                       this.inspect = JSON.parse(JSON.stringify(this.weighingList))
                       
                       this.isShowPrint = true
@@ -1291,6 +1343,7 @@
         return date.getFullYear() + mouth + date.getDate()
       },
       contractNoChange(e) {
+		this.warehouseCount=this.warehouseCount1
         for (let i = 0; i < this.taskNolist.length; i++) {
           if (this.taskNolist[i].inOutTaskNo == e) {
             var data = this.taskNolist[i]
@@ -1316,7 +1369,7 @@
             this.weighingList.grade = this.outContractNo[i].grade
             this.weighingList.inOutType = this.outContractNo[i].inOutType
             if (this.outContractNo[i].inOutType == '销售出库') {
-              this.warehouseCount = '000' + Number(this.warehouseCount + 1)
+              this.warehouseCount = '000' +(Number(this.warehouseCount) + 1) 
               this.weighingList.number =
                 'XSCK' +
                 this.getTime() +
@@ -1336,12 +1389,12 @@
               }
               this.weighingList.inOutTypeKey = 1
             } else if (this.outContractNo[i].inOutType == '移库出库') {
-              this.warehouseCount = '000' + Number(this.warehouseCount + 1)
+              this.warehouseCount = '000' +(Number(this.warehouseCount) + 1) 
               this.weighingList.number =
                 'YKCK' +
                 this.getTime() +
                 this.warehouseNo +
-                this.warehouseCount.substring(this.warehouseCount.length - 4)
+                num.substring(num.length - 4,num.length)
               this.weighingList.buyer = this.outContractNo[i].receiveWarehouse
               this.weighingList.seller = this.outContractNo[i].sendWarehouse
               this.weighingList.goodsName = data.goodsName
@@ -1401,7 +1454,8 @@
                 this.warehouseName = response[i].warehouseName
                 this.warehouseId = response[i].id
                 this.positionInfos = response[i].positionInfos
-                this.warehouseCount = response[i].count
+                this.warehouseCount = response[i].outCount
+				this.warehouseCount1 = response[i].outCount
                 this.warehouseNo = response[i].commonWarehouseNo
                 this.warehouseType = response[i].warehouseType
                 if (response[i].allowEdit == 1) {
@@ -1414,9 +1468,15 @@
                 this.warehouseName = this.warehouseList[0].value
                 this.warehouseId = this.warehouseList[0].warehouseId
                 this.positionInfos = response[0].positionInfos
-                this.warehouseCount = response[0].count
+                this.warehouseCount = response[0].outCount
+				this.warehouseCount1 = response[i].outCount
                 this.warehouseNo = response[0].commonWarehouseNo
                 this.warehouseType = response[0].warehouseType
+				if (response[0].allowEdit == 1) {
+                  this.disabled = false
+                } else {
+                  this.disabled = true
+                }
               }
             }
             this.warehouseList1 = response
@@ -1669,6 +1729,7 @@
       .car-type {
         text-align: left;
         width: 50%;
+		min-width:200px;
       }
 
       .car-no {
@@ -1683,6 +1744,7 @@
 
       .titleWeight {
         width: 35%;
+		min-width:200px;
         text-align: left;
         line-height: 90px;
         color: red;