Merge branch 'master' into feature/Feature-return

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/direct/direct_list.vue

@@ -80,6 +80,7 @@
           <el-table v-loading="listLoading" :data="dataList" element-loading-text="Loading" border fit highlight-current-row stripe @selection-change="handleSelectionChange">
             <el-table-column align="center" type="selection" width="55"></el-table-column>
             <el-table-column align="center" label="直接调拨单号" prop="id" min-width="180" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="订单号" prop="orderNo" min-width="140" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="审核状态" prop="examineStatus" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{scope.row.examineStatus | statusFilter}}
@@ -89,7 +90,8 @@
             <el-table-column align="center" label="经销商编码" prop="customerNumber" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="经销商名称" prop="customerName" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="调拨方向" prop="direction" min-width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column align="center" label="产品编码" prop="materialCode" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="物料编码" prop="materialCode" min-width="120" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="产品编码" prop="materialOldNumber" min-width="120" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="规格型号" prop="specification" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>

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;
       })
@@ -546,7 +546,7 @@ export default {
             enginOrderId: this.detailData.enginOrderId,
             enginOrderType: 'TRADE', // TRADE=商用 HOME=家用
             deliverDate: this.deliverForm.date + ' 00:00:00',
-            stockId: this.deliverForm.position,
+            correspondId: this.deliverForm.position,
             items: this.deliverGoodsList
           }
           deliverOrder(params).then(res => {

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;
       })
@@ -551,7 +551,7 @@ export default {
             enginOrderId: this.detailData.enginOrderId,
             enginOrderType: 'HOME', // TRADE=商用 HOME=家用
             deliverDate: this.deliverForm.date + ' 00:00:00',
-            stockId: this.deliverForm.position,
+            correspondId: this.deliverForm.position,
             items: this.deliverGoodsList
           }
           this.formLoading = true;

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;
       })
@@ -459,7 +459,7 @@ export default {
           let params = {
             orderNo: this.listItem.id,
             orderDate: this.deliverForm.date + ' 00:00:00',
-            stockId: this.deliverForm.position,
+            correspondId: this.deliverForm.position,
             directItems: goodsList
           }
           adjustDeliver(params).then(res => {

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

@@ -194,13 +194,6 @@
     <el-dialog title="添加产品" :visible.sync="isShowDialog" width="80%">
       <el-form ref="screenForm" :model="screenForm" size="small" label-position="left">
         <el-row :gutter="20">
-          <!-- <el-col :xs="12" :sm="6" :lg="6">
-            <el-form-item prop="type">
-              <el-select v-model="mainForm.type" placeholder="选择产品大类" style="width: 100%" clearable :disabled="goodsList.length > 0 || rightGoodsList.length > 0">
-                <el-option v-for="item in typeList" :key="item.dictCode" :label="item.dictValue" :value="item.dictCode"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col> -->
           <el-col :xs="12" :sm="6" :lg="6">
             <el-form-item prop="salesType">
               <el-select v-model="screenForm.salesType" placeholder="选择销售类型" style="width: 100%" clearable>
@@ -210,7 +203,7 @@
           </el-col>
           <el-col :xs="12" :sm="6" :lg="6">
             <el-form-item prop="proNum">
-              <el-input v-model="screenForm.proNum" placeholder="请输入产品编码"></el-input>
+              <el-input v-model="screenForm.proNum" placeholder="请输入物料编码"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="12" :sm="6" :lg="6">
@@ -243,7 +236,8 @@
         <div class="table">
           <el-table :data="leftGoodsList" element-loading-text="Loading" border fit highlight-current-row stripe height="400" @selection-change="leftSelectionChange">
             <el-table-column align="center" type="selection" width="55" :selectable='checkboxSelect'></el-table-column>
-            <el-table-column align="center" label="产品编码" prop="number" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="物料编码" prop="materialNumber" min-width="120" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="产品编码" prop="materialOldNumber" min-width="120" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="产品名称" prop="name" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="产品型号" prop="specification" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="产品价格" prop="batchPrice" min-width="80" show-overflow-tooltip></el-table-column>
@@ -270,7 +264,8 @@
         <div class="table">
           <el-table :data="rightGoodsList" element-loading-text="Loading" border fit highlight-current-row stripe height="400" @selection-change="rightSelectionChange">
             <el-table-column align="center" type="selection" width="55"></el-table-column>
-            <el-table-column align="center" label="产品编码" prop="number" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="物料编码" prop="materialNumber" min-width="120" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="产品编码" prop="materialOldNumber" min-width="120" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="产品名称" prop="name" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="产品型号" prop="specification" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="产品价格" prop="batchPrice" min-width="80" show-overflow-tooltip></el-table-column>