Merge branch 'v3.0' into company

src/components/globalComponents/search-terrace/main.vue

@@ -36,7 +36,8 @@ export default {
     "type",
     "names",
     "is_show",
-    "controlDisabled"
+    "controlDisabled",
+    "platformType"
   ],
   /**
    * 属性集合
@@ -75,6 +76,9 @@ export default {
         this.remoteMethod(this.searchName);
       }
     },
+    platformType() {
+      this.remoteMethod();
+    },
     isDetail: function(val, old) {
       // console.log(val, old, this.isDetail, "2");
       if (val && this.searchName) {
@@ -110,7 +114,14 @@ export default {
       this.selectLoading = true;
       this.options = [];
       this.formValue.is_show = this.is_show || "1";
-      const { code, data, message } = await asyncRequest.list(this.formValue);
+      const { code, data, message } = await asyncRequest.list({
+        ...this.formValue,
+        ...(this.platformType
+          ? {
+              platform_type: this.platformType
+            }
+          : {})
+      });
 
       if (code === 0) {
         const { list } = data;

src/views/goodStore/goodsCost/components/addEdit.vue

@@ -73,13 +73,26 @@
           >
             <el-row style="padding-bottom">
               <el-col :span="8">
+                <el-form-item label="对接平台" prop="platform_type">
+                  <el-select
+                    placeholder="对接平台"
+                    style="width:100%"
+                    v-model="ruleForm.platform_type"
+                    @change="ruleForm.platform = ''"
+                  >
+                    <el-option label="有赞平台" value="1" />
+                    <el-option label="无对接" value="0" />
+                  </el-select>
+                </el-form-item>
+
                 <el-form-item label="所属平台" prop="platform">
                   <search-terrace
                     :value="ruleForm.platform"
                     :is_show="'1'"
-                    :disabled="false"
+                    :disabled="!ruleForm.platform_type"
                     :is-detail="false"
                     :placeholder="'所属平台'"
+                    :platformType="ruleForm.platform_type"
                     @searchChange="platform_codesearchChange"
                   />
                 </el-form-item>
@@ -94,7 +107,8 @@
                     />
                   </el-select>
                 </el-form-item>
-
+              </el-col>
+              <el-col :span="16" style="text-align: right">
                 <el-form-item label="上线原因" prop="online_reason">
                   <el-input
                     v-model="ruleForm.online_reason"
@@ -103,8 +117,7 @@
                     maxlength="200"
                   />
                 </el-form-item>
-              </el-col>
-              <el-col :span="16" style="text-align: right">
+
                 <el-form-item label="上线备注" prop="online_remark">
                   <el-input
                     v-model="ruleForm.online_remark"
@@ -144,6 +157,7 @@ export default {
       isYZPlatform: false,
       showModelThis: this.showModel,
       ruleForm: {
+        platform_type: "",
         platform: "", // string	平台id
         is_fixed: "", // string 定价模式
         online_reason: "", // string	上线原因
@@ -156,6 +170,13 @@ export default {
       ],
       rulesThis: this.rules,
       rules: {
+        platform_type: [
+          {
+            required: true,
+            message: "请选择对接平台",
+            trigger: "change"
+          }
+        ],
         platform: [
           {
             required: true,
@@ -189,7 +210,11 @@ export default {
   },
   computed: {
     isFiexed() {
-      return !this.isYZPlatform && this.isNobleMetal;
+      return (
+        !this.isYZPlatform &&
+        this.isNobleMetal &&
+        this.ruleForm.platform_type !== "1"
+      );
     },
     pricingOptions() {
       return [
@@ -230,6 +255,7 @@ export default {
           this.$refs.ruleForm.resetFields();
           this.$refs.ruleForm.clearValidate();
           this.ruleForm = {
+            platform_type: "",
             platform: "", // string	平台id
             online_reason: "", // string	上线原因
             online_remark: "" // string	上线备注

src/views/goodStore/goodsCost/index.vue

@@ -133,28 +133,6 @@
               </el-select>
             </el-col>
 
-            <!-- <el-col :span="4" style="width: 147px; padding: 0 0 0 10px">
-              <el-select
-                v-model="parmValue.has_account"
-                filterable
-                clearable
-                :size="searchSize"
-                placeholder="供应商账号"
-                style="width: 100%"
-                @change="
-                  pageInfo.curr = 1;
-                  parmValue.page = 1;
-                  searchList();
-                "
-              >
-                <el-option
-                  v-for="item in has_account_list"
-                  :key="'status' + item.code"
-                  :label="item.name"
-                  :value="item.code"
-                />
-              </el-select>
-            </el-col>-->
             <el-col :span="3" style="margin: 0 10px">
               <search-supplier
                 :size="'mini'"
@@ -512,7 +490,7 @@ export default {
       }
     };
     return {
-      isNobleMetal:false,
+      isNobleMetal: false,
       dialogFormVisible: false,
       has_account_list,
       donline_formStOps: [],
@@ -949,31 +927,42 @@ export default {
         return;
       }
 
-      const categoryIds = this.changeList.map(({cat_info, is_gold_price}) => ({
-        id: String(cat_info[0].id),
-        isGoldPrice: String(is_gold_price)
-      }))
+      const categoryIds = this.changeList.map(
+        ({ cat_info, is_gold_price }) => ({
+          id: String(cat_info[0].id),
+          isGoldPrice: String(is_gold_price)
+        })
+      );
 
-      const nobleMetalIds = categoryIds.filter(({ id, isGoldPrice }
-      ) => id === '6' && isGoldPrice === "1")
+      const nobleMetalIds = categoryIds.filter(
+        ({ id, isGoldPrice }) => id === "6" && isGoldPrice === "1"
+      );
 
-      if(nobleMetalIds.length > 0 && categoryIds.length !== nobleMetalIds.length){
+      if (
+        nobleMetalIds.length > 0 &&
+        categoryIds.length !== nobleMetalIds.length
+      ) {
         const h = this.$createElement;
 
         this.$message({
-          message: h('p', null, [
-            h('span', null, '勾选商品必须全部为'),
-            h('i', { style: 'color: red' }, '开启实时金价贵金属商品'),
-            h('span', null, '或者全部为'),
-            h('i', { style: 'color: red' }, '未开启实时金价的贵金属商品和非贵金属商品')
+          message: h("p", null, [
+            h("span", null, "勾选商品必须全部为"),
+            h("i", { style: "color: red" }, "开启实时金价贵金属商品"),
+            h("span", null, "或者全部为"),
+            h(
+              "i",
+              { style: "color: red" },
+              "未开启实时金价的贵金属商品和非贵金属商品"
+            )
           ]),
-          type: 'warning',
+          type: "warning",
           dangerouslyUseHTMLString: true
-        })
-        return
+        });
+        return;
       }
 
-      this.isNobleMetal = nobleMetalIds.length > 0 && categoryIds.length === nobleMetalIds.length;
+      this.isNobleMetal =
+        nobleMetalIds.length > 0 && categoryIds.length === nobleMetalIds.length;
 
       let isok = true;
       this.changeList.forEach(e => {

src/views/goodStore/goodsOnline/add.vue

@@ -13,14 +13,27 @@
       >
         <el-row>
           <el-col :span="8">
+            <el-form-item label="对接平台" prop="platform_type">
+              <el-select
+                placeholder="对接平台"
+                style="width:100%"
+                v-model="ruleForm.platform_type"
+                @change="ruleForm.platform = ''"
+              >
+                <el-option label="有赞平台" value="1" />
+                <el-option label="无对接" value="0" />
+              </el-select>
+            </el-form-item>
+
             <el-form-item label="所属平台" prop="platform">
               <search-terrace
                 :value="ruleForm.platform"
-                :disabled="false"
+                :disabled="!ruleForm.platform_type"
                 :size="'mini'"
                 :is_show="'1'"
                 :isDetail="false"
                 :placeholder="'所属平台'"
+                :platformType="ruleForm.platform_type"
                 @searchChange="platform_codesearchChange"
               />
             </el-form-item>
@@ -35,7 +48,8 @@
                 />
               </el-select>
             </el-form-item>
-
+          </el-col>
+          <el-col :span="16">
             <el-form-item label="上线原因" prop="online_reason">
               <el-input
                 :disabled="false"
@@ -44,8 +58,7 @@
                 maxlength="200"
               />
             </el-form-item>
-          </el-col>
-          <el-col :span="16">
+
             <el-form-item label="上线备注" prop="online_remark">
               <el-input
                 type="textarea"
@@ -163,7 +176,11 @@ export default {
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     isFiexed() {
-      return !this.isYzPlatform && this.isNoble;
+      return (
+        !this.isYzPlatform &&
+        this.isNoble &&
+        this.ruleForm.platform_type !== "1"
+      );
     },
     powers() {
       const tran =
@@ -201,7 +218,16 @@ export default {
       costsitem: {},
       showModel: false,
       status: "",
-      rulesThis: this.rules,
+      rulesThis: {
+        ...this.rules,
+        platform_type: [
+          {
+            required: true,
+            message: "请选择对接平台",
+            trigger: "change"
+          }
+        ]
+      },
       activeName: "1",
       isYzPlatform: false,
       loading: true,
@@ -332,6 +358,7 @@ export default {
 
     resetFormData() {
       this.ruleForm = {
+        platform_type: "",
         is_fixed: "",
         platform: "", //string	平台id
         codes: [], //string	无

src/views/goodStore/goodsOnline/columns.js

@@ -167,6 +167,13 @@ const listCol = [
   }
 ]
 const rules = {
+  platform_type: [
+    {
+      required: true,
+      message: "请选择对接平台",
+      trigger: "change"
+    }
+  ],
   is_fixed:[
     {
       required: true,