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

config/index.js

@@ -12,6 +12,8 @@ module.exports = {
     proxyTable: {
       '/api': {
         // target: 'https://dp.huiju360.com.cn/hj_operations',
+        // target: 'http://192.168.0.62:8080', //wf
+        //target: 'http://127.0.0.1:8080', 
         target: 'http://192.168.0.62:8080', //wf
         // target: 'http://192.168.0.11', //ys
         // target: 'http://192.168.0.125:8080', //hyq

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

@@ -123,14 +123,14 @@ export default {
       if (this.postData.AreaIcon === '') {
         this.$message({
           type: 'error',
-          message: '区域图标不能为空'
+          message: '请上传区域图片'
         })
         return false
       }
       if (this.postData.AreaIconWhite === '') {
         this.$message({
           type: 'error',
-          message: '区域图标灰白不能为空'
+          message: '请上传区域黑白图片'
         })
         return false
       }

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

@@ -118,6 +118,13 @@ export default {
         })
         return false
       }
+      if (this.postData.AreaId === '' || this.CaseId === '') {
+        this.$message({
+          type: 'error',
+          message: '请选择案场/区域'
+        })
+        return false
+      }
       this.postData.OrgId = this.OrgId
       this.$ajax(this.$api.caseManager.addCaseTable.url, {
         method: this.$api.caseManager.addCaseTable.method,

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

@@ -24,7 +24,8 @@
               <el-input
                 placeholder="请输入数字"
                 v-model="postData.beginnum"
-                clearable>
+                clearable
+                onkeyup="value=value.replace(/[^\d]/g,'')">
               </el-input>
             </div>
           </div>
@@ -36,7 +37,8 @@
               <el-input
                 placeholder="请输入数字"
                 v-model="postData.endnum"
-                clearable>
+                clearable
+                onkeyup="value=value.replace(/[^\d]/g,'')">
               </el-input>
             </div>
           </div>
@@ -113,6 +115,7 @@ export default {
         })
         return false
       }
+      console.log('柜子编号:' + this.postData.beginnum + ' ' + this.postData.endnum)
       this.postData.orgid = this.OrgId
       this.$ajax(this.$api.caseManager.addKey.url, {
         method: this.$api.caseManager.addKey.method,

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

@@ -30,7 +30,7 @@
         </el-select>
     </div>
     <div class="button-div">
-      <el-button type="success" icon="el-icon-search" style="float: right;">导出excel</el-button>
+      <el-button type="success" icon="el-icon-search" style="float: right;" @click="excelSignin">导出excel</el-button>
       <el-button type="warning" icon="el-icon-search" style="float: right;" @click="reset">重置</el-button>
       <el-button type="primary" icon="el-icon-search" style="float: right; margin-right: -10px;" @click="getList">搜索</el-button>
     </div>
@@ -179,7 +179,9 @@ export default {
     FormatDate (date) {
       return this.toolClass.dateFormat(date, 'yyyy-MM-dd hh:mm:ss')
     },
-
+    excelSignin () { // 导出Excel
+      window.open(`${this.toolClass.ReplaceOrg(this.$api.caseManager.getExcelSignin.url)}?token=${localStorage.getItem('JWT')}&selectType=${this.$data.valueTime}&caseid=${this.$data.valueCase}`, '_blank')
+    }
   },
   computed: {
     ...mapState({

src/util/api.js

@@ -212,6 +212,10 @@ const $api = {
     getSignin: { // 获取签到列表
       method: 'get',
       url: `${baseUrl}${common}/case/signin`
+    },
+    getExcelSignin: { // 获取签到列表
+      method: 'get',
+      url: `${baseUrl}${common}/case/excelSignin`
     }
   },
   goodsManager: {