From b8e56a7c55cebb5f40867d2893189963fcdbe20f Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期四, 03 七月 2025 15:34:49 +0800
Subject: [PATCH] 1、删除用户管理冗余字段 2、区分MDC和设备管理部门及设备分配
---
src/views/system/modules/UserModal.vue | 191 ++++++++++++++++-------------------------------
1 files changed, 67 insertions(+), 124 deletions(-)
diff --git a/src/views/system/modules/UserModal.vue b/src/views/system/modules/UserModal.vue
index 05b0da8..0bb2e81 100644
--- a/src/views/system/modules/UserModal.vue
+++ b/src/views/system/modules/UserModal.vue
@@ -41,6 +41,7 @@
placeholder="璇疯緭鍏ョ敤鎴疯处鍙�"
v-model="model.username"
:readOnly="!!model.id"
+ autocomplete="off"
/>
</a-form-model-item>
@@ -55,6 +56,7 @@
type="password"
placeholder="璇疯緭鍏ョ櫥褰曞瘑鐮�"
v-model="model.password"
+ autocomplete="off"
/>
</a-form-model-item>
@@ -97,10 +99,6 @@
/>
</a-form-model-item>
- <!--<a-form-model-item label="鑱屽姟" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
- <!--<j-select-position placeholder="璇烽�夋嫨鑱屽姟" :multiple="false" v-model="model.post"/>-->
- <!--</a-form-model-item>-->
-
<a-form-model-item
label="瑙掕壊鍒嗛厤"
:labelCol="labelCol"
@@ -114,6 +112,23 @@
placeholder="璇烽�夋嫨瑙掕壊"
>
</j-multi-select-tag>
+ </a-form-model-item>
+
+ <a-form-model-item
+ label="棣栭〉鏉冮檺"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ >
+ <a-radio-group
+ v-model="model.userType"
+ :defaultValue="0"
+ >
+ <a-radio :value="4">鍏徃绾�</a-radio>
+ <a-radio :value="3">杞﹂棿绾�</a-radio>
+ <a-radio :value="2">宸ユ绾�</a-radio>
+ <a-radio :value="1">鎿嶄綔宸�</a-radio>
+ <a-radio :value="0">鏃�</a-radio>
+ </a-radio-group>
</a-form-model-item>
<!--閮ㄩ棬鍒嗛厤-->
@@ -134,9 +149,9 @@
</j-select-depart>
</a-form-model-item>
- <!--杞﹂棿鍒嗛厤-->
+ <!--MDC杞﹂棿鍒嗛厤-->
<a-form-model-item
- label="杞﹂棿鍒嗛厤"
+ label="MDC杞﹂棿鍒嗛厤"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
v-show="!productionDisabled"
@@ -151,41 +166,53 @@
</a-form-model-item>
<a-form-model-item
- label="閫夋嫨璁惧"
+ label="MDC璁惧鍒嗛厤"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
v-show="!productionDisabled"
>
- <a-input-search :readOnly="true" v-model="model.equipmentIds" @search="deviceSearch" enter-button
- placeholder="璇烽�夋嫨璁惧" :disabled="!model.selectedProduction"/>
+ <a-input-search
+ :readOnly="true"
+ v-model="model.equipmentIds"
+ @search="deviceSearch"
+ enter-button
+ placeholder="璇烽�夋嫨璁惧"
+ :disabled="!model.selectedProduction"
+ />
</a-form-model-item>
<a-form-model-item
- label="鐝粍鍒嗛厤"
- :labelCol="labelCol"
- :wrapperCol="wrapperCol"
- prop="teamId"
- >
- <j-dict-select-tag
- v-model="model.teamId"
- :triggerChange="true"
- dictCode="mom_base_team,name,id,del_flag = 0"
- placeholder="璇风淮鎶ょ彮缁�"
- ></j-dict-select-tag>
- </a-form-model-item>
- <a-form-model-item
- label="涓績鍒嗛厤"
+ label="EAM涓績鍒嗛厤"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
prop="areaId"
>
- <j-dict-select-tag
- v-model="model.areaId"
+ <j-multi-select-tag
:triggerChange="true"
- dictCode="mom_base_area,name,id,del_flag = 0"
+ v-model="model.eamFactoryIds"
+ dictCode="mom_base_area,name,id,del_flag = 0 and type = 1"
placeholder="璇风淮鎶や腑蹇�"
- ></j-dict-select-tag>
+ >
+ </j-multi-select-tag>
</a-form-model-item>
+
+ <a-form-model-item
+ label="EAM璁惧鍒嗛厤"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ v-show="!productionDisabled"
+ >
+ <a-input-search
+ :readOnly="true"
+ v-model="model.eamEquipmentIds"
+ @search="deviceSearch"
+ enter-button
+ placeholder="璇烽�夋嫨璁惧"
+ :disabled="!model.selectedProduction"
+ />
+ </a-form-model-item>
+
+
<a-form-model-item
label="璐熻矗閮ㄩ棬"
:labelCol="labelCol"
@@ -200,88 +227,6 @@
>
</j-multi-select-tag>
</a-form-model-item>
-
- <a-form-model-item
- label="澶村儚"
- :labelCol="labelCol"
- :wrapperCol="wrapperCol"
- >
- <j-image-upload
- class="avatar-uploader"
- text="涓婁紶"
- v-model="model.avatar"
- ></j-image-upload>
- </a-form-model-item>
-
- <a-form-model-item
- label="鐢熸棩"
- :labelCol="labelCol"
- :wrapperCol="wrapperCol"
- >
- <a-date-picker
- style="width: 100%"
- placeholder="璇烽�夋嫨鐢熸棩"
- v-model="model.birthday"
- :format="dateFormat"
- :getCalendarContainer="node => node.parentNode"
- />
- </a-form-model-item>
-
- <a-form-model-item
- label="鎬у埆"
- :labelCol="labelCol"
- :wrapperCol="wrapperCol"
- >
- <a-select
- v-model="model.sex"
- placeholder="璇烽�夋嫨鎬у埆"
- :getPopupContainer="(target) => target.parentNode"
- >
- <a-select-option :value="1">鐢�</a-select-option>
- <a-select-option :value="2">濂�</a-select-option>
- </a-select>
- </a-form-model-item>
-
- <a-form-model-item
- label="閭"
- :labelCol="labelCol"
- :wrapperCol="wrapperCol"
- prop="email"
- >
- <a-input
- placeholder="璇疯緭鍏ラ偖绠�"
- v-model="model.email"
- />
- </a-form-model-item>
-
- <a-form-model-item
- label="鎵嬫満鍙风爜"
- :labelCol="labelCol"
- :wrapperCol="wrapperCol"
- prop="phone"
- >
- <a-input
- placeholder="璇疯緭鍏ユ墜鏈哄彿鐮�"
- v-model="model.phone"
- />
- </a-form-model-item>
-
- <a-form-model-item
- label="搴ф満"
- :labelCol="labelCol"
- :wrapperCol="wrapperCol"
- prop="telephone"
- >
- <a-input
- placeholder="璇疯緭鍏ュ骇鏈�"
- v-model="model.telephone"
- />
- </a-form-model-item>
-
- <!--<a-form-model-item label="宸ヤ綔娴佸紩鎿�" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
- <!--<j-dict-select-tag v-model="model.activitiSync" placeholder="璇烽�夋嫨鏄惁鍚屾宸ヤ綔娴佸紩鎿�" :type="'radio'" dictCode="activiti_sync"/>-->
- <!--</a-form-model-item>-->
-
</a-form-model>
</a-spin>
@@ -305,7 +250,11 @@
</a-button>
</div>
- <select-device-modal ref="selectDeviceModal" @selectFinished="selectOK" :title="'閫夋嫨璁惧'"/>
+ <select-device-modal
+ ref="selectDeviceModal"
+ @selectFinished="selectOK"
+ :title="'閫夋嫨璁惧'"
+ />
</a-drawer>
</template>
@@ -359,7 +308,6 @@
{ validator: this.validateWorkNo }],
telephone: [{ pattern: /^0\d{2,3}-[1-9]\d{6,7}$/, message: '璇疯緭鍏ユ纭殑搴ф満鍙风爜' }],
teamId: [{ required: false, message: '璇风淮鎶ょ彮缁�' }]
-
},
departIdShow: false,
title: '鎿嶄綔',
@@ -403,9 +351,13 @@
},
'model.selectedProduction': {
handler(newVal, oldVal) {
- console.log('瑙﹀彂鐩戝惉', 'newVal=', newVal, 'oldVal=', oldVal)
- // if ((newVal !== oldVal && oldVal) || !newVal) this.model.equipmentIds = ''
- if (newVal && this.$refs.selectDeviceModal) this.$refs.selectDeviceModal.queryTreeData(newVal)
+ if (newVal && this.$refs.selectDeviceModal) {
+ // 濡傛灉杞﹂棿閫夋嫨鍓嶅悗涓嶄竴鑷村垯閲嶇疆閫夋嫨璁惧
+ if ((oldVal && newVal !== oldVal)) this.model.equipmentIds = ''
+ this.$refs.selectDeviceModal.queryTreeData(newVal)
+ }
+ // 濡傛灉娓呯┖杞﹂棿鍊煎垯閲嶇疆閫夋嫨璁惧
+ if (newVal === '') this.model.equipmentIds = ''
}
}
},
@@ -441,6 +393,7 @@
this.refresh()
this.edit({
activitiSync: '1',
+ userType: 0,
userIdentity: 1,
selectedroles: '',
selecteddeparts: '',
@@ -466,7 +419,6 @@
that.getUserRoles(record.id)
that.getUserDeparts(record.id)
}
- console.log('that.model', that.model)
},
isDisabledAuth(code) {
return disabledAuthFilter(code)
@@ -497,7 +449,6 @@
let c = { label: item.name, value: item.id + '' }
return c
})
- console.log('this.tenantsOptions: ', this.tenantsOptions)
}
})
},
@@ -509,16 +460,13 @@
let c = { label: item.roleName, value: item.id }
return c
})
- console.log('this.rolesOptions: ', this.rolesOptions)
}
})
},
getUserRoles(userid) {
queryUserRole({ userid: userid }).then((res) => {
if (res.success) {
- // this.model.selectedroles = res.result.join(',')
this.$set(this.model, 'selectedroles', res.result.join(','))
- console.log('that.model.selectedroles=', this.model.selectedroles)
}
})
},
@@ -538,11 +486,8 @@
})
}
- // that.model.selecteddeparts = selectDepartKeys.join(',')
this.$set(this.model, 'selecteddeparts', selectDepartKeys.join(','))
-
that.nextDepartOptions = departOptions
- console.log('that.nextDepartOptions=', that.nextDepartOptions)
}
})
@@ -560,10 +505,8 @@
})
}
- // that.model.selectedProduction = selectProductKeys.join(',')
this.$set(this.model, 'selectedProduction', selectProductKeys.join(','))
that.nextProductionOptions = ProductionOptions
- console.log('that.nextProductionOptions=', that.nextProductionOptions)
}
})
//杞﹂棿鐨剈rl
--
Gitblit v1.9.3