仓库问题修改

src/api/productionManagement/workshopRework.js

@@ -0,0 +1,14 @@
+import request from '@/axios';
+//列表接口
+export const getList = (current, size, params) => {
+  return request({
+    url: '/blade-desk/workOrder/page',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    },
+  });
+};
+

src/api/storeManagement/otherIssuing.js

@@ -116,3 +116,12 @@ export const approve = params =>
     params
   });
   
+
+
+// 根据仓库获取物料列表
+export const getGoodsListByShId = params =>
+  request({
+    url: '/api/blade-wms/combox/config/queryByShId',
+    method: 'get',
+    params
+  })

src/views/inboundOutboundManagement/otherIssuing/otherIssuingDailog.vue

@@ -103,16 +103,16 @@
             <span><i style="color: red">*</i>仓库物料</span>
           </template>
           <template #default="scope">
-            <!-- <el-select v-model="scope.row.goodsCode" @change="val => changeCode(val, scope.$index)">
+            <el-select v-model="scope.row.goodsCode" @change="val => changeCode(val, scope.$index)">
               <el-option
                 v-for="item in goodsList"
                 :key="item.id"
                 :label="item.goodsCode"
                 :value="item.goodsCode"
               ></el-option>
-            </el-select> -->
+            </el-select>
 
-            <jhSelect
+            <!-- <jhSelect
               @input="val => (scope.row.goodsCode = val)"
               :value="scope.row.goodsCode"
               placeholder="请搜索选择"
@@ -129,7 +129,7 @@
               :debounce-time="100"
               @change="(val, item) => changeCode(val, item, scope.$index)"
               :title="'修改'"
-            />
+            /> -->
           </template>
         </el-table-column>
 
@@ -254,12 +254,12 @@ import {
   getOtherOutNo,
   getWarehouseList,
   getKeeperList,
-  getGoodsOutList,
   getLocationList,
   completeIssue,
   getLocationData,
   addIssue,
   getShList,
+  getGoodsListByShId
 } from '@/api/storeManagement/otherIssuing';
 export default {
   props: {
@@ -379,7 +379,7 @@ export default {
     if (this.checkCode == '') {
       this.getWare();
       this.getKeeper();
-      this.getGoods();
+      // this.getGoods();
     } else {
       this.getKeeper();
       this.getShData();
@@ -418,23 +418,23 @@ export default {
       }
       return Array.from(seen.values());
     },
-    changeCode(val, item, index) {
+    changeCode(val, index) {
-    //   let tmp = this.goodsList.find(item => item.goodsCode == val);
+      let tmp = this.goodsList.find(item => item.goodsCode == val);
-    //   console.log('tmp------------', tmp);
+      console.log('tmp------------', tmp);
       
-      if (item != undefined) {
+      // if (item != undefined) {
-        this.outbankList[index].goodsName = item.goodsName;
+        this.outbankList[index].goodsName = tmp.goodsName;
-      this.outbankList[index].materialModel = item.materialModel;
+      this.outbankList[index].materialModel = tmp.materialModel;
-      this.outbankList[index].unitName = item.unitName;
+      this.outbankList[index].unitName = tmp.unitName;
-      this.outbankList[index].goodsId = item.id;
+      this.outbankList[index].goodsId = tmp.id;
       this.outbankList[index].slId = '';
       this.outbankList[index].piNo = '';
       this.outbankList[index].quantity = '';
      
-      }
+      // }
       getLocationData({
         shId: this.stOtherOutRecord.shId,
-        goodsId: item.id,
+        goodsId: tmp.id,
       }).then(res => {
         console.log('res--------', res);
         let data = this.uniqueById(res.data.data.records);
@@ -462,7 +462,7 @@ export default {
       }
     },
     getGoods() {
-      getGoodsOutList().then(res => {
+      getGoodsListByShId().then(res => {
         this.goodsList = res.data.data.records;
       });
     },
@@ -650,16 +650,17 @@ export default {
       } else {
         this.isShowInput = false;
       }
-      if (this.outbankList.length == 1) {
+      if (this.outbankList.length >= 0) {
-        this.outbankList[0].slId = '';
+        // this.outbankList[0].slId = '';
-        this.outbankList[0].piNo = '';
+        // this.outbankList[0].piNo = '';
-        this.outbankList[0].quantity = '';
+        // this.outbankList[0].quantity = '';
-        getGoodsOutList({
+        getGoodsListByShId({
           shId: val,
         }).then(res => {
           this.goodsList = res.data.data.records;
-          if (this.outbankList[0].goodsCode != '') {
+          if (this.checkCode != '') {
-            let tmp = this.goodsList.find(item => item.goodsCode == this.outbankList[0].goodsCode);
+            let tmp = this.goodsList.find(item => item.goodsCode == this.checkCode);
+            
             this.outbankList[0].goodsId = tmp.id;
             if (tmp) {
               getLocationData({

src/views/workRate/index.vue

@@ -145,7 +145,7 @@
                 <span class="icon-text">
                   <el-icon><Edit /></el-icon>实际开始：</span
                 >
-                <span>{{ item.factStartTime || '-' }}</span>
+                <span class="icon-text">{{ item.factStartTime || '-' }}</span>
               </div>
               <div class="flex-row" :title="'实际结束'">
                 <span class="icon-text">
@@ -177,7 +177,7 @@
               selectedItemInfo.factStartTime
             }}</el-descriptions-item>
             <el-descriptions-item label="实际结束" :span="1">{{
-              selectedItemInfo.planEndTime
+              selectedItemInfo.factEndTime
             }}</el-descriptions-item>
             <el-descriptions-item label="试验数量" :span="1">{{
               processDetails.testQty
@@ -579,7 +579,7 @@ export default {
           return 'color: rgb(251, 170, 8)';
         }
       };
-
+      consolog.log(9999999,this.detailsForm)
       return [
         { label: '车间订单号', value: this.detailsForm.woCode || '' },
         { label: '流程卡号', value: this.detailsForm.cardNo || '' },
@@ -590,7 +590,7 @@ export default {
           clickHandler: () => this.openDocLink(this.detailsForm.dsPart),
         },
         { label: '批次号', value: this.detailsForm.batchNo || '' },
-        { label: '订单数量', value: this.detailsForm.poQty || '' },
+        { label: '订单数量', value: this.detailsForm.ypQty || '' },
         { label: '状态', value: this.detailsForm.curStatus || '' },
         {
           label: '优先级',
@@ -599,7 +599,7 @@ export default {
         },
         {
           label: '调度员',
-          value: this.detailsForm.dispatcher === null ? '' : this.detailsForm.userName,
+          value: this.detailsForm.dispatcher === null ? '' : this.detailsForm.dispatcher,
         },
         { label: '订单下达', value: this.detailsForm.sendDownTime || '' },
         { label: '生产数量', value: this.detailsForm.makeQty || '' },