From 77190ea5cc644efededa7489085baa208f6b86da Mon Sep 17 00:00:00 2001
From: laozt <2721205210@qq.com>
Date: Mon, 25 Dec 2023 11:30:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E8=A1=A8=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/yingji/new.js           |  2 +-
 src/views/yingji/enterprise.vue | 85 +++++++++++++++++++--------------
 2 files changed, 51 insertions(+), 36 deletions(-)

diff --git a/src/api/yingji/new.js b/src/api/yingji/new.js
index a729d43..c6f9346 100644
--- a/src/api/yingji/new.js
+++ b/src/api/yingji/new.js
@@ -21,7 +21,7 @@ export function listGetNew(query) {
 // 查询企业新详细
 export function getNew(id) {
   return request({
-    url: '/system/new/' + id,
+    url: '/pharmaceuticals/new/' + id,
     method: 'get'
   })
 }
diff --git a/src/views/yingji/enterprise.vue b/src/views/yingji/enterprise.vue
index 62ae5f8..ae8f32d 100644
--- a/src/views/yingji/enterprise.vue
+++ b/src/views/yingji/enterprise.vue
@@ -192,16 +192,14 @@
                 :label="value"
                 v-for="(key, value) in elDesLabels"
                 :key="key"
-                :span="
-                  key == 'majorProduct' ||
-                  key == 'businessScope' ||
-                  key == 'subdistrict' ||
-                  key == 'rigisterAddress'
-                    ? 2
-                    : 1
-                "
+                :span="1"
               >
-                {{ infoData[key] || "/" }}
+                <dict-tag
+                  v-if="key == 'supervisionLarge'"
+                  :options="dict.type.category"
+                  :value="infoData[key]"
+                />
+                <span v-else>{{ infoData[key] || "/" }}</span>
               </el-descriptions-item>
             </el-descriptions>
           </div>
@@ -237,7 +235,7 @@ export default {
   ],
   data() {
     return {
-       options: [
+      options: [
         {
           value: "A",
           label: "A",
@@ -295,6 +293,15 @@ export default {
       // 表单校验
       rules: {},
       elDesLabels: {
+        企业名称: "enterpriseName",
+        统一社会信用代码: "enterpriseId",
+        "所在乡镇（街道）": "district",
+        行业监管大类: "supervisionLarge",
+        安全风险等级: "riskLevel",
+        标准化等级: "standLevel",
+        上次检查时间: "examineEndTime",
+      },
+      elDesLabels2: {
         企业名称: "enterpriseName",
         统一社会信用代码: "uuitNo",
         法定代表人: "legalPerson",
@@ -409,36 +416,44 @@ export default {
       this.addShow = false;
     },
     handleInfo(row) {
+      getNew(row.id).then((res) => {
+        this.addShow = true;
+        console.log(res);
+        let infoObj = res.data;
+        infoObj.district = this.componendDistrict(infoObj.district) || "/";
+        this.infoData = infoObj;
+      });
+      return;
       getByUuto(row.enterpriseId.trim()).then((res) => {
         //  console.log(res.data);
         let infoObj = res.data;
         // 查看弹窗
-        this.addShow = true;
-        infoObj["aboveDesignated"] =
-          infoObj.aboveDesignated == 1 ? "规上" : "规下";
-        infoObj["riskReport"] = infoObj.riskReport == 1 ? "是" : "否";
-        infoObj["aboveDesignatedTwo"] =
-          infoObj.aboveDesignatedTwo == 1
-            ? "大型"
-            : infoObj.aboveDesignatedTwo == 2
-            ? "中型"
-            : infoObj.aboveDesignatedTwo == 3
-            ? "小型"
-            : infoObj.aboveDesignatedTwo == 4
-            ? "微型"
-            : "";
-        infoObj["supervisionLarge"] = this.supervisionLarge(
-          infoObj.supervisionLarge
-        );
-        infoObj["subdistrict"] =
-          this.componendDistrict(infoObj.subdistrict) || "/";
+        // infoObj["aboveDesignated"] =
+        //   infoObj.aboveDesignated == 1 ? "规上" : "规下";
+        // infoObj["riskReport"] = infoObj.riskReport == 1 ? "是" : "否";
+        // infoObj["aboveDesignatedTwo"] =
+        //   infoObj.aboveDesignatedTwo == 1
+        //     ? "大型"
+        //     : infoObj.aboveDesignatedTwo == 2
+        //     ? "中型"
+        //     : infoObj.aboveDesignatedTwo == 3
+        //     ? "小型"
+        //     : infoObj.aboveDesignatedTwo == 4
+        //     ? "微型"
+        //     : "";
+        // infoObj["supervisionLarge"] = this.supervisionLarge(
+        //   infoObj.supervisionLarge
+        // );
+        // infoObj["district"] =
+        //   this.componendDistrict(infoObj.subdistrict) || "/";
+
+        // infoObj["createTime"] = this.$moment(infoObj.createTime).format(
+        //   "yyyy-MM-DD"
+        // );
+        // infoObj["updateTime"] = this.$moment(infoObj.createTime).format(
+        //   "yyyy-MM-DD"
+        // );
 
-        infoObj["createTime"] = this.$moment(infoObj.createTime).format(
-          "yyyy-MM-DD"
-        );
-        infoObj["updateTime"] = this.$moment(infoObj.createTime).format(
-          "yyyy-MM-DD"
-        );
         this.infoData = infoObj;
       });
     },