js

src/views/Store/goodslist.vue

@@ -250,6 +250,7 @@
       </div>
     </div>
     <Menu/>
+    <!--新增优势物料-->
     <el-dialog title="新增优势物料" :close-on-click-modal="false" :visible.sync="addBestgoods.dialogVisible" width="1000px">
       <div class="dialog-form bestGoodsList-dialog">
         <table>
@@ -279,6 +280,12 @@
             <th align="left" width="50">
               <span>库存</span>
             </th>
+            <th align="left" width="80">
+              <span>大陆交期</span>
+            </th>
+            <th align="left" width="80">
+              <span>香港交期</span>
+            </th>
             <th align="left" width="50">
               <span>操作</span>
             </th>
@@ -356,6 +363,12 @@
               <el-input v-model="addBestgoodsParam[index].stock_number" placeholder="个"></el-input>
             </td>
             <td>
+              <el-input v-model="addBestgoodsParam[index].delivery_time_cn" placeholder="如2-5个工作日"></el-input>
+            </td>
+            <td>
+              <el-input v-model="addBestgoodsParam[index].delivery_time_hk" placeholder="如2-5个工作日"></el-input>
+            </td>
+            <td>
               <el-button type="danger" @click="reduceRow(index)">删除</el-button>
             </td>
           </tr>
@@ -368,6 +381,7 @@
         <el-button type="primary" @click="addBestgoodsSubmit" v-dbClick>确 定</el-button>
       </div>
     </el-dialog>
+    <!--修改优势物料-->
     <el-dialog title="修改优势物料" :close-on-click-modal="false" :visible.sync="addBestgoods.dialogVisibleUpdate" width="1000px">
       <div class="dialog-form bestGoodsList-dialog">
         <table>
@@ -397,6 +411,12 @@
             <th align="left" width="50">
               <span>库存</span>
             </th>
+            <th align="left" width="80">
+              <span>大陆交期</span>
+            </th>
+            <th align="left" width="80">
+              <span>香港交期</span>
+            </th>
           </tr>
           <tr v-for="(item,index) in updateBestgoodsParam">
             <td>
@@ -470,6 +490,12 @@
             <td>
               <el-input v-model="updateBestgoodsParam[index].stock_number" placeholder="个"></el-input>
             </td>
+            <td>
+              <el-input v-model="updateBestgoodsParam[index].delivery_time_cn" placeholder="如2-5个工作日"></el-input>
+            </td>
+            <td>
+              <el-input v-model="updateBestgoodsParam[index].delivery_time_hk" placeholder="如2-5个工作日"></el-input>
+            </td>
           </tr>
           </tbody>
         </table>
@@ -479,6 +505,7 @@
         <el-button type="primary" @click="updateBestgoodsSubmit">确 定</el-button>
       </div>
     </el-dialog>
+    <!--优势物料日志-->
     <el-dialog title="优势物料日志" :close-on-click-modal="false" :visible.sync="dialogVisible" width="1000px">
       <el-table :data="logs" border max-height="600">
         <el-table-column prop="create_time" label="时间" min-width="150" align="center"></el-table-column>
@@ -547,7 +574,9 @@ export default {
           price_origin: "",
           batch: "",
           stock_number: "",
-          join_inquiry: ""
+          join_inquiry: "",
+          delivery_time_cn: '',//大陆交期
+          delivery_time_hk: ''//香港交期
         }
       ],
       updateBestgoodsParam: [],
@@ -614,7 +643,9 @@ export default {
         price_origin: "",
         batch: "",
         stock_number: "",
-        join_inquiry: ""
+        join_inquiry: "",
+        delivery_time_cn: '',//大陆交期
+        delivery_time_hk: ''//香港交期
       }]
     },
     //修改优势物料弹窗
@@ -637,7 +668,9 @@ export default {
         price_origin: this.multipleSelection[0].price_origin,
         batch: this.multipleSelection[0].batch,
         stock_number: this.multipleSelection[0].stock_number,
-        join_inquiry: this.multipleSelection[0].join_inquiry
+        join_inquiry: this.multipleSelection[0].join_inquiry,
+        delivery_time_cn: this.multipleSelection[0].delivery_time_cn,//大陆交期
+        delivery_time_hk: this.multipleSelection[0].delivery_time_hk//香港交期
       });
     },
     //增加行