增加补打印的按钮

common/http.api.js

@@ -93,8 +93,8 @@ const install = (Vue, vm) => {
         ),
       //生产报工补打印
       rePackageInfoPrint: (params = {}) =>
-        vm.$u.post(
-          config.adminPath + '/dev-api/pro/packagePrintRecord/rePackageInfoPrint',
+        vm.$u.postJson(
+          config.adminPath + '/pro/packagePrintRecord/rePackageInfoPrint',
           params
         ),
       // 生产指令列表
@@ -223,6 +223,12 @@ const install = (Vue, vm) => {
           config.adminPath + '/mobile/pro/proMaterial/listIssueLine',
           params
         ),
+      //投料校验列表
+      listFeedingInspectionlist: (params = {}) =>
+        vm.$u.post(
+          config.adminPath + '/mobile/pro/proMaterial/listFeedingInspection',
+          params
+        ),
       validateFeedingInspection: (params = {}) =>
         vm.$u.post(
           config.adminPath +

pages/mes/prodReport/index.vue

@@ -240,11 +240,11 @@
                         style="margin-left: 20rpx" size="mini">
                         打印/报工
                       </u-button>
-                      <!-- <u-button v-if="scope.row.feedbackQuantity && Number(scope.row.feedbackQuantity) > 0"
+                      <u-button v-if="scope.row.feedbackQuantity && Number(scope.row.feedbackQuantity) > 0"
                         @tap="rePackageInfoPrint(feedback, scope.row, i)" type="success"
                         style="margin-left: 20rpx" size="mini">
                         补打印
-                      </u-button> -->
+                      </u-button>
                       <!-- <u-input v-model="scope.row.reportQuantity" type="number"></u-input> -->
                     </template>
                   </zb-table>
@@ -329,7 +329,7 @@
                   </u-col>
                   <u-col span="6">
                     <u-form-item label="生产工单:" prop="workorderId">
-                      <view v-if="feedback.taskType&&feedback.taskType===3">{{feedback.workorderId}}</view>
+                      <view v-if="feedback.taskType&&feedback.taskType===3">{{feedback.workorderCode}}</view>
                       <uni-data-select v-model="feedback.workorderId" v-else :localdata="feedback.workorderOption"
                         @change="workorderSelect($event, i)"></uni-data-select>
                     </u-form-item>
@@ -396,9 +396,9 @@
                     </u-form-item>
                   </u-col>
                   <u-col span="6">
-                    <u-form-item label="是否关单:" prop="whether" v-if="feedback.taskType&&feedback.taskType===3">
+                    <u-form-item label="是否关单:" prop="closeType" v-if="feedback.taskType&&feedback.taskType===3">
                       <view class="uni-list-item__extra">
-                        <u-radio-group v-model="feedback.whether">
+                        <u-radio-group v-model="feedback.closeType">
                           <u-radio :name="1">是</u-radio>
                           <u-radio :name="0">否</u-radio>
                         </u-radio-group>
@@ -2230,6 +2230,7 @@ export default {
           printContents: item.arrangeCode,
           feedbackTime: this.parseTime(new Date()),
           whether: '',
+          closeType: null,
           printTemplate: '',
           tableSizeData: [],
           tableSizeColumn: [
@@ -2297,6 +2298,8 @@ export default {
         if(feedback.taskType && feedback.taskType === 3) {
           feedback.quantityQualify = item.quantity - item.quantityQualify - item.quantityUnqualify
           feedback.quantityUnqualify = item.quantityUnqualify
+          feedback.workorderCode = item.workorderCode
+          feedback.closeType = ''
         }
         this.getWorkorderWithSizeAndDirective(feedback, index);
         this.feedbackForms.push(feedback);
@@ -2388,6 +2391,9 @@ export default {
         });
     },
     rePackageInfoPrint(item, row, i){
+      if (!item.printTemplate) {
+        return this.$u.toast('请选择打印模版')
+      }
       if (item.printTemplate && !this.vuex_printConnect) {
         this.$u.toast('打印机连接失败');
         return;
@@ -2401,9 +2407,9 @@ export default {
         .then((res) => {
           if (res.code === 200) {
             // this.proVisible = false;
-            item.quantityUnqualify = 0;
-            this.$u.toast('上报成功');
-            this.getWorkorderDirectiveList(item, i)
+            // item.quantityUnqualify = 0;
+            // this.$u.toast('上报成功');
+            // this.getWorkorderDirectiveList(item, i)
             if (item.printTemplate) {
               let params = {};
               res.data.forEach((datas) => {
@@ -2575,6 +2581,7 @@ export default {
             processId: item.processId,
             processCode: item.processCode,
             processName: item.processName,
+            closeType: item.taskType === 3 ? item.closeType : null,
             itemId: item.itemId,
             itemCode: item.itemCode,
             itemName: item.itemName,
@@ -2656,7 +2663,7 @@ export default {
     },
     feedingInspectionLoadAndScan(bool) {
       const taskInfo = this.tableSelectData[0];
-      this.$u.api.listFeedingInspection({ taskId: taskInfo.taskId }).then((res) => {
+      this.$u.api.listFeedingInspectionlist({ taskId: taskInfo.taskId }).then((res) => {
         if (res.code === 200) {
           this.feedingInspectionList = res.data;
           if (bool) {