【修改】调整零售单和工程订单-直调发货

src/api/supply/engin.js

@@ -18,6 +18,24 @@ export function getDetail(params) {
   })
 }
 
+// 获取产品列表
+export function getRetailProductList(params) {
+  return request({
+    url: '/retail/product/list',
+    method: 'get',
+    params
+  })
+}
+
+// 获取仓位列表
+export function getPositionList(params) {
+  return request({
+    url: '/stock/list',
+    method: 'get',
+    params
+  })
+}
+
 // 工程信息单 - 获取列表
 export function getEnginList(params) {
   return request({
@@ -45,15 +63,6 @@ export function examineEngin(params) {
   })
 }
 
-// 获取产品列表
-export function getRetailProductList(params) {
-  return request({
-    url: '/retail/product/list',
-    method: 'get',
-    params
-  })
-}
-
 // 工程信息单 - 新增
 export function addEngin(params) {
   return request({

src/api/supply/retail.js

@@ -117,6 +117,15 @@ export function getWarehouseList(params) {
   })
 }
 
+// 获取仓位列表
+export function getPositionList(params) {
+  return request({
+    url: '/stock/list',
+    method: 'get',
+    params
+  })
+}
+
 // 检查库存
 export function checkStock(params) {
   return request({

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

@@ -218,13 +218,6 @@
             </el-form-item>
           </el-col>
           <el-col :xs="8" :sm="8" :lg="8">
-            <el-form-item label="发货仓库" prop="warehouse">
-              <el-select v-model="deliverForm.warehouse" placeholder="请选择发货仓库" style="width: 100%" filterable @change="changeWarehouse">
-                <el-option v-for="item in warehouseList" :key="item.id" :label="item.name" :value="item.id"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="8" :sm="8" :lg="8">
             <el-form-item label="选择仓位" prop="position">
               <el-select v-model="deliverForm.position" placeholder="请选择仓位" style="width: 100%" filterable>
                 <el-option v-for="item in positionList" :key="item.id" :label="item.name" :value="item.id"></el-option>
@@ -343,7 +336,7 @@
 </template>
 
 <script>
-import { getOrderDetail, closeCom, overOrder, getWarehouseList, deliverOrder, directOrder } from "@/api/supply/engin";
+import { getOrderDetail, closeCom, overOrder, getWarehouseList, deliverOrder, directOrder, getPositionList } from "@/api/supply/engin";
 
 export default {
   name: 'CommerceDetail',
@@ -369,21 +362,16 @@ export default {
       isShowDeliverDialog: false,
       deliverForm: {
         date: '',
-        warehouse: '',
         position: '',
       },
       deliverFormRules: {
         date: [
           { required: true, message: '请选择发货日期', trigger: 'change' }
         ],
-        warehouse: [
-          { required: true, message: '请选择发货仓库', trigger: 'change' }
-        ],
         position: [
           { required: true, message: '请选择仓位', trigger: 'change' }
         ],
       },
-      warehouseList: [],
       positionList: [],
       deliverGoodsList: [],
 
@@ -438,12 +426,22 @@ export default {
         pageNum: 1,
         pageSize: -1,
       }).then(res => {
-        this.warehouseList = res.data.records;
         this.warehouseList1 = res.data.records;
         this.warehouseList2 = res.data.records;
       })
     },
 
+    // 获取虚拟仓位列表
+    getPositionList() {
+      getPositionList({
+        pageNum: 1,
+        pageSize: -1,
+        stockType: 1
+      }).then(res => {
+        this.positionList = res.data.records;
+      })
+    },
+
     // 获取详情
     getDetail() {
       getOrderDetail({id: this.listItem.parentId}).then(res => {
@@ -505,7 +503,7 @@ export default {
         item.status1 = '';
         item.status2 = '';
       })
-      this.getWarehouseList();
+      this.getPositionList();
     },
 
     // 关闭 直调发货
@@ -527,7 +525,6 @@ export default {
             enginOrderId: this.detailData.enginOrderId,
             enginOrderType: 'TRADE', // TRADE=商用 HOME=家用
             deliverDate: this.deliverForm.date + ' 00:00:00',
-            correspondId: this.deliverForm.warehouse,
             stockId: this.deliverForm.position,
             items: this.deliverGoodsList
           }

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

@@ -218,13 +218,6 @@
             </el-form-item>
           </el-col>
           <el-col :xs="8" :sm="8" :lg="8">
-            <el-form-item label="发货仓库" prop="warehouse">
-              <el-select v-model="deliverForm.warehouse" placeholder="请选择发货仓库" style="width: 100%" filterable @change="changeWarehouse">
-                <el-option v-for="item in warehouseList" :key="item.id" :label="item.name" :value="item.id"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="8" :sm="8" :lg="8">
             <el-form-item label="选择仓位" prop="position">
               <el-select v-model="deliverForm.position" placeholder="请选择仓位" style="width: 100%" filterable>
                 <el-option v-for="item in positionList" :key="item.id" :label="item.name" :value="item.id"></el-option>
@@ -331,7 +324,7 @@
 </template>
 
 <script>
-import { getOrderDetail, closeHome, overOrder, getWarehouseList, deliverOrder, directOrder } from "@/api/supply/engin";
+import { getOrderDetail, closeHome, overOrder, getWarehouseList, deliverOrder, directOrder, getPositionList } from "@/api/supply/engin";
 
 export default {
   name: 'HomeDetail',
@@ -357,21 +350,16 @@ export default {
       isShowDeliverDialog: false,
       deliverForm: {
         date: '',
-        warehouse: '',
         position: '',
       },
       deliverFormRules: {
         date: [
           { required: true, message: '请选择发货日期', trigger: 'change' }
         ],
-        warehouse: [
-          { required: true, message: '请选择发货仓库', trigger: 'change' }
-        ],
         position: [
           { required: true, message: '请选择仓位', trigger: 'change' }
         ],
       },
-      warehouseList: [],
       positionList: [],
       deliverGoodsList: [],
 
@@ -428,12 +416,22 @@ export default {
         pageNum: 1,
         pageSize: -1,
       }).then(res => {
-        this.warehouseList = res.data.records;
         this.warehouseList1 = res.data.records;
         this.warehouseList2 = res.data.records;
       })
     },
 
+    // 获取虚拟仓位列表
+    getPositionList() {
+      getPositionList({
+        pageNum: 1,
+        pageSize: -1,
+        stockType: 1
+      }).then(res => {
+        this.positionList = res.data.records;
+      })
+    },
+
     // 获取详情
     getDetail() {
       getOrderDetail({id: this.listItem.parentId}).then(res => {
@@ -495,7 +493,7 @@ export default {
         item.status1 = '';
         item.status2 = '';
       })
-      this.getWarehouseList();
+      this.getPositionList();
     },
 
     // 关闭 直调发货
@@ -517,7 +515,6 @@ export default {
             enginOrderId: this.detailData.enginOrderId,
             enginOrderType: 'HOME', // TRADE=商用 HOME=家用
             deliverDate: this.deliverForm.date + ' 00:00:00',
-            correspondId: this.deliverForm.warehouse,
             stockId: this.deliverForm.position,
             items: this.deliverGoodsList
           }

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

@@ -169,13 +169,6 @@
             </el-form-item>
           </el-col>
           <el-col :xs="8" :sm="8" :lg="8">
-            <el-form-item label="发货仓库" prop="warehouse">
-              <el-select v-model="deliverForm.warehouse" placeholder="请选择发货仓库" style="width: 100%" filterable @change="changeWarehouse">
-                <el-option v-for="item in warehouseList" :key="item.id" :label="item.name" :value="item.id"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="8" :sm="8" :lg="8">
             <el-form-item label="选择仓位" prop="position">
               <el-select v-model="deliverForm.position" placeholder="请选择仓位" style="width: 100%" filterable>
                 <el-option v-for="item in positionList" :key="item.id" :label="item.name" :value="item.id"></el-option>
@@ -298,7 +291,7 @@
 </template>
 
 <script>
-import { getDetail, getWarehouseList, adjustDeliver, finishData, directOrder } from "@/api/supply/retail";
+import { getDetail, getWarehouseList, adjustDeliver, finishData, directOrder, getPositionList } from "@/api/supply/retail";
 
 export default {
   name: 'RetailDetail',
@@ -323,21 +316,16 @@ export default {
       isShowDeliverDialog: false,
       deliverForm: {
         date: '',
-        warehouse: '',
         position: '',
       },
       deliverFormRules: {
         date: [
           { required: true, message: '请选择发货日期', trigger: 'change' }
         ],
-        warehouse: [
-          { required: true, message: '请选择发货仓库', trigger: 'change' }
-        ],
         position: [
-          { required: true, message: '请选择仓位', trigger: 'change' }
+          { required: true, message: '请选择虚拟仓位', trigger: 'change' }
         ],
       },
-      warehouseList: [],
       positionList: [],
 
       goodsList: [],
@@ -415,24 +403,27 @@ export default {
         pageNum: 1,
         pageSize: -1,
       }).then(res => {
-        this.warehouseList = res.data.records;
         this.warehouseList1 = res.data.records;
         this.warehouseList2 = res.data.records;
       })
     },
 
-    // 更改仓库
-    changeWarehouse() {
-      this.deliverForm.position = '';
-      let obj = this.warehouseList.find(o => o.id == this.deliverForm.warehouse);
-      this.positionList = obj.kingDeeStocks;
+    // 获取虚拟仓位列表
+    getPositionList() {
+      getPositionList({
+        pageNum: 1,
+        pageSize: -1,
+        stockType: 1
+      }).then(res => {
+        this.positionList = res.data.records;
+      })
     },
 
     // 打开 直调发货
     openDeliverDialog() {
       this.isShowDeliverDialog = true;
       this.goodsList = this.detailData.retailOrderItemList;
-      this.getWarehouseList();
+      this.getPositionList();
     },
 
     // 关闭 直调发货
@@ -459,7 +450,6 @@ export default {
           let params = {
             orderNo: this.listItem.id,
             orderDate: this.deliverForm.date + ' 00:00:00',
-            correspondId: this.deliverForm.warehouse,
             stockId: this.deliverForm.position,
             directItems: goodsList
           }