浏览代码

Merge branch 'deploy' of http://git.chelingzhu.com/chelingzhu-web/storeCheck-it-html into deploy

lilei 4 年之前
父节点
当前提交
96a854de92

+ 6 - 3
src/config/router.config.js

@@ -74,7 +74,8 @@ export const asyncRouterMap = [{
     component: PageView,
     meta: {
       title: '考评管理',
-      icon: 'block'
+      icon: 'block',
+      permission: 'M_evaluation_0'
     },
     children: [{
       path: '/evaluation/evaluationItem',
@@ -83,7 +84,8 @@ export const asyncRouterMap = [{
         '@/views/evaluation/evaluationItem/EvaluationItem.vue'),
       meta: {
         title: '考评项目',
-        icon: 'save'
+        icon: 'save',
+        permission: 'M_evaluationItem_list'
       }
     }, {
       path: '/evaluation/evaluationPlan',
@@ -92,7 +94,8 @@ export const asyncRouterMap = [{
         '@/views/evaluation/evaluationPlan/EvaluationPlan.vue'),
       meta: {
         title: '考评方案',
-        icon: 'switcher'
+        icon: 'switcher',
+        permission: 'M_evaluationPlan_list'
       }
     }]
   },

+ 33 - 33
src/views/appSetting/bannerSetting.vue

@@ -45,8 +45,8 @@
         :hideRequiredMark="hideRequiredMark">
         <a-form-item label="名称" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
           <a-input
-            :maxLength="32"
-            v-decorator="['formData.title', { initialValue:formData.title,rules: [{ required: true, message: '请输入轮播图名称32个字以内!' }] }]"
+            :maxLength="30"
+            v-decorator="['formData.title', { initialValue:formData.title,rules: [{ required: true, message: '请输入轮播图名称30个字以内!' }] }]"
             :disabled="disabled"
             placeholder="请输入轮播图名称32个字以内" />
         </a-form-item>
@@ -88,9 +88,9 @@
             <Upload
               v-if="title != '查看详情'"
               v-decorator="[
-                'photo',
+                'formData.photoPath',
                 {
-                  initialValue: photo,
+                  initialValue: formData.photoPath,
                   rules: [{required: true,message: '请上传轮播图!'}]
                 }]"
               ref="bannerImage"
@@ -100,7 +100,7 @@
               listType="picture-card"
               upText="上传图片">
             </Upload>
-            <img v-else :src="photo" style="width:100px ;height: auto;" />
+            <img v-else :src="formData.photoPath" style="width:100px ;height: auto;" />
           </div>
         </a-form-item>
         <a-form-item :wrapper-col="{ span: 12, offset: 5 }" style="text-align: center;">
@@ -172,28 +172,30 @@ export default {
         dataIndex: 'url',
         align: 'center'
       },
-	  {
-	    title: '状态',
-	    minWidth: '100',
-	    dataIndex: 'status',
-	    align: 'center',
-	    scopedSlots: {
-	      customRender: 'status'
-	    }
-	  },
-	  {
-	    title: '操作',
-	    // dataIndex: 'action',
-	    minWidth: '100',
-	    align: 'center',
-	    scopedSlots: {
-	      customRender: 'action'
-	    }
-	  }
+      {
+        title: '状态',
+        minWidth: '100',
+        dataIndex: 'status',
+        align: 'center',
+        scopedSlots: {
+          customRender: 'status'
+        }
+      },
+      {
+        title: '操作',
+        // dataIndex: 'action',
+        minWidth: '100',
+        align: 'center',
+        scopedSlots: {
+          customRender: 'action'
+        }
+      }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
-        return getBannerSettingList({ bannerType: 'app' })
+        return getBannerSettingList({
+          bannerType: 'app'
+        })
           .then(res => {
             // console.log(res, '1111')
             const no = 0
@@ -227,10 +229,8 @@ export default {
         status: '', // 状态
         sort: '', // 排序
         position: '', // 广告图位置
-        photoBasePath: '',	// 图片基础路径
-        photoPath: ''	// 图片路径
+        photoPath: '' // banner地址
       },
-      photo: '', // banner图片
       bannerType: 'app',
       disabled: false,
       value: '',
@@ -249,10 +249,11 @@ export default {
       delete this.formData.id
       this.visible = true
       this.title = '新增'
-	  this.hideRequiredMark = false
+      this.hideRequiredMark = false
     },
+    // 轮播图change
     getbannerImage (data) {
-      this.photo = data
+      this.formData.photoPath = data
     },
     // 点击保存;
     handleSubmit (e) {
@@ -264,8 +265,6 @@ export default {
           const formData = Object.assign({}, this.formData, values.formData, {
             bannerType: 'app'
           })
-          formData.photoBasePath = this.photo.substring(0, this.photo.lastIndexOf('/') + 1)
-          formData.photoPath = this.photo.substring(this.photo.lastIndexOf('/') + 1)
           console.log(formData, _this.radioGroup)
           saveItem(formData, _this.radioGroup).then(res => {
             console.log(res, 'rrrrrrrrr')
@@ -298,7 +297,7 @@ export default {
     assignment (row) {
       this.formData.id = row.id
       this.formData.title = row.title
-	  this.photo = row.photoBasePath + row.photoPath
+      this.formData.photoPath = row.photoPath
       this.formData.url = row.url
       this.formData.status = row.status
       this.formData.sort = row.sort
@@ -306,6 +305,7 @@ export default {
     },
     // 0 修改,1 查看详情
     handleEdit (row, type) {
+      const _this = this
       console.log(row)
       if (type == 1) {
         this.title = '查看详情'
@@ -318,7 +318,7 @@ export default {
       this.disabled = type == 1
       this.visible = true
       setTimeout(() => {
-        this.$refs.bannerImage.setFileList(this.photo)
+        _this.$refs.bannerImage.setFileList(this.formData.photoPath)
       }, 500)
     },
     // 删除

+ 12 - 20
src/views/evaluation/evaluationItem/AddEvaIndexModal.vue

@@ -1,6 +1,12 @@
 <template>
   <div>
-    <a-modal class="modalBox" :title="titleText" v-model="isshow" @cancle="cancel" :width="600">
+    <a-modal
+      class="modalBox"
+      :footer="null"
+      :title="titleText"
+      v-model="isshow"
+      @cancle="cancel"
+      :width="600">
       <a-form :form="form" ref="form" @submit="handleSubmit">
         <a-row :gutter="24">
           <a-col :span="20">
@@ -8,7 +14,7 @@
             <a-form-item label="考评指标名称:" :label-col="{ span: 6 }" :wrapper-col="{ span: 18 }">
               <a-input
                 allowClear
-				id="addEvaIndexModal-name"
+                id="addEvaIndexModal-name"
                 :maxLength="128"
                 v-decorator="[
                   'formData.name',
@@ -23,7 +29,7 @@
           <a-button :loading="loading" id="addEvaIndexModal-submit" type="primary" @click="handleSubmit()">
             确定
           </a-button>
-          <a-button id="addEvaIndexModal-cancel" :style="{ marginLeft: '8px' }" @click="handleCancel()">
+          <a-button id="addEvaIndexModal-cancel" :style="{ marginLeft: '8px' }" @click="cancel()">
             取消
           </a-button>
         </a-form-item>
@@ -110,7 +116,7 @@ export default {
       const _this = this
       this.form.validateFields((err, values) => {
         if (!err) {
-			this.loading = true
+          this.loading = true
           const params = this.itemIndexId ? Object.assign({ assessItemId: this.itemId, id: this.itemIndexId }, values.formData) : Object.assign({ assessItemId: this.itemId }, values.formData)
           // console.log(params, 'ppppppppppppp')
           itemIndexSave(params).then(res => {
@@ -124,25 +130,11 @@ export default {
             } else {
               // this.$message.warning(res.message)
             }
-			this.loading = false
+            this.loading = false
           })
         }
       })
     },
-    // 取消
-    handleCancel () {
-      const _this = this
-      this.$confirm({
-        title: '提示',
-        content: '确定取消吗?',
-        okText: '确定',
-        cancelText: '取消',
-        onOk () {
-          _this.clear()
-          _this.cancel()
-        }
-      })
-    },
     clear () {
       this.form.resetFields()
     }
@@ -157,7 +149,7 @@ export default {
 }
 </script>
 
-<style>
+<style scoped>
 	.modalBox {}
 
 	.ant-modal-footer {

+ 9 - 3
src/views/evaluation/evaluationItem/AddEvaItemModal.vue

@@ -1,6 +1,12 @@
 <template>
   <div>
-    <a-modal class="modalBox" :title="titleText" v-model="isshow" @cancle="cancel" :width="600">
+    <a-modal
+      class="modalBox"
+      :footer="null"
+      :title="titleText"
+      v-model="isshow"
+      @cancle="cancel"
+      :width="600">
       <a-form :form="form" ref="form" @submit="handleSubmit">
         <a-row :gutter="24">
           <a-col :span="20">
@@ -41,7 +47,7 @@
           <a-button :loading="loading" id="addEvaItemModal-submit" type="primary" @click="handleSubmit()">
             确定
           </a-button>
-          <a-button id="addEvaItemModal-cancel" :style="{ marginLeft: '8px' }" @click="handleCancel()">
+          <a-button id="addEvaItemModal-cancel" :style="{ marginLeft: '8px' }" @click="cancel()">
             取消
           </a-button>
         </a-form-item>
@@ -183,7 +189,7 @@ export default {
 }
 </script>
 
-<style>
+<style scoped>
 	.modalBox {}
 
 	.ant-modal-footer {

+ 2 - 2
src/views/evaluation/evaluationItem/EvaluationItem.vue

@@ -1,7 +1,7 @@
 <template>
   <a-card :bordered="false">
     <div class="table-page-search-wrapper">
-      <a-form layout="inline">
+      <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
         <a-row :gutter="48">
           <a-col :span="6">
             <a-form-item label="考评项目名称">
@@ -28,7 +28,7 @@
     </div>
     <a-divider />
     <div class="table-operator">
-      <a-button id="evaluationItem-add" type="primary" icon="plus" @click="openModal">新</a-button>
+      <a-button id="evaluationItem-add" type="primary" icon="plus" @click="openModal">新</a-button>
     </div>
     <s-table
       ref="table"

+ 7 - 1
src/views/evaluation/evaluationItem/SetEvaItemModal.vue

@@ -1,6 +1,12 @@
 <template>
   <div>
-    <a-modal class="modalBox" title="设置考评指标" v-model="isshow" @cancle="cancel" :width="'60%'">
+    <a-modal
+      class="modalBox"
+      :footer="null"
+      title="设置考评指标"
+      v-model="isshow"
+      @cancle="cancel"
+      :width="'60%'">
       <a-row :gutter="24" class="header">
         <span>请给考评项目为【{{ itemName }}】设置考评指标</span>
         <a-button id="setEvaItemModal-add" type="primary" @click="openModal">新增</a-button>

+ 9 - 3
src/views/evaluation/evaluationPlan/AddEvaModal.vue

@@ -1,6 +1,12 @@
 <template>
   <div>
-    <a-modal class="modalBox" :title="titleText" v-model="isshow" @cancle="cancel" :width="600">
+    <a-modal
+      class="modalBox"
+      :footer="null"
+      :title="titleText"
+      v-model="isshow"
+      @cancle="cancel"
+      :width="600">
       <a-form :form="form" :model="formData" ref="form" @submit="handleSubmit">
         <a-row :gutter="24">
           <a-col :span="20">
@@ -61,7 +67,7 @@
           <a-button :loading="loading" id="addEvaModal-submit" type="primary" @click="handleSubmit()">
             确定
           </a-button>
-          <a-button id="addEvaModal-cancel" :style="{ marginLeft: '8px' }" @click="handleCancel()">
+          <a-button id="addEvaModal-cancel" :style="{ marginLeft: '8px' }" @click="cancel()">
             取消
           </a-button>
         </a-form-item>
@@ -223,7 +229,7 @@ export default {
 }
 </script>
 
-<style>
+<style scoped>
 	.modalBox {}
 
 	.ant-modal-footer {

+ 3 - 3
src/views/evaluation/evaluationPlan/EvaluationPlan.vue

@@ -1,7 +1,7 @@
 <template>
   <a-card :bordered="false">
     <div class="table-page-search-wrapper">
-      <a-form layout="inline">
+      <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
         <a-row :gutter="48">
           <a-col :span="6">
             <a-form-item label="方案名称">
@@ -28,8 +28,8 @@
     </div>
     <a-divider />
     <a-row class="add-btn" type="flex" justify="space-between">
-      <a-button id="evaluationPlan-add" type="primary" icon="plus" @click="openModal">新</a-button>
-	  <!-- 目前版本不要 -->
+      <a-button id="evaluationPlan-add" type="primary" icon="plus" @click="openModal">新</a-button>
+      <!-- 目前版本不要 -->
       <!-- <a-col id="evaluationPlan-setDefaultPlan" @click="handleDefaultSet">
         <a-icon type="setting" class="setting-icon" />
         <span class="setting">默认方案设置</span>

+ 9 - 3
src/views/evaluation/evaluationPlan/SetEvaDefaultModal.vue

@@ -1,6 +1,12 @@
 <template>
   <div>
-    <a-modal class="modalBox" title="默认方案设置" v-model="isshow" @cancle="cancel" :width="600">
+    <a-modal
+      class="modalBox"
+      :footer="null"
+      title="默认方案设置"
+      v-model="isshow"
+      @cancle="cancel"
+      :width="600">
       <a-form :form="form" ref="form" @submit="handleSubmit">
         <a-row :gutter="24">
           <a-col :span="24">
@@ -52,7 +58,7 @@
           <a-button :loading="loading" id="setEvaDefaultModal-submit" type="primary" @click="handleSubmit()">
             确定
           </a-button>
-          <a-button id="setEvaDefaultModal-cancle" :style="{ marginLeft: '8px' }" @click="handleCancel()">
+          <a-button id="setEvaDefaultModal-cancle" :style="{ marginLeft: '8px' }" @click="cancel()">
             取消
           </a-button>
         </a-form-item>
@@ -215,7 +221,7 @@ export default {
 }
 </script>
 
-<style>
+<style scoped>
 	.modalBox {}
 
 	.ant-modal-footer {

+ 9 - 6
src/views/evaluation/evaluationPlan/SetEvaModal.vue

@@ -1,6 +1,12 @@
 <template>
   <div>
-    <a-modal class="modalBox" title="选择考评项" v-model="isshow" @cancle="cancel" :width="'80%'">
+    <a-modal
+      class="modalBox"
+      :footer="null"
+      title="选择考评项"
+      v-model="isshow"
+      @cancle="cancel"
+      :width="'80%'">
       <a-row :gutter="24">
         <a-col class="title" :span="20">
           <!-- 考评方案名称 -->
@@ -89,7 +95,7 @@
             <a-button :loading="loading" id="setEvaModal-submit" type="primary" @click="handleSubmit()">
               保存
             </a-button>
-            <a-button id="setEvaModal-cancel" :style="{ marginLeft: '8px' }" @click="handleCancel()">
+            <a-button id="setEvaModal-cancel" :style="{ marginLeft: '8px' }" @click="cancel()">
               取消
             </a-button>
           </a-form-item>
@@ -151,7 +157,7 @@ export default {
       form: this.$form.createForm(this, {
         name: 'SetEvaModal'
       }),
-	  loading: false, // 确定按钮loading
+      loading: false, // 确定按钮loading
       // 已选考评项数据
       checkedList: [], // 已选考评项列表
       // 表头
@@ -195,9 +201,6 @@ export default {
       loadItemData: parameter => {
         return getItemList().then(res => {
           if (res.status == 200) {
-            //       res.data.map((item, index) => {
-			   // res.data.no = index + 1
-            //       })
             return res.data
           }
         })

+ 2 - 2
src/views/tenants/tenantsList.vue

@@ -1,7 +1,7 @@
 <template>
   <a-card :bordered="false">
     <div class="table-page-search-wrapper">
-      <a-form layout="inline">
+      <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
         <a-row :gutter="48">
           <a-col :span="6">
             <a-form-item label="企业名称">
@@ -27,7 +27,7 @@
     </div>
     <a-divider />
     <div class="table-operator">
-      <a-button type="primary" icon="plus" @click="openModal">新</a-button>
+      <a-button type="primary" icon="plus" @click="openModal">新</a-button>
     </div>
     <s-table
       ref="table"