修复退料入库入库方案数据不回显

.env.dev

@@ -2,13 +2,18 @@
 NODE_ENV = 'development'
 
 # 页面标题  WMS开发环境
-VUE_APP_TITLE = RTKWMS开发环境
+VUE_APP_TITLE = WMS开发环境
 
 # 芋道管理系统/开发环境
-VUE_APP_BASE_API = 'http://192.168.1.94:48080'
-#  VUE_APP_BASE_API = 'http://127.0.0.1:48080'
-# VUE_APP_BASE_API = 'http://113.105.183.190:42699'
-#VUE_APP_BASE_API = 'http://113.105.183.190:48163'
+# VUE_APP_BASE_API = 'http://192.168.1.94:48080'
+# VUE_APP_BASE_API = 'http://127.0.0.1:48080'
+VUE_APP_BASE_API = 'http://113.105.183.190:42699'
+# VUE_APP_BASE_API = 'http://192.168.1.85:48080'
+# VUE_APP_ETM_URL = 'http://localhost:81/index'
+# VUE_APP_ETM_URL = 'http://192.168.1.163:8181/etm/'
+# VUE_APP_MES_URL = 'http://192.168.1.163:8181/mes/'
+# VUE_APP_WMS_URL = 'http://192.168.1.163:8181/wms/'
+# VUE_APP_SYSTEM_URL = 'http://192.168.1.163:8181/system/'
 
 # 报表IP
 VUE_APP_REPORT_API = 'http://113.105.183.190:48064'

.env.rtk.prod

@@ -5,7 +5,7 @@ NODE_ENV = 'development'
 VUE_APP_TITLE = 瑞泰克WMS开发环境
 
 # 芋道管理系统/开发环境
-VUE_APP_BASE_API = 'http://113.105.183.190:48163'
+VUE_APP_BASE_API = 'http://113.105.183.190:48028'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

src/views/wms/inLibrary/outsourcePreparation/index.vue

@@ -1,6 +1,5 @@
 <template>
   <div class="app-container">
-
     <!-- 搜索工作栏 -->
     <el-form
       v-show="showSearch"
@@ -32,7 +31,11 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="备料状态" prop="syntheticalStatus">
-            <DictSelect v-model="queryParams.syntheticalStatus" placeholder="请选择备料状态" dict-type="WMS_MATERIAL_PREPARATION_STATUS" />
+            <DictSelect
+              v-model="queryParams.syntheticalStatus"
+              placeholder="请选择备料状态"
+              dict-type="WMS_MATERIAL_PREPARATION_STATUS"
+            />
           </el-form-item>
         </el-col>
         <div slot="right">
@@ -42,8 +45,11 @@
               icon="el-icon-search"
               size="mini"
               @click="handleQuery"
-            >查询</el-button>
-            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+              >查询</el-button
+            >
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+              >重置</el-button
+            >
           </el-form-item>
         </div>
       </QueryFormWrapper>
@@ -57,7 +63,8 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-        >新增</el-button>
+          >新增</el-button
+        >
       </el-col>
       <right-toolbar
         :columns="columnsList"
@@ -69,7 +76,7 @@
 
     <!-- 列表 -->
     <AutoResizer :given-height="188">
-      <template #default="{height}">
+      <template #default="{ height }">
         <el-table
           v-if="columnsList.length > 0"
           v-loading="loading"
@@ -89,7 +96,9 @@
           >
             <template slot-scope="scope">
               <div class="custom-column">
-                <el-button type="text" @click="handleDetail(scope.row)">{{ scope.row.prepareOrderNo }}</el-button>
+                <el-button type="text" @click="handleDetail(scope.row)">{{
+                  scope.row.prepareOrderNo
+                }}</el-button>
               </div>
             </template>
           </el-table-column>
@@ -111,7 +120,10 @@
             width="120"
           >
             <template slot-scope="scope">
-              <dict-tag :type="DICT_TYPE.WMS_MATERIAL_PREPARATION_STATUS" :value="scope.row.syntheticalStatus" />
+              <dict-tag
+                :type="DICT_TYPE.WMS_MATERIAL_PREPARATION_STATUS"
+                :value="scope.row.syntheticalStatus"
+              />
             </template>
           </el-table-column>
           <el-table-column
@@ -150,7 +162,8 @@
                 class="text-danger"
                 :disabled="scope.row.syntheticalStatus === 2"
                 @click="handleDelete(scope.row)"
-              >删除</el-button>
+                >删除</el-button
+              >
             </template>
           </el-table-column>
         </el-table>
@@ -166,21 +179,29 @@
       @pagination="getList"
     />
     <!-- 备料明细 -->
-    <ProductionPreparationDetail ref="productDetail" @prepareComplete="getList" @commitComplete="getList" />
+    <ProductionPreparationDetail
+      ref="productDetail"
+      @prepareComplete="getList"
+      @commitComplete="getList"
+    />
   </div>
 </template>
 
 <script>
-import { updateWorkBatchBom, getMainDetailPage, deleteMasterPrepare } from '@/api/wms/inLibrary/productionPreparation'
-import ProductionPreparationDetail from '../components/ProductionPreparationDetail.vue'
-import { getFormColumnsList } from '@/api/system/saveColumns/index'
-import { mapGetters } from 'vuex'
-import { isArray } from 'min-dash'
+import {
+  updateWorkBatchBom,
+  getMainDetailPage,
+  deleteMasterPrepare,
+} from "@/api/wms/inLibrary/productionPreparation";
+import ProductionPreparationDetail from "../components/ProductionPreparationDetail.vue";
+import { getFormColumnsList } from "@/api/system/saveColumns/index";
+import { mapGetters } from "vuex";
+import { isArray } from "min-dash";
 
 export default {
-  name: 'OutsourcePreparation',
+  name: "OutsourcePreparation",
   components: {
-    ProductionPreparationDetail
+    ProductionPreparationDetail,
   },
   data() {
     return {
@@ -203,46 +224,46 @@ export default {
         materialName: null,
         prepareOrderNo: null,
         syntheticalStatus: null,
-        prepareType: 1
+        prepareType: 1,
       },
       // 显示隐藏列参数
       columns: [
-        { key: 0, label: '备料单号', visible: true },
-        { key: 1, label: '供应商', visible: true },
-        { key: 2, label: '备料状态', visible: true },
-        { key: 3, label: '创建时间', visible: true },
-        { key: 4, label: '备注', visible: true }
+        { key: 0, label: "备料单号", visible: true },
+        { key: 1, label: "供应商", visible: true },
+        { key: 2, label: "备料状态", visible: true },
+        { key: 3, label: "创建时间", visible: true },
+        { key: 4, label: "备注", visible: true },
       ],
       // 显示隐藏持久化参数
-      columnsList: []
-    }
+      columnsList: [],
+    };
   },
   computed: {
-    ...mapGetters([
-      'userId'
-    ])
+    ...mapGetters(["userId"]),
   },
   created() {
     // 获取显隐列列表
-    this.getColumnsList()
-    this.getList()
+    this.getColumnsList();
+    this.getList();
   },
   methods: {
     /** 查询列表 */
     getList() {
-      this.loading = true
+      this.loading = true;
       // 执行查询
-      getMainDetailPage(this.queryParams).then(response => {
-        this.list = response.data.list
-        this.total = response.data.total
-      }).finally(() => {
-        this.loading = false
-      })
+      getMainDetailPage(this.queryParams)
+        .then((response) => {
+          this.list = response.data.list;
+          this.total = response.data.total;
+        })
+        .finally(() => {
+          this.loading = false;
+        });
     },
     /** 取消按钮 */
     cancel() {
-      this.open = false
-      this.reset()
+      this.open = false;
+      this.reset();
     },
     /** 表单重置 */
     reset() {
@@ -265,89 +286,108 @@ export default {
         remark: undefined,
         erpMdtime: undefined,
         erpMark: undefined,
-        prepareOrderNo: undefined
-      }
-      this.resetForm('form')
+        prepareOrderNo: undefined,
+      };
+      this.resetForm("form");
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      this.queryParams.pageNo = 1
-      this.getList()
+      this.queryParams.pageNo = 1;
+      this.getList();
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.resetForm('queryForm')
-      this.queryParams.prepareOrderNo = undefined
-      this.handleQuery()
+      this.resetForm("queryForm");
+      this.queryParams.prepareOrderNo = undefined;
+      this.handleQuery();
     },
     // 关联投料单
     handleView(row) {
-      const { materialNo } = row
-      this.$refs.productDetail.open = true
-      this.$refs.productDetail.queryParams.materialNo = materialNo
-      this.$refs.productDetail.title = '查看备料详情'
+      const { materialNo } = row;
+      this.$refs.productDetail.open = true;
+      this.$refs.productDetail.queryParams.materialNo = materialNo;
+      this.$refs.productDetail.title = "查看备料详情";
     },
     // 完成备料
     finishPreparation() {
       if (this.currentRows.length <= 0) {
-        this.$modal.msgWarning('备料数据不能为空，请选择您要备料的数据~')
-        return
+        this.$modal.msgWarning("备料数据不能为空，请选择您要备料的数据~");
+        return;
       }
-      this.$modal.confirm('您正在备料操作，是否继续？').then(() => {
-        updateWorkBatchBom(this.currentRows).then((res) => {
-          this.$modal.msgSuccess('操作成功')
-          this.getList()
+      this.$modal
+        .confirm("您正在备料操作，是否继续？")
+        .then(() => {
+          updateWorkBatchBom(this.currentRows).then((res) => {
+            this.$modal.msgSuccess("操作成功");
+            this.getList();
+          });
         })
-      }).catch(() => {
-        this.$modal.msg('您已取消操作')
-      })
+        .catch(() => {
+          this.$modal.msg("您已取消操作");
+        });
     },
     handleAdd() {
-      this.$router.push({ path: '/inLibrary/outsource-preparation-detail' })
+      this.$router.push({ path: "/inLibrary/outsource-preparation-detail" });
     },
     handleDetail(row) {
-      const { masterId } = row
-      this.$router.push({ path: '/inLibrary/outsource-preparation-detail', query: { masterId }})
+      const { id } = row;
+      this.$router.push({
+        path: "/inLibrary/outsource-preparation-detail",
+        query: { masterId: id },
+      });
     },
     // 删除
     handleDelete(row) {
-      const { id, prepareOrderNo } = row
-      this.$modal.confirm('是否确认删除备料单号为"' + prepareOrderNo + '"的数据项?').then(function() {
-        return deleteMasterPrepare(id)
-      }).then(() => {
-        this.getList()
-        this.$modal.msgSuccess('删除成功')
-      }).catch(() => {})
+      const { id, prepareOrderNo } = row;
+      this.$modal
+        .confirm('是否确认删除备料单号为"' + prepareOrderNo + '"的数据项?')
+        .then(function () {
+          return deleteMasterPrepare(id);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
     },
     // 获取显示隐藏列
     getColumnsList() {
-      const { componentName } = this.$route.meta || null
+      const { componentName } = this.$route.meta || null;
       const params = {
         userId: this.userId,
-        vueForm: componentName
-      }
-      getFormColumnsList(params).then(res => {
-        if (isArray(res.data)) {
-          this.columnsList = res.data.length === 0 ? this.columns : res.data
-          // 对比默认数据和接口数据，将缺失的列添加到接口数据中
-          this.columnsList = this.columns.reduce((acc, defaultColumn) => {
-            const found = res.data.find(apiColumn => apiColumn.key === defaultColumn.key)
-            if (!found) {
-              acc.push({ ...defaultColumn, vueForm: componentName, userId: this.userId, id: null })
-            }
-            return acc
-          }, res.data)
-        } else {
-          this.columnsList = this.columns
-        }
-      }).catch((err) => {
-        if (err) {
-          this.columnsList = this.columns
-        }
-      })
-    }
-  }
-}
+        vueForm: componentName,
+      };
+      getFormColumnsList(params)
+        .then((res) => {
+          if (isArray(res.data)) {
+            this.columnsList = res.data.length === 0 ? this.columns : res.data;
+            // 对比默认数据和接口数据，将缺失的列添加到接口数据中
+            this.columnsList = this.columns.reduce((acc, defaultColumn) => {
+              const found = res.data.find(
+                (apiColumn) => apiColumn.key === defaultColumn.key
+              );
+              if (!found) {
+                acc.push({
+                  ...defaultColumn,
+                  vueForm: componentName,
+                  userId: this.userId,
+                  id: null,
+                });
+              }
+              return acc;
+            }, res.data);
+          } else {
+            this.columnsList = this.columns;
+          }
+        })
+        .catch((err) => {
+          if (err) {
+            this.columnsList = this.columns;
+          }
+        });
+    },
+  },
+};
 </script>
 <style scoped>
 /* 表格使用了插槽复制的 */
@@ -358,4 +398,3 @@ export default {
   user-select: text;
 }
 </style>
-

src/views/wms/incoming/reject/components/AwaitRejectStock.vue

@@ -13,7 +13,7 @@
     </el-col> -->
     <!-- 列表 -->
     <AutoResizer :given-height="220">
-      <template #default="{height}">
+      <template #default="{ height }">
         <el-table
           v-if="columnsList.length > 0"
           v-loading="loading"
@@ -58,7 +58,10 @@
             prop="wmsStatus"
           >
             <template slot-scope="scope">
-              <dict-tag :type="DICT_TYPE.WMS_MATERIAL_RETURN_STATUS" :value="scope.row.wmsStatus" />
+              <dict-tag
+                :type="DICT_TYPE.WMS_MATERIAL_RETURN_STATUS"
+                :value="scope.row.wmsStatus"
+              />
             </template>
           </el-table-column>
           <el-table-column
@@ -75,15 +78,16 @@
                 type="text"
                 icon="el-icon-view"
                 @click="handleView(scope.row)"
-              >查看</el-button>
+                >查看</el-button
+              >
               <el-button
-                v-hasPermi="['wms:incoming-produce-detail:query']"
                 type="text"
                 icon="el-icon-upload"
                 size="mini"
                 @click="handleCase(scope.row)"
                 @complete="getComplete"
-              >入库方案</el-button>
+                >入库方案</el-button
+              >
             </template>
           </el-table-column>
         </el-table>
@@ -98,38 +102,43 @@
       @pagination="getList"
     />
     <!-- 入库方案 -->
-    <RejectWareHousingPlan ref="rejectWareHousingPlan" :warehousing-list="warehousingList" />
+    <RejectWareHousingPlan
+      ref="rejectWareHousingPlan"
+      :warehousing-list="warehousingList"
+    />
     <!-- 查看明细 -->
     <AwaitRejectDetail ref="awaitRejectDetail" />
   </div>
-
 </template>
 
 <script>
-import { getIncomingRejectPage, getToStockPageFromOut } from '@/api/wms/incoming/reject'
-import RejectWareHousingPlan from './RejectWareHousingPlan.vue'
-import AwaitRejectDetail from './AwaitRejectDetail.vue'
-import { getFormColumnsList } from '@/api/system/saveColumns/index'
-import { mapGetters } from 'vuex'
-import { isArray } from 'min-dash'
+import {
+  getIncomingRejectPage,
+  getToStockPageFromOut,
+} from "@/api/wms/incoming/reject";
+import RejectWareHousingPlan from "./RejectWareHousingPlan.vue";
+import AwaitRejectDetail from "./AwaitRejectDetail.vue";
+import { getFormColumnsList } from "@/api/system/saveColumns/index";
+import { mapGetters } from "vuex";
+import { isArray } from "min-dash";
 
 export default {
-  name: 'AwaitRejectStock',
+  name: "AwaitRejectStock",
   components: {
     RejectWareHousingPlan,
-    AwaitRejectDetail
+    AwaitRejectDetail,
   },
   props: {
-    'activeName': {
+    activeName: {
       type: String,
-      default: ''
+      default: "",
     },
-    'queryParamspro': {
+    queryParamspro: {
       type: Object,
-      default: () => {}
-    }
+      default: () => {},
+    },
   },
-  inject: ['paramsQuery'],
+  inject: ["paramsQuery"],
   data() {
     return {
       // 遮罩层
@@ -139,7 +148,7 @@ export default {
       // 领料单列表
       list: [],
       // 弹出层标题
-      title: '',
+      title: "",
       // 是否显示弹出层
       open: false,
       //   是否显示查看弹出层
@@ -150,7 +159,7 @@ export default {
       queryParams: {
         pageNo: 1,
         pageSize: 10,
-        receiveOrderNo: null
+        receiveOrderNo: null,
       },
       warehousingList: [],
       currentRows: [],
@@ -160,43 +169,41 @@ export default {
       rules: {},
       // 显示隐藏列参数
       columns: [
-        { key: 0, label: '退料单号', visible: true },
-        { key: 1, label: '退料原因', visible: true },
-        { key: 2, label: '退料发起时间', visible: true },
-        { key: 3, label: '退料状态', visible: true },
-        { key: 4, label: '物料批次', visible: true },
-        { key: 5, label: '退料单号', visible: true },
-        { key: 6, label: '入库仓库', visible: true },
-        { key: 7, label: '入库区域', visible: true },
-        { key: 8, label: '入库货位', visible: true },
-        { key: 9, label: '物料名称', visible: true },
-        { key: 10, label: '供应商', visible: true },
-        { key: 11, label: '物料编码', visible: true },
-        { key: 12, label: '领料单号', visible: true },
-        { key: 13, label: '发料单号', visible: true },
-        { key: 14, label: '发料数量', visible: true },
-        { key: 15, label: '退料数量', visible: true },
-        { key: 16, label: '入库数量', visible: true },
-        { key: 17, label: '创建时间', visible: true }
+        { key: 0, label: "退料单号", visible: true },
+        { key: 1, label: "退料原因", visible: true },
+        { key: 2, label: "退料发起时间", visible: true },
+        { key: 3, label: "退料状态", visible: true },
+        { key: 4, label: "物料批次", visible: true },
+        { key: 5, label: "退料单号", visible: true },
+        { key: 6, label: "入库仓库", visible: true },
+        { key: 7, label: "入库区域", visible: true },
+        { key: 8, label: "入库货位", visible: true },
+        { key: 9, label: "物料名称", visible: true },
+        { key: 10, label: "供应商", visible: true },
+        { key: 11, label: "物料编码", visible: true },
+        { key: 12, label: "领料单号", visible: true },
+        { key: 13, label: "发料单号", visible: true },
+        { key: 14, label: "发料数量", visible: true },
+        { key: 15, label: "退料数量", visible: true },
+        { key: 16, label: "入库数量", visible: true },
+        { key: 17, label: "创建时间", visible: true },
       ],
       // 显示隐藏持久化参数
-      columnsList: []
-    }
+      columnsList: [],
+    };
   },
   // 获取当前登录用户id
   computed: {
-    ...mapGetters([
-      'userId'
-    ])
+    ...mapGetters(["userId"]),
   },
   created() {
-    this.getColumnsList()
-    this.getList()
+    this.getColumnsList();
+    this.getList();
   },
   methods: {
     /** 查询列表 */
     getList() {
-      this.loading = true
+      this.loading = true;
       // 执行查询
       // if (this.$route.query.rejectId) {
       //   this.queryParams.id = this.$route.query.rejectId
@@ -204,34 +211,38 @@ export default {
       const params = {
         ...this.paramsQuery,
         ...this.queryParams,
-        ...this.advParams
-      }
+        ...this.advParams,
+      };
       if (this.$route.query.receiveOrderNo) {
-        this.queryParams.receiveOrderNo = this.$route.query.receiveOrderNo
+        this.queryParams.receiveOrderNo = this.$route.query.receiveOrderNo;
         const params = {
           ...this.paramsQuery,
           ...this.queryParams,
-          ...this.advParams
-        }
-        getToStockPageFromOut(params).then(res => {
-          this.list = res.data.list
-          this.total = res.data.total
-        }).finally(() => {
-          this.loading = false
-        })
+          ...this.advParams,
+        };
+        getToStockPageFromOut(params)
+          .then((res) => {
+            this.list = res.data.list;
+            this.total = res.data.total;
+          })
+          .finally(() => {
+            this.loading = false;
+          });
       } else {
-        getIncomingRejectPage(params).then(response => {
-          this.list = response.data.list
-          this.total = response.data.total
-        }).finally(() => {
-          this.loading = false
-        })
+        getIncomingRejectPage(params)
+          .then((response) => {
+            this.list = response.data.list;
+            this.total = response.data.total;
+          })
+          .finally(() => {
+            this.loading = false;
+          });
       }
     },
     /** 取消按钮 */
     cancel() {
-      this.open = false
-      this.reset()
+      this.open = false;
+      this.reset();
     },
     /** 表单重置 */
     reset() {
@@ -244,65 +255,73 @@ export default {
         wmsStoreId: undefined,
         inQty: undefined,
         funitId: undefined,
-        remark: undefined
-      }
-      this.resetForm('form')
+        remark: undefined,
+      };
+      this.resetForm("form");
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      this.queryParams.pageNo = 1
-      this.getList()
+      this.queryParams.pageNo = 1;
+      this.getList();
     },
     // 入库方案
     handleCase(row) {
-      const { rejectNo } = row
-      this.$refs.rejectWareHousingPlan.queryParams.rejectNo = rejectNo
-      this.$refs.rejectWareHousingPlan.open = true
-      this.$refs.rejectWareHousingPlan.title = '入库方案'
-      this.$refs.rejectWareHousingPlan.getList()
+      const { rejectNo } = row;
+      this.$refs.rejectWareHousingPlan.queryParams.rejectNo = rejectNo;
+      this.$refs.rejectWareHousingPlan.open = true;
+      this.$refs.rejectWareHousingPlan.title = "入库方案";
+      this.$refs.rejectWareHousingPlan.getList();
     },
     // 查看明细
     handleView(row) {
-      const { rejectNo } = row
-      this.$refs.awaitRejectDetail.queryParams.rejectNo = rejectNo
-      this.$refs.awaitRejectDetail.open = true
+      const { rejectNo } = row;
+      this.$refs.awaitRejectDetail.queryParams.rejectNo = rejectNo;
+      this.$refs.awaitRejectDetail.open = true;
     },
     getComplete() {
-      this.getList()
-      this.$emit('rejectComplete')
+      this.getList();
+      this.$emit("rejectComplete");
     },
     // 获取显示隐藏列
     getColumnsList() {
-      const { componentName } = this.$route.meta || null
+      const { componentName } = this.$route.meta || null;
       const params = {
         userId: this.userId,
-        vueForm: componentName
-      }
-      getFormColumnsList(params).then(res => {
-        if (isArray(res.data)) {
-          this.columnsList = res.data.length === 0 ? this.columns : res.data
-          // 对比默认数据和接口数据，将缺失的列添加到接口数据中
-          this.columnsList = this.columns.reduce((acc, defaultColumn) => {
-            const found = res.data.find(apiColumn => apiColumn.key === defaultColumn.key)
-            if (!found) {
-              acc.push({ ...defaultColumn, vueForm: componentName, userId: this.userId, id: null })
-            }
-            return acc
-          }, res.data)
-        } else {
-          this.columnsList = this.columns
-        }
-      }).catch((err) => {
-        if (err) {
-          this.columnsList = this.columns
-        }
-      }).finally(() => {
-        this.$emit('columns', this.columnsList)
-      })
-    }
-  }
-}
+        vueForm: componentName,
+      };
+      getFormColumnsList(params)
+        .then((res) => {
+          if (isArray(res.data)) {
+            this.columnsList = res.data.length === 0 ? this.columns : res.data;
+            // 对比默认数据和接口数据，将缺失的列添加到接口数据中
+            this.columnsList = this.columns.reduce((acc, defaultColumn) => {
+              const found = res.data.find(
+                (apiColumn) => apiColumn.key === defaultColumn.key
+              );
+              if (!found) {
+                acc.push({
+                  ...defaultColumn,
+                  vueForm: componentName,
+                  userId: this.userId,
+                  id: null,
+                });
+              }
+              return acc;
+            }, res.data);
+          } else {
+            this.columnsList = this.columns;
+          }
+        })
+        .catch((err) => {
+          if (err) {
+            this.columnsList = this.columns;
+          }
+        })
+        .finally(() => {
+          this.$emit("columns", this.columnsList);
+        });
+    },
+  },
+};
 </script>
-<style>
-</style>
-
+<style></style>

src/views/wms/incoming/reject/components/RejectWareHousingPlan.vue

@@ -40,7 +40,7 @@
           <template slot-scope="scope">
             <StockSelect
               :ref="`stock-${scope.$index}`"
-              v-model="scope.row.wmsStockName"
+              v-model="scope.row.selectedStockId"
               filterable
               @change="
                 ($event) => {
@@ -54,7 +54,7 @@
           <template slot-scope="scope">
             <AreaSelect
               :ref="`area-${scope.$index}`"
-              v-model="scope.row.wmsStoreAreaName"
+              v-model="scope.row.selectedStoreAreaId"
               filterable
               @change="
                 ($event) => {
@@ -72,7 +72,7 @@
           <template slot-scope="scope">
             <LocationSelect
               :ref="`location-${scope.$index}`"
-              v-model="scope.row.wmsStockLocationName"
+              v-model="scope.row.selectedStockLocationId"
               filterable
               @change="locationChange($event, scope.row)"
             />
@@ -184,7 +184,9 @@ export default {
     handleSure() {
       const isEmpty = this.list.every(
         (item) =>
-          item.wmsStockId && item.wmsStoreAreaId && item.wmsStockLocationId
+          item.selectedStockId &&
+          item.selectedStoreAreaId &&
+          item.selectedStockLocationId
       );
       if (this.list.length === 0) {
         this.$modal.msgWarning("暂无入库数据，无法入库");
@@ -197,9 +199,9 @@ export default {
       this.ensureLoading = true;
       const rejectList = this.list.map((item) => {
         const {
-          wmsStockId: erpStockId,
-          wmsStoreAreaId: wmsStoreAreaId,
-          wmsStockLocationId: wmsStoreId,
+          selectedStockId: erpStockId,
+          selectedStoreAreaId: wmsStoreAreaId,
+          selectedStockLocationId: wmsStoreId,
           inQty,
           rejectNo,
           mesDetailId,
@@ -240,7 +242,7 @@ export default {
     stockChange(item, index, row) {
       if (item) {
         const { id } = item;
-        row.wmsStockId = id;
+        row.selectedStockId = id;
         row.wmsStoreAreaName = undefined;
         row.wmsStockLocationName = undefined;
         this.$refs[`area-${index}`].options = [];
@@ -250,14 +252,14 @@ export default {
     areaChange(item, index, row) {
       if (item) {
         const { id } = item;
-        row.wmsStoreAreaId = id;
+        row.selectedStoreAreaId = id;
         row.wmsStockLocationName = undefined;
         this.$refs[`location-${index}`].options = [];
         this.$refs[`location-${index}`].fetchLocationList(id);
       }
     },
     locationChange(item, row) {
-      row.wmsStockLocationId = item.id;
+      row.selectedStockLocationId = item.id;
     },
   },
 };

src/views/wms/quality/iqcInspection/components/PeelingForce.vue

@@ -139,6 +139,7 @@ export default {
   methods: {
     /** 查询列表 */
     getList() {
+      // 暂时不调getPeelingList()屏蔽掉
       // this.loading = true
       // // 执行查询
       // getPeelingList(this.queryParams).then(response => {