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

ruoyi-ui/src/components/DictTag/index.vue

@@ -2,21 +2,11 @@
   <div>
     <template v-for="(item, index) in options">
       <template v-if="values.includes(item.value)">
-        <span
-          v-if="item.raw.listClass == 'default' || item.raw.listClass == ''"
-          :key="item.value"
-          :index="index"
-          :class="item.raw.cssClass"
-          >{{ item.label }}</span
-        >
-        <el-tag
-          v-else
-          :disable-transitions="true"
-          :key="item.value"
-          :index="index"
-          :type="item.raw.listClass == 'primary' ? '' : item.raw.listClass"
-          :class="item.raw.cssClass"
-        >
+        <span v-if="item.raw.listClass == 'default' || item.raw.listClass == ''" :key="item.value" :index="index"
+          :class="item.raw.cssClass">{{ item.label }}<span v-if="index < value.length - 1">，</span></span>
+
+        <el-tag v-else :disable-transitions="true" :key="item.value+1" :index="index"
+          :type="item.raw.listClass == 'primary' ? '' : item.raw.listClass" :class="item.raw.cssClass">
           {{ item.label }}
         </el-tag>
       </template>
@@ -46,7 +36,7 @@ export default {
 };
 </script>
 <style scoped>
-.el-tag + .el-tag {
+.el-tag+.el-tag {
   margin-left: 10px;
 }
 </style>

ruoyi-ui/src/views/business/fwjggl/ajgsx/xfaqjcxx/index.vue

@@ -265,15 +265,17 @@
                 <tr>
                   <td class="tdX"> 消防设施配备情况</td>
                   <td colspan="3">
-                    <div style="display: flex">
-                      <el-input v-model="xfsspbqk" :disabled="true"></el-input>
-                      <el-button type="primary" size="mini" @click="clickXfsspbqk()"
-                        style="margin-left: 10px;margin-right: 20px">选 择
-                      </el-button>
-                    </div>
-                    <span class="explain">
-                      说明：养老机构建筑环境及消防设施配置要严格执行《建筑设计防火规范》（GB50016）、《建筑灭火器配置设计规范》（GB50140）、《火灾自动报警系统设计规范》（GB50116）、《建筑防烟排烟系统技术标准》（GB51251）等相关标准规范要求。
-                    </span>
+                    <el-form-item class="el-form-item2" label="" prop="pbqk">
+                      <div style="display: flex">
+                        <el-input v-model="xfsspbqk" :disabled="true"></el-input>
+                        <el-button type="primary" size="mini" @click="clickXfsspbqk()"
+                          style="margin-left: 10px;margin-right: 20px">选 择
+                        </el-button>
+                      </div>
+                      <span class="explain">
+                        说明：养老机构建筑环境及消防设施配置要严格执行《建筑设计防火规范》（GB50016）、《建筑灭火器配置设计规范》（GB50140）、《火灾自动报警系统设计规范》（GB50116）、《建筑防烟排烟系统技术标准》（GB51251）等相关标准规范要求。
+                      </span>
+                    </el-form-item>
                   </td>
                 </tr>
                 <tr>
@@ -756,9 +758,9 @@ export default {
         jtqk: [
           { required: true, message: '文件或者不到位具体情况不能为空', trigger: 'blur' }
         ],
-        // pbqk: [
-        //   { required: true, message: "消防设施配备情况不能为空", trigger: "change" }
-        // ],
+        pbqk: [
+          { required: true, message: "消防设施配备情况不能为空", trigger: "blur" }
+        ],
         pbqkqt: [
           { required: true, message: '其他消防设施配备情况不能为空', trigger: 'blur' },
           { max: 100, message: '最大长度100个字符', trigger: 'blur' }
@@ -1503,6 +1505,13 @@ table td:nth-child(odd) {
   position: relative;
   top: 50%;
   transform: translateY(-50%);
+
+  &.el-form-item2 {
+    top: 48%;
+    .el-form-item__content{
+      line-height: 20px;
+    }
+  }
 }
 
 ::v-deep .el-dialog__body {

ruoyi-ui/src/views/organization/jggl/jcxx/index.vue

@@ -719,6 +719,7 @@ export default {
         // 查询参数
         // 表单参数
         form: {},
+        cacheTyshxydm: null,
         // 表单校验
         rules: {
           tyshxydm: [
@@ -1084,7 +1085,6 @@ export default {
         let that=this;
         geocoder.getLocation(address, function(status, result) {
           if (status === 'complete' && result.geocodes.length) {
-            console.log(result.geocodes,'result.geocodes');
             let lnglat = result.geocodes[0].location
             // lat: 45.147549
             // lng: 124.799857
@@ -1362,9 +1362,11 @@ export default {
       },
       changeChecked(value) {
         if (value) {
+          this.cacheTyshxydm = this.form.tyshxydm
           this.form.tyshxydm = ''
           this.rules.tyshxydm = []
         } else {
+          this.form.tyshxydm = this.cacheTyshxydm
           this.rules.tyshxydm = [
             { required: true, message: '统一社会信用代码不能为空', trigger: 'blur' },
             { pattern: Regular.CreditCode, message: '统一社会信用代码格式不对', trigger: 'blur' }
@@ -1518,7 +1520,6 @@ export default {
             szxzqh: this.form.szxzqh ? JSON.parse(this.form.szxzqh)[JSON.parse(this.form.szxzqh).length - 1] : ''
           }
           this.copyForm = this.deepCopy(copyData)
-          console.log(this.form, 'this.form')
         })
       },
       /** 提交按钮 */

ruoyi-ui/src/views/organization/zwyw/babgsq/module/index.vue

@@ -429,7 +429,7 @@
       append-to-body
     >
       <div><span class="red">*红色字体</span>代表变更的信息，鼠标放在<span class="red">红色字体</span>上可展示变更的信息</div>
-      <div v-for="(item,index) in xqList" :key="item.title">
+      <div v-for="(item) in xqList" :key="item.title">
         <h3>{{item.title}}</h3>
         <table>
           <tr v-for="(ite,inde) in item.data" :key="inde">
@@ -1079,12 +1079,14 @@ export default {
           this.form.barZjlx = this.form.frzjlx
           this.form.barZjhm = this.form.frzjhm
           this.form.barLxfs = this.form.frlxfs
+          this.changeBarzjlx()
         } else {
           this.form.barXm = null
           this.form.barZjlx = null
           this.form.barZjhm = null
           this.form.barLxfs = null
         }
+        this.$refs['form'].validateField('barZjhm')
       },
       changeCheckedBg(is) {
         if (!this.form.frxm) {
@@ -1097,54 +1099,15 @@ export default {
           this.form.babgZjlx = this.form.frzjlx
           this.form.babgSfzhm = this.form.frzjhm
           this.form.babgLxfs = this.form.frlxfs
+          this.changeBabgZjlx()
         } else {
           this.form.babgXm = null
           this.form.babgZjlx = null
           this.form.babgSfzhm = null
           this.form.babgLxfs = null
         }
+        this.$refs['form'].validateField('babgSfzhm')
       },
-      // changeChecked(is){
-      //   if(!this.form.frxm)
-      //   {
-      //     this.$modal.msgWarning('请填写法人信息');
-      //     this.checked=false;
-      //     return false
-      //   }
-      //   if(is)
-      //   {
-      //     this.form.barXm=JSON.parse(JSON.stringify(this.form.frxm));
-      //     this.form.barZjlx=JSON.parse(JSON.stringify(this.form.frzjlx));
-      //     this.form.barZjhm=JSON.parse(JSON.stringify(this.form.frzjhm));
-      //     this.form.barLxfs=JSON.parse(JSON.stringify(this.form.frlxfs));
-      //   }else
-      //   {
-      //     this.form.barXm=null;
-      //     this.form.barZjlx=null;
-      //     this.form.barZjhm=null;
-      //     this.form.barLxfs=null;
-      //   }
-      // },
-      // changeCheckedBg(is){
-      //   if(!this.form.frxm)
-      //   {
-      //     this.$modal.msgWarning('请填写法人信息');
-      //     this.checked=false;
-      //     return false
-      //   }
-      //   if(is)
-      //   {
-      //     this.form.babgXm=JSON.parse(JSON.stringify(this.form.frxm));
-      //     this.form.babgZjlx=JSON.parse(JSON.stringify(this.form.frzjlx));
-      //     this.form.babgSfzhm=JSON.parse(JSON.stringify(this.form.frzjhm));
-      //     this.form.babgLxfs=JSON.parse(JSON.stringify(this.form.frlxfs));
-      //   }else {
-      //     this.form.babgXm=null;
-      //     this.form.babgZjlx=null;
-      //     this.form.babgSfzhm=null;
-      //     this.form.babgLxfs=null;
-      //   }
-      // },
       changeBljg(value) {
         this.form.babtgyy = []
         this.form.jtclmc = ''
@@ -1232,7 +1195,6 @@ export default {
             return items
           })
           this.form.id = row.id
-          console.log(this.xqList, 'this.xqList')
         })
       },
       translateDict(type, value, is) {

ruoyi-ui/src/views/organization/zwyw/djpdsq/bgdjpdSq/index.vue

@@ -1,17 +1,17 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="125px">
-      <el-form-item label="统一社会信用代码" prop="xydm">
+      <!-- <el-form-item label="统一社会信用代码" prop="xydm">
         <el-input v-model="queryParams.xydm" placeholder="请输入统一社会信用代码" maxlength="18" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="单位名称" prop="dwmc">
         <el-input v-model="queryParams.dwmc" placeholder="请输入单位名称" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="所在区划" prop="xzqh">
         <RegionCascaderSelect v-model="xzqh" style="width: 100%" endLevel="2" valueProp="code"></RegionCascaderSelect>
       </el-form-item>
       <el-form-item label="变更申请日期">
-        <el-date-picker v-model="daterangeSqsj" style="width: 240px" value-format="yyyyMMdd" type="daterange"
+        <el-date-picker v-model="daterangeSqsj" style="width: 215px" value-format="yyyyMMdd" type="daterange"
           range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
         <!-- 一般情况不需要选择到时间，如果需要使用日期时间范围搜索，修改value-format="yyyyMMddHHmmss"  type="datetimerange"即可 -->
       </el-form-item>

ruoyi-ui/src/views/organization/zwyw/djpdsq/djpdSq/index.vue

@@ -1,12 +1,12 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="200px">
-      <el-form-item label="统一社会信用代码" prop="xydm">
+      <!-- <el-form-item label="统一社会信用代码" prop="xydm">
         <el-input v-model="queryParams.xydm" placeholder="请输入统一社会信用代码" maxlength="18" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="单位名称" prop="dwmc">
         <el-input v-model="queryParams.dwmc" placeholder="请输入单位名称" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="申请状态" prop="sqzt">
         <el-select v-model="queryParams.sqzt" placeholder="请选择申请状态" clearable>
           <el-option v-for="dict in dict.type.CZ013" :key="dict.value" :label="dict.label" :value="dict.value" />
@@ -16,7 +16,7 @@
         <RegionCascaderSelect v-model="xzqh" style="width: 100%" endLevel="2" valueProp="code"></RegionCascaderSelect>
       </el-form-item>
       <el-form-item label="申请日期">
-        <el-date-picker v-model="daterangeSqsj" style="width: 240px" value-format="yyyyMMdd" type="daterange"
+        <el-date-picker v-model="daterangeSqsj" style="width: 215px" value-format="yyyyMMdd" type="daterange"
           range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
         <!-- 一般情况不需要选择到时间，如果需要使用日期时间范围搜索，修改value-format="yyyyMMddHHmmss"  type="datetimerange"即可 -->
       </el-form-item>

ruoyi-ui/src/views/system/user/index.vue

@@ -37,10 +37,10 @@
       <!--用户数据-->
       <el-col :span="20" :xs="24">
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-          <el-form-item label="用户名称" prop="userName">
+          <el-form-item label="用户账号" prop="userName">
             <el-input
               v-model="queryParams.userName"
-              placeholder="请输入用户名称"
+              placeholder="请输入用户账号"
               clearable
               style="width: 240px"
               @keyup.enter.native="handleQuery"
@@ -145,7 +145,7 @@
         <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange" ref="table">
           <el-table-column type="selection" width="50" align="center" :selectable="selectable"  />
           <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
-          <el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
+          <el-table-column label="用户账号" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
           <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
           <el-table-column label="用户类型" align="center" key="userType" prop="userType" v-if="columns[2].visible" :show-overflow-tooltip="true" />
           <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
@@ -247,8 +247,8 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item v-if="form.userId == undefined && form.userType == '00'" label="用户名称" prop="userName">
-              <el-input v-model="form.userName" placeholder="请输入用户名称" maxlength="30" />
+            <el-form-item v-if="form.userId == undefined && form.userType == '00'" label="用户账号" prop="userName">
+              <el-input v-model="form.userName" placeholder="请输入用户账号" maxlength="30" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -463,7 +463,7 @@ export default {
       // 列信息
       columns: [
         { key: 0, label: `用户编号`, visible: true },
-        { key: 1, label: `用户名称`, visible: true },
+        { key: 1, label: `用户账号`, visible: true },
         { key: 2, label: `用户昵称`, visible: true },
         { key: 3, label: `部门`, visible: true },
         { key: 4, label: `手机号码`, visible: true },
@@ -473,8 +473,8 @@ export default {
       // 表单校验
       rules: {
         userName: [
-          { required: true, message: "用户名称不能为空", trigger: "blur" },
-          { min: 2, max: 20, message: '用户名称长度必须介于 2 和 20 之间', trigger: 'blur' }
+          { required: true, message: "用户账号不能为空", trigger: "blur" },
+          { min: 2, max: 20, message: '用户账号长度必须介于 2 和 20 之间', trigger: 'blur' }
         ],
         nickName: [
           { required: true, message: "用户昵称不能为空", trigger: "blur" }

ruoyi-ui/src/views/system/user/profile/index.vue

@@ -12,27 +12,27 @@
             </div>
             <ul class="list-group list-group-striped">
               <li class="list-group-item">
-                <svg-icon icon-class="user" />用户名称
+                <svg-icon icon-class="user" /> 用户账号
                 <div class="pull-right">{{ user.userName }}</div>
               </li>
               <li class="list-group-item">
-                <svg-icon icon-class="phone" />手机号码
+                <svg-icon icon-class="phone" /> 手机号码
                 <div class="pull-right">{{ user.phonenumber }}</div>
               </li>
               <li class="list-group-item">
-                <svg-icon icon-class="email" />用户邮箱
+                <svg-icon icon-class="email" /> 用户邮箱
                 <div class="pull-right">{{ user.email }}</div>
               </li>
               <li class="list-group-item">
-                <svg-icon icon-class="tree" />所属部门
+                <svg-icon icon-class="tree" /> 所属部门
                 <div class="pull-right" v-if="user.dept">{{ user.dept.deptName }} / {{ postGroup }}</div>
               </li>
               <li class="list-group-item">
-                <svg-icon icon-class="peoples" />所属角色
+                <svg-icon icon-class="peoples" /> 所属角色
                 <div :title="roleGroup" class="pull-right text-one">{{ roleGroup }}</div>
               </li>
               <li class="list-group-item">
-                <svg-icon icon-class="date" />创建日期
+                <svg-icon icon-class="date" /> 创建日期
                 <div class="pull-right">{{ user.createTime }}</div>
               </li>
             </ul>

ruoyi-ui/src/views/system/zhgl/sqyljg/index.vue

@@ -136,7 +136,7 @@
             <el-input :disabled="isXQ" v-model="form.jgmc" />
           </el-form-item>
           <el-form-item label="统一社会信用代码" prop="tyshxydm" class="formWidth2">
-            <el-input :disabled="isXQ||checked"  v-model="form.tyshxydm" />
+            <el-input :disabled="isXQ||checked"  v-model="form.tyshxydm" maxlength="18"/>
             <el-checkbox v-if="!isXQ" v-model="checked" @change="changeChecked">无统一社会信用代码</el-checkbox>
           </el-form-item>
         </div>

ruoyi-ui/src/views/system/zhgl/yljg/index.vue

@@ -84,7 +84,7 @@
             <el-input :disabled="form.id ? true : false" v-model="form.jgmc" />
           </el-form-item>
           <el-form-item label="统一社会信用代码" prop="tyshxydm" class="formWidth2">
-            <el-input :disabled="form.id ? true : false" v-model="form.tyshxydm" />
+            <el-input :disabled="form.id ? true : false" v-model="form.tyshxydm" maxlength="18"/>
           </el-form-item>
         </div>