dev分支提交

src/views/houseSelfCollect/inspectionManagementNew.vue

@@ -99,7 +99,7 @@
                 <ws-form-item v-if='serviceManagementType==3' label="货名" span="1" prop="inOutTaskNo">
                   <el-select v-model="deptBudgetList.goodsName" clearable filterable placeholder="请选择" class="typeselect"
                     @change="goodsNameChange" :disabled="goodsdisabled">
-                    <el-option v-for="item in goodnameList" :key="'huoming'+item.valueKey" :label="item.goodsName" :value="item.goodsName" />
+                    <el-option v-for="item in goodnameList" :key="'huoming'+item.id" :label="item.goodsName" :value="item.goodsName" />
                   </el-select>
                 </ws-form-item>
                 <ws-form-item v-if='statusTypetext!="初检"&&serviceManagementType==1' label="经办人" span="1" prop="agent">
@@ -500,7 +500,7 @@
       },
       goodsNameChange(e){
         for (let q = 0; q < this.goodnameList.length; q++) {
-            if(this.goodnameList[q].contractNo=e){
+            if(this.goodnameList[q].goodsName=e){
               this.deptBudgetList.goodsName=this.goodnameList[q].goodsName
               this.deptBudgetList.goodsNameKey=this.goodnameList[q].goodsNameKey
             } 
@@ -1919,10 +1919,8 @@
       },
       warehousetypechange(status){
         this.serviceManagementType=status
-        debugger
         if(status==3){
-          this.warehouseCount = '000' + Number(this.warehouseCount + 1)
-          this.deptBudgetList.qualityNo='SGRK'+this.getTime()+this.warehouseNo+this.warehouseCount.substring(this.warehouseCount.length - 4)
+          this.deptBudgetList.qualityNo='SGRK'+this.getTime()+this.warehouseNo+this.warehouseCount
         }
         this.getList()
       },
@@ -2064,7 +2062,60 @@
               console.log(response)
               this.taskNolist = response
             })
-           
+            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:'',
+          },
+          
+          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:'',
+        }
               this.getList()
           }
         }

src/views/outboundManagement/component/route.js

@@ -130,19 +130,19 @@ const outboundManagementRouter = {
           },
 
         // 付款管理
-        {
-            path:'collectionManagement',
-            component: () =>
-                import(/* webpackChunkName: "sparepartList" */ '@/views/outboundManagement/collectionManagement'),
-            name:'collectionManagement',
-            meta: {
-                title:'collectionManagement',
-                shortcutEntrance:'outboundManagement',
-                module:'outbound.collectionOut.weight',
-                permissicon: [],
-                keepAlive: true
-            }
-        },
+        // {
+        //     path:'collectionManagement',
+        //     component: () =>
+        //         import(/* webpackChunkName: "sparepartList" */ '@/views/outboundManagement/collectionManagement'),
+        //     name:'collectionManagement',
+        //     meta: {
+        //         title:'collectionManagement',
+        //         shortcutEntrance:'outboundManagement',
+        //         module:'outbound.collectionOut.weight',
+        //         permissicon: [],
+        //         keepAlive: true
+        //     }
+        // },
         //查看收款管理
         {
             path: 'collectionment',

src/views/outboundManagement/newQualityInspectionManagement.vue

@@ -235,10 +235,30 @@
         .toPromise()
         .then((response) => {
           this.warehouseList = response
-          if (localStorage.getItem('ck')) {
-            this.warehouseName = localStorage.getItem('ck')
+          let _wareHouse = localStorage.getItem('houseSelfCollect_house1')
+					_wareHouse = JSON.parse(_wareHouse)
+					for (let i = 0; i < response.length; i++) {
+						if (_wareHouse && response[i].warehouseName == _wareHouse.value) {
+							this.warehouseName = response[i].warehouseName
+							this.warehouseId = response[i].warehouseId
+							this.positionInfos=response[i].positionInfos
+							this.warehouseCount = response[i].count
+							this.warehouseNo = response[i].commonWarehouseNo
+							this.warehouseType=response[i].warehouseType
+						}
+						if (!_wareHouse) {
+							this.warehouseName = this.warehouseList[0].value
+							this.warehouseId = this.warehouseList[0].warehouseId
+							this.positionInfos=response[0].positionInfos
+							this.warehouseCount = response[0].count
+							this.warehouseNo = response[0].commonWarehouseNo
+							this.warehouseType=response[0].warehouseType
+						}
+					}
+          if (_wareHouse ) {
+            this.warehouseName =_wareHouse.value
             for (var i = 0; i < response.length; i++) {
-              if (this.warehouseName == this.warehouseList[i].warehouseName) {
+              if (response[i].warehouseName == _wareHouse.value) {
                 this.cangid = this.warehouseList[i].id
                 break
               }
@@ -262,7 +282,22 @@
         localStorage.setItem('out-Warehouse_print',JSON.stringify(this.inspect))
         window.open('../../../static/outInspectionPrint.html')
        },
-      warehouseNameChange() {
+      warehouseNameChange(e) {
+        for (let i = 0; i < this.warehouseList.length; i++) {
+					if(this.warehouseList[i].warehouseName==e){
+						localStorage.setItem('houseSelfCollect_house1', JSON.stringify({
+							No:this.warehouseList[i].commonWarehouseNo,
+							allowEdit:this.warehouseList[i].allowEdit,
+							value:this.warehouseList[i].warehouseName,
+							count:this.warehouseList[i].count,
+							warehouseId:this.warehouseList[i].id
+						}))
+						// this.positionInfos=this.warehouseList1[i].positionInfos
+						// this.warehouseCount = this.warehouseList1[i].count
+            //       		this.warehouseNo = this.warehouseList1[i].commonWarehouseNo
+						//   this.warehouseType=this.warehouseList1[i].warehouseType
+					}
+				}
         this.getList()
       },
       record(){

src/views/outboundManagement/outInspectRecord.vue

@@ -14,7 +14,7 @@
     </el-row>
     <BaseHeaderLayout :leftSpan="12">
       <template slot="right">
-        <ws-select style='margin-right:10px;' v-model="warehouseName" placeholder="" @change="selecttaskType"
+        <ws-select style='margin-right:10px;width:400px;' v-model="warehouseName" placeholder="" @change="selecttaskType"
           :value="searchType">
           <ws-option v-for="item in warehouseList" :key="item.value" :label="item.value" :value="item.value"
             style="color: #8890b1;" />
@@ -94,6 +94,7 @@
         inspect: [],
         warehouseList: [],
         cangid: '', //仓库id
+        statusType:'1'
       }
     },
     activated() {
@@ -173,6 +174,7 @@
             currentPage: this.currentPage,
             pageSize: this.pageSize,
             searchKeyWord: this.searchKeyWord,
+            statusType:this.statusType,
             warehouseName: this.warehouseName,
             managementType: this.managementType,
           })

src/views/outboundManagement/weighingManagementNew.vue

@@ -41,10 +41,10 @@
 						<div class="confirmWeight">
 							<div class="titleWeight">确认重量</div>
 							<div v-if="index == 0" class="weight">
-							{{ weighingList.grossWeight }} <span class="kg-style">kg</span>
+							{{ weighingList.tare }} <span class="kg-style">kg</span>
 							</div>
 							<div v-else class="weight">
-							{{ weighingList.tare }} <span class="kg-style">kg</span>
+							{{ weighingList.grossWeight }} <span class="kg-style">kg</span>
 							</div>
 						</div>
 						<el-button @click='weightweight' type="success" plain>确定</el-button>
@@ -109,12 +109,12 @@
 								<ws-form-item label="货名" span="1" prop="goodsName">
 									<ws-input v-model="weighingList.goodsName" placeholder="自动获取，不可编辑" maxlength="100" disabled size="small" />
 								</ws-form-item>
-								<ws-form-item v-if='tpyeNo==1' label="仓位号" span="1" prop="inOutTaskNo">
+								<ws-form-item v-if='tpyeNo==1&&warehouseType==1' label="仓位号" span="1" prop="inOutTaskNo">
 									<el-select @change='binNumberchange' :disabled='recheck' filterable clearable v-model="weighingList.binNumber" placeholder="请选择仓位号" class="typeselect">
 										<el-option v-for="item in positionInfos" :key="item.id" :label="item.binNumber" :value="item.binNumber" />
 									</el-select>
 								</ws-form-item>
-								<ws-form-item v-if='tpyeNo==1' label="囤位号" span="1" prop="storageNumber">
+								<ws-form-item v-if='tpyeNo==1&&warehouseType==1' label="囤位号" span="1" prop="storageNumber">
 									<ws-input :disabled='recheck' v-model="weighingList.storageNumber" placeholder="选填，1-10个字符" maxlength="10" size="small" />
 								</ws-form-item>
 								<ws-form-item v-if='tpyeNo==1' label="出库类型" span="1">
@@ -125,7 +125,7 @@
 									value-format="yyyy-MM-dd" />
 								</ws-form-item>
 								<ws-form-item label="运输方式" span="1" prop="outType">
-									<el-select v-model="weighingList.outType" placeholder="请选择运输方式">
+									<el-select :disabled='tpyeNo==2' v-model="weighingList.outType" placeholder="请选择运输方式">
 										<el-option v-for="item in multiSelector" :key="item.value" :label="item.name" :value="item.name" />
 									</el-select>
 								</ws-form-item>
@@ -136,7 +136,7 @@
 								</ws-form-item>
 								<ws-form-item label="车牌号" span="1" prop="carNo"
 									v-if="weighingList.outType == '汽运' || weighingList.outType == '集装箱船'">
-									<ws-input v-if="!carstatus || carjudge" v-model="weighingList.carNo" placeholder="请输入车牌号"
+									<ws-input v-if="!carstatus || carjudge" :disabled='tpyeNo==2' v-model="weighingList.carNo" placeholder="请输入车牌号"
 									maxlength="7" size="small" />
 									<el-select v-else filterable clearable v-model="weighingList.carNo"
 									placeholder="请选择车牌号" class="typeselect" @change="carChange">
@@ -149,31 +149,31 @@
 									weighingList.outType == '汽运' ||
 									weighingList.outType == '集装箱船'
 									">
-									<ws-input v-model="weighingList.boxNo" placeholder="请输入箱号" maxlength="20" size="small" />
+									<ws-input :disabled='tpyeNo==2' v-model="weighingList.boxNo" placeholder="请输入箱号" maxlength="20" size="small" />
 								</ws-form-item>
 								<ws-form-item label="箱号-2" span="1" prop="boxNoOther" v-if="
 									weighingList.outType == '汽运' ||
 									weighingList.outType == '集装箱船'
 									">
-									<ws-input v-model="weighingList.boxNoOther" placeholder="请输入箱号" maxlength="20" size="small" />
+									<ws-input :disabled='tpyeNo==2' v-model="weighingList.boxNoOther" placeholder="请输入箱号" maxlength="20" size="small" />
 								</ws-form-item>
 								<ws-form-item label="封号-1" span="1" prop="titleNo" v-if="
 									weighingList.outType == '汽运' ||
 									weighingList.outType == '集装箱船'
 									">
-									<ws-input v-model="weighingList.titleNo" placeholder="请输入封号" maxlength="20" size="small" />
+									<ws-input :disabled='tpyeNo==2' v-model="weighingList.titleNo" placeholder="请输入封号" maxlength="20" size="small" />
 								</ws-form-item>
 								<ws-form-item label="封号-2" span="1" prop="titleNoOther" v-if="
 									weighingList.outType == '汽运' ||
 									weighingList.outType == '集装箱船'
 									">
-									<ws-input v-model="weighingList.titleNoOther" placeholder="请输入封号" maxlength="20" size="small" />
+									<ws-input :disabled='tpyeNo==2' v-model="weighingList.titleNoOther" placeholder="请输入封号" maxlength="20" size="small" />
 								</ws-form-item>
 								<ws-form-item label="车厢号-1" span="1" prop="wingNumber" v-if="weighingList.outType == '火运'">
-									<ws-input v-model="weighingList.wingNumber" placeholder="请输入车厢号" maxlength="20" size="small" />
+									<ws-input	:disabled='tpyeNo==2' v-model="weighingList.wingNumber" placeholder="请输入车厢号" maxlength="20" size="small" />
 								</ws-form-item>
 								<ws-form-item label="车厢号-2" span="1" prop="wingNumberOther" v-if="weighingList.outType == '火运'">
-									<ws-input v-model="weighingList.wingNumberOther" placeholder="请输入车厢号" maxlength="20" size="small" />
+									<ws-input	:disabled='tpyeNo==2' v-model="weighingList.wingNumberOther" placeholder="请输入车厢号" maxlength="20" size="small" />
 								</ws-form-item>
 								<ws-form-item label="船名" span="1" prop="shipName" v-if="weighingList.outType == '散船'">
 									<ws-input v-model="weighingList.shipName" placeholder="请输入船名" maxlength="20" size="small" />
@@ -185,12 +185,18 @@
 									<ws-input type="number" @mousewheel.native.prevent v-if="tpyeNo==2"
 										v-model="weighingList.grossWeight" @input="calculation(status)" placeholder="未获取到毛重" maxlength="100"
 										size="small" :disabled="disabled" />
-										<el-button v-if="tpyeNo == 2" @click="openPort">重新获取</el-button>
+										<el-button v-if="tpyeNo == 2&&warehouseType==1" @click="openPort">重新获取</el-button>
+										<el-button v-if="tpyeNo == 2&&warehouseType==2" @click="disabled=false">编辑</el-button>
+								</ws-form-item>
+								<ws-form-item label="皮重(KG)" span="1" prop="tare" v-if="information == '毛重'">
+									<ws-input type="number" @mousewheel.native.prevent v-model="weighingList.tare" @input="calculation"
+										placeholder="未获取到皮重" maxlength="100" size="small" disabled />
 								</ws-form-item>
 								<ws-form-item label="皮重(KG)" span="1" prop="tare" v-if="information == '皮重'">
 									<ws-input type="number" @mousewheel.native.prevent v-model="weighingList.tare" @input="calculation"
 										placeholder="未获取到皮重" maxlength="100" size="small" :disabled="disabled" />
-									<el-button v-if="tpyeNo == 1" @click="openPort">重新获取</el-button>
+									<el-button v-if="tpyeNo == 1&&warehouseType==1" @click="openPort">重新获取</el-button>
+									<el-button v-if="tpyeNo == 1&&warehouseType==2" @click="disabled=false">编辑</el-button>
 								</ws-form-item>
 									<div class="formItem">
 										<ws-form-item label="扣重(KG)" span="1" prop="buckleMiscellaneous"
@@ -311,6 +317,7 @@
 				deliveryList:[],
 				positionInfos:[],
 				searchKeyWord:'',
+				paramType:'',
 				deptBudgetTotal:0,
 				monitorUrl1:'',
 				monitorUrl2:'',
@@ -337,7 +344,7 @@
 				carjudge: false,
 				warehouseCount:0,
                 warehouseNo:'',
-				statusType:'',
+				statusType:'1',
 				warehouseType:1,
 				weighingList: {
 					weight:'',
@@ -392,6 +399,7 @@
 		this.selectWarehouse()
       	this.showType = this.isShow
 	  	this.openPort()
+		  this.getNowTime()
 	},
 	activated() {
 			
@@ -401,6 +409,17 @@
 			this.statusType=status
 			this.getList()
 		},
+		getNowTime() {
+       var now = new Date();
+       var year = now.getFullYear(); //得到年份
+       var month = now.getMonth(); //得到月份
+       var date = now.getDate(); //得到日期
+       month = month + 1;
+       month = month.toString().padStart(2, "0");
+       date = date.toString().padStart(2, "0");
+       var defaultDate = `${year}-${month}-${date}`;
+       this.$set(this.weighingList, "inOutDate", defaultDate);
+   },
 		record(){
 			this.$router.push({path: 'weighingManagementrecord' })
 		},
@@ -508,6 +527,13 @@
 				.then((response) => {
 					console.log(response)
 					this.weighingList=response
+					this.weighingList.carNo=response.qualityInspectionManagement.carNumber
+					this.weighingList.boxNo=response.qualityInspectionManagement.boxNo
+					this.weighingList.boxNoOther=response.qualityInspectionManagement.boxNoOther
+					this.weighingList.titleNo=response.qualityInspectionManagement.titleNo
+					this.weighingList.titleNoOther=response.qualityInspectionManagement.titleNoOther
+					this.weighingList.wingNumber=response.qualityInspectionManagement.wingNumber
+					this.weighingList.wingNumberOther=response.qualityInspectionManagement.wingNumberOther
 					this.weighingList.warehouseInOutDetail={
 						grade:'',
 						imperfectGrain:'',
@@ -721,16 +747,18 @@
 						tareEdit(this.weighingList)
 						.toPromise()
 						.then((response) => {
-							this.$notify.success({
-								title: '成功',
-								message: '提交成功',
-							})
+							
 							addstorageputList(this.weighingList)
 							.toPromise()
 							.then((response) => {
 								if (this.reader) {
 									this.reader.cancel()
 								}
+								this.$notify.success({
+								title: '成功',
+								message: '提交成功',
+							})
+							this.getList()
 								this.inspect=JSON.parse(JSON.stringify(this.weighingList))
 								this.isShowPrint=true
 								this.weighingList= {
@@ -757,7 +785,7 @@
 										titleNoOther: "暂无",
 									}
 								}
-								this.getList()
+								
 							})
 						})
 						.catch((response) => {})
@@ -870,7 +898,9 @@
 		tabClick(val){
 			this.weighingList = []
 			this.index = val
+			this.disabled=true
 			if (val == 0) {
+				this.statusType='1'
 				this.information = '皮重'
 				this.tpyeNo = '1'
 			} else {
@@ -887,6 +917,13 @@
 				}
 				for (let i = 0; i < this.warehouseList1.length; i++) {
 					if(this.warehouseList1[i].warehouseName==e){
+						localStorage.setItem('houseSelfCollect_house1', JSON.stringify({
+							No:this.warehouseList1[i].commonWarehouseNo,
+							allowEdit:this.warehouseList1[i].allowEdit,
+							value:this.warehouseList1[i].warehouseName,
+							count:this.warehouseList1[i].count,
+							warehouseId:this.warehouseList1[i].id
+						}))
 						this.positionInfos=this.warehouseList1[i].positionInfos
 						this.warehouseCount = this.warehouseList1[i].count
                   		this.warehouseNo = this.warehouseList1[i].commonWarehouseNo
@@ -1119,9 +1156,11 @@
 					if (this.outContractNo[i].tranCarInfoList) {
 						this.options2 = this.outContractNo[i].tranCarInfoList
 						this.tranCarInfoList = this.outContractNo[i].tranCarInfoList
-						this.fleetNameList=this.outContractNo[i].tranCarInfoList1
 						this.carstatus = true
 					}
+					if(this.outContractNo[i].tranCarInfoList1){
+						this.fleetNameList=this.outContractNo[i].tranCarInfoList1
+					}
 				}
 				}
 			},
@@ -1138,13 +1177,28 @@
 						warehouseId: response[i].id,
 					})
 					}
+					let _wareHouse = localStorage.getItem('houseSelfCollect_house1')
+					_wareHouse = JSON.parse(_wareHouse)
+					for (let i = 0; i < response.length; i++) {
+						if (_wareHouse && response[i].warehouseName == _wareHouse.value) {
+							this.warehouseName = response[i].warehouseName
+							this.warehouseId = response[i].warehouseId
+							this.positionInfos=response[i].positionInfos
+							this.warehouseCount = response[i].count
+							this.warehouseNo = response[i].commonWarehouseNo
+							this.warehouseType=response[i].warehouseType
+						}
+						if (!_wareHouse) {
+							this.warehouseName = this.warehouseList[0].value
+							this.warehouseId = this.warehouseList[0].warehouseId
+							this.positionInfos=response[0].positionInfos
+							this.warehouseCount = response[0].count
+							this.warehouseNo = response[0].commonWarehouseNo
+							this.warehouseType=response[0].warehouseType
+						}
+					}
 					this.warehouseList1=response
-					this.warehouseName = this.warehouseList[0].value
-					this.warehouseId = this.warehouseList[0].warehouseId
-					this.positionInfos=response[0].positionInfos
-					this.warehouseCount = response[0].count
-                  	this.warehouseNo = response[0].commonWarehouseNo
-					this.warehouseType=response[0].warehouseType
+					
 					this.getList()
 				})
 			},

src/views/warehousenew/component/router/index.js

@@ -382,7 +382,7 @@ const warehouseManagementRouter = {
         shortcutEntrance: 'warehouseManagementPutOutLook',
         module: 'warehouseManagement.warehouse.warehouseInfo',
         permissicon: [],
-        keepAlive: true
+        keepAlive: false
         // module: 'procurement.sparepart.applDetail'
       },
       hidden: true