政策订单【修改】物料字段名称 policy_list retail_return retail_form retail_detail

仓库对应关系 【新增】新增&编辑添加单选虚拟仓

src/views/basic_data/warehouse/warehouse_site.vue

@@ -257,6 +257,10 @@
         <el-form-item label="备注">
           <el-input type="textarea" v-model="diaLogForm.remark"></el-input>
         </el-form-item>
+        <el-form-item label="虚拟仓">
+          <el-radio v-model="diaLogForm.type" label="1">是</el-radio>
+          <el-radio v-model="diaLogForm.type" label="2">否</el-radio>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="showDialogForm = false">取 消</el-button>
@@ -301,6 +305,7 @@ export default {
       ],
       diaLogForm: {
         id: null,
+        type:'1',
         name: "",
         remark: "",
         status: 1,
@@ -346,12 +351,14 @@ export default {
         });
       }
       this.newData();
+      console.log(row.type,'444')
       this.diaLogForm = {
         id,
         name: row.name,
         remark: row.remark,
         status: row.status,
         stockCordon: row.stockCordon,
+        type:row.type+'',
         stockIds: row.stockIds === undefined ? arr : row.stockIds,
       };
       this.showDialogForm = true;
@@ -378,6 +385,7 @@ export default {
       this.diaLogForm = {
         name: "",
         remark: "",
+        type:'1',
         status: 0,
         stockCordon: 0,
         stockIds: [],

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

@@ -94,7 +94,7 @@
           />
           <el-table-column
             align="center"
-            label="产品编码"
+            label="物料编码"
             prop="materialCode"
             min-width="160"
             show-overflow-tooltip
@@ -347,8 +347,8 @@
         <el-table :data="directGoodsList" element-loading-text="Loading" border fit highlight-current-row stripe max-height="400">
           <el-table-column align="center" label="序号" type="index" width="50"></el-table-column>
           <el-table-column align="center" label="销售类型" prop="saleTypeName" 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="materialOldNumber" min-width="160" 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="materialOldNumber" min-width="160" 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>
@@ -459,7 +459,7 @@
           />
           <el-table-column
             align="center"
-            label="产品编码"
+            label="物料编码"
             prop="materialCode"
             min-width="160"
             show-overflow-tooltip
@@ -761,7 +761,7 @@ export default {
       getPositionList({
         pageNum: 1,
         pageSize: -1,
-        stockType: 1
+        type:2
       }).then(res => {
         this.positionList = res.data.records;
       })
@@ -802,7 +802,7 @@ export default {
     getWarehouseList() {
       getWarehouseList({
         pageNum: 1,
-        pageSize: -1,
+        pageSize: -1
       }).then(res => {
         this.warehouseList1 = res.data.records;
         this.warehouseList2 = res.data.records;

src/views/supply/policy/components/retail_examine.vue

@@ -81,7 +81,7 @@
         ></el-table-column>
         <el-table-column
           align="center"
-          label="产品编码"
+          label="物料编码"
           prop="materialCode"
           min-width="160"
           show-overflow-tooltip

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

@@ -134,7 +134,7 @@
         />
         <el-table-column
           align="center"
-          label="存货编码"
+          label="物料编码"
           prop="materialNumber"
           min-width="100"
           show-overflow-tooltip

src/views/supply/policy/components/retail_return.vue

@@ -51,7 +51,7 @@
       <el-table :data="detailData.retailOrderItemList" element-loading-text="Loading" border fit highlight-current-row stripe max-height="400">
         <el-table-column align="center" label="序号" type="index" width="50"></el-table-column>
         <el-table-column align="center" label="销售类型" prop="saleTypeName" 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="160" 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>
@@ -135,7 +135,7 @@
 </template>
 
 <script>
-import { getDetail, returnData } from "@/api/supply/retail";
+import { getDetail, returnData } from '@/api/supply/retail'
 
 export default {
   name: 'RetailReturn',

src/views/supply/policy/policy_list.vue

@@ -215,7 +215,7 @@
             />
             <el-table-column
               align="center"
-              label="产品编码"
+              label="物料编码"
               prop="materialCode"
               min-width="160"
               show-overflow-tooltip
@@ -390,7 +390,7 @@
             <el-table-column
               align="center"
               label="操作"
-              
+
               width="220"
               fixed="right"
             >