魏志佳 4 gadi atpakaļ
vecāks
revīzija
1be18f70b7

+ 2 - 2
src/utils/request.js

@@ -16,8 +16,8 @@ else if (process.env.NODE_ENV == 'debug') {
 else if (process.env.NODE_ENV == 'production') { 
   
   // axios.defaults.baseURL = 'http://192.168.1.251/jeecg-boot';
-  // axios.defaults.baseURL = 'http://139.186.151.174:8804/jeecg-boot';     
-  axios.defaults.baseURL = 'http://api.tjyourong.com.cn/jeecg-boot';
+  axios.defaults.baseURL = 'http://139.186.151.174:8804/jeecg-boot';     
+  // axios.defaults.baseURL = 'http://api.tjyourong.com.cn/jeecg-boot';
 }
 const service = axios.create({
 //   baseURL: '/jeecg-boot', // api base_url

+ 1 - 1
src/views/modules/Statistics/videoStatics/KSvideoStatics.vue

@@ -762,7 +762,7 @@ export default {
         let column = this.columns.map((item, index) => {
           return item.dataIndex
         })      
-        columns=column.splice(7)
+        columns=column.splice(8)
       }
       downFilePost('/ctop/kuaishou/videoReport/excelV2', {
         columns,

+ 6 - 7
src/views/modules/Statistics/yicheStatistics/dayStatistics.vue

@@ -76,10 +76,8 @@ th div {
             optionFilterProp="children"
             :filterOption="filterOption"
           >
-            <a-select-option :value="item.projectId" v-for="item of dataElse" :key="item.id">
-              {{ item.projectName }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{
-                item.mediaId == "1" ? '头条' :item.mediaId == "2"? '快手':item.mediaId == "3"?'头条内广':'快手内广'
-              }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{ item.advertiserName }}
+            <a-select-option :value="item.projectId" v-for="item of dataElse" :key="item.projectId">
+              {{ item.projectName }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{ item.advertiserName }}
             </a-select-option>
           </a-select>
           <span style="margin-left:10px">日期选择:</span>
@@ -527,10 +525,11 @@ export default {
     },
     ...mapGetters(['nickname', 'avatar', 'userInfo']),
     getParticipateList() {
-      getAction('/ctop/projectMember/participateList', {
-        userId: this.userInfo().id
+      postAction('/ctop/projectMember/participateListByMediaId', {
+        userId: this.userInfo().id,
+        type: "kuaishou"
       }).then(res => {
-        if (res.code == 0) {
+        if (res.success) {
           this.dataElse = res.result
         }
       })

+ 6 - 7
src/views/modules/Statistics/yicheStatistics/timeStatistics.vue

@@ -76,10 +76,8 @@ th div {
             optionFilterProp="children"
             :filterOption="filterOption"
           >
-            <a-select-option :value="item.projectId" v-for="item of dataElse" :key="item.id">
-              {{ item.projectName }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{
-                item.mediaId == "1" ? '头条' :item.mediaId == "2"? '快手':item.mediaId == "3"?'头条内广':'快手内广'
-              }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{ item.advertiserName }}
+            <a-select-option :value="item.projectId" v-for="item of dataElse" :key="item.projectId">
+              {{ item.projectName }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{ item.advertiserName }}
             </a-select-option>
           </a-select>
           <span style="margin-left:10px">日期选择:</span>
@@ -269,10 +267,11 @@ export default {
     },
     ...mapGetters(['nickname', 'avatar', 'userInfo']),
     getParticipateList() {
-      getAction('/ctop/projectMember/participateList', {
-        userId: this.userInfo().id
+      postAction('/ctop/projectMember/participateListByMediaId', {
+        userId: this.userInfo().id,
+        type: "kuaishou"
       }).then(res => {
-        if (res.code == 0) {
+        if (res.success) {
           this.dataElse = res.result
         }
       })

+ 32 - 7
src/views/modules/autoLaunch/configLaunchInfo.vue

@@ -2194,7 +2194,8 @@ export default {
                     this.description=res.result.description
                     
                     //  res.result.creativeTag=res.result.creativeTag?res.result.creativeTag:[]
-                    new Promise((resolve,reject)=>{
+
+                    let fngetIsActivate=new Promise((resolve,reject)=>{
                         getAction('/kuaishou/batch/getIsActivate', {
                             accountId: this.accountId
                         }).then(res => {
@@ -2203,7 +2204,20 @@ export default {
                                 resolve()
                             }
                         })
-                    }).then(r=>{
+                    })
+
+                    let fngetWhite=new Promise((resolve,reject)=>{
+                        getAction('/kuaishou/batch/getIsActivate', {
+                            accountId: this.accountId
+                        }).then(res => {
+                            if (res.success) {
+                                this.groupTypeData = res.result
+                                resolve()
+                            }
+                        })
+                    })
+
+                    Promise.all([fngetIsActivate,fngetWhite]).then(r=>{
 
                     
                     // this.form.setFieldsValue({
@@ -2214,8 +2228,18 @@ export default {
                     //     cpaBid:res.result.cpaBid/1000,
                     //     appId:res.singleAppid?JSON.parse(res.result.appIdArray)[0]:JSON.parse(res.result.appIdArray)
                     // })
-                    this.$nextTick(()=>{
-                        res.result.creativeCategory=res.result.creativeCategory?[parseInt(res.result.creativeCategory/10000),parseInt(res.result.creativeCategory/100),res.result.creativeCategory]:[]
+              
+                    if(res.result.creativeCategory){
+                        // let arr=[];
+                        if(res.result.creativeCategory>10000){
+                            res.result.creativeCategory=res.result.creativeCategory?[parseInt(res.result.creativeCategory/10000),parseInt(res.result.creativeCategory/100),res.result.creativeCategory]:[];
+                        }else if(res.result.creativeCategory>100){
+                            res.result.creativeCategory=res.result.creativeCategory?[parseInt(res.result.creativeCategory/100),res.result.creativeCategory]:[];
+                        }else{
+                            res.result.creativeCategory=res.result.creativeCategory?[res.result.creativeCategory]:[];
+                        }
+                    }
+                    setTimeout(()=>{                       
                         this.form.setFieldsValue({
                              ...res.result,
                             creativeTag:res.result.creativeTag?JSON.parse(res.result.creativeTag):[],
@@ -2224,8 +2248,9 @@ export default {
                             cpaBid:res.result.cpaBid/1000,
                             appId:res.singleAppid?JSON.parse(res.result.appIdArray)[0]:JSON.parse(res.result.appIdArray)
                         })
-                    })
-                    if((this.getFormData('ocpxActionType') == 180 || this.getFormData('ocpxActionType') == 53) && this.groupTypeData.deepConversionTypes&&this.groupTypeData.deepConversionTypes.length > 0){
+                    },0)
+                    if((res.result.ocpxActionType == 180 || res.result.ocpxActionType == 53) && this.groupTypeData.deepConversionTypes&&this.groupTypeData.deepConversionTypes.length > 0){
+                        // console.log(1)
                         setTimeout(()=>{
                         this.form.setFieldsValue({
                             deepConversionType:res.result.deepConversionType,
@@ -2238,7 +2263,7 @@ export default {
                     },0)
                     }
                     
-                    console.log(this.getFormData('deepConversionBid'))
+                    // console.log(this.getFormData('deepConversionBid'))
                     this.noAreaBreak=res.result.noAreaBreak?true:false
                     this.noGenderBreak=res.result.noGenderBreak?true:false
                     this.noAgeBreak=res.result.noAgeBreak?true:false

+ 3 - 3
src/views/modules/kuaishouapp/account/copyAllUnit.vue

@@ -197,12 +197,12 @@
         >
           <a-select v-model="item.ocpxActionType">
             <a-select-option :value="2">行为数</a-select-option>
-            <a-select-option :value="180" v-if="campaignType == '2' && allForm.groupTypeData.isActivate == '1'"
+            <a-select-option :value="180" v-if=" allForm.groupTypeData.isActivate == '1'"
               >激活</a-select-option
             >
             <a-select-option
               :value="53"
-              v-if="(campaignType == '4' || campaignType == '5') && allForm.groupTypeData.isFormSubmit == '1'"
+              v-if=" allForm.groupTypeData.isFormSubmit == '1'"
               >表单提交</a-select-option
             >
 
@@ -756,7 +756,7 @@ export default {
         unitNameCheck: false,
         deepConversionType: '',
         deepConversionBid: '',
-        ocpxActionType: this.campaignType == '2' && this.allForm.groupTypeData.isActivate == '1' ? 180 : 2,
+        ocpxActionType:  this.allForm.groupTypeData.isActivate == '1' ? 180 : 2,
       })
     },
     resData(index) {

+ 2 - 2
src/views/modules/kuaishouapp/account/copyGroup.vue

@@ -199,9 +199,9 @@
                       <a-radio-button :value="1">点击数</a-radio-button>
                       <a-radio-button :value="2">行为数</a-radio-button>
                       <a-radio-button :value="180"
-                        v-if="campaignType == '2' && allForm.groupTypeData.isActivate == '1'">激活</a-radio-button>
+                        v-if=" allForm.groupTypeData.isActivate == '1'">激活</a-radio-button>
                       <a-radio-button :value="53"
-                        v-if="(campaignType == '4' || campaignType == '5') && allForm.groupTypeData.isFormSubmit == '1'">
+                        v-if=" allForm.groupTypeData.isFormSubmit == '1'">
                         表单提交</a-radio-button>
                     </a-radio-group>
                   </a-form-item>

+ 2 - 2
src/views/modules/kuaishouapp/account/editGroup.vue

@@ -236,9 +236,9 @@
 
                         <a-select-option :value="2">行为数</a-select-option>
                         <a-select-option :value="180"
-                          v-if="campaignType == '2' && allForm.groupTypeData.isActivate == '1'">激活</a-select-option>
+                          v-if=" allForm.groupTypeData.isActivate == '1'">激活</a-select-option>
                         <a-select-option :value="53" v-if="
-                            (campaignType == '4' || campaignType == '5') && allForm.groupTypeData.isFormSubmit == '1'
+                             allForm.groupTypeData.isFormSubmit == '1'
                           ">表单提交</a-select-option>
 
                         <a-select-option :value="394" v-if="

+ 2 - 2
src/views/modules/kuaishouapp/account/editGroupNew.vue

@@ -239,9 +239,9 @@
 
                         <a-select-option :value="2">行为数</a-select-option>
                         <a-select-option :value="180"
-                          v-if="campaignType == '2' && allForm.groupTypeData.isActivate == '1'">激活</a-select-option>
+                          v-if=" allForm.groupTypeData.isActivate == '1'">激活</a-select-option>
                         <a-select-option :value="53" v-if="
-                            (campaignType == '4' || campaignType == '5') && allForm.groupTypeData.isFormSubmit == '1'
+                             allForm.groupTypeData.isFormSubmit == '1'
                           ">表单提交</a-select-option>
 
                         <a-select-option :value="394" v-if="

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

@@ -289,9 +289,9 @@
 
                         <a-select-option :value="2">行为数</a-select-option>
                         <a-select-option :value="180"
-                          v-if="campaignType == '2' && allForm.groupTypeData.isActivate == '1'">激活</a-select-option>
+                          v-if=" allForm.groupTypeData.isActivate == '1'">激活</a-select-option>
                         <a-select-option :value="53" v-if="
-                            (campaignType == '4' || campaignType == '5') && allForm.groupTypeData.isFormSubmit == '1'
+                             allForm.groupTypeData.isFormSubmit == '1'
                           ">表单提交</a-select-option>
 
                         <a-select-option :value="394" v-if="
@@ -684,7 +684,7 @@
               unitNameCheck: false,
               deepConversionType: '',
               deepConversionBid: '',
-              ocpxActionType:this.campaignType == '2' && this.allForm.groupTypeData.isActivate == '1' ? 180 : 2,
+              ocpxActionType: this.allForm.groupTypeData.isActivate == '1' ? 180 : 2,
             })
           }else{
             this.$message.error('请选择目标应用之后添加广告组')
@@ -700,7 +700,7 @@
               unitNameCheck: false,
               deepConversionType: '',
               deepConversionBid: '',
-              ocpxActionType:this.campaignType == '2' && this.allForm.groupTypeData.isActivate == '1' ? 180 : 2,
+              ocpxActionType: this.allForm.groupTypeData.isActivate == '1' ? 180 : 2,
             })
         }
 

+ 3 - 3
src/views/modules/kuaishouapp/batchCreation/creat/creatUnit.vue

@@ -388,12 +388,12 @@
         >
           <a-select v-model="item.ocpxActionType">
             <a-select-option :value="2">行为数</a-select-option>
-            <a-select-option :value="180" v-if="campaignType == '2' && allForm.groupTypeData.isActivate == '1'"
+            <a-select-option :value="180" v-if=" allForm.groupTypeData.isActivate == '1'"
               >激活</a-select-option
             >
             <a-select-option
               :value="53"
-              v-if="(campaignType == '4' || campaignType == '5') && allForm.groupTypeData.isFormSubmit == '1'"
+              v-if=" allForm.groupTypeData.isFormSubmit == '1'"
               >表单提交</a-select-option
             >
 
@@ -1947,7 +1947,7 @@ export default {
         unitNameCheck: false,
         deepConversionType: '',
         deepConversionBid: '',
-        ocpxActionType: this.campaignType == '2' && this.allForm.groupTypeData.isActivate == '1' ? 180 : 2,
+        ocpxActionType:  this.allForm.groupTypeData.isActivate == '1' ? 180 : 2,
       })
     },
     resData(index) {

+ 23 - 18
src/views/modules/kuaishouapp/newBatch/index.vue

@@ -1036,12 +1036,11 @@ li.chouzhen.first:before {
               v-if="
                 groupTypeData &&
                 (unitInfo.ocpxActionType == 180 || unitInfo.ocpxActionType == 53) &&
-                groupTypeData.deepConversionTypes.length > 0 &&
-                items.deepConversionType
+                groupTypeData.deepConversionTypes.length > 0 
               "
             >
               <a-col :span="16">
-                <a-form-model-item label="深度转化目标出价">
+                <a-form-model-item label="深度转化出价">
                   <a-input-number
                     v-model="unitInfo.deepConversionBid"
                     style="width: 90%"
@@ -1051,7 +1050,7 @@ li.chouzhen.first:before {
                   <br />
                   <span v-if="unitInfo.deepConversionBid && (unitInfo.cpaBid || unitInfo.cpaBid > 0)"
                     >按照两个出价得到的期望目标深度转化率为{{
-                      (unitInfo.cpaBid / unitInfo.deepConversionBid) * 100
+                      (unitInfo.cpaBid / unitInfo.deepConversionBid).toFixed(2) * 100
                     }}%</span
                   >
                 </a-form-model-item>
@@ -2780,13 +2779,16 @@ export default {
 
         this.createTiveTemplateId = 'edit'
         this.creativeInfo.overlayType = dataJson.creativeJson.overlayType ? [dataJson.creativeJson.overlayType] : []
-        this.creativeInfo.creativeCategory = dataJson.creativeJson.creativeCategory
-          ? [
-              +(dataJson.creativeJson.creativeCategory + '').substring(0, 1),
-              +(dataJson.creativeJson.creativeCategory + '').substring(0, 3),
-              dataJson.creativeJson.creativeCategory,
-            ]
-          : []
+        this.creativeInfo.creativeCategory =
+          dataJson.creativeJson.creativeCategory > 10000
+            ? [
+                parseInt(dataJson.creativeJson.creativeCategory / 10000),
+                parseInt(dataJson.creativeJson.creativeCategory / 100),
+                dataJson.creativeJson.creativeCategory,
+              ]
+            : dataJson.creativeJson.creativeCategory > 100
+            ? [parseInt(dataJson.creativeJson.creativeCategory / 100), dataJson.creativeJson.creativeCategory]
+            : []
         this.creativeInfo.creativeTag = dataJson.creativeJson.creativeTag
           ? JSON.parse(dataJson.creativeJson.creativeTag)
           : []
@@ -4365,13 +4367,16 @@ export default {
             // params.stickerTitle = this.creativeInfo.overlayType.length > 0 ? this.creativeInfo.stickerTitle : null
             this.createTiveTemplateId = data.id
             this.creativeInfo.overlayType = data.overlayType ? [data.overlayType] : []
-            this.creativeInfo.creativeCategory = data.creativeCategory
-              ? [
-                  +(data.creativeCategory + '').substring(0, 1),
-                  +(data.creativeCategory + '').substring(0, 3),
-                  data.creativeCategory,
-                ]
-              : []
+            this.creativeInfo.creativeCategory =
+              data.creativeCategory > 10000
+                ? [
+                    parseInt(data.creativeCategory / 10000),
+                    parseInt(data.creativeCategory / 100),
+                    data.creativeCategory,
+                  ]
+                : data.creativeCategory > 100
+                ? [parseInt(data.creativeCategory / 100), data.creativeCategory]
+                : []
             this.creativeInfo.creativeTag = data.creativeTag ? JSON.parse(data.creativeTag) : []
             this.creativeInfo.actionBarText = data.actionBarText
             this.creativeInfo.stickerTitle = data.stickerTitle

+ 19 - 10
src/views/system/DepartList.vue

@@ -7,10 +7,10 @@
         <a-row style="margin-left: 14px">
           <a-button @click="handleAdd(1)" type="primary">添加部门</a-button>
           <a-button @click="handleAdd(2)" type="primary">添加下级</a-button>
-          <a-button type="primary" icon="download" @click="handleExportXls('部门信息')">导出</a-button>
+          <!-- <a-button type="primary" icon="download" @click="handleExportXls('部门信息')">导出</a-button>
           <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
             <a-button type="primary" icon="import">导入</a-button>
-          </a-upload>
+          </a-upload> -->
           <a-button title="删除多条数据" @click="batchDel" type="default">批量删除</a-button>
           <!--<a-button @click="refresh" type="default" icon="reload" :loading="loading">刷新</a-button>-->
         </a-row>
@@ -91,17 +91,17 @@
                   placeholder="无">
                 </a-tree-select>
               </a-form-item>
-              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="汇报上级">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="部门领导">
                 <a-select
                   showSearch
                   :filterOption="filterOption"
                   style="width: 100%"
-                  placeholder="请选择汇报上级"
-                   v-decorator="['leader', { rules: [{ required: true, message: '汇报上级必选' }] }]"
+                  placeholder="请选择部门领导"
+                  v-decorator="['leader', { rules: [{ required: true, message: '部门领导必选' }] }]"
                   labelInValue
                 >
                   <a-select-option v-for="(people, peopleindex) in peopleList" :key="peopleindex" :value="people.key">
-                    {{ people.label }}
+                    {{people.label}}
                   </a-select-option>
                 </a-select>
               </a-form-item>
@@ -137,7 +137,7 @@
                 :labelCol="labelCol"
                 :wrapperCol="wrapperCol"
                 label="排序">
-                <a-input-number v-decorator="[ 'departOrder',{'initialValue':0}]"/>
+                <a-input-number :min="0" v-decorator="[ 'departOrder',{'initialValue':0}]"/>
               </a-form-item>
               <a-form-item
                 :labelCol="labelCol"
@@ -159,7 +159,7 @@
               </a-form-item>
             </a-form>
             <div class="anty-form-btn">
-              <a-button @click="emptyCurrForm" type="default" htmlType="button" icon="sync">重置</a-button>
+              <!-- <a-button @click="emptyCurrForm" type="default" htmlType="button" icon="sync">重置</a-button> -->
               <a-button @click="submitCurrForm" type="primary" htmlType="button" icon="form">保存</a-button>
             </div>
           </a-card>
@@ -294,12 +294,19 @@
       }
     },
     methods: {
+      getData(className) {
+        return this.form.getFieldValue(className)
+      },
+      filterOption(input, option) {
+        return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+      },
       getAllPeople() {
         this.getAction('/sys/user/getAllUser',{status:1}).then((res) => {
           if (res.success) {
             this.peopleList = res.result.map((item) => {
               return { key: item.userId, label: item.realName }
             })
+            console.log(res,this.peopleList)
           }
         })
       },
@@ -458,7 +465,7 @@
         if(record.leaderId){
           record.leader = {key:record.leaderId,label:record.leaderName}
         }else{
-          record.leader = {}
+          record.leader = undefined
         }
         this.$nextTick(() => {
           this.form.getFieldDecorator('fax', {initialValue: ''})
@@ -492,8 +499,10 @@
               this.$message.warning('请点击选择要修改部门!')
               return
             }
-
+            console.log(values)
             let formData = Object.assign(this.currSelected, values)
+            formData.leaderId = values.leader.key
+            formData.leaderName = values.leader.label.replace(/\/n+$/g,'');
             console.log('Received values of form: ', formData)
             httpAction(this.url.edit, formData, 'put').then((res) => {
               if (res.success) {

+ 84 - 8
src/views/system/UserList.vue

@@ -15,7 +15,7 @@
               <a-input placeholder="请输入姓名查询" v-model="queryParam.realname"></a-input>
             </a-form-item>
           </a-col>
-          <a-col :md="6" :sm="8">
+          <!-- <a-col :md="6" :sm="8">
             <a-form-item label="性别">
               <a-select v-model="queryParam.sex" placeholder="请选择性别查询">
                 <a-select-option value="">请选择性别查询</a-select-option>
@@ -23,6 +23,28 @@
                 <a-select-option value="2">女性</a-select-option>
               </a-select>
             </a-form-item>
+          </a-col> -->
+          <a-col :md="6" :sm="12">
+            <a-form-item label="汇报上级">
+              <a-input placeholder="请输入姓名查询" v-model="queryParam.leaderName"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="12">
+            <a-form-item label="用户角色">
+              <a-input placeholder="请输入用户角色" v-model="queryParam.roleName"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="12">
+            <a-form-item label="部门分配">
+              <a-tree-select
+                style="width: 100%"
+                :dropdownStyle="{ maxHeight: '200px', overflow: 'auto' }"
+                :treeData="treeData"
+                v-model="queryParam.departId"
+                placeholder="无"
+              >
+              </a-tree-select>
+            </a-form-item>
           </a-col>
 
           <a-col :md="6" :sm="8">
@@ -31,18 +53,17 @@
             </a-form-item>
           </a-col>
 
-          <a-col :md="6" :sm="8">
+          <!-- <a-col :md="6" :sm="8">
             <a-form-item label="手机号码">
               <a-input placeholder="请输入手机号码查询" v-model="queryParam.phone"></a-input>
             </a-form-item>
-          </a-col>
+          </a-col> -->
 
           <a-col :md="6" :sm="8">
             <a-form-item label="状态">
               <a-select v-model="queryParam.status" placeholder="请选择用户状态查询">
-                <a-select-option value="">请选择用户状态</a-select-option>
                 <a-select-option value="1">正常</a-select-option>
-                <a-select-option value="2">冻</a-select-option>
+                <a-select-option value="2">冻</a-select-option>
               </a-select>
             </a-form-item>
           </a-col>
@@ -85,6 +106,21 @@
             {{ text ? text : '-' }}
           </span>
         </template>
+        <template slot="sex" slot-scope="text, record">
+          <span>
+            {{ text ? (text == 1 ? '男' : '女') : '未填写' }}
+          </span>
+        </template>
+        <template slot="status" slot-scope="text, record">
+          <span>
+            {{ text ? (text == 1 ? '正常' : '冻结') : '未填写' }}
+          </span>
+        </template>
+        <template slot="departName" slot-scope="text, record">
+          <span>
+            {{ text ? text : '-' }}
+          </span>
+        </template>
 
         <span slot="action" slot-scope="text, record">
           <a @click="handleEdit(record)">编辑</a>
@@ -141,7 +177,7 @@
 import UserModal from './modules/UserModal'
 import PasswordModal from './modules/PasswordModal'
 import { putAction } from '@/api/manage'
-import { frozenBatch } from '@/api/api'
+import { frozenBatch, queryIdTree } from '@/api/api'
 import { JeecgListMixin } from '@/mixins/JeecgListMixin'
 import SysUserAgentModal from './modules/SysUserAgentModal'
 
@@ -156,6 +192,7 @@ export default {
   data() {
     return {
       description: '这是用户管理页面',
+      treeData: [],
       queryParam: {},
       columns: [
         /*{
@@ -192,7 +229,8 @@ export default {
           title: '性别',
           align: 'center',
           width: 80,
-          dataIndex: 'sex_dictText',
+          dataIndex: 'sex',
+          scopedSlots: { customRender: 'sex' },
           sorter: true,
         },
         // {
@@ -235,7 +273,8 @@ export default {
           title: '状态',
           align: 'center',
           width: 80,
-          dataIndex: 'status_dictText',
+          dataIndex: 'status',
+          scopedSlots: { customRender: 'status' },
         },
         /* {
              title: '创建时间',
@@ -268,7 +307,44 @@ export default {
       return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
     },
   },
+  created() {
+    this.$nextTick(() => {
+      this.loadTreeData()
+    })
+  },
   methods: {
+    // loadTree() {
+    //   var that = this
+    //   that.treeData = []
+    //   that.departTree = []
+    //   queryDepartTreeList().then((res) => {
+    //     if (res.success) {
+    //       //部门全选后,再添加部门,选中数量增多
+    //       this.allTreeKeys = []
+    //       for (let i = 0; i < res.result.length; i++) {
+    //         let temp = res.result[i]
+    //         that.treeData.push(temp)
+    //         that.departTree.push(temp)
+    //         that.setThisExpandedKeys(temp)
+    //         that.getAllKeys(temp)
+    //         // console.log(temp.id)
+    //       }
+    //       this.loading = false
+    //     }
+    //   })
+    // },
+    loadTreeData() {
+      var that = this
+      queryIdTree().then((res) => {
+        if (res.success) {
+          that.treeData = []
+          for (let i = 0; i < res.result.length; i++) {
+            let temp = res.result[i]
+            that.treeData.push(temp)
+          }
+        }
+      })
+    },
     getAvatarView: function (avatar) {
       return this.url.imgerver + '/' + avatar
     },

+ 8 - 5
src/views/system/modules/DepartModal.vue

@@ -30,13 +30,13 @@
           >
           </a-tree-select>
         </a-form-item>
-        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="汇报上级">
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="部门领导">
           <a-select
             showSearch
             :filterOption="filterOption"
             style="width: 100%"
-            placeholder="请选择汇报上级"
-            v-decorator="['leader', { rules: [{ required: true, message: '汇报上级必选' }] }]"
+            placeholder="请选择部门领导"
+            v-decorator="['leader', { rules: [{ required: true, message: '部门领导必选' }] }]"
             labelInValue
           >
             <a-select-option v-for="(people, peopleindex) in peopleList" :key="peopleindex" :value="people.key">
@@ -67,7 +67,7 @@
           <a-input placeholder="请输入地址" v-decorator="['address', {}]" />
         </a-form-item>
         <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="排序">
-          <a-input-number v-decorator="['departOrder', { initialValue: 0 }]" />
+          <a-input-number :min="0" v-decorator="['departOrder', { initialValue: 0 }]" />
         </a-form-item>
         <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="备注">
           <a-textarea placeholder="请输入备注" v-decorator="['memo', {}]" />
@@ -124,6 +124,9 @@ export default {
   },
   created() {},
   methods: {
+    filterOption(input, option) {
+      return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+    },
     getAllPeople() {
       this.getAction('/sys/user/getAllUser',{status:1}).then((res) => {
         if (res.success) {
@@ -171,7 +174,7 @@ export default {
       if(record.leaderId){
         this.model.leader = {key:record.leaderId,label:record.leaderName}
       }else{
-        this.model.leader = {}
+        this.model.leader = undefined
       }
       this.$nextTick(() => {
         this.form.setFieldsValue(

+ 12 - 8
src/views/system/modules/UserModal.vue

@@ -21,12 +21,12 @@
       <a-form :form="form">
         <a-form-item label="用户账号" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <!-- :readOnly="!!model.id" -->
-          <a-input placeholder="请输入用户账号" v-decorator="['username', validatorRules.username]" />
+          <a-input placeholder="请输入用户账号" v-decorator="['username', validatorRules.username]" :disabled="disableSubmit"/>
         </a-form-item>
 
         <template v-if="!model.id">
           <a-form-item label="登陆密码" :labelCol="labelCol" :wrapperCol="wrapperCol">
-            <a-input type="password" placeholder="请输入登陆密码" v-decorator="['password', validatorRules.password]" />
+            <a-input type="password" placeholder="请输入登陆密码" v-decorator="['password', validatorRules.password]" :disabled="disableSubmit"/>
           </a-form-item>
 
           <a-form-item label="确认密码" :labelCol="labelCol" :wrapperCol="wrapperCol">
@@ -35,20 +35,21 @@
               @blur="handleConfirmBlur"
               placeholder="请重新输入登陆密码"
               v-decorator="['confirmpassword', validatorRules.confirmpassword]"
+              :disabled="disableSubmit"
             />
           </a-form-item>
         </template>
 
         <a-form-item label="用户名字" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-input placeholder="请输入用户名称" v-decorator="['realname', validatorRules.realname]" />
+          <a-input placeholder="请输入用户名称" v-decorator="['realname', validatorRules.realname]" :disabled="disableSubmit"/>
         </a-form-item>
 
         <a-form-item label="邮箱" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-input placeholder="请输入邮箱" v-decorator="['email', validatorRules.email]" />
+          <a-input placeholder="请输入邮箱" v-decorator="['email', validatorRules.email]" :disabled="disableSubmit"/>
         </a-form-item>
 
         <a-form-item label="角色分配" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!roleDisabled">
-          <a-select style="width: 100%" placeholder="请选择用户角色" v-model="selectedRole">
+          <a-select style="width: 100%" placeholder="请选择用户角色" v-model="selectedRole" :disabled="disableSubmit">
             <a-select-option v-for="(role, roleindex) in roleList" :key="roleindex.toString()" :value="role.id">
               {{ role.roleName }}
             </a-select-option>
@@ -70,6 +71,7 @@
             :headers="headers"
             :beforeUpload="beforeUpload"
             @change="handleChange"
+            :disabled="disableSubmit"
           >
             <img v-if="picUrl" :src="getAvatarView()" alt="头像" style="height: 104px; max-width: 300px" />
             <div v-else>
@@ -80,6 +82,7 @@
         </a-form-item>
         <a-form-item label="汇报上级" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <a-select
+            :disabled="disableSubmit"
             showSearch
             :filterOption="filterOption"
             style="width: 100%"
@@ -101,7 +104,7 @@
         </a-form-item> -->
 
         <a-form-item label="性别" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-select v-decorator="['sex', {}]" placeholder="请选择性别">
+          <a-select v-decorator="['sex', {}]" placeholder="请选择性别" :disabled="disableSubmit">
             <a-select-option :value="1">男</a-select-option>
             <a-select-option :value="2">女</a-select-option>
           </a-select>
@@ -110,13 +113,14 @@
         <a-form-item label="手机号码" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <a-input
             placeholder="请输入手机号码"
-            :disabled="isDisabledAuth('user:form:phone')"
+            :disabled="disableSubmit||isDisabledAuth('user:form:phone')"
             v-decorator="['phone', validatorRules.phone]"
           />
         </a-form-item>
 
         <a-form-item label="工作流引擎" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <j-dict-select-tag
+            :disabled="disableSubmit"
             v-decorator="['activitiSync', {}]"
             placeholder="请选择是否同步工作流引擎"
             :type="'radio'"
@@ -327,7 +331,7 @@ export default {
       if (record.leaderId) {
         record.leader = {key:record.leaderId,label:record.leaderName}
       }else{
-        record.leader = {}
+        record.leader = undefined
       }
       that.userId = record.id
       that.visible = true

+ 2 - 2
vue.config.js

@@ -80,13 +80,13 @@ module.exports = {
         // 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后台项目
         // target: 'http://192.168.1.251/', //请求本地 需要jeecg-boot后台项目
         // target:'http://118.24.244.213:8804',
-       target:'http://139.186.151.174:8804', //测试
+      //  target:'http://139.186.151.174:8804', //测试
 
         ws: false,