diff --git a/src/assets/style/common.scss b/src/assets/style/common.scss index 7d9fe78..80ddec1 100644 --- a/src/assets/style/common.scss +++ b/src/assets/style/common.scss @@ -64,3 +64,18 @@ a { } +.form-item { + display: flex; + justify-content: flex-start; + align-items: center; + flex-direction: row; + color: #C0C4CC; + line-height: 30px; + .label { + color: #000; + &.w-100 { + width: 100px; + } + } +} + diff --git a/src/components/CompanyForm/index.vue b/src/components/CompanyForm/index.vue index 78200df..962b2a4 100644 --- a/src/components/CompanyForm/index.vue +++ b/src/components/CompanyForm/index.vue @@ -58,13 +58,6 @@ - - - - - - diff --git a/src/components/InfoEditRecord/index.vue b/src/components/InfoEditRecord/index.vue index 7ed386f..29362c8 100644 --- a/src/components/InfoEditRecord/index.vue +++ b/src/components/InfoEditRecord/index.vue @@ -27,97 +27,27 @@ v-loading="infoForm_loading" > - - - - - - - - - - - - - - - 企业归属:{{ companyInfo.areaName || "--" }} - - - 联系人:{{ companyInfo.contactUser || "--" }} - - - 公司地址:{{ companyInfo.address || "--" }} - - - - - 社会信用代码:{{ companyInfo.socialCreditAgency || "--" }} - - - 联系电话:{{ companyInfo.contactPhone || "--" }} - - - - - + - - {{ v.FullName }} - + - - - - - - - - @@ -125,8 +55,7 @@ @@ -134,8 +63,7 @@ @@ -143,8 +71,7 @@ @@ -152,8 +79,7 @@ @@ -161,8 +87,7 @@ @@ -170,8 +95,7 @@ @@ -179,8 +103,7 @@ @@ -188,8 +111,7 @@ @@ -212,29 +134,52 @@ - + - - {{ v.fullName }} - + + + + + + + + + + + 企业归属:{{ companyInfo.areaName || "--" }} + + + 联系人:{{ companyInfo.contactUser || "--" }} + + + 公司地址:{{ companyInfo.address || "--" }} + + + + + 社会信用代码:{{ companyInfo.socialCreditAgency || "--" }} + + + 联系电话:{{ companyInfo.contactPhone || "--" }} + + + + 修改记录: - + 更新 - 将“{{ item.PropertyName }}”从“{{ item.OldValue }}”改为“{{ - item.NewValue - }}” + 将“{{ item.PropertyName }}”从“{{ + item.OldValue + }}”改为“{{ item.NewValue }}” @@ -310,39 +255,9 @@ export default { officeAddress: "", systemIcon: "", areaId: "", + systemClassName: '', }, - infoRules: { - systemName: { - required: true, - message: "请输入系统名称", - trigger: "blur", - }, - systemClass: { - required: true, - message: "请输入系统分类", - trigger: "change", - }, - systemType: { - required: true, - message: "请输入系统类型", - trigger: "change", - }, - companyId: { - required: true, - message: "请输入主体企业", - trigger: "change", - }, - areaId: { - required: true, - message: "请输入所属区县", - trigger: "change", - }, - pincipalPhone: { - pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, - message: "请输入正确的手机号码", - trigger: "blur", - }, - }, + infoRules: {}, value: "", companyOptions: [], listQuery_company: { @@ -378,6 +293,7 @@ export default { async companyChange(val) { // 公司信息 let { data } = await getCompanyInfoById(val); + this.infoForm.companyName = data.companyName; this.companyInfo = data; this.isShowCompanyInfo = true; }, @@ -436,10 +352,15 @@ export default { }, async initForm() { let { data } = await getSystemDetail(this.systemId); + data.systemTypeName = this.systemTypeOptions.find(v => v.Id == data.systemType).FullName; + data.areaName = this.areaOptions.find(v => v.id == data.areaId).fullName; this.infoForm = data; this.initSystemClassList(data.systemType); await this.companyChange(data.companyId); - this.$forceUpdate(); + this.$nextTick(() => { + this.infoForm.systemClassName = this.systemClassOptions.find(v => v.Id == this.infoForm.systemClass).ClassName; + this.$forceUpdate(); + }) }, }, }; diff --git a/src/components/InfoForm/index.vue b/src/components/InfoForm/index.vue index 3b0a758..a336adb 100644 --- a/src/components/InfoForm/index.vue +++ b/src/components/InfoForm/index.vue @@ -23,7 +23,7 @@ v-loading="infoForm_loading" label-width="100px" > - + @@ -113,15 +113,6 @@ - - - - -
- 将“{{ item.PropertyName }}”从“{{ item.OldValue }}”改为“{{ - item.NewValue - }}” + 将“{{ item.PropertyName }}”从“{{ + item.OldValue + }}”改为“{{ item.NewValue }}”