申请调整+添加审批人

ruoyi-ui-gljt/src/api/gljt/gljtSq.js

@@ -76,3 +76,13 @@ export function addGljtSqGstp(data) {
     data: data
   })
 }
+
+// 高龄津贴申请表单页面获取补发列表接口
+export function gljtSqFormList(data) {
+  return request({
+    url: '/gljt/gljtSq/formList',
+    method: 'post',
+    data: data
+  })
+}
+

ruoyi-ui-gljt/src/components/ImageUploadGljt/index.vue

@@ -331,6 +331,7 @@
           {
             this.formCard={
               fzjg:qur.words_result['签发机关'].words,
+              qfrq:qur.words_result['签发日期'].words,
             }
           }
           this.dialogImageUrl2 = 'data:image/png;base64,' + qur.card_image;

ruoyi-ui-gljt/src/views/gljt/gljtBg/index.vue

@@ -950,31 +950,32 @@
 
             <div>
               <h3 style="margin-top: 20px">信息变更社区(村)审核</h3>
-              <table class="tableStyle">
-                <tr>
-                  <td>
-                    <el-form-item label="审核结果" prop="bgsqShjg">
-                      <el-select
-                        v-model="form.bgsqShjg"
-                        placeholder="请选择审核结果"
-                      >
-                        <el-option
-                          v-for="dict in dict.type.GL007"
-                          :key="dict.value"
-                          :label="dict.label"
-                          :value="dict.value"
-                        ></el-option>
-                      </el-select>
-                    </el-form-item>
-                  </td>
-                  <td>
-                    <el-form-item label="审核意见" prop="bgsqShyj">
-                      <el-input
-                        v-model="form.bgsqShyj"
-                        placeholder="请输入审核意见"
-                      />
-                    </el-form-item>
-                  </td>
+              <div class="grid2">
+                <el-form-item label="审核结果" prop="bgsqShjg">
+                  <el-select
+                    v-model="form.bgsqShjg"
+                    placeholder="请选择审核结果">
+                    <el-option
+                      v-for="dict in dict.type.GL007"
+                      :key="dict.value"
+                      :label="dict.label"
+                      :value="dict.value"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="审批人" prop="bgsqShrxm">
+                  <el-input
+                    v-model="form.bgsqShrxm"
+                    placeholder="请输入审批人"
+                  />
+                </el-form-item>
+                <el-form-item label="审核意见" prop="bgsqShyj" style="grid-column: 1 / span 2">
+                  <el-input
+                    v-model="form.bgsqShyj"
+                    placeholder="请输入审核意见"
+                  />
+                </el-form-item>
+              </div>
                   <!--<td>-->
                   <!--<el-form-item label="申请社区(村)审核时间" prop="sqShsj">-->
                   <!--<el-date-picker clearable-->
@@ -985,69 +986,67 @@
                   <!--</el-date-picker>-->
                   <!--</el-form-item>-->
                   <!--</td>-->
-                </tr>
-              </table>
             </div>
           </div>
           <div v-if="status == '11'">
             <h3 style="margin-top: 20px">信息变更街道(乡镇)审核</h3>
-            <table class="tableStyle">
-              <tr>
-                <td>
-                  <el-form-item label="审核结果" prop="bgjdShjg">
-                    <el-select
-                      v-model="form.bgjdShjg"
-                      placeholder="请选择信息变更街道(乡镇)审核结果"
-                    >
-                      <el-option
-                        v-for="dict in dict.type.GL007"
-                        :key="dict.value"
-                        :label="dict.label"
-                        :value="dict.value"
-                      ></el-option>
-                    </el-select>
-                  </el-form-item>
-                </td>
-                <td>
-                  <el-form-item label="审核意见" prop="bgjdShyj">
-                    <el-input
-                      v-model="form.bgjdShyj"
-                      placeholder="请输入信息变更街道(乡镇)审核意见"
-                    />
-                  </el-form-item>
-                </td>
-              </tr>
-            </table>
+            <div class="grid2">
+              <el-form-item label="审核结果" prop="bgjdShjg">
+                <el-select
+                  v-model="form.bgjdShjg"
+                  placeholder="请选择信息变更街道(乡镇)审核结果"
+                >
+                  <el-option
+                    v-for="dict in dict.type.GL007"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="审批人" prop="bgjdShrxm">
+                <el-input
+                  v-model="form.bgjdShrxm"
+                  placeholder="请输入审批人"
+                />
+              </el-form-item>
+              <el-form-item label="审核意见" prop="bgjdShyj" style="grid-column: 1 / span 2">
+                <el-input
+                  v-model="form.bgjdShyj"
+                  placeholder="请输入信息变更街道(乡镇)审核意见"
+                />
+              </el-form-item>
+            </div>
           </div>
           <div v-if="status == '12'">
             <h3 style="margin-top: 20px">区民政局审核</h3>
-            <table class="tableStyle">
-              <tr>
-                <td>
-                  <el-form-item label="审核结果" prop="bgmzShjg">
-                    <el-select
-                      v-model="form.bgmzShjg"
-                      placeholder="请选择审核结果"
-                    >
-                      <el-option
-                        v-for="dict in dict.type.GL007"
-                        :key="dict.value"
-                        :label="dict.label"
-                        :value="dict.value"
-                      ></el-option>
-                    </el-select>
-                  </el-form-item>
-                </td>
-                <td>
-                  <el-form-item label="审核意见" prop="bgmzShyj">
-                    <el-input
-                      v-model="form.bgmzShyj"
-                      placeholder="请输入审核意见"
-                    />
-                  </el-form-item>
-                </td>
-              </tr>
-            </table>
+            <div class="grid2">
+              <el-form-item label="审核结果" prop="bgmzShjg">
+                <el-select
+                  v-model="form.bgmzShjg"
+                  placeholder="请选择审核结果"
+                >
+                  <el-option
+                    v-for="dict in dict.type.GL007"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="审批人" prop="bgmzShrxm">
+                <el-input
+                  v-model="form.bgmzShrxm"
+                  placeholder="请输入审批人"
+                />
+              </el-form-item>
+              <el-form-item label="审核意见" prop="bgmzShyj">
+                <el-input
+                  v-model="form.bgmzShyj"
+                  placeholder="请输入审核意见"
+                />
+              </el-form-item>
+            </div>
           </div>
         </el-form>
       </el-scrollbar>
@@ -1761,12 +1760,15 @@ export default {
         bgsqShjg: null,
         bgsqShyj: null,
         bgsqShsj: null,
+        bgsqShrxm:null,
         bgjdShjg: null,
         bgjdShyj: null,
         bgjdShsj: null,
+        bgjdShrxm:null,
         bgmzShjg: null,
         bgmzShyj: null,
         bgmzShsj: null,
+        bgmzShrxm:null,
         status: "0",
         istk: "0",
         isdb: "0",
@@ -1809,6 +1811,7 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
+      this.getSqShrxm();
       this.status = null;
       this.title = "添加高龄津贴变更信息";
     },
@@ -1886,6 +1889,16 @@ export default {
             ? JSON.stringify(this.form.xjdxzqhCode.split(","))
             : [];
           this.getQxBfPz();
+          //街道审核
+          if(this.status == "11"){
+            this.getJdShrxm();
+          }
+          //区县审核
+          if(this.status == "12"){
+            this.getMzShrxm();
+          }
+
+          this.getSqShrxm();
           this.open = true;
         }
         if (type === 2) {
@@ -2011,6 +2024,7 @@ export default {
               bgjdShjg: this.form.bgjdShjg,
               bgjdShyj: this.form.bgjdShyj,
               bgjdShsj: this.getTime(),
+              bgjdShrxm: this.form.bgjdShrxm,
             };
           }
           if (this.status == "12") {
@@ -2019,6 +2033,7 @@ export default {
               bgmzShjg: this.form.bgmzShjg,
               bgmzShyj: this.form.bgmzShyj,
               bgmzShsj: this.getTime(),
+              bgmzShrxm: this.form.bgmzShrxm,
             };
           }
           if (this.status == "14") {
@@ -2031,6 +2046,8 @@ export default {
             qur.bgmzShjg = null;
             qur.bgmzShyj = null;
             qur.bgmzShsj = null;
+            qur.bgjdShrxm= null;
+            qur.bgmzShrxm= null;
           }
 
           this.submitFormLoading = true;
@@ -2045,6 +2062,7 @@ export default {
               .then((response) => {
                 this.$modal.msgSuccess("修改成功");
                 this.open = false;
+                this.saveSpr();
                 // this.gljtBgList=this.dataReplacement(this.gljtBgList,this.form.id,formData);
                 this.getList();
               })
@@ -2060,6 +2078,7 @@ export default {
               .then((response) => {
                 this.$modal.msgSuccess("新增成功");
                 this.open = false;
+                this.saveSpr();
                 this.getList();
                 /****** sks 需要改动的地方 start ******/
                 // if (this.queryParams.pageSize===this.gljtBgList.length)
@@ -2075,6 +2094,33 @@ export default {
         }
       });
     },
+    //缓存各级的审批人
+    saveSpr(){
+      if(this.form.bgsqShrxm){
+        localStorage.setItem('bgsqShrxm', this.form.bgsqShrxm);
+      }
+      if(this.form.bgjdShrxm){
+        localStorage.setItem('bgjdShrxm', this.form.bgjdShrxm);
+      }
+      if(this.form.bgmzShrxm){
+        localStorage.setItem('bgmzShrxm', this.form.bgmzShrxm);
+      }
+    },
+    getSqShrxm(){
+      if(localStorage.getItem('bgsqShrxm')&&!this.form.bgsqShrxm){
+        this.form.bgsqShrxm=localStorage.getItem('bgsqShrxm')
+      }
+    },
+    getJdShrxm(){
+      if(localStorage.getItem('bgjdShrxm')&&!this.form.bgjdShrxm){
+        this.form.bgjdShrxm =localStorage.getItem('bgjdShrxm')
+      }
+    },
+    getMzShrxm(){
+      if(localStorage.getItem('bgmzShrxm')&&!this.form.bgmzShrxm){
+        this.form.bgmzShrxm=localStorage.getItem('bgmzShrxm')
+      }
+    },
     translateDict(type, value) {
       return this.selectDictLabel(this.dict.type[type], value);
     },

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

@@ -566,7 +566,6 @@
                 style="grid-column: 1 / span 3"
               >
                 <el-input
-                  disabled
                   v-model="form.hjdz"
                   placeholder="请输入户籍地址"
                 />
@@ -581,6 +580,37 @@
                   placeholder="请输入详情居住地址"
                 />
               </el-form-item>
+              <el-form-item label="是否迁入" prop="isqr">
+              <el-radio-group v-model="form.isqr" @change="chengeIsqr">
+              <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="isqr">-->
+                <!--<el-radio-group v-model="form.isqr" @change="chengeIsqr">-->
+                  <!--<el-radio-->
+                    <!--v-for="dict in hjOpt"-->
+                    <!--: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'">
+                <el-date-picker
+                  clearable
+                  v-model="form.qrsj"
+                  @change="getQxBfPz"
+                  type="date"
+                  value-format="yyyyMMdd"
+                  placeholder="请选择迁入日期"
+                >
+                </el-date-picker>
+              </el-form-item>
             </div>
             <h3>银行卡信息</h3>
             <div style="display: flex">
@@ -919,7 +949,30 @@
                 >
                 </el-date-picker>
               </el-form-item>
-
+              <el-form-item  label="补发详细" style="grid-column: 1 / span 2" v-if="form.jfxxList&&form.jfxxList.length>0">
+                <el-table  :data="form.jfxxList" ref="multipleTable" @selection-change="handleSelectionChange2">
+                  <el-table-column
+                    type="selection"
+                    width="55">
+                  </el-table-column>
+                  <el-table-column label="补贴月份" align="center" prop="ffyf" >
+                    <template slot-scope="scope">
+                      {{scope.row.ffyf&&scope.row.ffyf.length>=6?scope.row.ffyf.slice(0,4)+'-'+scope.row.ffyf.slice(-2):scope.row.ffyf}}
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="补发金额" align="center" prop="ffje" >
+                    <template slot-scope="scope">
+                      <el-form-item
+                        :prop="'jfxxList.' + scope.$index + '.ffje'"
+                        :rules="{ required: true, message: '金额不能为空', trigger: 'blur'}"
+                      >
+                        <number @changeValue="changeFfje" placeholder="补发金额" v-model.sync="scope.row.ffje" :min="0" :max="10000000000" :precision="2"/>
+                        <!--<el-input v-model="scope.row.ffje"></el-input>-->
+                      </el-form-item>
+                    </template>
+                  </el-table-column>
+                </el-table>
+              </el-form-item>
               <el-form-item label="补发月数" prop="sqbfys">
                 <el-input
                   disabled
@@ -971,75 +1024,65 @@
             <!--</tr>-->
             <div>
               <h3 style="margin-top: 20px">社区(村)审核</h3>
-              <table class="tableStyle">
-                <tr>
-                  <td>
-                    <el-form-item label="审核结果" prop="sqShjg">
-                      <el-select
-                        v-model="form.sqShjg"
-                        placeholder="请选择审核结果"
-                      >
-                        <el-option
-                          v-for="dict in dict.type.GL007"
-                          :key="dict.value"
-                          :label="dict.label"
-                          :value="dict.value"
-                        ></el-option>
-                      </el-select>
-                    </el-form-item>
-                  </td>
-                  <td>
-                    <el-form-item label="审核意见" prop="sqShyj">
-                      <el-input
-                        v-model="form.sqShyj"
-                        placeholder="请输入审核意见"
-                      />
-                    </el-form-item>
-                  </td>
-                  <!--<td>-->
-                  <!--<el-form-item label="申请社区(村)审核时间" prop="sqShsj">-->
-                  <!--<el-date-picker clearable-->
-                  <!--v-model="form.sqShsj"-->
-                  <!--type="datetime"-->
-                  <!--value-format="yyyyMMddHHmmss"-->
-                  <!--placeholder="请选择申请社区(村)审核时间">-->
-                  <!--</el-date-picker>-->
-                  <!--</el-form-item>-->
-                  <!--</td>-->
-                </tr>
-              </table>
+              <div class="grid2">
+                <el-form-item label="审核结果" prop="sqShjg">
+                  <el-select
+                    v-model="form.sqShjg"
+                    placeholder="请选择审核结果"
+                  >
+                    <el-option
+                      v-for="dict in dict.type.GL007"
+                      :key="dict.value"
+                      :label="dict.label"
+                      :value="dict.value"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="审批人" prop="sqShrxm">
+                  <el-input
+                    v-model="form.sqShrxm"
+                    placeholder="请输入审批人"
+                  />
+                </el-form-item>
+                <el-form-item label="审核意见" prop="sqShyj" style="grid-column: 1 / span 2">
+                  <el-input
+                    v-model="form.sqShyj"
+                    placeholder="请输入审核意见"
+                  />
+                </el-form-item>
+              </div>
             </div>
           </div>
 
           <div v-if="status == '1'">
             <h3 style="margin-top: 20px">街道(乡镇)审核</h3>
-            <table class="tableStyle">
-              <tr>
-                <td>
-                  <el-form-item label="审核结果" prop="jdShjg">
-                    <el-select
-                      v-model="form.jdShjg"
-                      placeholder="请选择申请街道(乡镇)审核结果"
-                    >
-                      <el-option
-                        v-for="dict in dict.type.GL007"
-                        :key="dict.value"
-                        :label="dict.label"
-                        :value="dict.value"
-                      ></el-option>
-                    </el-select>
-                  </el-form-item>
-                </td>
-                <td>
-                  <el-form-item label="审核意见" prop="jdShyj">
-                    <el-input
-                      v-model="form.jdShyj"
-                      placeholder="请输入申请街道(乡镇)审核意见"
-                    />
-                  </el-form-item>
-                </td>
-              </tr>
-            </table>
+            <div class="grid2">
+              <el-form-item label="审核结果" prop="jdShjg">
+                <el-select
+                  v-model="form.jdShjg"
+                  placeholder="请选择申请街道(乡镇)审核结果"
+                >
+                  <el-option
+                    v-for="dict in dict.type.GL007"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="审批人" prop="jdShrxm">
+                <el-input
+                  v-model="form.jdShrxm"
+                  placeholder="请输入审批人"
+                />
+              </el-form-item>
+              <el-form-item label="审核意见" prop="jdShyj" style="grid-column: 1 / span 2">
+                <el-input
+                  v-model="form.jdShyj"
+                  placeholder="请输入申请街道(乡镇)审核意见"
+                />
+              </el-form-item>
+            </div>
             <!--<el-form-item label="申请街道(乡镇)审核时间" prop="jdShsj">-->
             <!--<el-date-picker clearable-->
             <!--v-model="form.jdShsj"-->
@@ -1051,33 +1094,33 @@
           </div>
           <div v-if="status == '2'">
             <h3 style="margin-top: 20px">区民政局审核</h3>
-            <table class="tableStyle">
-              <tr>
-                <td>
-                  <el-form-item label="审核结果" prop="mzShjg">
-                    <el-select
-                      v-model="form.mzShjg"
-                      placeholder="请选择审核结果"
-                    >
-                      <el-option
-                        v-for="dict in dict.type.GL007"
-                        :key="dict.value"
-                        :label="dict.label"
-                        :value="dict.value"
-                      ></el-option>
-                    </el-select>
-                  </el-form-item>
-                </td>
-                <td>
-                  <el-form-item label="审核意见" prop="mzShyj">
-                    <el-input
-                      v-model="form.mzShyj"
-                      placeholder="请输入审核意见"
-                    />
-                  </el-form-item>
-                </td>
-              </tr>
-            </table>
+            <div class="grid2">
+              <el-form-item label="审核结果" prop="mzShjg">
+                <el-select
+                  v-model="form.mzShjg"
+                  placeholder="请选择审核结果"
+                >
+                  <el-option
+                    v-for="dict in dict.type.GL007"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="审批人" prop="jdShrxm">
+                <el-input
+                  v-model="form.mzShrxm"
+                  placeholder="请输入审批人"
+                />
+              </el-form-item>
+              <el-form-item label="审核意见" prop="mzShyj" style="grid-column: 1 / span 2">
+                <el-input
+                  v-model="form.mzShyj"
+                  placeholder="请输入审核意见"
+                />
+              </el-form-item>
+            </div>
           </div>
         </el-form>
       </el-scrollbar>
@@ -1213,6 +1256,7 @@ import {
   endGljtSq,
   getQxBfPz,
   getBfys,
+  gljtSqFormList,
   addGljtSqGstp,
 } from "@/api/gljt/gljtSq";
 import { chineseOne, idCard, Regular, Mobile } from "@/utils/regular";
@@ -1261,7 +1305,9 @@ export default {
   },
   data() {
     return {
+      hjOpt:[{label:'本地户籍',value:'0'},{label:'外地迁入',value:'1'}],
       glsqsjRange: [],
+      multipleSelection: [],
       pickerOptions: {
         shortcuts: [
           {
@@ -1503,9 +1549,16 @@ export default {
             trigger: "blur",
           },
         ],
+        qrsj: [
+          {
+            required: true,
+            message: "迁入日期不能为空",
+            trigger: "blur",
+          },
+        ],
         mz: [{ required: true, message: "民族不能为空", trigger: "blur" }],
         hjdz: [
-          // {required: true, message: "申请人户籍地址地址不能为空", trigger: "blur"},
+          {required: true, message: "申请人户籍地址地址不能为空", trigger: "blur"},
         ],
         yb: [
           {
@@ -1786,6 +1839,23 @@ export default {
       console.log(this.ids,'this.ids');
       this.multiple = !selection.length
     },
+    // 多选框选中数据
+    handleSelectionChange2(selection) {
+      this.multipleSelection = selection;
+      this.changeFfje();
+      console.log(this.multipleSelection,'<--------this.multipleSelection');
+    },
+    changeFfje(){
+      console.log('我变化了');
+      let sum=0;
+      this.multipleSelection.map(item=>{
+        sum+= Number(item.ffje)
+      })
+      // this.form.bfjeCity=sum;
+      // this.form.bfys= this.multipleSelection.length;
+      this.form.sqbfje = sum;
+      this.form.sqbfys = this.multipleSelection.length;
+    },
     changHm() {
       this.form.khmc = this.form.sqrXm;
     },
@@ -1991,7 +2061,7 @@ export default {
       if (!this.form.csrq) {
         return;
       }
-      let res = await getQxBfPz({ csrq: this.form.csrq, isdb: this.form.isdb });
+      let res = await getQxBfPz({ csrq: this.form.csrq, isdb: this.form.isdb,qrsj:this.form.qrsj });
       this.form.pc = res.data.pc;
       this.isJy = false;
       if (res.data.default) {
@@ -2040,6 +2110,14 @@ export default {
       this.getBfys();
       this.getQxBfPz();
     },
+    chengeIsqr(){
+      this.form.qrsj='';
+      if(this.form.qfrq){
+        this.form.qrsj=this.form.qfrq;
+        this.getQxBfPz();
+      }
+    },
+    //获取补贴的详细列表
     async getBfys() {
       if (this.form.ffyf && this.form.csrq) {
         let qur = {
@@ -2047,9 +2125,29 @@ export default {
           csrq: this.form.csrq,
           isdb: this.form.isdb,
         };
-        let res = await getBfys(qur);
-        this.form.sqbfje = res.data.sqbfje;
-        this.form.sqbfys = res.data.sqbfys;
+        // let res = await getBfys(qur);
+        // this.form.sqbfje = res.data.sqbfje;
+        // this.form.sqbfys = res.data.sqbfys;
+        this.form.jfxxList=[];
+        this.form.sqbfje =0;
+        this.form.sqbfys = 0;
+        let res=await gljtSqFormList(qur);
+        if(res.data.list&&res.data.list.length>0){
+          this.form.sqbfys=res.data.list.length;
+          let sum=0;
+          res.data.list.map(item=>{
+            sum+= Number(item.ffje)
+          })
+          this.form.sqbfje=sum;
+          this.form.jfxxList=res.data.list;
+          let that=this;
+          this.$nextTick(()=>{
+            that.form.jfxxList.forEach(row => {
+              that.$refs.multipleTable.toggleRowSelection(row);
+            });
+          })
+        }
+        console.log(res,'我是列表');
       }
     },
     getTime() {
@@ -2117,6 +2215,7 @@ export default {
     getBack(data) {
       if (data) {
         this.form.fzjg = data.fzjg;
+        this.form.qfrq = data.qfrq;
       }
     },
     getCard2(data) {
@@ -2169,6 +2268,7 @@ export default {
       this.form.ffyf = "";
       this.form.sqbfys = "";
       this.form.sqbfje = "";
+      this.form.jfxxList=[];
     },
     clear2() {
       this.form.dbrXm = "";
@@ -2203,6 +2303,7 @@ export default {
         sqrZjbm: null,
         sqrXm: null,
         fzjg: null,
+        qfrq:null,
         yb: null,
         mz: null,
         sndj: null,
@@ -2240,13 +2341,16 @@ export default {
         tffj: null,
         sqShjg: null,
         sqShyj: null,
+        sqShrxm:null,
         sqShsj: null,
         jdShjg: null,
         jdShyj: null,
         jdShsj: null,
+        jdShrxm:null,
         mzShjg: null,
         mzShyj: null,
         mzShsj: null,
+        mzShrxm:null,
         tfsqShjg: null,
         tfsqShyj: null,
         tfsqShsj: null,
@@ -2268,6 +2372,7 @@ export default {
         status: "0",
         istk: "0",
         isdb: "0",
+        isqr:"0",
         iszc: "0",
         dbzh: null, //低保证号
         sqms: null, //申请描述
@@ -2281,6 +2386,8 @@ export default {
         xjdxzqh: null, // 现居地行政区划
         khwd: null, // 开户网点
         gszp:null,
+        qrsj:null,
+        jfxxList:[]
       };
       this.clearHkb();
       this.resetForm("form");
@@ -2311,10 +2418,27 @@ export default {
       }
       this.getAccessToken();
       // this.createConnection();
+      // if(this.saveSpr();)
+      this.getSqShrxm();
       this.status = null;
       this.open = true;
       this.title = "添加高龄津贴申请信息";
     },
+    getSqShrxm(){
+      if(localStorage.getItem('sqShrxm')&&!this.form.sqShrxm){
+        this.form.sqShrxm=localStorage.getItem('sqShrxm')
+      }
+    },
+    getJdShrxm(){
+      if(localStorage.getItem('jdShrxm')&&!this.form.jdShrxm){
+        this.form.jdShrxm =localStorage.getItem('jdShrxm')
+      }
+    },
+    getMzShrxm(){
+      if(localStorage.getItem('mzShrxm')&&!this.form.mzShrxm){
+        this.form.mzShrxm=localStorage.getItem('mzShrxm')
+      }
+    },
     getAccessToken() {
       getAccessToken().then((res) => {
         if (res.access_token) {
@@ -2335,7 +2459,7 @@ export default {
         this.formXq = {
           ...response.data,
           isdb: this.translateDict("CZ035", response.data.isdb),
-          // isdb: this.translateDict('CZ035', response.data.isdb),
+          isqr: this.translateDict('CZ035', response.data.isqr),
           iszc: this.translateDict("CZ035", response.data.iszc),
           istk: this.translateDict("CZ035", response.data.istk),
           gx: this.translateDict("C0032", response.data.gx),
@@ -2361,11 +2485,23 @@ export default {
           this.form.xjdxzqh = this.form.xjdxzqhCode
             ? JSON.stringify(this.form.xjdxzqhCode.split(","))
             : [];
+          //草稿、被拒绝、社区审核
           if (this.status == "4" || this.status == "0" || this.status == "50") {
+            this.getSqShrxm();
             this.getAccessToken();
+
+            this.getBfys();
+          }
+          //街道审核
+          if(this.status == "1"){
+            this.getJdShrxm();
+          }
+          //区县审核
+          if(this.status == "2"){
+            this.getMzShrxm();
           }
           this.getQxBfPz2();
-          this.getBfys();
+
           this.open = true;
         }
         if (type === 2) {
@@ -2379,6 +2515,18 @@ export default {
         }
       });
     },
+    //缓存各级的审批人
+    saveSpr(){
+      if(this.form.sqShrxm){
+        localStorage.setItem('sqShrxm', this.form.sqShrxm);
+      }
+      if(this.form.jdShrxm){
+        localStorage.setItem('jdShrxm', this.form.jdShrxm);
+      }
+      if(this.form.mzShrxm){
+        localStorage.setItem('mzShrxm', this.form.mzShrxm);
+      }
+    },
     handleXq(row) {
       this.reset();
       const id = row.id;
@@ -2433,8 +2581,6 @@ export default {
             }
             numberErr++;
           }
-
-
           this.$modal.msgError(errorMessage)
          // this.$model   fields[0][0].message
         }
@@ -2516,6 +2662,7 @@ export default {
           jdShjg: this.form.jdShjg,
           jdShyj: this.form.jdShyj,
           jdShsj: this.getTime(),
+          jdShrxm: this.form.jdShrxm,
         };
       }
       if (this.status == "2") {
@@ -2524,6 +2671,7 @@ export default {
           mzShjg: this.form.mzShjg,
           mzShyj: this.form.mzShyj,
           mzShsj: this.getTime(),
+          mzShrxm: this.form.mzShrxm,
         };
       }
       if (this.status == "4") {
@@ -2533,9 +2681,11 @@ export default {
         qur.jdShjg = null;
         qur.jdShyj = null;
         qur.jdShsj = null;
+        qur.jdShrxm= null;
         qur.mzShjg = null;
         qur.mzShyj = null;
         qur.mzShsj = null;
+        qur.mzShrxm= null;
       }
       if (is) {
         qur.sqShyj = null;
@@ -2544,26 +2694,31 @@ export default {
         qur.jdShjg = null;
         qur.jdShyj = null;
         qur.jdShsj = null;
+        qur.jdShrxm= null;
         qur.mzShjg = null;
         qur.mzShyj = null;
         qur.mzShsj = null;
+        qur.mzShrxm= null;
       }
       if (this.form.id != null) {
         if (this.status == "0" || this.status == "50") {
           qur.sqShsj = this.getTime();
+          qur.jfxxList=this.multipleSelection;
         }
         updateGljtSq(qur)
           .then((response) => {
             this.$modal.msgSuccess("保存成功");
             this.open = false;
+            this.saveSpr();
             this.getList();
           })
           .finally(() => (this.submitFormLoading = false));
       } else {
-        addGljtSq({ ...qur, sqShsj: this.getTime() })
+        addGljtSq({ ...qur, sqShsj: this.getTime(),jfxxList:this.multipleSelection })
           .then((response) => {
             this.$modal.msgSuccess("新增成功");
             this.open = false;
+            this.saveSpr();
             this.getList();
             /****** sks 需要改动的地方 end ******/
           })

ruoyi-ui-gljt/src/views/gljt/gljtSq/sqXq.vue

@@ -70,6 +70,14 @@
           <td>现居地址</td>
           <td colspan="5">{{ form.jzdz }}</td>
         </tr>
+        <tr>
+          <!--<td>户籍类型</td>-->
+          <!--<td>{{form.isqr=='1'?'外地迁入':'本地户籍'}}</td>-->
+          <td>是否迁入</td>
+          <td>{{form.isqr}}</td>
+          <td>迁入日期</td>
+          <td>{{special(form.qrsj)}}</td>
+        </tr>
       </table>
       <h3>银行卡信息</h3>
       <table style="margin-bottom: 25px">
@@ -256,41 +264,7 @@
         </table>
       </div>
 
-      <div v-if="form.sqShjg">
-        <h3 style="margin-top: 20px">审核信息</h3>
-        <table>
-          <tr v-if="form.sqShjg">
-            <td>社区(村)审核结果</td>
-            <td>{{ form.sqShjg }}</td>
-            <td>社区(村)审核时间</td>
-            <td>{{ special(form.sqShsj, "time") }}</td>
-          </tr>
-          <tr v-if="form.sqShjg">
-            <td>社区(村)审核意见</td>
-            <td colspan="3">{{ form.sqShyj }}</td>
-          </tr>
-          <tr v-if="form.jdShjg">
-            <td>街道(乡镇)审核结果</td>
-            <td>{{ form.jdShjg }}</td>
-            <td>街道(乡镇)审核时间</td>
-            <td>{{ special(form.jdShsj, "time") }}</td>
-          </tr>
-          <tr v-if="form.jdShjg">
-            <td>街道(乡镇)审核意见</td>
-            <td colspan="3">{{ form.jdShyj }}</td>
-          </tr>
-          <tr v-if="form.mzShjg">
-            <td>区民政局审核结果</td>
-            <td>{{ form.mzShjg }}</td>
-            <td>区民政局审核时间</td>
-            <td>{{ special(form.mzShsj, "time") }}</td>
-          </tr>
-          <tr v-if="form.mzShjg">
-            <td>区民政局审核意见</td>
-            <td colspan="3">{{ form.mzShyj }}</td>
-          </tr>
-        </table>
-      </div>
+
       <div v-if="isZj">
         <h3 style="margin-top: 20px" v-if="form.bfks">追缴信息</h3>
         <table v-if="form.bfks">
@@ -446,10 +420,6 @@
           <td>代办人联系电话</td>
           <td>{{ form.tfbdrLxdh }}</td>
         </tr>
-        <tr v-if="form.tfyyValue=='5'">
-
-        </tr>
-
         <tr>
           <td>停发附件</td>
           <td colspan="5">
@@ -457,6 +427,48 @@
           </td>
         </tr>
       </table>
+
+      <div v-if="form.sqShjg">
+        <h3 style="margin-top: 20px">审核信息</h3>
+        <table>
+          <tr v-if="form.sqShjg">
+            <td>社区(村)审核结果</td>
+            <td>{{ form.sqShjg }}</td>
+            <td>社区(村)审核时间</td>
+            <td>{{ special(form.sqShsj, "time") }}</td>
+          </tr>
+          <tr v-if="form.sqShjg">
+            <td>社区(村)审批人</td>
+            <td>{{ form.sqShrxm }}</td>
+            <td>社区(村)审核意见</td>
+            <td>{{ form.sqShyj }}</td>
+          </tr>
+          <tr v-if="form.jdShjg">
+            <td>街道(乡镇)审核结果</td>
+            <td>{{ form.jdShjg }}</td>
+            <td>街道(乡镇)审核时间</td>
+            <td>{{ special(form.jdShsj, "time") }}</td>
+          </tr>
+          <tr v-if="form.jdShjg">
+            <td>街道(乡镇)审批人</td>
+            <td>{{ form.jdShrxm }}</td>
+            <td>街道(乡镇)审核意见</td>
+            <td>{{ form.jdShyj }}</td>
+          </tr>
+          <tr v-if="form.mzShjg">
+            <td>区民政局审核结果</td>
+            <td>{{ form.mzShjg }}</td>
+            <td>区民政局审核时间</td>
+            <td>{{ special(form.mzShsj, "time") }}</td>
+          </tr>
+          <tr v-if="form.mzShjg">
+            <td>区民政局审批人</td>
+            <td>{{ form.mzShrxm}}</td>
+            <td>区民政局审核意见</td>
+            <td colspan="3">{{ form.mzShyj }}</td>
+          </tr>
+        </table>
+      </div>
       <div v-if="form.bfsqShjg">
         <h3 style="margin-top: 20px">补发审核信息</h3>
         <table class="table">
@@ -467,8 +479,10 @@
             <td>{{ special(form.bfsqShsj, "time") }}</td>
           </tr>
           <tr v-if="form.bfsqShjg">
+            <td>社区(村)审批人</td>
+            <td>{{ form.bfsqShrxm }}</td>
             <td>社区(村)审核意见</td>
-            <td colspan="3">{{ form.bfsqShyj }}</td>
+            <td>{{ form.bfsqShyj }}</td>
           </tr>
           <tr v-if="form.bfjdShjg">
             <td>街道(乡镇)审核结果</td>
@@ -477,6 +491,8 @@
             <td>{{ special(form.bfjdShsj, "time") }}</td>
           </tr>
           <tr v-if="form.bfjdShjg">
+            <td>街道(乡镇)审批人</td>
+            <td>{{ form.bfjdShrxm }}</td>
             <td>街道(乡镇)审核意见</td>
             <td colspan="3">{{ form.bfjdShyj }}</td>
           </tr>
@@ -487,8 +503,10 @@
             <td>{{ special(form.bfmzShsj, "time") }}</td>
           </tr>
           <tr v-if="form.bfmzShjg">
+            <td>区民政局审批人</td>
+            <td>{{ form.bfmzShrxm}}</td>
             <td>区民政局审核意见</td>
-            <td colspan="3">{{ form.bfmzShyj }}</td>
+            <td>{{ form.bfmzShyj }}</td>
           </tr>
         </table>
       </div>
@@ -502,8 +520,10 @@
             <td>{{ special(form.zjsqShsj, "time") }}</td>
           </tr>
           <tr v-if="form.zjsqShjg">
+            <td>社区(村)审批人</td>
+            <td>{{ form.zjsqShrxm }}</td>
             <td>社区(村)审核意见</td>
-            <td colspan="3">{{ form.zjsqShyj }}</td>
+            <td>{{ form.zjsqShyj }}</td>
           </tr>
           <tr v-if="form.zjjdShjg">
             <td>街道(乡镇)审核结果</td>
@@ -512,8 +532,10 @@
             <td>{{ special(form.zjjdShsj, "time") }}</td>
           </tr>
           <tr v-if="form.zjjdShjg">
+            <td>街道(乡镇)审批人</td>
+            <td>{{ form.zjjdShrxm }}</td>
             <td>街道(乡镇)审核意见</td>
-            <td colspan="3">{{ form.zjjdShyj }}</td>
+            <td>{{ form.zjjdShyj }}</td>
           </tr>
           <tr v-if="form.zjmzShjg">
             <td>区民政局审核结果</td>
@@ -522,8 +544,10 @@
             <td>{{ special(form.zjmzShsj, "time") }}</td>
           </tr>
           <tr v-if="form.zjmzShjg">
+            <td>区民政局审批人</td>
+            <td>{{ form.zjmzShrxm}}</td>
             <td>区民政局审核意见</td>
-            <td colspan="3">{{ form.zjmzShyj }}</td>
+            <td>{{ form.zjmzShyj }}</td>
           </tr>
         </table>
       </div>
@@ -538,8 +562,10 @@
             <td>{{ special(form.tfsqShsj, "time") }}</td>
           </tr>
           <tr v-if="form.tfsqShjg">
+            <td>社区(村)审批人</td>
+            <td>{{ form.tfsqShrxm }}</td>
             <td>社区(村)审核意见</td>
-            <td colspan="3">{{ form.tfsqShyj }}</td>
+            <td>{{ form.tfsqShyj }}</td>
           </tr>
           <tr v-if="form.tfjdShjg">
             <td>街道(乡镇)审核结果</td>
@@ -548,8 +574,10 @@
             <td>{{ special(form.tfjdShsj, "time") }}</td>
           </tr>
           <tr v-if="form.tfjdShjg">
+            <td>街道(乡镇)审批人</td>
+            <td>{{ form.tfjdShrxm }}</td>
             <td>街道(乡镇)审核意见</td>
-            <td colspan="3">{{ form.tfjdShyj }}</td>
+            <td>{{ form.tfjdShyj }}</td>
           </tr>
           <tr v-if="form.tfmzShjg">
             <td>区民政局审核结果</td>
@@ -558,8 +586,10 @@
             <td>{{ special(form.tfmzShsj, "time") }}</td>
           </tr>
           <tr v-if="form.tfmzShjg">
+            <td>区民政局审批人</td>
+            <td>{{ form.tfmzShrxm}}</td>
             <td>区民政局审核意见</td>
-            <td colspan="3">{{ form.tfmzShyj }}</td>
+            <td>{{ form.tfmzShyj }}</td>
           </tr>
         </table>
       </div>
@@ -573,8 +603,10 @@
             <td>{{ special(form.bgsqShsj, "time") }}</td>
           </tr>
           <tr v-if="form.bgsqShjg">
+            <td>社区(村)审批人</td>
+            <td>{{ form.bgsqShrxm }}</td>
             <td>社区(村)审核意见</td>
-            <td colspan="3">{{ form.bgsqShyj }}</td>
+            <td>{{ form.bgsqShyj }}</td>
           </tr>
           <tr v-if="form.bgjdShjg">
             <td>街道(乡镇)审核结果</td>
@@ -583,8 +615,10 @@
             <td>{{ special(form.bgjdShsj, "time") }}</td>
           </tr>
           <tr v-if="form.bgjdShjg">
+            <td>街道(乡镇)审批人</td>
+            <td>{{ form.bgjdShrxm }}</td>
             <td>街道(乡镇)审核意见</td>
-            <td colspan="3">{{ form.bgjdShyj }}</td>
+            <td>{{ form.bgjdShyj }}</td>
           </tr>
           <tr v-if="form.bgmzShjg">
             <td>区民政局审核结果</td>
@@ -593,8 +627,10 @@
             <td>{{ special(form.bgmzShsj, "time") }}</td>
           </tr>
           <tr v-if="form.bgmzShjg">
+            <td>区民政局审批人</td>
+            <td>{{ form.bgmzShrxm}}</td>
             <td>区民政局审核意见</td>
-            <td colspan="3">{{ form.bgmzShyj }}</td>
+            <td>{{ form.bgmzShyj }}</td>
           </tr>
         </table>
       </div>

ruoyi-ui-gljt/src/views/gljt/gljtSqBf/index.vue

@@ -314,27 +314,27 @@
           </tr>
         </table>
           <h3 style="margin-top: 20px">补发社区(村)审核</h3>
-          <table  class="tableStyle">
-            <tr>
-              <td>
-                <el-form-item label="审核结果" prop="bfsqShjg">
-                  <el-select v-model="form.bfsqShjg" placeholder="请选择补发社区(村)审核结果">
-                    <el-option
-                      v-for="dict in dict.type.GL007"
-                      :key="dict.value"
-                      :label="dict.label"
-                      :value="dict.value"
-                    ></el-option>
-                  </el-select>
-                </el-form-item>
-              </td>
-              <td>
-                <el-form-item label="审核意见" prop="bfsqShyj">
-                  <el-input v-model="form.bfsqShyj" placeholder="请输入补发社区(村)审核意见"/>
-                </el-form-item>
-              </td>
-            </tr>
-          </table>
+          <div class="grid2">
+            <el-form-item label="审核结果" prop="bfsqShjg">
+              <el-select v-model="form.bfsqShjg" placeholder="请选择补发社区(村)审核结果">
+                <el-option
+                  v-for="dict in dict.type.GL007"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="审批人" prop="bfsqShrxm">
+              <el-input
+                v-model="form.bfsqShrxm"
+                placeholder="请输入审批人"
+              />
+            </el-form-item>
+            <el-form-item label="审核意见" prop="bfsqShyj" style="grid-column: 1 / span 2">
+              <el-input v-model="form.bfsqShyj" placeholder="请输入补发社区(村)审核意见"/>
+            </el-form-item>
+          </div>
         </div>
         <!--<el-form-item label="补发社区(村)审核时间" prop="bfsqShsj">-->
           <!--<el-date-picker clearable-->
@@ -346,27 +346,27 @@
         <!--</el-form-item>-->
         <div v-if="status=='16'">
           <h3 style="margin-top: 20px">补发街道(乡镇)审核</h3>
-          <table  class="tableStyle">
-            <tr>
-              <td>
-                <el-form-item label="审核结果" prop="bfjdShjg">
-                  <el-select v-model="form.bfjdShjg" placeholder="请选择补发街道(乡镇)审核结果">
-                    <el-option
-                      v-for="dict in dict.type.GL007"
-                      :key="dict.value"
-                      :label="dict.label"
-                      :value="dict.value"
-                    ></el-option>
-                  </el-select>
-                </el-form-item>
-              </td>
-              <td>
-                <el-form-item label="审核意见" prop="bfjdShyj">
-                  <el-input v-model="form.bfjdShyj" placeholder="请输入补发街道(乡镇)审核意见"/>
-                </el-form-item>
-              </td>
-            </tr>
-          </table>
+          <div class="grid2">
+            <el-form-item label="审核结果" prop="bfjdShjg">
+              <el-select v-model="form.bfjdShjg" placeholder="请选择补发街道(乡镇)审核结果">
+                <el-option
+                  v-for="dict in dict.type.GL007"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="审批人" prop="bfjdShrxm">
+              <el-input
+                v-model="form.bfjdShrxm"
+                placeholder="请输入审批人"
+              />
+            </el-form-item>
+            <el-form-item label="审核意见" prop="bfjdShyj" style="grid-column: 1 / span 2">
+              <el-input v-model="form.bfjdShyj" placeholder="请输入补发街道(乡镇)审核意见"/>
+            </el-form-item>
+          </div>
           <!--<el-form-item label="补发街道(乡镇)审核时间" prop="bfjdShsj">-->
             <!--<el-date-picker clearable-->
                             <!--v-model="form.bfjdShsj"-->
@@ -378,33 +378,28 @@
         </div>
         <div v-if="status=='17'">
           <h3 style="margin-top: 20px">补发区民政局审核</h3>
-          <table  class="tableStyle">
-            <tr>
-              <td><el-form-item label="审核结果" prop="bfmzShjg">
-                <el-select v-model="form.bfmzShjg" placeholder="请选择补发区民政局审核结果">
-                  <el-option
-                    v-for="dict in dict.type.GL007"
-                    :key="dict.value"
-                    :label="dict.label"
-                    :value="dict.value"
-                  ></el-option>
-                </el-select>
-              </el-form-item></td>
-              <td>
-                <el-form-item label="审核意见" prop="bfmzShyj">
-                  <el-input v-model="form.bfmzShyj" placeholder="请输入补发区民政局审核意见"/>
-                </el-form-item>
-              </td>
-            </tr>
-            <!--<el-form-item label="补发区民政局审核时间" prop="bfmzShsj">-->
-              <!--<el-date-picker clearable-->
-                              <!--v-model="form.bfmzShsj"-->
-                              <!--type="datetime"-->
-                              <!--value-format="yyyyMMddHHmmss"-->
-                              <!--placeholder="请选择补发区民政局审核时间">-->
-              <!--</el-date-picker>-->
-            <!--</el-form-item>-->
-          </table>
+          <div class="grid2">
+            <el-form-item label="审核结果" prop="bfmzShjg">
+              <el-select v-model="form.bfmzShjg" placeholder="请选择补发区民政局审核结果">
+                <el-option
+                  v-for="dict in dict.type.GL007"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="审批人" prop="bfmzShrxm">
+              <el-input
+                v-model="form.bfmzShrxm"
+                placeholder="请输入审批人"
+              />
+            </el-form-item>
+            <el-form-item label="审核意见" prop="bfmzShyj" style="grid-column: 1 / span 2">
+              <el-input v-model="form.bfmzShyj" placeholder="请输入补发区民政局审核意见"/>
+            </el-form-item>
+
+          </div>
         </div>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -632,6 +627,7 @@ export default {
             this.formXq={
               ...response.data,
               isdb: this.translateDict('CZ035',  response.data.isdb),
+              isqr: this.translateDict('CZ035',  response.data.isqr),
               newIsdb: response.data.isdb,
               iszc: this.translateDict('CZ035',  response.data.iszc),
               istk: this.translateDict('CZ035',  response.data.istk),
@@ -788,12 +784,15 @@ export default {
         bfsqShjg: null,
         bfsqShyj: null,
         bfsqShsj: null,
+        bfsqShrxm:null,
         bfjdShjg: null,
         bfjdShyj: null,
         bfjdShsj: null,
+        bfjdShrxm:null,
         bfmzShjg: null,
         bfmzShyj: null,
         bfmzShsj: null,
+        bfmzShrxm:null,
         jfxxList:[],
         cxjf:'0',
         status: "0",
@@ -826,6 +825,7 @@ export default {
       this.reset();
       this.status=null;
       this.open = true;
+      this.getSqShrxm();
       this.title = "添加高龄津贴申请信息补发信息";
     },
     /** 修改按钮操作 */
@@ -863,6 +863,7 @@ export default {
         this.formXq={
           ...this.form,
           isdb: this.translateDict('CZ035',  this.form.isdb),
+          isqr: this.translateDict('CZ035',  response.data.isqr),
           iszc: this.translateDict('CZ035',  this.form.iszc),
           istk: this.translateDict('CZ035',  this.form.istk),
           gx: this.translateDict('C0032',  this.form.gx),
@@ -892,6 +893,15 @@ export default {
         }
         if(type===1)
         {
+          if(this.status == "16"){
+            this.getJdShrxm();
+          }
+          //区县审核
+          if(this.status == "17"){
+            this.getMzShrxm();
+          }
+
+          this.getSqShrxm();
           this.open = true;
         }
         if(type===2)
@@ -901,9 +911,37 @@ export default {
         this.title = "高龄津贴补发信息";
       });
     },
+    //缓存各级的审批人
+    saveSpr(){
+      if(this.form.bfsqShrxm){
+        localStorage.setItem('bfsqShrxm', this.form.bfsqShrxm);
+      }
+      if(this.form.bfjdShrxm){
+        localStorage.setItem('bfjdShrxm', this.form.bfjdShrxm);
+      }
+      if(this.form.bfmzShrxm){
+        localStorage.setItem('bfmzShrxm', this.form.bfmzShrxm);
+      }
+    },
+    getSqShrxm(){
+      if(localStorage.getItem('bfsqShrxm')&&!this.form.bfsqShrxm){
+        this.form.bfsqShrxm=localStorage.getItem('bfsqShrxm')
+      }
+    },
+    getJdShrxm(){
+      if(localStorage.getItem('bfjdShrxm')&&!this.form.bfjdShrxm){
+        this.form.bfjdShrxm =localStorage.getItem('bfjdShrxm')
+      }
+    },
+    getMzShrxm(){
+      if(localStorage.getItem('bfmzShrxm')&&!this.form.bfmzShrxm){
+        this.form.bfmzShrxm=localStorage.getItem('bfmzShrxm')
+      }
+    },
     handleXq(row) {
       this.reset();
       const id = row.id || this.ids;
+      this.status=null;
       this.getInfo(id,2);
     },
     handleDy(row) {
@@ -947,7 +985,8 @@ export default {
               id:this.form.id,
               bfjdShjg:this.form.bfjdShjg,
               bfjdShyj:this.form.bfjdShyj,
-              bfjdShsj:this.getTime()
+              bfjdShsj:this.getTime(),
+              bfjdShrxm: this.form.bfjdShrxm,
             }
           }
           if(this.status=='17'){
@@ -955,7 +994,8 @@ export default {
               id:this.form.id,
               bfmzShjg:this.form.bfmzShjg,
               bfmzShyj:this.form.bfmzShyj,
-              bfmzShsj:this.getTime()
+              bfmzShsj:this.getTime(),
+              bfmzShrxm: this.form.bfmzShrxm,
             }
           }
           if(this.status=='19'){
@@ -968,12 +1008,15 @@ export default {
             qur.bfmzShjg=null;
             qur.bfmzShyj=null;
             qur.bfmzShsj=null;
+            qur.bfjdShrxm= null;
+            qur.bfmzShrxm= null;
           }
           if (this.form.id != null) {
             /****** sks 需要改动的地方 start ******/
             updateGljtSqBf(qur).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
+              this.saveSpr();
               this.getList();
             }).finally(() => this.submitFormLoading = false);
             /****** sks 需要改动的地方 end ******/
@@ -981,6 +1024,7 @@ export default {
             addGljtSqBf({...qur,id:null}).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
+              this.saveSpr();
               this.getList();
             }).finally(() => this.submitFormLoading = false);
           }
@@ -1107,4 +1151,9 @@ export default {
       }
     }
   }
+  .grid2 {
+    display: grid;
+    grid-template-columns: 1fr 1fr;
+    /*grid-template-rows: 50px 50px;*/
+  }
 </style>

ruoyi-ui-gljt/src/views/gljt/gljtSqZj/index.vue

@@ -287,73 +287,76 @@
             </tr>
           </table>
           <h3 style="margin-top: 20px">追缴社区(村)审核</h3>
-          <table  class="tableStyle">
-            <tr>
-              <td>
-                <el-form-item label="审核结果" prop="zjsqShjg">
-                  <el-select v-model="form.zjsqShjg" placeholder="请选择追缴社区(村)审核结果">
-                    <el-option
-                      v-for="dict in dict.type.GL007"
-                      :key="dict.value"
-                      :label="dict.label"
-                      :value="dict.value"
-                    ></el-option>
-                  </el-select>
-                </el-form-item>
-              </td>
-              <td>
-                <el-form-item label="审核意见" prop="zjsqShyj">
-                  <el-input v-model="form.zjsqShyj" placeholder="请输入追缴社区(村)审核意见"/>
-                </el-form-item>
-              </td>
-            </tr>
-          </table>
+          <div class="grid2">
+            <el-form-item label="审核结果" prop="zjsqShjg">
+              <el-select v-model="form.zjsqShjg" placeholder="请选择追缴社区(村)审核结果">
+                <el-option
+                  v-for="dict in dict.type.GL007"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="审批人" prop="zjsqShrxm">
+              <el-input
+                v-model="form.zjsqShrxm"
+                placeholder="请输入审批人"
+              />
+            </el-form-item>
+            <el-form-item label="审核意见" prop="zjsqShyj" style="grid-column: 1 / span 2">
+              <el-input v-model="form.zjsqShyj" placeholder="请输入追缴社区(村)审核意见"/>
+            </el-form-item>
+          </div>
+
         </div>
         <div v-if="status=='20'">
           <h3 style="margin-top: 20px">追缴街道(乡镇)审核</h3>
-          <table  class="tableStyle">
-            <tr>
-              <td>
-                <el-form-item label="审核结果" prop="zjjdShjg">
-                  <el-select v-model="form.zjjdShjg" placeholder="请选择追缴街道(乡镇)审核结果">
-                    <el-option
-                      v-for="dict in dict.type.GL007"
-                      :key="dict.value"
-                      :label="dict.label"
-                      :value="dict.value"
-                    ></el-option>
-                  </el-select>
-                </el-form-item>
-              </td>
-              <td>
-                <el-form-item label="审核意见" prop="zjjdShyj">
-                   <el-input v-model="form.zjjdShyj" placeholder="请输入追缴街道(乡镇)审核意见"/>
-                </el-form-item>
-              </td>
-            </tr>
-          </table>
+          <div class="grid2">
+            <el-form-item label="审核结果" prop="zjjdShjg">
+              <el-select v-model="form.zjjdShjg" placeholder="请选择追缴街道(乡镇)审核结果">
+                <el-option
+                  v-for="dict in dict.type.GL007"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="审批人" prop="zjjdShrxm">
+              <el-input
+                v-model="form.zjjdShrxm"
+                placeholder="请输入审批人"
+              />
+            </el-form-item>
+            <el-form-item label="审核意见" prop="zjjdShyj" style="grid-column: 1 / span 2">
+              <el-input v-model="form.zjjdShyj" placeholder="请输入追缴街道(乡镇)审核意见"/>
+            </el-form-item>
+          </div>
         </div>
         <div v-if="status=='21'">
           <h3 style="margin-top: 20px">追缴区民政局审核</h3>
-          <table  class="tableStyle">
-            <tr>
-              <td><el-form-item label="审核结果" prop="zjmzShjg">
-                <el-select v-model="form.zjmzShjg" placeholder="请选择追缴区民政局审核结果">
-                  <el-option
-                    v-for="dict in dict.type.GL007"
-                    :key="dict.value"
-                    :label="dict.label"
-                    :value="dict.value"
-                  ></el-option>
-                </el-select>
-              </el-form-item></td>
-              <td>
-                <el-form-item label="审核意见" prop="zjmzShyj">
-                  <el-input v-model="form.zjmzShyj" placeholder="请输入追缴区民政局审核意见"/>
-                </el-form-item>
-              </td>
-            </tr>
-          </table>
+          <div class="grid2">
+            <el-form-item label="审核结果" prop="zjmzShjg">
+              <el-select v-model="form.zjmzShjg" placeholder="请选择追缴区民政局审核结果">
+                <el-option
+                  v-for="dict in dict.type.GL007"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="审批人" prop="zjmzShrxm">
+              <el-input
+                v-model="form.zjmzShrxm"
+                placeholder="请输入审批人"
+              />
+            </el-form-item>
+            <el-form-item label="审核意见" prop="zjmzShyj" style="grid-column: 1 / span 2">
+              <el-input v-model="form.zjmzShyj" placeholder="请输入追缴区民政局审核意见"/>
+            </el-form-item>
+          </div>
         </div>
 
       </el-form>
@@ -568,6 +571,7 @@ export default {
             this.formXq={
               ...response.data,
               isdb: this.translateDict('CZ035',  response.data.isdb),
+              isqr: this.translateDict('CZ035',  response.data.isqr),
               iszc: this.translateDict('CZ035',  response.data.iszc),
               istk: this.translateDict('CZ035',  response.data.istk),
               gx: this.translateDict('C0032',  response.data.gx),
@@ -654,12 +658,15 @@ export default {
         zjsqShjg: null,
         zjsqShyj: null,
         zjsqShsj: null,
+        zjsqShrxm:null,
         zjjdShjg: null,
         zjjdShyj: null,
         zjjdShsj: null,
+        zjjdShrxm:null,
         zjmzShjg: null,
         zjmzShyj: null,
         zjmzShsj: null,
+        zjmzShrxm:null,
         jfxxList:[],
         status: "0",
       };
@@ -691,6 +698,7 @@ export default {
       this.reset();
       this.status=null;
       this.open = true;
+      this.getSqShrxm();
       this.title = "添加高龄津贴申请信息追缴信息";
     },
     /** 修改按钮操作 */
@@ -711,13 +719,14 @@ export default {
     getInfo(id,type){
       getGljtSqZj(id).then(response => {
         this.form = response.data;
+        let newJfxxList=null;
         if(this.status=='22'){
-          this.form.bfks=null;
-          this.form.bfjs=null;
-          this.form.bfys=null;
-          this.form.bfjeCity=null;
-          this.form.bfyy=null;
-          this.form.bffj=null;
+          // this.form.bfks=null;
+          // this.form.bfjs=null;
+          // this.form.bfys=null;
+          // this.form.bfjeCity=null;
+          // this.form.bfyy=null;
+          // this.form.bffj=null;
           this.form.zjsqShjg=null;
           this.form.zjsqShyj=null;
           this.form.zjsqShsj=null;
@@ -727,11 +736,43 @@ export default {
           this.form.zjmzShjg=null;
           this.form.zjmzShyj=null;
           this.form.zjmzShsj=null;
-          this.form.jfxxList=[];
+          newJfxxList=JSON.parse(JSON.stringify(this.form.jfxxList));
+          this.multipleSelection=newJfxxList;
+          // this.form.jfxxList=[];
+          let  qur={
+            lrId:this.form.lrId,
+            bfks:this.form.bfks,
+            bfjs:this.form.bfjs
+          };
+          formList(qur).then(res=>{
+            this.form.bfks =res.data.start;
+            this.form.bfjs =res.data.end;
+            if(res.data.list&&res.data.list.length>0){
+              this.form.jfxxList=res.data.list.map(item=>{
+                return {...item,max:item.ffje}
+              });
+              this.form.jfxxList.forEach((item,index)=>{
+                this.multipleSelection.forEach((ite,ind)=>{
+                  if(item.ffyf==ite.ffyf){
+                    this.multipleSelection[ind].max=item.ffje;
+                    this.form.jfxxList[index]=this.multipleSelection[ind]
+                  }
+                })
+              });
+              let that=this;
+              this.$nextTick(()=>{
+                newJfxxList.forEach(row => {
+                  that.$refs.multipleTable.toggleRowSelection(row);
+                });
+              })
+            }
+          })
         }
         this.formXq={
           ...this.form,
+          jfxxList:newJfxxList?newJfxxList:this.form.jfxxList,
           isdb: this.translateDict('CZ035',  this.form.isdb),
+          isqr: this.translateDict('CZ035',  response.data.isqr),
           iszc: this.translateDict('CZ035',  this.form.iszc),
           istk: this.translateDict('CZ035',  this.form.istk),
           gx: this.translateDict('C0032',  this.form.gx),
@@ -749,6 +790,15 @@ export default {
 
         if(type===1)
         {
+          if(this.status == "20"){
+            this.getJdShrxm();
+          }
+          //区县审核
+          if(this.status == "21"){
+            this.getMzShrxm();
+          }
+
+          this.getSqShrxm();
           this.open = true;
         }
         if(type===2)
@@ -758,9 +808,37 @@ export default {
         this.title = "高龄津贴追缴信息";
       });
     },
+    //缓存各级的审批人
+    saveSpr(){
+      if(this.form.zjsqShrxm){
+        localStorage.setItem('zjsqShrxm', this.form.zjsqShrxm);
+      }
+      if(this.form.zjjdShrxm){
+        localStorage.setItem('zjjdShrxm', this.form.zjjdShrxm);
+      }
+      if(this.form.zjmzShrxm){
+        localStorage.setItem('zjmzShrxm', this.form.zjmzShrxm);
+      }
+    },
+    getSqShrxm(){
+      if(localStorage.getItem('zjsqShrxm')&&!this.form.zjsqShrxm){
+        this.form.zjsqShrxm=localStorage.getItem('zjsqShrxm')
+      }
+    },
+    getJdShrxm(){
+      if(localStorage.getItem('zjjdShrxm')&&!this.form.zjjdShrxm){
+        this.form.zjjdShrxm =localStorage.getItem('zjjdShrxm')
+      }
+    },
+    getMzShrxm(){
+      if(localStorage.getItem('zjmzShrxm')&&!this.form.zjmzShrxm){
+        this.form.zjmzShrxm=localStorage.getItem('zjmzShrxm')
+      }
+    },
     handleXq(row) {
       this.reset();
       const id = row.id || this.ids;
+      this.status=null;
       this.getInfo(id,2);
     },
     handleDy(row) {
@@ -798,7 +876,8 @@ export default {
               id:this.form.id,
               zjjdShjg:this.form.zjjdShjg,
               zjjdShyj:this.form.zjjdShyj,
-              zjjdShsj:this.getTime()
+              zjjdShsj:this.getTime(),
+              zjjdShrxm: this.form.zjjdShrxm,
             }
           }
           if(this.status=='21'){
@@ -806,7 +885,8 @@ export default {
               id:this.form.id,
               zjmzShjg:this.form.zjmzShjg,
               zjmzShyj:this.form.zjmzShyj,
-              zjmzShsj:this.getTime()
+              zjmzShsj:this.getTime(),
+              zjmzShrxm: this.form.zjmzShrxm,
             }
           }
           if(this.status=='22'){
@@ -819,12 +899,15 @@ export default {
             qur.zjmzShjg=null;
             qur.zjmzShyj=null;
             qur.zjmzShsj=null;
+            qur.zjjdShrxm= null;
+            qur.zjmzShrxm= null;
           }
           this.submitFormLoading = true;
           if (this.form.id != null) {
             updateGljtSqZj(qur).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
+              this.saveSpr();
               this.getList();
             }).finally(() => this.submitFormLoading = false);
 
@@ -832,6 +915,7 @@ export default {
             addGljtSqZj({...qur,id:null}).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
+              this.saveSpr();
               this.getList();
             }).finally(() => this.submitFormLoading = false);
           }
@@ -958,4 +1042,9 @@ export default {
       }
     }
   }
+  .grid2 {
+    display: grid;
+    grid-template-columns: 1fr 1fr;
+    /*grid-template-rows: 50px 50px;*/
+  }
 </style>

ruoyi-ui-gljt/src/views/gljt/gljtTf/index.vue

@@ -257,52 +257,52 @@
           </table>
           <div v-if="zyMsg" style="color: red;font-size: 18px;font-weight: bold;">注意：{{zyMsg}}</div>
           <h3 style="margin-top: 20px">停发社区(村)审核</h3>
-          <table  class="tableStyle">
-            <tr>
-              <td>
-                <el-form-item label="审核结果" prop="tfsqShjg">
-                  <el-select v-model="form.tfsqShjg" placeholder="请选择停发社区(村)审核结果">
-                    <el-option
-                      v-for="dict in dict.type.GL007"
-                      :key="dict.value"
-                      :label="dict.label"
-                      :value="dict.value"
-                    ></el-option>
-                  </el-select>
-                </el-form-item>
-              </td>
-              <td>
-                <el-form-item label="审核意见" prop="tfsqShyj">
-                  <el-input v-model="form.tfsqShyj" placeholder="请输入停发社区(村)审核意见"/>
-                </el-form-item>
-              </td>
-            </tr>
-          </table>
+          <div class="grid2">
+            <el-form-item label="审核结果" prop="tfsqShjg">
+              <el-select v-model="form.tfsqShjg" placeholder="请选择停发社区(村)审核结果">
+                <el-option
+                  v-for="dict in dict.type.GL007"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="审批人" prop="tfsqShrxm">
+              <el-input
+                v-model="form.tfsqShrxm"
+                placeholder="请输入审批人"
+              />
+            </el-form-item>
+            <el-form-item label="审核意见" prop="tfsqShyj" style="grid-column: 1 / span 2">
+              <el-input v-model="form.tfsqShyj" placeholder="请输入停发社区(村)审核意见"/>
+            </el-form-item>
+          </div>
         </div>
         <div v-if="status=='5'">
           <div v-if="zyMsg" style="color: red;font-size: 18px;font-weight: bold;margin-top: 10px;">注意：{{zyMsg}}</div>
           <h3 style="margin-top: 20px">停发街道(乡镇)审核</h3>
-          <table  class="tableStyle">
-            <tr>
-              <td>
-                <el-form-item label="审核结果" prop="tfjdShjg">
-                  <el-select v-model="form.tfjdShjg" placeholder="请选择停发街道(乡镇)审核结果">
-                    <el-option
-                      v-for="dict in dict.type.GL007"
-                      :key="dict.value"
-                      :label="dict.label"
-                      :value="dict.value"
-                    ></el-option>
-                  </el-select>
-                </el-form-item>
-              </td>
-              <td>
-                <el-form-item label="审核意见" prop="tfjdShyj">
-                  <el-input v-model="form.tfjdShyj" placeholder="请输入停发街道(乡镇)审核意见"/>
-                </el-form-item>
-              </td>
-            </tr>
-          </table>
+          <div class="grid2">
+            <el-form-item label="审核结果" prop="tfjdShjg">
+              <el-select v-model="form.tfjdShjg" placeholder="请选择停发街道(乡镇)审核结果">
+                <el-option
+                  v-for="dict in dict.type.GL007"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="审批人" prop="tfjdShrxm">
+              <el-input
+                v-model="form.tfjdShrxm"
+                placeholder="请输入审批人"
+              />
+            </el-form-item>
+            <el-form-item label="审核意见" prop="tfjdShyj">
+              <el-input v-model="form.tfjdShyj" placeholder="请输入停发街道(乡镇)审核意见"/>
+            </el-form-item>
+          </div>
           <!--<el-form-item label="补发街道(乡镇)审核时间" prop="bfjdShsj">-->
           <!--<el-date-picker clearable-->
           <!--v-model="form.bfjdShsj"-->
@@ -315,27 +315,27 @@
         <div v-if="status=='6'">
           <div v-if="zyMsg" style="color: red;font-size: 18px;font-weight: bold;margin-top: 10px;">注意：{{zyMsg}}</div>
           <h3 style="margin-top: 20px">停发区民政局审核</h3>
-          <table  class="tableStyle">
-            <tr>
-              <td>
-                <el-form-item label="审核结果" prop="tfmzShjg">
-                  <el-select v-model="form.tfmzShjg" placeholder="请选择停发区民政局审核结果">
-                    <el-option
-                      v-for="dict in dict.type.GL007"
-                      :key="dict.value"
-                      :label="dict.label"
-                      :value="dict.value"
-                    ></el-option>
-                  </el-select>
-                </el-form-item>
-              </td>
-              <td>
-                <el-form-item label="审核意见" prop="tfmzShyj">
-                  <el-input v-model="form.tfmzShyj" placeholder="请输入停发区民政局审核意见"/>
-                </el-form-item>
-              </td>
-            </tr>
-          </table>
+          <div class="grid2">
+            <el-form-item label="审核结果" prop="tfmzShjg">
+              <el-select v-model="form.tfmzShjg" placeholder="请选择停发区民政局审核结果">
+                <el-option
+                  v-for="dict in dict.type.GL007"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="审批人" prop="tfmzShrxm">
+              <el-input
+                v-model="form.tfmzShrxm"
+                placeholder="请输入审批人"
+              />
+            </el-form-item>
+            <el-form-item label="审核意见" prop="tfmzShyj">
+              <el-input v-model="form.tfmzShyj" placeholder="请输入停发区民政局审核意见"/>
+            </el-form-item>
+          </div>
         </div>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -553,6 +553,7 @@ export default {
             this.formXq={
               ...response.data,
               isdb: this.translateDict('CZ035',  response.data.isdb),
+              isqr: this.translateDict('CZ035',  response.data.isqr),
               iszc: this.translateDict('CZ035',  response.data.iszc),
               istk: this.translateDict('CZ035',  response.data.istk),
               gx: this.translateDict('C0032',  response.data.gx),
@@ -645,12 +646,15 @@ export default {
         tfsqShjg: null,
         tfsqShyj: null,
         tfsqShsj: null,
+        tfsqShrxm:null,
         tfjdShjg: null,
         tfjdShyj: null,
         tfjdShsj: null,
+        tfjdShrxm:null,
         tfmzShjg: null,
         tfmzShyj: null,
         tfmzShsj: null,
+        tfmzShrxm:null,
         status: "0",
       };
       this.zyMsg=null;
@@ -679,6 +683,7 @@ export default {
       this.reset();
       this.status=null;
       this.open = true;
+      this.getSqShrxm();
       this.title = "添加高龄津贴申请停发信息";
     },
     /** 修改按钮操作 */
@@ -705,7 +710,6 @@ export default {
              // this.form.tfsj=null;
              // this.form.tfyy=null;
              // this.form.tffj=null;
-
             this.form.tfsqShjg=null;
             this.form.tfsqShyj=null;
             this.form.tfsqShsj=null;
@@ -720,6 +724,7 @@ export default {
         this.formXq={
           ...this.form,
           isdb: this.translateDict('CZ035',  this.form.isdb),
+          isqr: this.translateDict('CZ035',  response.data.isqr),
           iszc: this.translateDict('CZ035',  this.form.iszc),
           istk: this.translateDict('CZ035',  this.form.istk),
           gx: this.translateDict('C0032',  this.form.gx),
@@ -745,6 +750,15 @@ export default {
         }
         if(type===1)
         {
+          if(this.status == "5"){
+            this.getJdShrxm();
+          }
+          //区县审核
+          if(this.status == "6"){
+            this.getMzShrxm();
+          }
+
+          this.getSqShrxm();
           this.open = true;
           checkTfsj({tfyf:this.formXq.tfyf,sqrZjhm:this.formXq.sqrZjhm}).then(res=>{
             if(res.msg)
@@ -768,6 +782,33 @@ export default {
       const id = row.id || this.ids;
       this.getInfo(id,2);
     },
+    //缓存各级的审批人
+    saveSpr(){
+      if(this.form.tfsqShrxm){
+        localStorage.setItem('tfsqShrxm', this.form.tfsqShrxm);
+      }
+      if(this.form.tfjdShrxm){
+        localStorage.setItem('tfjdShrxm', this.form.tfjdShrxm);
+      }
+      if(this.form.tfmzShrxm){
+        localStorage.setItem('tfmzShrxm', this.form.tfmzShrxm);
+      }
+    },
+    getSqShrxm(){
+      if(localStorage.getItem('tfsqShrxm')&&!this.form.tfsqShrxm){
+        this.form.tfsqShrxm=localStorage.getItem('tfsqShrxm')
+      }
+    },
+    getJdShrxm(){
+      if(localStorage.getItem('tfjdShrxm')&&!this.form.tfjdShrxm){
+        this.form.tfjdShrxm =localStorage.getItem('tfjdShrxm')
+      }
+    },
+    getMzShrxm(){
+      if(localStorage.getItem('tfmzShrxm')&&!this.form.tfmzShrxm){
+        this.form.tfmzShrxm=localStorage.getItem('tfmzShrxm')
+      }
+    },
     handleDy(row) {
       this.reset();
       const id = row.id ;
@@ -796,7 +837,8 @@ export default {
               lrId:this.form.lrId,
               tfjdShjg:this.form.tfjdShjg,
               tfjdShyj:this.form.tfjdShyj,
-              tfjdShsj:this.getTime()
+              tfjdShsj:this.getTime(),
+              tfjdShrxm: this.form.tfjdShrxm,
             }
           }
           if(this.status=='6'){
@@ -805,7 +847,8 @@ export default {
               lrId:this.form.lrId,
               tfmzShjg:this.form.tfmzShjg,
               tfmzShyj:this.form.tfmzShyj,
-              tfmzShsj:this.getTime()
+              tfmzShsj:this.getTime(),
+              tfmzShrxm: this.form.tfmzShrxm,
             }
           }
           if(this.status=='8'){
@@ -818,18 +861,22 @@ export default {
             qur.tfmzShjg=null;
             qur.tfmzShyj=null;
             qur.tfmzShsj=null;
+            qur.tfjdShrxm= null;
+            qur.tfmzShrxm= null;
           }
           this.submitFormLoading = true;
           if (this.form.id != null) {
             updateGljtTf(qur).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
+              this.saveSpr();
               this.getList();
             }).finally(() => this.submitFormLoading = false);
           } else {
             addGljtTf({...qur,id:null}).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
+              this.saveSpr();
               this.getList();
             }).finally(() => this.submitFormLoading = false);
           }
@@ -956,4 +1003,9 @@ export default {
       }
     }
   }
+  .grid2 {
+    display: grid;
+    grid-template-columns: 1fr 1fr;
+    /*grid-template-rows: 50px 50px;*/
+  }
 </style>