Browse Source

'骄阳临时上线'

魏志佳 4 years ago
parent
commit
bf63fddac8

+ 8 - 32
src/views/dashboard/Analysis.vue

@@ -245,44 +245,20 @@
             </div>
             <div class="updateText">
               <div class="updateBox">
-                <h3 class="textTitle">1.预警管理新功能上线</h3>
+                <h3 class="textTitle">1.新功能上线</h3>
                 <ul class="updatelist">
-                  <li><span class="circular"></span>预警检查频率提升到15分钟一次;</li>
-                  <li><span class="circular"></span>预警系统增加历史导出记录;</li>
-                  <li><span class="circular"></span>推送预警模板增加操作符显示;</li>
+                  <li><span class="circular"></span>素材下单制-流程节点发通知给相关人员;</li>
+                  <li><span class="circular"></span>素材下单制-封面图片支持点击查看大图;</li>
+                  <li><span class="circular"></span>批量工具-定时获取最新行动号召按钮;</li>
                 </ul>
               </div>
               <div class="updateBox">
-                <h3 class="textTitle">2.头条内广更新</h3>
+                <h3 class="textTitle">2.功能优化:</h3>
                 <ul>
-                  <li><span class="circular"></span>头条内广数据API重新接入,历史数据持续补充;</li>
-                </ul>
-              </div>
-              <div class="updateBox">
-                <h3 class="textTitle">3.素材下单制优化</h3>
-                <ul>
-                  <li><span class="circular"></span>优化视频(视频、标签、封面)、脚本下方位置按钮,根据屏幕适配位置;</li>
-                  <li><span class="circular"></span>已上传未审核的脚本,视频支持重新上传;</li>
-                  <li><span class="circular"></span>当投放系统为安卓时,apk的链接修改为非必填;</li>
-                  <li><span class="circular"></span>运营下单时,日均产量修改非必填;</li>
-                  <li><span class="circular"></span>视频素材入库区分类型(真人、剪辑);</li>
                   <li><span class="circular"></span>修复了相关BUG;</li>
                 </ul>
               </div>
-              <div class="updateBox">
-                <h3 class="textTitle">4.预警管理优化</h3>
-                <ul>
-                  <li><span class="circular"></span>预警模版新增字段添加;</li>
-                  <li><span class="circular"></span>相关字段后台逻辑优化;</li>
-                </ul>
-              </div>
-              <div class="updateBox">
-                <h3 class="textTitle">5.优化浏览器进入汇创助手加载速度,清理缓存垃圾;</h3>
-                <ul>
-                  <!-- <li><span class="circular"></span>预警模版新增字段添加;</li>
-                  <li><span class="circular"></span>相关字段后台逻辑优化;</li> -->
-                </ul>
-              </div>
+
             </div>
         </div>
          
@@ -357,7 +333,7 @@
         indicator: <a-icon type="loading" style="font-size: 24px" spin />,
         roleCode: localStorage.getItem('roleCode'),
         visible:false,//更新通知消息提示框
-        updateTime:['2021-01-20'],
+        updateTime:['2021-01-27'],
         versionId:0,//存储版本号 判断通知什么时候显示
       }
     },
@@ -407,7 +383,7 @@
             if(res.success){
                this.visible=res.showPopup;
                if(res.data){
-                 this.versionId=res.data.id;
+                this.versionId=res.data.id;
                }
                
             }

+ 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="请选择项目以及账户"

+ 26 - 5
src/views/modules/advertiser/ProjectMemberList.vue

@@ -167,15 +167,21 @@
             <br />
             <span style="color:red;" v-if="loginType == 'bytedance'">*重要:如存在一户多开情况,请勾选所有子账号进行授权!!!</span>
           </a-form-item>
+<<<<<<< HEAD
           <!-- <a-form-item
             label="是否本代理商开户:"
+=======
+          <a-form-item
+            label="开户代理商:"
+>>>>>>> master
             :label-col="{ xs: { span: 24 }, sm: { span: 5 } }"
             :wrapper-col="{ xs: { span: 24 }, sm: { span: 16 } }"
             v-if="loginType == 'kuaishou'"
           >
-            <a-radio-group buttonStyle="outline" v-model="agentType">
-              <a-radio-button value="0">否</a-radio-button>
-              <a-radio-button value="1">是</a-radio-button>
+            <a-radio-group buttonStyle="outline" v-model="id">
+              <!-- <a-radio-button value="0">否</a-radio-button>
+              <a-radio-button value="1">是</a-radio-button> -->
+              <a-radio-button v-for="item in authConfigList" :key="item.id" :value='item.id'>{{item.agentName}}</a-radio-button>
             </a-radio-group>
           </a-form-item> -->
           <a-form-item
@@ -423,6 +429,7 @@ export default {
   mixins: [JeecgListMixin],
   data() {
     return {
+      authConfigList:[],
       title: '',
       titleAccount: '',
       description: '我的项目',
@@ -434,7 +441,7 @@ export default {
       accountName: '',
       password: '',
       loginType: 'kuaishou',
-      agentType: '1',
+      id: undefined,
       form: this.$form.createForm(this),
       record: '',
       systemType: '不限',
@@ -828,7 +835,7 @@ export default {
             params.authorizationType = this.loginType
             if (this.loginType == 'kuaishou') {
               params.mediaId = this.mediaId
-              params.agentType = this.agentType
+              params.id = this.id
             } else if (this.loginType == 'bytedance') {
               params.mediaId = 1
             }
@@ -887,10 +894,24 @@ export default {
         this.getAllUserList()
       }
     },
+    getauthConfigList(){
+      getAction('/auth/oauthConfig/list',{
+        status:0,
+        mediaId:2
+      }).then(res=>{
+        console.log(res)
+        this.authConfigList=res.result;
+        if(res.result.length>0){
+          this.id=res.result[0].id
+        }
+        
+      })
+    }
   },
   mounted() {
     this.$nextTick(() => {
       this.getParticipateList()
+      this.getauthConfigList()
     })
   },
 }

+ 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="请选择项目以及账户"

+ 2 - 2
src/views/modules/autoLaunch/configLaunchList.vue

@@ -76,7 +76,7 @@
 
 <script>
 import moment from 'moment';
-import { getAction, postAction, downFile, downFilePost } from '@/api/manage';
+import { getAction, postAction, downFile, downFilePost,deleteAction } from '@/api/manage';
 // import { JeecgListMixin } from '@/mixins/ipagination'
 // import editableCell from './editableCell'
 import Treeselect from '@/views/modules/Statistics/components/Treeselect.vue'
@@ -216,7 +216,7 @@ export default {
         },
         deleteRecord(record){
             this.loading=true
-            postAction(this.url.delete,{
+            deleteAction(this.url.delete,{
                 id:record.id
             }).then(res=>{
                 this.loading=false

+ 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="请选择项目以及账户"

+ 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"

+ 6 - 6
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>
@@ -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 {

+ 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
                     })

+ 2 - 2
src/views/modules/workBench/placeOrder.vue

@@ -306,7 +306,7 @@
                         </div>
                         <div class="input-item"> 
                             <a-form-model-item ref="materialAmountDay"  prop="materialAmountDay">
-                                <a-input-number :min="1" :max="500"  @blur="materialAmountDayChange" v-model="form.materialAmountDay"  />
+                                <a-input-number  :max="500"  @blur="materialAmountDayChange" v-model="form.materialAmountDay"  />
                             </a-form-model-item>
                         </div>
                     </div>
@@ -647,7 +647,7 @@ export default {
                         startDate:this.dateValue[0].format('YYYY-MM-DD'),
                         endDate:this.dateValue[1].format('YYYY-MM-DD'),
                     };
-
+                    console.log(params)
                     if(!this.$parent.isEdit){
                         postAction('/platform/operator/payout',params).then(res=>{
                             console.log(res);

+ 2 - 2
vue.config.js

@@ -74,13 +74,13 @@ module.exports = {
         // target: 'http://192.168.1.188:8088', //请求本地 需要jeecg-boot后台项目  英豪
         // target: 'http://192.168.2.115:8080', //请求本地 需要jeecg-boot后台项目  祚云
         // target: 'http://192.168.1.43:8098', //请求本地 需要jeecg-boot后台项目  毕洁泉
-        target: 'http://192.168.1.43:8088', //请求本地 需要jeecg-boot后台项目  毕洁泉
+        // target: 'http://192.168.1.43:8088', //请求本地 需要jeecg-boot后台项目  毕洁泉
         // target: 'http://192.168.1.43:8087', //请求本地 需要jeecg-boot后台项目  毕洁泉
         // target: 'http://192.168.0.252:8098', //请求本地 需要jeecg-boot后台项目  毕洁泉
         // target: 'http://192.168.1.219:8080', //请求本地 需要jeecg-boot后台项目  赵西安
         // target: 'http://192.168.1.193:8080', //请求本地 需要jeecg-boot后台项目  李煜一
         // target: 'http://192.168.1.193:31012', //请求本地 需要jeecg-boot后台项目  李煜一
-        //  target: 'http://api.tjyourong.com.cn', //请求本地 需要jeecg-boot后台项目
+         target: 'http://api.tjyourong.com.cn', //请求本地 需要jeecg-boot后台项目
         // target: 'https://trac.tjyourong.com.cn', //请求本地 需要jeecg-boot后台项目
         // target: 'http://39.106.184.70:8088/', //请求本地 需要jeecg-boot后台项目
         //  target: 'http://adsp.tjyourong.com.cn/', //请求本地 需要jeecg-boot后台项目