Merge branch 'sit'

src/components/search-good-online-modal/main.vue

@@ -103,7 +103,8 @@
                       placeholder="关键字类型"
                     >
                       <el-option label="商品名称" value="1" />
-                      <el-option label="商品编码" value="2" />
+                      <el-option label="成本商品编码" value="2" />
+                      <el-option label="上线商品编码" value="4" />
                       <el-option label="平台商品编码" value="3" />
                     </el-select>
                   </el-input>
@@ -194,7 +195,8 @@ export default {
         exam_status: "",
         cat_id: [], // 商品属性code
         brandid: [],
-        good_code: "", // 商品编码
+        skucode: "",
+        spucode: "", // 商品编码
         good_name: "", // 商品名称
         plat_code: "",
 
@@ -250,7 +252,8 @@ export default {
         cat_id: [], // 商品属性code
         brandid: [],
         exam_status: this.active ? "6" : "",
-        good_code: "", // 商品编码
+       skucode: "",
+        spucode: "", // 商品编码
         good_name: "", // 商品名称
         plat_code: "",
         page: 1, // 页码
@@ -298,9 +301,10 @@ export default {
         model.cat_id.length > 0 ? model.cat_id[model.cat_id.length - 1] : "";
       model.brandid =
         model.brandid.length > 0 ? model.brandid[model.brandid.length - 1] : "";
-      model.good_code = this.select === "2" ? this.sinput : ""; // 商品编码
+      model.spucode = this.select === "2" ? this.sinput : ""; // 商品编码
       model.good_name = this.select === "1" ? this.sinput : ""; // 商品名称
       model.plat_code = this.select === "3" ? this.sinput : "";
+      model.skucode = this.select === "4" ? this.sinput : "";
       // model.platform_code =
       //   model.platform_code.length > 0
       //     ? model.platform_code[model.platform_code.length - 1]

src/views/sellOut/zixunOrder/detail.vue

@@ -86,14 +86,14 @@
             @resGoodOk="initForm()"
           />
         </el-tab-pane>
-        <el-tab-pane label="审批记录" name="3" v-if="queryType == 'view'">
+        <!-- <el-tab-pane label="审批记录" name="3" v-if="queryType == 'view'">
           <process-time-line
             v-if="newTime !== ''"
             :newTime="newTime"
             :type="'ZXD'"
             :orderCode="queryId"
           />
-        </el-tab-pane>
+        </el-tab-pane> -->
       </el-tabs>
     </div>
     <div v-else>