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

public/static/weightCheck.html

@@ -164,7 +164,7 @@
             <td class="col col-bgc">霉变粒（%）</td>
             <td class="col">{{tableData.qualityInspectionManagement.mildewGrain}}</td>
             <td class="col col-bgc">扣杂（公斤）</td>
-            <td class="col">{{tableData.buckleMiscellaneous}}</td>
+            <td class="col">{{tableData.qualityInspectionManagement.buckleMiscellaneous}}</td>
             <td class="col col-bgc">净重（公斤）</td>
             <td class="col">{{tableData.netWeight}}</td>
           </tr>
@@ -256,10 +256,10 @@
             <div>{{tableData.grossDate}}</div>
           </div>
         
-        <div class="small-row">
+        <!-- <div class="small-row">
           <div>扣杂（公斤）</div>
           <div>{{tableData.buckleMiscellaneous}}</div>
-        </div>
+        </div> -->
         <div class="small-row">
           <div>净重（公斤）</div>
           <div>{{tableData.netWeight}}</div>

src/views/houseSelfCollect/component/weightCheckPrint.vue

@@ -44,7 +44,7 @@
             <td class="col col-bgc">霉变粒（%）</td>
             <td class="col">{{tableData.qualityInspectionManagement.mildewGrain}}</td>
             <td class="col col-bgc">扣杂（公斤）</td>
-            <td class="col">{{tableData.buckleMiscellaneous}}</td>
+            <td class="col">{{tableData.qualityInspectionManagement.buckleMiscellaneous}}</td>
             <td class="col col-bgc">净重（公斤）</td>
             <td class="col">{{tableData.netWeight}}</td>
           </tr>

src/views/houseSelfCollect/weighingManagement.vue

@@ -98,7 +98,7 @@
           <el-button @click="weightCheck(scope.row, 1)" v-if=" scope.row.status == '已称毛重' || scope.row.status == '已质检' " v-hasPermission="`acquisitionManagement.acquisitionWeight.mao`" >毛重</el-button >
           <!-- scope.row.paymentManagement.status == '待结算' && -->
           <el-button :disabled = "scope.row.allow == 2" @click="weightCheck(scope.row, 2)"  v-if=" (scope.row.status == '已称毛重' || scope.row.status == '已称皮重') " v-hasPermission="`acquisitionManagement.acquisitionWeight.weight`">皮重</el-button>
-          <el-button @click="print(scope.row)" v-if="scope.row.status == '已称皮重'" v-hasPermission="`acquisitionManagement.acquisitionWeight.print`">打印</el-button >
+          <el-button @click="print(scope.row)" v-if="scope.row.status == '已称皮重' ||scope.row.status == '已称毛重'" v-hasPermission="`acquisitionManagement.acquisitionWeight.print`">打印</el-button >
         </template>
       </el-table-column>
     </el-table>
@@ -230,7 +230,9 @@ export default {
           warehouseId: this.warehouseId,
           monitorUrl1: this.monitorUrl1,
           monitorUrl2: this.monitorUrl2,
-          allowEdit:this.allowEdit
+          allowEdit:this.allowEdit,
+          cangid:this.cangid,
+          paramType:row.qualityInspectionManagement.paramType
         },
       })
     },

src/views/houseSelfCollect/weightCheck.vue

@@ -86,10 +86,10 @@
               </ws-form-item>
               <el-button type="primary" v-if="index != 0" @click="openPort">重新获取</el-button>
               <div class="formItem">
-                <!-- <ws-form-item label="扣重（公斤）" span="1" prop="buckleWeightRatio" v-if="information == '皮重'">
+                <ws-form-item label="扣重（公斤）" span="1" prop="buckleWeightRatio" v-if="information == '皮重' && paramType == '2'">
                   <ws-input type="number" @mousewheel.native.prevent v-model="weighingList.buckleMiscellaneous" @input="calculation" placeholder="请输入扣重"
                     maxlength="100" size="small" />
-                </ws-form-item> -->
+                </ws-form-item>
 
                 <ws-form-item label="净重（公斤）" span="1" prop="netWeight" v-if="information == '皮重'">
                   <ws-input type="number" @mousewheel.native.prevent v-model="weighingList.netWeight" placeholder="请输入净重" maxlength="100" size="small"
@@ -98,7 +98,7 @@
               </div>
             </ws-info-table>
             <div class="but">
-              <el-button @click="cancel" type="primary">取消</el-button>
+              <el-button @click="cancel" type="primary">关闭</el-button>
               <el-button @click="print" v-if="this.information == '毛重'" type="primary">保存</el-button>
               <el-button @click="print" v-if="this.information == '皮重'" type="primary">保存并打印</el-button>
             </div>
@@ -205,10 +205,14 @@
         param: 9600,
         monitorUrl1: '',
         monitorUrl2: '',
+        cangid:'',
+        paramType:'1'
       }
     },
     activated() {
       console.log(this.common.name)
+      this.cangid = this.$route.query.cangid
+      this.paramType = this.$route.query.paramType
       this.getList()
       this.tpyeNo = this.$route.query.tpyeNo
       this.weighingList.number = this.$route.query.number
@@ -252,11 +256,6 @@
         this.pageSize = val
         this.getList()
       },
-      handleCurrentChange(val) {
-        this.currentPage = val
-        console.log(`当前页: ${val}`)
-        this.getList()
-      },
       getList() {
         // 货名
         getinspectLookGoods({
@@ -359,7 +358,9 @@
         this.index = val
         if (this.information == '皮重') {
           this.information = '毛重'
+          this.tpyeNo = 1
         } else {
+          this.tpyeNo = 2
           this.information = '皮重'
         }
         this.getList()
@@ -375,6 +376,7 @@
           weight: val.grossWeight
         }
         this.weighingList = val;
+        this.paramType = val.qualityInspectionManagement.paramType
       },
       async closePort() {
         console.log('closePort');
@@ -477,9 +479,9 @@
       },
       closePrint() {
         this.isShowPrint = false
-        this.$router.push({
-          path: 'weighingManagement'
-        })
+        // this.$router.push({
+        //   path: 'weighingManagement'
+        // })
       },
       print() {
         if (!this.weighingList.grossWeight) {
@@ -613,7 +615,7 @@
                               title: '成功',
                               message: '保存成功',
                             })
-                            this.$router.go(-1)
+                            // this.$router.go(-1)
                           })
                           .catch((response) => {
                             // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))