bug修改

src/pages/system/caseManager/caseInfo/pplConcerned/editPPLConcerned/index.vue

@@ -8,9 +8,9 @@
             <el-select v-model="postData.UserType" placeholder="请选择">
               <el-option
                 v-for="item in typeList"
-                :key="item.TypeId"
+                :key="item.TypeCode"
                 :label="item.TypeName"
-                :value="item.TypeId">
+                :value="item.TypeCode">
               </el-option>
             </el-select>
           </div>
@@ -22,6 +22,7 @@
               <el-input
                 placeholder="请输入名称"
                 v-model="postData.UserName"
+                maxlength="10"
                 clearable>
               </el-input>
             </div>
@@ -34,6 +35,7 @@
               <el-input
                 placeholder="请输入手机号码"
                 v-model="postData.Tel"
+                maxlength="11"
                 clearable>
               </el-input>
             </div>
@@ -98,11 +100,11 @@ export default {
       }
     },
     getUserTypeList () { // 获取用户类型
-      this.$ajax(this.$api.caseManager.getUserTypeList.url, {
-        method: this.$api.caseManager.getUserTypeList.method,
+      this.$ajax(this.$api.caseManager.getCaseUserType.url, {
+        method: this.$api.caseManager.getCaseUserType.method,
       }).then(res => {
         this.typeList = res
-        this.postData.UserType = res[0].TypeId
+        this.postData.UserType = res[0].TypeCode
       })
     },
     submit () { // 提交数据
@@ -120,6 +122,14 @@ export default {
         })
         return false
       }
+      var myreg = /^[1][3,4,5,6,7,8][0-9]{9}$/
+      if (!myreg.test(this.postData.Tel)) {
+        this.$message({
+          type: 'error',
+          message: '请输入正确的手机号！'
+        })
+        return false
+      }
       this.postData.OrgId = this.OrgId
       if (this.$route.query.userid !== undefined) {
         this.$ajax(this.$api.caseManager.editCaseUser.url, {

src/pages/system/caseManager/caseInfo/pplConcerned/index.vue

@@ -14,8 +14,10 @@
         stripe
         style="width: 100%">
         <el-table-column
-          prop="UserType"
           label="用户类型">
+          <template slot-scope="scope">
+            {{getUserType(scope.row)}}
+          </template>
         </el-table-column>
         <el-table-column
           prop="UserName"
@@ -67,10 +69,13 @@ export default {
     })
   },
   methods: {
+    getUserType (row) {
+      return (this.typeList.filter(x => x.TypeCode === row.UserType)[0] || {}).TypeName || ''
+    },
     getUserTypeList () { // 获取用户类型
       return new Promise((resolve) => {
-        this.$ajax(this.$api.caseManager.getUserTypeList.url, {
-          method: this.$api.caseManager.getUserTypeList.method,
+        this.$ajax(this.$api.caseManager.getCaseUserType.url, {
+          method: this.$api.caseManager.getCaseUserType.method,
         }).then(res => {
           this.typeList = res
           resolve()
@@ -85,9 +90,6 @@ export default {
         method: this.$api.caseManager.getCaseUserList.method,
         queryData: this.postData
       }).then(res => {
-        for (var n = 0; n < res.list.length; n++) {
-          res.list[n].UserType = this.typeList.filter(x => x.TypeId === res.list[n].UserType)[0].TypeName
-        }
         this.currentList = res.list
         this.postData.page = res.page
         this.total = res.pagenum

src/pages/system/cmsManager/majorProjects/index.vue

@@ -9,6 +9,10 @@
           <li>
             <span>选择案场：</span>
             <el-select v-model="tableSearch.caseId" placeholder="请选择">
+              <el-option
+              value=""
+              >
+              </el-option>
               <el-option
                 v-for="item in caseList"
                 :key="item.CaseId"
@@ -108,14 +112,14 @@ export default {
   },
   created () {
     this.updateSystemInfo().then(() => {
-      this.tableSearch.caseId = this.defaultCaseId
+      // this.tableSearch.caseId = this.defaultCaseId
       this.getList()
     })
   },
   methods: {
     ...mapActions(['updateSystemInfo']),
     handleCurrentChange (val) {
-      this.postData.currentPage = val - 1
+      this.postData.currentPage = val
       this.getList()
     },
     showItem (index, row) { // 前台显示

src/pages/system/cmsManager/newsManager/index.vue

@@ -18,7 +18,7 @@
             </el-select>
           </li>
         </ul>
-        <tableSearch @exportSearchKey="searchList"></tableSearch>
+        <tableSearch @exportSearchKey="searchList" value="请输入标题"></tableSearch>
       </div>
       <div class="moreFilter"></div>
     </div>
@@ -109,6 +109,7 @@ export default {
     ...mapCmsActions(['updateLocationInfo']),
     handleCurrentChange (val) {
       console.log(`当前页: ${val}`)
+      this.getList()
     },
     handleEdit (index, row) { // 编辑
       console.log(index, row)

src/util/api.js

@@ -100,6 +100,10 @@ const $api = {
       method: 'put',
       url: `${baseUrl}${common}/case/info/:id`
     },
+    getCaseUserType: { // 获取案场相关人员类型
+      method: 'get',
+      url: `${baseUrl}${common}/case/usertype`
+    },
     getCaseUserList: { // 获取案场相关人员列表
       method: 'get',
       url: `${baseUrl}${common}/case/user`