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

src/views/houseSelfCollect/newWeighingManagement.vue

@@ -1612,6 +1612,7 @@
       border-radius: 4px;
       min-width: 355px;
       width: 40%;
+      min-height: 685px;
 
       .but {
         position: absolute;
@@ -1669,6 +1670,7 @@
     padding: 10px;
     margin-left: 20px;
     border-radius: 4px;
+    min-height: 685px;
   }
 
   .screen {

src/views/outboundManagement/weighingManagementNew.vue

@@ -1150,7 +1150,7 @@
 			calculation() {
 				if (this.weighingList.grossWeight && this.weighingList.tare) {
 					let count = 0
-					this.weighingList.netWeight = this.weighingList.tare - this.weighingList.grossWeight
+					this.weighingList.netWeight = this.weighingList.grossWeight -  this.weighingList.tare - Number(this.weighingList.buckleMiscellaneous ? this.weighingList.buckleMiscellaneous : 0)
 				}
 			},
 			carChange(e) {

src/views/outboundManagement/weighingManagementrecord.vue

@@ -36,10 +36,26 @@
         </template></el-table-column>
       <el-table-column prop="goodsName" label="货名"></el-table-column>
       <el-table-column prop="carNumber" label="车牌号"></el-table-column>
-      <el-table-column prop="grossWeight" label="毛重（公斤）"></el-table-column>
-      <el-table-column prop="tare" label="皮重（公斤）"></el-table-column>
-      <el-table-column prop="buckleMiscellaneous" label="扣重（公斤）"></el-table-column>
-      <el-table-column prop="netWeight" label="净重（公斤）"></el-table-column>
+      <el-table-column prop="grossWeight" label="毛重（公斤）">
+        <template slot-scope="scope">
+          <span>{{Number(scope.row.grossWeight*1000).toFixed(3) == 0? "0": Number(scope.row.grossWeight*1000).toFixed(3)}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="tare" label="皮重（公斤）">
+        <template slot-scope="scope">
+          <span>{{Number(scope.row.tare*1000).toFixed(3) == 0? "0": Number(scope.row.tare*1000).toFixed(3)}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="buckleMiscellaneous" label="扣重（公斤）">
+         <template slot-scope="scope">
+          <span>{{Number(scope.row.buckleMiscellaneous*1000).toFixed(3) == 0? "0": Number(scope.row.buckleMiscellaneous*1000).toFixed(3)}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="netWeight" label="净重（公斤）">
+          <template slot-scope="scope">
+          <span>{{Number(scope.row.netWeight*1000).toFixed(3) == 0? "0": Number(scope.row.netWeight*1000).toFixed(3)}}</span>
+        </template>
+      </el-table-column>
       <!-- <el-table-column prop="binNumber" label="仓位号"></el-table-column>
       <el-table-column prop="storageNumber" label="囤位号"></el-table-column> -->
       <el-table-column prop="secretaryWeigher" label="司称员"></el-table-column>