生产出入库修改

src/api/production/production-return.js

@@ -23,3 +23,5 @@ export const  getUnissueNotifyHeaderOrderMaterialList = data => createAPI(`/pda/
 export const getUnissueMatericalForShopOrder = data => createAPI(`/pda/production/return/getUnissueMatericalForShopOrder`,'post',data)
 export const scanMaterialLabel = data => createAPI(`/pda/production/return/scanMaterialLabel`,'post',data)
 export const productionReturnUnissueConfirm = data => createAPI(`/pda/production/return/productionReturnUnissueConfirm`,'post',data)
+
+export const printLabelInfo = data => createAPI('/label/setting/printLabel','post',data)

src/views/modules/production-issue/directIssueDetail.vue

@@ -85,9 +85,9 @@
 
     <!-- 底部操作按钮 -->
     <div class="bottom-actions">
-      <button class="action-btn secondary" @click="confirmIssue" :disabled="scannedLabels.length === 0">
+      <el-button class="action-btn secondary" :loading="loading" @click="confirmIssue" :disabled="scannedLabels.length === 0">
         确定
-      </button>
+      </el-button>
       <!-- <button class="action-btn secondary" style="margin-left: 10px;">
         打印
       </button> -->
@@ -118,6 +118,7 @@ export default {
       requiredQty: 0,
       issuedQty: 0,
       itemNo: '',
+      loading: false,
     }
   },
   computed: {
@@ -227,6 +228,7 @@ export default {
           materialCode: l.materialCode,
         })),
       }
+      this.loading = true
       confirmDirectIssue(params)
         .then(({ data }) => {
           if (data && data.code === 0) {
@@ -238,6 +240,8 @@ export default {
         })
         .catch(() => {
           this.$message.error('发料失败')
+        }).finally(()=>{
+          this.loading = false
         })
     },
     initFromRoute() {

src/views/modules/production-issue/production.vue

@@ -43,7 +43,7 @@ export default {
           label: "申请单领料",
           iconClass: "qualified",
           to: "productionPicking",
-          disabled: false,
+          disabled: true,
         },
         {
           icon: "records",

src/views/modules/production-return/productionReturnPDAList.vue

@@ -41,7 +41,7 @@
               <div class="detail-value">{{ item.QUANTITY }}</div>
             </div>
             <div class="detail-item">
-              <div class="detail-label">撤销数量</div>
+              <div class="detail-label">已退数量</div>
               <div class="detail-value">{{ item.QTY_REVERSED || 0 }}</div>
             </div>
             <div class="detail-item">

src/views/modules/production-return/productionReturnPickingDetail.vue

@@ -82,11 +82,11 @@
         <i class="el-icon-circle-check"></i>
         <span>退料信息确认</span>
       </div>
-      <div class="title-right">
+      <!-- <div class="title-right">
         <span class="material-list-link" @click="showMaterialListDialog"
           >物料清单</span
         >
-      </div>
+      </div> -->
     </div>
 
     <!-- 退料标签列表 -->