失信信息（从业人员、养老机构）

ruoyi-ui/src/views/business/lhcj/sxxx/cyrySxxx/index.vue

@@ -71,15 +71,15 @@
         </template>
       </el-table-column>
       <el-table-column label="联系电话" align="center" prop="lxdh" />
-      <el-table-column label="操作" width="300" align="center" class-name="small-padding fixed-width" fixed="right">
+      <el-table-column label="操作" width="250" align="center" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="scope">
           <el-button v-if="scope.row.lzzt == '00'" size="mini" type="text" icon="el-icon-edit"
-            @click="handleUpdate(scope.row)" v-hasPermi="['business:cyrySxxx:edit']">修改</el-button>
-          <el-button v-if="scope.row.lzzt == '00'" size="mini" type="text" icon="el-icon-delete"
+            @click="handleUpdate(scope.row)" v-hasPermi="['business:cyrySxxx:edit']">{{scope.row.lzzt=='00'?'继续填写':'修改'}}</el-button>
+          <el-button v-if="scope.row.lzzt == '00'"  size="mini" type="text" icon="el-icon-delete"
             @click="handleDelete(scope.row, scope.$index)" v-hasPermi="['business:cyrySxxx:remove']">删除</el-button>
           <el-button v-if="scope.row.lzzt == '00'" size="mini" type="text" icon="el-icon-edit"
             @click="handleStart(scope.row)" v-hasPermi="['business:cyrySxxx:edit']">提交</el-button>
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleDetails(scope.row)"
             v-hasPermi="['business:cyrySxxx:query']">详情</el-button>
         </template>
       </el-table-column>
@@ -89,49 +89,44 @@
       @pagination="getList" />
 
     <!-- 添加或修改从业人员失信信息对话框 -->
-    <el-dialog v-dialog-drag :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+    <el-dialog v-dialog-drag :title="title" :visible.sync="open" width="700px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="150px">
+      <h3>人员信息</h3>
         <el-form-item label="姓名" prop="xm">
           <el-input v-model="form.xm" placeholder="请输入姓名" />
         </el-form-item>
-
         <el-form-item label="人员类别" prop="rylb">
           <el-select v-model="form.rylb" placeholder="请选择人员类别">
             <el-option v-for="dict in dict.type.CH044" :key="dict.value" :label="dict.label" :value="dict.value">
             </el-option>
           </el-select>
         </el-form-item>
-
         <el-form-item label="证件类型" prop="zjlx">
           <el-select v-model="form.zjlx" placeholder="请选择证件类型">
             <el-option v-for="dict in dict.type.C0015" :key="dict.value" :label="dict.label" :value="dict.value">
             </el-option>
           </el-select>
         </el-form-item>
-
         <el-form-item label="证件号码" prop="zjhm">
           <el-input v-model="form.zjhm" placeholder="请输入证件号码" />
         </el-form-item>
-
         <el-form-item label="人员联系电话" prop="lxdh">
           <el-input v-model="form.lxdh" placeholder="请输入人员联系电话" />
         </el-form-item>
-
         <el-form-item label="当前所在工作单位" prop="gzdw">
           <el-input v-model="form.gzdw" placeholder="请输入当前所在工作单位" />
         </el-form-item>
-
         <!-- <el-form-item label="行政区划" prop="szxzqh">
           <el-input v-model="form.szxzqh" placeholder="请输入行政区划" />
         </el-form-item> -->
-
         <el-form-item label="行政区划" prop="szxzqh">
-          <RegionCascaderSelect v-model="form.szxzqh" style="width: 100%" valueProp="code"></RegionCascaderSelect>
+          <RegionCascaderSelect v-model="form.szxzqh" style="width: 100%" valueProp="code" endLevel="2"  :isDataRoot="true"></RegionCascaderSelect>
         </el-form-item>
 
         <el-form-item label="通信地址" prop="txdz">
           <el-input v-model="form.txdz" placeholder="请输入通信地址" />
         </el-form-item>
+        <h3>失信信息</h3>
 
         <el-form-item label="来源途径" prop="sjly">
           <el-select v-model="form.sjly" placeholder="请选择来源途径">
@@ -184,13 +179,82 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm" :loading="submitFormLoading">暂 存
+        <el-button type="primary" @click="submitForm('00')" :loading="submitFormLoading">暂 存
         </el-button>
         <el-button type="primary" @click="submitFormAndStart" :loading="submitFormLoading">提 交
         </el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+
+    <!--详细-->
+    <el-dialog v-dialog-drag title="从业人员失信信息" :visible.sync="openXQ" width="700px" :append-to-body="true"
+      custom-class="custom">
+      <h3>机构信息</h3>
+      <table>
+        <tr>
+          <td>姓名:</td>
+          <td>{{ dataDetails.xm }}</td>
+          <td>人员类别:</td>
+          <td>{{ translateDict("CH044", dataDetails.rylb) }}</td>
+        </tr>
+        <tr>
+          <td>证件类型:</td>
+          <td>{{ translateDict("C0015", dataDetails.zjlx) }}</td>
+          <td>证件号码:</td>
+          <td>{{ dataDetails.zjhm }}</td>
+        </tr>
+         <tr>
+          <td>人员联系电话:</td>
+          <td>{{ dataDetails.lxdh }}</td>
+          <td>当前所在工作单位:</td>
+          <td>{{dataDetails.gzdw }}</td>
+        </tr>
+        <tr>
+          <td>通信地址:</td>
+          <td colspan="3">{{dataDetails.txdz }}</td>
+        </tr>
+        
+
+      </table>
+      <h3>失信信息</h3>
+      <table>
+        <tr>
+          <td>来源途径：</td>
+          <td colspan="3">{{ translateDict("CH042", dataDetails.sjly) }}</td>
+        </tr>
+        <tr>
+          <td>失信信息描述：</td>
+          <td colspan="3">{{ dataDetails.ms }}</td>
+        </tr>
+        <tr>
+          <td>是否处罚：</td>
+          <td colspan="3">{{ translateDict("CZ035", dataDetails.isCf) }}</td>
+        </tr>
+        <tr>
+          <td>处罚依据：</td>
+          <td colspan="3">{{ dataDetails.cfyj }}</td>
+        </tr>
+        <tr>
+          <td>处罚内容：</td>
+          <td colspan="3">{{ dataDetails.cfnr }}</td>
+        </tr>
+        <tr>
+          <td>处罚部门：</td>
+          <td>{{ translateDict("CH036", dataDetails.cfbm) }}</td>
+          <td>处罚时间：</td>
+          <td>{{ special(dataDetails.cfrq,'date') }}</td>
+        </tr>
+        <tr>
+          <td>相关材料：</td>
+          <td colspan="3"> <file-upload v-model="dataDetails.sxxxXgcl" :isFile="false"/></td>
+        </tr>
+        
+
+      </table>
+
+
+    </el-dialog>
   </div>
 </template>
 
@@ -225,10 +289,12 @@ export default {
       total: 0,
       // 从业人员失信信息表格数据
       cyrySxxxList: [],
+      dataDetails: {},
       // 弹出层标题
       title: "",
       // 是否显示弹出层
       open: false,
+      openXQ: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -340,7 +406,7 @@ export default {
         xm: null,
         sjly: null,
         cjfs: null,
-        lzzt: null,
+        lzzt: "01",
         lxdh: null,
         rylb: null,
         zjlx: null,
@@ -404,9 +470,16 @@ export default {
         this.open = true;
         this.title = "修改从业人员失信信息";
       });
+    },
+     /** 详细 */
+    handleDetails(row) {
+      getCyrySxxx(row.id).then(response => {
+        this.dataDetails = response.data
+        this.openXQ = true
+      })
     },
     /** 提交按钮 */
-    submitForm() {
+    submitForm(lzzt) {
       this.$refs["form"].validate((valid) => {
         if (valid) {
           this.submitFormLoading = true;
@@ -417,10 +490,15 @@ export default {
             let data = JSON.parse(this.form.szxzqh);
             szxzqh = data[data.length - 1];
           }
-          this.form.szxzqh = szxzqh;
+           let formList={
+          ...this.form,
+          lzzt: lzzt,
+          szxzqh:szxzqh
+    
+        }
           if (this.form.id != null) {
             /****** sks 需要改动的地方 start ******/
-            let formData = this.comparisonObject(this.form, this.copyForm);
+            let formData = this.comparisonObject(formList, this.copyForm);
             if (formData) {
               updateCyrySxxx({ ...formData, id: this.form.id })
                 .then((response) => {
@@ -441,7 +519,7 @@ export default {
             }
             /****** sks 需要改动的地方 end ******/
           } else {
-            addCyrySxxx(this.form)
+            addCyrySxxx(formList)
               .then((response) => {
                 this.$modal.msgSuccess("新增成功");
                 this.open = false;
@@ -450,7 +528,7 @@ export default {
                 if (this.queryParams.pageSize === this.cyrySxxxList.length) {
                   this.cyrySxxxList.pop();
                 }
-                this.cyrySxxxList.unshift({ ...this.form, id: response.data });
+                this.cyrySxxxList.unshift({ ...formList, id: response.data });
                 this.total++;
                 /****** sks 需要改动的地方 end ******/
               })
@@ -472,10 +550,9 @@ export default {
             let data = JSON.parse(this.form.szxzqh);
             szxzqh = data[data.length - 1];
           }
-          this.form.szxzqh = szxzqh;
           if (this.form.id != null) {
             /****** sks 需要改动的地方 start ******/
-            let formData = this.comparisonObject(this.form, this.copyForm);
+            let formData = this.comparisonObject({...this.form,szxzqh:szxzqh }, this.copyForm);
             if (formData) {
               updateCyrySxxx({ ...formData, id: this.form.id })
                 .then((response) => {
@@ -500,7 +577,7 @@ export default {
             }
             /****** sks 需要改动的地方 end ******/
           } else {
-            addCyrySxxx(this.form)
+            addCyrySxxx({...this.form,szxzqh:szxzqh })
               .then((response) => {
                 cyrySxxxStart(response.data).then((res) => {
                   this.$modal.msgSuccess("该信息已提交");
@@ -513,7 +590,7 @@ export default {
                 if (this.queryParams.pageSize === this.cyrySxxxList.length) {
                   this.cyrySxxxList.pop();
                 }
-                this.cyrySxxxList.unshift({ ...this.form, id: response.data });
+                this.cyrySxxxList.unshift({ ...this.form,szxzqh:szxzqh, id: response.data });
                 this.total++;
                 /****** sks 需要改动的地方 end ******/
               })
@@ -536,7 +613,7 @@ export default {
         (this.queryParams.pageNum - 1) * this.queryParams.pageSize + index + 1;
       this.$modal
         .confirm(
-          "确认删除" + this.changeDelData(row, "id", "ID值", xh) + "的记录？"
+          "确认删除" + this.changeDelData(row, "xm", "人员姓名", xh) + "的记录？"
         )
         .then(function () {
           return delCyrySxxx(ids);
@@ -565,6 +642,40 @@ export default {
         `cyrySxxx_${new Date().getTime()}.xlsx`
       );
     },
+     translateDict(type, value) {
+      return this.selectDictLabel(this.dict.type[type], value)
+    },
   },
 };
-</script>
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+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;
+}
+
+h3 {
+  /*margin: 0;*/
+  padding: 0.5rem !important;
+  background-image: -o-linear-gradient(290deg, #ddd 10%, #fff 90%);
+  background-image: linear-gradient(160deg, #ddd 10%, #fff 90%);
+  color: #000;
+  font-weight: 500;
+  font-size: 1.1rem;
+  margin-bottom: 10px;
+}
+</style>

ruoyi-ui/src/views/business/lhcj/sxxx/yljgSxxx/index.vue

@@ -60,10 +60,10 @@
         </template>
       </el-table-column>
       <el-table-column label="联系电话" align="center" prop="lxdh" />
-      <el-table-column label="操作" width="300" align="center" class-name="small-padding fixed-width" fixed="right">
+      <el-table-column label="操作" width="250" align="center" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="scope">
           <el-button v-if="scope.row.lzzt == '00'" size="mini" type="text" icon="el-icon-edit"
-            @click="handleUpdate(scope.row)" v-hasPermi="['business:yljgSxxx:edit']">修改</el-button>
+            @click="handleUpdate(scope.row)" v-hasPermi="['business:yljgSxxx:edit']">{{scope.row.lzzt=='00'?'继续填写':'修改'}}</el-button>
           <el-button v-if="scope.row.lzzt == '00'" size="mini" type="text" icon="el-icon-delete"
             @click="handleDelete(scope.row, scope.$index)" v-hasPermi="['business:yljgSxxx:remove']">删除</el-button>
           <el-button v-if="scope.row.lzzt == '00'" size="mini" type="text" icon="el-icon-edit"
@@ -108,7 +108,7 @@
         </el-form-item>
 
         <el-form-item label="行政区划" prop="szxzqh">
-          <RegionCascaderSelect v-model="form.szxzqh" style="width: 100%" valueProp="code"></RegionCascaderSelect>
+          <RegionCascaderSelect v-model="form.szxzqh" endLevel="2" :isDataRoot="true" style="width: 100%" valueProp="code"></RegionCascaderSelect>
         </el-form-item>
 
         <el-form-item label="通信地址" prop="txdzms">
@@ -129,7 +129,7 @@
 
         <el-form-item label="是否被处罚" prop="isCf">
           <el-radio-group v-model="form.isCf">
-            <el-radio v-for="dict in dict.type.CZ035" :key="dict.value" :label="dict.value">{{ dict.label }}</el-radio>
+            <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>
 
@@ -156,7 +156,7 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm" :loading="submitFormLoading">暂 存
+        <el-button type="primary" @click="submitForm('00')" :loading="submitFormLoading">暂 存
         </el-button>
         <el-button type="primary" @click="submitFormAndStart" :loading="submitFormLoading">提 交
         </el-button>
@@ -225,7 +225,7 @@
         </tr>
         <tr>
           <td>相关材料：</td>
-          <td colspan="3">{{ dataDetails.sxxxXgcl }}</td>
+          <td colspan="3"> <file-upload v-model="dataDetails.sxxxXgcl" :isFile="false"/></td>
         </tr>
         
 
@@ -282,7 +282,7 @@ export default {
         ],
         tyshxydm: [
           { required: true, message: "统一社会信用代码不能为空", trigger: "blur" },
-          { max: 18, message: '统一社会信用代码不能超过18个字符', trigger: 'blur' },
+          { pattern: Regular.CreditCode, message: '统一社会信用代码格式不对', trigger: 'blur' }
         ],
         sjly: [
           { required: true, message: "数据来源不能为空", trigger: "change" },
@@ -363,7 +363,7 @@ export default {
         tyshxydm: null,
         sjly: null,
         cjfs: null,
-        lzzt: null,
+        lzzt: "01",
         lxdh: null,
         frxm: null,
         frzjlx: null,
@@ -433,8 +433,8 @@ export default {
         this.openXQ = true
       })
     },
-    /** 提交按钮 */
-    submitForm() {
+    /** 暂存按钮 */
+    submitForm(lzzt) {
       this.$refs["form"].validate(valid => {
         if (valid) {
           this.submitFormLoading = true;
@@ -445,10 +445,15 @@ export default {
             let data = JSON.parse(this.form.szxzqh);
             szxzqh = data[data.length - 1];
           }
-          this.form.szxzqh = szxzqh;
+          let formList={
+          ...this.form,
+          lzzt: lzzt,
+          szxzqh:szxzqh
+    
+        }
           if (this.form.id != null) {
             /****** sks 需要改动的地方 start ******/
-            let formData = this.comparisonObject(this.form, this.copyForm);
+            let formData = this.comparisonObject(formList, this.copyForm);
             if (formData) {
               updateYljgSxxx({ ...formData, id: this.form.id }).then(response => {
                 this.$modal.msgSuccess("修改成功");
@@ -463,7 +468,7 @@ export default {
             }
             /****** sks 需要改动的地方 end ******/
           } else {
-            addYljgSxxx(this.form).then(response => {
+            addYljgSxxx(formList).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               // this.getList();
@@ -471,7 +476,7 @@ export default {
               if (this.queryParams.pageSize === this.yljgSxxxList.length) {
                 this.yljgSxxxList.pop();
               }
-              this.yljgSxxxList.unshift({ ...this.form, id: response.data });
+              this.yljgSxxxList.unshift({ ...formList, id: response.data });
               this.total++;
               /****** sks 需要改动的地方 end ******/
             }).finally(() => this.submitFormLoading = false);
@@ -491,10 +496,9 @@ export default {
             let data = JSON.parse(this.form.szxzqh);
             szxzqh = data[data.length - 1];
           }
-          this.form.szxzqh = szxzqh;
           if (this.form.id != null) {
             /****** sks 需要改动的地方 start ******/
-            let formData = this.comparisonObject(this.form, this.copyForm);
+            let formData = this.comparisonObject({...this.form,szxzqh:szxzqh }, this.copyForm);
             if (formData) {
               updateYljgSxxx({ ...formData, id: this.form.id }).then(response => {
                 startYljgSxxx(this.form.id).then((res) => {
@@ -513,7 +517,7 @@ export default {
             }
             /****** sks 需要改动的地方 end ******/
           } else {
-            addYljgSxxx(this.form).then(response => {
+            addYljgSxxx({...this.form,szxzqh:szxzqh }).then(response => {
               startYljgSxxx(response.data).then((res) => {
                 this.$modal.msgSuccess("该信息已提交");
                 // this.getList()
@@ -525,7 +529,7 @@ export default {
               if (this.queryParams.pageSize === this.yljgSxxxList.length) {
                 this.yljgSxxxList.pop();
               }
-              this.yljgSxxxList.unshift({ ...this.form, id: response.data });
+              this.yljgSxxxList.unshift({ ...this.form,szxzqh:szxzqh, id: response.data });
               this.total++;
               /****** sks 需要改动的地方 end ******/
             }).finally(() => this.submitFormLoading = false);
@@ -544,7 +548,7 @@ export default {
     handleDelete(row, index) {
       const ids = row.id || this.ids;
       const xh = (this.queryParams.pageNum - 1) * this.queryParams.pageSize + index + 1;
-      this.$modal.confirm('确认删除' + this.changeDelData(row, 'id', 'ID值', xh) + '的记录？').then(function () {
+      this.$modal.confirm('确认删除' + this.changeDelData(row, 'jgmc', '机构名称', xh) + '的记录？').then(function () {
         return delYljgSxxx(ids);
       }).then(() => {
         // this.getList();