Merge branch 'dev' of http://1.116.113.26:8088/zhuliu/qiaobi into dev

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)
+    },
+}

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
 }

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)
     },
 
 

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
     }
   },
 

src/views/backStageManage/application/apply/components/apply.vue

@@ -18,7 +18,7 @@
                 v-loading="loading"
                 :data="tableData"
                 header-row-class-name="custom-table-header"
-                max-height="calc(100% - 0)"
+                height="calc(100% - 0)"
             >
             <el-table-column label="应用名称" align="" show-overflow-tooltip>
                 <template slot-scope="scope">

src/views/backStageManage/application/apply/index copy.vue

@@ -79,7 +79,7 @@
           </el-form-item>
          
         </el-form>
-          <el-table :data="ruleForm.tenantVOList" header-row-class-name="custom-table-header"  max-height="250" border>
+          <el-table :data="ruleForm.tenantVOList" header-row-class-name="custom-table-header"  height="250" border>
             <!-- <el-table-column type="index" label="#" width="55" align="center"></el-table-column> -->
             <el-table-column prop="name" label="租户名称" align="center" show-overflow-tooltip></el-table-column>
             <el-table-column prop="contacts" label="联系人" align="center" show-overflow-tooltip></el-table-column>

src/views/backStageManage/application/function/index copy.vue

@@ -79,7 +79,7 @@
           </el-form-item>
          
         </el-form>
-          <el-table :data="ruleForm.tenantVOList" header-row-class-name="custom-table-header"  max-height="250" border>
+          <el-table :data="ruleForm.tenantVOList" header-row-class-name="custom-table-header"  height="250" border>
             <!-- <el-table-column type="index" label="#" width="55" align="center"></el-table-column> -->
             <el-table-column prop="name" label="租户名称" align="center" show-overflow-tooltip></el-table-column>
             <el-table-column prop="contacts" label="联系人" align="center" show-overflow-tooltip></el-table-column>

src/views/backStageManage/application/vipType/vipType.vue

@@ -30,7 +30,7 @@
           border
           row-key="id"
           style="width: 100%"
-          max-height="calc(100% - 40px)"
+          height="calc(100% - 0px)"
           v-loading="loading"
       >
           <el-table-column type="index" label="序号" align="center" width="120px">

src/views/backStageManage/application/vision/vision.vue

@@ -35,7 +35,7 @@
             :data="tableData"
             row-key="id"
             style="width: 100%"
-            max-height="calc(100% - 0)"
+            height="calc(100% - 0)"
             v-loading="loading"
             @sort-change="sortChange"
         >

src/views/backStageManage/examine/examine/components/examine.vue

@@ -22,7 +22,7 @@
                 :data="tableData"
                 row-key="id"
                 style="width: 100%"
-                max-height="calc(100% - 0)"
+                height="calc(100% - 0)"
                 v-loading="loading"
                 @sort-change="sortChange"
                 @selection-change="handleSelectionChange"

src/views/backStageManage/examine/examine/components/view/table.vue

@@ -6,7 +6,7 @@
         :data="tableData"
         row-key="id"
         style="width: 100%"
-        max-height="calc(100% - 0)"
+        height="calc(100% - 0)"
         v-loading="loading"
         @sort-change="sortChange"
         @selection-change="handleSelectionChange"

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>

src/views/backStageManage/organization/department/components/department.vue

@@ -26,7 +26,7 @@
               :data="tableData"
               row-key="id"
               style="width: 100%"
-              max-height="calc(100% - 0)"
+              height="calc(100% - 0)"
               v-loading="loading"
           >
               <el-table-column prop="name" label="部门名称" align="" show-overflow-tooltip></el-table-column>

src/views/backStageManage/organization/position/components/position.vue

@@ -26,7 +26,7 @@
               :data="tableData"
               row-key="id"
               style="width: 100%"
-              max-height="calc(100% - 0)"
+              height="calc(100% - 0)"
               v-loading="loading"
           >
             <el-table-column prop="position" label="职位名称"></el-table-column>

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">
@@ -94,11 +93,12 @@ const currentForm = {
     remark:null
 }
 import vipTypeTable from '../table/vipType.vue'
+import commonData from '../mixins/commonData';
 export default {
     components: {
         vipTypeTable
     },
-    mixins:[],
+    mixins:[commonData],
     props: {
         id:"",
         model:{
@@ -132,7 +132,7 @@ export default {
 						},
 					],
             },
-            tableData:[]
+            tableData:[],
         };
     },
     watch: {
@@ -140,6 +140,10 @@ export default {
             if(this.$route.path != '/administrator/editPaymentCode'){
                 return
             }
+            if(this.form.id == this.id){
+                return
+            }
+            
             this.init()
         },
     },
@@ -163,7 +167,7 @@ export default {
             }
         },
         //查询数据并校验
-        getById(){
+        async getById(){
             if(!this.id){
                 this.$message.error('编辑缺少参数')
                 return
@@ -171,7 +175,7 @@ export default {
             var params = {
                 ids: [this.id],
             };
-            this.$api.getPaymentCode(params).then(response=>{
+            await this.$api.getPaymentCode(params).then(response=>{
                 if(response.code == 200){
                     var data = response.data.records
                     if(data && data.length>0){
@@ -209,7 +213,7 @@ export default {
                         if (response.code === 200) {
                             this.btnLoading = false
                             this.$message.success( a + '成功');
-                            this.finish()
+                            this.finish(response.data)
                         }
                     })
                     .catch(error => {
@@ -219,10 +223,16 @@ export default {
                 }
             });
         },
-        finish(){
+        finish(data){
             if(this.model == 'add'){
-                this.resetForm();
-                this.init()
+                this.$alert('付费码：'+data, '添加成功', {
+                    confirmButtonText: '确定',
+                    callback: action => {
+                        this.resetForm();
+                        this.init()
+                    }
+                });
+                
             }else{
                 this.$store.commit('removeHistoryPath',this.$route.path);
                 this.$store.commit('removeHistory',this.$route.path);
@@ -244,12 +254,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 +275,12 @@ export default {
                         })
                         if(obj){
                             this.$set(item,'vipTypeNum',obj.vipTypeNum || 0)
+                        }else{
+                            this.$set(item,'vipTypeNum', 0)
                         }
                     }
                     this.tableData = data
+                    
                 }
             })
         },
@@ -271,7 +290,7 @@ export default {
 <style lang="scss">
 .form_center {
     width: 800px;
-    margin: 30px auto;
+    margin: -40px auto;
 }
 
 .button-container {

src/views/backStageManage/paymentCode/paymentCode/components/mixins/commonData.js

@@ -9,4 +9,20 @@ export default{
             },
         }
     },
+    computed: {
+        tenantType(){
+            return this.$store.state.admin.tenantType
+        }
+    },
+    methods: {
+        getTenantName(tenantType){
+            var obj = this.tenantType.find(item=>{
+                return item.dictChildValue == tenantType
+            })
+            if(obj){
+                return obj.dictChildLabel
+            }
+            return ''
+        }
+    },
 }

src/views/backStageManage/paymentCode/paymentCode/components/paymentCode.vue

@@ -28,7 +28,7 @@
             border
             row-key="id"
             style="width: 100%"
-            max-height="calc(100% - 40px)"
+            height="calc(100% - 0px)"
             v-loading="loading"
         >
             <el-table-column type="index" label="序号" align="center" width="120px">
@@ -58,7 +58,7 @@
               <template slot-scope="scope">
                 <div>
                   <div v-if="scope.row.tenantName">企业名称：{{ scope.row.tenantName }}</div>
-                  <div v-if="scope.row.tenantType">企业类型：{{ scope.row.tenantType }}</div>
+                  <div v-if="scope.row.tenantType == 0 || scope.row.tenantType">企业类型：{{ getTenantName(scope.row.tenantType) }}</div>
                   <div v-if="scope.row.tenantAddress">企业地址: {{ scope.row.tenantAddress }}</div>
                 </div>
               </template>
@@ -95,7 +95,7 @@
                   type="text"
                   icon="iconfont icon-tuikuan"
                   @click="refund(scope.row)"
-                >退款</el-button>
+                >  退款</el-button>
               </template>
             </el-table-column>
         </el-table>

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>

src/views/backStageManage/paymentCode/paymentCode/editPaymentCode.vue

@@ -17,10 +17,7 @@ export default {
     watch: {},
     computed: {
         id() {
-            if(this.$route.path == '/administrator/editVersion'){
-                return this.$route.query.id;
-            }
-            
+            return this.$route.query.id; 
         },
     },
     created() {},