Merge branch 'dev' into sit

src/views/goodStore/goodsOffline/columns.js

@@ -18,7 +18,7 @@ const columns = [
     // },
     {
       prop: "spuCode",
-      label: "spuCode",
+      label: "成本商品编号",
       minWidth: "155px",
     },
     {
@@ -52,32 +52,29 @@ const columns = [
   const costArr = [
     {
       prop: "spuCode",
-      label: "spuCode",
-      span: 12
+      label: "商品成本编号",
+      span: 6
     },
-    
     {
-      prop: "good_name",
-      label: "商品名称",
-      span: 12
+      prop: "addtime",
+      label: "下线时间",
+      span: 6
     },
-   
-  
     {
       prop: "creater",
       label: "操作人",
       span: 6
     },
-    
     {
       prop: "result",
       label: "下线原因",
       span: 6
     },
+    
     {
-      prop: "addtime",
-      label: "下线时间",
-      span: 12
+      prop: "good_name",
+      label: "商品名称",
+      span: 24
     },
     {
       prop: "offline_remark",

src/views/goodStore/goodsOffline/detail.vue

@@ -13,10 +13,11 @@
               <template slot="children_list">
                 <el-table
                   :data="list.children_list"
+                  size="mini"
                   style="width: 100%">
                   <el-table-column
                     prop="skuCode"
-                    label="skuCode"
+                    label="商品上线编号"
                     min-width="140">
                   </el-table-column>
                   <el-table-column

src/views/goodStore/goodsOnline/components/exam-form/main.vue

@@ -83,7 +83,7 @@
             >驳回重新审核
           </el-button>
         </el-form-item>
-        <el-form-item class="fr" v-if="ruleForm.state === '0'" >
+        <!-- <el-form-item class="fr" v-if="ruleForm.state === '0'" >
           <el-button
             v-if="!isDetail"
             :size="'mini'"
@@ -91,7 +91,7 @@
             @click="submitForm('8')"
             >驳回并下线
           </el-button>
-        </el-form-item>
+        </el-form-item> -->
       </el-col>
     </el-row>
   </el-form>

src/views/goodStore/goodsOnline/components/fixed-price-form.vue

@@ -369,7 +369,7 @@
             >驳回重新审核
           </el-button>
         </el-form-item>
-        <el-form-item class="fr" v-if="ruleForm.state === '0'" style="margin-right:30px;" >
+        <!-- <el-form-item class="fr" v-if="ruleForm.state === '0'" style="margin-right:30px;" >
           <el-button
             v-if="!isDetail"
             :size="'mini'"
@@ -377,7 +377,7 @@
             @click="rejectRe('8')"
             >驳回并下线
           </el-button>
-        </el-form-item>
+        </el-form-item> -->
       </el-col>
         <el-col :span="24" v-if="ruleForm.state === '1'"
           ><el-form-item label="售价凭证类型" prop="proof_type">

src/views/goodStore/goodsOnline/components/handle-online-form.vue

@@ -61,14 +61,14 @@
             >驳回重新审核
           </el-button>
         </el-form-item>
-        <el-form-item class="fr" v-if="ruleForm.state === '0'" >
+        <!-- <el-form-item class="fr" v-if="ruleForm.state === '0'" >
           <el-button
             :size="'mini'"
             type="danger"
             @click="submitForm('8')"
             >驳回并下线
           </el-button>
-        </el-form-item>
+        </el-form-item> -->
       </el-col>
       <el-col :span="24"  v-if="ruleForm.state === '1'" 
         ><el-form-item label="平台商品编码" prop="plat_code" >

src/views/goodStore/goodsOnline/components/online-exam-form.vue

@@ -75,10 +75,10 @@
             :size="'mini'"
             type="primary"
             @click="submitForm('')"
-            >驳回重新审核
+            >提交
           </el-button>
         </el-form-item>
-        <el-form-item class="fr" v-if="ruleForm.state === '0'" >
+        <!-- <el-form-item class="fr" v-if="ruleForm.state === '0'" >
           <el-button
             v-if="!isDetail"
             :size="'mini'"
@@ -86,7 +86,7 @@
             @click="submitForm('8')"
             >驳回并下线
           </el-button>
-        </el-form-item>
+        </el-form-item> -->
       </el-col>
     </el-row>
   </el-form>

src/views/goodStore/goodsOnline/detail.vue

@@ -442,7 +442,7 @@ export default {
 
         if ((e.numStatus ?? "") == "") {
           //驳回重新审核
-          await this.setstatus("驳回重新审核吗", model);
+          await this.setstatus("提交产品部门审核结果", model);
           
         } else if (e.numStatus == "3") {
           //点击保存