Merge branch '津贴追加' of sckj/mz-cloud into master

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

@@ -78,11 +78,11 @@
             <td colspan="3">{{selectDictLabels(dict.type['GL013'], rowData.btbz)}}</td>
           </tr>
           <tr>
-            <td>描述</td>
-            <td colspan="3">{{rowData.ms}}</td>
-            <td>发放时间</td>
-            <td>{{special(rowData.ffsj,'time')}}</td>
-            <td>发放金额</td>
+            <td>追加原因</td>
+            <td colspan="3">{{rowData.zjyy}}</td>
+            <td>追加人数</td>
+            <td>{{rowData.zjrs}}</td>
+            <td>追加金额</td>
             <td>{{rowData.zjje}}</td>
           </tr>
         </table>
@@ -104,16 +104,16 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
-          <el-form-item label="补贴标准" prop="btbz">
-            <el-select  v-model="queryParams.btbz" placeholder="请选择补贴标准" clearable>
-              <el-option
-                v-for="dict in dict.type.GL013"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              />
-            </el-select>
-          </el-form-item>
+          <!--<el-form-item label="补贴标准" prop="btbz">-->
+            <!--<el-select  v-model="queryParams.btbz" placeholder="请选择补贴标准" clearable>-->
+              <!--<el-option-->
+                <!--v-for="dict in dict.type.GL013"-->
+                <!--:key="dict.value"-->
+                <!--:label="dict.label"-->
+                <!--:value="dict.value"-->
+              <!--/>-->
+            <!--</el-select>-->
+          <!--</el-form-item>-->
           <el-form-item label="行政区划" prop="xzqh">
             <el-select v-model="queryParams.xzqh" multiple>
               <el-option v-for="(item,index) in xzqhOptGl" :key="item.id" :value="item.id" :label="item.name"/>
@@ -161,7 +161,7 @@
               icon="el-icon-edit"
               @click="handleFf(rowData)"
               v-hasPermi="['gljt:plzj:edit']"
-            >确认发放
+            >确认追加
             </el-button>
           </el-col>
           <el-col :span="1.5">
@@ -184,7 +184,7 @@
               size="mini"
               @click="handleExport"
               v-hasPermi="['gljt:plzj:export']"
-            >数据导出A
+            >数据导出
             </el-button>
           </el-col>
         </el-row>
@@ -213,12 +213,7 @@
           </el-table-column>
           <el-table-column label="银行账号" align="center" prop="yhzh" width="200"/>
           <el-table-column label="开户名称" align="center" prop="khmc"/>
-          <el-table-column label="当发月份" align="center" prop="dfyf">
-            <template v-slot="{ row }">
-              {{ row.dfyf | ffyfFilter }}
-            </template>
-          </el-table-column>
-          <el-table-column label="计发月份" align="center" prop="ffyf">
+          <el-table-column label="发放月份" align="center" prop="ffyf">
             <template slot-scope="scope">
               <span>{{ scope.row.ffyf | ffyfFilter}}</span>
             </template>
@@ -407,12 +402,12 @@
           </tr>
           <tr>
             <td colspan="2">
-              <el-form-item label="描述" prop="ms">
+              <el-form-item label="追加原因" prop="zjyy">
                 <el-input style="width: 100%"
                           type="textarea"
                           maxlength="100"
                           show-word-limit
-                          v-model="form.ms" placeholder="请输入描述"/>
+                          v-model="form.zjyy" placeholder="请输入追加原因"/>
               </el-form-item>
             </td>
           </tr>
@@ -569,7 +564,7 @@
             size="mini"
             @click="handleExportTj"
             v-hasPermi="['gljt:plzj:export']"
-          >导出B
+          >导出
           </el-button>
         </el-col>
       </el-row>
@@ -685,8 +680,9 @@
           endyf: [
             {required: true, message: "结束发放月份不能为空", trigger: "blur"},
           ],
-          ms: [
-            {max: 100, message: '描述不能超过100个字符', trigger: 'blur'},
+          zjyy: [
+            {required: true, message: "追加原因不能为空", trigger: "blur"},
+            {max: 100, message: '追加原因不能超过100个字符', trigger: 'blur'},
           ],
           jkzk: [
             {required: true, message: "请选择是否验活", trigger: "change"},
@@ -900,7 +896,7 @@
           // fflx: null,
           ffrs: null,
           ffje: null,
-          ms: null,
+          zjyy: null,
           ffr: null,
           ffrxm: null,
           ffdw: null,
@@ -996,7 +992,7 @@
       handleAdd() {
         this.reset();
         this.open = true;
-        this.title = "添加高龄津贴批次发放信息";
+        this.title = "添加高龄津贴追加信息";
       },
       handleAdd2() {
         this.reset2();
@@ -1008,7 +1004,7 @@
         this.formAdd.lrzt = this.rowData.lrzt;
         // this.formAdd.xzqh = this.rowData.xzqh ? this.rowData.xzqh.split(',') : [];
         this.open2 = true;
-        this.title = '添加高龄津贴批次发放人员'
+        this.title = '添加高龄津贴追加人员'
       },
       /** 修改按钮操作 */
       handleUpdate(row) {
@@ -1044,7 +1040,7 @@
           //   })
           // }
           this.open = true;
-          this.title = "修改高龄津贴批次发放信息";
+          this.title = "修改高龄津贴追加信息";
         });
       },
       oneGetPlzj(id){
@@ -1100,11 +1096,11 @@
         });
       },
       handleFf(row) {
-        this.$modal.confirm('确认发放' + row.pcmc + '的记录？').then(function () {
+        this.$modal.confirm('确认追加' + row.pcmc + '的记录？').then(function () {
           return updatePlzj({id: row.id, status: '1'});
         }).then(() => {
           this.getListBc();
-          this.$modal.msgSuccess("发放成功");
+          this.$modal.msgSuccess("追加成功");
           /****** sks 需要改动的地方 end ******/
         }).catch(() => {
         });