Merge branch '等级评定问题处理' of sckj/mz-cloud into master

ruoyi-ui/src/views/business/fwjggl/djpd/djpdGx/index.vue

@@ -145,6 +145,7 @@
         class-name="small-padding fixed-width"
         fixed="right"
       >
+
         <template slot-scope="scope">
           <el-button
             v-if="scope.row.sqzt === '02'"
@@ -190,7 +191,7 @@
       width="500px"
       append-to-body
     >
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-form-item label="机构ID" prop="jgId" style="display: none">
           <el-input v-model="form.jgId" placeholder="请输入机构ID" />
         </el-form-item>
@@ -268,12 +269,12 @@
 <script>
 import {
   listDjpdGx,
-  getDjpdSqConfig,
   getDjpdGx,
   delDjpdGx,
   addDjpdGx,
   updateDjpdGx,
 } from "@/api/business/fwjggl/djpd/djpdGx";
+import { getDjpdSqConfig } from "@/api/business/fwjggl/djpd/djpdSq";
 import {
   listDjpdSq,
   getDjpdSq,
@@ -494,6 +495,10 @@ export default {
     submitForm() {
       this.$refs["form"].validate((valid) => {
         if (valid) {
+          if(this.form.ksrq>this.form.jsrq){
+            this.$modal.msgError("开始日期不能大于结束日期");
+            return false;
+          }
           this.submitFormLoading = true;
           if (this.form.id != null) {
             updateDjpdGx(this.form)

ruoyi-ui/src/views/business/fwjggl/djpd/djpdSq/index.vue

@@ -218,9 +218,11 @@
       width="1200px"
       append-to-body
     >
+      <div v-if="!form.id">
       <el-input v-model="searchXydm" placeholder="请输入统一社会信用代码" />
       <el-button size="mini" type="text" icon="el-icon-edit" @click="searchJg()">查询</el-button>
       <el-button size="mini" type="text" icon="el-icon-edit" @click="selectJg()">选择机构</el-button>
+      </div>
       <el-form ref="form" :model="form" :rules="rules" label-width="180px">
         <!--<el-form-item label="机构ID" prop="jgId" style="display: none">-->
         <!--<el-input v-model="form.jgId" placeholder="请输入机构ID"/>-->
@@ -664,10 +666,11 @@
                 .then((response) => {
                   updateDjpdStart(response.data.id).then((res) => {
                     this.$modal.msgSuccess('该申请已提交')
+                    this.open = false
                     this.getList()
                   })
-                  this.$modal.msgSuccess('修改成功')
-                  this.open = false
+                  // this.$modal.msgSuccess('修改成功')
+
                 })
                 .finally(() => (this.submitFormLoading = false))
             } else {
@@ -675,10 +678,10 @@
                 .then((response) => {
                   updateDjpdStart(response.data.id).then((res) => {
                     this.$modal.msgSuccess('该申请已提交')
+                    this.open = false
                     this.getList()
                   })
-                  this.$modal.msgSuccess('新增成功')
-                  this.open = false
+                  // this.$modal.msgSuccess('新增成功')
                 })
                 .finally(() => (this.submitFormLoading = false))
             }

ruoyi-ui/src/views/business/fwjggl/djpd/gsjgFk/index.vue

@@ -139,7 +139,7 @@
       width="500px"
       append-to-body
     >
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="140px">
         <el-form-item label="申请主键标识" prop="sqId" style="display: none">
           <el-input v-model="form.sqId" placeholder="请输入申请主键标识" />
         </el-form-item>
@@ -209,6 +209,40 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+    <!--详情-->
+    <el-dialog
+      v-dialog-drag
+      :title="title"
+      :visible.sync="openXQ"
+      width="500px"
+      append-to-body
+    >
+      <table>
+        <tr>
+          <td>公示反馈人姓名</td>
+          <td>{{form.fkrxm}}</td>
+          <td>公示反馈人电话</td>
+          <td>{{form.fkrlxdh}}</td>
+        </tr>
+        <tr>
+          <td>公示反馈途径</td>
+          <td>{{translateDict('XZ027',form.fktj)}}</td>
+          <td>公示反馈日期</td>
+          <td>{{special(form.fkrq)}}</td>
+        </tr>
+        <tr>
+          <td>公示是否终止</td>
+          <td colspan="3">{{translateDict('CZ035',form.isZzgs)}}</td>
+        </tr>
+        <tr>
+          <td>反馈内容</td>
+          <td colspan="3">{{form.fknr}}</td>
+        </tr>
+      </table>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="openXQ=false">返 回</el-button>
+      </div>
+    </el-dialog>
 
     <!-- 反馈记录dialog -->
     <el-dialog
@@ -324,6 +358,7 @@ export default {
       recordTitle: "",
       // 是否显示弹出层
       open: false,
+      openXQ:false,
       recordOpen: false,
       // 查询参数
       queryParams: {
@@ -367,6 +402,20 @@ export default {
     this.getList();
   },
   methods: {
+    translateDict(type,value,is){
+      if(is&&value&&value.length>0)
+      {
+        let list="";
+        this.dict.type[type].forEach(item=>{
+          if(value.indexOf(item.value)!==-1)
+          {
+            list=list+item.label+' '
+          }
+        })
+        return list
+      }
+      return this.selectDictLabel(this.dict.type[type], value)
+    },
     /** 查询公示结果反馈信息列表 */
     getList() {
       this.loading = true;
@@ -448,8 +497,10 @@ export default {
         /****** sks 需要改动的地方 start ******/
         this.copyForm = this.deepCopy(response.data);
         /****** sks 需要改动的地方 end ******/
-        this.open = true;
-        this.title = "修改公示结果反馈信息";
+        // this.open = true;
+        // this.title = "修改公示结果反馈信息";
+        this.openXQ = true;
+        this.title = "公示结果反馈信息详情";
       });
     },
     /** 提交按钮 */
@@ -543,3 +594,32 @@ export default {
   },
 };
 </script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select {
+    width: 100%;
+  }
+
+  .el-date-editor.el-input {
+    width: 100%;
+  }
+  table td {
+    width: 10%;
+    height: 2.5rem;
+    padding: .5%;
+    font-weight: 500;
+    border: 1px solid #ddd;
+  }
+
+  table {
+    width: 100%;
+    border-collapse: collapse;
+    border: 1px solid #ddd;
+  }
+
+  table td:nth-child(odd) {
+    text-align: right;
+    background: #f5f5f5;
+  }
+</style>
+
+

ruoyi-ui/src/views/business/fwjggl/djpd/pdzj/index.vue

@@ -329,17 +329,17 @@
                 <td >联系电话</td><td colspan="4">{{form.dh}}</td>
               </tr>
               <tr>
-                <td>户籍区划</td><td colspan="4">{{form.hjqhName}}</td>
+                <td>户籍区划</td><td colspan="4">{{form.hjqhNames}}</td>
               </tr>
               <tr>
-                <td>单位所在区划</td><td colspan="4">{{form.dwqhName}}</td>
+                <td>单位所在区划</td><td colspan="4">{{form.dwqhNames}}</td>
               </tr>
               <tr>
                 <td>
                   相关证书
                 </td>
                 <td colspan="4">
-                  <file-upload v-model="form.fj" :isFile="false" />
+                  <file-upload v-if="form.fj" v-model="form.fj" :isFile="false" />
                 </td>
               </tr>
             </table>
@@ -545,14 +545,15 @@
         const id = row.id || this.ids
         getPdzj(id).then((response) => {
           this.form = response.data
-          this.form.hjqhId = JSON.stringify(this.form.hjqhId.split(','))
-          this.form.dwqhId = JSON.stringify(this.form.dwqhId.split(','))
+
           let copyData={
             ...response.data,
             hjqhId:response.data.hjqhId?response.data.hjqhId.split(',')[response.data.hjqhId.split(',').length-1]:'',
             dwqhId:response.data.dwqhId?response.data.dwqhId.split(',')[response.data.dwqhId.split(',').length-1]:'',
           };
           this.copyForm=this.deepCopy(copyData)
+          this.form.hjqhId = JSON.stringify(this.form.hjqhId.split(','))
+          this.form.dwqhId = JSON.stringify(this.form.dwqhId.split(','))
           this.oldId = id
           this.open = true
           this.title = '修改评定专家信息'
@@ -565,6 +566,8 @@
         const id = row.id || this.ids
         getPdzj(id).then((response) => {
           this.form = response.data
+          this.form.hjqhId = JSON.stringify(this.form.hjqhId.split(','))
+          this.form.dwqhId = JSON.stringify(this.form.dwqhId.split(','))
           this.oldId = id
           this.openXQ=true
         })
@@ -673,9 +676,11 @@
 <style rel="stylesheet/scss" lang="scss" scoped>
   ::v-deep .custom > .el-dialog__body {
     height: 780px;
+    overflow-y: auto;
   }
   ::v-deep .custom2 > .el-dialog__body {
     height: 780px;
+    overflow-y: auto;
   }
   ::v-deep .custom2{
     .el-dialog__body{