朱鑫波 %!s(int64=4) %!d(string=hai) anos
pai
achega
7e1b80f0ee

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

+ 3 - 4
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>

+ 11 - 7
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>
@@ -97,11 +97,11 @@
                   :filterOption="filterOption"
                   style="width: 100%"
                   placeholder="请选择部门领导"
-                   v-decorator="['leader', { rules: [{ required: true, message: '部门领导必选' }] }]"
+                  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"
@@ -294,6 +294,9 @@
       }
     },
     methods: {
+      getData(className) {
+        return this.form.getFieldValue(className)
+      },
       filterOption(input, option) {
         return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
       },
@@ -303,6 +306,7 @@
             this.peopleList = res.result.map((item) => {
               return { key: item.userId, label: item.realName }
             })
+            console.log(res,this.peopleList)
           }
         })
       },
@@ -495,10 +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
+            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) {

+ 1 - 1
src/views/system/modules/DepartModal.vue

@@ -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', {}]" />

+ 4 - 3
vue.config.js

@@ -68,7 +68,8 @@ module.exports = {
     open : true,
     proxy: {
       '/jeecg-boot': {
-        //  target: 'http://192.168.1.8:8080', //请求本地 需要jeecg-boot后台项目  蒙蒙
+          // target: 'http://192.168.1.8:8080', //请求本地 需要jeecg-boot后台项目  蒙蒙
+          // target: 'http://192.168.1.8:8081', //请求本地 需要jeecg-boot后台项目  蒙蒙
         // target: 'http://192.168.0.59:8088', //请求本地 需要jeecg-boot后台项目  英豪
         // target: 'http://192.168.1.188:8088', //请求本地 需要jeecg-boot后台项目  英豪
         // target: 'http://192.168.2.115:8080', //请求本地 需要jeecg-boot后台项目  祚云
@@ -79,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,