From 6916f00714a2d583ff6afaef52cbac01761e7f24 Mon Sep 17 00:00:00 2001
From: wanglei <wl2666675>
Date: Mon, 3 Jun 2024 17:01:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A1=A3=E6=A1=88=E5=90=88=E9=9B=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dangan-ui/src/views/dangan/catalog/index.vue |  77 +-----
 dangan-ui/src/views/dangan/czrkdj/index.vue  | 233 ++++++++++++-------
 2 files changed, 152 insertions(+), 158 deletions(-)

diff --git a/dangan-ui/src/views/dangan/catalog/index.vue b/dangan-ui/src/views/dangan/catalog/index.vue
index 64a24e9..083da25 100644
--- a/dangan-ui/src/views/dangan/catalog/index.vue
+++ b/dangan-ui/src/views/dangan/catalog/index.vue
@@ -60,7 +60,11 @@
               row-key="id"
               :default-expand-all="isExpandAll"
               :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
-      <el-table-column label="目录名称" align="left" header-align="center" prop="muName" />
+      <el-table-column label="目录名称" align="left" header-align="center" prop="muName">
+        <template slot-scope="scope">
+          <el-link type="primary" @click="handleDAXX(scope.row)">{{ scope.row.muName }}</el-link>
+        </template>
+      </el-table-column>
       <el-table-column label="业务类型" align="center" prop="ywType" >
         <template slot-scope="scope">
           <dict-tag :options="dict.type.yw_type" :value="scope.row.ywType"/>
@@ -83,7 +87,7 @@
         </template>
       </el-table-column>
       <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="240px">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200px">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -118,12 +122,6 @@
             icon="el-icon-tickets"
             @click="handleSCJL(scope.row)"
           >上传记录</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-tickets"
-            @click="handleDAXX(scope.row)"
-          >档案信息</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -276,36 +274,6 @@
 
     </el-dialog>
 
-    <!-- 档案信息 -->
-    <el-dialog title="档案信息" :visible.sync="daxx.open" width="1000px" append-to-body top="6vh">
-      <el-table :data="daxx.list">
-        <el-table-column label="姓名" align="center" prop="name" />
-        <el-table-column label="身份证号" align="center" prop="cardId" />
-        <el-table-column label="户主姓名" align="center" prop="hzName" />
-        <el-table-column label="与户主关系" align="center" prop="relation" />
-        <el-table-column label="出生日期" align="center" prop="birthday" width="180">
-          <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.birthday, '{y}-{m}-{d}') }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="地址" align="center" prop="address" />
-        <el-table-column label="籍贯" align="center" prop="jiguan" />
-        <el-table-column label="档案图片" align="center" prop="pictures" >
-          <template slot-scope="scope">
-            <image-preview :src="scope.row.pictures" :width="50" :height="50"/>
-          </template>
-        </el-table-column>
-        <el-table-column label="备注" align="center" prop="remark" />
-      </el-table>
-      <pagination
-        v-show="daxx.total>0"
-        :total="daxx.total"
-        :page.sync="daxx.queryParams.pageNum"
-        :limit.sync="daxx.queryParams.pageSize"
-        @pagination="daxxQuery"
-      />
-    </el-dialog>
-
   </div>
 </template>
 
@@ -313,7 +281,6 @@
 import { listCatalog, getCatalog, delCatalog, addCatalog, updateCatalog } from "@/api/dangan/catalog";
 import { listPictureRecard } from "@/api/dangan/pictureRecard";
 import { listAreaSort } from "@/api/dangan/areaSort";
-import { listSearch } from "@/api/dangan/search";
 import { collectRecongnize } from "@/api/dangan/collection";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@@ -390,18 +357,6 @@ export default {
         muId: null,
         recognize: '0'
       },
-      // 档案信息
-      daxx:{
-        open: false,
-        list: [],
-        total: 0,
-        queryParams:{
-          pageNum: 1,
-          pageSize: 10,
-          ywType: null,
-          id: null,
-        }
-      }
     };
   },
   created() {
@@ -648,25 +603,7 @@ export default {
     },
     // 档案信息
     handleDAXX(row){
-      this.daxx.list = [];
-      this.daxx.open = true;
-      this.daxx.queryParams.pageNum = 1;
-      this.daxx.queryParams.pageSize = 10;
-      this.daxx.queryParams.id = row.id;
-      this.daxx.queryParams.ywType = row.ywType;
-      this.daxxQuery()
-    },
-    // 查询档案信息
-    daxxQuery(){
-      listSearch(this.daxx.queryParams).then(response => {
-        if(this.daxx.queryParams.ywType==='0'){
-          this.daxx.list = response.czrkdj.rows;
-          this.daxx.total = response.czrkdj.total;
-        }else {
-          this.daxx.list = []
-          this.daxx.total = 0
-        }
-      });
+      this.$router.push("/dangan/czrkdj?muId=" + row.id);
     },
   }
 };
diff --git a/dangan-ui/src/views/dangan/czrkdj/index.vue b/dangan-ui/src/views/dangan/czrkdj/index.vue
index 9c9ce90..16d48f3 100644
--- a/dangan-ui/src/views/dangan/czrkdj/index.vue
+++ b/dangan-ui/src/views/dangan/czrkdj/index.vue
@@ -1,14 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="目录id" prop="muId">
-        <el-input
-          v-model="queryParams.muId"
-          placeholder="请输入目录id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
       <el-form-item label="姓名" prop="name">
         <el-input
           v-model="queryParams.name"
@@ -65,6 +57,37 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="是否纠错" prop="errorCorrect">
+        <el-select
+          v-model="queryParams.errorCorrect"
+          placeholder="是否纠错"
+          clearable
+          style="width:100%"
+        >
+          <el-option
+            v-for="dict in dict.type.error_correct"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="审核状态" prop="errorCorrect">
+        <el-select
+          v-model="queryParams.auditStatus"
+          placeholder="审核状态"
+          clearable
+          style="width:100%"
+        >
+          <el-option
+            v-for="dict in dict.type.audit_status"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -72,38 +95,6 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['dangan:czrkdj:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['dangan:czrkdj:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['dangan:czrkdj:remove']"
-        >删除</el-button>
-      </el-col>
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -117,10 +108,8 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="czrkdjList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="id" align="center" prop="id" />
-      <el-table-column label="目录id" align="center" prop="muId" />
+    <el-table v-loading="loading" :data="czrkdjList">
+<!--      <el-table-column label="目录ID" align="center" prop="muId" />-->
       <el-table-column label="姓名" align="center" prop="name" />
       <el-table-column label="户主姓名" align="center" prop="hzName" />
       <el-table-column label="与户主关系" align="center" prop="relation" />
@@ -132,17 +121,43 @@
       <el-table-column label="地址" align="center" prop="address" />
       <el-table-column label="籍贯" align="center" prop="jiguan" />
       <el-table-column label="身份证号" align="center" prop="cardId" />
-      <el-table-column label="档案图片" align="center" prop="pictures" />
+      <el-table-column label="是否纠错" align="center" prop="errorCorrect" >
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.error_correct" :value="scope.row.errorCorrect"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="审核状态" align="center" prop="auditStatus" >
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.audit_status" :value="scope.row.auditStatus"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="审核结果" align="center" prop="auditResult" >
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.audit_status" :value="scope.row.auditResult"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="审核原因" align="center" prop="auditReason" />
+      <el-table-column label="档案图片" align="center" prop="pictures" >
+        <template slot-scope="scope">
+          <image-preview :src="scope.row.pictures" :width="50" :height="50"/>
+        </template>
+      </el-table-column>
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['dangan:czrkdj:edit']"
-          >修改</el-button>
+          >纠错</el-button>
+          <el-button
+            v-if="scope.row.auditStatus=='0'"
+            size="mini"
+            type="text"
+            @click="handleShenHe(scope.row)"
+            v-hasPermi="['dangan:czrkdj:edit']"
+          >审核</el-button>
           <el-button
             size="mini"
             type="text"
@@ -153,7 +168,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -163,11 +178,8 @@
     />
 
     <!-- 添加或修改常住人口登记对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="目录id" prop="muId">
-          <el-input v-model="form.muId" placeholder="请输入目录id" />
-        </el-form-item>
+    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="姓名" prop="name">
           <el-input v-model="form.name" placeholder="请输入姓名" />
         </el-form-item>
@@ -178,7 +190,7 @@
           <el-input v-model="form.relation" placeholder="请输入与户主关系" />
         </el-form-item>
         <el-form-item label="出生日期" prop="birthday">
-          <el-date-picker clearable
+          <el-date-picker clearable style="width:100%;"
             v-model="form.birthday"
             type="date"
             value-format="yyyy-MM-dd"
@@ -195,7 +207,7 @@
           <el-input v-model="form.cardId" placeholder="请输入身份证号" />
         </el-form-item>
         <el-form-item label="档案图片" prop="pictures">
-          <el-input v-model="form.pictures" type="textarea" placeholder="请输入内容" />
+          <image-upload v-model="form.pictures"/>
         </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
@@ -206,24 +218,43 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+
+    <!-- 审核对话框 -->
+    <el-dialog title="审核" :visible.sync="shenHe.open" width="500px" append-to-body>
+      <el-form ref="shenHeForm" :model="shenHe.form" :rules="shenHe.rules" label-width="90px">
+        <el-form-item label="审核结果" prop="auditResult">
+          <el-select
+            v-model="shenHe.form.auditResult"
+            placeholder="请选择审核结果"
+            clearable
+            style="width:100%"
+          >
+            <el-option label="通过" value="1"/>
+            <el-option label="不通过" value="2"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="审核原因" prop="auditReason">
+          <el-input v-model="shenHe.form.auditReason" type="textarea" placeholder="请输入审核原因" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="shenHeSubmit">确 定</el-button>
+      </div>
+    </el-dialog>
+
   </div>
 </template>
 
 <script>
-import { listCzrkdj, getCzrkdj, delCzrkdj, addCzrkdj, updateCzrkdj } from "@/api/dangan/czrkdj";
+import { listCzrkdj, getCzrkdj, delCzrkdj, updateCzrkdj } from "@/api/dangan/czrkdj";
 
 export default {
   name: "Czrkdj",
+  dicts: ['error_correct', 'audit_status'],
   data() {
     return {
       // 遮罩层
       loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
       // 显示搜索条件
       showSearch: true,
       // 总条数
@@ -246,19 +277,37 @@ export default {
         address: null,
         jiguan: null,
         cardId: null,
-        pictures: null,
+        errorCorrect: null,
+        auditStatus: null,
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
         muId: [
-          { required: true, message: "目录id不能为空", trigger: "blur" }
+          { required: true, message: "目录ID不能为空", trigger: "blur" }
         ],
-      }
+      },
+      // 审核
+      shenHe:{
+        // 是否显示审核弹出层
+        open: false,
+        // 表单参数
+        form: {},
+        // 表单校验
+        rules: {
+          auditResult: [
+            { required: true, message: "审核结果不能为空", trigger: "blur" }
+          ],
+          auditReason: [
+            { required: true, message: "审核原因不能为空", trigger: "blur" }
+          ],
+        }
+      },
     };
   },
   created() {
+    this.queryParams.muId = this.$route.query.muId
     this.getList();
   },
   methods: {
@@ -293,7 +342,9 @@ export default {
         createBy: null,
         createTime: null,
         updateBy: null,
-        updateTime: null
+        updateTime: null,
+        errorCorrect: null,
+        auditStatus: null,
       };
       this.resetForm("form");
     },
@@ -307,22 +358,10 @@ export default {
       this.resetForm("queryForm");
       this.handleQuery();
     },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加常住人口登记";
-    },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const id = row.id || this.ids
+      const id = row.id
       getCzrkdj(id).then(response => {
         this.form = response.data;
         this.open = true;
@@ -334,24 +373,19 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.id != null) {
+            this.form.errorCorrect = 1;
             updateCzrkdj(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
-          } else {
-            addCzrkdj(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
           }
         }
       });
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const ids = row.id || this.ids;
+      const ids = row.id ;
       this.$modal.confirm('是否确认删除常住人口登记编号为"' + ids + '"的数据项？').then(function() {
         return delCzrkdj(ids);
       }).then(() => {
@@ -364,7 +398,30 @@ export default {
       this.download('dangan/czrkdj/export', {
         ...this.queryParams
       }, `czrkdj_${new Date().getTime()}.xlsx`)
-    }
+    },
+    /** 审核按钮操作 */
+    handleShenHe(row) {
+      this.reset();
+      this.resetForm("shenHeForm");
+      const id = row.id
+      getCzrkdj(id).then(response => {
+        this.shenHe.form = response.data;
+        this.shenHe.open  = true;
+      });
+    },
+    // 审核提交
+    shenHeSubmit(){
+      this.$refs["shenHeForm"].validate(valid => {
+        if (valid) {
+          this.shenHe.form.auditStatus = this.shenHe.form.auditResult
+          updateCzrkdj(this.shenHe.form).then(response => {
+            this.$modal.msgSuccess("操作成功");
+            this.shenHe.open = false;
+            this.getList();
+          });
+        }
+      });
+    },
   }
 };
 </script>