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

src/views/houseSelfCollect/acquisitionManagementAdd.vue

@@ -381,17 +381,16 @@
           break
       }
     },
-     mounted() {
-         if (window.history && window.history.pushState) {
-             history.pushState(null, null, document.URL);
-             window.addEventListener("popstate", this.onCloseGoodSelect, false);
-         }
-     },
+    mounted() {
+         if (window.history && window.history.pushState) {
+             history.pushState(null, null, document.URL);
+             window.addEventListener("popstate", this.onCloseGoodSelect, false);
+         }
+     },
     methods: {
-      //修改点击浏览器返回还显示下拉菜单为题
       onCloseGoodSelect(){
-        this.$refs.elSelect.blur()
-      },
+        this.$refs.elSelect.blur()
+      },
       paramTypeChange(e){
         // this.makeTableList()
       },

src/views/outboundManagement/newQualityInspectionManagement.vue

@@ -109,8 +109,8 @@
               <el-table-column property="status" label="状态">
               </el-table-column>
             </el-table>
-            <div style="text-align: center" v-if="inspectbtn == 1" class="paging">
-              <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
+            <div style="text-align: center">
+              <el-pagination class='switchpage' @size-change="handleSizeChange" @current-change="handleCurrentChange"
                 :current-page="currentPage" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper"
                 :total="deptBudgetTotal1">
               </el-pagination>
@@ -791,8 +791,7 @@
     text-align: center;
     margin: 20px auto;
   }
-  // /deep/.paging .el-pagination .el-select .el-input{
-  //   width: 85px !important;
-  //   margin: 0 auto !important;
-  // }
+  /deep/.switchpage.el-pagination .el-select .el-input{
+    margin:0 30px 0 10px;
+  }
 </style>

src/views/outboundManagement/weighingManagementNew.vue

@@ -529,6 +529,10 @@
 				.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.carNo=response.qualityInspectionManagement.carNumber
 					this.weighingList.boxNo=response.boxNo
 					this.weighingList.boxNoOther=response.boxNoOther
@@ -589,6 +593,7 @@
 					message: '删除成功!',
 					type: 'success',
 				})
+				this.id=''
 				this.weighingList= {
 					grossWeight: 0,
 					tare: 0,
@@ -677,30 +682,33 @@
 					})
 					return
 				}
-					// if (!this.weighingList.tare) {
-					// 	this.$message({
-					// 		message: '皮重不能为空',
-					// 		type: 'warning',
-					// 	})
-					// 	return
-					// }
-					// if (
-					// 	isNaN(this.weighingList.tare) ||
-					// 	(String(this.weighingList.tare).indexOf('.') != -1 &&
-					// 		String(this.weighingList.tare).length -
-					// 		(String(this.weighingList.tare).indexOf('.') + 1) >
-					// 		1) ||
-					// 	this.weighingList.tare < 1 ||
-					// 	this.weighingList.tare > 100000
-					// ) {
-					// 	this.$message({
-					// 		message: '皮重输入错误！',
-					// 		type: 'warning',
-					// 	})
-					// 	return
-					// }
+					
+			}
+			if(this.tpyeNo==1){
+				if (!this.weighingList.tare) {
+						this.$message({
+							message: '皮重不能为空',
+							type: 'warning',
+						})
+						return
+					}
+					if (
+						isNaN(this.weighingList.tare) ||
+						(String(this.weighingList.tare).indexOf('.') != -1 &&
+							String(this.weighingList.tare).length -
+							(String(this.weighingList.tare).indexOf('.') + 1) >
+							1) ||
+						this.weighingList.tare < 1 ||
+						this.weighingList.tare > 100000
+					) {
+						this.$message({
+							message: '皮重输入错误！',
+							type: 'warning',
+						})
+						return
+					}
 			}
-			if (this.types == 1) {
+			if (this.types == 2) {
 				if (!this.weighingList.grossWeight) {
 					this.$message({
 						message: '毛重不能为空',
@@ -768,12 +776,13 @@
 										message: '提交成功',
 									})
 									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.inspect=JSON.parse(JSON.stringify(response))
+									this.inspect=JSON.parse(JSON.stringify(this.weighingLis))
 									this.isShowPrint=true
 									this.weighingList= {
 										grossWeight: 0,
@@ -820,12 +829,13 @@
 							getweighing({id:response})
 								.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.inspect=JSON.parse(JSON.stringify(response))
+									this.inspect=JSON.parse(JSON.stringify(this.weighingList))
 									this.isShowPrint=true
 									
 								})
@@ -1013,6 +1023,31 @@
 					}
 				}
 				this.getList()
+				this.weighingList= {
+					grossWeight: 0,
+					selfLoading:0,
+					tare: 0,
+					tips:'',
+					// contractNo:'',
+					// inOutTaskNo:'',
+					buckleMiscellaneous: 0,
+					netWeight: 0,
+					receivableWeighingFee: '',
+					warehouseInOutDetail: {
+						grade:'',
+						imperfectGrain:'',
+						impurity:'',
+						jiaorenli:'',
+						bulkDensity:'',
+						mildewGrain:'',
+					},
+					qualityInspectionManagement: {
+						boxNo: "暂无",
+						boxNoOther: "暂无",
+						titleNo: "暂无",
+						titleNoOther: "暂无",
+					}
+				}
 			},
 			async openPort(){
 			 console.log('openPort', navigator)