Przeglądaj źródła

Signed-off-by: 1004749546@qq.com <1004749546@qq.com>
修改

1004749546@qq.com 4 lat temu
rodzic
commit
dc7b8cc7b2

+ 8 - 8
src/api/tenants.js

@@ -1,8 +1,8 @@
 import { axios } from '@/utils/request'
 
-// 获取列表数据
+// 获取列表数据  atcompany/query/{pageNo}/{pageSize}
 export const getTenantsList = params => {
-  const url = `/org/apply/queryLike/${params.pageNo}/${params.pageSize}`
+  const url = `/atcompany/query/${params.pageNo}/${params.pageSize}`
   delete params.pageNo
   delete params.pageSize
   return axios({
@@ -12,19 +12,19 @@ export const getTenantsList = params => {
   })
 }
 
-// 启用禁用
-export const enable = params => {
+// 删除
+export const tenantsDelete = params => {
   return axios({
-    url: '/org/apply/enable',
+    url: '/atcompany/delete/${params.id}',
     data: params,
     method: 'POST'
   })
 }
 
-// 授权
-export const saveAuth = params => {
+// 保存
+export const tenantsSave = params => {
   return axios({
-    url: '/org/apply/auth',
+    url: '/atcompany/save',
     data: params,
     method: 'POST'
   })

+ 1 - 1
src/permission.js

@@ -10,7 +10,7 @@ import { ACCESS_TOKEN } from '@/store/mutation-types'
 
 NProgress.configure({ showSpinner: false }) // NProgress Configuration
 
-const whiteList = ['login', 'register', 'registerResult', 'EvaluationPlan', 'EvaluationItem'] // no redirect whitelist
+const whiteList = ['login', 'register', 'registerResult', 'EvaluationPlan', 'EvaluationItem', 'tenantsList'] // no redirect whitelist
 const defaultRoutePath = '/home'
 
 router.beforeEach((to, from, next) => {

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

@@ -140,7 +140,7 @@ export default {
   },
   beforeRouteEnter (to, from, next) {
     next(vm => {
-      vm.$refs.table.refresh()
+      vm.reset()
     })
   },
   methods: {

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

@@ -124,7 +124,7 @@ export default {
       const _this = this
       this.$confirm({
         title: '警告',
-        content: '删除后无法恢复,确认删除?',
+        content: '删除后原数据不可恢复,是否删除?',
         okText: '确定',
         cancelText: '取消',
         onOk () {

+ 52 - 25
src/views/evaluation/evaluationPlan/EvaluationPlan.vue

@@ -43,7 +43,7 @@
       </template>
       <!-- 启用禁用 -->
       <template slot="enable" slot-scope="text, row">
-        <a-switch checkedChildren="启用" unCheckedChildren="禁用" v-model="row.status" @change="changeFlagHandle(row)"/>
+        <a-switch checkedChildren="启用" unCheckedChildren="禁用" v-model="row.status" @change="changeFlagHandle(row)" />
       </template>
     </s-table>
     <!-- 新增/编辑 弹窗 -->
@@ -51,7 +51,7 @@
     <!-- 选择考评项弹窗 -->
     <set-evaModal :itemId="itemId" :itemName="itemName" :visible="openSetting" @close="openSetting=false"></set-evaModal>
     <!-- 设置默认方案弹窗 -->
-    <set-evaDefaultModal :itemId="itemId" :visible="openDefaultSetting" @close="openDefaultSetting=false"></set-evaDefaultModal>
+    <set-evaDefaultModal :itemId="itemId" :defaultPlanList="defaultPlanList" :visible="openDefaultSetting" @refresh="getDefaultPlan" @close="openDefaultSetting=false"></set-evaDefaultModal>
   </a-card>
 
 </template>
@@ -64,12 +64,12 @@ import {
 import {
   planQueryByPage,
   planEnable,
+  planDefaultQuery,
   planDelete
 } from '@/api/evaluationPlan.js'
 import addEvaModal from './AddEvaModal.vue'
 import setEvaModal from './SetEvaModal.vue'
 import setEvaDefaultModal from './SetEvaDefaultModal.vue'
-import moment from 'moment'
 export default {
   name: 'EvaluationPlanList',
   components: {
@@ -81,14 +81,14 @@ export default {
   },
   data () {
     return {
-      moment,
       pageNo: 1,
       pageSize: 10,
       openAddModal: false, // 打开新增弹窗
-	  openSetting: false, // 打开选择考评项弹窗
-	  openDefaultSetting: false, // 打开设置默认方案弹窗
+      openSetting: false, // 打开选择考评项弹窗
+      openDefaultSetting: false, // 打开设置默认方案弹窗
       itemId: '', // 要编辑的方案id
-	  itemName: '', // 方案名称
+      itemName: '', // 方案名称
+      defaultPlanList: [], // 默认方案列表
       // 查询参数
       queryParam: {
         name: '',
@@ -154,10 +154,22 @@ export default {
   },
   beforeRouteEnter (to, from, next) {
     next(vm => {
-      vm.$refs.table.refresh()
+      vm.reset()
+      vm.getDefaultPlan()
     })
   },
   methods: {
+    // 默认方案查询
+    getDefaultPlan () {
+      planDefaultQuery().then(res => {
+        // console.log(res, 'rrrrrrrr')
+        if (res.status == 200) {
+          this.defaultPlanList = res.data
+        } else {
+          this.defaultPlanList = []
+        }
+      })
+    },
     // 修改状态
     changeFlagHandle (record) {
       const _data = {
@@ -186,29 +198,38 @@ export default {
     // 删除
     delect (row) {
       const _this = this
-      this.$confirm({
-        title: '警告',
-        content: '删除考评方案后其关联的考评项目将被同步解除关联,确认删除吗?',
-        okText: '确定',
-        cancelText: '取消',
-        onOk () {
-          planDelete({
-          	id: row.id
-          }).then(res => {
-          	if (res.status == 200) {
-          		_this.$message.success(res.message)
-          		_this.$refs.table.refresh()
-          	}
-          })
-        }
-      })
+      // 判断当前方案是否为默认方案
+      const has = this.defaultPlanList.find(item => item.assessId == row.id)
+      if (has) {
+        this.$warning({
+          title: '警告',
+          content: '该考评方案为当前默认考评方案,不能删除,请取消该方案的默认后再进行删除!'
+        })
+      } else {
+        this.$confirm({
+          title: '警告',
+          content: '删除后原数据不可恢复,是否删除?',
+          okText: '确定',
+          cancelText: '取消',
+          onOk () {
+            planDelete({
+              id: row.id
+            }).then(res => {
+              if (res.status == 200) {
+                _this.$message.success(res.message)
+                _this.$refs.table.refresh()
+              }
+            })
+          }
+        })
+      }
     },
     // 打开设置弹框
     handleSet (row) {
       this.itemId = row.id
       this.itemName = row.name
       this.openSetting = true
-	  console.log(this.openSetting)
+      console.log(this.openSetting)
     },
     // 重置
     reset () {
@@ -230,24 +251,29 @@ export default {
 	.table-page-search-wrapper .ant-form-inline .ant-form-item {
 		margin-bottom: 10px;
 	}
+
 	.add-btn {
 		margin-bottom: 10px;
 	}
+
 	.actionBtn {
 		font-size: 20px;
 		padding: 0 10px;
 	}
+
 	.setting-icon {
 		font-size: 20px;
 		margin-right: 5px;
 		color: #1890FF;
 	}
+
 	.setting {
 		font-size: 16px;
 		color: #1890FF;
 		border-bottom: 1px solid #1890FF;
 		cursor: pointer;
 	}
+
 	.blue {
 		color: #1890FF;
 	}
@@ -259,6 +285,7 @@ export default {
 	.red {
 		color: red;
 	}
+
 	.orange {
 		color: #ffaa00;
 	}

+ 28 - 29
src/views/evaluation/evaluationPlan/SetEvaDefaultModal.vue

@@ -7,13 +7,14 @@
             <!-- 视频巡店默认方案 -->
             <a-form-item label="视频巡店默认方案:" :label-col="{ span: 6 }" :wrapper-col="{ span: 16 }">
               <a-select
-                placeholder="请选择考评方案方案(单选)"
                 @change="videoTypeChange"
                 v-decorator="[
                   'formData.videoType',
                   { initialValue: formData.videoType,
-                    rules: [{ required: true, message: '请选择考评方案方案(单选)!' }] },
-                ]">
+                    rules: [{ required: true, message: '请选择考评方案(单选)!' }] },
+                ]"
+                placeholder="请选择考评方案(单选)"
+              >
                 <a-select-option v-for="item in planList" :key="item.id" :value="item.id">
                   {{ item.name }}
                 </a-select-option>
@@ -26,12 +27,12 @@
             <!-- 现场巡店默认方案 -->
             <a-form-item label="现场巡店默认方案:" :label-col="{ span: 6 }" :wrapper-col="{ span: 16 }">
               <a-select
-                placeholder="请选择考评方案方案(单选)"
+                placeholder="请选择考评方案(单选)"
                 @change="spotTypeChange"
                 v-decorator="[
                   'formData.spotType',
                   { initialValue: formData.spotType,
-                    rules: [{ required: true, message: '请选择考评方案方案(单选)!' }] },
+                    rules: [{ required: true, message: '请选择考评方案(单选)!' }] },
                 ]">
                 <a-select-option v-for="item in planList" :key="item.id" :value="item.id">
                   {{ item.name }}
@@ -66,7 +67,6 @@ import {
 } from '@/components'
 import {
   planQuery,
-  planDefaultQuery,
   planDefaultSave
 } from '@/api/evaluationPlan.js'
 export default {
@@ -84,6 +84,13 @@ export default {
     itemId: {
       type: [String, Number],
       default: ''
+    },
+    // 默认方案
+    defaultPlanList: {
+      type: Array,
+      default: function () {
+        return []
+      }
     }
   },
   watch: {
@@ -93,8 +100,8 @@ export default {
     isshow (newValue, oldValue) {
       if (newValue) {
         this.form.resetFields()
-        // 默认方案查询
-        this.getDefaultPlan()
+        // 默认方案回显
+        this.pageInit()
       } else {
         this.cancel()
       }
@@ -106,9 +113,10 @@ export default {
       form: this.$form.createForm(this, {
         name: 'AddEvaModal'
       }),
+	  // 默认值设为undefined, 解决placeholder不生效问题
       formData: {
-        videoType: '', // 视频巡店默认方案
-        spotType: '' // 现场巡店默认方案
+        videoType: undefined, // 视频巡店默认方案
+        spotType: undefined // 现场巡店默认方案
       },
       planList: [] // 考评方案列表
     }
@@ -119,9 +127,16 @@ export default {
     this.getPlanList()
   },
   methods: {
+    pageInit () {
+      if (this.defaultPlanList.length) {
+        this.formData.videoType = this.defaultPlanList.find(item => item.scopeType == 'VIDEO_INSPECTION').assessId
+        this.formData.spotType = this.defaultPlanList.find(item => item.scopeType == 'SPOT_INSPECTION').assessId
+      }
+    },
     // 点击弹框x号触发事件
     cancel (e) {
-      this.clear()
+      this.formData.videoType = undefined
+      this.formData.spotType = undefined
       this.$emit('close')
     },
     // 获取方案列表数据
@@ -134,19 +149,6 @@ export default {
         }
       })
     },
-    // 默认方案查询
-    getDefaultPlan () {
-      planDefaultQuery().then(res => {
-        // console.log(res, 'rrrrrrrr')
-        if (res.status == 200) {
-          this.formData.videoType = res.data.find(item => item.scopeType == 'VIDEO_INSPECTION').assessId
-          this.formData.spotType = res.data.find(item => item.scopeType == 'SPOT_INSPECTION').assessId
-        } else {
-          this.formData.videoType = ''
-          this.formData.spotType = ''
-        }
-      })
-    },
     // 视频巡店默认方案改变
     videoTypeChange (v) {
       this.formData.videoType = v
@@ -173,6 +175,8 @@ export default {
             console.log(res, 'res--save')
             if (res.status + '' === '200') {
               this.$message.success(res.message ? res.message : '保存成功')
+			  // 保存后更新默认方案
+			  this.$emit('refresh')
               setTimeout(function () {
                 _this.cancel()
               }, 300)
@@ -192,15 +196,10 @@ export default {
         okText: '确定',
         cancelText: '取消',
         onOk () {
-          _this.clear()
           _this.cancel()
         }
       })
-    },
-    clear () {
-      this.form.resetFields()
     }
-
   },
   beforeCreate () {
     this.form = this.$form.createForm(this, {

+ 16 - 47
src/views/tenants/tenantsList.vue

@@ -59,7 +59,7 @@ import {
 } from '@/components'
 import {
   getTenantsList,
-  enable
+  tenantsDelete
 } from '@/api/tenants.js'
 import tenantsModal from './tenantsModal.vue'
 import moment from 'moment'
@@ -92,7 +92,7 @@ export default {
       },
       {
         title: '创建时间',
-        dataIndex: 'applyTime',
+        dataIndex: 'createDate',
         width: '200',
         align: 'center'
       },
@@ -103,7 +103,7 @@ export default {
       },
       {
         title: '负责人名称',
-        dataIndex: 'orgType',
+        dataIndex: 'contactName',
         width: '120',
         align: 'center'
       },
@@ -140,6 +140,7 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         return getTenantsList(Object.assign(parameter, this.queryParam)).then(res => {
+          console.log(res, 'rrrrrrr')
           if (res.status == 200) {
             const no = (res.data.pageNo - 1) * res.data.pageSize
             for (let i = 0; i < res.data.list.length; i++) {
@@ -155,43 +156,11 @@ export default {
   },
   beforeRouteEnter (to, from, next) {
     next(vm => {
-      vm.$refs.table.refresh()
+      vm.reset()
     })
   },
   methods: {
-    // 地址拼接
-    getAddr (row) {
-      const provinceName = row.provinceName ? row.provinceName : ''
-      const cityName = row.cityName ? row.cityName : ''
-      const districtName = row.districtName ? row.districtName : ''
-      const addrDetail = row.addrDetail ? row.addrDetail : ''
-      if (provinceName === cityName) {
-        return cityName + districtName + addrDetail
-      }
-      return provinceName + cityName + districtName + addrDetail
-    },
-    // 修改状态
-    changeFlagHandle (text, record) {
-      const _data = {
-        id: record.id,
-        status: record.status ? '1' : '0'
-      }
-      if (!record.expireDate && _data.status == '1') {
-        this.$message.success('请确认授权设置无误并点击【确定】后,再进行启用!')
-        record.status = !record.status
-      } else {
-        enable(_data).then(res => {
-          console.log(res.status)
-          if (res.status == '200') {
-            this.$message.success('修改成功')
-            this.$refs.table.refresh()
-          } else {
-            record.status = !record.status
-          }
-        })
-      }
-    },
-    // 打开授权弹窗
+    // 打开新增/编辑 弹窗
     openModal (row) {
       this.itemId = row ? row.id : ''
       this.openTenantsModal = true
@@ -201,18 +170,18 @@ export default {
       const _this = this
       this.$confirm({
         title: '警告',
-        content: '删除后无法恢复,确认删除?',
+        content: '删除后原数据不可恢复,是否删除?',
         okText: '确定',
         cancelText: '取消',
         onOk () {
-          // deleteItem({
-          // 	id: row.id
-          // }).then(res => {
-          // 	if (res.status == 200) {
-          // 		_this.$message.success('删除成功')
-          // 		_this.$refs.table.refresh()
-          // 	}
-          // })
+          tenantsDelete({
+          	id: row.id
+          }).then(res => {
+          	if (res.status == 200) {
+          		_this.$message.success('res.message')
+          		_this.$refs.table.refresh()
+          	}
+          })
         }
       })
     },
@@ -223,7 +192,7 @@ export default {
         contactPhone: '',
         status: '' // 状态
       }
-      this.$refs.table.refresh()
+      this.$refs.table.refresh(true)
     }
   }
 }