From 96b37a8d47d8ed6307cb503236b6861a5a257e3d Mon Sep 17 00:00:00 2001
From: kylin L <452061493@qq.com>
Date: Wed, 31 Jul 2024 15:09:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=A7=E6=B3=95=E4=BA=BA=E5=91=98=E5=8A=A8?=
 =?UTF-8?q?=E6=80=81=E5=A4=9A=E9=80=89=20=E8=AF=A6=E6=83=85=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../enterprise/enterpriseInspectionDetail.vue | 48 ++++++++++++----
 src/views/enterprise/registrationDetail.vue   | 56 ++++++++++++++-----
 2 files changed, 78 insertions(+), 26 deletions(-)

diff --git a/src/views/enterprise/enterpriseInspectionDetail.vue b/src/views/enterprise/enterpriseInspectionDetail.vue
index 4f0dafd..76fa00f 100644
--- a/src/views/enterprise/enterpriseInspectionDetail.vue
+++ b/src/views/enterprise/enterpriseInspectionDetail.vue
@@ -35,22 +35,46 @@
               label="检查时间"
 
             />
+
             <van-field
-              v-model="submitData.checkItem"
-              label="检查事项"
-              type="textarea"
-              rows="1"
-              autosize
-              readonly
+                    v-model="submitData.checkItem"
+                    label="检查事项"
+                    rows="2"
+                    autosize
+                    readonly
+                    type="textarea"
+                    maxlength="50"
+                    placeholder="请输入检查事项"
+                    show-word-limit
             />
             <van-field
-              v-model="submitData.checkRequire"
-              label="检查要求"
-              type="textarea"
-              rows="1"
-              autosize
-              readonly
+                    v-model="submitData.checkRequire"
+                    label="检查要求"
+                    rows="2"
+                    autosize
+                    readonly
+                    type="textarea"
+                    maxlength="50"
+                    placeholder="请输入检查要求"
+                    show-word-limit
             />
+
+<!--            <van-field-->
+<!--              v-model="submitData.checkItem"-->
+<!--              label="检查事项"-->
+<!--              type="textarea"-->
+<!--              rows="1"-->
+<!--              autosize-->
+<!--              readonly-->
+<!--            />-->
+<!--            <van-field-->
+<!--              v-model="submitData.checkRequire"-->
+<!--              label="检查要求"-->
+<!--              type="textarea"-->
+<!--              rows="1"-->
+<!--              autosize-->
+<!--              readonly-->
+<!--            />-->
             <van-field
                 v-if="!data.isEnterprise"
                 v-model="submitData.lawEnforcement"
diff --git a/src/views/enterprise/registrationDetail.vue b/src/views/enterprise/registrationDetail.vue
index ff896ea..a6401e1 100644
--- a/src/views/enterprise/registrationDetail.vue
+++ b/src/views/enterprise/registrationDetail.vue
@@ -20,8 +20,8 @@
                       label="执法人员"
                       readonly
                     />
-                    <van-field
-                      v-model="submitData.lawEnforcerTwo"
+                    <van-field v-for="(item, index) in data.lawCer" :key="index"
+                      v-model="item.show"
                       label="执法人员"
                       readonly
                       @click="showPopup"
@@ -42,20 +42,18 @@
                     </view>
                     <van-field
                       v-model="submitData.lawEnforcementItemText"
-                      required
                       label="检查事项"
-                      :rules="[{ required: true, message: '必填项' }]"
-                      placeholder="检查事项"
+                      rows="2"
+                      autosize
                       readonly
                       type="textarea"
-                      rows="1"
-                      autosize
+                      maxlength="50"
+                      placeholder="请输入检查事项"
+                      show-word-limit
                     />
-                    <van-field
-                      v-model="submitData.lawEnforcementBasisText"
-                      required
+                    <van-field v-for="(item, index) in data.lawList" :key="index"
+                      v-model="item.text"
                       label="检查依据"
-                      :rules="[{ required: true, message: '必填项' }]"
                       placeholder="检查依据"
                       readonly
                       type="textarea"
@@ -170,6 +168,8 @@ const data = reactive({
     popupVisible2: false,
     popupContent2: '',
     imgstr: "",
+    lawList: [{ text:"", id:"" }],
+    lawCer:[{ text:"", id:"" }],
 });
 //保存参数
 const submitData = reactive({
@@ -265,9 +265,9 @@ onMounted(() =>{
         submitData.lawEnforcementId = success.data.lawEnforcementId;
         submitData.lawEnforcementItem = success.data.lawEnforcementItem;
         submitData.lawEnforcementItemText = success.data.lawEnforcementItemText;
-        submitData.lawEnforcementBasis = success.data.lawEnforcementBasis;
-        submitData.lawEnforcementBasisText = success.data.lawEnforcementBasisText;
-        submitData.lawEnforcerIdTwo = success.data.lawEnforcerIdTwo;
+        // submitData.lawEnforcementBasis = success.data.lawEnforcementBasis;
+        // submitData.lawEnforcementBasisText = success.data.lawEnforcementBasisText;
+        // submitData.lawEnforcerIdTwo = success.data.lawEnforcerIdTwo;
         submitData.lawEnforcer = success.data.lawEnforcer;
         submitData.remark = success.data.remark;
         submitData.enforce = success.data.enforce;
@@ -279,6 +279,34 @@ onMounted(() =>{
           data.bad = "#7FFFD4";
         }
 
+        // 执法依据
+        submitData.lawEnforcementBasis = success.data.lawEnforcementBasis;
+        submitData.lawEnforcementBasisText = success.data.lawEnforcementBasisText;
+        if ((null != submitData.lawEnforcementBasis && submitData.lawEnforcementBasis.length > 0)
+            && (null != submitData.lawEnforcementBasisText && submitData.lawEnforcementBasisText.length > 0)) {
+            var tmpBasis = submitData.lawEnforcementBasis.split(',');
+            var tmpBasisText = submitData.lawEnforcementBasisText.split(',');
+            data.lawList = [];
+            for (var i = 0; i < tmpBasis.length; i++) {
+                data.lawList.push({text: tmpBasisText[i], id: tmpBasis[i]});
+            }
+        }
+
+        // 执法人员
+        submitData.lawEnforcerIdTwo = success.data.lawEnforcerIdTwo;
+        submitData.lawEnforcerTwo = success.data.lawEnforcerTwo;
+        var lawEnforcer2ShowStr = success.data.lawEnforcer2Show;
+        if ((null != submitData.lawEnforcerIdTwo && submitData.lawEnforcerIdTwo.length > 0)
+            && (null != submitData.lawEnforcerTwo && submitData.lawEnforcerTwo.length > 0)) {
+            var tmpEnforceId = submitData.lawEnforcerIdTwo.split(',');
+            var tmpEnforceText = submitData.lawEnforcerTwo.split(',');
+            var lawEnforcer2Show = lawEnforcer2ShowStr.split(',');
+            data.lawCer = [];
+            for (var i = 0; i < tmpEnforceId.length; i++) {
+                data.lawCer.push({text: tmpEnforceText[i], id: tmpEnforceId[i], show: lawEnforcer2Show[i]});
+            }
+        }
+
         // setLinkageItem(submitData.lawEnforcementItem);
         // setLinkageGA(submitData.lawEnforcementBasis);
     },error=>{