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

public/static/weightCheck.html

@@ -605,9 +605,7 @@
           }
         } else {
           this.tableData = JSON.parse(_data)
-          console.log("sssss",this.tableData)
         }
-        console.log("ooooooo",this.tableData1)
         // sessionStorage.setItem('record_print', JSON.stringify(response))
         // this.tableData = JSON.parse(sessionStorage.getItem("record_print"))
 

src/views/houseSelfCollect/acquisitionManagement.vue

@@ -6,7 +6,7 @@
         <el-button type="primary" @click="newAcquisition('','','新增')"
           v-hasPermission=" `acquisitionManagement.acquisitionCustomer.add`">新增</el-button>
         <div>
-          <el-select v-model="selectVal" placeholder="请选择" @change="warehouseChange" style="margin:0 20px">
+          <el-select v-model="selectVal" placeholder="请选择" @change="warehouseChange" style="margin:0 20px" filterable>
             <el-option v-for="item in warehouseList" :key="item.id" :label="item.warehouseName" :value="item.id">
             </el-option>
           </el-select>

src/views/houseSelfCollect/inspectionManagementNew.vue

@@ -1988,18 +1988,9 @@
       warehousetypechange(status){
         this.serviceManagementType=status
         if(status==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.warehouseCount = '000' + Number(this.warehouseCount + 1)
+          this.deptBudgetList.qualityNo='SGRK'+this.getTime()+this.warehouseNo+this.warehouseCount.substring(this.warehouseCount.length - 4)
         }
         this.getList()
       },

src/views/houseSelfCollect/newWeighingManagement.vue

@@ -541,7 +541,6 @@
                 this.dialogData.compName = this.companyName
                 this.dialogDataList.push( this.dialogData)
              }
-             console.log("dsdi",this.dialogDataList)
               window.open('../../../../static/weightCheck.html?type=2&tableData=' + JSON.stringify(this.dialogDataList))
               // this.printBig("", this.radio)
             })
@@ -1261,7 +1260,6 @@
             } else if (this.tpyeNo == 2) {
               this.weighingList.warehouseId = this.cangid;
               this.weighingList.skinInspector = localStorage.getItem('ws-pf_staffName')
-              console.log(this.weighingList)
               tare(this.weighingList)
                 .toPromise()
                 .then((response) => {

src/views/outboundManagement/component/outInspectPrint.vue

@@ -5,19 +5,19 @@
     <table class="table">
       <tr class="row">
         <td class="col col-bgc">收货单位</td>
-        <td class="col" colspan="2">{{ printData.contractManagement.buyer }}</td>
+        <td class="col" colspan="2">{{ printData.contractManagement ? printData.contractManagement.buyer:"" }}</td>
         <td class="col col-bgc">联系电话</td>
-        <td class="col" colspan="2">{{ printData.contractManagement.buyerPhone }}</td>
+        <td class="col" colspan="2">{{ printData.contractManagement ?printData.contractManagement.buyerPhone:"" }}</td>
         <td class="col col-bgc">车牌号</td>
         <td class="col">{{ printData.carNumber }}</td>
       </tr>
       <tr class="row">
         <td class="col col-bgc">发货单位</td>
-        <td class="col" colspan="2">{{ printData.contractManagement.seller }}</td>
+        <td class="col" colspan="2">{{ printData.contractManagement ? printData.contractManagement.seller:"" }}</td>
         <td class="col col-bgc">联系人</td>
-        <td class="col" colspan="2">{{ printData.contractManagement.feedbackLeader }}</td>
+        <td class="col" colspan="2">{{ printData.contractManagement ? printData.contractManagement.feedbackLeader:"" }}</td>
         <td class="col col-bgc">联系电话</td>
-        <td class="col">{{ printData.contractManagement.sellerPhone }}</td>
+        <td class="col">{{ printData.contractManagement ? printData.contractManagement.sellerPhone:"" }}</td>
       </tr>
       <tr class="row">
         <td class="col col-bgc">货名</td>
@@ -39,7 +39,7 @@
         <td v-if="printData.contractManagement.priceType == '定价销售'" class="col col-bgc">单价（元/公斤）</td>
         <td v-else class="col col-bgc">待定单价（元/公斤）</td>
         <!-- <td v-if="printData.type == '潮粮'" class="col">{{ printData.tidalGrainPrice }}</td> -->
-        <td class="col">{{ printData.contractManagement.unitContractPrice }}</td>
+        <td class="col">{{ contractManagement ? printData.contractManagement.unitContractPrice:"" }}</td>
       </tr>
       <tr class="row">
         <td class="col col-bgc">杂质（%）</td>

src/views/outboundManagement/newQualityInspectionManagement.vue

@@ -51,16 +51,16 @@
             </ws-form-item>
 
             <ws-form-item label="箱号-1" span="1" prop="boxNo">
-              <ws-input v-model="inspect.boxNo" placeholder="暂无" disabled size="small" />
+              <ws-input v-model="inspect.weighingManagement.boxNo" placeholder="暂无" disabled size="small" />
             </ws-form-item>
             <ws-form-item label="箱号-2" span="1" prop="boxNoOther">
-              <ws-input v-model="inspect.boxNoOther" placeholder="暂无" disabled size="small" />
+              <ws-input v-model="inspect.weighingManagement.boxNoOther" placeholder="暂无" disabled size="small" />
             </ws-form-item>
             <ws-form-item label="封号-1" span="1" prop="titleNo">
-              <ws-input v-model="inspect.titleNo" placeholder="暂无" disabled size="small" />
+              <ws-input v-model="inspect.weighingManagement.titleNo" placeholder="暂无" disabled size="small" />
             </ws-form-item>
             <ws-form-item label="封号-2" span="1" prop="titleNoOther">
-              <ws-input v-model="inspect.titleNoOther" placeholder="暂无" disabled size="small" />
+              <ws-input v-model="inspect.weighingManagement.titleNoOther" placeholder="暂无" disabled size="small" />
             </ws-form-item>
           </ws-info-table>
         </ws-form>

src/views/outboundManagement/outInspectRecord.vue

@@ -174,7 +174,8 @@
             currentPage: this.currentPage,
             pageSize: this.pageSize,
             searchKeyWord: this.searchKeyWord,
-            statusType:this.statusType,
+            // statusType:this.statusType,
+            qualityType:"2",
             warehouseName: this.warehouseName,
             managementType: this.managementType,
           })

src/views/outboundManagement/weighingManagementNew.vue

@@ -32,7 +32,7 @@
 						<div>{{tpyeNo == 1?'皮重':'毛重'}} </div>
 						<div class="confirmInfo">
 							<div class="car-type">车牌号</div>
-							<div class="car-no">{{ carWeightInfo.carNumber }}</div>
+							<div class="car-no">{{ weighingList.carNumber }}</div>
 						</div>
 						<div class="confirmInfo">
 							<div class="car-type">浮动重量</div>
@@ -399,10 +399,14 @@
 		this.selectWarehouse()
       	this.showType = this.isShow
 	  	this.openPort()
-		  this.getNowTime()
+		this.getNowTime()
 	},
 	activated() {
-			
+		if(	localStorage.getItem('houseSelfCollect_house1').allowEdit == 1){
+			this.disabled = false
+		}else{
+			this.disabled = true
+		}		
 	},
 	methods: {
 		statustypechangelist(status){
@@ -947,6 +951,11 @@
 							count:this.warehouseList1[i].count,
 							warehouseId:this.warehouseList1[i].id
 						}))
+							if(	this.warehouseList1[i].allowEdit == 1){
+			this.disabled = false
+		}else{
+			this.disabled = true
+		}
 						this.positionInfos=this.warehouseList1[i].positionInfos
 						this.warehouseCount = this.warehouseList1[i].count
                   		this.warehouseNo = this.warehouseList1[i].commonWarehouseNo
@@ -1096,7 +1105,8 @@
 			},
 			carChange(e) {
 				for (let i = 0; i < this.tranCarInfoList.length; i++) {
-					if (this.tranCarInfoList[i].carNo == this.deptBudgetList.carNo) {
+					if (this.tranCarInfoList[i].carNo == this.weighingList.carNo) {
+						this.weighingList.carNumber =this.tranCarInfoList[i].carNo
 						this.weighingList.tranCarNo = this.tranCarInfoList[i].tranCarNo
 						this.weighingList.carId = this.tranCarInfoList[i].id
 					}
@@ -1210,6 +1220,11 @@
 							this.warehouseCount = response[i].count
 							this.warehouseNo = response[i].commonWarehouseNo
 							this.warehouseType=response[i].warehouseType
+							if( response[i].allowEdit == 1){
+								this.disabled = false
+							}else{
+								this.disabled = true
+							}
 						}
 						if (!_wareHouse) {
 							this.warehouseName = this.warehouseList[0].value

src/views/warehouse/warehouseManagementRecord.vue

@@ -677,10 +677,6 @@
 				
 			// },
       batchPrint() {
-<<<<<<< HEAD
-      
-=======
->>>>>>> origin
         this.printList = []
         if (this.modification.length == 0) {
           this.$message.error("请勾选要打印的条目！")