Merge branch 'pet' into dev

用户信息修改页面用户名和身份证号校验

src/views/accesscontrol/accesscontroldata/components/list.vue

@@ -59,9 +59,7 @@
     <div class="page-btn-group">
       <div>
         <el-button v-show="add" type="primary" icon="el-icon-plus" @click="handleAdd">申请</el-button>
-        <!--
-        <el-button v-show="del" type="danger" icon="el-icon-delete" plain @click="batchDel">删除</el-button>
--->
+
       </div>
       <pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" />
     </div>

src/views/accident/event/components/addOrEdit.vue

@@ -431,11 +431,12 @@ export default {
         }
         this.infoForm.incidentDate = formatDate(this.infoForm.incidentDate, 'YYYY-MM-DD HH:mm:ss')
         this.infoForm.reportDate = formatDate(this.infoForm.reportDate, 'YYYY-MM-DD HH:mm:ss')
-        const address = this.infoForm.fileAddressList
+        const address = this.infoForm.fileAddressList[0]
+        console.log(address)
         const params = {
           ...this.infoForm,
           photos: this.infoForm.fileList[0].remotePathName,
-          attachmentAddress: address == null || address.length === 0 ? address[0].remotePathName : '',
+          attachmentAddress: address == null ? '' : address.remotePathName,
           type: 1
         }
         delete params.fileList

src/views/accident/records/components/addOrEdit.vue

@@ -431,11 +431,11 @@ export default {
         }
         this.infoForm.incidentDate = formatDate(this.infoForm.incidentDate, 'YYYY-MM-DD HH:mm:ss')
         this.infoForm.reportDate = formatDate(this.infoForm.reportDate, 'YYYY-MM-DD HH:mm:ss')
-        const address = this.infoForm.fileAddressList
+        const address = this.infoForm.fileAddressList[0]
         const params = {
           ...this.infoForm,
           photos: this.infoForm.fileList[0].remotePathName,
-          attachmentAddress: address == null || address.length === 0 ? address[0].remotePathName : '',
+          attachmentAddress: address == null ? '' : address.remotePathName,
           type: 2
         }
         delete params.fileList

src/views/corpInfo/user/components/edit.vue

@@ -42,7 +42,7 @@
                 </el-select>
               </el-form-item>
               <el-form-item label="用户名" prop="USERNAME">
-                <el-input v-model="form.USERNAME" placeholder="默认用户手机号码..." @change="goCheck()"/>
+                <el-input v-model="form.USERNAME" placeholder="默认用户手机号码..." @blur="goCheck()"/>
                 <a style="color: red">
                 <span>如果修改手机号，登录密码则会变成初始密码“Aa@123456789”</span></a>
               </el-form-item>
@@ -64,7 +64,7 @@
                 </div>
               </el-form-item>
               <el-form-item label="身份证号" prop="USER_ID_CARD">
-                <el-input v-model="form.USER_ID_CARD" placeholder="这里输入身份证号..." @change="goCheck()"/>
+                <el-input v-model="form.USER_ID_CARD" placeholder="这里输入身份证号..."/>
               </el-form-item>
               <el-row :gutter="20">
                 <el-col :span="12">
@@ -717,10 +717,11 @@ export default {
   data() {
     var hasUser = (rule, value, callback) => {
       requestFN(
-        '/user/hasUser',
+        '/user/goCheck',
         {
           USERNAME: value,
-          VERIFYUSER_ID: this.form.USER_ID
+          VERIFYUSER_ID: this.form.USER_ID,
+          USER_ID: this.form.USER_ID
         }
       ).then((data) => {
         if (data.result == 'success') {
@@ -1517,10 +1518,12 @@ export default {
                   if (this.form.ISSTUDENT) {
                     this.uploadImgByZhengshu(this.form.USER_ID)
                     this.uploadImgByFace(this.form.USER_ID)
-                    this.goPush(this.form)
+                    // this.goPush(this.form)
+                    this.$parent.activeName = 'List'
                   } else {
                     this.uploadImgByFace(this.form.USER_ID)
-                    this.goPush(this.form)
+                    // this.goPush(this.form)
+                    this.$parent.activeName = 'List'
                   }
                 }).catch((e) => {
                   this.listLoading = false
@@ -1541,10 +1544,12 @@ export default {
                 if (this.form.ISSTUDENT) {
                   this.uploadImgByZhengshu(this.form.USER_ID)
                   this.uploadImgByFace(this.form.USER_ID)
-                  this.goPush(this.form)
+                  // this.goPush(this.form)
+                  this.$parent.activeName = 'List'
                 } else {
                   this.uploadImgByFace(this.form.USER_ID)
-                  this.goPush(this.form)
+                  // this.goPush(this.form)
+                  this.$parent.activeName = 'List'
                 }
               }).catch((e) => {
                 this.listLoading = false

src/views/corpInfo/user/components/list.vue

@@ -798,7 +798,7 @@ export default {
           SHIFTDUTYTWO: this.SHIFTDUTYTWO,
           IS_HAZARDCONFIRMER: this.IS_HAZARDCONFIRMER,
           USER_ID: this.USER_ID,
-          ISPUSH: '2'
+          ISPUSH: '1'
         }
       ).then((data) => {
         this.listLoading = false

src/views/login/index.vue

@@ -320,11 +320,12 @@ export default {
       ).then((data) => {
         if (data.list && data.list.length > 0) {
           setTimeout(() => {
-            console.log(data)
-            console.log('???????--sparrow')
             this.$notify.info({
               title: '消息',
-              message: '您有【' + data.list.length + '】条相关方人员数据待审核'
+              message: '您有【' + data.list.length + '】条相关方人员数据待审核',
+              onClick: () => {
+                this.$router.push('/xgf/flow')
+              }
             })
           }, 3000)
         }

src/views/xgf/flowApply/components/userInfo.vue

@@ -62,7 +62,7 @@
 
             <tr>
               <th>民族</th>
-              <td>{{ userDetailForm.minzuName ? userDetailForm.minzuName : '暂无信息' }}</td>
+              <td>{{ userDetailForm.NATIONALITY_NAME ? userDetailForm.NATIONALITY_NAME : '暂无信息' }}</td>
               <th>婚姻状况</th>
               <td>{{ userDetailForm.MARITALSTATUS === '0' ? '未婚' : '已婚' }}</td>
               <th>政治面貌</th>