From 7cbb457c0db0ba176ad21cc66ebc141d4f11c8cd Mon Sep 17 00:00:00 2001
From: wanglei <wl2666675>
Date: Fri, 14 Jun 2024 17:19:27 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=87=BA=E7=94=9F=E5=8C=BB=E5=AD=A6?=
 =?UTF-8?q?=E8=AF=81=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dangan-ui/src/views/dangan/birthDJ/index.vue | 985 ++++++++++++++-----
 1 file changed, 732 insertions(+), 253 deletions(-)

diff --git a/dangan-ui/src/views/dangan/birthDJ/index.vue b/dangan-ui/src/views/dangan/birthDJ/index.vue
index 84bc3d9..d85573f 100644
--- a/dangan-ui/src/views/dangan/birthDJ/index.vue
+++ b/dangan-ui/src/views/dangan/birthDJ/index.vue
@@ -1,10 +1,10 @@
 <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-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+      <el-form-item label="档案目录ID" prop="muId">
         <el-input
           v-model="queryParams.muId"
-          placeholder="请输入目录id"
+          placeholder="请输入档案目录ID"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -26,12 +26,12 @@
         />
       </el-form-item>
       <el-form-item label="出生时间" prop="birthday">
-        <el-date-picker clearable
+        <el-input
           v-model="queryParams.birthday"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择出生时间">
-        </el-date-picker>
+          placeholder="请输入出生时间"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
       </el-form-item>
       <el-form-item label="出生地点" prop="bornAddress">
         <el-input
@@ -153,53 +153,35 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="识别图片id" prop="picIds">
-        <el-input
-          v-model="queryParams.picIds"
-          placeholder="请输入识别图片id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="相关图片id" prop="allPicIds">
-        <el-input
-          v-model="queryParams.allPicIds"
-          placeholder="请输入相关图片id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="是否纠错(字典0否1是)" prop="errorCorrect">
-        <el-input
+      <el-form-item label="是否纠错" prop="errorCorrect">
+        <el-select
           v-model="queryParams.errorCorrect"
-          placeholder="请输入是否纠错(字典0否1是)"
+          placeholder="是否纠错"
           clearable
-          @keyup.enter.native="handleQuery"
-        />
+          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="auditName">
-        <el-input
-          v-model="queryParams.auditName"
-          placeholder="请输入审核人"
+      <el-form-item label="审核状态" prop="auditStatus">
+        <el-select
+          v-model="queryParams.auditStatus"
+          placeholder="审核状态"
           clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="审核结果" prop="auditResult">
-        <el-input
-          v-model="queryParams.auditResult"
-          placeholder="请输入审核结果"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="审核原由" prop="auditReason">
-        <el-input
-          v-model="queryParams.auditReason"
-          placeholder="请输入审核原由"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+          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>
@@ -216,102 +198,86 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['dangan:birthDJ: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:birthDJ: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:birthDJ:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['dangan:birthDJ:export']"
-        >导出</el-button>
+        >新增手动识别</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="birthDJList" @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="业务类型(字典)" align="center" prop="ywType" />
-      <el-table-column label="目录id" align="center" prop="muId" />
-      <el-table-column label="出生证编号" align="center" prop="birthNum" />
-      <el-table-column label="婴儿姓名" align="center" prop="name" />
-      <el-table-column label="出生时间" align="center" prop="birthday" width="180">
+    <el-table v-loading="loading" :data="birthDJList" border>
+      <el-table-column label="档案目录ID" align="center" prop="muId" min-width="90" fixed/>
+      <el-table-column label="出生证编号" align="center" prop="birthNum" fixed min-width="100" show-overflow-tooltip/>
+      <el-table-column label="婴儿姓名" align="center" prop="name" fixed min-width="100" show-overflow-tooltip/>
+      <el-table-column label="出生时间" align="center" prop="birthday" min-width="100" show-overflow-tooltip/>
+      <el-table-column label="性别" align="center" prop="sex" min-width="100" show-overflow-tooltip/>
+      <el-table-column label="出生地点" align="center" prop="bornAddress" min-width="100" show-overflow-tooltip/>
+      <el-table-column label="母亲姓名" align="center" prop="mName" min-width="100" show-overflow-tooltip/>
+      <el-table-column label="母亲年龄" align="center" prop="mAge" min-width="100" show-overflow-tooltip/>
+      <el-table-column label="母亲国籍" align="center" prop="mGj" min-width="100" show-overflow-tooltip/>
+      <el-table-column label="母亲民族" align="center" prop="mNation" min-width="100" show-overflow-tooltip/>
+      <el-table-column label="母亲身份证号" align="center" prop="mCardId" min-width="100" show-overflow-tooltip/>
+      <el-table-column label="父亲姓名" align="center" prop="fName" min-width="100" show-overflow-tooltip/>
+      <el-table-column label="父亲年龄" align="center" prop="fAge" min-width="100" show-overflow-tooltip/>
+      <el-table-column label="父亲国籍" align="center" prop="fGj" min-width="100" show-overflow-tooltip/>
+      <el-table-column label="父亲民族" align="center" prop="fNation" min-width="100" show-overflow-tooltip/>
+      <el-table-column label="父亲身份证号" align="center" prop="fCardId" min-width="100" show-overflow-tooltip/>
+      <el-table-column label="家庭住址" align="center" prop="homeAddress" min-width="100" show-overflow-tooltip/>
+      <el-table-column label="婴儿母亲签字" align="center" prop="momSign" min-width="100" show-overflow-tooltip/>
+      <el-table-column label="接生人员签字" align="center" prop="jsrySign" min-width="100" show-overflow-tooltip/>
+      <el-table-column label="接生单位" align="center" prop="jsUnit" min-width="100" show-overflow-tooltip/>
+<!--      <el-table-column label="出生登记类型(字典)" align="center" prop="djType" min-width="100" show-overflow-tooltip/>-->
+      <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="allPics">
+        <template slot-scope="scope">
+          <image-preview :src="scope.row.allPics" :width="50" :height="50"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="是否纠错" align="center" prop="errorCorrect" min-width="100" show-overflow-tooltip>
+        <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" min-width="100">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.birthday, '{y}-{m}-{d}') }}</span>
+          <dict-tag :options="dict.type.audit_status" :value="scope.row.auditStatus"/>
         </template>
       </el-table-column>
-      <el-table-column label="性别" align="center" prop="sex" />
-      <el-table-column label="出生地点" align="center" prop="bornAddress" />
-      <el-table-column label="母亲姓名" align="center" prop="mName" />
-      <el-table-column label="母亲年龄" align="center" prop="mAge" />
-      <el-table-column label="母亲国籍" align="center" prop="mGj" />
-      <el-table-column label="母亲民族" align="center" prop="mNation" />
-      <el-table-column label="母亲身份证号" align="center" prop="mCardId" />
-      <el-table-column label="父亲姓名" align="center" prop="fName" />
-      <el-table-column label="父亲年龄" align="center" prop="fAge" />
-      <el-table-column label="父亲国籍" align="center" prop="fGj" />
-      <el-table-column label="父亲民族" align="center" prop="fNation" />
-      <el-table-column label="父亲身份证号" align="center" prop="fCardId" />
-      <el-table-column label="家庭住址" align="center" prop="homeAddress" />
-      <el-table-column label="婴儿母亲签字" align="center" prop="momSign" />
-      <el-table-column label="接生人员签字" align="center" prop="jsrySign" />
-      <el-table-column label="接生单位" align="center" prop="jsUnit" />
-      <el-table-column label="出生登记类型(字典)" align="center" prop="djType" />
-      <el-table-column label="识别图片id" align="center" prop="picIds" />
-      <el-table-column label="识别图片" align="center" prop="pictures" />
-      <el-table-column label="相关图片id" align="center" prop="allPicIds" />
-      <el-table-column label="相关图片" align="center" prop="allPics" />
-      <el-table-column label="是否纠错(字典0否1是)" align="center" prop="errorCorrect" />
-      <el-table-column label="审核状态(字典)" align="center" prop="auditStatus" />
-      <el-table-column label="审核人" align="center" prop="auditName" />
-      <el-table-column label="审核结果" align="center" prop="auditResult" />
-      <el-table-column label="审核原由" align="center" prop="auditReason" />
-      <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="审核结果" align="center" prop="auditResult" min-width="100" show-overflow-tooltip>
+        <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" min-width="140" show-overflow-tooltip/>
+      <el-table-column label="备注" align="center" prop="remark" min-width="140" show-overflow-tooltip/>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="160" fixed="right">
         <template slot-scope="scope">
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['dangan:birthDJ:edit']"
-          >修改</el-button>
+            v-hasPermi="['dangan:qyz:edit']"
+          >纠错</el-button>
+          <el-button
+            v-if="scope.row.auditStatus=='0'"
+            size="mini"
+            type="text"
+            @click="handleShenHe(scope.row)"
+            v-hasPermi="['dangan:qyz:edit']"
+          >审核</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['dangan:birthDJ:remove']"
+            v-hasPermi="['dangan:qyz:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -320,137 +286,474 @@
       @pagination="getList"
     />
 
-    <!-- 添加或修改出生登记对话框 -->
-    <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-form-item label="出生证编号" prop="birthNum">
-          <el-input v-model="form.birthNum" placeholder="请输入出生证编号" />
-        </el-form-item>
-        <el-form-item label="婴儿姓名" prop="name">
-          <el-input v-model="form.name" placeholder="请输入婴儿姓名" />
-        </el-form-item>
-        <el-form-item label="出生时间" prop="birthday">
-          <el-date-picker clearable
-            v-model="form.birthday"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择出生时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="出生地点" prop="bornAddress">
-          <el-input v-model="form.bornAddress" placeholder="请输入出生地点" />
-        </el-form-item>
-        <el-form-item label="母亲姓名" prop="mName">
-          <el-input v-model="form.mName" placeholder="请输入母亲姓名" />
-        </el-form-item>
-        <el-form-item label="母亲年龄" prop="mAge">
-          <el-input v-model="form.mAge" placeholder="请输入母亲年龄" />
-        </el-form-item>
-        <el-form-item label="母亲国籍" prop="mGj">
-          <el-input v-model="form.mGj" placeholder="请输入母亲国籍" />
-        </el-form-item>
-        <el-form-item label="母亲民族" prop="mNation">
-          <el-input v-model="form.mNation" placeholder="请输入母亲民族" />
-        </el-form-item>
-        <el-form-item label="母亲身份证号" prop="mCardId">
-          <el-input v-model="form.mCardId" placeholder="请输入母亲身份证号" />
-        </el-form-item>
-        <el-form-item label="父亲姓名" prop="fName">
-          <el-input v-model="form.fName" placeholder="请输入父亲姓名" />
-        </el-form-item>
-        <el-form-item label="父亲年龄" prop="fAge">
-          <el-input v-model="form.fAge" placeholder="请输入父亲年龄" />
-        </el-form-item>
-        <el-form-item label="父亲国籍" prop="fGj">
-          <el-input v-model="form.fGj" placeholder="请输入父亲国籍" />
-        </el-form-item>
-        <el-form-item label="父亲民族" prop="fNation">
-          <el-input v-model="form.fNation" placeholder="请输入父亲民族" />
-        </el-form-item>
-        <el-form-item label="父亲身份证号" prop="fCardId">
-          <el-input v-model="form.fCardId" placeholder="请输入父亲身份证号" />
-        </el-form-item>
-        <el-form-item label="家庭住址" prop="homeAddress">
-          <el-input v-model="form.homeAddress" placeholder="请输入家庭住址" />
-        </el-form-item>
-        <el-form-item label="婴儿母亲签字" prop="momSign">
-          <el-input v-model="form.momSign" placeholder="请输入婴儿母亲签字" />
-        </el-form-item>
-        <el-form-item label="接生人员签字" prop="jsrySign">
-          <el-input v-model="form.jsrySign" placeholder="请输入接生人员签字" />
-        </el-form-item>
-        <el-form-item label="接生单位" prop="jsUnit">
-          <el-input v-model="form.jsUnit" placeholder="请输入接生单位" />
-        </el-form-item>
-        <el-form-item label="识别图片id" prop="picIds">
-          <el-input v-model="form.picIds" placeholder="请输入识别图片id" />
-        </el-form-item>
-        <el-form-item label="识别图片" prop="pictures">
-          <el-input v-model="form.pictures" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-        <el-form-item label="相关图片id" prop="allPicIds">
-          <el-input v-model="form.allPicIds" placeholder="请输入相关图片id" />
-        </el-form-item>
-        <el-form-item label="相关图片" prop="allPics">
-          <el-input v-model="form.allPics" type="textarea" placeholder="请输入内容" />
+    <!-- 纠错 -->
+    <el-dialog title="纠错" :visible.sync="open_jc" width="1400px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-row :gutter="10">
+          <el-col :span="8">
+            <el-carousel height="600px" v-if="form.pictures" :autoplay="false">
+              <el-carousel-item v-for="item in form.pictures.split(',')" :key="item">
+                <div style="height: 600px; overflow: auto">
+                  <el-image style="height:850px; width: 100%" :src="item" fit="contain" :preview-src-list="[item]"></el-image>
+                </div>
+              </el-carousel-item>
+            </el-carousel>
+          </el-col>
+          <el-col :span="16">
+            <el-row :gutter="20">
+              <el-col :span="12">
+                <el-form-item label="出生证编号" prop="birthNum">
+                  <el-input v-model="form.birthNum" placeholder="请输入出生证编号" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="婴儿姓名" prop="name">
+                  <el-input v-model="form.name" placeholder="请输入婴儿姓名" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20">
+              <el-col :span="12">
+                <el-form-item label="出生时间" prop="birthday">
+                  <el-input v-model="form.birthday" placeholder="请输入出生时间" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="性别" prop="sex">
+                  <el-input v-model="form.sex" placeholder="请输入性别" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20">
+              <el-col :span="24">
+                <el-form-item label="出生地点" prop="bornAddress">
+                  <el-input v-model="form.bornAddress" placeholder="请输入出生地点" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20">
+              <el-col :span="8">
+                <el-form-item label="母亲姓名" prop="mName">
+                  <el-input v-model="form.mName" placeholder="请输入母亲姓名" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="母亲年龄" prop="mAge">
+                  <el-input v-model="form.mAge" placeholder="请输入母亲年龄" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="母亲国籍" prop="mGj">
+                  <el-input v-model="form.mGj" placeholder="请输入母亲国籍" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20">
+              <el-col :span="12">
+                <el-form-item label="母亲民族" prop="mNation">
+                  <el-input v-model="form.mNation" placeholder="请输入母亲民族" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="母亲身份证号" prop="mCardId">
+                  <el-input v-model="form.mCardId" placeholder="请输入母亲身份证号" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20">
+              <el-col :span="8">
+                <el-form-item label="父亲姓名" prop="fName">
+                  <el-input v-model="form.fName" placeholder="请输入父亲姓名" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="父亲年龄" prop="fAge">
+                  <el-input v-model="form.fAge" placeholder="请输入父亲年龄" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="父亲国籍" prop="fGj">
+                  <el-input v-model="form.fGj" placeholder="请输入父亲国籍" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20">
+              <el-col :span="12">
+                <el-form-item label="父亲民族" prop="fNation">
+                  <el-input v-model="form.fNation" placeholder="请输入父亲民族" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="父亲身份证号" prop="fCardId">
+                  <el-input v-model="form.fCardId" placeholder="请输入父亲身份证号" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20">
+              <el-col :span="12">
+                <el-form-item label="家庭住址" prop="homeAddress">
+                  <el-input v-model="form.homeAddress" placeholder="请输入家庭住址" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="婴儿母亲签字" prop="momSign">
+                  <el-input v-model="form.momSign" placeholder="请输入婴儿母亲签字" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20">
+              <el-col :span="12">
+                <el-form-item label="接生人员签字" prop="jsrySign">
+                  <el-input v-model="form.jsrySign" placeholder="请输入接生人员签字" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="接生单位" prop="jsUnit">
+                  <el-input v-model="form.jsUnit" placeholder="请输入接生单位" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20">
+              <el-col :span="24">
+                <el-form-item label="备注" prop="remark">
+                  <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-col>
+        </el-row>
+
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+
+    <!--    新增手动识别-->
+    <el-dialog title="新增手动识别" :visible.sync="open_add" width="1400px" append-to-body>
+
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="档案目录ID" prop="muId">
+              <el-input readonly  placeholder="请选择档案目录ID" v-model="form.muId">
+                <el-button slot="append" icon="el-icon-search" @click="muIdChange"></el-button>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-button type="primary" @click="selectDaRecard" style="margin-left: 10px;">选择档案记录</el-button>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20" v-if="shiBieList&&shiBieList.length>0">
+          <el-col :span="8">
+            <el-carousel height="600px" :autoplay="false">
+              <el-carousel-item v-for="item in shiBieList" :key="item.id">
+                <div style="height: 600px; overflow: auto">
+                  <el-image style="height:850px; width: 100%" :src="item.picUrl" fit="contain" :preview-src-list="[item.picUrl]"></el-image>
+                </div>
+              </el-carousel-item>
+            </el-carousel>
+          </el-col>
+          <el-col :span="16">
+
+            <el-row :gutter="20">
+              <el-col :span="12">
+                <el-form-item label="出生证编号" prop="birthNum">
+                  <el-input v-model="form.birthNum" placeholder="请输入出生证编号" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="婴儿姓名" prop="name">
+                  <el-input v-model="form.name" placeholder="请输入婴儿姓名" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20">
+              <el-col :span="12">
+                <el-form-item label="出生时间" prop="birthday">
+                  <el-input v-model="form.birthday" placeholder="请输入出生时间" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="性别" prop="sex">
+                  <el-input v-model="form.sex" placeholder="请输入性别" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20">
+              <el-col :span="24">
+                <el-form-item label="出生地点" prop="bornAddress">
+                  <el-input v-model="form.bornAddress" placeholder="请输入出生地点" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20">
+              <el-col :span="8">
+                <el-form-item label="母亲姓名" prop="mName">
+                  <el-input v-model="form.mName" placeholder="请输入母亲姓名" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="母亲年龄" prop="mAge">
+                  <el-input v-model="form.mAge" placeholder="请输入母亲年龄" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="母亲国籍" prop="mGj">
+                  <el-input v-model="form.mGj" placeholder="请输入母亲国籍" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20">
+              <el-col :span="12">
+                <el-form-item label="母亲民族" prop="mNation">
+                  <el-input v-model="form.mNation" placeholder="请输入母亲民族" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="母亲身份证号" prop="mCardId">
+                  <el-input v-model="form.mCardId" placeholder="请输入母亲身份证号" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20">
+              <el-col :span="8">
+                <el-form-item label="父亲姓名" prop="fName">
+                  <el-input v-model="form.fName" placeholder="请输入父亲姓名" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="父亲年龄" prop="fAge">
+                  <el-input v-model="form.fAge" placeholder="请输入父亲年龄" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="父亲国籍" prop="fGj">
+                  <el-input v-model="form.fGj" placeholder="请输入父亲国籍" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20">
+              <el-col :span="12">
+                <el-form-item label="父亲民族" prop="fNation">
+                  <el-input v-model="form.fNation" placeholder="请输入父亲民族" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="父亲身份证号" prop="fCardId">
+                  <el-input v-model="form.fCardId" placeholder="请输入父亲身份证号" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20">
+              <el-col :span="12">
+                <el-form-item label="家庭住址" prop="homeAddress">
+                  <el-input v-model="form.homeAddress" placeholder="请输入家庭住址" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="婴儿母亲签字" prop="momSign">
+                  <el-input v-model="form.momSign" placeholder="请输入婴儿母亲签字" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20">
+              <el-col :span="12">
+                <el-form-item label="接生人员签字" prop="jsrySign">
+                  <el-input v-model="form.jsrySign" placeholder="请输入接生人员签字" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="接生单位" prop="jsUnit">
+                  <el-input v-model="form.jsUnit" placeholder="请输入接生单位" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20">
+              <el-col :span="24">
+                <el-form-item label="备注" prop="remark">
+                  <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+
+          </el-col>
+
+        </el-row>
+
+      </el-form>
+
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="addSubmitForm">确 定</el-button>
+        <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="是否纠错(字典0否1是)" prop="errorCorrect">
-          <el-input v-model="form.errorCorrect" placeholder="请输入是否纠错(字典0否1是)" />
+        <el-form-item label="审核原因" prop="auditReason">
+          <el-input v-model="shenHe.form.auditReason" type="textarea" placeholder="请输入审核原因" />
         </el-form-item>
-        <el-form-item label="审核人" prop="auditName">
-          <el-input v-model="form.auditName" placeholder="请输入审核人" />
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="shenHeSubmit">确 定</el-button>
+      </div>
+    </el-dialog>
+
+    <!--选择档案历史记录-->
+    <el-dialog title="选择档案历史记录" :visible.sync="dalsInfo.visible" width="1200px" append-to-body>
+      <el-form :model="dalsInfo.queryParams" ref="queryForm" size="small" :inline="true" label-width="100px">
+
+        <el-form-item label="物理书架路径" prop="wlsjPath">
+          <el-input
+            v-model="dalsInfo.queryParams.wlsjPath"
+            placeholder="请输入物理书架路径"
+            clearable
+            @keyup.enter.native="dalsInfoQuery"
+          />
         </el-form-item>
-        <el-form-item label="审核结果" prop="auditResult">
-          <el-input v-model="form.auditResult" placeholder="请输入审核结果" />
+
+        <el-form-item label="是否已经识别" prop="recognize">
+          <el-select
+            v-model="dalsInfo.queryParams.recognize"
+            placeholder="是否已经识别"
+            clearable
+            style="width:100%"
+          >
+            <el-option
+              v-for="dict in dict.type.recognize"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
         </el-form-item>
-        <el-form-item label="审核原由" prop="auditReason">
-          <el-input v-model="form.auditReason" placeholder="请输入审核原由" />
+
+        <el-form-item label="图片名称" prop="picName">
+          <el-input
+            v-model="dalsInfo.queryParams.picName"
+            placeholder="请输入图片名称"
+            clearable
+            @keyup.enter.native="dalsInfoQuery"
+          />
         </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="dalsInfoQuery">搜索</el-button>
         </el-form-item>
       </el-form>
+      <el-table v-loading="dalsInfo.loading" :data="dalsInfo.list" border height="500" @selection-change="dalsInfoDblclick">
+        <el-table-column type="selection" width="50" align="center" fixed/>
+        <el-table-column label="档案目录ID" align="center" prop="muId" fixed min-width="50"/>
+        <el-table-column label="档案目录路径" align="center" prop="muPath" fixed min-width="100" show-overflow-tooltip/>
+        <el-table-column label="物理书架路径" align="center" prop="wlsjPath" min-width="100" show-overflow-tooltip/>
+        <el-table-column label="是否已经识别" align="center" prop="recognize" >
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.recognize" :value="scope.row.recognize"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="上传时间" align="center" prop="createTime" min-width="100" show-overflow-tooltip/>
+        <el-table-column label="图片名称" align="center" prop="picName" min-width="100" show-overflow-tooltip/>
+        <el-table-column label="图片路径" align="center" prop="picUrl">
+          <template slot-scope="scope">
+            <image-preview :src="scope.row.picUrl" :width="40" :height="40"/>
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination
+        v-show="dalsInfo.total>0"
+        :total="dalsInfo.total"
+        :page.sync="dalsInfo.queryParams.pageNum"
+        :limit.sync="dalsInfo.queryParams.pageSize"
+        @pagination="getlistPictureRecard"
+      />
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="dalsSubmit">确 定</el-button>
       </div>
     </el-dialog>
+
+    <!--选择档案目录-->
+    <el-dialog title="选择档案目录" :visible.sync="damlInfo.visible" width="1200px" append-to-body>
+      <el-table v-if="damlInfo.refreshTable" border
+                v-loading="damlInfo.loading"
+                :data="damlInfo.list"
+                row-key="id"
+                :default-expand-all="damlInfo.isExpandAll"
+                :tree-props="{children: 'children', hasChildren: 'hasChildren'}" @cell-dblclick="damlInfoDblclick">
+        <el-table-column label="目录名称" align="left" header-align="center" prop="muName"/>
+        <el-table-column label="业务类型" align="center" prop="ywType" >
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.yw_type" :value="scope.row.ywType"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="显示顺序" align="center" prop="orderNum" />
+        <el-table-column label="状态" align="center" prop="status" >
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="图片" align="center" prop="picPath" >
+          <template slot-scope="scope">
+            <image-preview :src="scope.row.picPath" :width="50" :height="50" v-if="scope.row.pid===0"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="创建时间" align="center" prop="createTime">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.createTime) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" align="center" prop="remark" />
+      </el-table>
+    </el-dialog>
+
+
   </div>
 </template>
 
 <script>
 import { listBirthDJ, getBirthDJ, delBirthDJ, addBirthDJ, updateBirthDJ } from "@/api/dangan/birthDJ";
+import { listCatalog } from "@/api/dangan/catalog";
+import { listPictureRecard } from "@/api/dangan/pictureRecard";
 
 export default {
   name: "BirthDJ",
+  dicts: ['error_correct', 'audit_status', 'yw_type', 'recognize'],
   data() {
     return {
       // 遮罩层
       loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
       // 显示搜索条件
       showSearch: true,
       // 总条数
       total: 0,
       // 出生登记表格数据
       birthDJList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
+      // 是否显示纠错弹出层
+      open_jc: false,
+      // 是否显示新增弹出层
+      open_add: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        ywType: null,
+        ywType: 'option4',
         muId: null,
         birthNum: null,
         name: null,
@@ -484,11 +787,70 @@ export default {
       },
       // 表单参数
       form: {},
+      // 识别list
+      shiBieList: [],
       // 表单校验
       rules: {
         muId: [
-          { required: true, message: "目录id不能为空", trigger: "blur" }
+          { required: true, message: "档案目录ID不能为空", trigger: "blur" }
         ],
+        birthNum: [
+          { required: true, message: "出生证编号不能为空", trigger: "blur" }
+        ],
+        name: [
+          { required: true, message: "婴儿姓名不能为空", trigger: "blur" }
+        ],
+      },
+      // 审核
+      shenHe:{
+        // 是否显示审核弹出层
+        open: false,
+        // 表单参数
+        form: {},
+        // 表单校验
+        rules: {
+          auditResult: [
+            { required: true, message: "审核结果不能为空", trigger: "blur" }
+          ],
+          auditReason: [
+            { required: true, message: "审核原因不能为空", trigger: "blur" }
+          ],
+        }
+      },
+      // 档案历史记录
+      dalsInfo: {
+        visible: false,
+        // 遮罩层
+        loading: false,
+        // 总条数
+        total: 0,
+        // 查询参数
+        queryParams:{
+          pageNum: 1,
+          pageSize: 10
+        },
+        // 查询列表
+        list: [],
+        // 选中数据
+        selectRow: null
+      },
+      // 档案目录
+      damlInfo:{
+        visible: false,
+        // 遮罩层
+        loading: false,
+        // 是否展开，默认全部折叠
+        isExpandAll: false,
+        // 重新渲染表格状态
+        refreshTable: true,
+        // 查询参数
+        queryParams:{
+          ywType: 'option4',
+        },
+        // 查询列表
+        list: [],
+        // 选中数据
+        selectRow: null
       }
     };
   },
@@ -507,14 +869,15 @@ export default {
     },
     // 取消按钮
     cancel() {
-      this.open = false;
+      this.open_jc = false;
+      this.open_add = false
       this.reset();
     },
     // 表单重置
     reset() {
       this.form = {
         id: null,
-        ywType: null,
+        ywType: 'option4',
         muId: null,
         birthNum: null,
         name: null,
@@ -551,6 +914,7 @@ export default {
         updateBy: null,
         updateTime: null
       };
+      this.shiBieList = [];
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
@@ -563,26 +927,18 @@ 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 = "添加出生登记";
+      this.open_add = true;
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const id = row.id || this.ids
+      const id = row.id
       getBirthDJ(id).then(response => {
         this.form = response.data;
-        this.open = true;
-        this.title = "修改出生登记";
+        this.open_jc = true;
       });
     },
     /** 提交按钮 */
@@ -590,15 +946,10 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.id != null) {
+            this.form.errorCorrect = 1;
             updateBirthDJ(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addBirthDJ(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
+              this.open_jc = false;
               this.getList();
             });
           }
@@ -607,7 +958,7 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const ids = row.id || this.ids;
+      const ids = row.id;
       this.$modal.confirm('是否确认删除出生登记编号为"' + ids + '"的数据项？').then(function() {
         return delBirthDJ(ids);
       }).then(() => {
@@ -615,12 +966,140 @@ export default {
         this.$modal.msgSuccess("删除成功");
       }).catch(() => {});
     },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('dangan/birthDJ/export', {
-        ...this.queryParams
-      }, `birthDJ_${new Date().getTime()}.xlsx`)
-    }
+    /** 审核按钮操作 */
+    handleShenHe(row) {
+      this.reset();
+      this.resetForm("shenHeForm");
+      const id = row.id
+      getBirthDJ(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
+          updateBirthDJ(this.shenHe.form).then(response => {
+            this.$modal.msgSuccess("操作成功");
+            this.shenHe.open = false;
+            this.getList();
+          });
+        }
+      });
+    },
+    // 选择档案记录
+    selectDaRecard(){
+      if(this.form.muId){
+        this.dalsInfo.queryParams.muId = this.form.muId;
+        this.getlistPictureRecard()
+        this.dalsInfo.visible = true;
+      }else {
+        this.$alert(`请先选择档案目录`, `提示`, {
+          type: 'warning'
+        });
+      }
+    },
+    // 档案历史记录查询
+    dalsInfoQuery(){
+      this.dalsInfo.queryParams.pageNum = 1;
+      this.getlistPictureRecard();
+    },
+    // 档案历史选择 选中数据
+    dalsInfoDblclick(row) {
+      this.dalsInfo.selectRow = row;
+    },
+    // 档案历史确认选中
+    dalsSubmit(){
+      if(this.dalsInfo.selectRow.length===1){
+        this.dalsInfo.visible = false;
+        this.shiBieList = this.dalsInfo.selectRow
+      }else {
+        this.$alert(`选择1条档案历史记录数据`, `提示`, {
+          type: 'warning'
+        });
+      }
+    },
+    /** 查询档案历史记录列表 */
+    getlistPictureRecard() {
+      this.dalsInfo.loading = true;
+      listPictureRecard(this.dalsInfo.queryParams).then(response => {
+        this.dalsInfo.list = response.rows;
+        this.dalsInfo.total = response.total;
+        this.dalsInfo.loading = false;
+      });
+    },
+    // 档案目录选择
+    muIdChange(){
+      this.damlInfo.visible = true;
+      this.getlistCatalog()
+    },
+    // 获取档案目录
+    getlistCatalog(){
+      this.damlInfo.loading = true;
+      listCatalog(this.damlInfo.queryParams).then(response => {
+        this.damlInfo.list = this.handleTree(response.data, "id","pid");
+        this.damlInfo.loading = false;
+      });
+    },
+    // 双击选择档案目录
+    damlInfoDblclick(row){
+      this.damlInfo.selectRow = row;
+      this.form.muId = row.id
+      this.damlInfo.visible = false
+    },
+    /** 新增手动识别提交按钮 */
+    addSubmitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if(this.shiBieList&&this.shiBieList.length>0){
+            // 识别图片id
+            this.form.picIds='';
+            // 识别图片地址
+            this.form.pictures='';
+            // 相关图片id
+            this.form.allPicIds='';
+            // 相关图片id
+            this.form.allPics='';
+
+            this.shiBieList.forEach(item=>{
+              this.form.picIds += item.id+',';
+              // 识别图片地址
+              this.form.pictures += item.picUrl+',';
+              // 相关图片id
+              this.form.allPicIds += item.id+',';
+              // 相关图片id
+              this.form.allPics += item.picUrl+',';
+            })
+
+            this.form.picIds= this.form.picIds.slice(0, -1);
+            this.form.pictures= this.form.pictures.slice(0, -1);
+            this.form.allPicIds= this.form.allPicIds.slice(0, -1);
+            this.form.allPics= this.form.allPics.slice(0, -1);
+
+            this.form.auditStatus = '0';
+            this.form.errorCorrect = 0;
+
+            addBirthDJ(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open_add = false;
+              this.getList();
+            });
+          }else {
+            this.$alert(`请先点击【选择档案记录】或【直接上传】选择识别图片`, `提示`, {
+              type: 'warning'
+            });
+          }
+        }
+      });
+    },
   }
 };
 </script>
+
+<style lang="scss">
+.el-carousel__item{
+  background-color: #b5c2d2;
+}
+</style>

From 357629550e30b57dd43a6e8220a0c37b9e57fa2b Mon Sep 17 00:00:00 2001
From: wanglei <wl2666675>
Date: Fri, 14 Jun 2024 18:11:10 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=B8=80=E8=83=8E=E8=AF=81=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dangan-ui/src/views/dangan/ytzm/index.vue | 971 ++++++++++++++++------
 1 file changed, 703 insertions(+), 268 deletions(-)

diff --git a/dangan-ui/src/views/dangan/ytzm/index.vue b/dangan-ui/src/views/dangan/ytzm/index.vue
index 06172d0..bb4c534 100644
--- a/dangan-ui/src/views/dangan/ytzm/index.vue
+++ b/dangan-ui/src/views/dangan/ytzm/index.vue
@@ -1,10 +1,10 @@
 <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-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+      <el-form-item label="档案目录ID" prop="muId">
         <el-input
           v-model="queryParams.muId"
-          placeholder="请输入目录id"
+          placeholder="请输入档案目录ID"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -97,14 +97,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="意见" prop="suggest">
-        <el-input
-          v-model="queryParams.suggest"
-          placeholder="请输入意见"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="派出所位置" prop="pcsAddress">
         <el-input
           v-model="queryParams.pcsAddress"
@@ -113,73 +105,51 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="填表日
-填表日期1" prop="tbDate1">
+      <el-form-item label="填表日期1" prop="tbDate1">
         <el-date-picker clearable
           v-model="queryParams.tbDate1"
           type="date"
           value-format="yyyy-MM-dd"
-          placeholder="请选择填表日
-填表日期1">
+          placeholder="请选择填表日期1">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="填表日
-填表日期2" prop="tbDate2">
+      <el-form-item label="填表日期2" prop="tbDate2">
         <el-date-picker clearable
           v-model="queryParams.tbDate2"
           type="date"
           value-format="yyyy-MM-dd"
-          placeholder="请选择填表日
-填表日期2">
+          placeholder="请选择填表日期2">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="识别图片id" prop="picIds">
-        <el-input
-          v-model="queryParams.picIds"
-          placeholder="请输入识别图片id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="相关图片id" prop="allPicIds">
-        <el-input
-          v-model="queryParams.allPicIds"
-          placeholder="请输入相关图片id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="是否纠错(字典0否1是)" prop="errorCorrect">
-        <el-input
+      <el-form-item label="是否纠错" prop="errorCorrect">
+        <el-select
           v-model="queryParams.errorCorrect"
-          placeholder="请输入是否纠错(字典0否1是)"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="审核人" prop="auditName">
-        <el-input
-          v-model="queryParams.auditName"
-          placeholder="请输入审核人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="审核结果" prop="auditResult">
-        <el-input
-          v-model="queryParams.auditResult"
-          placeholder="请输入审核结果"
+          placeholder="是否纠错"
           clearable
-          @keyup.enter.native="handleQuery"
-        />
+          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="auditReason">
-        <el-input
-          v-model="queryParams.auditReason"
-          placeholder="请输入审核原由"
+      <el-form-item label="审核状态" prop="auditStatus">
+        <el-select
+          v-model="queryParams.auditStatus"
+          placeholder="审核状态"
           clearable
-          @keyup.enter.native="handleQuery"
-        />
+          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>
@@ -196,108 +166,86 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['dangan:ytzm: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:ytzm: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:ytzm:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['dangan:ytzm:export']"
-        >导出</el-button>
+        >新增手动识别</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="ytzmList" @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="业务类型(字典)" align="center" prop="ywType" />
-      <el-table-column label="目录id" align="center" prop="muId" />
-      <el-table-column label="年份" align="center" prop="year" />
-      <el-table-column label="序号" align="center" prop="xh" />
-      <el-table-column label="姓名女" align="center" prop="wName" />
-      <el-table-column label="工作单位女" align="center" prop="wUnit" />
-      <el-table-column label="身份证号女" align="center" prop="wCardId" />
-      <el-table-column label="姓名男" align="center" prop="mName" />
-      <el-table-column label="工作单位男" align="center" prop="mUnit" />
-      <el-table-column label="身份证号男" align="center" prop="mCardId" />
-      <el-table-column label="生育证号" align="center" prop="syzh" />
-      <el-table-column label="出生日期" align="center" prop="birthday" width="180">
+    <el-table v-loading="loading" :data="ytzmList" border>
+      <el-table-column label="档案目录ID" align="center" prop="muId" min-width="90" fixed/>
+      <el-table-column label="年份" align="center" prop="year" min-width="100" show-overflow-tooltip/>
+      <el-table-column label="序号" align="center" prop="xh" min-width="100" show-overflow-tooltip/>
+      <el-table-column label="姓名女" align="center" prop="wName" min-width="100" show-overflow-tooltip/>
+      <el-table-column label="工作单位女" align="center" prop="wUnit" min-width="100" show-overflow-tooltip/>
+      <el-table-column label="身份证号女" align="center" prop="wCardId" min-width="100" show-overflow-tooltip/>
+      <el-table-column label="姓名男" align="center" prop="mName" min-width="100" show-overflow-tooltip/>
+      <el-table-column label="工作单位男" align="center" prop="mUnit" min-width="100" show-overflow-tooltip/>
+      <el-table-column label="身份证号男" align="center" prop="mCardId" min-width="100" show-overflow-tooltip/>
+      <el-table-column label="生育证号" align="center" prop="syzh" min-width="100" show-overflow-tooltip/>
+      <el-table-column label="出生日期" align="center" prop="birthday" min-width="100" show-overflow-tooltip>
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.birthday, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="医院地址" align="center" prop="hospital" />
-      <el-table-column label="婴儿性别" align="center" prop="babySex" />
-      <el-table-column label="意见" align="center" prop="suggest" />
-      <el-table-column label="派出所位置" align="center" prop="pcsAddress" />
-      <el-table-column label="填表日
-填表日期1" align="center" prop="tbDate1" width="180">
+      <el-table-column label="医院地址" align="center" prop="hospital" min-width="100" show-overflow-tooltip/>
+      <el-table-column label="婴儿性别" align="center" prop="babySex" min-width="100" show-overflow-tooltip/>
+      <el-table-column label="意见" align="center" prop="suggest" min-width="100" show-overflow-tooltip/>
+      <el-table-column label="派出所位置" align="center" prop="pcsAddress" min-width="100" show-overflow-tooltip/>
+      <el-table-column label="填表日期1" align="center" prop="tbDate1" min-width="100" show-overflow-tooltip/>
+      <el-table-column label="填表日期2" align="center" prop="tbDate2" min-width="100" show-overflow-tooltip/>
+      <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="allPics">
+        <template slot-scope="scope">
+          <image-preview :src="scope.row.allPics" :width="50" :height="50"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="是否纠错" align="center" prop="errorCorrect" min-width="100" show-overflow-tooltip>
+        <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" min-width="100">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.tbDate1, '{y}-{m}-{d}') }}</span>
+          <dict-tag :options="dict.type.audit_status" :value="scope.row.auditStatus"/>
         </template>
       </el-table-column>
-      <el-table-column label="填表日
-填表日期2" align="center" prop="tbDate2" width="180">
+      <el-table-column label="审核结果" align="center" prop="auditResult" min-width="100" show-overflow-tooltip>
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.tbDate2, '{y}-{m}-{d}') }}</span>
+          <dict-tag :options="dict.type.audit_status" :value="scope.row.auditResult"/>
         </template>
       </el-table-column>
-      <el-table-column label="识别图片id" align="center" prop="picIds" />
-      <el-table-column label="识别图片" align="center" prop="pictures" />
-      <el-table-column label="相关图片id" align="center" prop="allPicIds" />
-      <el-table-column label="相关图片" align="center" prop="allPics" />
-      <el-table-column label="是否纠错(字典0否1是)" align="center" prop="errorCorrect" />
-      <el-table-column label="审核状态(字典)" align="center" prop="auditStatus" />
-      <el-table-column label="审核人" align="center" prop="auditName" />
-      <el-table-column label="审核结果" align="center" prop="auditResult" />
-      <el-table-column label="审核原由" align="center" prop="auditReason" />
-      <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="审核原由" align="center" prop="auditReason" min-width="140" show-overflow-tooltip/>
+      <el-table-column label="备注" align="center" prop="remark" min-width="140" show-overflow-tooltip/>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="160" fixed="right">
         <template slot-scope="scope">
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['dangan:ytzm:edit']"
-          >修改</el-button>
+            v-hasPermi="['dangan:qyz:edit']"
+          >纠错</el-button>
+          <el-button
+            v-if="scope.row.auditStatus=='0'"
+            size="mini"
+            type="text"
+            @click="handleShenHe(scope.row)"
+            v-hasPermi="['dangan:qyz:edit']"
+          >审核</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['dangan:ytzm:remove']"
+            v-hasPermi="['dangan:qyz:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -306,142 +254,459 @@
       @pagination="getList"
     />
 
-    <!-- 添加或修改一胎证明对话框 -->
-    <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-form-item label="年份" prop="year">
-          <el-input v-model="form.year" placeholder="请输入年份" />
-        </el-form-item>
-        <el-form-item label="序号" prop="xh">
-          <el-input v-model="form.xh" placeholder="请输入序号" />
-        </el-form-item>
-        <el-form-item label="姓名女" prop="wName">
-          <el-input v-model="form.wName" placeholder="请输入姓名女" />
-        </el-form-item>
-        <el-form-item label="工作单位女" prop="wUnit">
-          <el-input v-model="form.wUnit" placeholder="请输入工作单位女" />
-        </el-form-item>
-        <el-form-item label="身份证号女" prop="wCardId">
-          <el-input v-model="form.wCardId" placeholder="请输入身份证号女" />
-        </el-form-item>
-        <el-form-item label="姓名男" prop="mName">
-          <el-input v-model="form.mName" placeholder="请输入姓名男" />
-        </el-form-item>
-        <el-form-item label="工作单位男" prop="mUnit">
-          <el-input v-model="form.mUnit" placeholder="请输入工作单位男" />
-        </el-form-item>
-        <el-form-item label="身份证号男" prop="mCardId">
-          <el-input v-model="form.mCardId" placeholder="请输入身份证号男" />
-        </el-form-item>
-        <el-form-item label="生育证号" prop="syzh">
-          <el-input v-model="form.syzh" placeholder="请输入生育证号" />
-        </el-form-item>
-        <el-form-item label="出生日期" prop="birthday">
-          <el-date-picker clearable
-            v-model="form.birthday"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择出生日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="医院地址" prop="hospital">
-          <el-input v-model="form.hospital" placeholder="请输入医院地址" />
-        </el-form-item>
-        <el-form-item label="意见" prop="suggest">
-          <el-input v-model="form.suggest" placeholder="请输入意见" />
-        </el-form-item>
-        <el-form-item label="派出所位置" prop="pcsAddress">
-          <el-input v-model="form.pcsAddress" placeholder="请输入派出所位置" />
-        </el-form-item>
-        <el-form-item label="填表日
-填表日期1" prop="tbDate1">
-          <el-date-picker clearable
-            v-model="form.tbDate1"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择填表日
-填表日期1">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="填表日
-填表日期2" prop="tbDate2">
-          <el-date-picker clearable
-            v-model="form.tbDate2"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择填表日
-填表日期2">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="识别图片id" prop="picIds">
-          <el-input v-model="form.picIds" placeholder="请输入识别图片id" />
-        </el-form-item>
-        <el-form-item label="识别图片" prop="pictures">
-          <el-input v-model="form.pictures" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-        <el-form-item label="相关图片id" prop="allPicIds">
-          <el-input v-model="form.allPicIds" placeholder="请输入相关图片id" />
-        </el-form-item>
-        <el-form-item label="相关图片" prop="allPics">
-          <el-input v-model="form.allPics" type="textarea" placeholder="请输入内容" />
+    <!-- 纠错 -->
+    <el-dialog title="纠错" :visible.sync="open_jc" width="1400px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-row :gutter="10">
+          <el-col :span="8">
+            <el-carousel height="600px" v-if="form.pictures" :autoplay="false">
+              <el-carousel-item v-for="item in form.pictures.split(',')" :key="item">
+                <div style="height: 600px; overflow: auto">
+                  <el-image style="height:850px; width: 100%" :src="item" fit="contain" :preview-src-list="[item]"></el-image>
+                </div>
+              </el-carousel-item>
+            </el-carousel>
+          </el-col>
+          <el-col :span="16">
+            <el-row :gutter="20">
+              <el-col :span="12">
+                <el-form-item label="年份" prop="year">
+                  <el-input v-model="form.year" placeholder="请输入年份" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="序号" prop="xh">
+                  <el-input v-model="form.xh" placeholder="请输入序号" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20">
+              <el-col :span="8">
+                <el-form-item label="姓名女" prop="wName">
+                  <el-input v-model="form.wName" placeholder="请输入姓名女" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="工作单位女" prop="wUnit">
+                  <el-input v-model="form.wUnit" placeholder="请输入工作单位女" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="身份证号女" prop="wCardId">
+                  <el-input v-model="form.wCardId" placeholder="请输入身份证号女" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20">
+              <el-col :span="8">
+                <el-form-item label="姓名男" prop="mName">
+                  <el-input v-model="form.mName" placeholder="请输入姓名男" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="工作单位男" prop="mUnit">
+                  <el-input v-model="form.mUnit" placeholder="请输入工作单位男" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="身份证号男" prop="mCardId">
+                  <el-input v-model="form.mCardId" placeholder="请输入身份证号男" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20">
+              <el-col :span="8">
+                <el-form-item label="生育证号" prop="syzh">
+                  <el-input v-model="form.syzh" placeholder="请输入生育证号" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="出生日期" prop="birthday">
+                  <el-date-picker clearable
+                                  v-model="form.birthday"
+                                  type="date"
+                                  value-format="yyyy-MM-dd"
+                                  placeholder="请选择出生日期">
+                  </el-date-picker>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="婴儿性别" prop="babySex">
+                  <el-input v-model="form.babySex" placeholder="请输入婴儿性别" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20">
+              <el-col :span="24">
+                <el-form-item label="医院地址" prop="hospital">
+                  <el-input v-model="form.hospital" placeholder="请输入医院地址" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="意见" prop="suggest">
+                  <el-input v-model="form.suggest" placeholder="请输入意见" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="派出所位置" prop="pcsAddress">
+                  <el-input v-model="form.pcsAddress" placeholder="请输入派出所位置" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20">
+              <el-col :span="12">
+                <el-form-item label="填表日期1" prop="tbDate1">
+                  <el-date-picker clearable
+                                  v-model="form.tbDate1"
+                                  type="date"
+                                  value-format="yyyy-MM-dd"
+                                  placeholder="请选择填表日期1">
+                  </el-date-picker>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="填表日期2" prop="tbDate2">
+                  <el-date-picker clearable
+                                  v-model="form.tbDate2"
+                                  type="date"
+                                  value-format="yyyy-MM-dd"
+                                  placeholder="请选择填表日期2">
+                  </el-date-picker>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20">
+              <el-col :span="24">
+                <el-form-item label="备注" prop="remark">
+                  <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-col>
+        </el-row>
+
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 新增手动识别-->
+    <el-dialog title="新增手动识别" :visible.sync="open_add" width="1400px" append-to-body>
+
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="档案目录ID" prop="muId">
+              <el-input readonly  placeholder="请选择档案目录ID" v-model="form.muId">
+                <el-button slot="append" icon="el-icon-search" @click="muIdChange"></el-button>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-button type="primary" @click="selectDaRecard" style="margin-left: 10px;">选择档案记录</el-button>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20" v-if="shiBieList&&shiBieList.length>0">
+          <el-col :span="8">
+            <el-carousel height="600px" :autoplay="false">
+              <el-carousel-item v-for="item in shiBieList" :key="item.id">
+                <div style="height: 600px; overflow: auto">
+                  <el-image style="height:850px; width: 100%" :src="item.picUrl" fit="contain" :preview-src-list="[item.picUrl]"></el-image>
+                </div>
+              </el-carousel-item>
+            </el-carousel>
+          </el-col>
+          <el-col :span="16">
+            <el-row :gutter="20">
+              <el-col :span="12">
+                <el-form-item label="年份" prop="year">
+                  <el-input v-model="form.year" placeholder="请输入年份" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="序号" prop="xh">
+                  <el-input v-model="form.xh" placeholder="请输入序号" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20">
+              <el-col :span="8">
+                <el-form-item label="姓名女" prop="wName">
+                  <el-input v-model="form.wName" placeholder="请输入姓名女" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="工作单位女" prop="wUnit">
+                  <el-input v-model="form.wUnit" placeholder="请输入工作单位女" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="身份证号女" prop="wCardId">
+                  <el-input v-model="form.wCardId" placeholder="请输入身份证号女" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20">
+              <el-col :span="8">
+                <el-form-item label="姓名男" prop="mName">
+                  <el-input v-model="form.mName" placeholder="请输入姓名男" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="工作单位男" prop="mUnit">
+                  <el-input v-model="form.mUnit" placeholder="请输入工作单位男" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="身份证号男" prop="mCardId">
+                  <el-input v-model="form.mCardId" placeholder="请输入身份证号男" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20">
+              <el-col :span="8">
+                <el-form-item label="生育证号" prop="syzh">
+                  <el-input v-model="form.syzh" placeholder="请输入生育证号" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="出生日期" prop="birthday">
+                  <el-date-picker clearable
+                                  v-model="form.birthday"
+                                  type="date"
+                                  value-format="yyyy-MM-dd"
+                                  placeholder="请选择出生日期">
+                  </el-date-picker>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="婴儿性别" prop="babySex">
+                  <el-input v-model="form.babySex" placeholder="请输入婴儿性别" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20">
+              <el-col :span="24">
+                <el-form-item label="医院地址" prop="hospital">
+                  <el-input v-model="form.hospital" placeholder="请输入医院地址" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="意见" prop="suggest">
+                  <el-input v-model="form.suggest" placeholder="请输入意见" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="派出所位置" prop="pcsAddress">
+                  <el-input v-model="form.pcsAddress" placeholder="请输入派出所位置" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20">
+              <el-col :span="12">
+                <el-form-item label="填表日期1" prop="tbDate1">
+                  <el-date-picker clearable
+                                  v-model="form.tbDate1"
+                                  type="date"
+                                  value-format="yyyy-MM-dd"
+                                  placeholder="请选择填表日期1">
+                  </el-date-picker>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="填表日期2" prop="tbDate2">
+                  <el-date-picker clearable
+                                  v-model="form.tbDate2"
+                                  type="date"
+                                  value-format="yyyy-MM-dd"
+                                  placeholder="请选择填表日期2">
+                  </el-date-picker>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20">
+              <el-col :span="24">
+                <el-form-item label="备注" prop="remark">
+                  <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-col>
+
+        </el-row>
+
+      </el-form>
+
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="addSubmitForm">确 定</el-button>
+        <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="是否纠错(字典0否1是)" prop="errorCorrect">
-          <el-input v-model="form.errorCorrect" placeholder="请输入是否纠错(字典0否1是)" />
+        <el-form-item label="审核原因" prop="auditReason">
+          <el-input v-model="shenHe.form.auditReason" type="textarea" placeholder="请输入审核原因" />
         </el-form-item>
-        <el-form-item label="审核人" prop="auditName">
-          <el-input v-model="form.auditName" placeholder="请输入审核人" />
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="shenHeSubmit">确 定</el-button>
+      </div>
+    </el-dialog>
+
+    <!--选择档案历史记录-->
+    <el-dialog title="选择档案历史记录" :visible.sync="dalsInfo.visible" width="1200px" append-to-body>
+      <el-form :model="dalsInfo.queryParams" ref="queryForm" size="small" :inline="true" label-width="100px">
+
+        <el-form-item label="物理书架路径" prop="wlsjPath">
+          <el-input
+            v-model="dalsInfo.queryParams.wlsjPath"
+            placeholder="请输入物理书架路径"
+            clearable
+            @keyup.enter.native="dalsInfoQuery"
+          />
         </el-form-item>
-        <el-form-item label="审核结果" prop="auditResult">
-          <el-input v-model="form.auditResult" placeholder="请输入审核结果" />
+
+        <el-form-item label="是否已经识别" prop="recognize">
+          <el-select
+            v-model="dalsInfo.queryParams.recognize"
+            placeholder="是否已经识别"
+            clearable
+            style="width:100%"
+          >
+            <el-option
+              v-for="dict in dict.type.recognize"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
         </el-form-item>
-        <el-form-item label="审核原由" prop="auditReason">
-          <el-input v-model="form.auditReason" placeholder="请输入审核原由" />
+
+        <el-form-item label="图片名称" prop="picName">
+          <el-input
+            v-model="dalsInfo.queryParams.picName"
+            placeholder="请输入图片名称"
+            clearable
+            @keyup.enter.native="dalsInfoQuery"
+          />
         </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="dalsInfoQuery">搜索</el-button>
         </el-form-item>
       </el-form>
+      <el-table v-loading="dalsInfo.loading" :data="dalsInfo.list" border height="500" @selection-change="dalsInfoDblclick">
+        <el-table-column type="selection" width="50" align="center" fixed/>
+        <el-table-column label="档案目录ID" align="center" prop="muId" fixed min-width="50"/>
+        <el-table-column label="档案目录路径" align="center" prop="muPath" fixed min-width="100" show-overflow-tooltip/>
+        <el-table-column label="物理书架路径" align="center" prop="wlsjPath" min-width="100" show-overflow-tooltip/>
+        <el-table-column label="是否已经识别" align="center" prop="recognize" >
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.recognize" :value="scope.row.recognize"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="上传时间" align="center" prop="createTime" min-width="100" show-overflow-tooltip/>
+        <el-table-column label="图片名称" align="center" prop="picName" min-width="100" show-overflow-tooltip/>
+        <el-table-column label="图片路径" align="center" prop="picUrl">
+          <template slot-scope="scope">
+            <image-preview :src="scope.row.picUrl" :width="40" :height="40"/>
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination
+        v-show="dalsInfo.total>0"
+        :total="dalsInfo.total"
+        :page.sync="dalsInfo.queryParams.pageNum"
+        :limit.sync="dalsInfo.queryParams.pageSize"
+        @pagination="getlistPictureRecard"
+      />
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="dalsSubmit">确 定</el-button>
       </div>
     </el-dialog>
+
+    <!--选择档案目录-->
+    <el-dialog title="选择档案目录" :visible.sync="damlInfo.visible" width="1200px" append-to-body>
+      <el-table v-if="damlInfo.refreshTable" border
+                v-loading="damlInfo.loading"
+                :data="damlInfo.list"
+                row-key="id"
+                :default-expand-all="damlInfo.isExpandAll"
+                :tree-props="{children: 'children', hasChildren: 'hasChildren'}" @cell-dblclick="damlInfoDblclick">
+        <el-table-column label="目录名称" align="left" header-align="center" prop="muName"/>
+        <el-table-column label="业务类型" align="center" prop="ywType" >
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.yw_type" :value="scope.row.ywType"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="显示顺序" align="center" prop="orderNum" />
+        <el-table-column label="状态" align="center" prop="status" >
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="图片" align="center" prop="picPath" >
+          <template slot-scope="scope">
+            <image-preview :src="scope.row.picPath" :width="50" :height="50" v-if="scope.row.pid===0"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="创建时间" align="center" prop="createTime">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.createTime) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" align="center" prop="remark" />
+      </el-table>
+    </el-dialog>
+
   </div>
 </template>
 
 <script>
 import { listYtzm, getYtzm, delYtzm, addYtzm, updateYtzm } from "@/api/dangan/ytzm";
+import { listCatalog } from "@/api/dangan/catalog";
+import { listPictureRecard } from "@/api/dangan/pictureRecard";
 
 export default {
   name: "Ytzm",
+  dicts: ['error_correct', 'audit_status', 'yw_type', 'recognize'],
   data() {
     return {
       // 遮罩层
       loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
       // 显示搜索条件
       showSearch: true,
       // 总条数
       total: 0,
       // 一胎证明表格数据
       ytzmList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
+      // 是否显示纠错弹出层
+      open_jc: false,
+      // 是否显示新增弹出层
+      open_add: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        ywType: null,
+        ywType: 'option6',
         muId: null,
         year: null,
         xh: null,
@@ -471,11 +736,64 @@ export default {
       },
       // 表单参数
       form: {},
+      // 识别list
+      shiBieList: [],
       // 表单校验
       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" }
+          ],
+        }
+      },
+      // 档案历史记录
+      dalsInfo: {
+        visible: false,
+        // 遮罩层
+        loading: false,
+        // 总条数
+        total: 0,
+        // 查询参数
+        queryParams:{
+          pageNum: 1,
+          pageSize: 10
+        },
+        // 查询列表
+        list: [],
+        // 选中数据
+        selectRow: null
+      },
+      // 档案目录
+      damlInfo:{
+        visible: false,
+        // 遮罩层
+        loading: false,
+        // 是否展开，默认全部折叠
+        isExpandAll: false,
+        // 重新渲染表格状态
+        refreshTable: true,
+        // 查询参数
+        queryParams:{
+          ywType: 'option6',
+        },
+        // 查询列表
+        list: [],
+        // 选中数据
+        selectRow: null
       }
     };
   },
@@ -494,14 +812,15 @@ export default {
     },
     // 取消按钮
     cancel() {
-      this.open = false;
+      this.open_jc = false;
+      this.open_add = false
       this.reset();
     },
     // 表单重置
     reset() {
       this.form = {
         id: null,
-        ywType: null,
+        ywType: 'option6',
         muId: null,
         year: null,
         xh: null,
@@ -534,6 +853,7 @@ export default {
         updateBy: null,
         updateTime: null
       };
+      this.shiBieList = [];
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
@@ -546,26 +866,18 @@ 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 = "添加一胎证明";
+      this.open_add = true;
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const id = row.id || this.ids
+      const id = row.id
       getYtzm(id).then(response => {
         this.form = response.data;
-        this.open = true;
-        this.title = "修改一胎证明";
+        this.open_jc = true;
       });
     },
     /** 提交按钮 */
@@ -573,15 +885,10 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.id != null) {
+            this.form.errorCorrect = 1;
             updateYtzm(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addYtzm(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
+              this.open_jc = false;
               this.getList();
             });
           }
@@ -590,7 +897,7 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const ids = row.id || this.ids;
+      const ids = row.id
       this.$modal.confirm('是否确认删除一胎证明编号为"' + ids + '"的数据项？').then(function() {
         return delYtzm(ids);
       }).then(() => {
@@ -598,12 +905,140 @@ export default {
         this.$modal.msgSuccess("删除成功");
       }).catch(() => {});
     },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('dangan/ytzm/export', {
-        ...this.queryParams
-      }, `ytzm_${new Date().getTime()}.xlsx`)
-    }
+    /** 审核按钮操作 */
+    handleShenHe(row) {
+      this.reset();
+      this.resetForm("shenHeForm");
+      const id = row.id
+      getYtzm(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
+          updateYtzm(this.shenHe.form).then(response => {
+            this.$modal.msgSuccess("操作成功");
+            this.shenHe.open = false;
+            this.getList();
+          });
+        }
+      });
+    },
+    // 选择档案记录
+    selectDaRecard(){
+      if(this.form.muId){
+        this.dalsInfo.queryParams.muId = this.form.muId;
+        this.getlistPictureRecard()
+        this.dalsInfo.visible = true;
+      }else {
+        this.$alert(`请先选择档案目录`, `提示`, {
+          type: 'warning'
+        });
+      }
+    },
+    // 档案历史记录查询
+    dalsInfoQuery(){
+      this.dalsInfo.queryParams.pageNum = 1;
+      this.getlistPictureRecard();
+    },
+    // 档案历史选择 选中数据
+    dalsInfoDblclick(row) {
+      this.dalsInfo.selectRow = row;
+    },
+    // 档案历史确认选中
+    dalsSubmit(){
+      if(this.dalsInfo.selectRow.length===1){
+        this.dalsInfo.visible = false;
+        this.shiBieList = this.dalsInfo.selectRow
+      }else {
+        this.$alert(`选择1条档案历史记录数据`, `提示`, {
+          type: 'warning'
+        });
+      }
+    },
+    /** 查询档案历史记录列表 */
+    getlistPictureRecard() {
+      this.dalsInfo.loading = true;
+      listPictureRecard(this.dalsInfo.queryParams).then(response => {
+        this.dalsInfo.list = response.rows;
+        this.dalsInfo.total = response.total;
+        this.dalsInfo.loading = false;
+      });
+    },
+    // 档案目录选择
+    muIdChange(){
+      this.damlInfo.visible = true;
+      this.getlistCatalog()
+    },
+    // 获取档案目录
+    getlistCatalog(){
+      this.damlInfo.loading = true;
+      listCatalog(this.damlInfo.queryParams).then(response => {
+        this.damlInfo.list = this.handleTree(response.data, "id","pid");
+        this.damlInfo.loading = false;
+      });
+    },
+    // 双击选择档案目录
+    damlInfoDblclick(row){
+      this.damlInfo.selectRow = row;
+      this.form.muId = row.id
+      this.damlInfo.visible = false
+    },
+    /** 新增手动识别提交按钮 */
+    addSubmitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if(this.shiBieList&&this.shiBieList.length>0){
+            // 识别图片id
+            this.form.picIds='';
+            // 识别图片地址
+            this.form.pictures='';
+            // 相关图片id
+            this.form.allPicIds='';
+            // 相关图片id
+            this.form.allPics='';
+
+            this.shiBieList.forEach(item=>{
+              this.form.picIds += item.id+',';
+              // 识别图片地址
+              this.form.pictures += item.picUrl+',';
+              // 相关图片id
+              this.form.allPicIds += item.id+',';
+              // 相关图片id
+              this.form.allPics += item.picUrl+',';
+            })
+
+            this.form.picIds= this.form.picIds.slice(0, -1);
+            this.form.pictures= this.form.pictures.slice(0, -1);
+            this.form.allPicIds= this.form.allPicIds.slice(0, -1);
+            this.form.allPics= this.form.allPics.slice(0, -1);
+
+            this.form.auditStatus = '0';
+            this.form.errorCorrect = 0;
+
+            addYtzm(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open_add = false;
+              this.getList();
+            });
+          }else {
+            this.$alert(`请先点击【选择档案记录】或【直接上传】选择识别图片`, `提示`, {
+              type: 'warning'
+            });
+          }
+        }
+      });
+    },
   }
 };
 </script>
+
+<style lang="scss">
+.el-carousel__item{
+  background-color: #b5c2d2;
+}
+</style>

From caaf6d26b1b05bb43745259669ded79daba0c76e Mon Sep 17 00:00:00 2001
From: wanglei <wl2666675>
Date: Sat, 15 Jun 2024 11:14:11 +0800
Subject: [PATCH 3/3] =?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/birthDJ/index.vue  |  8 ++++----
 dangan-ui/src/views/dangan/qyz/index.vue      | 12 ++++++------
 dangan-ui/src/views/dangan/zfnyhkcg/index.vue |  4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/dangan-ui/src/views/dangan/birthDJ/index.vue b/dangan-ui/src/views/dangan/birthDJ/index.vue
index d85573f..5529495 100644
--- a/dangan-ui/src/views/dangan/birthDJ/index.vue
+++ b/dangan-ui/src/views/dangan/birthDJ/index.vue
@@ -17,10 +17,10 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="婴儿姓名" prop="name">
+      <el-form-item label="姓名" prop="name">
         <el-input
           v-model="queryParams.name"
-          placeholder="请输入婴儿姓名"
+          placeholder="请输入姓名"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -41,7 +41,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="母亲姓名" prop="mName">
+<!--      <el-form-item label="母亲姓名" prop="mName">
         <el-input
           v-model="queryParams.mName"
           placeholder="请输入母亲姓名"
@@ -136,7 +136,7 @@
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item>-->
       <el-form-item label="接生人员签字" prop="jsrySign">
         <el-input
           v-model="queryParams.jsrySign"
diff --git a/dangan-ui/src/views/dangan/qyz/index.vue b/dangan-ui/src/views/dangan/qyz/index.vue
index c3b6247..4511bdc 100644
--- a/dangan-ui/src/views/dangan/qyz/index.vue
+++ b/dangan-ui/src/views/dangan/qyz/index.vue
@@ -25,15 +25,15 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="姓名1" prop="name1">
+      <el-form-item label="姓名" prop="name1">
         <el-input
           v-model="queryParams.name1"
-          placeholder="请输入姓名1"
+          placeholder="请输入姓名"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="性别1" prop="sex1">
+<!--      <el-form-item label="性别1" prop="sex1">
         <el-input
           v-model="queryParams.sex1"
           placeholder="请输入性别1"
@@ -120,7 +120,7 @@
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item>-->
 <!--      <el-form-item label="迁移原因" prop="qyReason">
         <el-input
           v-model="queryParams.qyReason"
@@ -161,14 +161,14 @@
                         placeholder="签发有效时间止">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="承办人" prop="cbr">
+<!--      <el-form-item label="承办人" prop="cbr">
         <el-input
           v-model="queryParams.cbr"
           placeholder="请输入承办人"
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item>-->
       <el-form-item label="是否纠错" prop="errorCorrect">
         <el-select
           v-model="queryParams.errorCorrect"
diff --git a/dangan-ui/src/views/dangan/zfnyhkcg/index.vue b/dangan-ui/src/views/dangan/zfnyhkcg/index.vue
index c0f829b..f1f9965 100644
--- a/dangan-ui/src/views/dangan/zfnyhkcg/index.vue
+++ b/dangan-ui/src/views/dangan/zfnyhkcg/index.vue
@@ -33,7 +33,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="与申请人关系1" prop="relation1">
+      <!--     <el-form-item label="与申请人关系1" prop="relation1">
         <el-input
           v-model="queryParams.relation1"
           placeholder="请输入与申请人关系1"
@@ -168,7 +168,7 @@
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item>-->
       <el-form-item label="承办人" prop="cbr">
         <el-input
           v-model="queryParams.cbr"