瀏覽代碼

租户修改

1004749546@qq.com 4 年之前
父節點
當前提交
ed9f2ed475

+ 44 - 3
src/api/tenants.js

@@ -15,9 +15,17 @@ export const getTenantsList = params => {
 // 删除
 export const tenantsDelete = params => {
   return axios({
-    url: '/atcompany/delete/${params.id}',
-    data: params,
-    method: 'POST'
+    url: `/atcompany/delete/${params.id}`,
+    data: {},
+    method: 'get'
+  })
+}
+// 查详情
+export const tenantsDetail = params => {
+  return axios({
+    url: `/atcompany/findById/${params.id}`,
+    data: {},
+    method: 'get'
   })
 }
 
@@ -29,3 +37,36 @@ export const tenantsSave = params => {
     method: 'POST'
   })
 }
+// 查询省
+export const getProvince = () => {
+  return axios({
+    url: `/area/PROVINCE`,
+    headers: {
+      'USER-TERM-TYPE': 'pc',
+      'App-Type': 2
+    },
+    method: 'get'
+  })
+}
+// 查询市
+export const getCityByPro = params => {
+  return axios({
+    url: `/area/CITY/${params.id}`,
+    headers: {
+      'USER-TERM-TYPE': 'pc',
+      'App-Type': 2
+    },
+    method: 'get'
+  })
+}
+// 查询区
+export const getDistrictByCity = params => {
+  return axios({
+    url: `/area/DISTRICT/${params.id}`,
+    headers: {
+      'USER-TERM-TYPE': 'pc',
+      'App-Type': 2
+    },
+    method: 'get'
+  })
+}

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

@@ -16,7 +16,7 @@
                 allowClear
                 placeholder="状态"
                 v-model="queryParam.status"
-                code="CHECK_ENABLE_STATE"></v-select>
+                code="ENABLE_FLAG"></v-select>
             </a-form-item>
           </a-col>
           <a-col :span="6">

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

@@ -24,9 +24,9 @@
           <a-col :span="20">
             <!-- 适用模式 -->
             <a-form-item label="适用模式:" :label-col="{ span: 6 }" :wrapper-col="{ span: 18 }">
-              <!-- <v-select
+              <v-select
                 ref="orgType"
-				id="addEvaModal-scopeType"
+                id="addEvaModal-scopeType"
                 allowClear
                 mode="multiple"
                 @change="scopeTypeChange"
@@ -35,22 +35,7 @@
                   { initialValue: formData.scopeType,
                     rules: [{ required: true, message: '请选择适用模式!' }] },
                 ]"
-                code="STORE_AUTH_TYPE"></v-select> -->
-              <a-select
-                mode="multiple"
-                allowClear
-                id="addEvaModal-scopeType"
-                placeholder="请选择适用模式"
-                @change="scopeTypeChange"
-                v-decorator="[
-                  'formData.scopeType',
-                  { initialValue: formData.scopeType,
-                    rules: [{ required: true, message: '请选择适用模式!' }] },
-                ]">
-                <a-select-option v-for="item in options" :key="item.code" :value="item.code">
-                  {{ item.dispName }}
-                </a-select-option>
-              </a-select>
+                code="TASK_TYPE"></v-select>
             </a-form-item>
           </a-col>
         </a-row>

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

@@ -16,7 +16,7 @@
                 allowClear
                 placeholder="状态"
                 v-model="queryParam.status"
-                code="CHECK_ENABLE_STATE"></v-select>
+                code="ENABLE_FLAG"></v-select>
             </a-form-item>
           </a-col>
           <a-col :span="6">

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

@@ -15,7 +15,7 @@
           </a-col>
           <a-col :span="6">
             <a-form-item label="启用状态">
-              <v-select ref="status" allowClear placeholder="状态" v-model="queryParam.status" code="CHECK_ENABLE_STATE"></v-select>
+              <v-select ref="status" allowClear placeholder="状态" v-model="queryParam.status" code="ENABLE_FLAG"></v-select>
             </a-form-item>
           </a-col>
           <a-col :span="6">
@@ -47,7 +47,7 @@
       </template>
     </s-table>
     <!-- 新增/编辑 弹窗 -->
-    <tenantsModal :itemId="itemId" :visible="openTenantsModal" @refresh="$refs.table.refresh()" @close="openTenantsModal=false"></tenantsModal>
+    <tenantsModal :itemId="itemId" :visible="openTenantsModal" @refresh="reset()" @close="openTenantsModal=false"></tenantsModal>
   </a-card>
 
 </template>

+ 164 - 36
src/views/tenants/tenantsModal.vue

@@ -8,7 +8,7 @@
             <a-form-item label="企业名称:" :label-col="{ span: 6 }" :wrapper-col="{ span: 18 }">
               <a-input
                 allowClear
-                :maxLength="32"
+                :maxLength="30"
                 v-decorator="[
                   'formData.name',
                   { initialValue: formData.name,
@@ -22,10 +22,10 @@
             <a-form-item label="企业编码:" :label-col="{ span: 6 }" :wrapper-col="{ span: 18 }">
               <a-input
                 allowClear
-                :maxLength="32"
+                :maxLength="30"
                 v-decorator="[
-                  'formData.mark',
-                  { initialValue: formData.mark, },
+                  'formData.code',
+                  { initialValue: formData.code, },
                 ]"
                 placeholder="请输入企业编码" />
             </a-form-item>
@@ -37,10 +37,10 @@
             <a-form-item label="负责人名称:" :label-col="{ span: 6 }" :wrapper-col="{ span: 18 }">
               <a-input
                 allowClear
-                :maxLength="32"
+                :maxLength="30"
                 v-decorator="[
-                  'formData.userName',
-                  { initialValue: formData.userName,
+                  'formData.contactName',
+                  { initialValue: formData.contactName,
                     rules: [] },
                 ]"
                 placeholder="请输入负责人名称" />
@@ -53,8 +53,8 @@
                 allowClear
                 :maxLength="11"
                 v-decorator="[
-                  'formData.phone',
-                  { initialValue: formData.phone,
+                  'formData.contactPhone',
+                  { initialValue: formData.contactPhone,
                     rules: [{ required: true,
                               message:'请输入负责人手机号!'
                             },
@@ -123,34 +123,63 @@
           </a-col>
         </a-row>
         <a-row :gutter="24">
-          <a-col :span="12">
-            <!-- 地址 -->
-            <a-form-item label="地址:" :label-col="{ span: 6 }" :wrapper-col="{ span: 18 }">
-              <a-cascader
-                allowClear
-                :options="addressData"
-                placeholder="请选择省市区"
+          <!-- 地址 -->
+          <a-col span="9">
+            <a-form-item label="地址:" :label-col="{ span: 8 }" :wrapper-col="{ span: 16 }">
+              <a-select
+                @change="getCityList"
                 v-decorator="[
-                  'formData.address',
-                  { initialValue: formData.address,
+                  'formData.addrProvince',
+                  { initialValue: formData.addrProvince,
                     rules: [] },
                 ]"
-              />
+                placeholder="请选择省">
+                <a-select-option v-for="item in addrProvinceList" :value="item.id" :key="item.id+'a'">{{ item.name }}</a-select-option>
+              </a-select>
             </a-form-item>
           </a-col>
-          <a-col :span="12">
+          <a-col span="7">
+            <a-form-item prop="addrCity">
+              <a-select
+                v-decorator="[
+                  'formData.addrCity',
+                  { initialValue: formData.addrCity,
+                    rules: [] },
+                ]"
+                @change="getAreaList"
+                placeholder="请选择市">
+                <a-select-option v-for="item in addrCityList" :value="item.id" :key="item.id+'b'">{{ item.name }}</a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col span="7">
+            <a-form-item prop="addrDistrict">
+              <a-select
+                v-decorator="[
+                  'formData.addrDistrict',
+                  { initialValue: formData.addrDistrict,
+                    rules: [] },
+                ]"
+                @change="areaCharged"
+                placeholder="请选择区/县">
+                <a-select-option v-for="item in addrDistrictList" :value="item.id" :key="item.id+'c'">{{ item.name }}</a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+        </a-row >
+        <a-row :gutter="24">
+          <a-col :span="17">
             <!-- 详细地址 -->
-            <a-form-item>
+            <a-form-item label="详细地址" :label-col="{ span: 4 }" :wrapper-col="{ span: 18 }">
               <a-input
-                :maxLength="32"
+                :maxLength="30"
                 allowClear
                 placeholder="请输入详细地址"
                 v-decorator="[
-                  'formData.addressDetail',
-                  { initialValue: formData.addressDetail,
+                  'formData.addrDetail',
+                  { initialValue: formData.addrDetail,
                     rules: [] },
-                ]"
-              />
+                ]" />
             </a-form-item>
           </a-col>
         </a-row>
@@ -174,6 +203,10 @@ import {
   VSelect
 } from '@/components'
 import {
+  getProvince,
+  getCityByPro,
+  getDistrictByCity,
+  tenantsDetail,
   tenantsSave
 } from '@/api/tenants.js'
 import moment from 'moment'
@@ -200,8 +233,10 @@ export default {
     },
     isshow (newValue, oldValue) {
       if (newValue) {
-        const now = moment().add(7, 'day').format('YYYY-MM-DD')
-        const expireDate = moment(now, 'YYYY-MM-DD')
+		  if (this.itemId) {
+			  this.getDetail(this.itemId)
+		  }
+
         // this.formData.expireDate = this.itemData.expireDate ? moment(this.itemData.expireDate, 'YYYY-MM-DD') : expireDate
         // // this.form.setFields({ 'formData.expireDate': { value: this.formData.expireDate, errors: '' } })
       } else {
@@ -216,17 +251,21 @@ export default {
       form: this.$form.createForm(this, {
         name: 'tenantsModal'
       }),
-      addressData: null, // 省市区
+      addrProvinceList: [], // 省列表
+      addrCityList: [], // 市列表
+      addrDistrictList: [], // 区列表
       formData: {
         name: '', // 企业名称
-        mark: '', // 企业编码
-        userName: '', // 负责人名称
-        phone: '', // 负责人电话
+        code: '', // 企业编码
+        contactName: '', // 负责人名称
+        contactPhone: '', // 负责人电话
         expireDate: null, // 使用有效期
         scopeType: '', // 权限类型
         status: 1, // 启用状态
-        address: [], // 省市区
-        addressDetail: '' // 详细地址
+        addrProvince: undefined,
+        addrCity: undefined,
+        addrDistrict: undefined,
+        addrDetail: '' // 详细地址
       }
 
     }
@@ -236,11 +275,99 @@ export default {
       return this.itemId ? '编辑' : '新增'
     }
   },
+  mounted () {
+  	this.getProvinceList()
+  },
   methods: {
     cancel (e) {
       this.clear()
       this.$emit('close')
     },
+    pageInit () {
+      this.formData = {
+        name: '', // 企业名称
+        code: '', // 企业编码
+        contactName: '', // 负责人名称
+        contactPhone: '', // 负责人电话
+        expireDate: null, // 使用有效期
+        scopeType: '', // 权限类型
+        status: 1, // 启用状态
+        addrProvince: undefined,
+        addrCity: undefined,
+        addrDistrict: undefined,
+        addrDetail: '' // 详细地址
+      }
+    },
+    // 查详情
+    getDetail (id) {
+      tenantsDetail({ id: id }).then(res => {
+		  console.log(res, 'rrrrrrr')
+        if (res.status == 200) {
+          this.formData = Object.assign(this.formData, res.data)
+		  const now = moment().add(7, 'day').format('YYYY-MM-DD')
+		  const expireDate = moment(now, 'YYYY-MM-DD')
+		  this.formData.expireDate = this.formData.expireDate ? moment(this.formData.expireDate, 'YYYY-MM-DD') : expireDate
+		  this.form.setFields({ 'formData.expireDate': { value: this.formData.expireDate, errors: '' } })
+		  this.formData.status = Number(this.formData.status)
+		  console.log(this.formData, 'this.formData')
+        } else {
+          // this.pageInit()
+        }
+      })
+    },
+    // 获取省列表'
+    getProvinceList () {
+      getProvince().then(res => {
+		  console.log(res, 'rrrrrrr')
+        if (res.status == 200) {
+          this.addrProvinceList = res.data || []
+        } else {
+          this.addrProvinceList = []
+        }
+      })
+    },
+    // 获取城市列表
+    getCityList (val) {
+      this.addrCityList = []
+      this.addrDistrictList = []
+	  this.form.setFields({ 'formData.addrCity': { value: undefined, errors: '' } })
+	  this.form.setFields({ 'formData.addrDistrict': { value: undefined, errors: '' } })
+	  this.form.setFields({ 'formData.addrDetail': { value: undefined, errors: '' } })
+	  this.getCityListRequest(val)
+    },
+    getCityListRequest (val) {
+      getCityByPro({
+        id: val
+      }).then(res => {
+        if (res.status == 200) {
+          this.addrCityList = res.data || []
+        } else {
+          this.addrCityList = []
+        }
+      })
+    },
+    // 获取区县列表
+    getAreaList (val) {
+      this.addrDistrictList = []
+	  this.form.setFields({ 'formData.addrDistrict': { value: undefined, errors: '' } })
+	  this.form.setFields({ 'formData.addrDetail': { value: undefined, errors: '' } })
+	  this.getAreaListRequest(val)
+    },
+    getAreaListRequest (val) {
+      getDistrictByCity({
+        id: val
+      }).then(res => {
+        if (res.status == 200) {
+          this.addrDistrictList = res.data || []
+        } else {
+          this.addrDistrictList = []
+        }
+      })
+    },
+    // 区县变更
+    areaCharged (val) {
+      this.form.setFields({ 'formData.addrDetail': { value: undefined, errors: '' } })
+    },
     // 有效期改变
     expireDateChange (v) {
       console.log(v)
@@ -253,12 +380,12 @@ export default {
     },
     // 使用权限改变
     scopeTypeChange (v) {
-      this.formData.scopeType = v
+      this.form.setFields({ 'formData.scopeType': { value: v, errors: '' } })
     },
     // 启用状态切换
     onStatusChange (v) {
       console.log(v, 'vvvvvvvvvv')
-	  this.formData.status = v
+      this.formData.status = v
     },
     // 快捷时间处理
     timeFilter (time) {
@@ -313,6 +440,7 @@ export default {
     },
     clear () {
       this.form.resetFields()
+	  this.pageInit()
     }
 
   },