diff --git a/examples/main.js b/examples/main.js index d6925b0f..7dfe09af 100644 --- a/examples/main.js +++ b/examples/main.js @@ -17,8 +17,17 @@ Vue.use(vcUI); Vue.config.productionTip = false; Object.keys(utils).map((e) => (Vue.prototype[e] = utils[e])); Vue.prototype.$request = axios -new Vue({ +const app = new Vue({ router, store, - render: (h) => h(App) -}).$mount('#app'); + render: h => h(App) +}); +let theme = null +store.dispatch('getSystem').then(({colorScheme}) => { + theme = JSON.parse(colorScheme || null) + Vue.prototype.$theme = theme?.web || "blue" + return import(`dvcp-ui/lib/styles/theme.${theme?.web}.scss`).catch(() => 0) +}).finally(() => { + !theme ? app.$mount('#app') : import(`dvcp-ui/lib/styles/common.scss`).finally(() => app.$mount('#app')) +}) + diff --git a/packages/core/AppQyWxConfig/list.vue b/packages/core/AppQyWxConfig/list.vue index 1655ae0b..14b8e58c 100644 --- a/packages/core/AppQyWxConfig/list.vue +++ b/packages/core/AppQyWxConfig/list.vue @@ -162,6 +162,10 @@ + + + + diff --git a/packages/meta/AppResident/AppResidentTags.vue b/packages/meta/AppResident/AppResidentTags.vue index 34d6c73b..150858a6 100644 --- a/packages/meta/AppResident/AppResidentTags.vue +++ b/packages/meta/AppResident/AppResidentTags.vue @@ -49,7 +49,7 @@ export default { permissions: Function }, computed: { - ...mapState(['user']), + ...mapState(['user', 'sys']), rules() { return { labelName: [{required: true, message: "请输入标签"}], @@ -57,7 +57,12 @@ export default { }, dialogTitle() { return `${this.form.id ? "编辑" : "添加"}标签` - } + }, + colConfigs: v => [{type: "selection"}, + {label: "标签信息", prop: "labelName"}, + {label: "创建时间", prop: "createTime", align: '120px'}, + {label: "创建人", prop: "createUserName", align: 'center', openType: v.sys.info?.edition == "saas" ? "userName" : null}, + {slot: "options"}] }, data() { return { @@ -66,13 +71,6 @@ export default { tableData: [], search: {name: "", ids: ""}, form: {}, - colConfigs: [ - {type: "selection"}, - {label: "标签信息", prop: "labelName"}, - {label: "创建时间", prop: "createTime", align: '120px'}, - {label: "创建人", prop: "createUserName", align: 'center'}, - {slot: "options"} - ] } }, methods: { diff --git a/packages/wxwork/Announce/AppAnnounce/components/Add.vue b/packages/wxwork/Announce/AppAnnounce/components/Add.vue index b8d8cf0d..b759f63e 100644 --- a/packages/wxwork/Announce/AppAnnounce/components/Add.vue +++ b/packages/wxwork/Announce/AppAnnounce/components/Add.vue @@ -632,7 +632,8 @@ export default { examines: this.form.examines.length ? this.form.examines.map(v => { return { ...v, - examineUserId: v.id + examineUserId: v.id, + examineUserName: v.name } }) : [] }).then(res => { diff --git a/packages/wxwork/Announce/AppAnnounce/components/Detail.vue b/packages/wxwork/Announce/AppAnnounce/components/Detail.vue index c29062da..dfe924fd 100644 --- a/packages/wxwork/Announce/AppAnnounce/components/Detail.vue +++ b/packages/wxwork/Announce/AppAnnounce/components/Detail.vue @@ -33,7 +33,7 @@
- {{ item.name }} + {{ item.examineUserName }}
@@ -294,11 +294,11 @@ content: '', currIndex: 0, colConfigs3: [ - { prop: 'groupOwnerName', label: '群主', openType: 'userName' }, + { prop: 'groupOwnerName', label: '群主' }, { prop: 'groupNames', label: '群名称' } ], colConfigs1: [ - { slot: 'user', label: '成员', openType: 'userName' }, + { slot: 'user', label: '成员' }, { prop: 'groupCount', label: '预计送达居民群', align: 'center' } ], colConfigs2: [ diff --git a/project/sass/apps/AppSpecialDrug/components/Add.vue b/project/sass/apps/AppSpecialDrug/components/Add.vue index 00ba6ebf..19a5f571 100644 --- a/project/sass/apps/AppSpecialDrug/components/Add.vue +++ b/project/sass/apps/AppSpecialDrug/components/Add.vue @@ -135,6 +135,19 @@ export default { } } + var controlPhone = (rule, value, callback) => { + if (!value) { + callback() + } else { + const reg = /^[0-9]{3,11}$/ + if (reg.test(value)) { + callback() + } else { + return callback(new Error('请输入正确的电话号码')) + } + } + } + let IdNumberPass = (rule, value, callback) => { if (value) { if (this.idCardNoUtil.checkIdCardNo(value)) { @@ -253,7 +266,7 @@ export default { type: 'input', grid: 1, formDbName: 'controlPhone', - rules: { validator: regPhone, trigger: 'blur' } + rules: { validator: controlPhone, trigger: 'blur' } }, { label: '有无犯罪史', diff --git a/project/sass/apps/AppSpecialMental/components/Add.vue b/project/sass/apps/AppSpecialMental/components/Add.vue index 5e963aa6..af06e2f7 100644 --- a/project/sass/apps/AppSpecialMental/components/Add.vue +++ b/project/sass/apps/AppSpecialMental/components/Add.vue @@ -135,6 +135,19 @@ export default { } } + var controlPhone = (rule, value, callback) => { + if (!value) { + callback() + } else { + const reg = /^[0-9]{3,11}$/ + if (reg.test(value)) { + callback() + } else { + return callback(new Error('请输入正确的电话号码')) + } + } + } + let IdNumberPass = (rule, value, callback) => { if (value) { if (this.idCardNoUtil.checkIdCardNo(value)) { @@ -239,7 +252,7 @@ export default { type: 'input', grid: 1, formDbName: 'helpPhone', - rules: { validator: regPhone, trigger: 'blur' } + rules: { validator: controlPhone, trigger: 'blur' } }, { label: '目前危险等级', diff --git a/project/sass/apps/AppSpecialPrison/components/List.vue b/project/sass/apps/AppSpecialPrison/components/List.vue index 630d8f7b..b8c1f96a 100644 --- a/project/sass/apps/AppSpecialPrison/components/List.vue +++ b/project/sass/apps/AppSpecialPrison/components/List.vue @@ -65,8 +65,8 @@ { prop: 'name', label: '姓名' }, { prop: 'idNumber', align: 'center', label: '身份证号' }, { prop: 'gender', align: 'center', label: '性别' }, - { prop: 'birthday', align: 'center', label: '出生日期' }, - { prop: 'age', align: 'center', label: '年龄', }, + { prop: 'birthday', align: 'center', label: '出生日期' }, + { prop: 'age', align: 'center', label: '年龄', }, { prop: 'phone', align: 'center', label: '联系方式' } ], tableData: [], @@ -103,6 +103,7 @@ let info = this.idCardNoUtil.getIdCardInfo(v.idNumber) v.birthday = info.birthday v.age = this.$calcAge(v.idNumber) + v.gender = info.gender return v })