ccjgmwz vor 3 Jahren
Ursprung
Commit
09fe5f248d

+ 3 - 3
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>

+ 1 - 1
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>

+ 1 - 1
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>