Merge branch '问题处理' of sckj/mz-cloud into master

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

@@ -957,7 +957,7 @@
                 <td style="width: 1.7%;">
                   <span style="width: 73px;display: inline-block;">变更内容</span>
                 </td>
-                <td><pre>{{ form.bdbz }}</pre></td>
+                <td><pre style="color: red;font-weight: bold">{{ form.bdbz }}</pre></td>
               </tr>
             </table>
 

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

@@ -238,11 +238,13 @@
           <td>{{ form.pc }}</td>
           <td>始发年月</td>
           <td>
+            <el-tag>
             {{
               form.ffyf && form.ffyf.length >= 6
                 ? form.ffyf.slice(0, 4) + "-" + form.ffyf.slice(-2)
                 : form.ffyf
             }}
+            </el-tag>
           </td>
         </tr>
         <tr>
@@ -260,7 +262,7 @@
             <td style="width: 1.7%;">
               <span style="width: 73px;display: inline-block;">变更内容</span>
             </td>
-            <td><pre>{{ form.bdbz }}</pre></td>
+            <td><pre style="color: red;font-weight: bold">{{ form.bdbz }}</pre></td>
           </tr>
         </table>
       </div>
@@ -309,6 +311,7 @@
           <el-table :data="form.jfxxList">
             <el-table-column label="追缴月份" align="center" prop="ffyf">
               <template slot-scope="scope">
+                <el-tag type="danger">
                 {{
                   scope.row.ffyf && scope.row.ffyf.length >= 6
                     ? scope.row.ffyf.slice(0, 4) +
@@ -316,6 +319,7 @@
                       scope.row.ffyf.slice(-2)
                     : scope.row.ffyf
                 }}
+                </el-tag>
               </template>
             </el-table-column>
             <el-table-column label="追缴金额" align="center" prop="ffje">
@@ -382,6 +386,7 @@
           <el-table :data="form.jfxxList">
             <el-table-column label="补贴月份" align="center" prop="ffyf">
               <template slot-scope="scope">
+                <el-tag>
                 {{
                   scope.row.ffyf && scope.row.ffyf.length >= 6
                     ? scope.row.ffyf.slice(0, 4) +
@@ -389,6 +394,7 @@
                       scope.row.ffyf.slice(-2)
                     : scope.row.ffyf
                 }}
+                </el-tag>
               </template>
             </el-table-column>
             <el-table-column label="补发金额" align="center" prop="ffje">
@@ -411,7 +417,7 @@
         </tr>
         <tr>
           <td>停发月份</td>
-          <td>{{ form.tfyf | ffyfFilter }}</td>
+          <td><el-tag type="danger">{{ form.tfyf | ffyfFilter }}</el-tag></td>
           <td v-if="form.tfyyValue!='5'">{{form.tfyy}}时间</td>
           <td v-if="form.tfyyValue!='5'">{{ special(form.tfsj, "time") }}</td>
         </tr>

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

@@ -96,6 +96,16 @@
                     @click="handleAdd"
                   >新增</el-button>
                 </el-col>
+          <el-col :span="1.5">
+            <el-button
+              type="warning"
+              plain
+              icon="el-icon-download"
+              size="mini"
+              @click="handleExport"
+            >老人导出
+            </el-button>
+          </el-col>
 
           <el-col :span="1.5">
             <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleImport(true)"  v-if="level===4"
@@ -1225,6 +1235,9 @@
           this.form.xzqh = this.form.xzqhCode
             ? JSON.stringify(this.form.xzqhCode.split(","))
             : [];
+          this.form.xjdxzqh = this.form.xjdxzqhCode
+            ? JSON.stringify(this.form.xjdxzqhCode.split(","))
+            : [];
           this.getKhyh();
           /****** sks 需要改动的地方 start ******/
           // this.copyForm=this.deepCopy(response.data)
@@ -1319,6 +1332,8 @@
           if (valid) {
             this.submitFormLoading = true;
             let xzqh = "";
+            let xjdxzqh = "";
+            let qur = {};
             if (this.form.xzqh !== null) {
               if (Array.isArray(this.form.xzqh)) {
                 xzqh = this.form.xzqh[this.form.xzqh.length - 1];
@@ -1327,15 +1342,28 @@
                 xzqh = data[data.length - 1];
               }
             }
+            if (this.form.xjdxzqh !== null) {
+              if (Array.isArray(this.form.xjdxzqh)) {
+                xjdxzqh = this.form.xjdxzqh[this.form.xjdxzqh.length - 1];
+              } else {
+                let data = JSON.parse(this.form.xjdxzqh);
+                xjdxzqh = data[data.length - 1];
+              }
+            }
+            qur = {
+              ...this.form,
+              xzqh: xzqh,
+              xjdxzqh: xjdxzqh,
+            };
             if (this.form.id != null) {
               /****** sks 需要改动的地方 start ******/
-              updateGljtLr({...this.form,xzqh:xzqh}).then(response => {
+              updateGljtLr(qur).then(response => {
                 this.$modal.msgSuccess("修改成功");
                 this.open = false;
                 this.getList();
               }).finally(() => this.submitFormLoading = false);
             } else {
-              addGljtLr({...this.form,xzqh:xzqh}).then(response => {
+              addGljtLr(qur).then(response => {
                 this.$modal.msgSuccess("新增成功");
                 this.open = false;
                 this.getList();
@@ -1405,7 +1433,7 @@
           deptL = this.user.userData.dept.locationCode;
         }
         const sss1 = {
-          tab: {tab: 'jtmd', qh: deptL},
+          tab: {tab: 'jtmdn', qh: deptL},
           sys: {dpt: '高龄津贴老人名册(' + this.user.userData.dept.deptName + ')', dt: Date.now()},
           tj: tj
         }

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

@@ -178,6 +178,7 @@
             <el-radio-group v-model="form.replace" >
               <el-radio
                 :disabled="isXq"
+                @change="changeReplace"
                 v-for="dict in dict.type.CZ035"
                 :key="dict.value"
                 :label="dict.value"
@@ -338,6 +339,11 @@
       this.getList();
     },
     methods: {
+      // changeReplace(){
+      //   this.$modal.confirm('确认替换老人的自拍照吗,选择“是”，后续的健康登记会跟此照片进行对比？').then(function () {
+      //
+      //   })
+      // },
       lookOld(sqrZjhm){
         if(sqrZjhm)
         {

ruoyi-ui-gljt/src/views/gljtcx/jkdjjlcx/index.vue

@@ -99,6 +99,9 @@
           <el-table-column label="姓名" align="center" prop="xm"/>
           <el-table-column label="身份证号" align="center" prop="sfzh" width="180"/>
           <el-table-column label="行政区划" align="center" prop="xzqhName" width="320"/>
+          <el-table-column label="登记时段" align="center" prop="jcsd"/>
+          <!--jcsd-->
+
           <el-table-column label="登记时间" align="center" prop="djsj" width="180">
           <template slot-scope="scope">
             <span>{{ special(scope.row.djsj, 'time') }}</span>