flat: 6.5 版本更新 1.1
This commit is contained in:
@@ -251,6 +251,7 @@ export default {
|
|||||||
calcHeight: 180,
|
calcHeight: 180,
|
||||||
align: "center",
|
align: "center",
|
||||||
menuAlign: "center",
|
menuAlign: "center",
|
||||||
|
addBtn: false,
|
||||||
tip: false,
|
tip: false,
|
||||||
columnBtn: false,
|
columnBtn: false,
|
||||||
searchBtn: true,
|
searchBtn: true,
|
||||||
|
|||||||
@@ -81,11 +81,11 @@
|
|||||||
@click="handleTransfer"
|
@click="handleTransfer"
|
||||||
v-show="vaildData(permission.tenant_main_talents_certain_index_transfergroup, false)">转移推送
|
v-show="vaildData(permission.tenant_main_talents_certain_index_transfergroup, false)">转移推送
|
||||||
</el-button>
|
</el-button>
|
||||||
<el-button type="danger" size="small" icon="el-icon-delete" @click="handleDelete"
|
<!-- <el-button type="danger" size="small" icon="el-icon-delete" @click="handleDelete"-->
|
||||||
:disabled="!selectionList.length" plain
|
<!-- :disabled="!selectionList.length" plain-->
|
||||||
v-show="vaildData(permission.tenant_main_talents_certain_index_transfergroup, false)">
|
<!-- v-show="vaildData(permission.tenant_main_talents_certain_index_transfergroup, false)">-->
|
||||||
删除
|
<!-- 删除-->
|
||||||
</el-button>
|
<!-- </el-button>-->
|
||||||
</template>
|
</template>
|
||||||
<template slot="name" slot-scope="{row}">
|
<template slot="name" slot-scope="{row}">
|
||||||
<span>{{ row.name }}</span>
|
<span>{{ row.name }}</span>
|
||||||
@@ -336,6 +336,7 @@ export default {
|
|||||||
align: "center",
|
align: "center",
|
||||||
menuAlign: "center",
|
menuAlign: "center",
|
||||||
tip: false,
|
tip: false,
|
||||||
|
delBtn: false,
|
||||||
columnBtn: false,
|
columnBtn: false,
|
||||||
searchBtn: true,
|
searchBtn: true,
|
||||||
searchShow: true,
|
searchShow: true,
|
||||||
|
|||||||
@@ -81,11 +81,11 @@
|
|||||||
@click="handleTransfer"
|
@click="handleTransfer"
|
||||||
v-show="vaildData(permission.tenant_main_talents_latent_index_tansfergroup, false)">转移推送
|
v-show="vaildData(permission.tenant_main_talents_latent_index_tansfergroup, false)">转移推送
|
||||||
</el-button>
|
</el-button>
|
||||||
<el-button type="danger" size="small" icon="el-icon-delete" @click="handleDelete"
|
<!-- <el-button type="danger" size="small" icon="el-icon-delete" @click="handleDelete"-->
|
||||||
:disabled="!selectionList.length" plain
|
<!-- :disabled="!selectionList.length" plain-->
|
||||||
v-show="vaildData(permission.tenant_main_talents_latent_index_tansfergroup, false)">
|
<!-- v-show="vaildData(permission.tenant_main_talents_latent_index_tansfergroup, false)">-->
|
||||||
删除
|
<!-- 删除-->
|
||||||
</el-button>
|
<!-- </el-button>-->
|
||||||
</template>
|
</template>
|
||||||
<template slot="name" slot-scope="{row}">
|
<template slot="name" slot-scope="{row}">
|
||||||
<span>{{ row.name }}</span>
|
<span>{{ row.name }}</span>
|
||||||
@@ -342,6 +342,7 @@ export default {
|
|||||||
tip: false,
|
tip: false,
|
||||||
columnBtn: false,
|
columnBtn: false,
|
||||||
searchBtn: true,
|
searchBtn: true,
|
||||||
|
delBtn: false,
|
||||||
searchShow: true,
|
searchShow: true,
|
||||||
viewBtn: true,
|
viewBtn: true,
|
||||||
menuWidth: 170,
|
menuWidth: 170,
|
||||||
@@ -719,6 +720,7 @@ export default {
|
|||||||
let params = {
|
let params = {
|
||||||
idNumber: this.dialogInfo.idNumber,
|
idNumber: this.dialogInfo.idNumber,
|
||||||
id: this.dialogInfo.id,
|
id: this.dialogInfo.id,
|
||||||
|
name: this.dialogInfo.name,
|
||||||
approvalStatus: 1,
|
approvalStatus: 1,
|
||||||
content: value,
|
content: value,
|
||||||
}
|
}
|
||||||
@@ -744,6 +746,7 @@ export default {
|
|||||||
let params = {
|
let params = {
|
||||||
idNumber: this.dialogInfo.idNumber,
|
idNumber: this.dialogInfo.idNumber,
|
||||||
id: this.dialogInfo.id,
|
id: this.dialogInfo.id,
|
||||||
|
name: this.dialogInfo.name,
|
||||||
approvalStatus: 0,
|
approvalStatus: 0,
|
||||||
content: value,
|
content: value,
|
||||||
groupId: this.GroupValue
|
groupId: this.GroupValue
|
||||||
|
|||||||
@@ -15,13 +15,6 @@
|
|||||||
@size-change="sizeChange"
|
@size-change="sizeChange"
|
||||||
class="customPage"
|
class="customPage"
|
||||||
>
|
>
|
||||||
<!--自定义列-->
|
|
||||||
<template slot="labelsBase" slot-scope="{ row }">
|
|
||||||
<el-tooltip effect="dark" placement="top">
|
|
||||||
<div slot="content" v-for="(item,index) in row.labelsBaseArr" :key="index">{{ item }}<br/></div>
|
|
||||||
<div>{{ row.labelsBase | ellipsis }}</div>
|
|
||||||
</el-tooltip>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<template slot-scope="{row}" slot="menu">
|
<template slot-scope="{row}" slot="menu">
|
||||||
<el-button type="text"
|
<el-button type="text"
|
||||||
@@ -302,68 +295,6 @@ export default {
|
|||||||
],
|
],
|
||||||
span: 24,
|
span: 24,
|
||||||
},
|
},
|
||||||
{
|
|
||||||
label: "经办时间",
|
|
||||||
prop: "aae036",
|
|
||||||
display: false,
|
|
||||||
span: 24,
|
|
||||||
rules: [
|
|
||||||
{required: true, message: "请输入经办时间", trigger: "blur"},
|
|
||||||
],
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: "用户类型",
|
|
||||||
prop: "userId",
|
|
||||||
type: "select",
|
|
||||||
dicData: [
|
|
||||||
{
|
|
||||||
value: "0",
|
|
||||||
label: "未注册用户",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
value: "1",
|
|
||||||
label: "已注册用户",
|
|
||||||
},
|
|
||||||
],
|
|
||||||
display: false,
|
|
||||||
hide: true,
|
|
||||||
// search: true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: "分组",
|
|
||||||
prop: "groupId",
|
|
||||||
type: "tree",
|
|
||||||
span: 24,
|
|
||||||
display: true,
|
|
||||||
dicData: self.treeData,
|
|
||||||
props: {
|
|
||||||
label: "groupName",
|
|
||||||
value: "id",
|
|
||||||
},
|
|
||||||
rules: [
|
|
||||||
{
|
|
||||||
required: true,
|
|
||||||
message: "请选择分组",
|
|
||||||
trigger: "change",
|
|
||||||
},
|
|
||||||
],
|
|
||||||
placeholder: "请选择 分组",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: "标签名称",
|
|
||||||
prop: "labelsBase",
|
|
||||||
rules: [
|
|
||||||
{
|
|
||||||
required: true,
|
|
||||||
message: "请选择标签名称",
|
|
||||||
trigger: ["blur"],
|
|
||||||
},
|
|
||||||
],
|
|
||||||
slot: true,
|
|
||||||
formslot: true,
|
|
||||||
span: 24,
|
|
||||||
},
|
|
||||||
|
|
||||||
{
|
{
|
||||||
label: "备注",
|
label: "备注",
|
||||||
prop: "remarks",
|
prop: "remarks",
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ module.exports = {
|
|||||||
port: 1888,
|
port: 1888,
|
||||||
proxy: {
|
proxy: {
|
||||||
"/api": {
|
"/api": {
|
||||||
target: 'http://192.168.1.105:8000',
|
target: 'http://10.165.0.173:8000',
|
||||||
ws: true,
|
ws: true,
|
||||||
changeOrigin: true,
|
changeOrigin: true,
|
||||||
pathRewrite: {
|
pathRewrite: {
|
||||||
|
|||||||
Reference in New Issue
Block a user