zhuliu 9 ماه پیش
والد
کامیت
ba11ebfa0f

+ 12 - 0
src/api/common.js

@@ -0,0 +1,12 @@
+import axios from '@/utils/axios'
+
+export default {
+    /**
+     * 根据类型查询字典
+     * @param {*} data 
+     * @returns 
+     */
+    getSysDictByType(data){
+        return axios.post('/permission/api/system/getSysDict',data)
+    },
+}

+ 3 - 1
src/api/index.js

@@ -10,6 +10,7 @@ import paymentCode from "./paymentCode";
 import department from "./department";
 import position from "./position";
 import admin from "./admin"
+import common from "./common"
 
 
 export default {
@@ -23,5 +24,6 @@ export default {
   ...paymentCode,
   ...department,
   ...position,
-  ...admin
+  ...admin,
+  ...common
 }

+ 1 - 1
src/api/paymentCode.js

@@ -7,7 +7,7 @@ export default {
      * @returns 
      */
     getPaymentCode(data){
-        return axios.post('/permission/api/vipType/queryList',data)
+        return axios.post('/permission/api/paidCode/queryList',data)
     },
 
 

+ 5 - 1
src/store/modules/admin.js

@@ -2,7 +2,8 @@ export default {
   state: {
     userinfo: {},
     permission:"",
-    dictionaries:''
+    dictionaries:'',
+    tenantType:[]
   },
 
   mutations: {
@@ -14,6 +15,9 @@ export default {
     },
     SET_ADMIN_DICTIONARIES(state,dictionaries){
       state.dictionaries = dictionaries
+    },
+    SET_TENANT_TYPE(state,tenantType){
+      state.tenantType = tenantType
     }
   },
 

+ 9 - 0
src/views/backStageManage/layout/Layout.vue

@@ -45,6 +45,7 @@ export default {
   },
   created(){
     this.getUserinfo()
+    this.getDict()
   },
   methods:{
     getUserinfo(){
@@ -53,6 +54,14 @@ export default {
         this.$store.commit('SET_ADMIN_USERINFO', response.data)
       })
     },
+    getDict() {
+      var params = {
+        type:'TENANT_TYPE'
+      }
+      this.$api.getSysDictByType(params).then(response => {
+        this.$store.commit('SET_TENANT_TYPE', response.data.TENANT_TYPE)
+      })
+    },
   }
 }
 </script>

+ 20 - 8
src/views/backStageManage/paymentCode/paymentCode/components/form/paymentCode.vue

@@ -18,10 +18,9 @@
 					</el-col>
                     <el-col :span="12">
 						<el-form-item label="类型:" prop="tenantType">
-							<el-input
-								v-model="form.tenantType"
-								placeholder="请输入企业类型"
-							></el-input>
+                            <el-select v-model="form.tenantType" placeholder="请选择企业类型">
+                                <el-option v-for="item in tenantType" :key="item.dictChildValue" :label="item.dictChildLabel" :value="Number(item.dictChildValue)"></el-option>
+                            </el-select>
 						</el-form-item>
 					</el-col>
                     <el-col :span="24">
@@ -143,7 +142,11 @@ export default {
             this.init()
         },
     },
-    computed: {},
+    computed: {
+        tenantType(){
+            return this.$store.state.admin.tenantType
+        }
+    },
     created() {},
     mounted() {
        this.init()
@@ -244,12 +247,18 @@ export default {
                         return
                     }
                     if(this.model == 'add'){
-                        this.tableData = data
+                        this.tableData = data.map(item=>{
+                            item.vipTypeNum = 0
+                            return item
+                        })
                         return
                     }
                     var vipTypes = this.form.vipTypes
                     if(!vipTypes || vipTypes.length == 0){
-                        this.tableData = data
+                        this.tableData = data.map(item=>{
+                            item.vipTypeNum = 0
+                            return item
+                        })
                         return
                     }
                     for(var i = 0;i<data.length;i++){
@@ -259,9 +268,12 @@ export default {
                         })
                         if(obj){
                             this.$set(item,'vipTypeNum',obj.vipTypeNum || 0)
+                        }else{
+                            this.$set(item,'vipTypeNum', 0)
                         }
                     }
                     this.tableData = data
+                    
                 }
             })
         },
@@ -271,7 +283,7 @@ export default {
 <style lang="scss">
 .form_center {
     width: 800px;
-    margin: 30px auto;
+    margin: -40px auto;
 }
 
 .button-container {

+ 8 - 3
src/views/backStageManage/paymentCode/paymentCode/components/table/vipType.vue

@@ -1,14 +1,19 @@
 <template>
   <div class="height_100">
-    <el-table border :data="tableData" style="width: 100%" height="calc(100% - 30px)">
-        <el-table-column v-if="canChoose" type="index" align="center" width="50px">
+    <el-table border :data="tableData" style="width: 100%" height="calc(100% - 0px)">
+        <el-table-column type="index" align="center" width="50px">
             <template slot-scope="scope">
                 <div>{{ scope.$index +1 }}</div>
             </template>
         </el-table-column>
         <el-table-column prop="vipTypeName" label="会员类型名称" align="center" show-overflow-tooltip></el-table-column>
         <el-table-column prop="vipTypeNum" label="会员类型数量" align="center">
-            <el-input-number v-model="scope.row.vipTypeNum" controls-position="right" :min="0"></el-input-number>
+          <template slot-scope="scope">
+            <div>
+              <el-input-number v-model="scope.row.vipTypeNum" size="small" controls-position="right" :min="0"></el-input-number>
+            </div>
+          </template>
+            
         </el-table-column>
     </el-table>
   </div>