Merge branch 'dev-yjl' into 'shenzhen-dev'

演示平台新增(标准七参数版)

See merge request !110
This commit is contained in:
袁晶琳 2023-03-01 09:47:24 +08:00
commit b49d182c7f
4 changed files with 886 additions and 681 deletions

View File

@ -18,7 +18,7 @@ var PROJECT = {
} }
var PROJECT_TYPE = PROJECT.online_zjsj var PROJECT_TYPE = PROJECT.local_test
var headerShow = true; // 是否显示头部 var headerShow = true; // 是否显示头部
var tabsShow = true; // 是否显示tabs var tabsShow = true; // 是否显示tabs

View File

@ -46,8 +46,8 @@ if (process.env.NODE_ENV == 'development') {
// axios.defaults.baseURL = 'http://192.168.34.117:6023/' // 杨杰本地 // axios.defaults.baseURL = 'http://192.168.34.117:6023/' // 杨杰本地
// axios.defaults.baseURL = 'http://ue6a4s.natappfree.cc' // 邱平毅vpn本地 // axios.defaults.baseURL = 'http://ue6a4s.natappfree.cc' // 邱平毅vpn本地
// axios.defaults.baseURL = 'http://139.9.66.234:6324/' // 河南春笋 // axios.defaults.baseURL = 'http://139.9.66.234:6324/' // 河南春笋
axios.defaults.baseURL ='http://124.71.67.160:8088/' //中建四局线上 // axios.defaults.baseURL ='http://124.71.67.160:8088/' //中建四局线上
// axios.defaults.baseURL ='http://182.90.224.147:100/' //演示平台/ axios.defaults.baseURL ='http://182.90.224.147:100/' //演示平台/
// axios.defaults.baseURL = 'http://192.168.34.125:6023/' //杨意本地 http/1.1 // axios.defaults.baseURL = 'http://192.168.34.125:6023/' //杨意本地 http/1.1
// axios.defaults.baseURL ='http://47.97.202.104:6023/' //金林湾线上 // axios.defaults.baseURL ='http://47.97.202.104:6023/' //金林湾线上
// axios.defaults.baseURL = 'http://192.168.34.231:6023/'; //杨思瑞本地 // axios.defaults.baseURL = 'http://192.168.34.231:6023/'; //杨思瑞本地

File diff suppressed because it is too large Load Diff

View File

@ -1,7 +1,12 @@
<template> <template>
<div class="fullHeight"> <div class="fullHeight">
<div class="searchBox whiteBlock"> <div class="searchBox whiteBlock">
<el-form :inline="true" size="medium" :model="searchForm" ref="searchForm"> <el-form
:inline="true"
size="medium"
:model="searchForm"
ref="searchForm"
>
<el-form-item label="审核状态" prop="useState"> <el-form-item label="审核状态" prop="useState">
<el-select v-model="searchForm.useState" placeholder="请选择"> <el-select v-model="searchForm.useState" placeholder="请选择">
<el-option label="全部" value=""></el-option> <el-option label="全部" value=""></el-option>
@ -10,7 +15,11 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="企业名称" prop="companyName" class="last"> <el-form-item label="企业名称" prop="companyName" class="last">
<el-input v-model="searchForm.companyName" placeholder="请输入" clearable></el-input> <el-input
v-model="searchForm.companyName"
placeholder="请输入"
clearable
></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" plain @click="getListData">查询</el-button> <el-button type="primary" plain @click="getListData">查询</el-button>
@ -20,25 +29,53 @@
</div> </div>
<div class="table_wrap whiteBlock"> <div class="table_wrap whiteBlock">
<el-table class="tables" :data="tableData"> <el-table class="tables" :data="tableData">
<el-table-column type="index" width="50" align="center" label="序号"></el-table-column> <el-table-column
<el-table-column prop="companyName" label="企业名称" align="center" width="180"></el-table-column> type="index"
<el-table-column prop="createTime" label="注册时间" align="center" width="180"></el-table-column> width="50"
<el-table-column prop="companyTel" label="手机号码" align="center" width="180"></el-table-column> align="center"
label="序号"
></el-table-column>
<el-table-column
prop="companyName"
label="企业名称"
align="center"
width="180"
></el-table-column>
<el-table-column
prop="createTime"
label="注册时间"
align="center"
width="180"
></el-table-column>
<el-table-column
prop="companyTel"
label="手机号码"
align="center"
width="180"
></el-table-column>
<el-table-column prop="isEnable" label="使用状态" align="center"> <el-table-column prop="isEnable" label="使用状态" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.isEnable==0?'禁用':'启用'}} {{ scope.row.isEnable == 0 ? '禁用' : '启用' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="diffDay" label="剩余天数" align="center"></el-table-column> <el-table-column
prop="diffDay"
label="剩余天数"
align="center"
></el-table-column>
<el-table-column prop="diffDay" label="项目数" align="center"> <el-table-column prop="diffDay" label="项目数" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.createProjectNum}}/{{scope.row.projectNum}} {{ scope.row.createProjectNum }}/{{ scope.row.projectNum }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="address" label="操作" align="center"> <el-table-column prop="address" label="操作" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<div @click="configuration(scope.row)" class="operationText"> <div @click="configuration(scope.row)" class="operationText">
<img src="@/assets/images/accredit.png" width="15px" height="15px" /> <img
src="@/assets/images/accredit.png"
width="15px"
height="15px"
/>
<span>授权配置</span> <span>授权配置</span>
</div> </div>
</template> </template>
@ -56,91 +93,122 @@
background background
></el-pagination> ></el-pagination>
</div> </div>
<el-dialog :modal-append-to-body="false" title="授权配置" :visible.sync="authorizedDialog" width="767px"> <el-dialog
:modal-append-to-body="false"
title="授权配置"
:visible.sync="authorizedDialog"
width="767px"
>
<div class="dialog_content"> <div class="dialog_content">
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="11" style="margin:7px 0px 0 0;"> <el-col :span="11" style="margin: 7px 0px 0 0">
<span class="firstConlumLabel">授权状态</span> <span class="firstConlumLabel">授权状态</span>
<el-radio-group v-model="isEnable" size="medium"> <el-radio-group v-model="isEnable" size="medium">
<el-radio :label="1">启用</el-radio> <el-radio :label="1">启用</el-radio>
<el-radio :label="0">禁用</el-radio> <el-radio :label="0">禁用</el-radio>
</el-radio-group> </el-radio-group>
</el-col> </el-col>
<el-col :span="13" style="text-align:right"> <el-col :span="13" style="text-align: right">
<span style="margin-right:15px">到期日期</span> <span style="margin-right: 15px">到期日期</span>
<el-date-picker <el-date-picker
v-model="time" v-model="time"
type="date" type="date"
placeholder="选择日期" value-format="yyyy-MM-dd" size="medium"> placeholder="选择日期"
value-format="yyyy-MM-dd"
size="medium"
>
</el-date-picker> </el-date-picker>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="24" style="margin-top: 20px"> <el-row :gutter="24" style="margin-top: 20px">
<el-col :span="11" style="margin:7px 0px 0 0;"> <el-col :span="11" style="margin: 7px 0px 0 0">
<span class="firstConlumLabel">是否显示未解锁模块</span> <span class="firstConlumLabel">是否显示未解锁模块</span>
<el-radio-group v-model="moduleShowType" size="medium"> <el-radio-group v-model="moduleShowType" size="medium">
<el-radio :label="0"></el-radio> <el-radio :label="0"></el-radio>
<el-radio :label="1"></el-radio> <el-radio :label="1"></el-radio>
</el-radio-group> </el-radio-group>
</el-col> </el-col>
<el-col :span="13" style="text-align:right"> <el-col :span="13" style="text-align: right">
<span style="margin-right:15px">授权项目数</span> <span style="margin-right: 15px">授权项目数</span>
<el-input-number v-model="projectNum" :min="1" size="medium" style="width: 220px"></el-input-number> <el-input-number
v-model="projectNum"
:min="1"
size="medium"
style="width: 220px"
></el-input-number>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="24" style="margin-top: 20px"> <el-row :gutter="24" style="margin-top: 20px">
<el-col :span="11" style="margin:7px 0px 0 0;"> <el-col :span="11" style="margin: 7px 0px 0 0">
<span class="firstConlumLabel">是否显示企业大屏</span> <span class="firstConlumLabel">是否显示企业大屏</span>
<el-radio-group v-model="companyBigScreen" size="medium"> <el-radio-group v-model="companyBigScreen" size="medium">
<el-radio :label="0"></el-radio> <el-radio :label="0"></el-radio>
<el-radio :label="1"></el-radio> <el-radio :label="1"></el-radio>
</el-radio-group> </el-radio-group>
</el-col> </el-col>
<el-col :span="13" style="text-align:right"> <el-col :span="13" style="text-align: right">
<span style="margin-right:15px">是否显示项目看板</span> <span style="margin-right: 15px">是否显示项目看板</span>
<el-radio-group v-model="projectKanban" size="medium" style="width: 220px;text-align:left"> <el-radio-group
v-model="projectKanban"
size="medium"
style="width: 220px; text-align: left"
>
<el-radio :label="0"></el-radio> <el-radio :label="0"></el-radio>
<el-radio :label="1"></el-radio> <el-radio :label="1"></el-radio>
</el-radio-group> </el-radio-group>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="24" style="margin-top: 20px"> <el-row :gutter="24" style="margin-top: 20px">
<el-col :span="11" style="margin:7px 0px 0 0;"> <el-col :span="11" style="margin: 7px 0px 0 0">
<span class="firstConlumLabel">是否启用人员录入二维码</span> <span class="firstConlumLabel">是否启用人员录入二维码</span>
<el-radio-group v-model="inputQrCode" size="medium"> <el-radio-group v-model="inputQrCode" size="medium">
<el-radio :label="0"></el-radio> <el-radio :label="0"></el-radio>
<el-radio :label="1"></el-radio> <el-radio :label="1"></el-radio>
</el-radio-group> </el-radio-group>
</el-col> </el-col>
<el-col :span="13" style="text-align:right"> <el-col :span="13" style="text-align: right">
<span style="margin-right:15px">是否启用移动考勤</span> <span style="margin-right: 15px">是否启用移动考勤</span>
<el-radio-group v-model="mobileAttendance" size="medium" style="width: 220px;text-align:left"> <el-radio-group
v-model="mobileAttendance"
size="medium"
style="width: 220px; text-align: left"
>
<el-radio :label="0"></el-radio> <el-radio :label="0"></el-radio>
<el-radio :label="1"></el-radio> <el-radio :label="1"></el-radio>
</el-radio-group> </el-radio-group>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="24" style="margin-top: 20px"> <el-row :gutter="24" style="margin-top: 20px">
<el-col :span="16" style="margin:7px 0px 0 0;"> <el-col :span="16" style="margin: 7px 0px 0 0; width: 100%">
<!-- 此处注释是因为添加了一个菜单版本 20220706 --> <!-- 此处注释是因为添加了一个菜单版本 20220706 -->
<!-- <span class="firstConlumLabel">是否启用精益建造</span> <!-- <span class="firstConlumLabel">是否启用精益建造</span>
<el-radio-group v-model="styleType" size="medium" @change="getBaseModuleList"> <el-radio-group v-model="styleType" size="medium" @change="getBaseModuleList">
<el-radio :label="2"></el-radio> <el-radio :label="2"></el-radio>
<el-radio :label="1"></el-radio> <el-radio :label="1"></el-radio>
</el-radio-group> --> </el-radio-group> -->
<span class="firstConlumLabel">选择系统版本</span> <span class="firstConlumLabel">选择系统版本</span>
<el-radio-group v-model="styleType" size="medium" @change="getBaseModuleList"> <el-radio-group
v-model="styleType"
size="medium"
@change="getBaseModuleList"
>
<el-radio :label="1">标准版</el-radio> <el-radio :label="1">标准版</el-radio>
<el-radio :label="2">星璇版</el-radio> <el-radio :label="2">星璇版</el-radio>
<el-radio :label="3">衢州版</el-radio> <el-radio :label="3">衢州版</el-radio>
<el-radio :label="4">三江版</el-radio> <el-radio :label="4">三江版</el-radio>
<el-radio :label="4">标准七参数版</el-radio>
</el-radio-group> </el-radio-group>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="24" style="margin-top: 20px"> <el-row :gutter="24" style="margin-top: 20px">
<el-col :span="16" style="margin:7px 0px 0 0;"> <el-col :span="16" style="margin: 7px 0px 0 0">
<span class="firstConlumLabel">客服电话</span> <span class="firstConlumLabel">客服电话</span>
<el-input v-model="customerServicePhone" size="medium" placeholder="请输入" style="display: inline-block; width: 200px;"></el-input> <el-input
v-model="customerServicePhone"
size="medium"
placeholder="请输入"
style="display: inline-block; width: 200px"
></el-input>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="24" style="margin-top: 20px"> <el-row :gutter="24" style="margin-top: 20px">
@ -151,9 +219,13 @@
<el-radio :label="1"></el-radio> <el-radio :label="1"></el-radio>
</el-radio-group> </el-radio-group>
</el-col> </el-col>
<el-col :span="13" style="text-align:right"> <el-col :span="13" style="text-align: right">
<span style="margin-right:15px">是否能添加项目</span> <span style="margin-right: 15px">是否能添加项目</span>
<el-radio-group v-model="canAddProject" size="medium" style="width: 220px;text-align:left"> <el-radio-group
v-model="canAddProject"
size="medium"
style="width: 220px; text-align: left"
>
<el-radio :label="0"></el-radio> <el-radio :label="0"></el-radio>
<el-radio :label="1"></el-radio> <el-radio :label="1"></el-radio>
</el-radio-group> </el-radio-group>
@ -162,49 +234,89 @@
<el-row :gutter="24" style="margin-top: 20px"> <el-row :gutter="24" style="margin-top: 20px">
<el-col :span="24"> <el-col :span="24">
<div>请勾选功能权限</div> <div>请勾选功能权限</div>
<el-checkbox :indeterminate="isIndeterminate" v-model="checkAll" @change="handleCheckAllChange">全选</el-checkbox> <el-checkbox
<el-checkbox-group class="zdy-checkbox" v-model="moduleInfo.moduleId" @change="handleCheckedCitiesChange"> :indeterminate="isIndeterminate"
v-model="checkAll"
@change="handleCheckAllChange"
>全选</el-checkbox
>
<el-checkbox-group
class="zdy-checkbox"
v-model="moduleInfo.moduleId"
@change="handleCheckedCitiesChange"
>
<div class="CheckboxTitle">企业模块</div> <div class="CheckboxTitle">企业模块</div>
<el-checkbox v-if="i.moduleType===1" v-for="i in companyArr" :key="i.moduleId" :label="i.moduleId">{{i.moduleName}}</el-checkbox> <el-checkbox
v-if="i.moduleType === 1"
v-for="i in companyArr"
:key="i.moduleId"
:label="i.moduleId"
>{{ i.moduleName }}</el-checkbox
>
<div class="CheckboxTitle">企业后台模块</div> <div class="CheckboxTitle">企业后台模块</div>
<el-checkbox v-if="i.moduleType===3" v-for="i in companyArr" :key="i.moduleId" :label="i.moduleId">{{i.moduleName}}</el-checkbox> <el-checkbox
v-if="i.moduleType === 3"
v-for="i in companyArr"
:key="i.moduleId"
:label="i.moduleId"
>{{ i.moduleName }}</el-checkbox
>
<div class="CheckboxTitle">项目模块</div> <div class="CheckboxTitle">项目模块</div>
<el-checkbox v-if="i.moduleType===2" v-for="i in companyArr" :key="i.moduleId" :label="i.moduleId">{{i.moduleName}}</el-checkbox> <el-checkbox
v-if="i.moduleType === 2"
v-for="i in companyArr"
:key="i.moduleId"
:label="i.moduleId"
>{{ i.moduleName }}</el-checkbox
>
<div class="CheckboxTitle">项目看板模块</div> <div class="CheckboxTitle">项目看板模块</div>
<el-checkbox v-if="i.moduleType===4" v-for="i in companyArr" :key="i.moduleId" :label="i.moduleId">{{i.moduleName}}</el-checkbox> <el-checkbox
v-if="i.moduleType === 4"
v-for="i in companyArr"
:key="i.moduleId"
:label="i.moduleId"
>{{ i.moduleName }}</el-checkbox
>
</el-checkbox-group> </el-checkbox-group>
</el-col> </el-col>
</el-row> </el-row>
<div class="dialog-footer"> <div class="dialog-footer">
<el-button class="cancleBtn" <el-button
class="cancleBtn"
@click="authorizedDialog = false" @click="authorizedDialog = false"
icon="el-icon-circle-close" icon="el-icon-circle-close"
size="medium" size="medium"
> </el-button> > </el-button
>
<el-button <el-button
type="primary" type="primary"
icon="el-icon-circle-check" icon="el-icon-circle-check"
@click="saveFn" @click="saveFn"
size="medium" size="medium"
> </el-button> > </el-button
>
</div> </div>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
<script> <script>
import { getRegisterAuditList,editCompanyConfigApi,baseModuleList,getCompanyModuleList,baseModuleProjectEdit } from "@/assets/js/api/jxjadmin.js"; import {
getRegisterAuditList,
editCompanyConfigApi,
baseModuleList,
getCompanyModuleList,
baseModuleProjectEdit
} from '@/assets/js/api/jxjadmin.js'
export default { export default {
name: "registerAudit", name: 'registerAudit',
data() { data() {
return { return {
checkAll: false, checkAll: false,
isIndeterminate: false, isIndeterminate: false,
cityOptions: [], cityOptions: [],
moduleInfo:{moduleId:''}, moduleInfo: { moduleId: '' },
companyArr:[], companyArr: [],
count: 0, count: 0,
props: { props: {
multiple: true multiple: true
@ -214,8 +326,8 @@ export default {
children: 'zones' children: 'zones'
},*/ },*/
searchForm: { searchForm: {
companyName: "", companyName: '',
useState: "", useState: ''
}, },
total: 0, total: 0,
pageNo: 1, pageNo: 1,
@ -225,146 +337,157 @@ export default {
checkList: [], checkList: [],
authorizedDialog: false, authorizedDialog: false,
isEnable: 0, isEnable: 0,
time: "", time: '',
detail:{}, detail: {},
projectNum: 1, projectNum: 1,
moduleShowType:0, moduleShowType: 0,
"companyBigScreen": 0, companyBigScreen: 0,
"inputQrCode": 0, inputQrCode: 0,
"projectKanban": 0, projectKanban: 0,
"mobileAttendance": 0, mobileAttendance: 0,
customerServicePhone:'', customerServicePhone: '',
styleType:1, styleType: 1,
canGoProjectEnd:0, canGoProjectEnd: 0,
canAddProject:0 canAddProject: 0
}; }
}, },
created() { created() {
this.getListData(); this.getListData()
}, },
methods: { methods: {
saveFn(){ saveFn() {
if(this.time==''){ if (this.time == '') {
this.$message.error('请选择授权时长!') this.$message.error('请选择授权时长!')
}else{ } else {
var json = { var json = {
"clientId": this.detail.clientId, clientId: this.detail.clientId,
"clientSecret": this.detail.clientSecret, clientSecret: this.detail.clientSecret,
"companySn": this.detail.companySn, companySn: this.detail.companySn,
// "effectiveTime": 0, // "effectiveTime": 0,
"expireTime": this.time, expireTime: this.time,
"headquartersSn": this.detail.headquartersSn, headquartersSn: this.detail.headquartersSn,
"isEnable": this.isEnable, isEnable: this.isEnable,
projectNum:this.projectNum, projectNum: this.projectNum,
moduleShowType:this.moduleShowType, moduleShowType: this.moduleShowType,
mobileAttendance:this.mobileAttendance, mobileAttendance: this.mobileAttendance,
companyBigScreen:this.companyBigScreen, companyBigScreen: this.companyBigScreen,
inputQrCode:this.inputQrCode, inputQrCode: this.inputQrCode,
projectKanban:this.projectKanban, projectKanban: this.projectKanban,
customerServicePhone:this.customerServicePhone, customerServicePhone: this.customerServicePhone,
styleType:this.styleType, styleType: this.styleType,
enterProjectBackType:this.canGoProjectEnd, enterProjectBackType: this.canGoProjectEnd,
addProjectType:this.canAddProject addProjectType: this.canAddProject
} }
editCompanyConfigApi(json).then(res=>{ editCompanyConfigApi(json).then((res) => {
let moduleIdStr=JSON.parse(JSON.stringify(this.moduleInfo)).moduleId.join(','); let moduleIdStr = JSON.parse(
console.log('查看form',moduleIdStr,this.moduleInfo); JSON.stringify(this.moduleInfo)
baseModuleProjectEdit({headquartersSn:this.moduleInfo.headquartersSn,moduleIdStr:moduleIdStr,sn:this.moduleInfo.companySn,type:'1'}).then(res=>{ ).moduleId.join(',')
console.log('查看form', moduleIdStr, this.moduleInfo)
baseModuleProjectEdit({
headquartersSn: this.moduleInfo.headquartersSn,
moduleIdStr: moduleIdStr,
sn: this.moduleInfo.companySn,
type: '1'
}).then((res) => {
// this.$message.success('') // this.$message.success('')
}) })
this.authorizedDialog=false; this.authorizedDialog = false
this.getListData(); this.getListData()
this.$message.success('配置成功!') this.$message.success('配置成功!')
}) })
} }
}, },
// //
getListData() { getListData() {
let data = this.searchForm; let data = this.searchForm
data.pageNo = this.pageNo; data.pageNo = this.pageNo
data.pageSize = this.pageSize; data.pageSize = this.pageSize
getRegisterAuditList(data).then((res) => { getRegisterAuditList(data).then((res) => {
console.log(res); console.log(res)
this.tableData=res.result.records this.tableData = res.result.records
this.total=res.result.total this.total = res.result.total
}); })
}, },
resetForm() { resetForm() {
this.$refs['searchForm'].resetFields(); this.$refs['searchForm'].resetFields()
this.getListData(); this.getListData()
}, },
// -- // --
configuration(item) { configuration(item) {
console.log('打印',item); console.log('打印', item)
item.moduleId=[]; item.moduleId = []
this.moduleInfo=JSON.parse(JSON.stringify(item)); this.moduleInfo = JSON.parse(JSON.stringify(item))
this.getCompanyList(item.headquartersSn); this.getCompanyList(item.headquartersSn)
this.authorizedDialog = true; this.authorizedDialog = true
this.time = item.expireTime this.time = item.expireTime
this.isEnable = item.isEnable this.isEnable = item.isEnable
this.detail=item this.detail = item
this.projectNum = item.projectNum this.projectNum = item.projectNum
this.projectKanban = item.projectKanban this.projectKanban = item.projectKanban
this.companyBigScreen = item.companyBigScreen this.companyBigScreen = item.companyBigScreen
this.mobileAttendance = item.mobileAttendance this.mobileAttendance = item.mobileAttendance
this.inputQrCode = item.inputQrCode this.inputQrCode = item.inputQrCode
this.styleType=item.styleType this.styleType = item.styleType
this.canGoProjectEnd=item.enterProjectBackType this.canGoProjectEnd = item.enterProjectBackType
this.canAddProject=item.addProjectType this.canAddProject = item.addProjectType
this.getBaseModuleList(); this.getBaseModuleList()
}, },
// //
handleSizeChange(val) { handleSizeChange(val) {
this.pageSize = val; this.pageSize = val
this.getListData(); this.getListData()
}, },
// //
handleCurrentChange(val) { handleCurrentChange(val) {
this.pageNo = val; this.pageNo = val
this.getListData(); this.getListData()
}, },
getBaseModuleList(){ getBaseModuleList() {
baseModuleList({moduleType:'',styleType:this.styleType}).then(result => { baseModuleList({ moduleType: '', styleType: this.styleType }).then(
if (result.success) { (result) => {
let brHtm={}; if (result.success) {
this.companyArr=result.result; let brHtm = {}
this.companyArr.map(item =>{ this.companyArr = result.result
this.cityOptions.push(item.moduleId); this.companyArr.map((item) => {
}) this.cityOptions.push(item.moduleId)
this.brHtm=brHtm; })
// console.log('',brHtm) this.brHtm = brHtm
// console.log('',this.companyArr) // console.log('',brHtm)
// console.log('',this.companyArr)
}
} }
}) )
}, },
getCompanyList(headquartersSn){ getCompanyList(headquartersSn) {
getCompanyModuleList({headquartersSn:headquartersSn}).then(result => { getCompanyModuleList({ headquartersSn: headquartersSn }).then(
if (result.success) { (result) => {
result.result.map(item =>{ if (result.success) {
this.moduleInfo.moduleId.push(item.moduleId); result.result.map((item) => {
}) this.moduleInfo.moduleId.push(item.moduleId)
// console.log('',result.result) })
this.handleCheckedCitiesChange(this.moduleInfo.moduleId); // console.log('',result.result)
this.handleCheckedCitiesChange(this.moduleInfo.moduleId)
}
} }
}) )
}, },
handleCheckAllChange(val) { handleCheckAllChange(val) {
this.moduleInfo.moduleId = val ? this.cityOptions : []; this.moduleInfo.moduleId = val ? this.cityOptions : []
this.isIndeterminate = false; this.isIndeterminate = false
}, },
handleCheckedCitiesChange(value) { handleCheckedCitiesChange(value) {
let checkedCount = value.length; let checkedCount = value.length
this.checkAll = checkedCount === this.cityOptions.length; this.checkAll = checkedCount === this.cityOptions.length
this.isIndeterminate = checkedCount > 0 && checkedCount < this.cityOptions.length; this.isIndeterminate =
checkedCount > 0 && checkedCount < this.cityOptions.length
} }
} }
}; }
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.dialogTable { .dialogTable {
@ -392,19 +515,19 @@ export default {
width: 46%; width: 46%;
margin: 10px 0; margin: 10px 0;
} }
.zdy-checkbox{ .zdy-checkbox {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
justify-content: space-between; justify-content: space-between;
>label{ > label {
width: 30%; width: 30%;
} }
} }
.CheckboxTitle{ .CheckboxTitle {
font-size: 14px; font-size: 14px;
width: 100%; width: 100%;
} }
.firstConlumLabel{ .firstConlumLabel {
width: 160px; width: 160px;
// margin-right: 15px; // margin-right: 15px;
display: inline-block; display: inline-block;