build

src/apis/service/youzan/othGoodLog/index.js

@@ -3,5 +3,5 @@ import http from "@/apis/axios";
 export default {
  
   // 分页查询
-  list: (data, params) => http("youzan/yz_get_youzan_update_log", data, "post", params),
+  list: (data, params) => http("youzan/yz_get_update_good_log_by_yz", data, "post", params),
 };

src/views/goodStore/goodsCost/index.vue

@@ -604,7 +604,7 @@ export default {
         const { is_allow_update } = data;
         if (is_allow_update + "" === "1") {
           this.routeGoto("goodsCostDetail", {
-            id: code,
+            id: spuCode,
             type: wtype === "2" ? "editBase" : wtype === "3" ? "editCoin" : "",
           });
         } else {

src/views/youzan/othgoodsOnline/columns.js

@@ -399,4 +399,76 @@ const  is_support_barter_list= [
     label: "不支持",
   },
 ]
-export { options1, options2, options3, options4, options5, options6, options7, options8, listCol, rules,public_listCol,sale_listCol,is_support_barter_list }
+const item_type_options=[
+  {
+    value: "0",
+    label: "普通商品", 
+    status:'1'
+  },
+  {
+    value: "3",
+    label: "UMP降价拍", 
+    status:'0'
+  },
+  {
+    value: "5",
+    label: "外卖商品", 
+    status:'0'
+  },
+  {
+    value: "10",
+    label: "分销商品", 
+    status:'0'
+  },
+  {
+    value: "20",
+    label: "会员卡商品", 
+    status:'0'
+  },
+  {
+    value: "21",
+    label: "礼品卡商品", 
+    status:'0'
+  },
+  {
+    value: "22",
+    label: "团购券", 
+    status:'0'
+  },
+  {
+    value: "25",
+    label: "批发商品", 
+    status:'0'
+  },
+  {
+    value: "30",
+    label: "收银台商品", 
+    status:'0'
+  },
+  {
+    value: "31",
+    label: "知识付费商品", 
+    status:'0'
+  },
+  {
+    value: "35",
+    label: "酒店商品", 
+    status:'0'
+  },
+  {
+    value: "40",
+    label: "美业商品", 
+    status:'0'
+  },
+  {
+    value: "60",
+    label: "虚拟商品", 
+    status:'0'
+  },
+  {
+    value: "61",
+    label: "电子卡券", 
+    status:'0'
+  }
+]
+export { options1, options2, options3, options4, options5, options6, options7, options8, listCol, rules,public_listCol,sale_listCol,is_support_barter_list,item_type_options }

src/views/youzan/othgoodsOnline/components/online-exam-form.vue

@@ -30,7 +30,7 @@
       </el-col>
       <el-col :span="18" v-if="ruleForm.exam_status === '1'">
         <el-row>
-          <el-col :span="12">
+          <el-col :span="13">
             <el-form-item label="有赞公用分类" prop="yz_cat_id" label-width="120px">
               <good-class-youzan
                 :value="ruleForm.yz_cat_id"
@@ -40,7 +40,7 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="12">
+          <el-col :span="11">
             <el-form-item label="是否可退货" prop="is_support_barter" label-width="120px">
               <el-radio-group
                 v-model="ruleForm.is_support_barter"
@@ -77,7 +77,82 @@
           </el-col> -->
         </el-row>
       </el-col>
-      <el-col :span="24" v-if="ruleForm.exam_status === '1'" style="padding: 0 0 10px 0">
+      <el-col
+        :span="24"
+        v-show="ruleForm.exam_status === '1'"
+        style="padding: 0 0 10px 0"
+      >
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="商品类型" prop="item_type">
+              <el-select
+                v-model="ruleForm.item_type"
+                placeholder="请选择商品类型"
+                style="width: 100%"
+              >
+                <el-option
+                  v-for="item in item_type_options"
+                  :key="item.label + item.value"
+                  :label="item.label"
+                  :value="item.value"
+                  :disabled="item.status === '0'"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="10">
+            <el-form-item
+              label="开始出售时间"
+              prop="auto_listing_time"
+              label-width="120px"
+            >
+              <ul class="item_auto_listing_time clearfix">
+                <li class="fl" style="width: 100px">
+                  <el-radio v-model="ruleForm.item_auto_listing_time" label="0"
+                    >立即出售</el-radio
+                  >
+                </li>
+                <li class="fl">
+                  <el-date-picker
+                    v-model="ruleForm.auto_listing_time"
+                    type="datetime"
+                    style="width: 100%"
+                    value-format="yyyy-MM-dd HH:mm:ss"
+                    placeholder="选择开始出售时间"
+                    default-time="12:00:00"
+                    :picker-options="pickerOptions"
+                  >
+                  </el-date-picker>
+                </li>
+              </ul>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="划线价" prop="origin">
+              <digital-input
+                :values="ruleForm.origin"
+                :placeholder="'起订量'"
+                :min="0"
+                :max="100000000000"
+                :position="'right'"
+                :precision="2"
+                :controls="false"
+                :append="''"
+                :newTime="''"
+                :size="'mini'"
+                :disabled="false"
+                @reschange="num_change($event, 'origin', -1)"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-col>
+      <el-col
+        :span="24"
+        v-show="ruleForm.exam_status === '1'"
+        style="padding: 0 0 10px 0"
+      >
         <el-table
           :data="nakelist"
           :size="'mini'"
@@ -146,7 +221,7 @@
           </el-table-column>
         </el-table>
       </el-col>
-      <el-col :span="18" v-else>
+      <el-col :span="18" v-show="ruleForm.exam_status !== '1'">
         <el-form-item label="审核备注" prop="reject_reason">
           <el-input
             type="textarea"
@@ -172,6 +247,7 @@
 
 <script>
 import asyncRequest from "@/apis/service/youzan/othgoodsOnline";
+import { item_type_options } from "../columns";
 export default {
   name: "exam-form",
   props: ["size", "statusList", "disabled", "isMust", "labelWidth", "time", "sitem"],
@@ -196,6 +272,7 @@ export default {
       currentRow: null,
       nakelist: [],
       tags_options: [],
+      item_type_options,
       exam_statusList: [
         {
           value: "1",
@@ -218,8 +295,8 @@ export default {
       ],
       showModelThis: this.showModel,
       pickerOptions: {
-        disabledDate(time) {
-          return time.getTime() < Date.now() - 60 * 60 * 24 * 1000;
+        disabledDate: (time) => {
+          return time.getTime() > new Date().valueOf();
         },
       },
       ruleForm: {
@@ -228,6 +305,10 @@ export default {
         rebut: "", //驳回至
         reject_reason: "",
         tags: [],
+        item_type: "0",
+        item_auto_listing_time: "0",
+        auto_listing_time: "",
+        origin: 0,
       },
       rulesThis: this.rules,
       rules: {
@@ -270,6 +351,27 @@ export default {
             trigger: "blur",
           },
         ],
+        origin: [
+          {
+            required: true,
+            message: "请输入划线价",
+            trigger: "blur",
+          },
+        ],
+        auto_listing_time: [
+          {
+            required: true,
+            message: "请选择开始出售时间",
+            trigger: "change",
+          },
+        ],
+        item_type: [
+          {
+            required: true,
+            message: "请选择商品类型",
+            trigger: "change",
+          },
+        ],
       },
     };
   },
@@ -337,12 +439,20 @@ export default {
       const isok = exam_status === "1";
       this.rulesThis.is_support_barter[0].required = isok;
       this.rulesThis.yz_cat_id[0].required = isok;
+      this.rulesThis.item_type[0].required = isok;
+      this.rulesThis.auto_listing_time[0].required = isok;
+      this.rulesThis.origin[0].required = isok;
       this.rulesThis.reject_reason[0].required = !isok;
     },
     num_change(e, key, index) {
-      this.nakelist[index][key] = e;
-      this.nakelist[index].newTime = new Date().valueOf() + "";
-      // this.$set(this.nakelist, index, this.nakelist[index]);
+      if (index === -1) {
+        this.ruleForm[key] = e;
+        this.$refs.ruleForm.validateField(key);
+      } else {
+        this.nakelist[index][key] = e;
+        this.nakelist[index].newTime = new Date().valueOf() + "";
+        // this.$set(this.nakelist, index, this.nakelist[index]);
+      }
     },
     handleChange(e) {
       this.ruleForm.yz_cat_id = e;
@@ -390,6 +500,10 @@ export default {
             is_support_barter: "1",
             reject_reason: "",
             tags: [],
+            item_type: "0",
+            item_auto_listing_time: "0",
+            auto_listing_time: "",
+            origin: 0,
           };
         }
       });
@@ -489,6 +603,7 @@ export default {
 </script>
 
 <style>
-p {
+.item_auto_listing_time .fl:last-child {
+  width: calc(100% - 115px);
 }
 </style>

src/views/youzan/othsearchSort/addEditRate.vue

@@ -304,9 +304,9 @@ export default {
             delete model["cat_name"];
             // delete model["pid"];
             // delete model["fund_code"];
-            let res = await asyncRequest.update(model);
+            const { code, data, message } = await asyncRequest.update(model);
             this.loading = false;
-            if (res && res.code === 0) {
+            if (code === 0) {
               this.$notify.success({
                 title: "毛利率设置成功！",
                 message: "",
@@ -314,10 +314,24 @@ export default {
               this.showModelThis = false;
               // 刷新
               this.$emit("refresh");
-            } else if (res && res.code >= 100 && res.code <= 104) {
+            } else if (code >= 100 && code <= 104) {
               await this.logout();
+            } else if (code === 10004) {
+              const { skuCode } = data;
+              let resList = JSON.parse(JSON.stringify(skuCode));
+
+              let htmlList = "<ul>";
+              resList.forEach((v) => {
+                htmlList += `<li><span>${v.skuCode}__</span><span>${v.good_name}</span></li>`;
+              });
+              htmlList += "</ul>";
+              this.$notify({
+                title: "新毛利已影响以下线上商品售价，请下线后再修改！",
+                dangerouslyUseHTMLString: true,
+                message: htmlList,
+              });
             } else {
-              this.$message.warning(res.message);
+              this.$message.warning(message);
             }
           }
         } else {