Ver código fonte

Merge branch '存量老人可以进行修改新增' of sckj/mz-cloud into master

sckj 1 semana atrás
pai
commit
42bae52607

+ 1 - 0
ruoyi-ui-gljt/src/api/gljt/gljtLrHi.js

@@ -42,3 +42,4 @@ export function delGljtLrHi(id) {
     method: 'get'
   })
 }
+

+ 3 - 0
ruoyi-ui-gljt/src/components/ImageUploadGljt/index.vue

@@ -444,5 +444,8 @@
     top: 50%;
     transform: translateY(-50%);
   }
+  ::v-deep .el-upload-list__item-thumbnail{
+    object-fit: cover;
+  }
 </style>
 

+ 1 - 1
ruoyi-ui-gljt/src/views/gljt/gljtSq/index.vue

@@ -1610,7 +1610,7 @@ export default {
         ],
         mz: [{ required: true, message: "民族不能为空", trigger: "blur" }],
         hjdz: [
-          {required: true, message: "申请人户籍地址地址不能为空", trigger: "blur"},
+          {required: true, message: "申请人户籍地址不能为空", trigger: "blur"},
         ],
         yb: [
           {

+ 482 - 109
ruoyi-ui-gljt/src/views/gljt/gljtclLr/index.vue

@@ -86,16 +86,15 @@
         </el-form>
 
         <el-row :gutter="10" class="mb8">
-          <!--      <el-col :span="1.5">-->
-          <!--        <el-button-->
-          <!--          type="primary"-->
-          <!--          plain-->
-          <!--          icon="el-icon-plus"-->
-          <!--          size="mini"-->
-          <!--          @click="handleAdd"-->
-          <!--          v-hasPermi="['gljt:gljtLr:add']"-->
-          <!--        >新增</el-button>-->
-          <!--      </el-col>-->
+                <el-col :span="1.5">
+                  <el-button
+                    type="primary"
+                    plain
+                    icon="el-icon-plus"
+                    size="mini"
+                    @click="handleAdd"
+                  >新增</el-button>
+                </el-col>
 
           <el-col :span="1.5">
             <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleImport(true)" v-hasPermi="['gljt:temp:exprot']"
@@ -155,15 +154,14 @@
           <!--</el-table-column>-->
           <!--<el-table-column label="居住地址" align="center" prop="jzdz" />-->
           <!--<el-table-column label="创建人行政区划编码" align="center" prop="createAreaCode" />-->
-          <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="150">
+          <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="280">
             <template slot-scope="scope">
-              <!--<el-button-->
-              <!--size="mini"-->
-              <!--type="text"-->
-              <!--icon="el-icon-edit"-->
-              <!--@click="handleUpdate(scope.row)"-->
-              <!--v-hasPermi="['gljt:gljtLr:edit']"-->
-              <!--&gt;修改</el-button>-->
+              <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-edit"
+              @click="handleUpdate(scope.row)"
+              >修改</el-button>
               <!--<el-button-->
               <!--size="mini"-->
               <!--type="text"-->
@@ -202,41 +200,284 @@
       </el-col>
     </el-row>
     <!-- 添加或修改高龄津贴申请老人信息对话框 -->
-    <el-dialog v-dialog-drag :title="title" :visible.sync="open" width="600px" append-to-body>
+    <el-dialog v-dialog-drag :title="title" :visible.sync="open"  width="1000px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <h3>基本信息</h3>
+        <div class="grid3">
+          <el-form-item label="姓名" prop="sqrXm">
+            <label slot="label"
+            >姓<span style="opacity: 0">姓名</span>名</label
+            >
+            <el-input
+              v-model="form.sqrXm"
+              @change="changHm"
+              placeholder="请输入申请人姓名"
+            />
+          </el-form-item>
+          <el-form-item label="性别" prop="xb">
+            <label slot="label"
+            >性<span style="opacity: 0">性别</span>别</label
+            >
+            <el-select disabled v-model="form.xb" placeholder="请选择性别">
+              <el-option
+                v-for="dict in dict.type.C0007"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item  label="出生日期" prop="csrq">
+            <el-date-picker
+              disabled
+              clearable
+              v-model="form.csrq"
+              type="date"
+              value-format="yyyyMMdd"
+              placeholder="请选择出生日期"
+            >
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="民族" prop="mz">
+            <label slot="label"
+            >民<span style="opacity: 0">民族</span>族</label
+            >
+            <el-select v-model="form.mz" placeholder="请选择民族">
+              <el-option
+                v-for="dict in dict.type.C0009"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
 
-        <el-form-item label="姓名" prop="xm">
-          <el-input disabled v-model="form.xm" placeholder="请输入姓名"/>
-        </el-form-item>
-
-        <el-form-item label="身份证号" prop="sfzh">
-          <el-input disabled v-model="form.sfzh" placeholder="请输入身份证号"/>
-        </el-form-item>
-        <el-form-item label="登记活体照片" prop="htzp">
-          <image-upload-gljt v-model="form.htzp" :limit="1"></image-upload-gljt>
-          <!--<el-input v-model="form.htzp" type="textarea" maxlength="200" show-word-limit placeholder="请输入登记活体照片"/>-->
-        </el-form-item>
-        <el-form-item label="描述" prop="kz9">
-          <!--<image-upload-gljt v-model="form.kz9" :limit="1"></image-upload-gljt>-->
-          <el-input v-model="form.kz9" type="textarea" maxlength="100" show-word-limit placeholder="请输入描述"/>
-        </el-form-item>
-        <!--<el-form-item label="审核结果" prop="kz4">-->
-        <!--<el-select v-model="form.kz4" placeholder="请选择申请街道(乡镇)审核结果">-->
-        <!--<el-option-->
-        <!--v-for="dict in dict.type.GL007"-->
-        <!--:key="dict.value"-->
-        <!--:label="dict.label"-->
-        <!--:value="dict.value"-->
-        <!--&gt;</el-option>-->
-        <!--</el-select>-->
-        <!--</el-form-item>-->
-        <!--<el-form-item label="审核意见" prop="kz5">-->
-        <!--<el-input  v-model="form.kz5" placeholder="请输入审核意见"/>-->
-        <!--</el-form-item>-->
-
+          <el-form-item label="身份证号" prop="sqrZjhm">
+            <el-input
+              v-model="form.sqrZjhm"
+              placeholder="请输入申请人身份证号"
+              @change="changeZjhm"
+            />
+          </el-form-item>
+          <el-form-item label="发证机关" prop="fzjg">
+            <el-input
+              v-model="form.fzjg"
+              placeholder="请输入发证机关"
+            />
+          </el-form-item>
+          <el-form-item label="户籍社区" prop="xzqh">
+            <RegionCascaderSelect
+              v-model="form.xzqh"
+              style="width: 100%"
+              valueProp="code"
+              :isDataRoot="true"
+            >
+            </RegionCascaderSelect>
+          </el-form-item>
+          <el-form-item label="护理等级" prop="sndj">
+            <el-select v-model="form.sndj" placeholder="请选择护理等级">
+              <el-option
+                v-for="dict in dict.type.GL021"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="联系电话" prop="sqrLxdh">
+            <el-input
+              v-model="form.sqrLxdh"
+              placeholder="请输入申请人联系电话"
+            />
+          </el-form-item>
+          <el-form-item label="联系电话2" prop="sqrLxdh2 ">
+            <el-input
+              v-model="form.sqrLxdh2"
+              placeholder="请输入申请人联系电话"
+            />
+          </el-form-item>
+          <el-form-item label="居住区划" prop="xjdxzqh">
+            <RegionCascaderSelect
+              v-model="form.xjdxzqh"
+              style="width: 100%"
+              valueProp="code"
+              :isJl="false"
+              :isDataRoot="false"
+            >
+            </RegionCascaderSelect>
+          </el-form-item>
+          <el-form-item
+            label="户籍地址"
+            prop="hjdz"
+            style="grid-column: 1 / span 3"
+          >
+            <el-input
+              v-model="form.hjdz"
+              placeholder="请输入户籍地址"
+            />
+          </el-form-item>
+          <el-form-item
+            label="现居地址"
+            prop="jzdz"
+            style="grid-column: 1 / span 3"
+          >
+            <el-input
+              v-model="form.jzdz"
+              placeholder="请输入详情居住地址"
+            />
+          </el-form-item>
+          <!--是否显示是否迁入配置-->
+          <!--<el-form-item label="是否迁入" prop="isqr" v-if="user.qxpz&&user.qxpz.isqr&&user.qxpz.isqr=='1'">-->
+            <!--<el-radio-group v-model="form.isqr" @change="chengeIsqr">-->
+              <!--<el-radio-->
+                <!--v-for="dict in dict.type.CZ035"-->
+                <!--:key="dict.value"-->
+                <!--:label="dict.value"-->
+              <!--&gt;{{ dict.label }}-->
+              <!--</el-radio>-->
+            <!--</el-radio-group>-->
+          <!--</el-form-item>-->
+          <!--<el-form-item label="迁入日期" prop="qrsj" v-if="form.isqr=='1'&&user.qxpz.isqr&&user.qxpz.isqr=='1'">-->
+            <!--<el-date-picker-->
+              <!--clearable-->
+              <!--v-model="form.qrsj"-->
+              <!--@change="getQxBfPz"-->
+              <!--type="date"-->
+              <!--value-format="yyyyMMdd"-->
+              <!--placeholder="请选择迁入日期"-->
+            <!--&gt;-->
+            <!--</el-date-picker>-->
+          <!--</el-form-item>-->
+        </div>
+        <h3>银行卡信息</h3>
+        <div style="display: flex">
+          <div style="flex: 2" class="grid2">
+            <el-form-item label="开户银行" prop="khyh">
+              <el-cascader
+                style="width: 100%;"
+                :props="props"
+                :options="dict.tree.C0044"
+                v-model="form.khyh"
+                placeholder="请选择开户银行"
+                clearable
+              />
+            </el-form-item>
+            <el-form-item label="银行网点" prop="khwd">
+              <el-input v-model="form.khwd" placeholder="请输入银行网点" />
+            </el-form-item>
+            <el-form-item label="账号" prop="yhzh">
+              <label slot="label"
+              >账<span style="opacity: 0">账号</span>号</label
+              >
+              <el-input v-model="form.yhzh" placeholder="请输入银行账号" />
+            </el-form-item>
+            <el-form-item label="户名" prop="khmc">
+              <label slot="label"
+              >户<span style="opacity: 0">户名</span>名</label
+              >
+              <el-input
+                disabled
+                v-model="form.khmc"
+                placeholder="请输入户名"
+              />
+            </el-form-item>
+          </div>
+        </div>
+        <h3>监护人信息</h3>
+        <div style="display: flex">
+          <div style="flex: 2" class="grid2">
+            <el-form-item label="姓名" prop="jhrXm">
+              <label slot="label"
+              >姓<span style="opacity: 0">姓名</span>名</label
+              >
+              <el-input
+                v-model="form.jhrXm"
+                placeholder="请输入监护人姓名"
+              />
+            </el-form-item>
+            <el-form-item label="身份证号" prop="jhrZjhm">
+              <el-input
+                v-model="form.jhrZjhm"
+                placeholder="请输入监护人身份证号"
+              />
+            </el-form-item>
+            <el-form-item label="联系电话" prop="jhrLxdh">
+              <el-input
+                v-model="form.jhrLxdh"
+                placeholder="请输入监护人联系电话"
+              />
+            </el-form-item>
+            <el-form-item label="与老人关系" prop="jhrGx">
+              <el-select
+                v-model="form.jhrGx"
+                placeholder="请选择监护人与申请人关系"
+                clearable
+              >
+                <el-option
+                  v-for="dict in dict.type.C0032"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item
+              label="居住地址"
+              prop="jhrJzdz"
+              style="grid-column: 1 / span 2"
+            >
+              <el-input
+                v-model="form.jhrJzdz"
+                maxlength="200"
+                placeholder="请输入监护人居住地址"
+              />
+            </el-form-item>
+          </div>
+        </div>
+        <h3>低保信息</h3>
+        <div class="grid2">
+            <el-form-item label="是否低保" prop="isdb">
+              <el-radio-group v-model="form.isdb" @change="changeDb">
+                <el-radio
+                  v-for="dict in dict.type.CZ035"
+                  :key="dict.value"
+                  :label="dict.value"
+                >{{ dict.label }}
+                </el-radio>
+              </el-radio-group>
+            </el-form-item>
+            <el-form-item
+              label="低保证号"
+              prop="dbzh"
+              v-if="form.isdb == '1'"
+            >
+              <el-input v-model="form.dbzh" placeholder="请输入低保证号" />
+            </el-form-item>
+        </div>
+        <h3>津贴标准信息</h3>
+        <div class="grid2">
+          <el-form-item label="申请标准">
+            <dict-tag :options="dict.type.GL013" :value="form.pc" />
+          </el-form-item>
+          <el-form-item label="始发年月" prop="ffyf">
+            <el-date-picker
+              clearable
+              v-model="form.ffyf"
+              type="month"
+              value-format="yyyyMM"
+              placeholder="请输入始发年月"
+              :picker-options="ffyfPickerOptions"
+            >
+            </el-date-picker>
+          </el-form-item>
+        </div>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm" :loading="submitFormLoading">确 定</el-button>
+        <el-button type="primary" @click="submitForm" :loading="submitFormLoading">保 存</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
@@ -472,8 +713,9 @@
 
 <script>
   import {listGljtLrHi} from "@/api/gljt/gljtLrHi";
+  import {getQxDfPz} from "@/api/gljt/gljtSq";
   import {addGljtLr, delGljtLr, getGljtLr, listGljtLr, updateGljtLr, adminRemove} from "@/api/gljt/gljtLr";
-  import {chineseOne, idCard, Regular} from '@/utils/regular'
+  import {chineseOne, idCard, Regular,Mobile} from '@/utils/regular'
   import {addJkzkDj} from "@/api/gljt/jkzkDj";
   import sqXq from "../gljtSq/sqXq"
   import {mapState} from 'vuex'
@@ -484,7 +726,7 @@
   const axios = require('axios');
   export default {
     name: "GljtLr",
-    dicts: ['GL005', 'GL007', 'GL010', 'C0007', 'C0032', 'C0044', 'GL002', 'GL003', 'CZ035', 'GL009', 'GL013', 'GL019'],
+    dicts: ["GL021","C0009",'GL005', 'GL007', 'GL010', 'C0007', 'C0032', 'C0044', 'GL002', 'GL003', 'CZ035', 'GL009', 'GL013', 'GL019'],
     components: {
       sqXq
     },
@@ -521,6 +763,15 @@
             }
           }]
         },
+        ffyfPickerOptions: {
+          disabledDate: (time) => {
+            return false;
+          },
+        },
+        props: {
+          emitPath: false,
+          checkStrictly: false,
+        },
         btbzId: '',
         // 用户导入参数
         upload: {
@@ -576,7 +827,7 @@
           pageSize: 10,
           isImport: 1,
           pc: null,
-          status: "1",
+          // status: "1",
           sqrXm: null,
           sqrZjhm: null,
           jkzkDjzt: null,
@@ -595,47 +846,79 @@
         formXq: {},
         // 表单校验
         rules: {
-          xzqh: [
-            {max: 12, message: '行政区划不能超过12个字符', trigger: 'blur'},
+          xb: [
+            { required: true, message: "申请人性别不能为空", trigger: "change" },
           ],
-          xm: [
-            {max: 72, message: '姓名不能超过72个字符', trigger: 'blur'},
-            {validator: chineseOne, trigger: 'blur'},
+          csrq: [
+            {
+              required: true,
+              message: "申请人出生日期不能为空",
+              trigger: "blur",
+            },
           ],
-          sfzh: [
-            {max: 72, message: '身份证号不能超过72个字符', trigger: 'blur'},
+          sqrXm: [
+            { required: true, message: "申请人姓名不能为空", trigger: "blur" },
+            { max: 72, message: "申请人姓名不能超过72个字符", trigger: "blur" },
+            { validator: chineseOne, trigger: "blur" },
           ],
-          htzp: [
-            {required: true, message: '请上传活体照片', trigger: 'blur'},
+          sqrZjhm: [
+            {
+              required: true,
+              message: "申请人身份证号不能为空",
+              trigger: "blur",
+            },
+            {
+              max: 72,
+              message: "申请人身份证号不能超过72个字符",
+              trigger: "blur",
+            },
+            { validator: idCard, trigger: "blur" },
           ],
-          kz1: [
-            {max: 100, message: '扩展字段不能超过100个字符', trigger: 'blur'},
+          sqrLxdh: [
+            {
+              required: true,
+              message: "申请人联系电话不能为空",
+              trigger: "blur",
+            },
+            { validator: Mobile, trigger: "blur" },
+            {
+              max: 64,
+              message: "申请人联系电话不能超过64个字符",
+              trigger: "blur",
+            },
           ],
-          kz2: [
-            {max: 100, message: '扩展字段不能超过100个字符', trigger: 'blur'},
+          mz: [{ required: true, message: "民族不能为空", trigger: "blur" }],
+          sndj: [
+            { required: true, message: "护理等级不能为空", trigger: "blur" },
           ],
-          kz3: [
-            {max: 100, message: '扩展字段不能超过100个字符', trigger: 'blur'},
+          hjdz: [
+            {required: true, message: "申请人户籍地址不能为空", trigger: "blur"},
           ],
-          kz4: [
-            {required: true, message: '审核结果不能为空', trigger: 'blur'},
-            {max: 100, message: '审核结果不能超过100个字符', trigger: 'blur'},
+          yhzh: [
+            { required: true, message: "银行账号不能为空", trigger: "blur" },
+            // {max: 72, message: '银行账号不能超过72个字符', trigger: 'blur'},
           ],
-          kz5: [
-            {required: true, message: '审核意见不能为空', trigger: 'blur'},
-            {max: 100, message: '审核意见不能超过100个字符', trigger: 'blur'},
+          khyh: [
+            { required: true, message: "开户银行不能为空", trigger: "blur" },
+            // {max: 4, message: '开户银行不能超过4个字符', trigger: 'blur'},
           ],
-          kz6: [
-            {max: 100, message: '扩展字段不能超过100个字符', trigger: 'blur'},
+          fzjg: [
+            { required: true, message: "发证机关不能为空", trigger: "blur" },
           ],
-          kz7: [
-            {max: 100, message: '扩展字段不能超过100个字符', trigger: 'blur'},
+          jzdz: [
+            {
+              required: true,
+              message: "申请人详情居住地址不能为空",
+              trigger: "blur",
+            },
           ],
-          kz8: [
-            {max: 100, message: '扩展字段不能超过100个字符', trigger: 'blur'},
+          xzqh: [
+            { required: true, message: "行政区划不能为空", trigger: "blur" },
+            // {max: 12, message: '行政区划不能超过12个字符', trigger: 'blur'},
           ],
-          kz9: [
-            {max: 100, message: '扩展字段不能超过100个字符', trigger: 'blur'},
+          ffyf: [
+            { required: true, message: "始发年月不能为空", trigger: "blur" },
+            { max: 8, message: "开始发放月份不能超过8个字符", trigger: "blur" },
           ],
         }
       };
@@ -644,6 +927,42 @@
       this.getList();
     },
     methods: {
+      getGender() {
+        return this.form.sqrZjhm.charAt(16) % 2 === 0 ? '2' : '1';
+      },
+      getBirthDate() {
+        const year = this.form.sqrZjhm.substr(6, 4);
+        const month = this.form.sqrZjhm.substr(10, 2);
+        const day = this.form.sqrZjhm.substr(12, 2);
+        return `${year}${month}${day}`;
+      },
+      changeZjhm(){
+        if(this.form.sqrZjhm&&this.form.sqrZjhm.length===18){
+          this.form.csrq=this.getBirthDate();
+          this.form.xb=this.getGender();
+          this.getQxDfPz();
+        }else{
+          this.form.csrq='';
+          this.form.sqrXm='';
+        }
+      },
+      changeDb() {
+        this.form.dbzh = "";
+        this.form.dbzm = "";
+        this.getQxDfPz();
+      },
+      //获取默认的发放月份、标准、月份禁用的时间
+      async getQxDfPz(is) {
+        if (!this.form.csrq) {
+          return;
+        }
+
+        let res = await getQxDfPz({ csrq: this.form.csrq, isdb: this.form.isdb});
+        this.form.pc = res.data.pc;
+      },
+      changHm() {
+        this.form.khmc = this.form.sqrXm;
+      },
       handleImport(is) {
         this.isUser=is;
         this.upload.form.xzqh = '';
@@ -708,24 +1027,63 @@
       reset() {
         this.submitFormLoading = false;
         this.form = {
+          isdb: "0",
           id: null,
-          sqId: null,
-          pcId: null,
+          isImport:"1",
+          status:"1",
           xzqh: null,
-          xm: null,
-          sfzh: null,
-          djsj: null,
-          htzp: null,
-          kz1: null,
-          kz2: null,
-          kz3: null,
-          kz4: null,
-          kz5: null,
-          kz6: null,
-          kz7: null,
-          kz8: null,
-          kz9: null,
-          status: "0",
+          sqrZjzm: null,
+          sqrZjbm: null,
+          sqrXm: null,
+          fzjg: null,
+          qfrq:null,
+          yb: null,
+          mz: null,
+          sndj: null,
+          sqrZjhm: null,
+          sqrLxdh: null,
+          sqrLxdh2: null,
+          tx: null,
+          xb: null,
+          csrq: null,
+          jzdz: null,
+          hjdz: null,
+          ffyf: null,
+          pc: null,
+          sqbfys: null,
+          sqbfje: null,
+          bfksyf:null,
+          dbrZjzm: null,
+          dbrZjbm: null,
+          dbrXm: null,
+          dbrZjhm: null,
+          dbrLxdh: null,
+          gx: null,
+          jhrGx: null,
+          dbrJzdz: null,
+          yhzjz: null,
+          hkbzm: null,
+          hkbbm: null,
+          khyh: null,
+          yhzh: null,
+          khmc: null,
+          fj: null,
+          tfdbrXm: null,
+          tfbdrLxdh: null,
+          tfsj: null,
+          tfyy: null,
+          tffj: null,
+          dbzh: null, //低保证号
+          sqms: null, //申请描述
+          sqbfj: null,
+          jhrXm: null, // 监护人姓名
+          jhrZjhm: null, // 监护人证件号码
+          jhrLxdh: null, // 监护人联系电话
+          jhrJzdz: null, // 监护人居住地址
+          jhrZjzm: null, // 监护人证件照正面
+          jhrZjbm: null, // 监护人证件照背面
+          xjdxzqh: null, // 现居地行政区划
+          khwd: null, // 开户网点
         };
         this.resetForm("form");
       },
@@ -749,17 +1107,10 @@
         this.multiple = !selection.length
       },
       /** 新增按钮操作 */
-      handleAdd(row) {
+      handleAdd() {
         this.reset();
-
-        this.form.xm = row.sqrXm;
-        this.form.lrId = row.id;
-        this.form.xzqh = row.xzqh;
-        this.form.sfzh = row.sqrZjhm;
-        console.log(row, '<-row');
-        console.log(this.form, '<-this.form');
         this.open = true;
-        this.title = "健康状况登记";
+        this.title = "新增存量老人信息";
       },
       getTime() {
         // 获取当前年月日时分秒
@@ -823,11 +1174,14 @@
         const id = row.id || this.ids
         getGljtLr(id).then(response => {
           this.form = response.data;
+          this.form.xzqh = this.form.xzqhCode
+            ? JSON.stringify(this.form.xzqhCode.split(","))
+            : [];
           /****** sks 需要改动的地方 start ******/
           // this.copyForm=this.deepCopy(response.data)
           /****** sks 需要改动的地方 end ******/
           this.open = true;
-          this.title = "修改高龄津贴申请老人信息";
+          this.title = "修改存量老人信息";
         });
       },
       handleDy(row) {
@@ -915,15 +1269,24 @@
         this.$refs["form"].validate(valid => {
           if (valid) {
             this.submitFormLoading = true;
+            let xzqh = "";
+            if (this.form.xzqh !== null) {
+              if (Array.isArray(this.form.xzqh)) {
+                xzqh = this.form.xzqh[this.form.xzqh.length - 1];
+              } else {
+                let data = JSON.parse(this.form.xzqh);
+                xzqh = data[data.length - 1];
+              }
+            }
             if (this.form.id != null) {
               /****** sks 需要改动的地方 start ******/
-              updateGljtLr(this.form).then(response => {
+              updateGljtLr({...this.form,xzqh:xzqh}).then(response => {
                 this.$modal.msgSuccess("修改成功");
                 this.open = false;
                 this.getList();
               }).finally(() => this.submitFormLoading = false);
             } else {
-              addJkzkDj({...this.form, djsj: this.getTime(), kz3: '0', kz6: this.getTime()}).then(response => {
+              addGljtLr({...this.form,xzqh:xzqh}).then(response => {
                 this.$modal.msgSuccess("新增成功");
                 this.open = false;
                 this.getList();
@@ -1125,4 +1488,14 @@
       }
     }
   }
+  .grid3 {
+    display: grid;
+    grid-template-columns: 1fr 1fr 1fr;
+    /*grid-template-rows: 50px 50px;*/
+  }
+  .grid2 {
+    display: grid;
+    grid-template-columns: 1fr 1fr;
+    /*grid-template-rows: 50px 50px;*/
+  }
 </style>

+ 11 - 0
ruoyi-ui-gljt/src/views/gljt/jkzkDj/index.vue

@@ -169,6 +169,16 @@
           <image-upload-gljt v-model="form.htzp" :limit="1"></image-upload-gljt>
           <!--<el-input v-model="form.htzp" type="textarea" maxlength="200" show-word-limit placeholder="请输入登记活体照片"/>-->
         </el-form-item>
+        <el-form-item label="替换老人自拍照" prop="replace">
+          <el-radio-group v-model="form.replace" >
+            <el-radio
+              v-for="dict in dict.type.CZ035"
+              :key="dict.value"
+              :label="dict.value"
+            >{{ dict.label }}
+            </el-radio>
+          </el-radio-group>
+        </el-form-item>
         <el-form-item label="描述" prop="kz9">
           <!--<image-upload-gljt v-model="form.kz9" :limit="1"></image-upload-gljt>-->
           <el-input v-model="form.kz9" type="textarea" maxlength="100" show-word-limit placeholder="请输入描述"/>
@@ -443,6 +453,7 @@
           kz8: null,
           kz9: null,
           status: "0",
+          replace:"0",
         };
         this.resetForm("form");
       },

+ 23 - 3
ruoyi-ui-gljt/src/views/gljt/jkzkSh/index.vue

@@ -168,14 +168,27 @@
             <image-preview class="imgStyle" :src="form.tx" v-if="form.tx"></image-preview>
           </td>
         </tr>
-
         <tr>
           <td>老人活体照片</td>
           <td>
             <image-preview class="imgStyle" :src="form.htzp" v-if="form.htzp"></image-preview>
           </td>
+          <td>是否替换老人自拍照</td>
+          <td colspan="3">
+            <el-radio-group v-model="form.replace" >
+              <el-radio
+                :disabled="isXq"
+                v-for="dict in dict.type.CZ035"
+                :key="dict.value"
+                :label="dict.value"
+              >{{ dict.label }}
+              </el-radio>
+            </el-radio-group>
+          </td>
+        </tr>
+        <tr>
           <td>老人活体视频</td>
-          <td>
+          <td colspan="5">
             <video width="171.2" height="108" controls  v-if="form.htsp">
               <source :src="form.htsp" type="video/mp4">
             </video>
@@ -191,6 +204,9 @@
             <file-upload v-model="form.fj" :isFile="false"></file-upload>
           </td>
         </tr>
+        <tr>
+
+        </tr>
       </table>
       <h3 style="margin-top: 20px">审核</h3>
       <table  v-if="isXq">
@@ -237,7 +253,7 @@
   import {getLrByZjhm} from "@/api/gljt/gljtLr";
   export default {
     name: "JkzkSh",
-    dicts: ['GL015','GL007'],
+    dicts: ['GL015','GL007','CZ035'],
     computed: {
       ...mapState(['user']),
     },
@@ -400,6 +416,7 @@
           kz7: null,
           kz8: null,
           kz9: null,
+          replace:"0",
           status: "0",
         };
         this.resetForm("form");
@@ -438,6 +455,9 @@
         const id = row.id || this.ids
         getJkzkDj(id).then(response => {
           this.form = response.data;
+          if(!is){
+            this.form.replace="0";
+          }
           this.open = true;
           this.title =this.isXq?"健康状况登记信息": "健康状况登记信息审核";
         });