朱鑫波 vor 4 Jahren
Ursprung
Commit
f3c6c52f3c

+ 26 - 12
src/views/modules/earlyWarningRules/ruleModule.vue

@@ -3,6 +3,12 @@
 .display-none-selset {
   display: none !important;
 }
+.ruleModule .ant-form-item-label > label::after {
+  content: '';
+  position: relative;
+  top: -0.5px;
+  margin: 0 8px 0 2px;
+}
 </style>
 <template>
   <div class="ruleModule">
@@ -32,7 +38,7 @@
       </div>
       <a-spin :spinning="spinLoading">
         <div class="toolbox-automate-rules-create-content">
-          <a-form-model ref="ruleForm" :model="form" layout="horizontal">
+          <a-form-model ref="ruleForm" :model="form" layout="horizontal" :hideRequiredMark="true">
             <div class="moduler">
               <template v-for="(item, index) of form.ruleList">
                 <div class="row-item" v-if="item.ruleType == 'base' && item.isCopy == 0" :key="index">
@@ -60,7 +66,10 @@
                         trigger: value.dataType == 'array' ? 'change' : 'blur',
                       }"
                     >
-                      <span style="color: red;font-size:16px;font-weight:500" v-if="value.modelType == 'numberText'">
+                      <span
+                        style="color: red; font-size: 16px; font-weight: 500"
+                        v-if="value.modelType == 'numberText'"
+                      >
                         {{ value.ruleCondition | conditionName }}
                       </span>
                       <a-input-number
@@ -192,7 +201,7 @@
                                     }"
                                     v-if="value.modelType == 'numberText'"
                                   >
-                                    <span style="color: red;font-size:16px;font-weight:500">
+                                    <span style="color: red; font-size: 16px; font-weight: 500">
                                       {{ value.ruleCondition | conditionName }}
                                     </span>
 
@@ -338,7 +347,7 @@
                                     }"
                                     v-if="value.modelType == 'numberText'"
                                   >
-                                    <span style="color: red;font-size:16px;font-weight:500">
+                                    <span style="color: red; font-size: 16px; font-weight: 500">
                                       {{ value.ruleCondition | conditionName }}
                                     </span>
                                     <a-input-number
@@ -1247,15 +1256,20 @@ export default {
         width: 120px;
       }
     }
-    .row-item .required-item {
-      width: 4px;
-      height: 4px;
-      border-radius: 2px;
-      background: #f45858;
+    .row-item .required-item::after {
+      content: '*';
+      // width: 4px;
+      // height: 4px;
+      // border-radius: 2px;
+      // background: #f45858;
+      color: #f5222d;
+      font-size: 14px;
       position: absolute;
-      right: 10px;
-      top: 50%;
-      transform: translateY(-50%);
+      left: -40px;
+      top: -1px;
+      font-family: SimSun, sans-serif;
+
+      // transform: translateY(-50%);
     }
     .row-item .input-item {
       min-width: 480px;

+ 1 - 1
src/views/modules/kuaishouapp/account/stepForm/Step1.vue

@@ -46,7 +46,7 @@
         <a-input
           v-decorator="[
             'dayBudget',
-            { rules: [{ required: true, message: 'error:' }, { validator: handleConfirmValue }] }
+            { rules: [{ required: true, message: ' ' }, { validator: handleConfirmValue }] }
           ]"
           placeholder="不小于500,不超过100000000,仅支持输入自然数"
           type="number"

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

@@ -108,7 +108,7 @@
         </a-checkbox>
       </a-form-item>
       <a-form-item label=" " :labelCol="{ lg: { span: 7}, sm: { span: 7 } }"
-        :wrapperCol="{ lg: { span: 10 }, sm: { span: 16 } }" class="else-label" v-if="getData('useAppMarket')">
+        :wrapperCol="{ lg: { span: 10 }, sm: { span: 16 } }" class="else-label" v-if="getData('useAppMarket')&&campaignType == '2'&&(getPlatForm(getData('appId'))=='1'||getPlatForm(getData('appId'))=='2')">
         请勾选投放应用已上架的应用商店(默认全选)
         <a-checkbox-group v-model="allForm.appStore">
           <a-checkbox value="huawei">华为</a-checkbox>

+ 18 - 22
src/views/modules/workBench/materialList.vue

@@ -476,12 +476,12 @@
                                             'modalityTagList', // 给表单赋值或拉取表单时,该input对应的key
                                             { rules: [{ required: true, message: '请选择形式标签!' }] },
                                             ]"
-                                            :props="{ multiple: true, value: 'id', label: 'tagName', emitPath: false }"
+                                            :props="{ checkStrictly: true, value: 'tagCode', label: 'tagName', 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 },
@@ -495,21 +495,16 @@
                                             :options="departTreeContent"
                                             class="only-video-material-disable-modal"
                                             v-decorator="[
-                                            'contentTagList', // 给表单赋值或拉取表单时,该input对应的key
+                                            'contentTagList', 
                                             { rules: [{ required: true, message: '请选择内容标签!' }] },
                                             ]"
                                             :props="{
-                                            multiple: true,
-                                            value: 'id',
-                                            label: 'tagName',
-                                            emitPath: false,
-                                            checkStrictly: true,
-                                            expandTrigger: 'hover',
+                                            checkStrictly: true, value: 'tagCode', label: 'tagName', expandTrigger: 'hover'
                                             }"
                                             filterable
                                             style="width: 100%"
                                         ></el-cascader>
-                                    </a-form-item>
+                                    </a-form-item> -->
                                     <a-form-item
                                         :label-col="labelCol"
                                         :wrapper-col="{
@@ -526,7 +521,7 @@
                                             'senceTagList', // 给表单赋值或拉取表单时,该input对应的key
                                             { rules: [{ required: true, message: '请选择场景标签!' }] },
                                             ]"
-                                            :props="{ multiple: true, value: 'id', label: 'tagName', emitPath: false }"
+                                            :props="{ checkStrictly: true, value: 'tagCode', label: 'tagName', expandTrigger: 'hover' }"
                                             filterable
                                             style="width: 100%"
                                         ></el-cascader>
@@ -543,7 +538,7 @@
                                             'modTagList', // 给表单赋值或拉取表单时,该input对应的key
                                             { rules: [{ required: true, message: '请选择基调标签!' }] },
                                             ]"
-                                            :props="{ multiple: true, value: 'id', label: 'tagName', emitPath: false }"
+                                            :props="{ checkStrictly: true, value: 'tagCode', label: 'tagName', expandTrigger: 'hover' }"
                                             filterable
                                             style="width: 100%"
                                         ></el-cascader>
@@ -1265,7 +1260,7 @@ export default {
                 }
                 
                 this.form.setFieldsValue({
-                    contentTagList: res.result.tags.contentTagList.map(item=>{return item.tagId}),
+                    // contentTagList: res.result.tags.contentTagList.map(item=>{return item.tagId}),
                     modalityTagList:  res.result.tags.modalityTagList.map(item=>{return item.tagId}),
                     modTagList:  res.result.tags.modTagList.map(item=>{return item.tagId}),
                     senceTagList:  res.result.tags.senceTagList.map(item=>{return item.tagId}),
@@ -1562,7 +1557,7 @@ export default {
             };
             this.imageinfo=[];
             this.form.setFieldsValue({
-                contentTagList: null,
+                // contentTagList: null,
                 modalityTagList: null,
                 modTagList: null,
                 senceTagList: null,
@@ -1649,7 +1644,7 @@ export default {
             this.urlList.name='';
            
             this.form.setFieldsValue({
-                contentTagList: null,
+                // contentTagList: null,
                 modalityTagList: null,
                 modTagList: null,
                 senceTagList: null,
@@ -1670,9 +1665,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
                     }),
@@ -1894,7 +1889,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
@@ -1902,9 +1898,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
                     })

+ 17 - 16
src/views/modules/workBench/orderDetail.vue

@@ -627,12 +627,12 @@
                                             'modalityTagList', // 给表单赋值或拉取表单时,该input对应的key
                                             { rules: [{ required: true, message: '请选择形式标签!' }] },
                                             ]"
-                                            :props="{ multiple: true, value: 'id', label: 'tagName', emitPath: false }"
+                                            :props="{ checkStrictly: true, value: 'tagCode', label: 'tagName', 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 },
@@ -646,7 +646,7 @@
                                             :options="departTreeContent"
                                             class="only-video-material-disable-modal"
                                             v-decorator="[
-                                            'contentTagList', // 给表单赋值或拉取表单时,该input对应的key
+                                            'contentTagList', 
                                             { rules: [{ required: true, message: '请选择内容标签!' }] },
                                             ]"
                                             :props="{
@@ -660,7 +660,7 @@
                                             filterable
                                             style="width: 100%"
                                         ></el-cascader>
-                                    </a-form-item>
+                                    </a-form-item> -->
                                     <a-form-item
                                         :label-col="labelCol"
                                         :wrapper-col="{
@@ -677,7 +677,7 @@
                                             'senceTagList', // 给表单赋值或拉取表单时,该input对应的key
                                             { rules: [{ required: true, message: '请选择场景标签!' }] },
                                             ]"
-                                            :props="{ multiple: true, value: 'id', label: 'tagName', emitPath: false }"
+                                            :props="{ checkStrictly: true, value: 'tagCode', label: 'tagName', expandTrigger: 'hover' }"
                                             filterable
                                             style="width: 100%"
                                         ></el-cascader>
@@ -694,7 +694,7 @@
                                             'modTagList', // 给表单赋值或拉取表单时,该input对应的key
                                             { rules: [{ required: true, message: '请选择基调标签!' }] },
                                             ]"
-                                            :props="{ multiple: true, value: 'id', label: 'tagName', emitPath: false }"
+                                            :props="{ checkStrictly: true, value: 'tagCode', label: 'tagName', expandTrigger: 'hover' }"
                                             filterable
                                             style="width: 100%"
                                         ></el-cascader>
@@ -1345,7 +1345,7 @@ export default {
                 }
                 
                 this.form.setFieldsValue({
-                    contentTagList: res.result.tags.contentTagList.map(item=>{return item.tagId}),
+                    // contentTagList: res.result.tags.contentTagList.map(item=>{return item.tagId}),
                     modalityTagList:  res.result.tags.modalityTagList.map(item=>{return item.tagId}),
                     modTagList:  res.result.tags.modTagList.map(item=>{return item.tagId}),
                     senceTagList:  res.result.tags.senceTagList.map(item=>{return item.tagId}),
@@ -1944,7 +1944,7 @@ export default {
             };
             this.imageinfo=[];
             this.form.setFieldsValue({
-                contentTagList: null,
+                // contentTagList: null,
                 modalityTagList: null,
                 modTagList: null,
                 senceTagList: null,
@@ -2099,7 +2099,7 @@ export default {
             this.urlList.name='';
            
             this.form.setFieldsValue({
-                contentTagList: null,
+                // contentTagList: null,
                 modalityTagList: null,
                 modTagList: null,
                 senceTagList: null,
@@ -2120,9 +2120,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
                     }),
@@ -2344,7 +2344,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
@@ -2352,9 +2353,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
                     })