Merge branch 'dev' of http://git.ycjcjy.com/SpaceOfCheng/admin into dev

src/pages/system/caseManager/caseAreaManager/add.vue

@@ -9,7 +9,9 @@
               <el-input
                 placeholder="请输入区域名"
                 v-model="postData.AreaName"
-                clearable>
+                clearable
+                maxlength="5"
+                >
               </el-input>
             </div>
           </div>
@@ -88,7 +90,8 @@ export default {
   computed: {
     ...mapState({
       cases: x => x.app.cases.list,
-      defaultCaseId: x => x.app.cases.default
+      defaultCaseId: x => x.app.cases.default,
+      OrgId: x => x.app.user.OrgId,
     }),
     CaseId: {
       get () {

src/pages/system/caseManager/caseAreaManager/edit.vue

@@ -9,7 +9,9 @@
               <el-input
                 placeholder="请输入区域名"
                 v-model="postData.AreaName"
-                clearable>
+                clearable
+                maxlength="5"
+                >
               </el-input>
             </div>
           </div>
@@ -88,7 +90,8 @@ export default {
   computed: {
     ...mapState({
       cases: x => x.app.cases.list,
-      defaultCaseId: x => x.app.cases.default
+      defaultCaseId: x => x.app.cases.default,
+      OrgId: x => x.app.user.OrgId,
     }),
     CaseId: {
       get () {

src/pages/system/caseManager/caseAreaManager/index.vue

@@ -44,7 +44,7 @@
         </el-table-column>
         <el-table-column
           prop="AreaIconWhite"
-          label="灰白图标">
+          label="黑白图标">
           <template slot-scope="scope">
             <a class="tableImg">
               <img :src="scope.row.AreaIconWhite" class="centerLabel contain" alt="">
@@ -95,8 +95,10 @@ export default {
       currentList: [],
     }
   },
-  created () {
-    this.getList()
+  mounted () {
+    this.$nextTick(function () {
+      this.getList()
+    })
   },
   computed: {
     ...mapState({

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

@@ -9,6 +9,7 @@
               <el-input
                 placeholder="请输入名称"
                 v-model="postData.CaseName"
+                maxlength="10"
                 clearable>
               </el-input>
             </div>
@@ -22,6 +23,7 @@
                 type="textarea"
                 :autosize="{ minRows: 3, maxRows: 5}"
                 placeholder="请填写详细地址"
+                maxlength="30"
                 v-model="postData.CaseAddress">
               </el-input>
             </div>
@@ -35,6 +37,7 @@
                 type="textarea"
                 :autosize="{ minRows: 3, maxRows: 5}"
                 placeholder="请填写详细描述"
+                maxlength="30"
                 v-model="postData.CaseDesc">
               </el-input>
             </div>
@@ -47,6 +50,7 @@
               <el-input
                 placeholder="限中国地区有效号码"
                 v-model="postData.CaseTel"
+                maxlength="11"
                 clearable>
               </el-input>
             </div>

src/pages/system/caseManager/caseInfo/addCase/page.scss

@@ -14,6 +14,7 @@ span{
   &>div.search{
     display: inline-block;
     position: absolute;
+    padding: 10px;
   }
 
   &>div.flex-item{

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

@@ -14,10 +14,6 @@
         :data="currentList"
         stripe
         style="width: 100%">
-        <el-table-column
-          prop="CaseId"
-          label="ID">
-        </el-table-column>
         <el-table-column
           prop="CaseName"
           label="案场名称">
@@ -70,10 +66,9 @@ export default {
     tableSearch,
   },
   mounted () {
-    this.$nextTick(function () { })
-  },
-  created () {
-    this.getList()
+    this.$nextTick(function () {
+      this.getList()
+    })
   },
   methods: {
     pplConcerned (index, row) { // 相关人员

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/caseManager/caseTableManager/add.vue

@@ -14,13 +14,28 @@
             </div>
           </div>
         </li>
+        <li class="flex-h">
+          <span>案场：</span>
+          <div class="flex-item">
+            <div style="width:50%">
+              <el-select v-model="CaseId" placeholder="请选择">
+                <el-option
+                  v-for="item in cases"
+                  :key="item.CaseId"
+                  :label="item.CaseName"
+                  :value="item.CaseId">
+                </el-option>
+              </el-select>
+            </div>
+          </div>
+        </li>
         <li class="flex-h">
           <span>区域：</span>
           <div class="flex-item">
             <div style="width:50%">
               <el-select v-model="postData.AreaId" placeholder="请选择">
                 <el-option
-                  v-for="item in caseAreaList"
+                  v-for="item in caseAreas"
                   :key="item.AreaId"
                   :label="item.AreaName"
                   :value="item.AreaId">
@@ -62,7 +77,9 @@ export default {
   computed: {
     ...mapState({
       cases: x => x.app.cases.list,
-      defaultCaseId: x => x.app.cases.default
+      caseids: x => x.app.cases.list.map(i => i.CaseId).join(','),
+      defaultCaseId: x => x.app.cases.default,
+      OrgId: x => x.app.user.OrgId,
     }),
     CaseId: {
       get () {
@@ -70,8 +87,12 @@ export default {
       },
       set (val) {
         this.postData.CaseId = val
+        this.postData.AreaId = ''
       }
-    }
+    },
+    caseAreas () {
+      return this.caseAreaList.filter(x => x.CaseId === this.CaseId)
+    },
   },
   components: {},
   methods: {
@@ -79,13 +100,13 @@ export default {
       this.$ajax(this.$api.caseManager.getCaseAreaList.url, {
         method: this.$api.caseManager.getCaseAreaList.method,
         queryData: {
-          caseid: this.CaseId, // 案场id
+          caseid: this.caseids, // 案场id
           page: 1, // 当前页码
           pagesize: 10000, // 请求数据量
         }
       }).then(res => {
         this.caseAreaList = res.list
-        this.postData.AreaId = res.list[0].AreaId
+        // this.postData.AreaId = res.list[0].AreaId
       })
     },
     submit () { // 提交数据

src/pages/system/caseManager/caseTableManager/edit.vue

@@ -14,13 +14,28 @@
             </div>
           </div>
         </li>
+        <li class="flex-h">
+          <span>案场：</span>
+          <div class="flex-item">
+            <div style="width:50%">
+              <el-select v-model="CaseId" placeholder="请选择">
+                <el-option
+                  v-for="item in cases"
+                  :key="item.CaseId"
+                  :label="item.CaseName"
+                  :value="item.CaseId">
+                </el-option>
+              </el-select>
+            </div>
+          </div>
+        </li>
         <li class="flex-h">
           <span>区域：</span>
           <div class="flex-item">
             <div style="width:50%">
               <el-select v-model="postData.AreaId" placeholder="请选择">
                 <el-option
-                  v-for="item in caseAreaList"
+                  v-for="item in caseAreas"
                   :key="item.AreaId"
                   :label="item.AreaName"
                   :value="item.AreaId">
@@ -63,7 +78,9 @@ export default {
   computed: {
     ...mapState({
       cases: x => x.app.cases.list,
-      defaultCaseId: x => x.app.cases.default
+      caseids: x => x.app.cases.list.map(i => i.CaseId).join(','),
+      defaultCaseId: x => x.app.cases.default,
+      OrgId: x => x.app.user.OrgId,
     }),
     CaseId: {
       get () {
@@ -71,8 +88,12 @@ export default {
       },
       set (val) {
         this.postData.CaseId = val
+        this.postData.AreaId = ''
       }
-    }
+    },
+    caseAreas () {
+      return this.caseAreaList.filter(x => x.CaseId === this.CaseId)
+    },
   },
   components: {},
   methods: {
@@ -88,7 +109,7 @@ export default {
       this.$ajax(this.$api.caseManager.getCaseAreaList.url, {
         method: this.$api.caseManager.getCaseAreaList.method,
         queryData: {
-          caseid: this.CaseId, // 案场id
+          caseid: this.caseids, // 案场id
           page: 1, // 当前页码
           pagesize: 10000, // 请求数据量
         }

src/pages/system/caseManager/caseTableManager/index.vue

@@ -34,7 +34,11 @@
           label="桌位名称">
         </el-table-column>
         <el-table-column
-          prop="AreaId"
+          prop="CaseName"
+          label="所属案场">
+        </el-table-column>
+        <el-table-column
+          prop="AreaName"
           label="区域">
         </el-table-column>
         <el-table-column label="操作">
@@ -92,27 +96,12 @@ export default {
       }
     }
   },
-  created () {
-    this.getAreaList().then(() => {
+  mounted () {
+    this.$nextTick(function () {
       this.getList()
     })
   },
   methods: {
-    getAreaList () {
-      return new Promise((resolve) => {
-        this.$ajax(this.$api.caseManager.getCaseAreaList.url, {
-          method: this.$api.caseManager.getCaseAreaList.method,
-          queryData: {
-            caseid: this.CaseId, // 案场id
-            page: 1, // 当前页码
-            pagesize: 10000, // 请求数据量
-          }
-        }).then(res => {
-          this.caseAreaList = res.list
-          resolve()
-        })
-      })
-    },
     search () { // 搜索
       this.postData.page = 1
       this.currentList = []
@@ -123,9 +112,6 @@ export default {
         method: this.$api.caseManager.getCaseTableList.method,
         queryData: { ...this.postData, caseid: this.CaseId }
       }).then(res => {
-        for (var n = 0; n < res.list.length; n++) {
-          res.list[n].AreaId = this.caseAreaList.filter(x => x.AreaId === res.list[n].AreaId)[0].AreaName
-        }
         this.currentList = res.list
         this.postData.page = res.page
         this.total = res.pagenum

src/pages/system/caseManager/deviceManager/add.vue

@@ -74,7 +74,7 @@ export default {
         return this.detail.CaseId || this.caseid
       },
       set (val) {
-        this.detail.CaseId = val
+        this.UpdateInfo({...this.detail, CaseId: val})
       }
     }
   },
@@ -84,6 +84,7 @@ export default {
       'AddDevice',
       'UpdateDevice',
       'SetDeviceNull',
+      'UpdateInfo',
     ]),
     submit () {
       if ((this.detail.EquipmentId || '') === '') {

src/pages/system/caseManager/deviceManager/index.vue

@@ -17,6 +17,8 @@
         </el-table-column>
         <el-table-column prop="Name" label="体检设备名称">
         </el-table-column>
+        <el-table-column prop="EquipmentCode" label="设备Code">
+        </el-table-column>
         <el-table-column label="创建时间" width="300">
           <template slot-scope="scope">
             <label>{{FormatDate(scope.row.CreateDate)}}</label>

src/pages/system/caseManager/keyManager/index.vue

@@ -17,6 +17,13 @@
               </el-option>
             </el-select>
           </li>
+          <li>
+            <el-input
+              :placeholder="'请输入锁柜编号'"
+              v-model="lockNum"
+            >
+            </el-input>
+          </li>
         </ul>
         <el-button
           size="mini"
@@ -40,17 +47,24 @@
         <el-table-column
           prop="Status"
           label="状态">
+          <template slot-scope="scope">
+            {{scope.row.Status===1?'有人':'无人'}}
+          </template>
         </el-table-column>
         <el-table-column label="操作">
           <template slot-scope="scope">
-            <el-button v-if="scope.row.Status==='有人'"
+            <el-button v-if="scope.row.Status===1"
               size="mini"
               type="danger"
               @click="unBindItem(scope.$index, scope.row)">解绑</el-button>
-            <el-button v-if="scope.row.Status==='无人'"
+            <el-button v-if="scope.row.Status===0"
               size="mini"
               type="success"
               @click="bindItem(scope.$index, scope.row)">绑定</el-button>
+            <el-button v-if="scope.row.Status===0"
+              size="mini"
+              type="danger"
+              @click="deleteItem(scope.$index, scope.row)">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -110,10 +124,13 @@ export default {
         pagesize: 10, // 请求数据量
       },
       currentList: [],
+      lockNum: '',
     }
   },
-  created () {
-    this.getList()
+  mounted () {
+    this.$nextTick(function () {
+      this.getList()
+    })
   },
   computed: {
     ...mapState({
@@ -144,13 +161,8 @@ export default {
     getList () { // 获取列表
       this.$ajax(this.$api.caseManager.getKeyList.url, {
         method: this.$api.caseManager.getKeyList.method,
-        queryData: { ...this.postData, caseid: this.CaseId }
+        queryData: { ...this.postData, caseid: this.CaseId, num: this.lockNum }
       }).then(res => {
-        if (res.list !== null) {
-          for (var n = 0; n < res.list.length; n++) {
-            res.list[n].Status === 0 ? res.list[n].Status = '无人' : res.list[n].Status = '有人'
-          }
-        }
         this.currentList = res.list
         this.postData.page = res.page
         this.total = res.pagenum
@@ -185,6 +197,24 @@ export default {
         })
       })
     },
+    deleteItem (index, row) {
+      this.$confirm('确认删除此锁柜?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.$ajax(this.$api.caseManager.deleteKey.url, {
+          method: this.$api.caseManager.deleteKey.method,
+          urlData: { id: row.KeyId }
+        }).then(res => {
+          this.$message({
+            type: 'success',
+            message: '删除成功!'
+          })
+          this.getList()
+        })
+      })
+    },
   }
 }
 </script>

src/pages/system/caseManager/tagManager/index.vue

@@ -36,9 +36,6 @@
         <el-table-column
           prop="CaseNames"
           label="案场">
-          <template slot-scope="scope">
-            <span v-for="(item,index) in scope.row.CaseNames" :key="index">{{item}}<br></span>
-          </template>
         </el-table-column>
         <el-table-column label="操作">
           <template slot-scope="scope">
@@ -95,8 +92,10 @@ export default {
       }
     }
   },
-  created () {
-    this.getList()
+  mounted () {
+    this.$nextTick(function () {
+      this.getList()
+    })
   },
   methods: {
     search () { // 搜索
@@ -109,9 +108,6 @@ export default {
         method: this.$api.caseManager.getCaseTagList.method,
         queryData: { ...this.postData, caseid: this.CaseId }
       }).then(res => {
-        for (var n = 0; n < res.list.length; n++) {
-          res.list[n].CaseNames = res.list[n].CaseNames.split(',')
-        }
         this.currentList = res.list
         this.postData.page = res.page
         this.total = res.pagenum

src/pages/system/channelManager/channelList/index.vue

@@ -53,7 +53,7 @@
     </div>
     <el-pagination
       @current-change="handleCurrentChange"
-      :current-page.sync="postData.page+1"
+      :current-page.sync="postData.page"
       :page-size="postData.pagesize"
       layout="prev, pager, next, jumper"
       :total="total">
@@ -77,8 +77,10 @@ export default {
       currentList: []
     }
   },
-  created () {
-    this.getList()
+  mounted () {
+    this.$nextTick(function () {
+      this.getList()
+    })
   },
   computed: {
     ...mapState({
@@ -117,15 +119,15 @@ export default {
       this.$router.push({ name: 'editChannel', query: { id: row.ChannelId } })
     },
     handleDelete (index, row) { // 删除
-      let name = '确认删除规格“' + row.TypeName + '”?'
+      let name = '确认删除渠道“' + row.ChannelName + '”?'
       this.$confirm(name, '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        this.$ajax(this.$api.goodsManager.deleteGoodsType.url, {
-          method: this.$api.goodsManager.deleteGoodsType.method,
-          urlData: { id: row.TypeId }
+        this.$ajax(this.$api.channelManager.deleteChannel.url, {
+          method: this.$api.channelManager.deleteChannel.method,
+          urlData: { channelId: row.ChannelId }
         }).then(res => {
           this.$message({
             type: 'success',

src/pages/system/cmsManager/bannerManager/add.vue

@@ -144,6 +144,24 @@ export default {
     ...mapCmsActions(['updateLocationInfo']),
     ...mapActions(['updateSystemInfo']),
     submit () {
+      if (this.postData.ForwardType === '1') {
+        if (this.postData.ForwardUrl === '') {
+          this.$message({
+            message: '链接地址不能为空',
+            type: 'error',
+          })
+          return false
+        } else {
+          var reg = /^([hH][tT]{2}[pP]:\/\/|[hH][tT]{2}[pP][sS]:\/\/)(([A-Za-z0-9-~]+)\.)+([A-Za-z0-9-~\/])+$/  // eslint-disable-line
+          if (!reg.test(this.postData.ForwardUrl)) {
+            this.$message({
+              message: '链接地址格式不正确',
+              type: 'error',
+            })
+            return false
+          }
+        }
+      }
       this.postData.OrgId = this.OrgId
       this.postData.ForwardType === '1' ? this.postData.ForwardType = 'url' : this.postData.ForwardType = 'course'
       this.postData.ImageUrl = ''

src/pages/system/cmsManager/bannerManager/edit.vue

@@ -140,6 +140,24 @@ export default {
   methods: {
     ...mapCmsActions(['updateLocationInfo']),
     submit () {
+      if (this.postData.ForwardType === '1') {
+        if (this.postData.ForwardUrl === '') {
+          this.$message({
+            message: '链接地址不能为空',
+            type: 'error',
+          })
+          return false
+        } else {
+          var reg = /^([hH][tT]{2}[pP]:\/\/|[hH][tT]{2}[pP][sS]:\/\/)(([A-Za-z0-9-~]+)\.)+([A-Za-z0-9-~\/])+$/  // eslint-disable-line
+          if (!reg.test(this.postData.ForwardUrl)) {
+            this.$message({
+              message: '链接地址格式不正确',
+              type: 'error',
+            })
+            return false
+          }
+        }
+      }
       this.postData.OrgId = this.OrgId
       this.postData.CaseId = this.CaseId
       this.postData.ForwardType === '1' ? this.postData.ForwardType = 'url' : this.postData.ForwardType = 'course'

src/pages/system/cmsManager/indexMsg/add.vue

@@ -41,7 +41,7 @@
             </div>
           </div>
         </li>
-        <li class="flex-h">
+        <!-- <li class="flex-h">
           <span>位置：</span>
           <div class="flex-item">
             <div style="width:50%">
@@ -55,7 +55,7 @@
               </el-select>
             </div>
           </div>
-        </li>
+        </li> -->
         <li style="text-align:center">
           <el-button type="primary" size="mini" @click="submit">保存</el-button>
           <el-button type="danger" size="mini" @click="cancel">取消</el-button>
@@ -90,7 +90,7 @@ export default {
   },
   computed: {
     ...mapState({
-      positionList: x => x.cms.location,
+      // positionList: x => x.cms.location,
       OrgId: x => x.app.user.OrgId,
       defaultCaseId: x => x.app.cases.default,
       caseList: x => x.app.cases.list
@@ -100,7 +100,14 @@ export default {
     ...mapCmsActions(['updateLocationInfo']),
     ...mapActions(['updateSystemInfo']),
     submit () {
-      console.log(this.postData)
+      var reg = /^([hH][tT]{2}[pP]:\/\/|[hH][tT]{2}[pP][sS]:\/\/)(([A-Za-z0-9-~]+)\.)+([A-Za-z0-9-~\/])+$/  // eslint-disable-line
+      if (!reg.test(this.postData.InfoUrl)) {
+        this.$message({
+          message: '链接地址格式不正确',
+          type: 'error',
+        })
+        return false
+      }
       this.postData.OrgId = this.OrgId
       this.$ajax(this.$api.cms.addInfo.url, {
         method: this.$api.cms.addInfo.method,

src/pages/system/cmsManager/indexMsg/edit.vue

@@ -41,7 +41,7 @@
             </div>
           </div>
         </li>
-        <li class="flex-h">
+        <!-- <li class="flex-h">
           <span>位置：</span>
           <div class="flex-item">
             <div style="width:50%">
@@ -55,7 +55,7 @@
               </el-select>
             </div>
           </div>
-        </li>
+        </li> -->
         <li style="text-align:center">
           <el-button type="primary" size="mini" @click="submit">保存</el-button>
           <el-button type="danger" size="mini" @click="cancel">取消</el-button>
@@ -88,7 +88,7 @@ export default {
   },
   computed: {
     ...mapState({
-      positionList: x => x.cms.location,
+      // positionList: x => x.cms.location,
       OrgId: x => x.app.user.OrgId,
       caseList: x => x.app.cases.list
     })
@@ -96,7 +96,14 @@ export default {
   methods: {
     ...mapCmsActions(['updateLocationInfo']),
     submit () {
-      console.log(this.postData)
+      var reg = /^([hH][tT]{2}[pP]:\/\/|[hH][tT]{2}[pP][sS]:\/\/)(([A-Za-z0-9-~]+)\.)+([A-Za-z0-9-~\/])+$/  // eslint-disable-line
+      if (!reg.test(this.postData.InfoUrl)) {
+        this.$message({
+          message: '链接地址格式不正确',
+          type: 'error',
+        })
+        return false
+      }
       this.postData.OrgId = this.OrgId
       this.$ajax(this.$api.cms.editInfo.url, {
         method: this.$api.cms.editInfo.method,

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

@@ -22,6 +22,12 @@
           prop="InfoUrl"
           label="跳转链接">
         </el-table-column>
+        <el-table-column
+          label="创建时间">
+          <template slot-scope="scope">
+            <label>{{FormatDate(scope.row.CreateDate)}}</label>
+          </template>
+        </el-table-column>
         <el-table-column label="操作">
           <template slot-scope="scope">
             <el-button
@@ -80,16 +86,17 @@ export default {
     tableSearch,
   },
   methods: {
+    FormatDate (date) {
+      return this.toolClass.dateFormat(date)
+    },
     handleCurrentChange (val) {
       this.postData.currentPage = val
       this.getList()
     },
     handleEdit (index, row) { // 编辑
-      console.log(index, row)
       this.$router.push({ name: 'editIndexMsg', query: { id: row.InfoId } })
     },
     handleDelete (index, row) { // 删除
-      console.log(index, row)
       this.$confirm('确认删除此消息?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',

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

@@ -3,12 +3,16 @@
     <div class="system-table-search">
       <div class="flex-h">
         <div class="flex-item flex-h">
-          <el-button size="mini" type="success" @click='addMajorProjects'>新增首页案场</el-button>
+          <el-button size="mini" type="success" @click='addMajorProjects'>新增售楼处项目专题</el-button>
         </div>
         <ul>
           <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"
@@ -52,6 +56,7 @@
             <el-button
               size="mini"
               type="warning"
+              v-if="scope.row.Status === 0"
               @click="editItem(scope.$index, scope.row)">编辑</el-button>
             <!-- <el-button
               size="mini"
@@ -59,6 +64,7 @@
             <el-button
               size="mini"
               type="danger"
+              v-if="scope.row.Status === 0"
               @click="deleteItem(scope.$index, scope.row)">删除</el-button>
           </template>
         </el-table-column>
@@ -106,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/add.vue

@@ -6,17 +6,17 @@
           <span>跳转类型：</span>
           <div class="flex-item">
             <div style="width:50%" class="radio">
-                <el-radio v-model="postData.ForwardType" label='1' >连接</el-radio>
+                <el-radio v-model="postData.ForwardType" label='1' >链接</el-radio>
                 <el-radio v-model="postData.ForwardType" label='0' >课程</el-radio>
             </div>
           </div>
         </li>
         <li class="flex-h">
-          <span>连接：</span>
+          <span>链接：</span>
           <div class="flex-item">
             <div style="width:50%">
               <el-input
-                placeholder="请输入连接"
+                placeholder="请输入链接"
                 v-model="postData.ForwardUrl"
                 clearable>
               </el-input>
@@ -128,7 +128,24 @@ export default {
     ...mapActions(['updateSystemInfo']),
     ...mapCmsActions(['updateLocationInfo']),
     submit () {
-      console.log(this.postData)
+      if (this.postData.ForwardType === '1') {
+        if (this.postData.ForwardUrl === '') {
+          this.$message({
+            message: '链接地址不能为空',
+            type: 'error',
+          })
+          return false
+        } else {
+          var reg = /^([hH][tT]{2}[pP]:\/\/|[hH][tT]{2}[pP][sS]:\/\/)(([A-Za-z0-9-~]+)\.)+([A-Za-z0-9-~\/])+$/  // eslint-disable-line
+          if (!reg.test(this.postData.ForwardUrl)) {
+            this.$message({
+              message: '链接地址格式不正确',
+              type: 'error',
+            })
+            return false
+          }
+        }
+      }
       this.postData.ForwardType === '1' ? this.postData.ForwardType = 'url' : this.postData.ForwardType = 'course'
       this.postData.locationids = this.postData.LocationIds.join(',')
       this.postData.ImageUrl = ''

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

@@ -6,17 +6,17 @@
           <span>跳转类型：</span>
           <div class="flex-item">
             <div style="width:50%" class="radio">
-                <el-radio v-model="postData.ForwardType" label='1' >连接</el-radio>
+                <el-radio v-model="postData.ForwardType" label='1' >链接</el-radio>
                 <el-radio v-model="postData.ForwardType" label='0' >课程</el-radio>
             </div>
           </div>
         </li>
         <li class="flex-h">
-          <span>连接：</span>
+          <span>链接：</span>
           <div class="flex-item">
             <div style="width:50%">
               <el-input
-                placeholder="请输入连接"
+                placeholder="请输入链接"
                 v-model="postData.ForwardUrl"
                 clearable>
               </el-input>
@@ -124,7 +124,24 @@ export default {
   methods: {
     ...mapCmsActions(['updateLocationInfo']),
     submit () {
-      console.log(this.postData)
+      if (this.postData.ForwardType === '1') {
+        if (this.postData.ForwardUrl === '') {
+          this.$message({
+            message: '链接地址不能为空',
+            type: 'error',
+          })
+          return false
+        } else {
+          var reg = /^([hH][tT]{2}[pP]:\/\/|[hH][tT]{2}[pP][sS]:\/\/)(([A-Za-z0-9-~]+)\.)+([A-Za-z0-9-~\/])+$/  // eslint-disable-line
+          if (!reg.test(this.postData.ForwardUrl)) {
+            this.$message({
+              message: '链接地址格式不正确',
+              type: 'error',
+            })
+            return false
+          }
+        }
+      }
       this.postData.ForwardType === '1' ? this.postData.ForwardType = 'url' : this.postData.ForwardType = 'course'
       this.postData.locationids = this.postData.LocationIds.join(',')
       this.postData.ImageUrl = ''

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/pages/system/dataStatistics/frontEndUserList/index.vue

@@ -36,6 +36,12 @@
           prop="OpenId"
           label="openId">
         </el-table-column>
+        <el-table-column
+          label="创建时间">
+          <template slot-scope="scope">
+            <label>{{FormatDate(scope.row.CreateDate)}}</label>
+          </template>
+        </el-table-column>
       </el-table>
     </div>
     <el-pagination
@@ -67,10 +73,15 @@ export default {
   components: {
     tableSearch,
   },
-  created () {
-    this.getList()
+  mounted () {
+    this.$nextTick(function () {
+      this.getList()
+    })
   },
   methods: {
+    FormatDate (date) {
+      return this.toolClass.dateFormat(date)
+    },
     handleCurrentChange (val) {
       this.getList()
     },

src/pages/system/goodsManager/goodsSpecManager/index.vue

@@ -33,6 +33,12 @@
           prop="SpecName"
           label="规格名">
         </el-table-column>
+        <el-table-column
+          label="所属案场">
+          <template slot-scope="scope">
+            <label>{{getCaseName(scope.row.CaseId)}}</label>
+          </template>
+        </el-table-column>
         <el-table-column label="操作">
           <template slot-scope="scope">
             <el-button
@@ -68,13 +74,15 @@ export default {
       postData: { // 表格搜索条件
         CaseId: '', // 案场id
         page: 1, // 当前页码
-        pagesize: 3, // 请求数据量
+        pagesize: 10, // 请求数据量
       },
       currentList: []
     }
   },
-  created () {
-    this.getList()
+  mounted () {
+    this.$nextTick(function () {
+      this.getList()
+    })
   },
   computed: {
     ...mapState({
@@ -91,6 +99,9 @@ export default {
     }
   },
   methods: {
+    getCaseName (caseid) {
+      return (this.cases.filter(x => x.CaseId === caseid)[0] || {}).CaseName
+    },
     search () { // 搜索
       this.postData.page = 1
       this.currentList = []
@@ -99,7 +110,7 @@ export default {
     getList () { // 获取列表
       this.$ajax(this.$api.goodsManager.getGoodsSpecList.url, {
         method: this.$api.goodsManager.getGoodsSpecList.method,
-        queryData: { ...this.postData, CaseId: this.CaseId }
+        queryData: { ...this.postData, caseid: this.CaseId }
       }).then(res => {
         this.currentList = res.list
         this.postData.page = res.page

src/pages/system/goodsManager/goodsTypeManager/index.vue

@@ -77,8 +77,10 @@ export default {
       currentList: []
     }
   },
-  created () {
-    this.getList()
+  mounted () {
+    this.$nextTick(function () {
+      this.getList()
+    })
   },
   computed: {
     ...mapState({
@@ -120,7 +122,7 @@ export default {
       this.$router.push({ name: 'editGoodsType', query: { id: row.TypeId } })
     },
     handleDelete (index, row) { // 删除
-      let name = '确认删除规格“' + row.TypeName + '”?'
+      let name = '确认删除类型“' + row.TypeName + '”?'
       this.$confirm(name, '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',

src/pages/system/page.js

@@ -120,16 +120,6 @@ export default {
             name: 'editCase',
             component: editCase,
             children: []
-          }, { // 体检设备
-            path: 'deviceManager',
-            name: 'deviceManager',
-            component: deviceManager,
-            children: []
-          }, { // 添加体检设备
-            path: 'editDevice',
-            name: 'editDevice',
-            component: editDevice,
-            children: []
           }, { // 相关人员
             path: 'pplConcerned',
             name: 'pplConcerned',
@@ -141,6 +131,16 @@ export default {
               children: []
             }]
           }]
+        }, { // 体检设备
+          path: 'deviceManager',
+          name: 'deviceManager',
+          component: deviceManager,
+          children: [{ // 添加体检设备
+            path: 'editDevice',
+            name: 'editDevice',
+            component: editDevice,
+            children: []
+          }]
         }, { // 钥匙管理
           path: 'keyManager',
           name: 'keyManager',

src/pages/system/systemSet/roleManager/add.vue

@@ -9,6 +9,7 @@
               <el-input
                 placeholder="请输入角色名称"
                 v-model="detail.RoleName"
+                maxlength="10"
                 clearable>
               </el-input>
             </div>
@@ -64,6 +65,13 @@ export default {
       'SetRoleNull',
     ]),
     submit () {
+      if (!this.detail.RoleName || this.detail.RoleName === '') {
+        this.$message({
+          type: 'error',
+          message: '角色名称不允许为空！'
+        })
+        return false
+      }
       if ((this.detail.RoleId || '') === '') {
         this.detail.CaseId = this.caseid
         this.detail.OrgId = this.orgid

src/pages/system/systemSet/roleManager/index.vue

@@ -96,7 +96,6 @@ export default {
       'GetRoleMenu',
     ]),
     FormatDate (date) {
-      console.log()
       return this.toolClass.dateFormat(date)
     },
     handleSizeChange (val) {

src/pages/system/systemSet/userManager/add.vue

@@ -7,7 +7,7 @@
           <div class="flex-item">
             <div style="width:50%">
               <el-input
-                placeholder="请输入帐户名称"
+                placeholder="请输入帐户名称，只限英文"
                 v-model="postData.UserName"
                 clearable>
               </el-input>
@@ -202,6 +202,14 @@ export default {
         })
         return false
       }
+      var re = new RegExp('^[a-zA-Z0-9]+$')
+      if (!re.test(this.postData.UserName)) {
+        this.$message({
+          type: 'error',
+          message: '帐户名称必须为英文或数字'
+        })
+        return false
+      }
       if (this.postData.Phone === '') {
         this.$message({
           type: 'error',

src/pages/system/systemSet/userManager/edit.vue

@@ -7,7 +7,7 @@
           <div class="flex-item">
             <div style="width:50%">
               <el-input
-                placeholder="请输入帐户名称"
+                placeholder="请输入帐户名称，只限英文"
                 v-model="postData.UserName"
                 clearable>
               </el-input>
@@ -178,7 +178,7 @@ export default {
         method: this.$api.systemSet.getUserInfo.method,
         urlData: { id: this.$route.query.id }
       }).then(res => {
-        for (var n = 0; n < res.UserTag.length; n++) {
+        for (var n = 0; n < (res.UserTag || []).length; n++) {
           this.TagIds.push(res.UserTag[n].TagId)
         }
         if (res.UserType !== null) res.TypeId = res.UserType[0].TypeId
@@ -219,6 +219,14 @@ export default {
         })
         return false
       }
+      var re = new RegExp('^[a-zA-Z0-9]+$')
+      if (!re.test(this.postData.UserName)) {
+        this.$message({
+          type: 'error',
+          message: '帐户名称必须为英文或数字'
+        })
+        return false
+      }
       if (this.postData.Phone === '') {
         this.$message({
           type: 'error',

src/pages/system/systemSet/userManager/index.vue

@@ -17,6 +17,29 @@
               </el-option>
             </el-select>
           </li>
+          <li>
+            <el-input
+              placeholder="请输入用户名"
+              v-model="name"
+            >
+            </el-input>
+          </li>
+          <li>
+            <el-select v-model="usertype" placeholder="请选择用户类型">
+              <el-option
+                key=""
+                label=""
+                value=""
+              >
+              </el-option>
+              <el-option
+                v-for="item in typeList"
+                :key="item.TypeId"
+                :label="item.TypeName"
+                :value="item.TypeId">
+              </el-option>
+            </el-select>
+          </li>
         </ul>
         <el-button
           size="mini"
@@ -53,7 +76,7 @@
         <el-table-column
           prop="Phone"
           label="手机号"
-          width="100">
+          width="150">
         </el-table-column>
         <el-table-column
           prop="UserTypeNames"
@@ -157,6 +180,9 @@ export default {
   name: '',
   data () {
     return {
+      name: '',
+      usertype: '',
+      typeList: [],
       currentEditItem: null,
       dialogTableVisible: false,
       total: 0,
@@ -164,7 +190,7 @@ export default {
         caseid: '',
         name: '', // 搜索关键词
         page: 1, // 当前页码
-        pagesize: 10000, // 请求数据量
+        pagesize: 10, // 请求数据量
       },
       currentList: [],
       searchTagList: [],
@@ -185,10 +211,20 @@ export default {
       }
     }
   },
-  created () {
-    this.getList()
+  mounted () {
+    this.$nextTick(function () {
+      this.getUserTypeList()
+      this.getList()
+    })
   },
   methods: {
+    getUserTypeList () { // 获取用户类型
+      this.$ajax(this.$api.caseManager.getUserTypeList.url, {
+        method: this.$api.caseManager.getUserTypeList.method,
+      }).then(res => {
+        this.typeList = res
+      })
+    },
     resetPasswd (index, row) { // 重置密码
       this.$confirm('确认重置此用户密码?', '提示', {
         confirmButtonText: '确定',
@@ -212,11 +248,19 @@ export default {
       })
     },
     bindRoles () { // 绑定角色
+      const roleids = this.returnRoles()
+      if (roleids === '') {
+        this.$message({
+          type: 'error',
+          message: '请先选择角色！'
+        })
+        return false
+      }
       this.$ajax(this.$api.systemSet.bindRoles.url, {
         method: this.$api.systemSet.bindRoles.method,
         queryData: {
           userid: this.currentEditItem.UserId,
-          roles: this.returnRoles()
+          roles: roleids
         }
       }).then(res => {
         this.$message({
@@ -244,7 +288,7 @@ export default {
     getList () { // 获取列表
       this.$ajax(this.$api.systemSet.getUserList.url, {
         method: this.$api.systemSet.getUserList.method,
-        queryData: { ...this.postData, caseid: this.CaseId }
+        queryData: { ...this.postData, caseid: this.CaseId, typeid: this.usertype, username: this.name }
       }).then(res => {
         for (var n = 0; n < res.list.length; n++) {
           res.list[n].CreateDate = this.returnTime(res.list[n].CreateDate)

src/store/app.js

@@ -53,7 +53,7 @@ export default {
     breadcrumb: [],
     cases: {
       list: [],
-      default: 0
+      default: '',
     },
     roles: [],
     user: {}
@@ -65,7 +65,7 @@ export default {
       state.user = data.user
       state.menus = packChildren(data.menus)
 
-      let defaultCase = 0
+      let defaultCase = ''
       for (let i = 0; i < data.cases.length; i++) {
         if (data.cases[i].IsBelong === 1) {
           defaultCase = data.cases[i].CaseId

src/store/case/device.js

@@ -66,5 +66,8 @@ export default {
     SetDeviceNull ({ commit }) {
       commit('updateInfo', {})
     },
+    UpdateInfo ({ commit }, info) {
+      commit('updateInfo', info)
+    },
   }
 }

src/store/cms/index.js

@@ -10,10 +10,13 @@ export default {
     }
   },
   actions: {
-    updateLocationInfo (context) { // 这里的context和我们使用的$store拥有相同的对象和方法
+    updateLocationInfo (context, payload) { // 这里的context和我们使用的$store拥有相同的对象和方法
       return new Promise((resolve) => {
         this.$ajax(this.$api.cms.location.url, {
-          method: this.$api.cms.location.method
+          method: this.$api.cms.location.method,
+          data: {
+            issys: payload && payload.issys ? payload.issys : 0
+          }
         }).then(res => {
           context.commit('init', res)
           resolve()

src/util/api.js

@@ -74,6 +74,10 @@ const $api = {
       method: 'put',
       url: `${baseUrl}${common}/channel`
     },
+    deleteChannel: { // 删除渠道
+      method: 'delete',
+      url: `${baseUrl}${common}/channel/:channelId`
+    },
   },
   caseManager: {
     getRolesList: { // 获取角色列表
@@ -96,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`
@@ -124,6 +132,10 @@ const $api = {
       method: 'put',
       url: `${baseUrl}${common}/case/unlock/:id`
     },
+    deleteKey: { // 删除钥匙
+      method: 'delete',
+      url: `${baseUrl}${common}/case/key/:id`
+    },
     getCaseAreaList: { // 获取案场区域列表
       method: 'get',
       url: `${baseUrl}${common}/case/area`