【修改】零售单/工程单 - 直调发货的仓库

src/api/supply/engin.js

@@ -39,7 +39,7 @@ export function getEnginProductList(params) {
 // 获取仓位列表
 export function getPositionList(params) {
   return request({
-    url: '/stock/list',
+    url: '/stock/listStock',
     method: 'get',
     params
   })

src/api/supply/retail.js

@@ -20,7 +20,7 @@ export function getDetail(params) {
 // 获取仓位列表
 export function getPositionList(params) {
   return request({
-    url: "/stock/list",
+    url: "/stock/listStock",
     method: "get",
     params,
   });

src/views/stock/stock_list.vue

@@ -19,16 +19,6 @@
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="物料代码" prop="goodsCode">
-              <el-input v-model="screenForm.goodsCode" placeholder="请输入物料代码"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="产品名称" prop="goodsName">
-              <el-input v-model="screenForm.goodsName" placeholder="请输入产品名称"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="产品大类" prop="type">
               <el-select v-model="screenForm.type" placeholder="请选择产品大类" @change="changeType" clearable>
                 <el-option v-for="item in typeList" :key="item.dictCode" :label="item.dictValue" :value="item.dictCode"></el-option>
@@ -43,11 +33,21 @@
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="物料编码" prop="goodsCode">
+              <el-input v-model="screenForm.goodsCode" placeholder="请输入物料编码"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="产品编码" prop="goodsNum">
               <el-input v-model="screenForm.goodsNum" placeholder="请输入产品编码"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="产品名称" prop="goodsName">
+              <el-input v-model="screenForm.goodsName" placeholder="请输入产品名称"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="规格型号" prop="model">
               <el-input v-model="screenForm.model" placeholder="请输入规格型号"></el-input>
             </el-form-item>
@@ -139,8 +139,8 @@ export default {
         correspondId: this.screenForm.warehouse,
         stockId: this.screenForm.position,
         materialName: this.screenForm.goodsName,
-        materialNumber: this.screenForm.goodsNum,
-        materialOldNumber: this.screenForm.goodsCode,
+        materialNumber: this.screenForm.goodsCode,
+        materialOldNumber: this.screenForm.goodsNum,
         specification: this.screenForm.model,
         mainNumber: this.screenForm.type,
         categoryId: this.screenForm.smallType,
@@ -219,8 +219,8 @@ export default {
         correspondId: this.screenForm.warehouse,
         stockId: this.screenForm.position,
         materialName: this.screenForm.goodsName,
-        materialNumber: this.screenForm.goodsNum,
-        materialOldNumber: this.screenForm.goodsCode,
+        materialNumber: this.screenForm.goodsCode,
+        materialOldNumber: this.screenForm.goodsNum,
         specification: this.screenForm.model,
         mainNumber: this.screenForm.type,
         categoryId: this.screenForm.smallType,

src/views/supply/engin/components/commerce_detail.vue

@@ -457,7 +457,7 @@ export default {
       getPositionList({
         pageNum: 1,
         pageSize: -1,
-        stockType: 1
+        type: 2
       }).then(res => {
         this.positionList = res.data.records;
       })

src/views/supply/engin/components/home_detail.vue

@@ -462,7 +462,7 @@ export default {
       getPositionList({
         pageNum: 1,
         pageSize: -1,
-        stockType: 1
+        type: 2
       }).then(res => {
         this.positionList = res.data.records;
       })

src/views/supply/retail/components/retail_detail.vue

@@ -422,7 +422,7 @@ export default {
       getPositionList({
         pageNum: 1,
         pageSize: -1,
-        stockType: 1
+        type: 2
       }).then(res => {
         this.positionList = res.data.records;
       })