0412 新看板

src/views/modules/Abnormal/AbnormalFeedBack.vue

@@ -609,6 +609,7 @@
         }
         getSOScheduleRoutingDataForShiyanshi(inData).then(({data})=>{
           data.rows[0].abnormalDesc=row.abnormalDesc
+          data.rows[0].abnormalRemark=row.abnormalRemark
           printABLabel(data.rows);
         })
       }

src/views/modules/print/print_Abnormal_label.js

@@ -77,6 +77,9 @@ export function printABLabel(printList) {
       LODOP.ADD_PRINT_TEXT(68,253,120,63,printData.abnormalDesc);
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+      LODOP.ADD_PRINT_TEXT(108,253,120,76,printData.abnormalRemark);
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
     }
     // LODOP.PRINT_DESIGN();
     LODOP.PREVIEW();

src/views/modules/query/hlQuery.vue

@@ -96,9 +96,17 @@
 
     <el-tabs style="font-size: 12px;min-height: 200px" class="customer-tab" v-model="activeName"  type="border-card"  @tab-click="tabClick">
       <el-tab-pane label="合并明细" name="detail">
+        <el-form :inline="true" label-position="top" style="margin-top: -10px">
+          <el-form-item :label="'物料编码：'">
+            <el-input v-model="partNo" style="width: 120px"></el-input>
+          </el-form-item >
+          <el-form-item :label="'产品库存：'">
+            <el-input v-model="qtyOnHand" style="width: 120px"></el-input>
+          </el-form-item>
+        </el-form>
         <el-table
           :data="dataList2"
-          :height="height"
+          :height="height2"
           border
           v-loading="dataListLoading"
           style="width: 100%; ">
@@ -149,9 +157,17 @@
 
       </el-tab-pane>
       <el-tab-pane label="分发记录" name="issureDetail">
+        <el-form :inline="true" label-position="top" style="margin-top: -10px">
+          <el-form-item :label="'物料编码：'">
+            <el-input v-model="partNo" style="width: 120px"></el-input>
+          </el-form-item >
+          <el-form-item :label="'产品库存：'">
+            <el-input v-model="qtyOnHand" style="width: 120px"></el-input>
+          </el-form-item>
+        </el-form>
         <el-table
           :data="dataList3"
-          :height="height"
+          :height="height2"
           border
           v-loading="dataListLoading"
           style="width: 100%; ">
@@ -162,6 +178,20 @@
             min-width="60"
             label="派工单号">
           </el-table-column>
+          <el-table-column
+            prop="partNo"
+            header-align="center"
+            align="center"
+            min-width="60"
+            label="产品编码">
+          </el-table-column>
+          <el-table-column
+            prop="partDesc"
+            header-align="center"
+            align="center"
+            min-width="100"
+            label="规格型号">
+          </el-table-column>
           <el-table-column
             prop="sScheduledDate"
             header-align="center"
@@ -183,7 +213,27 @@
             min-width="70"
             label="发料数量">
           </el-table-column>
-
+          <el-table-column
+            prop="returnQty"
+            header-align="center"
+            align="right"
+            min-width="70"
+            label="退料数量">
+          </el-table-column>
+          <el-table-column
+            prop="realQty"
+            header-align="center"
+            align="right"
+            min-width="70"
+            label="实际领料数量">
+          </el-table-column>
+          <el-table-column
+            prop="returnPercent"
+            header-align="center"
+            align="right"
+            min-width="70"
+            label="退料率">
+          </el-table-column>
         </el-table>
 
       </el-tab-pane>
@@ -201,7 +251,7 @@
     ,getHunlianTaskIssure
   } from "@/api/production/query.js"
   import {
-    getHunlianTaskDetailData
+    getHunlianTaskDetailData,getPartNoOnHand
   } from "@/api/production.js"
   import Chooselist from '@/views/modules/common/Chooselist'
 
@@ -213,7 +263,10 @@
     data() {
       return {
         height:200,
+        height2:200,
         modelFlag:false,
+        qtyOnHand:'',
+        partNo:'',
         activeName: 'detail',
         dataList: [],
         dataList2: [],
@@ -453,7 +506,7 @@
     mounted () {
       this.$nextTick(() => {
         this.height = (window.innerHeight- 260) / 2
-
+        this.height2 = (window.innerHeight- 260) / 2 -30
       })
     },
     methods: {
@@ -494,6 +547,25 @@
         this.currentRow = JSON.parse(JSON.stringify(row));
         this.headerData=row;
         this.refreshCurrentTabTable ();
+        let inData={
+          site:this.currentRow.site,
+          partNo:this.currentRow.partNo,
+        }
+        this.partNo=this.currentRow.partNo
+        getPartNoOnHand(inData).then(({data}) => {
+          if (data && data.code === 0) {
+            if(data.row!=null){
+              this.qtyOnHand=data.row.qtyOnHand;
+            }else {
+              this.qtyOnHand=0;
+            }
+
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定'
+            })
+          }
+        })
       },
       refreshCurrentTabTable(){
         if(this.currentRow===''||this.currentRow===null){

src/views/modules/query/liuhuaIssureAndReport.vue

@@ -209,7 +209,7 @@
             columnProp: "qtyIssure",
             headerAlign: "center",
             align: "right",
-            columnLabel: "发料重量",
+            columnLabel: "实际领料重量",
             columnHidden: false,
             columnImage: false,
             columnSortable: false,