Merge branch 'NanMing1' of sckj/mz-cloud into master

ruoyi-ui/src/components/Amodule/QualityDetails/index.vue

@@ -37,6 +37,18 @@
             <span v-show="scope.row.isZdx==='1'" class="zdJc">*</span>{{scope.row.jcFs}}
           </template>
         </el-table-column>
+        <el-table-column label="上次结果" align="center" prop="jcJg" width="300" v-if="!is_isXQ">
+          <template slot-scope="scope">
+           {{translateDict('XZ032',scope.row.beforeDaxx)}}
+          </template>
+        </el-table-column>
+        <el-table-column label="上次材料" align="center" prop="jcXgcl" width="120" v-if="!is_isXQ">
+          <template slot-scope="scope">
+            <el-badge :value="changeData(scope.row.beforeJcXgcl)" class="item">
+              <el-button type="primary" @click="uploudFile(scope.row.beforeJcXgcl,(queryParamsJc.pageNum-1)*queryParamsJc.pageSize + scope.$index,scope.row.id)"> {{is_isXQ?'附件上传':'查看附件'}}</el-button>
+            </el-badge>
+          </template>
+        </el-table-column>
         <el-table-column label="检查结果" align="center" prop="jcJg" width="300" v-if="is_isXQ">
           <template slot-scope="scope">
             <el-radio-group v-model="scope.row.daxx" @change="changeDaxx({daxx:scope.row.daxx,id:scope.row.id})">

ruoyi-ui/src/views/business/tsxdxm/jjhsq/index.vue

@@ -29,14 +29,20 @@
       </el-table-column>
       <el-table-column label="项目名称" align="center" prop="mc" />
       <el-table-column label="行政区划" align="center" prop="xzqhName" />
-      <el-table-column label="制定政策数量(个)" align="center" prop="zc" >
-      <template slot-scope="scope">
-          <el-button @click="getZcList(scope.row)">
+      <el-table-column label="制定政策数量(个)" align="center" prop="zc">
+        <template slot-scope="scope">
+          <el-button @click="getZcList(scope.row,'0')">
             {{ scope.row.zc }}
           </el-button>
         </template>
       </el-table-column>
-      <el-table-column label="制定标准数量(个)" align="center" prop="wj" />
+      <el-table-column label="制定标准数量(个)" align="center" prop="wj">
+        <template slot-scope="scope">
+          <el-button @click="getZcList(scope.row,'1')">
+            {{ scope.row.wj }}
+          </el-button>
+        </template>
+      </el-table-column>
       <el-table-column label="制定政策标准文件总数（个）" align="center" prop="num" />
       <el-table-column label="数据更新日期" align="center" prop="gxrq" width="180">
         <template slot-scope="scope">
@@ -68,7 +74,7 @@
           <el-input v-model="form.mc" :disabled="true" />
         </el-form-item>
         <el-form-item label="行政区划" prop="xzqhName">
-          <el-input v-model="form.xzqhName" :disabled="true"/>
+          <el-input v-model="form.xzqhName" :disabled="true" />
         </el-form-item>
         <el-form-item label="行政区划" prop="xzqh" style="display: none">
           <el-input v-model="form.xzqh" />
@@ -79,22 +85,23 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
-    <el-dialog v-dialog-drag title="政策标准文件" :visible.sync="Zcopen" width="800px" :before-close="handleClose"  append-to-body >
-      <zcbzwj :jjId="jtId"></zcbzwj>
+    <el-dialog v-dialog-drag :title="title2" :visible.sync="Zcopen" width="800px" :before-close="handleClose"
+      append-to-body>
+      <zcbzwj :jjId="jjId" :wjlx="wjlx"></zcbzwj>
     </el-dialog>
   </div>
 </template>
 
 <script>
-import {addJjhsq, delJjhsq, getJjhsq, listJjhsq, updateJjhsq} from "@/api/business/tsxdxm/jjhsq";
+import { addJjhsq, delJjhsq, getJjhsq, listJjhsq, updateJjhsq } from "@/api/business/tsxdxm/jjhsq";
 import zcbzwj from "@/views/business/tsxdxm/jjhsq/zcbzwj";
-import {getLocationName} from "@/api/system/jlDept";
-import {mapGetters, mapState} from 'vuex'
+import { getLocationName } from "@/api/system/jlDept";
+import { mapGetters, mapState } from 'vuex'
 
 export default {
   name: "Jjhsq",
   dicts: ['XZ033'],
-   components: {
+  components: {
     zcbzwj: zcbzwj,
   },
   data() {
@@ -118,6 +125,7 @@ export default {
       jjhsqList: [],
       // 弹出层标题
       title: "",
+      title2: "",
       // 是否显示弹出层
       open: false,
       Zcopen: false,
@@ -136,7 +144,8 @@ export default {
       // 表单校验
       rules: {
       },
-      jtId: null,
+      jjId: null,
+      wjlx: null,
       isIF: false,
       xmData: {},
       xzqh: [],
@@ -155,10 +164,10 @@ export default {
   mounted() {
     this.getXzqhNames();
     // 省市显示行政区划筛选
-    if (this.level<2) {
-      this.isIF=true
+    if (this.level < 2) {
+      this.isIF = true
     }
-     console.log(this.level)
+    console.log(this.level)
   },
   computed: {
     ...mapGetters(["level"]),
@@ -186,10 +195,11 @@ export default {
         this.loading = false;
       });
     },
-     /** 查询政策标准文件列表 */
-    getZcList(row) {
-      this.jtId = row.id;
-      this.jjId = row.jtId
+    /** 查询政策标准文件列表 */
+    getZcList(row, wjlx) {
+      wjlx === '0' ? this.title2 = '制定政策文件' : this.title2 = '制定标准文件'
+      this.wjlx = wjlx
+      this.jjId = row.id;
       this.Zcopen = true;
     },
     // 取消按钮
@@ -264,26 +274,26 @@ export default {
         this.title = "修改居家和社区养老基本体系建设情况";
       });
     },
-     /**上报操作*/
+    /**上报操作*/
     handleUpdateYx(row, index) {
       const ids = row.id || this.ids;
       let msg = "是否上报";
-      this.form.sbzt=index;
+      this.form.sbzt = index;
       this.$modal.confirm(msg).then(function () {
-        return updateJjhsq({id: row.id ,sbzt:"0"});
+        return updateJjhsq({ id: row.id, sbzt: "0" });
       }).then(() => {
-        this.jjhsqList = this.dataReplacement(this.jjhsqList,row.id,{sbzt:"0"});
+        this.jjhsqList = this.dataReplacement(this.jjhsqList, row.id, { sbzt: "0" });
         this.$modal.msgSuccess("上报成功");
-      }).catch(() => {});
+      }).catch(() => { });
     },
-     /**已上报操作*/
+    /**已上报操作*/
     handleUpdateY() {
       this.$message({
-          message: '数据已上报',
-          type: 'warning'
-        });
+        message: '数据已上报',
+        type: 'warning'
+      });
     },
-   handleClose() {
+    handleClose() {
       this.Zcopen = false;
       this.loading = true;
       listJjhsq(this.queryParams).then(response => {

ruoyi-ui/src/views/business/tsxdxm/jjhsq/zcbzwj.vue

@@ -179,9 +179,9 @@ export default {
       type: String,
       default: null
     },
-    isComponent: {
-      type: Boolean,
-      default: true
+    wjlx:{
+      type: String,
+      default: null
     },
   },
   watch:{
@@ -194,12 +194,16 @@ export default {
           this.getList();
         }
       }
-    }
-  },
-  computed: {
-    is_Component(){
-      return this.isComponent;
-    }
+    },
+    wjlx:{
+      deep:true,
+      handler(val){
+        if(val!==null)
+        {
+          this.getList();
+        }
+      }
+    },
   },
   created() {
     this.zjId = this.jjId
@@ -210,7 +214,7 @@ export default {
     getList() {
       this.loading = true;
       listZcbzwj({...this.queryParams,jjId:this.zjId}).then(response => {
-        this.zcbzwjList = response.rows;
+        this.zcbzwjList = response.rows.filter(item => item.wjlx === this.wjlx);
         this.total = response.total;
         this.loading = false;
       });

ruoyi-ui/src/views/organization/kugl/khjy/index.vue

@@ -132,25 +132,22 @@
           <td>{{detailsData.tsrxm}}</td>
           <td>联系电话:</td>
           <td>{{detailsData.tsrlxfs}}</td>
-        <tr/>
+        </tr>
         <tr>
           <td>投诉日期:</td>
           <td>{{special(detailsData.tssj) }}</td>
           <td>是否处理:</td>
           <td>{{translateDict('CZ035',detailsData.clzt)}}</td>
-        <tr/>
+        </tr>
         <tr>
           <td>投诉内容:</td>
           <td colspan="3">{{detailsData.tsnr}}</td>
-        <tr/>
+        </tr>
         <tr>
-
           <td>处理结果:</td>
           <td colspan="3">{{detailsData.cljg}}</td>
-        <tr/>
-
+        </tr>
       </table>
-
     </el-dialog>
   </div>
 </template>