Merge branch 'sit'

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

@@ -36,6 +36,7 @@ export default {
     "disabled",
     "type",
     "names",
+    "is_show",
   ],
   //  watch: {
   //   names: function (val, old) {
@@ -72,8 +73,9 @@ export default {
       searchName: "",
       formValue: {
         page: 1,
-        size: 100,
+        size: 10000,
         start: "",
+        is_show: "1",
         end: "",
         platform_name: "",
         creater: "",
@@ -106,7 +108,7 @@ export default {
     async remoteMethod() {
       this.selectLoading = true;
       this.options = [];
-      // this.formValue.platform_name = query;
+      this.formValue.is_show = this.is_show || "1";
       const { code, data, message } = await asyncRequest.list(this.formValue);
 
       if (code === 0) {

src/views/goodStore/active/components/baseForm.vue

@@ -39,6 +39,7 @@
               :disabled="status !== ''"
               :size="'mini'"
               :isDetail="false"
+              :is_show="start !== '' ? '1' : '0'"
               :placeholder="'所属平台'"
               @searchChange="platform_codesearchChange"
             />

src/views/goodStore/active/index.vue

@@ -30,6 +30,7 @@
                 :disabled="false"
                 :size="'mini'"
                 :isDetail="false"
+                :is_show="'0'"
                 :placeholder="'所属平台'"
                 @searchChange="platform_codesearchChange"
             /></el-col>

src/views/goodStore/activeGood/index.vue

@@ -98,6 +98,7 @@
                   :disabled="false"
                   :size="'mini'"
                   :isDetail="false"
+                  :is_show="'0'"
                   :placeholder="'所属平台'"
                   @searchChange="platform_codesearchChange"
                 />

src/views/goodStore/dealGoodsPool/addEdit.vue

@@ -127,6 +127,7 @@
                     :value="ruleForm.platform"
                     :disabled="false"
                     :isDetail="false"
+                    :is_show="'1'"
                     :placeholder="'所属平台'"
                     @searchChange="platform_codesearchChange"
                   />

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

@@ -127,6 +127,7 @@
                     :value="ruleForm.platform"
                     :disabled="false"
                     :isDetail="false"
+                    :is_show="'1'"
                     :placeholder="'所属平台'"
                     @searchChange="platform_codesearchChange"
                   />

src/views/goodStore/goodsOnline/add.vue

@@ -21,6 +21,7 @@
                 :value="ruleForm.platform"
                 :disabled="false"
                 :size="'mini'"
+                :is_show="'1'"
                 :isDetail="false"
                 :placeholder="'所属平台'"
                 @searchChange="platform_codesearchChange"

src/views/goodStore/goodsOnline/index.vue

@@ -108,6 +108,7 @@
                 :disabled="false"
                 :size="'mini'"
                 :isDetail="false"
+                :is_show="'0'"
                 :placeholder="'所属平台'"
                 @searchChange="platform_codeChange"
             /></el-col>
@@ -323,6 +324,7 @@
             :value="ruleForm.platform_id"
             :disabled="false"
             :isDetail="false"
+            :is_show="'0'"
             :placeholder="'所属平台'"
             @searchChange="platform_codesearchChange"
           />

src/views/orderEntry/orderEnter/index.vue

@@ -103,6 +103,7 @@
                   :disabled="false"
                   :size="'mini'"
                   :isDetail="false"
+                  :is_show="'0'"
                   :placeholder="'导入目标平台'"
                   @searchChange="platform_codesearchChange"
               /></el-col>

src/views/orderEntry/orderImport/index.vue

@@ -18,6 +18,7 @@
                 :value="ruleForm.platform_id"
                 :disabled="false"
                 :size="'mini'"
+                :is_show="'1'"
                 :isDetail="false"
                 :placeholder="'导入目标平台'"
                 @searchChange="platform_codesearchChange"

src/views/orderEntry/source/index.vue

@@ -4,13 +4,14 @@
       v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
       v-loading="loading"
     >
-      <el-row style="padding:8px 0 10px 0 ">
+      <el-row style="padding: 8px 0 10px 0">
         <el-col :span="4" style="width: 200px">
           <search-terrace
             :value="parmValue.platform_id"
             :disabled="false"
             :size="'mini'"
             :isDetail="false"
+            :is_show="'0'"
             :placeholder="'业务平台'"
             @searchChange="platform_codesearchChange"
           />
@@ -24,7 +25,7 @@
         stripe
       >
         <el-table-column label="序号" type="index"> </el-table-column>
-        <el-table-column prop="platform_name" label="业务平台" >
+        <el-table-column prop="platform_name" label="业务平台">
         </el-table-column>
         <el-table-column prop="source" label="销售渠道"> </el-table-column>
       </el-table>

src/views/sellOut/project/components/addForm.vue

@@ -27,6 +27,7 @@
                 :disabled="type === 'view'"
                 :size="'mini'"
                 :isDetail="type === 'view'"
+                :is_show="'0'"
                 :names="platform_name"
                 :placeholder="'所属平台'"
                 @searchChange="platform_codesearchChange"

src/views/sellOut/salesOrder/components/addForm.vue

@@ -44,6 +44,7 @@
                   :value="ruleForm.platform_id"
                   :disabled="false"
                   :size="'mini'"
+                  :is_show="'1'"
                   :isDetail="false"
                   :placeholder="'所属平台'"
                   @searchChange="platform_idsearchChange"

src/views/sellOut/zixunOrder/components/addEditForm.vue

@@ -41,6 +41,7 @@
             :value="ruleForm.platform_code"
             :disabled="type === 'view'"
             :size="'mini'"
+            :is_show="'1'"
             :isDetail="type === 'view'"
             :names="platform_code_name"
             :placeholder="'所属平台'"

src/views/sellOut/zixunOrder/components/editForm.vue

@@ -42,6 +42,7 @@
             :value="ruleForm.platform_code"
             :disabled="type === 'view' || type === 'edit'"
             :size="'mini'"
+            :is_show="'1'"
             :isDetail="type === 'view' || type === 'edit'"
             :names="platform_name"
             :placeholder="'所属平台'"