Преглед на файлове

上线 修改 账户配置

jiayufei преди 4 години
родител
ревизия
0362d0fff3

Файловите разлики са ограничени, защото са твърде много
+ 1098 - 1099
src/views/modules/account-config/components/configuration-modal.vue


+ 12 - 0
src/views/modules/account-config/components/tree-select/tree-select.vue

@@ -68,6 +68,18 @@ export default {
         };
     },
     watch: {
+        editdata(newVal) {
+            if (newVal.length) {
+                this.checkedValue = [...newVal];
+                const rightSelectList = [];
+                this.updateTreeData.forEach(item => {
+                    if (newVal.includes(item.value)) {
+                        rightSelectList.push(item);
+                    }
+                });
+                this.applyTypeOption = rightSelectList;
+            }
+        },
         defaultlist(newVal) {
             if (newVal.length) {
                 this.changeCheckData = this.defaultlist;

+ 34 - 0
src/views/modules/advertiser/ProjectMemberList.vue

@@ -168,6 +168,20 @@
             <span style="color:red;" v-if="loginType == 'bytedance'">*重要:如存在一户多开情况,请勾选所有子账号进行授权!!!</span>
           </a-form-item>
           <a-form-item
+            label="授权时间:"
+            :label-col="{ xs: { span: 24 }, sm: { span: 5 } }"
+            :wrapper-col="{ xs: { span: 24 }, sm: { span: 16 } }"
+          >
+            <a-date-picker 
+				v-model="dateValue"
+				style="width: 180px;"
+				:allowClear="false"
+				format="YYYY-MM-DD"
+				:disabled-date="disabledDate"
+				@change="handleCostTimeChange" 
+			/>
+          </a-form-item>
+          <a-form-item
             label="开户代理商:"
             :label-col="{ xs: { span: 24 }, sm: { span: 5 } }"
             :wrapper-col="{ xs: { span: 24 }, sm: { span: 16 } }"
@@ -305,6 +319,7 @@
 </template>
 
 <script>
+import moment from 'moment';
 import { httpAction, getAction, deleteAction, putAction } from '@/api/manage'
 
 import { mapGetters } from 'vuex'
@@ -424,6 +439,8 @@ export default {
   mixins: [JeecgListMixin],
   data() {
     return {
+		moment,
+		dateValue: '',
       authConfigList:[],
       title: '',
       titleAccount: '',
@@ -606,6 +623,22 @@ export default {
   },
   methods: {
     //   /ctop/userAllocation/getAccountsByProjectId    projectId  userId
+	handleCostTimeChange(date, dateString) {
+		console.log(dateString, 'dateString');
+		this.dateValue = dateString;
+	},
+	disabledDate(current) {
+		if (this.loginType == 'kuaishou') {
+			return current && !(current > moment().subtract(7, 'days'));
+		}
+		else if (this.loginType == 'bytedance') {
+			return false;
+		}
+		// TODO 时间限制格式
+		// return current && !(current > moment().subtract(7, 'days'));
+		// return current && !(current > (moment().subtract(7, 'days')) && current < moment());
+		// return false;
+	},
     projectLook(item) {
       var params = {}
       params.projectId = item.id
@@ -805,6 +838,7 @@ export default {
       params.projectId = this.record.projectId
       params.projectName = this.record.projectName
       params.systemType = this.systemType == '4' ? this.systemTypeName : this.systemType
+	  params.authBeginTime = this.dateValue;
       
       // 触发表单验证
       this.form.validateFields((err, values) => {

+ 0 - 1
src/views/modules/headline-view/headline-view.vue

@@ -1150,7 +1150,6 @@ export default {
                         });
                         let option = isType + '<br/>';
                         for (let i = 0, length = params.length; i < length; i++) {
-                            console.log(params[i], 'params[i]--params[i]');
                             const showTime = specialIdentification === '时' ? params[i].seriesName : '';
                             option += `<span style="width:8px;height:8px;border-radius:50%;background:${params[i].color};display:inline-block;position:relative;top:-2px;margin-right:5px"></span>${showTime} ${params[i].axisValue}${specialIdentification} ${params[i].data}${showBai}<br />`;
                         }

+ 1 - 1
src/views/modules/user-manage-operation/user-manage-operation.vue

@@ -89,7 +89,6 @@
 			</span>
 		</a-table>
 		<a-pagination
-			v-if="userInfo().realname === '管理员'"
 			class="pagin-table-class"
 			:total="totalAll"
 			:show-total="total => `共 ${totalAll} 条`"
@@ -255,6 +254,7 @@ export default {
             });
         },
 		onShowSizeChange(current, pageSize) {
+			console.log(current, pageSize, 'current, pageSize');
             this.tablePag = {
                 page: current,
                 size: pageSize

+ 3 - 2
src/views/system/modules/UserModal.vue

@@ -113,7 +113,7 @@
         <a-form-item label="手机号码" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <a-input
             placeholder="请输入手机号码"
-            :disabled="disableSubmit||isDisabledAuth('user:form:phone')"
+            :disabled="disableSubmit"
             v-decorator="['phone', validatorRules.phone]"
           />
         </a-form-item>
@@ -388,7 +388,6 @@ export default {
       // 触发表单验证
       this.form.validateFields((err, values) => {
         if (!err) {
-          
           let avatar = that.model.avatar
           if (!values.birthday) {
             values.birthday = ''
@@ -398,6 +397,8 @@ export default {
           let formData = Object.assign(this.model, values)
           formData.avatar = avatar
           formData.selectedroles = this.selectedRole ? this.selectedRole : ''
+          formData.roleName = this.selectedRole ? this.roleList.filter(item => item.id === this.selectedRole)[0].roleName : '';
+          formData.departName = this.checkedDepartNameString;
           formData.selecteddeparts =
             this.userDepartModel.departIdList.length > 0 ? this.userDepartModel.departIdList.join(',') : ''
           formData.leaderId = values.leader.key