前端检斤完成更新sdy

src/views/houseSelfCollect/paymentManagement.vue

@@ -90,6 +90,11 @@
         prop="transactionPrice"
         label="货名"
       ></el-table-column>
+      <el-table-column
+        class="table_td"
+        prop="type"
+        label="类型"
+      ></el-table-column>
       <el-table-column
         class="table_td"
         prop="closeRate"

src/views/houseSelfCollect/settlement.vue

@@ -261,6 +261,14 @@
                 size="small"
               />
             </ws-form-item>
+            <ws-form-item label="质量扣款" span="1" prop="qualityDeduction">
+              <ws-input
+                placeholder="请输入质量扣款"
+                maxlength="100"
+                :disabled="disabled"
+                size="small"
+              />
+            </ws-form-item>
             <ws-form-item label="其他扣款" span="1" prop="waterContent">
               <ws-input
                 placeholder="请输入其他扣款"

src/views/houseSelfCollect/weighingManagement.vue

@@ -62,7 +62,7 @@
       <el-table-column prop="customer" label="客户"></el-table-column>
       <el-table-column prop="carNumber" label="车牌号"></el-table-column>
       <el-table-column prop="goodsName" label="货名"></el-table-column>
-
+  <el-table-column prop="type" label="类型"></el-table-column>
       <el-table-column
         prop="grossWeight"
         label="毛重（公斤）"
@@ -79,9 +79,9 @@
       <el-table-column width="300" prop="contractNo1" label="操作">
         <template slot-scope="scope">
 
-        <el-button @click="weightCheck(scope.row,1)">毛重</el-button>
-        <el-button @click="weightCheck(scope.row,2)">皮重</el-button>
-        <el-button @click="print">打印</el-button>
+        <el-button @click="weightCheck(scope.row,1)" v-if="(scope.row.status !='已称皮重'&& scope.row.status !='已质检')">毛重</el-button>
+        <el-button @click="weightCheck(scope.row,2)" v-if="scope.row.status =='已称毛重' || scope.row.status =='已称皮重'">皮重</el-button>
+        <el-button @click="print" v-if="scope.row.status =='已称皮重'">打印</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -234,7 +234,7 @@ export default {
     weightCheck(row,num) {
       this.$router.push({
         path: 'weightCheck',
-        query: { tpyeNo: num ,number:row.number,binNumber:row.binNumber,customer:row.customer,storageNumber:row.storageNumber,carNumber:row.carNumber,goodsName:row.goodsName,grossWeight:row.grossWeight,tare:row.tare,netWeight:row.netWeight,relationId:row.relationId},
+        query: { tpyeNo: num ,id:row.id,number:row.number,binNumber:row.binNumber,customer:row.customer,storageNumber:row.storageNumber,carNumber:row.carNumber,goodsName:row.goodsName,grossWeight:row.grossWeight,tare:row.tare,netWeight:row.netWeight,relationId:row.relationId},
       })
     },
     // Reacquire() {

src/views/houseSelfCollect/weightCheck.vue

@@ -86,10 +86,10 @@
                 placeholder="请输入毛重"
                 maxlength="100"
                 size="small"
-               
+                disabled
               />
             </ws-form-item>
-            <el-button type="primary">重新获取</el-button>
+            <el-button type="primary" :class="tpyeNo != 2?'':'css1'" @click="chongxin">重新获取</el-button>
             <ws-form-item
               label="皮重（公斤）"
               span="1"
@@ -139,14 +139,14 @@
             </div>
           </ws-info-table>
           <div class="but">
-            <el-button @click="cancel" v-if="this.types != 2" type="primary"
+            <el-button @click="cancel" type="primary"
               >取消</el-button
             >
-            <el-button @click="print" v-if="this.types != 2" type="primary"
-              >保存并打印</el-button
+            <el-button @click="print" v-if="this.tpyeNo == 1" type="primary"
+              >保存</el-button
             >
-            <el-button @click="cancel" v-if="this.types == 2" type="primary"
-              >关闭</el-button
+            <el-button @click="print" v-if="this.tpyeNo == 2" type="primary"
+              >保存并打印</el-button
             >
           </div>
         </div>
@@ -176,6 +176,7 @@ export default {
     this.weighingList.storageNumber = this.$route.query.storageNumber
     this.weighingList.carNumber = this.$route.query.carNumber
     this.weighingList.goodsName = this.$route.query.goodsName
+    this.weighingList.id = this.$route.query.id
     // this.weighingList.grossWeight = this.$route.query.grossWeight
     // this.weighingList.tare = this.$route.query.tare
     // this.weighingList.netWeight = this.$route.query.netWeight
@@ -198,6 +199,12 @@ export default {
         .catch(() => {
           return false
         })
+    },
+    chongxin(){
+      if(this.tpyeNo == 2){
+        return
+      }
+console.log("dfsgfgdgdsgszdf")
     },
      cancel() {
       this.$router.push({ path: 'weighingManagement' })
@@ -342,4 +349,7 @@ export default {
   text-align: center;
   margin: 20px auto;
 }
+.css1{
+  opacity: 0;
+}
 </style>