1

src/App.vue

@@ -110,12 +110,13 @@ html, body, #app {
     padding: 0 !important;
   }
 }
-.custom-table-header > th {
+.custom-table-header > th ,.el-table__header>thead>tr>th{
   word-break: break-word;
-  background-color: #f8f8f9 !important;
+  background-color: #f9f8f8 !important;
   color: #515a6e;
   height: 40px;
   font-size: 13px;
+  text-align: center !important;
 }
 .el-header {
   padding: 13px 0 !important;

src/views/backStageManage/application/vision/components/form/versionForm.vue

@@ -16,7 +16,7 @@
 
                 <el-form-item label="版本状态：" prop="status">
                     <el-radio-group v-model="form.status">
-                        <el-radio v-for="(item, key) in status" :key="key" :label="parseInt(key)">{{item}}</el-radio>
+                        <el-radio v-for="(item, key) in (model == 'detail'?status:status2)" :key="key" :label="parseInt(key)">{{item}}</el-radio>
                     </el-radio-group>
                 </el-form-item>
                 <el-form-item label="强制更新：" prop="updateType">
@@ -133,7 +133,10 @@ export default {
             tableData:{},
             loading:false,
             reload:true,
-            
+            status2:{
+                1:'调试',
+                3:'发布'
+            }
         };
     },
     watch: {

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

@@ -42,9 +42,10 @@
             <el-table-column type="index" label="序号" align="center" width="100px">
                 <template slot-scope="scope">
                     <div>
-                        <el-checkbox-group v-model="checkList">
+                        <!-- <el-checkbox-group v-model="checkList">
                             <el-checkbox :label="scope.row.id">{{(scope.$index + 1) + ((queryParams.current - 1) * queryParams.size)}}</el-checkbox>
-                        </el-checkbox-group>
+                        </el-checkbox-group> -->
+                        {{(scope.$index + 1) + ((queryParams.current - 1) * queryParams.size)}}
                     </div>
                 </template>
             </el-table-column>
@@ -83,12 +84,12 @@
 
             <el-table-column label="操作" align="center" width="170px">
               <template slot-scope="scope">
-                <template v-if="scope.row.status != 3">
+                <template v-if="scope.row.status == 1">
                   <el-button size="mini" type="text" icon="el-icon-edit" @click="handleEdit(scope.row)">修改</el-button>
                   <el-button size="mini" type="text" icon="el-icon-position" @click="release(scope.row)">发布</el-button>
                 </template>
                 <el-button size="mini" type="text" icon="el-icon-download" @click="downLoad(scope.row)">下载</el-button>
-                <el-button v-if="scope.row.id != 0" size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button>
+                <el-button v-if="scope.row.status == 1" size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button>
               </template>
             </el-table-column>
         </el-table>

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

@@ -36,9 +36,9 @@
                 @sort-change="sortChange"
                 @selection-change="handleSelectionChange"
             >
-                <el-table-column  type="selection" width="55"></el-table-column>
+                <el-table-column  type="selection" width="55" :selectable="selectableStatus"></el-table-column>
 
-                <el-table-column v-for="item in columnList" :render-header="$commonJS.renderHeaderMethods" :key="item.field" :prop="item.field" :label="item.name" :sortable="item.ifSort?'custom':false" :width="item.width || 'auto'">
+                <el-table-column v-for="item in columnList" :render-header="$commonJS.renderHeaderMethods" :key="item.field" :prop="item.field" :label="item.name" :sortable="item.ifSort?'custom':false" :width="item.width || 'auto'" :min-width="item.minWidth?item.minWidth:''">
                     <template slot-scope="scope">
                         <div v-if="item.field == 'type'" v-html="examineType[scope.row.type]"></div>
                         <div v-else-if="item.field == 'status'" v-html="status[scope.row.status]"></div>
@@ -63,9 +63,9 @@
                 </el-table-column>
 
                 <el-table-column label="操作" align="center" width="180px">
-                    <template slot-scope="scope">
+                    <template slot-scope="scope" v-if="scope.row.status!=1">
                         <el-button size="mini" type="primary" @click="examine(scope.row,1)"><i class="el-icon-check"></i>通过</el-button>
-                        <el-button size="mini" type="danger" @click="examine(scope.row,2)"><i class="el-icon-close"></i>不通过</el-button>
+                        <el-button size="mini" type="danger" @click="examine(scope.row,0)"><i class="el-icon-close"></i>不通过</el-button>
                     </template>
                 </el-table-column>
             </el-table>
@@ -75,7 +75,7 @@
                 <div v-if="multipleSelection.length">
                     已选择{{ multipleSelection.length }}条数据
                     <el-button size="mini" type="primary" @click="examineAll(1)"><i class="el-icon-check"></i>审核通过</el-button>
-                    <el-button size="mini" type="danger" @click="examineAll(2)"><i class="el-icon-close"></i>审核通过</el-button>
+                    <el-button size="mini" type="danger" @click="examineAll(0)"><i class="el-icon-close"></i>审核不通过</el-button>
                 </div>
                 <div v-else></div>
                 <el-pagination background layout="total, sizes, prev, pager, next, jumper"
@@ -102,12 +102,13 @@ const defaultColumn = [
         field:'content',
         name:'待审核内容',
         ifSort:false,
+        minWidth:'200px'
     },
     {
         field:'createName',
         name:'发起人',
         ifSort:false,
-        width:'150px',
+        width:'120px',
         type:"function",
         useFunction:(data)=>{
             return data.createName || data.personnelName
@@ -117,31 +118,31 @@ const defaultColumn = [
         field:'createTime',
         name:'发起时间时间',
         ifSort:false,
-        width:'180px',
+        width:'160px',
     },
     {
         field:'status',
         name:'任务状态',
         ifSort:false,
-        width:'150px',
+        width:'120px',
     },
     {
         field:'auditResult',
         name:'审核结果',
         ifSort:false,
-        width:'150px',
+        width:'120px',
     },
     {
         field:'handleName',
         name:'审核人',
         ifSort:false,
-        width:'150px',
+        width:'120px',
     },
     {
         field:'handleTime',
         name:'审核时间',
         ifSort:false,
-        width:'180px',
+        width:'160px',
     },
 ]
 const defaultSearchForm = {
@@ -183,6 +184,13 @@ export default {
     this.getList()
   },
   methods: {
+    selectableStatus(row,index){
+        if(row.status == 1){
+            return false
+        }else{
+            return true
+        }
+    },
     //查询审核任务列表
     getList(){
         this.loading = true

src/views/backStageManage/organization/personnel/components/detail.vue

@@ -90,7 +90,7 @@
     </el-form>
     <div class="form_item_title">
         所属企业信息：
-        <div>
+        <div v-if="userinfo.roleType == 1 || userinfo.roleType == 2">
             <el-button v-if="!tenantForm.edit" type="text" @click="edit(2)">编辑</el-button>
             <template v-else>
                 <div>
@@ -102,6 +102,15 @@
     </div>
     <el-form ref="tenantForm" :model="tenantForm" label-position="left" label-width="100px" :class="tenantForm.edit != true?'pointer_events_none':''">
         <el-row :gutter="24">
+            <el-col :span="24">
+                <el-form-item label="企业码：" prop="enterpriseCode">
+                    <el-input
+                        v-model="tenantForm.enterpriseCode"
+                        readonly
+                        placeholder="企业码"
+                    ></el-input>
+                </el-form-item>
+            </el-col>
             <el-col :span="12">
                 <el-form-item label="名称：" prop="name">
                     <el-input
@@ -161,7 +170,7 @@
             </el-col>
         </el-row>
     </el-form>
-    <div style="border:1px solid white;padding:10px;margin:10px 0;border-radius:8px;height:300px" :class="(tenantForm.edit != true && userinfo.roleType == 1)?'pointer_events_none':''">
+    <div style="border:1px solid white;padding:10px;margin:10px 0;border-radius:8px;height:300px" :class="(tenantForm.edit == true && userinfo.roleType == 1)?'':'pointer_events_none'">
         <vipTypeTable :tableData="tenantForm.vipTypes||[]"></vipTypeTable>
     </div>
   </div>
@@ -366,5 +375,6 @@ export default {
     display: flex;
     justify-content: space-between;
     align-items: center;
+    border-bottom: 0;
 }
 </style>

src/views/backStageManage/organization/tenant/components/form/tenant.vue

@@ -6,8 +6,11 @@
         </div>
         <div class="form_center" :class="model == 'detail'?'pointer_events_none':''">
             <el-form ref="form" :model="form" :rules="rules" label-width="120px" label-position="left">
-                <el-form-item label="租户名称" prop="tenant">
-                    <el-input v-model="form.name" placeholder="请输入租户名称"></el-input>
+                <el-form-item label="企业码" prop="tenant" v-if="form.enterpriseCode">
+                    <el-input v-model="form.enterpriseCode" readonly placeholder="请输入企业码"></el-input>
+                </el-form-item>
+                <el-form-item label="企业名称" prop="tenant">
+                    <el-input v-model="form.name" placeholder="请输入企业名称"></el-input>
                 </el-form-item>
 
                 <el-form-item label="可使用人员数量" prop="number">
@@ -16,7 +19,6 @@
 
                 <el-form-item label="状态" prop="state">
                     <el-switch
-                        style="display: block"
                         v-model="form.state"
                         active-color="#13ce66"
                         inactive-color="red"

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

@@ -14,20 +14,21 @@
         </el-header>
         <el-main class="padding_10">
             <el-table v-loading="loading" :data="tableData" border header-row-class-name="custom-table-header" height="calc(100% - 0px)">
-                <el-table-column type="index" label="#" width="55" align="center">
+                <el-table-column type="index" label="#" width="55" align="">
                     <template slot-scope="scope">
                         <span>{{ (scope.$index + 1) + ((queryParams.current - 1) * queryParams.size) }}</span>
                     </template>
                 </el-table-column>
-                <el-table-column prop="name" label="企业名称" align="center" show-overflow-tooltip></el-table-column>
-                <el-table-column prop="userName" label="企业管理员" align="center" show-overflow-tooltip></el-table-column>
-                <el-table-column prop="address" label="联系人地址" align="center" show-overflow-tooltip></el-table-column>
-                <el-table-column prop="type" label="类型" align="center" show-overflow-tooltip>
+                <el-table-column prop="name" label="企业名称" min-width="120px" align="" show-overflow-tooltip></el-table-column>
+                <el-table-column prop="enterpriseCode" label="企业码" width="160px" align="" show-overflow-tooltip></el-table-column>
+                <el-table-column prop="userName" label="企业管理员" align="" width="120px" show-overflow-tooltip></el-table-column>
+                <el-table-column prop="address" label="联系人地址" align="" show-overflow-tooltip></el-table-column>
+                <el-table-column prop="type" label="类型" align="" width="120px" show-overflow-tooltip>
                     <template slot-scope="scope">
                         <div>{{ getTenantName(scope.row.type) }}</div>
                     </template>
                 </el-table-column>
-                <el-table-column prop="vipTypes" label="购买会员信息">
+                <el-table-column prop="vipTypes" label="购买会员信息" min-width="160px">
                     <template slot-scope="scope">
                         <div v-if="scope.row.vipTypes && scope.row.vipTypes.length">
                             <div v-for="item in scope.row.vipTypes" :key="item.vipTypeId">
@@ -36,22 +37,19 @@
                         </div>
                     </template>
                 </el-table-column>
-                <el-table-column label="是否启用" align="center" show-overflow-tooltip>
+                <el-table-column label="是否启用" align="center" header-align="left" width="120px" show-overflow-tooltip>
                     <template slot-scope="scope">
                         <el-switch
-                            style="display: block"
                             v-model="scope.row.state"
                             @change="(val)=>changeState(scope.row,val)"
                             active-color="#13ce66"
                             inactive-color="red"
                             :active-value="1"
-                            :inactive-value="0"
-                            active-text="启用"
-                            inactive-text="禁用">
+                            :inactive-value="0">
                         </el-switch>
                     </template>
                 </el-table-column>
-                <el-table-column prop="describe" label="备注" align="center" show-overflow-tooltip></el-table-column>
+                <el-table-column prop="describe" label="备注" align="" show-overflow-tooltip></el-table-column>
                 <el-table-column label="操作"  width="150">
                     <template slot-scope="scope">
                         <el-button

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

@@ -31,21 +31,21 @@
             height="calc(100% - 0px)"
             v-loading="loading"
         >
-            <el-table-column type="index" label="序号" align="center" width="120px">
+            <el-table-column type="index" label="序号" align="center" width="80px">
               <template slot-scope="scope">
                   <div>
                       {{(scope.$index + 1) + ((queryParams.current - 1) * queryParams.size)}}
                   </div>
               </template>
             </el-table-column>
-            <el-table-column prop="code" label="付费码">
+            <el-table-column prop="code" label="付费码" width="100px">
               <template slot-scope="scope">
                   <div>
                     <el-link type="primary" @click="handleDetail(scope.row)">{{ scope.row.code }}</el-link>
                   </div>
                 </template>
             </el-table-column>
-            <el-table-column prop="vipTypes" label="购买会员信息">
+            <el-table-column prop="vipTypes" label="购买会员信息" min-width="160px">
               <template slot-scope="scope">
                 <div v-if="scope.row.vipTypes && scope.row.vipTypes.length">
                     <div v-for="item in scope.row.vipTypes" :key="item.vipTypeId">
@@ -54,7 +54,7 @@
                 </div>
               </template>
             </el-table-column>
-            <el-table-column prop="tenantMessage" label="企业信息">
+            <el-table-column prop="tenantMessage" label="企业信息" min-width="160px">
               <template slot-scope="scope">
                 <div>
                   <div v-if="scope.row.tenantName">企业名称：{{ scope.row.tenantName }}</div>
@@ -63,7 +63,7 @@
                 </div>
               </template>
             </el-table-column>
-            <el-table-column prop="userMessage" label="用户信息">
+            <el-table-column prop="userMessage" label="用户信息" min-width="160px">
               <template slot-scope="scope">
                 <div>
                   <div v-if="scope.row.personnelName">姓名：{{ scope.row.personnelName }}</div>
@@ -72,15 +72,15 @@
                 </div>
               </template>
             </el-table-column>
-            <el-table-column prop="status" label="状态">
+            <el-table-column prop="status" label="状态" width="100px">
                 <template slot-scope="scope">
                     <div>
                         {{status[scope.row.status]}}
                     </div>
               </template>
             </el-table-column>
-            <el-table-column prop="createName" label="创建人"></el-table-column>
-            <el-table-column prop="createTime" label="创建时间"></el-table-column>
+            <el-table-column prop="createName" label="创建人" width="100px"></el-table-column>
+            <el-table-column prop="createTime" label="创建时间" width="160px"></el-table-column>
             <el-table-column prop="remark" label="备注"></el-table-column>
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
               <template slot-scope="scope">