From 13da714598ba287dc85e3bdde098436b2a2b7c44 Mon Sep 17 00:00:00 2001
From: xzt <1113240624@qq.com>
Date: Wed, 5 Jun 2024 10:29:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/editPart.vue                   | 220 ++++++++++++++----
 .../components/inspection.vue                 |   2 +-
 .../components/responsibleUnit.vue            |   2 +-
 3 files changed, 175 insertions(+), 49 deletions(-)

diff --git a/jwtech-admin-page/src/views/evaluationEarlyWarning/supervisionInspection/components/editPart.vue b/jwtech-admin-page/src/views/evaluationEarlyWarning/supervisionInspection/components/editPart.vue
index 8b0574ec..ca99c31c 100644
--- a/jwtech-admin-page/src/views/evaluationEarlyWarning/supervisionInspection/components/editPart.vue
+++ b/jwtech-admin-page/src/views/evaluationEarlyWarning/supervisionInspection/components/editPart.vue
@@ -7,7 +7,7 @@
         size="mini"
         @click="handleAdd"
         v-hasPermi="['warn:rectification:add']"
-        >新增整改通知书</el-button
+        >添加问题</el-button
       >
     </div>
 
@@ -26,19 +26,22 @@
         min-width="120"
       /> -->
       <el-table-column
-        label="发文单位"
+        label="责任单位"
         align="center"
-        prop="issuingUnit"
+        prop="responsibleUnit"
+        :formatter="unitFormat"
         min-width="120"
       />
       <el-table-column
-        label="文号"
+        label="单位类型"
         align="center"
-        prop="documentNumber"
+        prop="responsibleUnitType"
+        :formatter="unitTypeFormat"
         min-width="120"
       />
+
       <el-table-column
-        label="通知生效时间"
+        label="检查时间"
         align="center"
         prop="noticeBegainTime"
         min-width="120"
@@ -50,29 +53,38 @@
         </template>
       </el-table-column>
       <el-table-column
-        label="整改通知书"
+        label="问题描述"
+        align="center"
+        prop="content"
+        min-width="120"
+      />
+
+      <el-table-column
+        label="处理状态"
+        align="center"
+        prop="isFinish"
+        :formatter="isFinishFormat"
+        min-width="120"
+      />
+
+      <!-- <el-table-column
+        label="整改时间"
         align="center"
-        prop="rectificationAttachment"
+        prop="feedbackTime"
         min-width="120"
       >
         <template slot-scope="scope">
-          <div
-            v-for="(item, index) in JSON.parse(
-              scope.row.rectificationAttachment
-            )"
-            :key="item + index"
-          >
-            <i class="el-icon-document"></i>
-            {{ item.name }}
-            <i
-              class="el-icon-download"
-              @click="downloadFile(scope.row.rectificationAttachment, index)"
-              style="cursor: pointer"
-            ></i>
-          </div>
+          <span>{{ parseTime(scope.row.feedbackTime, "{y}-{m}-{d}") }}</span>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column
+        label="整改反馈"
+        align="center"
+        prop="feedback"
+        min-width="120"
+      />
+
+      <!-- <el-table-column
         label="责任单位"
         align="center"
         prop="unitArray"
@@ -85,7 +97,7 @@
         prop="isFinish"
         :formatter="isFinishFormat"
         min-width="120"
-      />
+      /> -->
       <!-- <el-table-column
         label="整改相关附件"
         align="center"
@@ -106,7 +118,7 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row, scope.$index)"
             v-hasPermi="['warn:rectification:edit']"
-            >修改</el-button
+            >整改</el-button
           >
           <el-button
             size="mini"
@@ -140,13 +152,50 @@
         <!-- <el-form-item label="监管id" prop="inspectionId">
           <el-input v-model="form.inspectionId" placeholder="请输入监管id" />
         </el-form-item> -->
-        <el-form-item label="发文单位" prop="issuingUnit">
+        <!-- <el-form-item label="发文单位" prop="issuingUnit">
           <el-input v-model="form.issuingUnit" placeholder="请输入发文单位" />
         </el-form-item>
         <el-form-item label="文号" prop="documentNumber">
           <el-input v-model="form.documentNumber" placeholder="请输入文号" />
+        </el-form-item> -->
+
+        <el-form-item label="责任单位" prop="responsibleUnit">
+          <el-select
+            v-model="form.responsibleUnit"
+            placeholder="请选择责任单位"
+            filterable
+            clearable
+            size="small"
+            style="width: 100%"
+          >
+            <el-option
+              v-for="dict in unitOptions"
+              :key="dict.id + dict.enterpriseName"
+              :label="dict.enterpriseName"
+              :value="dict.id"
+              @click.native="getType(dict)"
+            />
+          </el-select>
         </el-form-item>
-        <el-form-item label="通知生效时间" prop="noticeBegainTime">
+
+        <el-form-item label="单位类型" prop="responsibleUnitType">
+          <el-select
+            v-model="form.responsibleUnitType"
+            placeholder="请选择单位类型"
+            filterable
+            clearable
+            size="small"
+            style="width: 100%"
+          >
+            <el-option
+              v-for="dict in unitTypeOptions"
+              :key="dict.value + dict.name"
+              :label="dict.name"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="检查时间" prop="noticeBegainTime">
           <el-date-picker
             clearable
             size="small"
@@ -154,13 +203,39 @@
             v-model="form.noticeBegainTime"
             type="date"
             value-format="yyyy-MM-dd"
-            placeholder="选择通知生效时间"
+            placeholder="选择检查时间"
           >
           </el-date-picker>
         </el-form-item>
+        <el-form-item label="问题描述" prop="content">
+          <el-input
+            v-model="form.content"
+            placeholder="请输入问题描述"
+            type="textarea"
+          />
+        </el-form-item>
 
-        <el-form-item label="整改通知书" prop="rectificationAttachment">
-          <!-- <el-input v-model="form.rectificationAttachment" placeholder="请输入整改通知书" /> -->
+        <el-form-item label="整改时间" prop="feedbackTime" v-if="!isAdd">
+          <el-date-picker
+            clearable
+            size="small"
+            style="width: 100%"
+            v-model="form.feedbackTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择整改时间"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="整改反馈" prop="feedback" v-if="!isAdd">
+          <el-input
+            v-model="form.feedback"
+            placeholder="请输入整改反馈"
+            type="textarea"
+          />
+        </el-form-item>
+
+        <!-- <el-form-item label="整改通知书" prop="rectificationAttachment">
           <el-upload
             class="upload-demo"
             action="thinking/common/upload"
@@ -184,16 +259,16 @@
               支持jpg/png/pdf/word/excel文件等，不超过200M
             </div>
           </el-upload>
-        </el-form-item>
+        </el-form-item> -->
       </el-form>
-      <responsibleUnit
+      <!-- <responsibleUnit
         v-if="open && form.id"
         :isAdd="isAdd"
         :inspectionId="inspectionId"
         :rectificationId="form.id"
         :proNo="proNo"
         :proCode="proCode"
-      />
+      /> -->
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
@@ -285,16 +360,33 @@ export default {
         },
       },
       unitOptions: [],
+      unitTypeOptions: [
+        {
+          name: "设计单位",
+          value: "0",
+        },
+        {
+          name: "施工单位",
+          value: "1",
+        },
+        {
+          name: "监理单位",
+          value: "2",
+        },
+        {
+          name: "其他单位",
+          value: "3",
+        },
+      ],
       // 表单参数
       form: {},
       // 表单校验
       rules: {
-        issuingUnit: [
-          { required: true, message: "请输入发文单位", trigger: "blur" },
-          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        responsibleUnit: [
+          { required: true, message: "请选择责任单位", trigger: "blur" },
         ],
-        documentNumber: [
-          { required: true, message: "请输入发号", trigger: "blur" },
+        content: [
+          { required: true, message: "请输入发文单位", trigger: "blur" },
           { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
       },
@@ -314,12 +406,16 @@ export default {
     } else {
       this.loading = false;
     }
-    // this.getUnit();
+    this.getUnit();
     this.getDicts("rectification_completion").then((response) => {
       this.isFinishOptions = response.data;
     });
   },
   methods: {
+    getType(dict) {
+      this.form.responsibleUnitType = dict.enterpriseType;
+      console.log(111, this.form.responsibleUnitType);
+    },
     /** 查询整改通知书列表 */
     getList() {
       this.loading = true;
@@ -331,14 +427,32 @@ export default {
         this.loading = false;
       });
     },
-    // getUnit() {
-    //   this.unitParams.data.proNo = this.proNo;
-    //   this.unitParams.data.proCode = this.proCode;
-    //   listInfo(this.unitParams).then((response) => {
-    //     this.unitOptions = response.data.enterpriseInfoList;
-    //     // console.log(88888888888, this.unitOptions);
-    //   });
-    // },
+    getUnit() {
+      this.unitParams.data.proNo = this.proNo;
+      this.unitParams.data.proCode = this.proCode;
+      listInfo(this.unitParams).then((response) => {
+        this.unitOptions = response.data.enterpriseInfoList;
+        // console.log(88888888888, this.unitOptions);
+      });
+    },
+    unitFormat(row) {
+      let res = "";
+      this.unitOptions.filter((item) => {
+        if (item.id == row.responsibleUnit) {
+          res = item.enterpriseName;
+          return res;
+        }
+      });
+    },
+    unitTypeFormat(row) {
+      let res = "";
+      this.unitTypeOptions.filter((item) => {
+        if (item.value == row.responsibleUnitType) {
+          res = item.label;
+          return res;
+        }
+      });
+    },
     unitArrayFormat(row) {
       let res = "";
       row.unitArray?.forEach((item) => {
@@ -363,6 +477,12 @@ export default {
       this.fileList1 = [];
       this.form = {
         id: null,
+        responsibleUnit: null,
+        responsibleUnitType: null,
+        content: null,
+        noticeBegainTime: null,
+        feedbackTime: null,
+        feedback: null,
         inspectionId: null,
         issuingUnit: null,
         documentNumber: null,
@@ -384,6 +504,12 @@ export default {
         pageSize: 10,
         data: {
           id: null,
+          responsibleUnit: null,
+          responsibleUnitType: null,
+          content: null,
+          noticeBegainTime: null,
+          feedbackTime: null,
+          feedback: null,
           inspectionId: null,
           issuingUnit: null,
           documentNumber: null,
diff --git a/jwtech-admin-page/src/views/evaluationEarlyWarning/supervisionInspection/components/inspection.vue b/jwtech-admin-page/src/views/evaluationEarlyWarning/supervisionInspection/components/inspection.vue
index ebc9123d..d3ae4d07 100644
--- a/jwtech-admin-page/src/views/evaluationEarlyWarning/supervisionInspection/components/inspection.vue
+++ b/jwtech-admin-page/src/views/evaluationEarlyWarning/supervisionInspection/components/inspection.vue
@@ -400,7 +400,7 @@
       </el-form>
       <div v-if="form.projectName">
         <div class="listTitle" style="margin-top: 0">
-          <span>责令限期整改通知书列表</span>
+          <span>责令限期整改问题列表</span>
         </div>
         <editPart
           ref="editPart"
diff --git a/jwtech-admin-page/src/views/evaluationEarlyWarning/supervisionInspection/components/responsibleUnit.vue b/jwtech-admin-page/src/views/evaluationEarlyWarning/supervisionInspection/components/responsibleUnit.vue
index 6f667859..b0dd9801 100644
--- a/jwtech-admin-page/src/views/evaluationEarlyWarning/supervisionInspection/components/responsibleUnit.vue
+++ b/jwtech-admin-page/src/views/evaluationEarlyWarning/supervisionInspection/components/responsibleUnit.vue
@@ -112,7 +112,7 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['warn:zrdw:edit']"
-            >修改</el-button
+            >整改</el-button
           >
           <el-button
             size="mini"