diff --git a/src/views/components/dialog/index.vue b/src/views/components/dialog/index.vue index 95752a4..07f25dd 100644 --- a/src/views/components/dialog/index.vue +++ b/src/views/components/dialog/index.vue @@ -315,7 +315,7 @@ export default { options: [], // optionstwo:[], props: { - value: "county", + value: "subdistrict", label: "institutionName", checkStrictly: true, }, @@ -851,8 +851,8 @@ export default { this.listOne.map((item) => { if (item.institutionName == dept.deptName) { // console.log(item.county) - this.form.subdistrict = item.county; - this.workingArea = item.county; + this.form.subdistrict = item.subdistrict; + this.workingArea = item.subdistrict; this.county = true; // delete item.children } @@ -863,7 +863,7 @@ export default { item.children.map((itemTwo) => { if (itemTwo.institutionName == dept.deptName) { this.form.subdistrict = itemTwo.subdistrict; - this.workingArea = itemTwo.county; + this.workingArea = itemTwo.subdistrict; this.county = false; } }); diff --git a/src/views/components/firmDialog/index.vue b/src/views/components/firmDialog/index.vue index 84e2211..e7f22f0 100644 --- a/src/views/components/firmDialog/index.vue +++ b/src/views/components/firmDialog/index.vue @@ -23,6 +23,14 @@ :label="value" v-for="(key, value) in elDesLabels" :key="key" + :span=" + key == 'majorProduct' || + key == 'businessScope' || + key == 'subdistrict' || + key == 'rigisterAddress' + ? 2 + : 1 + " > {{ infoData[key] }} @@ -34,6 +42,7 @@ - - \ No newline at end of file diff --git a/src/views/yingji/enterprise.vue b/src/views/yingji/enterprise.vue index f2b5e28..1835300 100644 --- a/src/views/yingji/enterprise.vue +++ b/src/views/yingji/enterprise.vue @@ -163,6 +163,14 @@ :label="value" v-for="(key, value) in elDesLabels" :key="key" + :span=" + key == 'majorProduct' || + key == 'businessScope' || + key == 'subdistrict' || + key == 'rigisterAddress' + ? 2 + : 1 + " > {{ infoData[key] }} @@ -211,8 +219,12 @@ export default { 企业类型: "zjEconKind", 生产经营地址: "businessAddress", 行业监管大类: "supervisionLarge", + "所在乡镇(街道)": "subdistrict", + 注册地址: "rigisterAddress", + 主营业务及产品: "majorProduct", + 经营范围: "businessScope", 登记状态: "corpStatus", - 行政区划: "county", + // 行政区划: "county", 办公地址: "enterpriseAddress", 企业规模: "enterpristScale", 固定资产: "fixedAssets", @@ -223,24 +235,20 @@ export default { 法人职务: "legalPersonPost", 法人固定电话: "legalPersonTel", 法人类型: "legalPersonType", - 主营业务及产品: "majorProduct", 机构编码: "orgCode", 其他名称: "otherName", 登记时间: "registerTime", 登记机关: "registrationOrg", - 注册地址: "rigisterAddress", 注册资金: "rigisterFund", 是否上报风险报告: "riskReport", 安全生产投入占比: "safetyProductionInvestment", 申请人: "sqr", 申请人联系方式: "sqrlxfs", 成立时间: "startTime", - "所在乡镇(街道)": "subdistrict", 有效期起: "termStart", 有效期止: "termEnd", 创建时间: "createTime", 修改时间: "updateTime", - 经营范围: "businessScope", 备注: "remark", // 工艺流程内容: "htmlText", // :"updateBy", @@ -268,7 +276,6 @@ export default { }, addShow: false, details: null, - //== subdistrict: [], infoData: {}, }; @@ -350,22 +357,29 @@ export default { this.addShow = false; }, look(e) { + localStorage.setItem("enterInfo", JSON.stringify(e)); + let infoObj = JSON.parse(localStorage.getItem("enterInfo")); // 查看弹窗 this.addShow = true; - e["aboveDesignated"] = e.aboveDesignated == 1 ? "规上" : "规下"; - e["riskReport"] = e.riskReport == 1 ? "是" : "否"; - e["aboveDesignatedTwo"] = - e.aboveDesignatedTwo == 1 + infoObj["aboveDesignated"] = + infoObj.aboveDesignated == 1 ? "规上" : "规下"; + infoObj["riskReport"] = infoObj.riskReport == 1 ? "是" : "否"; + infoObj["aboveDesignatedTwo"] = + infoObj.aboveDesignatedTwo == 1 ? "大型" - : e.aboveDesignatedTwo == 2 + : infoObj.aboveDesignatedTwo == 2 ? "中型" - : e.aboveDesignatedTwo == 3 + : infoObj.aboveDesignatedTwo == 3 ? "小型" - : e.aboveDesignatedTwo == 4 + : infoObj.aboveDesignatedTwo == 4 ? "微型" : ""; - e["supervisionLarge"] = this.supervisionLarge(e.supervisionLarge); - this.infoData = e; + infoObj["supervisionLarge"] = this.supervisionLarge( + infoObj.supervisionLarge + ); + infoObj["subdistrict"] = + this.componendDistrict(infoObj.subdistrict) || "/"; + this.infoData = infoObj; }, quhua(e) { this.form.subdistrict = e; diff --git a/src/views/yingji/planManage.vue b/src/views/yingji/planManage.vue index 3701e10..33cb1aa 100644 --- a/src/views/yingji/planManage.vue +++ b/src/views/yingji/planManage.vue @@ -3,130 +3,132 @@ * @version: * @Author: JC9527 * @Date: 2023-09-04 10:20:06 - * @LastEditors: JC9527 - * @LastEditTime: 2023-10-11 10:28:00 + * @LastEditors: 张涛 + * @LastEditTime: 2023-10-20 09:25:30 -->