浏览代码

Merge branch 'master' of http://git.tjyourong.com.cn/ctop/adsp-vue

魏志佳 4 年之前
父节点
当前提交
83fb230c33

+ 1 - 0
src/views/modules/Statistics/components/Treeselect.vue

@@ -8,6 +8,7 @@
     <treeselect
       :multiple="multiple"
       :disable-branch-nodes="!multiple"
+      :disable-fuzzy-matching="true"
       :options="options"
       :load-options="loadOptions"
       placeholder="请选择项目以及账户"

+ 1 - 0
src/views/modules/advertiser/modules/Treeselect.vue

@@ -8,6 +8,7 @@
     <treeselect
       :multiple="multiple"
       :disable-branch-nodes="!multiple"
+      :disable-fuzzy-matching="true"
       :options="options"
       :load-options="loadOptions"
       placeholder="请选择项目"

+ 1 - 0
src/views/modules/autoLaunch/components/Treeselect.vue

@@ -8,6 +8,7 @@
     <treeselect
       :multiple="multiple"
       :disable-branch-nodes="!multiple"
+      :disable-fuzzy-matching="true"
       :options="options"
       :load-options="loadOptions"
       placeholder="请选择项目以及账户"

+ 1 - 0
src/views/modules/earlyWarningRules/pushTreeSelect.vue

@@ -8,6 +8,7 @@
     <treeselect
       :multiple="multiple"
       :disable-branch-nodes="!multiple"
+      :disable-fuzzy-matching="true"
       :options="options"
       :load-options="loadOptions"
       placeholder="请选择项目以及账户"

+ 5 - 5
src/views/modules/kuaishouapp/account/stepForm/Step2.vue

@@ -941,7 +941,10 @@
             }
             postAction('/kuaishou/batch/createUnit', paramsEnd).then(res => {
               if (res.success) {
-               
+                this.visible = true
+                this.allForm.fail = res.result.fail
+                this.allForm.success = res.result.success
+                this.loading = false
                 if (res.result.success.length > 0) {
 
                   var dataElse =  res.result.success.map(item => {
@@ -956,10 +959,7 @@
                   var dataJson = JSON.stringify(dataElse)
                   localStorage.setItem('pans', dataJson)
                   localStorage.setItem('appId', this.getData('appId'))
-                  this.visible = true
-                  this.allForm.fail = res.result.fail
-                  this.allForm.success = res.result.success
-                  this.loading = false
+                 
                 }
               } else {
                 this.loading = false

+ 65 - 22
src/views/modules/material/videoMaterial.vue

@@ -1016,12 +1016,19 @@ a {
               'modalityTagList', // 给表单赋值或拉取表单时,该input对应的key
               { rules: [{ required: true, message: '请选择形式标签!' }] },
             ]"
-            :props="{ multiple: true, value: 'id', label: 'tagName', emitPath: false }"
+            :props="{
+              multiple: true,
+              value: 'id',
+              label: 'tagName',
+              emitPath: false,
+              checkStrictly: true,
+              expandTrigger: 'hover',
+            }"
             filterable
             style="width: 100%"
           ></el-cascader>
         </a-form-item>
-        <a-form-item
+        <!-- <a-form-item
           :label-col="labelCol"
           :wrapper-col="{
             xs: { span: 24 },
@@ -1035,7 +1042,7 @@ a {
             :options="departTreeContent"
             class="only-video-material-disable-modal"
             v-decorator="[
-              'contentTagList', // 给表单赋值或拉取表单时,该input对应的key
+              'contentTagList',
               { rules: [{ required: true, message: '请选择内容标签!' }] },
             ]"
             :props="{
@@ -1049,7 +1056,7 @@ a {
             filterable
             style="width: 100%"
           ></el-cascader>
-        </a-form-item>
+        </a-form-item> -->
         <a-form-item
           :label-col="labelCol"
           :wrapper-col="{
@@ -1066,7 +1073,14 @@ a {
               'senceTagList', // 给表单赋值或拉取表单时,该input对应的key
               { rules: [{ required: true, message: '请选择场景标签!' }] },
             ]"
-            :props="{ multiple: true, value: 'id', label: 'tagName', emitPath: false }"
+            :props="{
+              multiple: true,
+              value: 'id',
+              label: 'tagName',
+              emitPath: false,
+              checkStrictly: true,
+              expandTrigger: 'hover',
+            }"
             filterable
             style="width: 100%"
           ></el-cascader>
@@ -1087,7 +1101,14 @@ a {
               'modTagList', // 给表单赋值或拉取表单时,该input对应的key
               { rules: [{ required: true, message: '请选择基调标签!' }] },
             ]"
-            :props="{ multiple: true, value: 'id', label: 'tagName', emitPath: false }"
+            :props="{
+              multiple: true,
+              value: 'id',
+              label: 'tagName',
+              emitPath: false,
+              checkStrictly: true,
+              expandTrigger: 'hover',
+            }"
             filterable
             style="width: 100%"
           ></el-cascader>
@@ -1528,12 +1549,19 @@ a {
           placeholder="搜索你想要的形式标签"
           :options="departTreeModality"
           v-model="departValueInfoModality"
-          :props="{ multiple: true, value: 'id', label: 'tagName', emitPath: false }"
+          :props="{
+            multiple: true,
+            value: 'id',
+            label: 'tagName',
+            emitPath: false,
+            checkStrictly: true,
+            expandTrigger: 'hover',
+          }"
           filterable
           style="width: 100%"
         ></el-cascader>
       </a-form-item>
-      <a-form-item
+      <!-- <a-form-item
         :label-col="labelCol"
         :wrapper-col="{
           xs: { span: 24 },
@@ -1549,7 +1577,7 @@ a {
           filterable
           style="width: 100%"
         ></el-cascader>
-      </a-form-item>
+      </a-form-item> -->
       <a-form-item
         :label-col="labelCol"
         :wrapper-col="{
@@ -1562,7 +1590,14 @@ a {
           placeholder="搜索你想要的场景标签"
           :options="departTreeSence"
           v-model="departValueInfoSence"
-          :props="{ multiple: true, value: 'id', label: 'tagName', emitPath: false }"
+          :props="{
+            multiple: true,
+            value: 'id',
+            label: 'tagName',
+            emitPath: false,
+            checkStrictly: true,
+            expandTrigger: 'hover',
+          }"
           filterable
           style="width: 100%"
         ></el-cascader>
@@ -1579,7 +1614,14 @@ a {
           placeholder="搜索你想要的基调标签"
           :options="departTreeMod"
           v-model="departValueInfoMod"
-          :props="{ multiple: true, value: 'id', label: 'tagName', emitPath: false }"
+          :props="{
+            multiple: true,
+            value: 'id',
+            label: 'tagName',
+            emitPath: false,
+            checkStrictly: true,
+            expandTrigger: 'hover',
+          }"
           filterable
           style="width: 100%"
         ></el-cascader>
@@ -2389,7 +2431,8 @@ export default {
         code: md5,
       }).then((res) => {
         if (res.success) {
-          this.tagInfoList = [...res.modalityTagList, ...res.contentTagList, ...res.senceTagList, ...res.modTagList]
+          // ...res.contentTagList,
+          this.tagInfoList = [...res.modalityTagList, ...res.senceTagList, ...res.modTagList]
           if (this.tagInfoListVisible) {
             this.departValueInfoModality = res.modalityTagList.map((item) => {
               return item.tagId
@@ -2397,9 +2440,9 @@ export default {
             this.departValueInfoMod = res.modTagList.map((item) => {
               return item.tagId
             })
-            this.departValueInfoContent = res.contentTagList.map((item) => {
-              return item.tagId
-            })
+            // this.departValueInfoContent = res.contentTagList.map((item) => {
+            //   return item.tagId
+            // })
             this.departValueInfoSence = res.senceTagList.map((item) => {
               return item.tagId
             })
@@ -2784,7 +2827,7 @@ export default {
     },
     removeUpload() {
       this.form.setFieldsValue({
-        contentTagList: null,
+        // contentTagList: null,
         modalityTagList: null,
         modTagList: null,
         senceTagList: null,
@@ -2803,9 +2846,9 @@ export default {
         if (res.success) {
           if (res.modalityTagList.length > 0) {
             this.form.setFieldsValue({
-              contentTagList: res.contentTagList.map((item) => {
-                return item.tagId
-              }),
+              // contentTagList: res.contentTagList.map((item) => {
+              //   return item.tagId
+              // }),
               modalityTagList: res.modalityTagList.map((item) => {
                 return item.tagId
               }),
@@ -3008,7 +3051,7 @@ export default {
               item.roleCode == 'plan' ||
               item.roleCode == 'designTeamLeader' ||
               item.roleCode == 'shot' ||
-              item.roleCode == 'plane'||
+              item.roleCode == 'plane' ||
               item.roleCode == 'planeLeader'
             ) {
               return {
@@ -3023,7 +3066,7 @@ export default {
               item.roleCode == 'shot' ||
               item.roleCode == 'plan' ||
               item.roleCode == 'designTeamLeader' ||
-              item.roleCode == 'plane'||
+              item.roleCode == 'plane' ||
               item.roleCode == 'planeLeader'
             ) {
               return {
@@ -3038,7 +3081,7 @@ export default {
               item.roleCode == 'plan' ||
               item.roleCode == 'designTeamLeader' ||
               item.roleCode == 'clip' ||
-              item.roleCode == 'plane'||
+              item.roleCode == 'plane' ||
               item.roleCode == 'planeLeader'
             ) {
               return {