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

public/static/weightCheck.html

@@ -233,7 +233,9 @@
                 <!-- <div class="left">
                 <img :src="item.codeUrl" alt="">
               </div> -->
-                <div class="config">收货单位签名或盖章：</div>
+                
+              <div class="config" v-if="item.warehouseName!='白城补数据'">收货单位签名或盖章：</div>
+              <div class="config" v-if="item.warehouseName=='白城补数据'">收货单位签名或盖章：黑龙江中天昊元贸易有限公司</div>
                 <div class="autograph">客户签名：</div>
                 <div class="autograph" v-if="item.warehouseName!='白城补数据'">司机签名：</div>
               </div>
@@ -335,7 +337,8 @@
                 <!-- <div class="left">
                 <img :src="item.codeUrl" alt="">
               </div> -->
-                <div class="config">收货单位签名或盖章：</div>
+                <div class="config" v-if="item.warehouseName!='白城补数据'">收货单位签名或盖章：</div>
+                <div class="config" v-if="item.warehouseName=='白城补数据'">收货单位签名或盖章：黑龙江中天昊元贸易有限公司</div>
                 <div class="autograph">客户签名：</div>
                 <div class="autograph" v-if="item.warehouseName!='白城补数据'">司机签名：</div>
               </div>
@@ -440,7 +443,9 @@
               <!-- <div class="left">
                 <img :src="tableData.codeUrl" alt="">
               </div> -->
-              <div class="config">收货单位签名或盖章：</div>
+              
+              <div class="config" v-if="_item.warehouseName!='白城补数据'">收货单位签名或盖章：</div>
+              <div class="config" v-if="_item.warehouseName=='白城补数据'">收货单位签名或盖章：黑龙江中天昊元贸易有限公司</div>
               <div class="autograph">客户签名：</div>
               <div class="autograph" v-if="_item.warehouseName!='白城补数据'">司机签名：</div>
             </div>

src/views/outboundManagement/weighingManagementNew.vue

@@ -776,13 +776,13 @@
         this.$refs.weightChild.openPort()
       },
 
-      listclick(row) {debugger
+      listclick(row) {
         this.id = row.id
         getweighing({
             id: row.id,
           })
           .toPromise()
-          .then((response) => {debugger
+          .then((response) => {
             this.weighingList = response
             // this.weighingList.grossWeight = this.weighingList.grossWeight * 1000
             // this.weighingList.tare = this.weighingList.tare * 1000
@@ -889,6 +889,12 @@
         }
       },
       print() {
+        if(this.tpyeNo==2){
+          if(this.weighingList.qualityInspectionManagement.status != '已质检'){
+            this.$message.error("该条信息未质检！")
+            return
+          }
+        }
         this.weighingList.carNumber = this.weighingList.carNo
         if (this.types == 1 || this.types == 2) {
           if (!this.weighingList.contractNo) {
@@ -1575,9 +1581,13 @@
       },
       contractNoChange(e) {
         this.warehouseCount = this.warehouseCount1
-        console.log(this.warehouseCount)
         for (let i = 0; i < this.taskNolist.length; i++) {
           if (this.taskNolist[i].inOutTaskNo == e) {
+            //  this.weighingList.number = this.taskNolist[i].inOutTaskNo
+              this.warehouseCount = '000' + (Number(this.warehouseCount) + 1)
+              this.weighingList.number = 'XSCK' + this.getTime() +  this.warehouseNo + this.warehouseCount.substring(this.warehouseCount.length - 4)
+             this.weighingList.goodsName = this.taskNolist[i].goodsName
+             this.weighingList.tips = this.taskNolist[i].businessDescribe
             var data = this.taskNolist[i]
             if (this.taskNolist[i].contractNo) {
               // console.log(this.taskNolist[i])
@@ -1601,11 +1611,7 @@
             this.weighingList.inOutType = this.outContractNo[i].inOutType
             if (this.outContractNo[i].inOutType == '销售出库') {
               this.warehouseCount = '000' + (Number(this.warehouseCount) + 1)
-              this.weighingList.number =
-                'XSCK' +
-                this.getTime() +
-                this.warehouseNo +
-                this.warehouseCount.substring(this.warehouseCount.length - 4)
+              this.weighingList.number = 'XSCK' + this.getTime() +  this.warehouseNo + this.warehouseCount.substring(this.warehouseCount.length - 4)
               this.weighingList.buyer = this.outContractNo[i].buyer
               this.weighingList.seller = localStorage.getItem('ws-pf_compName')
               if (!this.outContractNo[i].unitContractPrice) {

src/views/taskManagement/tranManagementLook.vue

@@ -230,7 +230,6 @@ export default {
       examinetran({ id: this.$route.query.id })
         .toPromise()
         .then((response) => {
-          
           this.checkList = response.tranType.split(',')
           this.deptBudgetList = response
           // for (let i = 0; i < this.deptBudgetList.tranProcessInfoList.length; i++) {