商城修改

1

src/views/oms/apply/index.vue

@@ -94,7 +94,7 @@
         </el-table-column>
       </el-table>
     </div>
-    <div class="batch-operate-container">
+    <!-- <div class="batch-operate-container">
       <el-select
         size="small"
         v-model="operateType" placeholder="批量操作">
@@ -113,7 +113,7 @@
         size="small">
         确定
       </el-button>
-    </div>
+    </div> -->
     <div class="pagination-container">
       <el-pagination
         background

src/views/oms/apply/reason.vue

@@ -50,7 +50,7 @@
         </el-table-column>
       </el-table>
     </div>
-    <div class="batch-operate-container">
+    <!-- <div class="batch-operate-container">
       <el-select
         size="small"
         v-model="operateType" placeholder="批量操作">
@@ -69,7 +69,7 @@
         size="small">
         确定
       </el-button>
-    </div>
+    </div> -->
     <div class="pagination-container">
       <el-pagination
         background

src/views/oms/order/index.vue

@@ -200,7 +200,7 @@
         </el-table-column>
       </el-table>
     </div>
-    <div class="batch-operate-container">
+    <!-- <div class="batch-operate-container">
       <el-select size="small" v-model="operateType" placeholder="批量操作">
         <el-option
           v-for="item in operateOptions"
@@ -219,7 +219,7 @@
       >
         确定
       </el-button>
-    </div>
+    </div> -->
     <div class="pagination-container">
       <el-pagination
         background

src/views/pms/brand/index.vue

@@ -101,7 +101,7 @@
         </el-table-column>
       </el-table>
     </div>
-    <div class="batch-operate-container">
+    <!-- <div class="batch-operate-container">
       <el-select
         size="small"
         v-model="operateType" placeholder="批量操作">
@@ -120,7 +120,7 @@
         size="small">
         确定
       </el-button>
-    </div>
+    </div> -->
     <div class="pagination-container">
       <el-pagination
         background

src/views/pms/product/components/ProductAttrDetail.vue

@@ -23,7 +23,12 @@
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="商品规格：" :rules='[{ required: true, message: "请选择商品规格", trigger: "blur" }]'>
+      <el-form-item
+        label="商品规格："
+        :rules="[
+          { required: true, message: '请选择商品规格', trigger: 'blur' },
+        ]"
+      >
         <el-card shadow="never" class="cardBg">
           <div v-for="(productAttr, idx) in selectProductAttr">
             {{ productAttr.name }}：
@@ -231,8 +236,11 @@
         <el-button size="medium" @click="handlePrev"
           >上一步，填写商品促销</el-button
         >
-        <el-button type="primary" size="medium" @click="handleNext"
+        <!-- <el-button type="primary" size="medium" @click="handleNext"
           >下一步，选择商品关联</el-button
+        > -->
+        <el-button type="primary" size="medium" @click="handleFinishCommit"
+          >完成，提交商品</el-button
         >
       </el-form-item>
     </el-form>
@@ -342,7 +350,7 @@ export default {
   mounted() {
     console.log(this.value.skuStockList);
     this.handleEditCreated();
-    this.getProductAttrCateList()
+    this.getProductAttrCateList();
   },
   watch: {
     productId: function (newValue) {
@@ -749,6 +757,24 @@ export default {
       this.mergeProductAttrPics();
       this.$emit("nextStep");
     },
+
+    handleFinishCommit() {
+      if (
+        !this.value.skuStockList ||
+        this.value.skuStockList.length <= 0 ||
+        !(this.value.skuStockList[0].price + "") ||
+        !(this.value.skuStockList[0].stock + "") ||
+        !(this.value.skuStockList[0].lowStock + "") ||
+        !(this.value.skuStockList[0].skuCode + "")
+      ) {
+        this.$message.error("请编辑商品规格");
+        return;
+      }
+
+      this.mergeProductAttrValue();
+      this.mergeProductAttrPics();
+      this.$emit("finishCommit", this.isEdit);
+    },
   },
 };
 </script>

src/views/pms/product/components/ProductDetail.vue

@@ -5,7 +5,7 @@
       <el-step title="填写商品信息"></el-step>
       <el-step title="填写商品促销"></el-step>
       <el-step title="填写商品属性"></el-step>
-      <el-step title="选择商品关联"></el-step>
+      <!-- <el-step title="选择商品关联"></el-step> -->
     </el-steps>
     <product-info-detail
       v-show="showStatus[0]"
@@ -27,17 +27,17 @@
       v-model="productParam"
       :is-edit="isEdit"
       @nextStep="nextStep"
-      @prevStep="prevStep"
+       @finishCommit="finishCommit"
     >
     </product-attr-detail>
-    <product-relation-detail
+    <!-- <product-relation-detail
       v-if="showStatus[3]"
       v-model="productParam"
       :is-edit="isEdit"
       @prevStep="prevStep"
       @finishCommit="finishCommit"
     >
-    </product-relation-detail>
+    </product-relation-detail> -->
   </el-card>
 </template>
 <script>

src/views/pms/product/components/ProductSaleDetail.vue

@@ -1,7 +1,7 @@
 <template>
   <div style="margin-top: 50px">
     <el-form :model="value" ref="productSaleForm" label-width="120px" style="width: 600px" size="small">
-      <el-form-item label="赠送积分：">
+      <!-- <el-form-item label="赠送积分：">
         <el-input v-model="value.giftPoint" :disabled="!isEdit"></el-input>
       </el-form-item>
       <el-form-item label="赠送成长值：">
@@ -17,7 +17,7 @@
           :active-value="1"
           :inactive-value="0">
         </el-switch>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="商品上架：">
         <el-switch
           v-model="value.publishStatus"
@@ -42,7 +42,7 @@
           :inactive-value="0">
         </el-switch>
       </el-form-item>
-      <el-form-item label="服务保证：">
+      <!-- <el-form-item label="服务保证：">
         <el-checkbox-group v-model="selectServiceList" :disabled="!isEdit">
           <el-checkbox :label="1">无忧退货</el-checkbox>
           <el-checkbox :label="2">快速退款</el-checkbox>
@@ -69,7 +69,7 @@
           <el-radio-button :label="3">阶梯价格</el-radio-button>
           <el-radio-button :label="4">满减价格</el-radio-button>
         </el-radio-group>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item v-show="value.promotionType===1">
         <div>
           开始时间：

src/views/pms/product/index.vue

@@ -231,7 +231,7 @@
         </el-table-column>
       </el-table>
     </div>
-    <div class="batch-operate-container">
+    <!-- <div class="batch-operate-container">
       <el-select size="small" v-model="operateType" placeholder="批量操作">
         <el-option
           v-for="item in operates"
@@ -250,7 +250,7 @@
       >
         确定
       </el-button>
-    </div>
+    </div> -->
     <div class="pagination-container">
       <el-pagination
         background

src/views/pms/productAttr/index.vue

@@ -34,10 +34,10 @@
               size="mini"
               @click="getAttrList(scope.$index, scope.row)">属性列表
             </el-button>
-            <el-button
+            <!-- <el-button
               size="mini"
               @click="getParamList(scope.$index, scope.row)">参数列表
-            </el-button>
+            </el-button> -->
           </template>
         </el-table-column>
         <el-table-column label="操作" width="200" align="center">