Merge branch 'master' of http://git.zthymaoyi.com:3000/gdc/yiliangyiyun-pc

public/static/inspection.html

@@ -239,6 +239,10 @@
           <div>客户姓名：</div>
           <div>{{tableData.customerName}}</div>
         </div>
+        <div class="small-row">
+          <div>客户身份证：</div>
+          <div>{{tableData.customerNumberCard}}</div>
+        </div>
         <div class="small-row">
           <div>客户电话：</div>
           <div>{{tableData.customerPhone}}</div>
@@ -247,6 +251,10 @@
           <div>车牌号：</div>
           <div>{{tableData.carNumber}}</div>
         </div>
+        <div class="small-row">
+          <div>仓位号：</div>
+          <div>{{tableData.binNumber}}</div>
+        </div>
         <div class="small-row">
           <div>收货单位：</div>
           <div>{{tableData.compName}}</div>
@@ -325,9 +333,6 @@
         <div class="small-row">
           <div>收货单位签名或盖章:</div>
         </div>
-        <div class="small-row">
-          <div class="sign">客户签名:</div>
-        </div>
       </div>
     </div>
   </body>

public/static/weightCheck.html

@@ -333,6 +333,10 @@
         <div class="small-row">
           <div>客户姓名</div>
           <div>{{tableData.customer}}</div>
+        </div>
+         <div class="small-row">
+          <div>客户身份证：</div>
+          <div>{{tableData.customerNumberCard}}</div>
         </div>
         <div class="small-row">
           <div>客户电话</div>
@@ -342,6 +346,10 @@
           <div>车牌号</div>
           <div>{{tableData.carNumber}}</div>
         </div>
+        <div class="small-row">
+          <div>仓位号：</div>
+          <div>{{tableData.binNumber}}</div>
+        </div>
         <div class="small-row">
           <div>收货单位</div>
           <div>{{tableData.compName}}</div>
@@ -390,10 +398,6 @@
         <div class="small-row">
           <div>收货单位签名或盖章:</div>
         </div>
-        <div class="small-row">
-          <div class="sign">客户签名:</div>
-        </div>
-       
       </div>
     </div>
   </body>

src/views/houseSelfCollect/weighingManagement.vue

@@ -431,15 +431,14 @@
         this.getList()
       },
       isConfirmQuality(val) {
-        if (val.qualityInspectionManagement.confirm == '1' && val.qualityInspectionManagement.warehouseName == '哈尔滨依兰库')
-          return false;
-        return true
+        if (val.qualityInspectionManagement.confirm == '0' && val.qualityInspectionManagement.warehouseName == '白城内陆港') return false;
+        return true;
       },
       weightCheck(row, num) {
         console.log(this.cangid)
         // 质检是否是已确定状态
-        // let _isGoweightCheck = this.isConfirmQuality(row)
-        let _isGoweightCheck = true
+        let _isGoweightCheck = this.isConfirmQuality(row)
+        // let _isGoweightCheck = true
         console.log(row.qualityInspectionManagement)
         if (_isGoweightCheck) {
           this.$router.push({

src/views/warehouse/warehouseManagementNoWeight.vue

@@ -259,7 +259,7 @@
             type: 'warning',
           })
           .then(() => {
-              addstorageputList({statusFlag:1,id:this.id,positionId:this.deptBudgetList.positionId,binNumber:this.binNumber,warehouseInOutDetail:{}}).toPromise()
+              addstorageputList({statusFlag:1,id:this.id,positionId:this.deptBudgetList.positionId,binNumber:this.binNumber,warehouseInOutDetail: JSON.parse(this.warehouseInOutDetail)}).toPromise()
 						.then((response) => {
               this.$notify.success({
                   title: '成功',
@@ -295,6 +295,7 @@
               this.$forceUpdate()
 						})
          this.id=row.id
+         this.warehouseInOutDetail= JSON.stringify(row.warehouseInOutDetail),
          this.dialogVisible=true
 
        },