소스 검색

Merge remote-tracking branch 'origin/master'

syh 5 년 전
부모
커밋
cf480e4728

+ 1 - 1
src/views/modules/Statistics/accountMaterStatistics.vue

@@ -47,7 +47,7 @@ th div {
       <a-row type="flex" align="middle" justify="space-between" class="panel-body">
         <div class="search-bar" style="width:100%">
           <span>账户选择:</span>
-          <treeselect :appId.sync="appId" request="2"/>
+          <treeselect :appId.sync="appId" request="2,4"/>
           <a-button type="primary" style="margin:10px" @click="addUser">搜索</a-button>
           <a-button
             type="primary"

+ 15 - 8
src/views/modules/Statistics/components/Treeselect.vue

@@ -16,6 +16,7 @@
       :auto-load-root-options="false"
       @select="update"
       @input="emitValue"
+      @open="getParticipateList"
       :limit="2"
       :limitText="
         count => {
@@ -57,7 +58,7 @@ export default {
     request: {
       type: String,
       default() {
-        return '2'
+        return '2,4'
       }
     },
     reqUrl: {
@@ -73,7 +74,7 @@ export default {
     $route(n, o) {},
     appId: {
       handler(n, o) {
-        console.log(n)
+        // console.log(n)
         if (n.length == 0) {
           if (this.multiple) {
             this.value = []
@@ -88,9 +89,8 @@ export default {
   methods: {
     ...mapGetters(['nickname', 'avatar', 'userInfo']),
     update(node, id) {
-
       getAction('/ctop/userAllocation/getAccountListByProjectId', { projectId: node.id }).then(res => {
-        console.log(res)
+        // console.log(res)
         if (res.code == 0) {
           if (res.result.length > 0) {
             node.children = res.result.map(item => {
@@ -117,7 +117,6 @@ export default {
       // assign children options to the parent node & call the callback.
       if (action === LOAD_CHILDREN_OPTIONS) {
         getAction('/ctop/userAllocation/getAccountListByProjectId', { projectId: parentNode.id }).then(res => {
-          console.log(res)
           if (res.code == 0) {
             if (res.result.length > 0) {
               parentNode.children = res.result.map(item => {
@@ -142,10 +141,18 @@ export default {
       //   toutiaoParticipateList
       getAction(this.reqUrl, { userId: this.userInfo().id }).then(res => {
         if (res.code == 0) {
+          var arr = this.request.split(',')
+          var dataTwo  = []
           var data = res.result.filter(item => {
-            return item.mediaId == this.request
+                 return item.mediaId == arr[0]
           })
-          this.options = data.map(item => {
+          if(arr.length>1){
+            dataTwo = res.result.filter(item => {
+                return item.mediaId == arr[1]
+            })
+          }
+          var allData = data.concat(dataTwo)
+          this.options = allData.map(item => {
             return {
               id: item.projectId,
               label: item.projectName + '\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0' + item.advertiserName,
@@ -158,7 +165,7 @@ export default {
   },
 
   mounted() {
-    this.getParticipateList()
+    // this.getParticipateList()
   }
 }
 </script>

+ 25 - 30
src/views/modules/Statistics/videoStatics/vDay.vue

@@ -2,7 +2,7 @@
   <div class="vsummary">
     <div class="xiangmuxuanze">
       <span>项目选择:</span>
-       <Treeselect  :appId.sync="appId"  style="display: inline-block;position: relative;top: 10px;"/>
+       <Treeselect  :appId.sync="appId" request="1,3" reqUrl="/ctop/projectMember/bytedanceProjectParticipateInList"  style="display: inline-block;position: relative;top: 10px;"/>
     </div>
     <div class="timeDiv">
       <div>
@@ -81,7 +81,7 @@
       ref="vSummaryTable"
       :width='tableWidth'
       style="word-break: break-all;"
-      
+      @change="sort"
     >
       <div slot="videoU" slot-scope="test,records">
         <img  :src="records.url+'?x-oss-process=video/snapshot,t_0,m_fast'"  alt=""  style="width:140px"  @click="openVideo(records.url)" @load="loadShow">
@@ -148,7 +148,7 @@ import moment from 'moment'
 import { JeecgListMixin } from '@/mixins/ipagination'
 import { getAction, postAction, downFile, downFilePost } from '@/api/manage'
 import selectComponent from './selectComponent'
-import Treeselect from './Treeselect.vue'
+import Treeselect from '../components/Treeselect'
 const columnsFixd = [
   {
     title: '时间',
@@ -307,19 +307,25 @@ export default {
   },
    watch:{
       'ipagination.current':function(n,o){
-          console.log(n,o)
-          if(this.appId.length>0||this.roleCode=='admin'||this.roleCode=='plane'||this.roleCode=='plan'||this.roleCode=='shot'||this.roleCode=='clip'||this.roleCode=='designTeamLeader'||this.roleCode=='planeLeader'){
+         
             this.HttpPost()
-          }
           
       }
   },
   mixins: [JeecgListMixin],
   methods: {
+      sort(pagination, filters, sorter, { currentDataSource }){
+         if(sorter.order == 'ascend'){
+              this.HttpPost(sorter.columnKey+'+')
+          }else if(sorter.order == 'descend'){
+              this.HttpPost(sorter.columnKey+'-')
+          }
+
+
+      },
     moment,
     loadShow(){
         show++
-        console.log(show)
         if(this.data.length>0){
             if(show == (this.data.length*2)){
                 this.data = [...this.data]
@@ -356,33 +362,32 @@ export default {
           .subtract(1, 'days')
           .format('YYYY-MM-DD')
       this.dateRange=moment(yesterday)
-      console.log(this.dateRange);
       this.timedata=moment(yesterday).format('YYYY-MM-DD')
       // this.totalSelect = 1
       // this.daysFlag = true
-      if(this.appId.length>0||this.roleCode=='admin'||this.roleCode=='plane'||this.roleCode=='plan'||this.roleCode=='shot'||this.roleCode=='clip'||this.roleCode=='designTeamLeader'||this.roleCode=='planeLeader'){
-        this.HttpPost();
-      }else{
-          this.$message.error('请选择项目')
-      }
+     
+        this.HttpPost()
       
     },
     //table数据查询时间
-    HttpPost(){
+    HttpPost(sort){
       this.loading = true
       this.date = []
       show = 0
       postAction('/toutiao/videoReportDaily/bytedanceVideoInfoListDaily', {
-        date: this.timedata,
+        // date: this.timedata,
+        startDate: this.timedata,
+        endDate: this.timedata,
         cost: this.consumeValue,
         signature:this.videoID,
         pageNo:this.ipagination.current,
         pageSize:this.ipagination.pageSize,
-        projectIds:this.appId
+        // projectIds:this.appId,
+        accountIds:this.appId,
+        sort:sort?sort:''
       }).then(res => {
         let resArr = []
         this.loading = false
-        console.log(res)
         if (res.success) {
           let result = res.result
           this.data = result.list.map((item,index)=>{
@@ -397,12 +402,7 @@ export default {
     },
     //查询按钮
     searchRes() {
-      console.log(this.timedata[0])
-      if(this.appId.length>0||this.roleCode=='admin'||this.roleCode=='plane'||this.roleCode=='plan'||this.roleCode=='shot'||this.roleCode=='clip'||this.roleCode=='designTeamLeader'||this.roleCode=='planeLeader'){
-        this.HttpPost();
-      }else{
-          this.$message.error('请选择项目')
-      }
+        this.HttpPost()
       
     },
 
@@ -421,12 +421,10 @@ export default {
 
     tableHandle(){
       // this.listNum = [...this.columns]
-      console.log(this.listNum.length,this.columns)
       this.scrollX=0;
       if(this.listNum.length >= 12|| this.columns.length>=12){
           this.tableWidth=120;
           this.scrollX=this.columns.length*140
-          console.log(this.scrollX)
       }else{
         this.scrollX = 0
       }
@@ -569,11 +567,8 @@ export default {
   mounted() {
       this.dateRange=moment().subtract(1,'days')  
       this.timedata=moment().subtract(1,'days').format('YYYY-MM-DD')
-    if(this.appId.length>0||this.roleCode=='admin'||this.roleCode=='plane'||this.roleCode=='plan'||this.roleCode=='shot'||this.roleCode=='clip'||this.roleCode=='designTeamLeader'||this.roleCode=='planeLeader'){
-        this.HttpPost();
-      }else{
-          this.$message.error('请选择项目')
-      }
+    
+        this.HttpPost()
   },
 
 }

+ 25 - 22
src/views/modules/Statistics/videoStatics/vMonth.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="vsummary">
     <div class="xiangmuxuanze">
-      <span>项目选择:</span>
-       <Treeselect  :appId.sync="appId"  style="display: inline-block;position: relative;top: 10px;"/>
+        <span>项目选择:</span>
+       <Treeselect  :appId.sync="appId" request="1,3" reqUrl="/ctop/projectMember/bytedanceProjectParticipateInList"  style="display: inline-block;position: relative;top: 10px;"/>
     </div>
     <div class="timeDiv">
       <div>
@@ -84,6 +84,7 @@
       ref="vSummaryTable"
       style="word-break: break-all;"
       :width='tableWidth'
+      @change="sort"
     >
      
 
@@ -173,7 +174,7 @@ import moment from 'moment'
 import { JeecgListMixin } from '@/mixins/ipagination'
 import { getAction, postAction, downFile, downFilePost } from '@/api/manage'
 import selectComponent from './selectComponent'
-import Treeselect from './Treeselect.vue'
+import Treeselect from '../components/Treeselect'
 const columnsFixd = [
   {
     title: '时间',
@@ -412,13 +413,23 @@ export default {
   watch:{
       'ipagination.current':function(n,o){
           console.log(n,o)
-           if(this.appId.length>0||this.roleCode=='admin'||this.roleCode=='plane'||this.roleCode=='plan'||this.roleCode=='shot'||this.roleCode=='clip'||this.roleCode=='designTeamLeader'||this.roleCode=='planeLeader'){
+          
             this.HttpPost()
-          }
           
       }
   },
   methods: {
+      sort(pagination, filters, sorter, { currentDataSource }){
+          console.log(pagination, filters, sorter)
+          if(sorter.order == 'ascend'){
+              this.HttpPost(sorter.columnKey+'+')
+          }else if(sorter.order == 'descend'){
+              this.HttpPost(sorter.columnKey+'-')
+          }else{
+              this.HttpPost("")
+          }
+
+      },
     moment,
     //select切换---项目
     selectChange(key){
@@ -455,17 +466,14 @@ export default {
       this.totalSelect = (this.dateRange[1]._d - this.dateRange[0]._d) / (24 * 60 * 60 * 1000) + 1;
       this.timedata=[this.dateRange[0]._i,this.dateRange[1]._i]
       this.daysFlag = true
-       if(this.appId.length>0||this.roleCode=='admin'||this.roleCode=='plane'||this.roleCode=='plan'||this.roleCode=='shot'||this.roleCode=='clip'||this.roleCode=='designTeamLeader'||this.roleCode=='planeLeader'){
-          this.HttpPost();
-      }else{
-          this.$message.error('请选择项目')
-      }
+      
+          this.HttpPost()
      
     },
 
     consumeOnChange() {},
     //获取table数据请求
-    HttpPost(){
+    HttpPost(sort){
       this.loading=true;
       this.date=[];
       show = 0
@@ -476,7 +484,8 @@ export default {
         signature: this.videoID,
         pageNo:this.ipagination.current,
         pageSize:this.ipagination.pageSize,
-        projectIds:this.appId
+        accountIds:this.appId,
+        sort:sort?sort:''
       }).then(res => {
         let resArr = []
         this.loading = false
@@ -496,11 +505,8 @@ export default {
     },
     //查询按钮
     searchRes() {
-         if(this.appId.length>0||this.roleCode=='admin'||this.roleCode=='plane'||this.roleCode=='plan'||this.roleCode=='shot'||this.roleCode=='clip'||this.roleCode=='designTeamLeader'||this.roleCode=='planeLeader'){
-            this.HttpPost(); 
-        }else{
-            this.$message.error('请选择项目')
-        }
+        
+        this.HttpPost()
            
     },
 
@@ -765,11 +771,8 @@ export default {
       this.totalSelect = (this.dateRange[1]._d - this.dateRange[0]._d) / (24 * 60 * 60 * 1000) + 1;
       this.timedata=[this.dateRange[0]._i,this.dateRange[1]._i]
       this.daysFlag = true
-      if(this.appId.length>0||this.roleCode=='admin'||this.roleCode=='plane'||this.roleCode=='plan'||this.roleCode=='shot'||this.roleCode=='clip'||this.roleCode=='designTeamLeader'||this.roleCode=='planeLeader'){
-        this.HttpPost();
-      }else{
-          this.$message.error('请选择项目')
-      }
+      
+        this.HttpPost()
 
   },
 }

+ 46 - 47
src/views/modules/Statistics/videoStatics/vSummary.vue

@@ -2,15 +2,7 @@
   <div class="vsummary">
     <div class="xiangmuxuanze">
       <span>项目选择:</span>
-       <Treeselect  :appId.sync="appId"  style="display: inline-block;position: relative;top: 10px;"/>
-       <!-- <a-tree-select style="width: 60%"
-       v-model="value"
-      :tree-data="treeData"
-      tree-checkable
-      :show-checked-strategy="SHOW_PARENT"
-      search-placeholder="Please select">
-
-       </a-tree-select> -->
+       <Treeselect  :appId.sync="appId" request="1,3" reqUrl="/ctop/projectMember/bytedanceProjectParticipateInList"  style="display: inline-block;position: relative;top: 10px;"/>
     </div>
     <div class="timeDiv">
       <div>
@@ -96,6 +88,7 @@
       ref="vSummaryTable"
       :width="tableWidth"
       @customHeaderCell="customHeaderCell(columns)"
+      @change="sort"
       style="word-break: break-all;"
     >
       <div slot="videoU" slot-scope="test,records">
@@ -187,7 +180,7 @@ import moment from 'moment'
 import { JeecgListMixin } from '@/mixins/ipagination'
 import { getAction, postAction, downFile, downFilePost } from '@/api/manage'
 import selectComponent from './selectComponent'
-import Treeselect from './Treeselect.vue'
+import Treeselect from '../components/Treeselect'
 const columnsFixd = [
   {
     title: '视频',
@@ -229,6 +222,7 @@ let variableCol = [
 
     scopedSlots: { customRender: 'clickMaterial' },
     sorter: (a, b) => a.clickMaterial - b.clickMaterial
+    // (a, b) => a.clickMaterial - b.clickMaterial
   },
   {
     title: '点击率',
@@ -331,6 +325,15 @@ export default {
     Treeselect
   },
   methods: {
+      sort(pagination, filters, sorter, { currentDataSource }){
+          console.log(pagination, filters, sorter)
+          if(sorter.order == 'ascend'){
+              this.HttpPost(sorter.columnKey+'+')
+          }else if(sorter.order == 'descend'){
+              this.HttpPost(sorter.columnKey+'-')
+          }
+
+      },
     moment,
     //select切换---项目
     selectChange(key){
@@ -355,15 +358,12 @@ export default {
     //查询按钮
     searchRes() {
       this.date = []
-      if(this.appId.length>0||this.roleCode=='admin'||this.roleCode=='plane'||this.roleCode=='plan'||this.roleCode=='shot'||this.roleCode=='clip'||this.roleCode=='designTeamLeader'||this.roleCode=='planeLeader'){
-        this.HttpPost();
-      }else{
-          this.$message.error('请选择项目')
-      }
+     
+      this.HttpPost()
       
     },
     //网络请求table数据函数
-    HttpPost(){
+    HttpPost(sort){
       this.loading=true;
       show = 0
       postAction('/toutiao/videoReportDaily/videoInfoListTotal', {
@@ -373,7 +373,8 @@ export default {
         signature: this.videoID,
         pageNo:this.ipagination.current,
         pageSize:this.ipagination.pageSize,
-        projectIds:this.appId
+        accountIds:this.appId,
+        sort:sort?sort:''
       }).then(res => {
         let resArr = []
         
@@ -409,16 +410,18 @@ export default {
       // downFilePost('/ctop/yiche/report/exportDailyReport', params).then(res => {
       //   let blob = new Blob([res], {
       //     type: 'application/vnd.ms-excel'
-      let columns = this.columns.map((item, index) => {
+      let column = this.columns.map((item, index) => {
         return item.dataIndex
       })
-
+        let columns=['url',...column]
+        
       downFilePost('/toutiao/videoReportDaily/bytedanceVideoInfoListTotalExportExcel', {
         columns,
         signature: this.videoID,
         startDate: this.timedata[0],
         endDate: this.timedata[1],
-        cost: this.consumeValue
+        cost: this.consumeValue,
+        accountIds:this.appId,
       }).then(res => {
         let blob = new Blob([res], {
           type:'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
@@ -460,20 +463,19 @@ export default {
 
     //设置头部单元格属性
     customHeaderCell(columns) {
-      console.log(columns)
+    //   console.log(columns)
     },
 
     tableHandle() {
       // this.listNum = [...this.columns]
-      console.log(this.listNum.length, this.columns)
+    //   console.log(this.listNum.length, this.columns)
 
       if (this.listNum.length >= 9 || this.columns.length >= 9) {
         this.tableWidth = 120
         this.scrollX = this.columns.length * 120
-        console.log(this.scrollX)
+        // console.log(this.scrollX)
       } else {
         this.scrollX = 0
-        console.log('scroll==0')
       }
     },
 
@@ -602,10 +604,7 @@ export default {
   watch:{
       'ipagination.current':function(n,o){
           console.log(n,o)
-          if(this.appId.length>0||this.roleCode=='admin'||this.roleCode=='plane'||this.roleCode=='plan'||this.roleCode=='shot'||this.roleCode=='clip'||this.roleCode=='designTeamLeader'||this.roleCode=='planeLeader'){
-            this.HttpPost()
-          }
-          
+          this.HttpPost()
       }
   },
   activated() {
@@ -621,23 +620,26 @@ export default {
       // console.log(res)
       if (res.success) {
         // console.log(JSON.parse(res.result))
-        let columns = JSON.parse(res.result)
-        if (columns.length) {
-          if (columns.length >= columnsFixd.length) {
-            columns.map((item, index) => {
-              if (index > columnsFixd.length - 1) {
-                item.sorter = function(a, b) {
-                  return a[item.dataIndex] - b[item.dataIndex]
+        if(res.result){
+            let columns = JSON.parse(res.result)
+            if (columns.length) {
+            if (columns.length >= columnsFixd.length) {
+                columns.map((item, index) => {
+                if (index > columnsFixd.length - 1) {
+                    item.sorter = function(a, b) {
+                    return a[item.dataIndex] - b[item.dataIndex]
+                    }
                 }
-              }
-            })
-            columns = columns.slice(columnsFixd.length)
-            this.columns = [...columnsFixd, ...columns]
-            this.tableHandle()
-          }
+                })
+                columns = columns.slice(columnsFixd.length)
+                this.columns = [...columnsFixd, ...columns]
+                this.tableHandle()
+            }
 
-          // console.log(this.columns)
+            // console.log(this.columns)
+            }
         }
+        
       }
     })
   },
@@ -686,11 +688,8 @@ export default {
     this.dateRange=[moment().subtract(1,'days'),moment()]
     this.timedata=[moment().subtract(1,'days').format('YYYY-MM-DD'),moment().format('YYYY-MM-DD')]
     // this.loading=true;
-    if(this.appId.length>0||this.roleCode=='admin'||this.roleCode=='plane'||this.roleCode=='plan'||this.roleCode=='shot'||this.roleCode=='clip'||this.roleCode=='designTeamLeader'||this.roleCode=='planeLeader'){
-        this.HttpPost();
-      }else{
-          this.$message.error('请选择项目')
-      }
+   
+        this.HttpPost()
     
   }
 }

+ 23 - 24
src/views/modules/Statistics/videoStatics/vWeek.vue

@@ -2,7 +2,7 @@
   <div class="vsummary">
     <div class="xiangmuxuanze">
       <span>项目选择:</span>
-       <Treeselect  :appId.sync="appId"  style="display: inline-block;position: relative;top: 10px;"/>
+       <Treeselect  :appId.sync="appId" request="1,3" reqUrl="/ctop/projectMember/bytedanceProjectParticipateInList"  style="display: inline-block;position: relative;top: 10px;"/>
     </div>
     <div class="timeDiv">
       <div>
@@ -84,6 +84,7 @@
       ref="vSummaryTable"
       style="word-break: break-all;"
       :width='tableWidth'
+      @change="sort"
     >
      
 
@@ -173,7 +174,7 @@ import moment from 'moment'
 import { JeecgListMixin } from '@/mixins/ipagination'
 import { getAction, postAction, downFile, downFilePost } from '@/api/manage'
 import selectComponent from './selectComponent'
-import Treeselect from './Treeselect.vue'
+import Treeselect from '../components/Treeselect'
 const columnsFixd = [
   {
     title: '时间',
@@ -398,11 +399,7 @@ export default {
      watch:{
       'ipagination.current':function(n,o){
           console.log(n,o)
-         
-          if(this.appId.length>0||this.roleCode=='admin'||this.roleCode=='plane'||this.roleCode=='plan'||this.roleCode=='shot'||this.roleCode=='clip'||this.roleCode=='designTeamLeader'||this.roleCode=='planeLeader'){
-            this.HttpPost()
-          }
-          
+          this.HttpPost()
       }
   },
   components: {
@@ -415,6 +412,15 @@ export default {
   },
   mixins: [JeecgListMixin],
   methods: {
+      sort(pagination, filters, sorter, { currentDataSource }){
+          console.log(pagination, filters, sorter)
+          if(sorter.order == 'ascend'){
+              this.HttpPost(sorter.columnKey+'+')
+          }else if(sorter.order == 'descend'){
+              this.HttpPost(sorter.columnKey+'-')
+          }
+
+      },
     moment,
     loadShow(){
         show++
@@ -457,17 +463,14 @@ export default {
       this.daysFlag = true
       this.timedata=[moment(this.dateRange[0]).format('YYYY-MM-DD'),moment(this.dateRange[1]).format('YYYY-MM-DD')]
       
-          if(this.appId.length>0||this.roleCode=='admin'||this.roleCode=='plane'||this.roleCode=='plan'||this.roleCode=='shot'||this.roleCode=='clip'||this.roleCode=='designTeamLeader'||this.roleCode=='planeLeader'){
-        this.HttpPost();
-      }else{
-          this.$message.error('请选择项目')
-      }
+         
+        this.HttpPost()
 
     },
 
     consumeOnChange() {},
     //tableshuju请求
-    HttpPost(){
+    HttpPost(sort){
       this.date = []
       this.loading = true
       show = 0
@@ -478,7 +481,9 @@ export default {
         signature: this.videoID,
          pageNo:this.ipagination.current,
         pageSize:this.ipagination.pageSize,
-        projectIds:this.appId
+        // projectIds:this.appId
+        accountIds:this.appId,
+        sort:sort?sort:''
       }).then(res => {
         let resArr = []
         this.loading = false
@@ -497,11 +502,8 @@ export default {
     //查询按钮
     searchRes() {
       
-      if(this.appId.length>0||this.roleCode=='admin'||this.roleCode=='plane'||this.roleCode=='plan'||this.roleCode=='shot'||this.roleCode=='clip'||this.roleCode=='designTeamLeader'||this.roleCode=='planeLeader'){
-        this.HttpPost();
-      }else{
-          this.$message.error('请选择项目')
-      }
+      
+        this.HttpPost()
     },
 
     //导出报表
@@ -745,11 +747,8 @@ export default {
   },
   mounted() {
     // this.lastWeekHandle();
-    if(this.appId.length>0||this.roleCode=='admin'||this.roleCode=='plane'||this.roleCode=='plan'||this.roleCode=='shot'||this.roleCode=='clip'||this.roleCode=='designTeamLeader'||this.roleCode=='planeLeader'){
-        this.HttpPost();
-      }else{
-          this.$message.error('请选择项目')
-      }
+   
+        this.HttpPost()
   },
 }
 </script>

+ 4 - 11
src/views/modules/advertiser/modules/ProjectModal.vue

@@ -21,17 +21,9 @@
         <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="项目名称">
           <a-input placeholder="请输入项目名称" v-decorator="['projectName', validatorRules.projectName]" />
         </a-form-item>
-        
-        <a-form-item label="行业" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <j-tree-select 
-            ref="treeSelect"
-            placeholder="请选择行业"
-            dict="sys_category,name,id"
-            pidField="pid"
-            pidValue="f5cb2d2d28417b3b65a6dd744bcb9a76"
-            v-decorator="['industryId', validatorRules.industryId]"
-           
-          >
+         <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="行业">
+          <j-tree-select ref="treeSelect" placeholder="请选择行业" v-decorator="['industryId', validatorRules.pid]"
+            dict="sys_category,name,id" pidField="pid" pidValue="f5cb2d2d28417b3b65a6dd744bcb9a76">
           </j-tree-select>
         </a-form-item>
         <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="广告主名称">
@@ -248,6 +240,7 @@ export default {
             'userId',
             'designResponsibleId',
             'responsibleId',
+            'industryId'
             // 'advertiserType',
             // 'saleId'
           )