Skip to content

V
vue-gic-people
Commit b7df0ef8 by member
Options

add: 提交回家过年可能要使用

parent 61191db1
Showing with 1434 additions and 1139 deletions
.babelrc
...@@ -3,5 +3,5 @@ ...@@ -3,5 +3,5 @@
["env", { "modules": false }], ["env", { "modules": false }],
"stage-3" "stage-3"
], ],
"plugins": ["transform-vue-jsx"] "plugins": ["transform-vue-jsx", "transform-runtime"]
} }
dist/vue-gic-people.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/vue-gic-people.js.map
This source diff could not be displayed because it is too large. You can view the blob instead.
package.json
{ {
"name": "@gic-test/vue-gic-people", "name": "@gic-test/vue-gic-people",
"description": "vue-gic-people Plugin", "description": "vue-gic-people Plugin",
"author": "fairyly <498745097@qq.com>", "author": "shiyao <syolmm@qq.com>",
"version": "1.4.2", "version": "1.8.91",
"license": "MIT", "license": "MIT",
"private": false, "private": false,
"main": "dist/vue-gic-people.js", "main": "dist/vue-gic-people.js",
...@@ -11,10 +11,15 @@ ...@@ -11,10 +11,15 @@
"build": "cross-env NODE_ENV=production webpack --progress --hide-modules" "build": "cross-env NODE_ENV=production webpack --progress --hide-modules"
}, },
"dependencies": { "dependencies": {
"@gic-test/vue-gic-datepicker": "^1.2.9", "@gic-test/vue-gic-datepicker": "^1.3.8",
"@gic-test/vue-gic-store-new": "^1.0.9", "@gic-test/vue-gic-people": "^1.7.0",
"@gic-test/vue-gic-store-new": "^1.3.1",
"@riophae/vue-treeselect": "0.0.35", "@riophae/vue-treeselect": "0.0.35",
"axios": "^0.18.0", "axios": "^0.18.0",
"babel-plugin-transform-runtime": "^6.23.0",
"element-ui": "^2.4.11",
"less": "^3.9.0",
"less-loader": "^4.1.0",
"localforage": "^1.7.2", "localforage": "^1.7.2",
"vue": "^2.5.11" "vue": "^2.5.11"
}, },
......
src/App.vue
<template> <template>
<div id="app"> <div id="app">
<vue-gic-people :projectName="projectName" :useId="useId" :hasSearchData="hasSearchData" :sceneValue="sceneValue" ref="peopleFilter" @findFilter="findFilter" @getBackData="getBackData" @editHide= "editHide" @editShow="editShow" @hideBtn="hideBtn"></vue-gic-people> <!-- <vue-gic-people :projectName="projectName" :useId="useId" :hasSearchData="hasSearchData" :sceneValue="sceneValue" ref="peopleFilter" @findFilter="findFilter" @getBackData="getBackData" @editHide= "editHide" @editShow="editShow" @hideBtn="hideBtn"></vue-gic-people>
<!-- // 按钮根据当前使用场景设置,有的无保存 --> <!-- // 按钮根据当前使用场景设置,有的无保存 -->
<!--
<div v-if="toggleTag"> <div v-if="toggleTag">
<button @click="getData">确定</button> <button @click="getData">确定</button>
<button @click="cancelFilter">取消</button> <button @click="cancelFilter">取消</button>
</div> </div>
<div v-else> <div v-else>
<button @click="saveTempData">保存</button> <button @click="saveTempData">保存</button>
</div> </div> -->
<!-- <gicSelect></gicSelect> -->
</div> </div>
</template> </template>
<script> <script>
import vueGicPeople from './lib/vue-gic-people' import gicSelect from './lib/gic-select';
export default { export default {
name: 'app', name: 'app',
...@@ -30,7 +33,7 @@ export default { ...@@ -30,7 +33,7 @@ export default {
} }
}, },
components: { components: {
vueGicPeople gicSelect
}, },
methods: { methods: {
// 父组件调用子组件方法,触发父组件事件 // 父组件调用子组件方法,触发父组件事件
...@@ -92,11 +95,3 @@ export default { ...@@ -92,11 +95,3 @@ export default {
}, },
} }
</script> </script>
<style lang="scss">
* {
margin: 0;
padding: 0;
}
</style>
src/lib/birth-select.vue 0 → 100644
<template>
<div class="birth-select">
<div class="start-date date-block">
<el-select v-model="startVal[0]" style="width: 100px" placeholder="月份" @change="handleStartMonthChange">
<el-option v-for="item in MonthList"
:value="item.value"
:key="item.key"
:label="item.label">
</el-option>
</el-select>
<span class="space"></span>
<el-select v-model="startVal[1]" style="width: 100px" placeholder="日期" @change="handleStartDateChange">
<el-option v-for="item in startDateList"
:value="item.value"
:key="item.key"
:label="item.label">
</el-option>
</el-select>
</div>
<span class="range">至</span>
<div class="end-date date-block">
<el-select v-model="endVal[0]" style="width: 100px" placeholder="月份" @change="handleEndMonthChange">
<el-option v-for="item in MonthList"
:value="item.value"
:key="item.key"
:label="item.label">
</el-option>
</el-select>
<span class="space"></span>
<el-select v-model="endVal[1]" style="width: 100px" placeholder="日期" @change="handleEndDateChange">
<el-option v-for="item in endDateList"
:value="item.value"
:key="item.key"
:label="item.label">
</el-option>
</el-select>
</div>
</div>
</template>
<script>
export default {
name: 'GicSelect',
props: {
dateval: [String, Array]
},
data() {
return {
startVal: ['', ''],
endVal: ['', ''],
// 月份
MonthList: [
{ key: 1, value: '01', label: '1月' },
{ key: 2, value: '02', label: '2月' },
{ key: 3, value: '03', label: '3月' },
{ key: 4, value: '04', label: '4月' },
{ key: 5, value: '05', label: '5月' },
{ key: 6, value: '06', label: '6月' },
{ key: 7, value: '07', label: '7月' },
{ key: 8, value: '08', label: '8月' },
{ key: 9, value: '09', label: '9月' },
{ key: 10, value: '10', label: '10月' },
{ key: 11, value: '11', label: '11月' },
{ key: 12, value: '12', label: '12月' },
],
// 日期
daysList: [ ['01', '03', '05', '07', '08', '10', '12'], ['02'], ['04', '06', '09', '11'] ],
startDateList: [
{ key: 1, value: '01', label: '1日' },
{ key: 2, value: '02', label: '2日' },
{ key: 3, value: '03', label: '3日' },
{ key: 4, value: '04', label: '4日' },
{ key: 5, value: '05', label: '5日' },
{ key: 6, value: '06', label: '6日' },
{ key: 7, value: '07', label: '7日' },
{ key: 8, value: '08', label: '8日' },
{ key: 9, value: '09', label: '9日' },
{ key: 10, value: '10', label: '10日' },
{ key: 11, value: '11', label: '11日' },
{ key: 12, value: '12', label: '12日' },
{ key: 13, value: '13', label: '13日' },
{ key: 14, value: '14', label: '14日' },
{ key: 15, value: '15', label: '15日' },
{ key: 16, value: '16', label: '16日' },
{ key: 17, value: '17', label: '17日' },
{ key: 18, value: '18', label: '18日' },
{ key: 19, value: '19', label: '19日' },
{ key: 20, value: '20', label: '20日' },
{ key: 21, value: '21', label: '21日' },
{ key: 22, value: '22', label: '22日' },
{ key: 23, value: '23', label: '23日' },
{ key: 24, value: '24', label: '24日' },
{ key: 25, value: '25', label: '25日' },
{ key: 26, value: '26', label: '26日' },
{ key: 27, value: '27', label: '27日' },
{ key: 28, value: '28', label: '28日' },
{ key: 29, value: '29', label: '29日' },
{ key: 30, value: '30', label: '30日' },
{ key: 31, value: '31', label: '31日' }
],
endDateList: [
{ key: 1, value: '01', label: '1日' },
{ key: 2, value: '02', label: '2日' },
{ key: 3, value: '03', label: '3日' },
{ key: 4, value: '04', label: '4日' },
{ key: 5, value: '05', label: '5日' },
{ key: 6, value: '06', label: '6日' },
{ key: 7, value: '07', label: '7日' },
{ key: 8, value: '08', label: '8日' },
{ key: 9, value: '09', label: '9日' },
{ key: 10, value: '10', label: '10日' },
{ key: 11, value: '11', label: '11日' },
{ key: 12, value: '12', label: '12日' },
{ key: 13, value: '13', label: '13日' },
{ key: 14, value: '14', label: '14日' },
{ key: 15, value: '15', label: '15日' },
{ key: 16, value: '16', label: '16日' },
{ key: 17, value: '17', label: '17日' },
{ key: 18, value: '18', label: '18日' },
{ key: 19, value: '19', label: '19日' },
{ key: 20, value: '20', label: '20日' },
{ key: 21, value: '21', label: '21日' },
{ key: 22, value: '22', label: '22日' },
{ key: 23, value: '23', label: '23日' },
{ key: 24, value: '24', label: '24日' },
{ key: 25, value: '25', label: '25日' },
{ key: 26, value: '26', label: '26日' },
{ key: 27, value: '27', label: '27日' },
{ key: 28, value: '28', label: '28日' },
{ key: 29, value: '29', label: '29日' },
{ key: 30, value: '30', label: '30日' },
{ key: 31, value: '31', label: '31日' }
]
};
},
methods: {
//
handleMonthValue(position, val) {
const WM = this.daysList.findIndex((item, i) => {
return item.includes(val);
});
if (position == 'start') {
this.handleChangeData(this.startDateList, WM);
} else if ('end') {
this.handleChangeData(this.endDateList, WM);
}
},
handleChangeData(data, inx) {
const length = data.length; // 31 29 30
if (inx == 0) {
// 31天
this.handleLength(length, data, 0);
} else if (inx == 2) {
// 如果升级 30天
this.handleLength(length, data, 1);
} else {
// 29天
this.handleLength(length, data, 2);
}
},
handleLength(length, data, days) {
if (length == 31) {
if (days == 0) {
return;
} else if (days == 1) {
data.pop();
} else if (days == 2) {
data.splice(29, 2);
}
} else if (length == 30) {
if (days == 0) {
data.push({ key: 31, value: '31', label: '31日' });
} else if (days == 1) {
return;
} else if (days == 2) {
data.splice(29, 1);
}
} else if (length == 29) {
if (days == 0) {
data.push({ key: 30, value: '30', label: '30日' });
data.push({ key: 31, value: '31', label: '31日' });
} else if (days == 1) {
data.push({ key: 30, value: '30', label: '30日' });
} else if (days == 2) {
return;
}
}
},
// 开始月份
handleStartMonthChange(val) {
this.handleMonthValue('start', val);
this.handleDate();
this.$emit('change');
},
handleStartDateChange(val) {
this.handleDate();
this.$emit('change');
},
handleEndMonthChange(val) {
this.handleMonthValue('end', val);
this.handleDate();
this.$emit('change');
},
handleEndDateChange(val) {
this.handleDate();
this.$emit('change');
},
handleDate() {
if (!this.startVal[0] || !this.startVal[0] || !this.endVal[0] || !this.endVal[1]) {
return;
}
const start = this.startVal.join('');
const end = this.endVal.join('');
if (start - end > 0) {
this.$message.warning('开始生日日期不能大于结束日期');
this.$emit('update:dateval', '');
return;
}
const value = [start, end];
this.$emit('update:dateval', value);
},
// 回显数据
replay(start, end) {
this.startVal[0] = start.slice(0, 2);
this.startVal[1] = start.slice(2, 4);
this.endVal[0] = end.slice(0, 2);
this.endVal[1] = end.slice(2, 4);
}
},
created() {
if (this.dateval[0] && this.dateval[1]) {
this.replay(this.dateval[0], this.dateval[1]);
}
}
};
</script>
<style lang="scss" scoped>
.birth-select {
.date-block {
display: inline-block;
.space {
display: inline-block;
width: 10px;
}
}
.range {
display: inline-block;
vertical-align: middle;
width: 30px;
height: 32px;
line-height: 32px;
font-size: 12px;
text-align: center;
}
}
</style>
src/lib/filter-txt.vue
<template> <template>
<p class="filtertxt"> <div class="filtertxt" v-if="templateArr.length > 0">
<span v-if="singleTxt">{{singleTxt}}</span> <span v-if="templateArr.length === 1 && templateArr[0].length === 1">
<span v-for="(txt, i) in templateArr" :key="i" v-if="templateArr && templateArr.length"> <span>(</span>
<span v-for="(txt, i) in templateArr[0]" :key="'hash' + i.toString()" class="light-txt">{{txt}}</span>
<span>)</span>
</span>
<span v-if="templateArr.length === 1 && templateArr[0].length > 1">
<span>(</span>
<span v-for="(txt, i) in templateArr[0]" :key="'hash' + i.toString()">
<span v-if="i !== 0 && templateArr[0].length - 1 && txt">&nbsp;或者&nbsp;</span>
<span class='light-txt' v-if="txt">{{txt}}</span>
</span>
<span>)</span>
</span>
<span v-if="templateArr.length > 1 && templateArr[i][0]" v-for="(txt, i) in templateArr" :key="'hash' + i.toString()">
<span v-if="i !== 0">&nbsp;且&nbsp;</span>
<span>(</span>
<span v-for="(item, index) in templateArr[i]" :key="'hashinner' + index.toString()">
<span v-if="index !== 0 && templateArr[i].length - 1 && item">&nbsp;或者&nbsp;</span>
<span class='light-txt' v-if="item">{{item}}</span>
</span>
<span>)</span>
</span>
<!-- <span v-for="(txt, i) in templateArr" :key="i" v-if="templateArr.length > 1">
<span v-if="i !== 0">&nbsp;且&nbsp;</span> <span v-if="i !== 0">&nbsp;且&nbsp;</span>
<span v-for="(item, index) in templateArr[i]" :key="index"> <span v-for="(item, index) in templateArr[i]" :key="index">
<span v-if="index !== 0 && index !== templateArr[i].length - 1">&nbsp;或&nbsp;</span> <span v-if="index !== 0 && index !== templateArr[i].length - 1">&nbsp;或&nbsp;</span>
<span :class="(index !== 0 && index !== templateArr[i].length - 1) ? 'light-txt' : ''">{{item}}</span> <span :class="(index !== 0 && index !== templateArr[i].length - 1) ? 'light-txt' : ''">{{item}}</span>
</span> </span>
</span> </span> -->
</p> </div>
<div v-else>
</div>
</template> </template>
<script> <script>
...@@ -23,39 +52,74 @@ export default { ...@@ -23,39 +52,74 @@ export default {
data() { data() {
return { return {
templateArr: [], templateArr: [],
singleTxt: '' singleTxt: '',
templateText: ''
} }
}, },
beforeMount() {
let middletxt = this.templatetxt; methods: {
// 只有一条 没有或 getText() {
let middletxt = this.templateText;
if (!middletxt) {
return;
}
// 只有括号
if (!middletxt.replace(/[\(|\)]/g, '')) {
return;
}
// 只有一条 没有或 没有且
// middletxt
if (!middletxt.includes('或') && !middletxt.includes('且')) { if (!middletxt.includes('或') && !middletxt.includes('且')) {
this.singleTxt = middletxt; middletxt = middletxt.replace(/[\(|\)]/g, '');
this.templateArr.push([middletxt]);
} }
// 只有一条 有或 没有且 // 只有一条 有或 没有且
if (middletxt.includes('或') && !middletxt.includes('且')) { if (middletxt.includes('或') && !middletxt.includes('且')) {
middletxt = middletxt.replace(/\)/g, '').split('或'); middletxt = middletxt.replace(/[\(|\)]/g, '');
middletxt.push(')'); middletxt = middletxt.split('或');
this.templateArr = [middletxt]; this.templateArr.push(middletxt);
} }
// 两条 有且 有或 没有 或 // 两条 有且 有或 没有 或
// (所属主门店包含自营...)且(会员开卡时间2018-11-09 00:00:00至2018-12-04 23:59:59)
if (middletxt.includes('且')) { if (middletxt.includes('且')) {
if (middletxt.includes('或')) { if (middletxt.includes('或')) {
// (年龄等于12且(所属主门店包含自营) // (年龄等于12且(所属主门店包含自营)
middletxt = middletxt.split('且'); middletxt = middletxt.split('且');
middletxt = middletxt.map(ele => { middletxt.forEach(ele => {
let eletxt = ele.replace(/\)/g, ''); let txt = ele.replace(/[\(|\)]/g, '');
let ret = eletxt.split('或'); let txtArr = txt.split('或');
ret.push(')'); this.templateArr.push(txtArr);
return ret;
}); });
this.templateArr = middletxt;
} else { } else {
this.singleTxt = middletxt; middletxt = middletxt.split('且');
middletxt.forEach(ele => {
let txt = ele.replace(/[\(|\)]/g, '');
this.templateArr.push([txt]);
});
} }
} }
console.log(this.templateArr);
} }
},
watch: {
templatetxt: {
immediate: true,
handler(newval) {
this.templateArr = [];
this.templateText = newval;
this.getText();
}
}
}
}; };
</script> </script>
<style> <style>
......
src/lib/tags.vue
...@@ -253,4 +253,7 @@ export default { ...@@ -253,4 +253,7 @@ export default {
.vue-input-tag-wrapper.read-only { .vue-input-tag-wrapper.read-only {
cursor: default; cursor: default;
} }
.new-tag::placeholder {
color: #ccc;
}
</style> </style>
src/lib/vue-gic-people.vue
...@@ -2,43 +2,26 @@ ...@@ -2,43 +2,26 @@
<div class="people-content"> <div class="people-content">
<!-- 选择模板 --> <!-- 选择模板 -->
<div class="people-temp-head"> <div class="people-temp-head">
<!-- <div class="temp-wrap">
<label class="member-templates-title">人群模板</label>
<el-select v-model="tempValue" class="temp-select" placeholder="请选择" @change="tempChangeList">
<el-option
v-for="item in tempOptions"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</div> -->
<!-- 模板内容 --> <!-- 模板内容 -->
<div class="condition-detail-contain" v-if="conditionDetailShow"> <div class="condition-detail-contain" v-if="conditionDetailShow">
<div class="screening-condition"> <div class="screening-condition">
<div class="detail" id="detail-tempcondition"> <div class="detail" id="detail-tempcondition">
<!-- (<span class="bg_blue"><b>活跃于</b>最近30天</span>
<span class="word">或者</span>
<span class="bg_blue"><b>活跃于</b>最近30天</span>
<span class="word">或者</span>
<span class="bg_blue"><b>活跃于</b>最近30天</span>
<span class="word">或者</span>
<span class="bg_yellow">在新增后3天内<b>页面点击</b>次数&gt;=1</span>)
<span class="word">且</span> (
<span class="bg_blue"><b>活跃于</b>2017-12-07到2017-12-13</span>
<span class="word">或者</span>
<span class="bg_blue"><b>新增于</b>最近30天</span>
<span class="word">或者</span>
<span class="bg_blue"><b>活跃于</b>最近30天</span>) -->
<filter-txt :templatetxt="templatetxt"></filter-txt> <filter-txt :templatetxt="templatetxt"></filter-txt>
</div> </div>
<span class="el-icon-edit btn-edit-group" id="btn-edit-group-tempcondition" title="编辑用户群" @click="editTemp" style="display: inline-block;"></span> <span
<span class="el-icon-delete btn-cancel-group" id="btn-cancel-group-tempcondition" title="重置条件" @click="resetTemp"></span> class="el-icon-edit btn-edit-group"
id="btn-edit-group-tempcondition"
title="编辑用户群"
@click="editTemp"
style="display: inline-block;"
></span>
<span
class="el-icon-delete btn-cancel-group"
id="btn-cancel-group-tempcondition"
title="重置条件"
@click="resetTemp"
></span>
</div> </div>
<!-- <div class="button-group marginLeft134 button-group-save" id="save-tempcondition">
<button class="gic-btn gic-btn-preserve gic-btn-save" @click="saveTemp">保存</button>
</div> -->
</div> </div>
<!-- end --> <!-- end -->
...@@ -50,12 +33,19 @@ ...@@ -50,12 +33,19 @@
<!-- 增加内容部分 --> <!-- 增加内容部分 -->
<div id="app1" class="rations"> <div id="app1" class="rations">
<!-- 循环几行(并且)--> <!-- 循环几行(并且)-->
<div class="condition-cell" v-for="(item, index) in conditionsList" v-if="item.children.length>0"> <div
class="condition-cell"
v-for="(item, index) in conditionsList"
v-if="item.children.length>0"
>
<div class="andlabels labelsbg_white" data-ration-id="index" v-if="index!=0">并且</div> <div class="andlabels labelsbg_white" data-ration-id="index" v-if="index!=0">并且</div>
<div class="filter-box inline-block ration" data-ration-id="index" > <div class="filter-box inline-block ration" data-ration-id="index">
<!-- 循环几行(或者) --> <!-- 循环几行(或者) -->
<div class="group_combo" data-group-id="1" v-for="(cellItem, key) in item.children"> <div
class="group_combo"
data-group-id="1"
v-for="(cellItem, key) in item.children"
>
<div class="orlabels" v-if="key!=0">或者</div> <div class="orlabels" v-if="key!=0">或者</div>
<!-- type="belong" --> <!-- type="belong" -->
<div class="filter-message groupbox"> <div class="filter-message groupbox">
...@@ -64,68 +54,135 @@ ...@@ -64,68 +54,135 @@
<!-- 一行循环了几个 --> <!-- 一行循环了几个 -->
<template v-for="(childCell,ind) in cellItem.children"> <template v-for="(childCell,ind) in cellItem.children">
<div class="gic-select-wrap inline-block" v-if="childCell.templateCode == 'com001'&& storeFlag && childCell.widgetName "> <div
<vue-gic-store-new :options="childCell.storeOption" :uuid.sync="childCell.uuid"></vue-gic-store-new> class="gic-select-wrap inline-block"
:key="ind"
v-if="childCell.templateCode == 'com020'&& childCell.storeFlag"
>
<vue-gic-store-new
:options="childCell.storeOption"
:key="ind"
:uuid.sync="childCell.uuid"
:isAdd="childCell.operateType"
></vue-gic-store-new>
</div> </div>
<!-- 下拉单选 --> <!-- 下拉单选 -->
<!-- && !childCell.widgetName --> <!-- && !childCell.widgetName -->
<div class="gic-select-wrap inline-block" v-if="childCell.templateCode == 'com001' && !childCell.widgetName"> <div
class="gic-select-wrap inline-block"
v-if="childCell.templateCode == 'com001' && !childCell.widgetName"
>
<div class="gic-select"> <div class="gic-select">
<el-select v-model="childCell.levelModel" class="temp-select" placeholder="请选择" @focus="selectFocus(index,key,ind)" @change="tempChange(index,key,ind)"> <el-select
v-model="childCell.levelModel"
class="temp-select"
placeholder="请选择"
@focus="selectFocus(index,key,ind)"
@change="tempChange(index,key,ind)"
>
<el-option <el-option
v-for="item in childCell.levelOptions" v-for="item in childCell.levelOptions"
:label="item.value" :label="item.value"
:key="item.key" :key="item.key"
:value="item.key"> :value="item.key"
</el-option> ></el-option>
</el-select> </el-select>
</div> </div>
</div> </div>
<!-- 下拉多选 最后控件--> <!-- 下拉多选 最后控件-->
<div class="gic-select-wrap inline-block" v-if="childCell.templateCode == 'com002'"> <div
<el-select v-model="childCell.levelModel" multiple class="temp-select" @focus="selectFocus(index,key,ind)" :placeholder="childCell" @change="tempChangeMultip($event,index,key,ind)"> class="gic-select-wrap inline-block"
v-if="childCell.templateCode == 'com002'"
>
<el-select
v-model="childCell.levelModel"
multiple
class="temp-select"
@focus="selectFocus(index,key,ind)"
placeholder="请选择"
@change="tempChangeMultip($event,index,key,ind)"
>
<el-option <el-option
v-for="item in childCell.levelOptions" v-for="item in childCell.levelOptions"
:label="item.value" :label="item.value"
:key="item.key" :key="item.key"
:value="item.key"> :value="item.key"
</el-option> ></el-option>
</el-select> </el-select>
</div> </div>
<!-- 单选+输入框 -->
<!-- <div class="gic-select-wrap inline-block" v-if="childCell.templateCode == 'com003'">
<el-select v-model="childCell.levelModel" class="temp-select" @focus="selectFocus(index,key,ind)" placeholder="请选择" @change="tempChange(index,key,ind)">
<el-option
v-for="item in childCell.levelOptions"
:key="item.key"
:label="item.value"
:value="item.key">
</el-option>
</el-select>
</div> -->
<!-- 加输入框 最后控件--> <!-- 加输入框 最后控件-->
<div class="gic-select-wrap inline-block" v-if="childCell.templateCode == 'com003'"> <div
<el-input v-model="childCell.levelModel" class="select-wrap-input" placeholder="请输入" @focus="selectFocus(index,key,ind)" @keyup.native="(value) => toInput(value,index,key,ind)"></el-input><label></label> class="gic-select-wrap inline-block"
v-if="childCell.templateCode == 'com003'"
>
<el-input
v-model="childCell.levelModel"
class="select-wrap-input"
placeholder="请输入"
@focus="selectFocus(index,key,ind)"
@keyup.native="(value) => toInput(value,index,key,ind)"
></el-input>
<label></label>
</div> </div>
<!-- 加区间输入框 最后控件--> <!-- 加区间输入框 最后控件-->
<div class="gic-select-wrap inline-block" v-if="childCell.templateCode == 'com013'"> <div
<el-input v-model="childCell.levelModel[0]" class="select-wrap-input" style="margin-right: 0;" :placeholder="childCell.widgetInstruction" @blur="blurFrom" @focus="selectFocus(index,key,ind)" ></el-input><!-- @keyup.native="(value) => toInputFrom(value)" --> class="gic-select-wrap inline-block"
<label> - </label> v-if="childCell.templateCode == 'com013'"
<el-input v-model="childCell.levelModel[1]" class="select-wrap-input" style="margin-right: 0;" :placeholder="childCell.widgetInstruction" @blur="blurTo" @focus="selectFocus(index,key,ind)" ></el-input><!-- @keyup.native="(value) => toInputTo(value)" --> >
<el-input
v-model="childCell.levelModel[0]"
class="select-wrap-input"
style="margin-right: 0;"
:placeholder="childCell.widgetInstruction"
@blur="blurFrom"
@focus="selectFocus(index,key,ind)"
></el-input>
<!-- @keyup.native="(value) => toInputFrom(value)" -->
<label>-</label>
<el-input
v-model="childCell.levelModel[1]"
class="select-wrap-input"
style="margin-right: 0;"
:placeholder="childCell.widgetInstruction"
@blur="blurTo"
@focus="selectFocus(index,key,ind)"
></el-input>
<!-- @keyup.native="(value) => toInputTo(value)" -->
</div> </div>
<!-- 下拉树形结构 最后控件--> <!-- 下拉树形结构 最后控件-->
<div class="gic-select-wrap inline-block" v-if="childCell.templateCode == 'com004'"> <div
<treeselect v-model="childCell.levelModel" :multiple="true" placeholder="请选择" :options="childCell.levelOptions" noOptionsText="暂无数据" noResultsText="无数据" noChildrenText="无数据" :normalizer="normalizer" :value-consists-of="valueConsistsOf" :searchable="false" :clearable="false" @open="selectFocus(index,key,ind)" @select="selectTree($event,index,key,ind)" @deselect="deSelectTree($event,index,key,ind)"/><!-- :normalizer="normalizer" --> class="gic-select-wrap inline-block"
v-if="childCell.templateCode == 'com004'"
>
<treeselect
v-model="childCell.levelModel"
:multiple="true"
placeholder="请选择"
:options="childCell.levelOptions"
noOptionsText="暂无数据"
noResultsText="无数据"
noChildrenText="无数据"
:normalizer="normalizer"
:value-consists-of="valueConsistsOf"
:searchable="false"
:clearable="false"
@open="selectFocus(index,key,ind)"
@select="selectTree($event,index,key,ind)"
@deselect="deSelectTree($event,index,key,ind)"
/>
<!-- :normalizer="normalizer" -->
</div> </div>
<!-- 搜索后出现下列 最后控件--> <!-- 搜索后出现下列 最后控件-->
<div class="gic-select-wrap inline-block input-search-select" v-if="childCell.templateCode == 'com005'"> <div
class="gic-select-wrap inline-block input-search-select"
v-if="childCell.templateCode == 'com005'"
>
<el-select <el-select
v-model="childCell.levelModel" v-model="childCell.levelModel"
multiple multiple
...@@ -142,13 +199,15 @@ ...@@ -142,13 +199,15 @@
v-for="item in childCell.levelOptions" v-for="item in childCell.levelOptions"
:key="item.key" :key="item.key"
:label="item.value" :label="item.value"
:value="item.key"> :value="item.key"
</el-option> ></el-option>
</el-select> </el-select>
</div> </div>
<!-- 时间区间年月日-年月日 最后控件--> <!-- 时间区间年月日-年月日 最后控件-->
<div class="gic-select-wrap inline-block" v-if="childCell.templateCode == 'com006'"> <div
class="gic-select-wrap inline-block"
v-if="childCell.templateCode == 'com006'"
>
<el-date-picker <el-date-picker
v-model="childCell.levelModel" v-model="childCell.levelModel"
type="daterange" type="daterange"
...@@ -162,86 +221,112 @@ ...@@ -162,86 +221,112 @@
:picker-options="pickerOptions" :picker-options="pickerOptions"
@focus="selectFocus(index,key,ind)" @focus="selectFocus(index,key,ind)"
@change="changeDate($event,index,key,ind)" @change="changeDate($event,index,key,ind)"
> ></el-date-picker>
</el-date-picker>
</div> </div>
<!-- 下拉多选异步() 最后控件--> <!-- 下拉多选异步() 最后控件-->
<div class="gic-select-wrap inline-block" v-if="childCell.templateCode == 'com007'" @click="selectFocus(index,key,ind)"> <div
<el-select v-model="childCell.levelModel" multiple class="temp-select" v-if="" @focus="selectFocus(index,key,ind)" placeholder="请选择" @change="tempChangeMultip($event,index,key,ind)"> class="gic-select-wrap inline-block"
v-if="childCell.templateCode == 'com007'"
@click="selectFocus(index,key,ind)"
>
<el-select
v-model="childCell.levelModel"
multiple
class="temp-select"
v-if
@focus="selectFocus(index,key,ind)"
placeholder="请选择"
@change="tempChangeMultip($event,index,key,ind)"
>
<el-option <el-option
v-for="item in childCell.levelOptions" v-for="item in childCell.levelOptions"
:key="item.key" :key="item.key"
:label="item.value" :label="item.value"
:value="item.key"> :value="item.key"
</el-option> ></el-option>
</el-select> </el-select>
</div> </div>
<!-- 时间区间 月日- 月日 最后控件--> <!-- 时间区间 月日- 月日 最后控件-->
<div class="gic-select-wrap inline-block" v-if="childCell.templateCode == 'com008'"> <div
<vue-gic-datepicker class="gic-select-wrap inline-block"
v-model="childCell.levelModel" v-if="childCell.templateCode == 'com008'"
type="daterange"
:editable="false"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
format="MMdd"
value-format="MMdd"
:picker-options="pickerBirthOptions"
@focus="selectFocus(index,key,ind)"
@change="changeDate($event,index,key,ind)"
> >
</vue-gic-datepicker> <gic-select
:dateval.sync="childCell.levelModel"
@change="changeGicSelectValue(index, key, ind)"
></gic-select>
</div> </div>
<!-- 下拉单选异步 --> <!-- 下拉单选异步 -->
<div class="gic-select-wrap inline-block" v-if="childCell.templateCode == 'com009'"> <div
class="gic-select-wrap inline-block"
v-if="childCell.templateCode == 'com009'"
>
<div class="gic-select"> <div class="gic-select">
<el-select v-model="childCell.levelModel" class="temp-select" placeholder="请选择" @focus="selectFocus(index,key,ind)" @change="tempChange(index,key,ind)"> <el-select
v-model="childCell.levelModel"
class="temp-select"
placeholder="请选择"
@focus="selectFocus(index,key,ind)"
@change="tempChange(index,key,ind)"
>
<el-option <el-option
v-for="item in childCell.levelOptions" v-for="item in childCell.levelOptions"
:key="item.key" :key="item.key"
:label="item.value" :label="item.value"
:value="item.key"><!-- :key="item.key" --> :value="item.key"
>
<!-- :key="item.key" -->
</el-option> </el-option>
</el-select> </el-select>
</div> </div>
</div> </div>
<!-- input tag 最后控件--> <!-- input tag 最后控件-->
<div class="gic-select-wrap inline-block input-tags" v-if="childCell.templateCode == 'com010'"> <div
<!-- <el-select class="gic-select-wrap inline-block input-tags"
v-model="childCell.levelModel" v-if="childCell.templateCode == 'com010'"
multiple >
filterable <tags
allow-create :tags.sync="childCell.levelModel"
default-first-option @click="selectFocus(index,key,ind)"
:popper-append-to-body="false" :placeholder="childCell.widgetInstruction"
no-data-text= ' ' @tagsChange="changeCreate($event,index,key,ind)"
no-match-text=' ' />
placeholder="请输入"
@focus="selectFocus(index,key,ind)"
@change = "changeCreate($event,index,key,ind)">
<el-option
v-for="item in optionsNone"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select> -->
<tags :tags.sync="childCell.levelModel" @click="selectFocus(index,key,ind)" :placeholder="childCell.widgetInstruction" @tagsChange="changeCreate($event,index,key,ind)"/>
</div> </div>
<!-- 门店区域省市县树形 最后控件--> <!-- 门店区域省市县树形 最后控件-->
<div class="gic-select-wrap inline-block" v-if="childCell.templateCode == 'com011'"> <div
class="gic-select-wrap inline-block"
v-if="childCell.templateCode == 'com011'"
>
<!-- <vue-area-ab :projectName="projectName" :areaOptions="areaOptions" :index="index" :indexKey="key" :ind="ind" @selected="selected" @click="selectFocus(index,key,ind)"></vue-area-ab> --> <!-- <vue-area-ab :projectName="projectName" :areaOptions="areaOptions" :index="index" :indexKey="key" :ind="ind" @selected="selected" @click="selectFocus(index,key,ind)"></vue-area-ab> -->
<treeselect v-model="childCell.levelModel" :multiple="true" placeholder="请选择" :options="childCell.levelOptions" noOptionsText="暂无数据" noResultsText="无数据" noChildrenText="无数据" :normalizer="normalizer" value-consists-of="BRANCH_PRIORITY" :searchable="true" :clearable="false" @open="selectFocus(index,key,ind)" @select="selectTree($event,index,key,ind)" @deselect="deSelectTree($event,index,key,ind)"/> <treeselect
v-model="childCell.levelModel"
:multiple="true"
placeholder="请选择"
:options="childCell.levelOptions"
noOptionsText="暂无数据"
noResultsText="无数据"
noChildrenText="无数据"
:normalizer="normalizer"
value-consists-of="BRANCH_PRIORITY"
:searchable="true"
:clearable="false"
@open="selectFocus(index,key,ind)"
@select="selectTree($event,index,key,ind)"
@deselect="deSelectTree($event,index,key,ind)"
/>
</div> </div>
<!-- 时间区间年月日时分秒-年月日时分秒 最后控件v-if="childCell.templateCode == 'com012'"--> <!-- 时间区间年月日时分秒-年月日时分秒 最后控件v-if="childCell.templateCode == 'com012'"-->
<div class="gic-select-wrap inline-block" v-if="childCell.templateCode == 'com012'"><!-- default-time="235900" --> <div
class="gic-select-wrap inline-block"
v-if="childCell.templateCode == 'com012'"
>
<!-- default-time="235900" -->
<el-date-picker <el-date-picker
v-model="childCell.levelModel" v-model="childCell.levelModel"
type="daterange" type="daterange"
...@@ -255,24 +340,24 @@ ...@@ -255,24 +340,24 @@
:picker-options="pickerOptionsRange" :picker-options="pickerOptionsRange"
@focus="selectFocus(index,key,ind)" @focus="selectFocus(index,key,ind)"
@change="changeDate($event,index,key,ind)" @change="changeDate($event,index,key,ind)"
> ></el-date-picker>
</el-date-picker>
</div> </div>
</template> </template>
</div> </div>
</div> </div>
<!-- 或者条件 --> <!-- 或者条件 -->
<div class="add-or-box" v-if="item.children.length < orConditionLength"> <div class="add-or-box" v-if="item.children.length < orConditionLength">
<span class="add-or-words">或者</span> <span class="add-or-words">或者</span>
<span class="add-or-type" id=""> <span class="add-or-type" id>
<ul class="filter-button condition-type" id=""> <ul class="filter-button condition-type" id>
<li data-flag="or" v-for="(orItem,cindex) in conditionTypeList" data-index="index" data-key="key" data-conditiontype="belong" @click="orConditionClick(index,'or',orItem)">{{orItem.chainNodeName}}</li> <li
<!-- <li data-flag="or" data-index="index" data-key="key" data-conditiontype="baseinfo" @click="orConditionClick(index,'or','baseinfo')">基本信息</li> data-flag="or"
<li data-flag="or" data-index="index" data-key="key" data-conditiontype="meminfo" @click="orConditionClick(index,'or','meminfo')">会员信息</li> v-for="(orItem,cindex) in conditionTypeList"
<li data-flag="or" data-index="index" data-key="key" data-conditiontype="interact" @click="orConditionClick(index,'or','interact')">互动信息</li> data-index="index"
<li data-flag="or" data-index="index" data-key="key" data-conditiontype="consume" @click="orConditionClick(index,'or','consume')">消费行为</li> --> data-key="key"
data-conditiontype="belong"
@click="orConditionClick(index,'or',orItem)"
>{{orItem.chainNodeName}}</li>
</ul> </ul>
</span> </span>
</div> </div>
...@@ -280,42 +365,36 @@ ...@@ -280,42 +365,36 @@
<!-- 第一个end --> <!-- 第一个end -->
</div> </div>
</div> </div>
<div class="filter-and add-and-box addAndConditions" v-if="conditionsList.length < andConditionLength"> <div
class="filter-and add-and-box addAndConditions"
v-if="conditionsList.length < andConditionLength"
>
<span class="and-words" v-if="conditionsList.length > 0">并且</span> <span class="and-words" v-if="conditionsList.length > 0">并且</span>
<span class="conditionTypes"> <span class="conditionTypes">
<ul class="filter-button condition-type"> <ul class="filter-button condition-type">
<li data-flag="and" data-conditiontype="belong" v-for="(andItem,index) in conditionTypeList" @click="andConditionClick('and',andItem)">{{andItem.chainNodeName}}</li> <li
<!-- <li data-flag="and" data-conditiontype="baseinfo" @click="andConditionClick('and','baseinfo')">基本信息</li> data-flag="and"
<li data-flag="and" data-conditiontype="meminfo" @click="andConditionClick('and','meminfo')">会员信息</li> data-conditiontype="belong"
<li data-flag="and" data-conditiontype="interact" @click="andConditionClick('and','interact')">互动信息</li> v-for="(andItem,index) in conditionTypeList"
<li data-flag="and" data-conditiontype="consume" @click="andConditionClick('and','consume')">消费行为</li> --> @click="andConditionClick('and',andItem)"
>{{andItem.chainNodeName}}</li>
</ul> </ul>
</span> </span>
</div> </div>
</div> </div>
</div> </div>
<!-- <div class="people-temp-btns" v-if="conditionsShow">
<el-button type="primary" @click="confirmSet">确定</el-button>
<el-button @click="cancelSet">取消</el-button>
</div> -->
</div> </div>
<!-- end --> <!-- end -->
</div> </div>
<!-- 筛选条件 -->
<!-- end -->
</div> </div>
</template> </template>
<script> <script>
import Vue from 'vue'; import Vue from "vue";
import qs from "qs"; import qs from "qs";
import VueGicDatepicker from '@gic-test/vue-gic-datepicker'; import VueGicDatepicker from "@gic-test/vue-gic-datepicker";
import vueGicStoreNew from '@gic-test/vue-gic-store-new/src/lib/index.vue'; import VueGicStoreNew from "@gic-test/vue-gic-store-new";
// 使用树形插件 // 使用树形插件
// import the component // import the component
import Treeselect from "@riophae/vue-treeselect"; import Treeselect from "@riophae/vue-treeselect";
...@@ -325,13 +404,25 @@ import FilterTxt from "./filter-txt"; ...@@ -325,13 +404,25 @@ import FilterTxt from "./filter-txt";
// import vueAreaAb from './vue-area-ab' // import vueAreaAb from './vue-area-ab'
import tags from "./tags"; import tags from "./tags";
import GicSelect from "./birth-select";
import localforage from "localforage"; import localforage from "localforage";
import { _debounce } from "./public"; import { _debounce } from "./public";
import { setTimeout } from "timers";
Vue.use(VueGicStoreNew);
export default { export default {
name: "vue-gic-people", name: "vue-gic-people",
props: { props: {
isAdd: {
type: Boolean,
default: true
},
// 是否是触发重置按钮
triggerReset: {
type: Boolean,
default: false
},
projectName: String, // 项目名 projectName: String, // 项目名
sceneValue: String, // 场景值 sceneValue: String, // 场景值
useId: String, // 模板id useId: String, // 模板id
...@@ -340,6 +431,8 @@ export default { ...@@ -340,6 +431,8 @@ export default {
}, },
data() { data() {
return { return {
flagStore: false,
OperateType: "",
repProjectName: "gic-web", // 项目名 repProjectName: "gic-web", // 项目名
repSceneCode: "member", //场景值 repSceneCode: "member", //场景值
repId: "", // 模板id repId: "", // 模板id
...@@ -374,19 +467,12 @@ export default { ...@@ -374,19 +467,12 @@ export default {
function formatDig(num) { function formatDig(num) {
return num > 9 ? "" + num : "0" + num; return num > 9 ? "" + num : "0" + num;
} }
console.log(date);
this.birthBegin = this.birthBegin =
formatDig(new Date(date.minDate).getMonth() + 1) + formatDig(new Date(date.minDate).getMonth() + 1) +
formatDig(new Date(date.minDate).getDate()); formatDig(new Date(date.minDate).getDate());
this.birthEnd = this.birthEnd =
formatDig(new Date(date.maxDate).getMonth() + 1) + formatDig(new Date(date.maxDate).getMonth() + 1) +
formatDig(new Date(date.maxDate).getDate()); formatDig(new Date(date.maxDate).getDate());
console.log(
new Date(date.minDate).getMonth(),
new Date(date.maxDate),
this.birthBegin,
this.birthEnd
);
} }
}, },
...@@ -437,100 +523,7 @@ export default { ...@@ -437,100 +523,7 @@ export default {
optionsNone: [], optionsNone: [],
// 条件数据 // 条件数据
conditionsList: [ conditionsList: [],
// {
// id: '',
// chainNodeName: '归属信息',
// children: [
// {
// id: '',
// chainNodeName: '归属信息',
// type: 'belong',
// children:[
// {
// levelModel: '',
// templateCode: 'com001',
// levelOptions: [
// {
// value: '选项1',
// key: '黄金糕'
// },
// {
// value: '选项2',
// key: '黄金糕2'
// }
// ],
// },
// {
// levelModel: '',
// templateCode: 'com001',
// levelOptions: [
// {
// value: '选项11',
// key: '黄金糕11'
// },
// {
// value: '选项22',
// key: '黄金糕22'
// }
// ],
// },
// {
// levelModel: '',
// templateCode: 'com001',
// levelOptions: [
// {
// value: '选项13',
// key: '黄金糕13'
// },
// {
// value: '选项23',
// key: '黄金糕23'
// }
// ],
// },
// {
// levelModel: '',
// templateCode: 'com001',
// levelOptions: [],
// },
// {
// levelModel: null, // tree: null /['aa']; select: ''
// templateCode: 'com004',
// levelOptions: [
// {
// id: 'aa',
// label: 'a',
// children: [
// {
// id: 'aaa',
// label: 'aa',
// }, {
// id: 'abab',
// label: 'ab',
// }
// ],
// }
// ],
// },
// {
// levelModel: '',
// templateCode: 'com001',
// levelOptions: []
// }
// ]
// }
// ]
// }
],
// normalizer(node) {
// return {
// id: node.value,
// label: node.key,
// children: node.subOptions,
// }
// },
// tree // tree
treeFlag: false, treeFlag: false,
nodeId: "0", //获取门店分组参数 nodeId: "0", //获取门店分组参数
...@@ -597,7 +590,7 @@ export default { ...@@ -597,7 +590,7 @@ export default {
children: node.children children: node.children
}; };
} }
return {} return {};
}, },
// 条件类别列表数据 // 条件类别列表数据
...@@ -626,6 +619,12 @@ export default { ...@@ -626,6 +619,12 @@ export default {
} }
}, },
methods: { methods: {
// 接收生日时间范围值
changeGicSelectValue(i, j, k) {
this.conditionsList[i].children[j].columnValue = this.conditionsList[
i
].children[j].children[1].levelModel.toString();
},
// 过滤回显数据 // 过滤回显数据
filterPassValue(data = []) { filterPassValue(data = []) {
data = data.map((ele, index) => { data = data.map((ele, index) => {
...@@ -636,23 +635,34 @@ export default { ...@@ -636,23 +635,34 @@ export default {
let model = e.levelModel; // 用来对比 let model = e.levelModel; // 用来对比
// model 有基本类型和引用类型 // model 有基本类型和引用类型
let filterArr = []; let filterArr = [];
if (Array.isArray(model)) { if (Array.isArray(model) && model.length) {
// 树形结构 // 树形结构 移出去了
if (e && e.templateCode == 'com004') { // if (e && e.templateCode == 'com004') {
// let saveChild = e.levelOptions[0].children[0]; // // let saveChild = e.levelOptions[0].children[0];
e.levelOptions[0].children.length = 0; // e.levelOptions[0].children.length = 0;
// let middle = e.levelOptions[0].children.push(saveChild); // // let middle = e.levelOptions[0].children.push(saveChild);
filterArr.push(e.levelOptions[0].children); // filterArr.push(e.levelOptions[0].children);
} // }
// 保存levelModel 的值 // 保存levelModel 的值
model.forEach(mel => { model.forEach(mel => {
let middle = e.levelOptions.find(val => val.key == mel); if (e.levelOptions && e.levelOptions.length) {
let middle = e.levelOptions.find(val => {
if (val) {
return val.key == mel;
}
});
filterArr.push(middle); filterArr.push(middle);
}
}); });
} else { } else {
filterArr = if (e.levelOptions && e.levelOptions.length) {
e.levelOptions && filterArr = e.levelOptions.filter(item => {
e.levelOptions.filter(item => item.key == model); if (item) {
return item.key == model;
}
});
}
} }
e.levelOptions.length = 0; e.levelOptions.length = 0;
e.levelOptions = filterArr; e.levelOptions = filterArr;
...@@ -667,41 +677,30 @@ export default { ...@@ -667,41 +677,30 @@ export default {
// 模板选择 // 模板选择
tempChangeList(e) { tempChangeList(e) {
var that = this; var that = this;
console.log(e);
}, },
// 选择方法后,获取下级数据,追加到当行数据 // 选择方法后,获取下级数据,追加到当行数据
tempChange(index, key, order) { tempChange(index, key, order) {
var that = this; var that = this;
this.storeFlag = false; if (this.conditionsList[index].children[key].children[1]) {
console.log(index, key, order); this.conditionsList[index].children[key].children[1].storeFlag = false;
console.log(this.conditionsList[index].children); }
// 请求参数 // 请求参数
var parentChainId = var parentChainId =
that.conditionsList[index].children[key].children[order] that.conditionsList[index].children[key].children[order]
.esScreeningWidgetChainId; .esScreeningWidgetChainId;
var widgetFieldKey = var widgetFieldKey =
that.conditionsList[index].children[key].children[order].levelModel; that.conditionsList[index].children[key].children[order].levelModel;
that.getNextData(parentChainId, widgetFieldKey); that.getNextData(parentChainId, widgetFieldKey, {
index: index,
key: key,
order: order
});
}, },
// 下拉多选最后控件 // 下拉多选最后控件
tempChangeMultip(e, index, key, order) { tempChangeMultip(e, index, key, order) {
var that = this; var that = this;
console.log(
"下拉多选:",
String(e),
e.join(" "),
index,
key,
order,
that.conditionsList[index].children[key].columnValue
);
console.log(that.conditionsList[index].children[key]);
console.log(that.conditionsList[index].children[key].children[order]);
console.log(
that.conditionsList[index].children[key].children[order].levelModel
);
that.conditionsList[index].children[key].columnValue = e.join(" "); that.conditionsList[index].children[key].columnValue = e.join(" ");
}, },
...@@ -717,7 +716,6 @@ export default { ...@@ -717,7 +716,6 @@ export default {
qs.stringify(para) qs.stringify(para)
) )
.then(res => { .then(res => {
console.log(res, res.data, res.data.errorCode);
var resData = res.data; var resData = res.data;
if (resData.errorCode == 0) { if (resData.errorCode == 0) {
this.conditionTypeList = resData.result; this.conditionTypeList = resData.result;
...@@ -729,8 +727,6 @@ export default { ...@@ -729,8 +727,6 @@ export default {
}); });
}) })
.catch(function(error) { .catch(function(error) {
console.log(error);
// that.toLogin()
this.$message.error({ this.$message.error({
duration: 1000, duration: 1000,
message: error.message message: error.message
...@@ -739,7 +735,7 @@ export default { ...@@ -739,7 +735,7 @@ export default {
}, },
// 获取下级数据 // 获取下级数据
getNextData(parentChainId, widgetFieldKey) { getNextData(parentChainId, widgetFieldKey, indexObj) {
var that = this; var that = this;
that.$forceUpdate(); that.$forceUpdate();
var param = { var param = {
...@@ -754,18 +750,15 @@ export default { ...@@ -754,18 +750,15 @@ export default {
qs.stringify(param) qs.stringify(param)
) )
.then(res => { .then(res => {
console.log(res, res.data, res.data.errorCode);
var resData = res.data; var resData = res.data;
if (resData.errorCode == 0) { if (resData.errorCode == 0) {
var data = resData.result; var data = resData.result;
if (!resData.result) { if (!resData.result) {
console.log("zuihou: result-null"); this.$message.warning("没有此模板!");
return; return;
} }
// 如果切换了不是特殊的 16 ,先删除 // 如果切换了不是特殊的 16 ,先删除
console.log(
that.conditionsList[that.andIndex].children[that.orIndex]
);
// sy 添加文本内容 根据property字段 // sy 添加文本内容 根据property字段
if ( if (
data.property != 16 && data.property != 16 &&
...@@ -776,16 +769,6 @@ export default { ...@@ -776,16 +769,6 @@ export default {
delete that.conditionsList[that.andIndex].children[that.orIndex] delete that.conditionsList[that.andIndex].children[that.orIndex]
.dealKey; .dealKey;
} }
// if (data.property == 8) {
// // "property" : "8", //属性:1、计算属性(>,=), 2、字段属性(搜索字段名称)，4、值属性，8、不是属性 可以两两组合(比如，有事计算属性又是值属性，就是5
// that.conditionsList[that.andIndex].children[that.orIndex].columnKey = data.columnKey;
// that.conditionsList[that.andIndex].children[that.orIndex].computeCharacter = data.computeCharacter;
// that.conditionsList[that.andIndex].children[that.orIndex].columnValue = '';
// if (that.conditionsList[that.andIndex].children[that.orIndex].dealKey) {
// delete that.conditionsList[that.andIndex].children[that.orIndex].dealKey
// }
// console.log("data.property字段8:columnKey" ,data.property,data.columnKey,data.computeCharacter)
// }
// 计算 // 计算
if (data.property == 1) { if (data.property == 1) {
...@@ -804,11 +787,6 @@ export default { ...@@ -804,11 +787,6 @@ export default {
delete that.conditionsList[that.andIndex].children[that.orIndex] delete that.conditionsList[that.andIndex].children[that.orIndex]
.dealKey; .dealKey;
} }
console.log(
"data.property计算: computeCharacter",
data.property,
data.computeCharacter
);
} }
// 字段 // 字段
if (data.property == 2) { if (data.property == 2) {
...@@ -829,11 +807,6 @@ export default { ...@@ -829,11 +807,6 @@ export default {
delete that.conditionsList[that.andIndex].children[that.orIndex] delete that.conditionsList[that.andIndex].children[that.orIndex]
.dealKey; .dealKey;
} }
console.log(
"data.property字段:columnKey",
data.property,
data.columnKey
);
} }
// 计算属性+字段属性 // 计算属性+字段属性
if (data.property == 3) { if (data.property == 3) {
...@@ -854,11 +827,6 @@ export default { ...@@ -854,11 +827,6 @@ export default {
delete that.conditionsList[that.andIndex].children[that.orIndex] delete that.conditionsList[that.andIndex].children[that.orIndex]
.dealKey; .dealKey;
} }
console.log(
"data.property计算+字段:computeCharacter,columnKey",
data.computeCharacter,
data.columnKey
);
} }
// 值属性 // 值属性
if (data.property == 4) { if (data.property == 4) {
...@@ -866,33 +834,32 @@ export default { ...@@ -866,33 +834,32 @@ export default {
that.conditionsList[that.andIndex].children[ that.conditionsList[that.andIndex].children[
that.orIndex that.orIndex
].columnValue = data.columnValue; ].columnValue = data.columnValue;
console.log(
"data.property值属性:columnValue",
data.property,
data.columnValue
);
} }
// 新的门店 // 新的门店
// 门店 // 门店
if (data.property && data.chainNodeName.indexOf('门店') > -1) { if (data.property === 19 && data.widget.templateCode === "com020") {
this.conditionsList[this.andIndex].children[this.orIndex].dealKey = 'storeWidget'; this.conditionsList[this.andIndex].children[
console.log(this.conditionsList[this.andIndex].children[this.orIndex].dealKey); this.orIndex
} ].dealKey = "storeWidget";
// if ((data.property & 16) > 0) { }
// that.conditionsList[that.andIndex].children[ if ((data.property & 16) > 0) {
// that.orIndex that.conditionsList[that.andIndex].children[
// ].dealKey = data.dealKey; that.orIndex
// that.conditionsList[that.andIndex].children[that.orIndex].columnKey = data.columnKey; ].dealKey = data.dealKey;
// that.conditionsList[that.andIndex].children[that.orIndex].computeCharacter = data.computeCharacter; that.conditionsList[that.andIndex].children[
// that.conditionsList[that.andIndex].children[ that.orIndex
// that.orIndex ].columnKey = data.columnKey;
// ].columnValue = ""; that.conditionsList[that.andIndex].children[
// console.log("data.property门店:", data.property); that.orIndex
// } ].computeCharacter = data.computeCharacter;
that.conditionsList[that.andIndex].children[
that.orIndex
].columnValue = "";
}
// 判断是否把数据添加到下级组件中 // 判断是否把数据添加到下级组件中
that.addNextData(resData.result, widgetFieldKey); that.addNextData(resData.result, widgetFieldKey, indexObj);
return; return;
} }
that.$message.error({ that.$message.error({
...@@ -901,8 +868,6 @@ export default { ...@@ -901,8 +868,6 @@ export default {
}); });
}) })
.catch(function(error) { .catch(function(error) {
console.log(error);
// that.toLogin()
that.$message.error({ that.$message.error({
duration: 1000, duration: 1000,
message: error.message message: error.message
...@@ -911,30 +876,26 @@ export default { ...@@ -911,30 +876,26 @@ export default {
}, },
// 添加数据到下级组件,需要先清空当前组件以后所有数据 // 添加数据到下级组件,需要先清空当前组件以后所有数据
addNextData(item, fieldKey) { addNextData(item, fieldKey, indexObj) {
var that = this; var that = this;
console.log("添加的下级数据:", item);
// 先清空当前组件以后所有数据 // 先清空当前组件以后所有数据
var arrList = var arrList = this.conditionsList[this.andIndex].children[this.orIndex]
that.conditionsList[that.andIndex].children[that.orIndex].children; .children;
for (var i = 0; i < arrList.length; i++) { for (var i = 0; i < arrList.length; i++) {
if (that.componentIndex < i) { if (this.componentIndex < i) {
arrList.splice(i, 1); arrList.splice(i, 1);
--i; --i;
} }
} }
// sourceFlag 如果是 url // sourceFlag 如果是 url
if (!!item.widget && item.widget.sourceFlag == 1) { if (!!item.widget && item.widget.sourceFlag == 1) {
console.log(":sourceFlag:", item.widget.sourceFlag);
item.widget.widgetParam = JSON.parse(item.widget.widgetParam); item.widget.widgetParam = JSON.parse(item.widget.widgetParam);
console.log(item.widget.widgetParam[0]);
// 如果是搜索下拉多选 // 如果是搜索下拉多选
if (item.widget.templateCode == "com005") { if (item.widget.templateCode == "com005") {
that.conditionsList[that.andIndex].children[that.orIndex].children[ that.conditionsList[that.andIndex].children[that.orIndex].children[
that.componentIndex that.componentIndex
].url = item.widget.widgetParam[0].value; ].url = item.widget.widgetParam[0].value;
console.log(item.widget.widgetParam[0].value);
// 追加数据,显示下拉搜索双选组件,因为是多选,追加数据时候levelModel 是数组,不然选择时候报错 TypeError: value.push is not a function // 追加数据,显示下拉搜索双选组件,因为是多选,追加数据时候levelModel 是数组,不然选择时候报错 TypeError: value.push is not a function
that.pushData(item); that.pushData(item);
...@@ -960,31 +921,12 @@ export default { ...@@ -960,31 +921,12 @@ export default {
item.widget.templateCode == "com013"; item.widget.templateCode == "com013";
// 添加示范文本 // 添加示范文本
let widgetName; let widgetName;
const storeOption = [0]; const storeOption = [0, 1, 2, 3, 4, 5];
const levelOptions = JSON.parse(item.widget.widgetValues); const levelOptions = JSON.parse(item.widget.widgetValues);
// 门店组件 保存门店类型 传给门店组件
// 0 全部 1 门店类型 2门店标签 3 门店区域 4 门店分组 5 部分门店 // 0 全部 1 门店类型 2门店标签 3 门店区域 4 门店分组 5 部分门店
const storeConf = [ if (item.property === 19 && item.widget.templateCode === "com020") {
{ key: 1, type: '门店类型' },
{ key: 2, type: '门店标签' },
{ key: 3, type: '门店区域' },
{ key: 4, type: '门店分组' },
{ key: 5, type: '部分门店' }
];
// sy
if (item.widget.widgetName.indexOf('门店') > -1) {
this.storeFlag = true;
widgetName = item.widget.widgetName; widgetName = item.widget.widgetName;
levelOptions.forEach(el => {
storeConf.some(val => {
if (el.value == val.type) {
storeOption.push(val.key);
return true;
}
});
});
} }
const newObj = { const newObj = {
...@@ -993,15 +935,18 @@ export default { ...@@ -993,15 +935,18 @@ export default {
levelModel: conditionTag ? [] : "", levelModel: conditionTag ? [] : "",
templateCode: item.widget.templateCode, templateCode: item.widget.templateCode,
levelOptions: levelOptions, levelOptions: levelOptions,
widgetInstruction: item.widget.widgetInstruction, widgetInstruction: item.widget.widgetInstruction
? item.widget.widgetInstruction
: "请选择",
widgetName: widgetName, widgetName: widgetName,
storeOption: storeOption, storeOption: storeOption,
uuid: '' storeFlag: true,
operateType: true,
uuid: ""
}; };
console.log('当前数组', newObj); that.conditionsList[that.andIndex].children[that.orIndex].children.push(
newObj
that.conditionsList[that.andIndex].children[that.orIndex].children.push(newObj); );
console.log(that.conditionsList[that.andIndex].children[that.orIndex].children, '门店数据结构');
}, },
// 追加数据 // 追加数据
...@@ -1014,22 +959,20 @@ export default { ...@@ -1014,22 +959,20 @@ export default {
levelModel: [], levelModel: [],
templateCode: item.widget.templateCode, templateCode: item.widget.templateCode,
levelOptions: [], //JSON.parse(item.widget.widgetValues), levelOptions: [], //JSON.parse(item.widget.widgetValues),
widgetInstruction: item.widget.widgetInstruction, widgetInstruction: item.widget.widgetInstruction
? item.widget.widgetInstruction
: "请选择",
widgetName: item.widget.widgetName widgetName: item.widget.widgetName
}; };
that.conditionsList[that.andIndex].children[that.orIndex].children.push(newObj); that.conditionsList[that.andIndex].children[that.orIndex].children.push(
newObj
);
}, },
// 追加组件+数据 // 追加组件+数据
pushComData(item, options) { pushComData(item, options) {
var that = this; var that = this;
// 如果是门店树形结构
// if (item.widget.templateCode=='com004') {
// options.forEach(function(ele,index) {
// // ele.id = ele.storeGroupId
// })
// }
var newObj = {}; var newObj = {};
newObj = { newObj = {
esScreeningWidgetChainId: item.esScreeningWidgetChainId, esScreeningWidgetChainId: item.esScreeningWidgetChainId,
...@@ -1038,10 +981,7 @@ export default { ...@@ -1038,10 +981,7 @@ export default {
templateCode: item.widget.templateCode, templateCode: item.widget.templateCode,
levelOptions: options //JSON.parse(item.widget.widgetValues), levelOptions: options //JSON.parse(item.widget.widgetValues),
}; };
console.log(
"当前数组:",
that.conditionsList[that.andIndex].children[that.orIndex].children
);
that.conditionsList[that.andIndex].children[that.orIndex].children.push( that.conditionsList[that.andIndex].children[that.orIndex].children.push(
newObj newObj
); );
...@@ -1049,7 +989,6 @@ export default { ...@@ -1049,7 +989,6 @@ export default {
// 获取请求的url,请求数据到下级 // 获取请求的url,请求数据到下级
getUrlData(widgetParam, item, fieldKey) { getUrlData(widgetParam, item, fieldKey) {
console.log("获取请求的url:", widgetParam, item);
var that = this; var that = this;
var param = { var param = {
requestProject: that.repProjectName, requestProject: that.repProjectName,
...@@ -1059,13 +998,11 @@ export default { ...@@ -1059,13 +998,11 @@ export default {
that.axios that.axios
.post(that.baseUrl + widgetParam[0].value, qs.stringify(param)) .post(that.baseUrl + widgetParam[0].value, qs.stringify(param))
.then(res => { .then(res => {
console.log(res, res.data, res.data.errorCode);
var resData = res.data; var resData = res.data;
if (resData.errorCode == 0) { if (resData.errorCode == 0) {
// 判断省市县控件 // 判断省市县控件
if (item.widget.templateCode == "com011") { if (item.widget.templateCode == "com011") {
console.log("省市县控件>>>>>>>>>>>");
resData.result.forEach(function(ele, index) { resData.result.forEach(function(ele, index) {
ele.storeGroupId = ele.provinceId; ele.storeGroupId = ele.provinceId;
ele.storeGroupName = ele.provinceName; ele.storeGroupName = ele.provinceName;
...@@ -1077,7 +1014,6 @@ export default { ...@@ -1077,7 +1014,6 @@ export default {
} }
}); });
} }
console.log("resData.result>>>>>", resData.result);
that.pushComData(item, resData.result); that.pushComData(item, resData.result);
return; return;
} }
...@@ -1087,8 +1023,6 @@ export default { ...@@ -1087,8 +1023,6 @@ export default {
}); });
}) })
.catch(function(error) { .catch(function(error) {
console.log(error);
// that.toLogin()
that.$message.error({ that.$message.error({
duration: 1000, duration: 1000,
message: error.message message: error.message
...@@ -1099,14 +1033,32 @@ export default { ...@@ -1099,14 +1033,32 @@ export default {
// input tag // input tag
changeCreate(e, index, key, ind) { changeCreate(e, index, key, ind) {
var that = this; var that = this;
console.log("create input tag:", e, index, key, ind); if (!this.conditionsList[index].children[key].children[ind].holderFlag) {
this.conditionsList[index].children[key].children[
ind
].holderFlag = false;
}
if (!this.conditionsList[index].children[key].children[ind].holderFlag) {
this.conditionsList[index].children[key].children[
ind
].holderFlag = true;
this.conditionsList[index].children[key].children[
ind
].middleHolder = this.conditionsList[index].children[key].children[
ind
].widgetInstruction;
}
this.conditionsList[index].children[key].children[
ind
].widgetInstruction = e.length
? ""
: this.conditionsList[index].children[key].children[ind].middleHolder;
that.conditionsList[index].children[key].columnValue = e.join(" "); that.conditionsList[index].children[key].columnValue = e.join(" ");
}, },
// 输入框输入的时候 // 输入框输入的时候
toInput(e, index, key, ind) { toInput(e, index, key, ind) {
var that = this; var that = this;
console.log("输入值:", e.target.value, index, key, ind);
var value = e.target.value; var value = e.target.value;
that.conditionsList[that.andIndex].children[ that.conditionsList[that.andIndex].children[
that.orIndex that.orIndex
...@@ -1115,16 +1067,10 @@ export default { ...@@ -1115,16 +1067,10 @@ export default {
blurFrom(e) { blurFrom(e) {
var that = this; var that = this;
console.log(
"输入值From:",
e.target.value,
that.conditionsList[that.andIndex].children[that.orIndex],
Number(e.target.value.replace(/[^\.\d]/g, ""))
);
var value = !Number(e.target.value.replace(/[^\.\d]/g, "")) var value = !Number(e.target.value.replace(/[^\.\d]/g, ""))
? Number(0) ? Number(0)
: Number(e.target.value.replace(/[^\.\d]/g, "")); : Number(e.target.value.replace(/[^\.\d]/g, ""));
console.log(value, Number(e.target.value.replace(/[^\.\d]/g, "")));
// 判断输入 // 判断输入
let v1 = let v1 =
...@@ -1134,7 +1080,6 @@ export default { ...@@ -1134,7 +1080,6 @@ export default {
that.conditionsList[that.andIndex].children[that.orIndex].children[2] that.conditionsList[that.andIndex].children[that.orIndex].children[2]
.levelModel[1]; .levelModel[1];
if (!Number(v2) || Number(v1) >= Number(v2)) { if (!Number(v2) || Number(v1) >= Number(v2)) {
console.log("输入值From:v2", Number(v1), v2, value);
that.conditionsList[that.andIndex].children[ that.conditionsList[that.andIndex].children[
that.orIndex that.orIndex
].children[2].levelModel[0] = value; ].children[2].levelModel[0] = value;
...@@ -1151,12 +1096,6 @@ export default { ...@@ -1151,12 +1096,6 @@ export default {
].children[2].levelModel.join(","); ].children[2].levelModel.join(",");
return; return;
} }
// if (Number(v1) >= Number(v2)) {
// that.conditionsList[that.andIndex].children[that.orIndex].children[2].levelModel[1] = Number((!!Number(v1)? Number(v1):0) + 1)
// that.$forceUpdate();
// that.conditionsList[that.andIndex].children[that.orIndex].columnValue = that.conditionsList[that.andIndex].children[that.orIndex].children[2].levelModel.join(',')
// return;
// }
that.conditionsList[that.andIndex].children[ that.conditionsList[that.andIndex].children[
that.orIndex that.orIndex
...@@ -1171,15 +1110,10 @@ export default { ...@@ -1171,15 +1110,10 @@ export default {
}, },
blurTo(e) { blurTo(e) {
var that = this; var that = this;
console.log(
"输入值To:",
e.target.value,
that.conditionsList[that.andIndex].children[that.orIndex]
);
var value = !Number(e.target.value.replace(/[^\.\d]/g, "")) var value = !Number(e.target.value.replace(/[^\.\d]/g, ""))
? Number(0) ? Number(0)
: Number(e.target.value.replace(/[^\.\d]/g, "")); : Number(e.target.value.replace(/[^\.\d]/g, ""));
console.log(value);
let t1 = let t1 =
that.conditionsList[that.andIndex].children[that.orIndex].children[2] that.conditionsList[that.andIndex].children[that.orIndex].children[2]
.levelModel[0]; .levelModel[0];
...@@ -1219,13 +1153,6 @@ export default { ...@@ -1219,13 +1153,6 @@ export default {
].children[2].levelModel.join(","); ].children[2].levelModel.join(",");
return; return;
} }
// if (Number(t1) >= Number(t2)) {
// console.log("输入值To:",Number(t1))
// that.conditionsList[that.andIndex].children[that.orIndex].children[2].levelModel[1] = Number(Number(t1) + 1)
// that.$forceUpdate();
// that.conditionsList[that.andIndex].children[that.orIndex].columnValue = that.conditionsList[that.andIndex].children[that.orIndex].children[2].levelModel.join(',')
// return
// }
that.conditionsList[that.andIndex].children[ that.conditionsList[that.andIndex].children[
that.orIndex that.orIndex
...@@ -1242,19 +1169,10 @@ export default { ...@@ -1242,19 +1169,10 @@ export default {
// 输入框区间输入的时候 // 输入框区间输入的时候
toInputFrom(e) { toInputFrom(e) {
var that = this; var that = this;
console.log(
"输入值:",
e.target.value,
that.conditionsList[that.andIndex].children[that.orIndex]
);
var value = !Number(e.target.value.replace(/[^\d]/g, "")) var value = !Number(e.target.value.replace(/[^\d]/g, ""))
? "0" ? "0"
: Number(e.target.value.replace(/[^\d]/g, "")); : Number(e.target.value.replace(/[^\d]/g, ""));
console.log(
value,
Number(e.target.value.replace(/[^\d]/g, "")),
String(value).substr(String(value).length - 1, 1)
);
// 判断输入 // 判断输入
let v1 = let v1 =
...@@ -1289,11 +1207,7 @@ export default { ...@@ -1289,11 +1207,7 @@ export default {
}, },
toInputTo(e) { toInputTo(e) {
var that = this; var that = this;
console.log(
"输入值:",
e.target.value,
that.conditionsList[that.andIndex].children[that.orIndex]
);
var value = !Number(e.target.value.replace(/[^\d]/g, "")) var value = !Number(e.target.value.replace(/[^\d]/g, ""))
? "0" ? "0"
: Number(e.target.value.replace(/[^\d]/g, "")); : Number(e.target.value.replace(/[^\d]/g, ""));
...@@ -1332,16 +1246,13 @@ export default { ...@@ -1332,16 +1246,13 @@ export default {
// date 选择的时候 // date 选择的时候
changeDate(e, index, key, ind) { changeDate(e, index, key, ind) {
var that = this; var that = this;
console.log("选择 date:", e, index, key, ind);
that.conditionsList[index].children[key].columnValue = that.conditionsList[index].children[key].columnValue =
String(e) == "null" ? "" : String(e); String(e) == "null" ? "" : String(e);
console.log(that.conditionsList[index].children[key].columnValue.length);
}, },
// 添加并且条件 flag: and, conditiontype: belong/baseinfo/meminfo/interact/consume // 添加并且条件 flag: and, conditiontype: belong/baseinfo/meminfo/interact/consume
andConditionClick(flag, item) { andConditionClick(flag, item) {
var that = this; var that = this;
console.log("添加并且条件", flag, item);
// 显示确认取消按钮 // 显示确认取消按钮
that.$emit("editShow"); that.$emit("editShow");
// 判断是不是通过 url 请求数据 sourceFlag 是 url请求 // 判断是不是通过 url 请求数据 sourceFlag 是 url请求
...@@ -1358,7 +1269,6 @@ export default { ...@@ -1358,7 +1269,6 @@ export default {
// 添加或者条件 index: 第几个并条件; // 添加或者条件 index: 第几个并条件;
orConditionClick(index, flag, item) { orConditionClick(index, flag, item) {
var that = this; var that = this;
console.log("添加或者条件:", index, flag, item);
// 显示确认取消按钮 // 显示确认取消按钮
that.$emit("editShow"); that.$emit("editShow");
...@@ -1371,7 +1281,6 @@ export default { ...@@ -1371,7 +1281,6 @@ export default {
that.conditionsList[index].children.push( that.conditionsList[index].children.push(
that.judgeOrConditionType(item, JSON.parse(item.widget.widgetValues)) that.judgeOrConditionType(item, JSON.parse(item.widget.widgetValues))
); );
console.log(that.conditionsList[index].children, '开卡信息');
}, },
// 点击下拉事件 // 点击下拉事件
...@@ -1379,20 +1288,6 @@ export default { ...@@ -1379,20 +1288,6 @@ export default {
this.andIndex = index; this.andIndex = index;
this.orIndex = key; this.orIndex = key;
this.componentIndex = order; this.componentIndex = order;
console.log(
"第 " +
index +
" 个并条件中第 " +
key +
" 个或条件中第 " +
order +
" 个组件",
this.conditionsList[index].children[key].children[order]
);
console.log(
this.conditionsList[index].children[key].children[order].levelModel
);
const idCollection = this.conditionsList[index].children[key].children[ const idCollection = this.conditionsList[index].children[key].children[
order order
]; ];
...@@ -1408,29 +1303,52 @@ export default { ...@@ -1408,29 +1303,52 @@ export default {
) )
.then(res => { .then(res => {
const result = res.data.result; // 返回的结果 从第一层开始 const result = res.data.result; // 返回的结果 从第一层开始
if (result.chainNodeName === '开卡信息' || result.widget.templateCode === 'com009') { if (
result.chainNodeName === "开卡信息" ||
result.widget.templateCode === "com009"
) {
return; return;
} }
const retArr = JSON.parse(result.widget.widgetValues); const retArr = JSON.parse(result.widget.widgetValues);
const widgetParam = JSON.parse(result.widget.widgetParam); const widgetParam = JSON.parse(result.widget.widgetParam);
// 根据order来判断 // 根据order来判断
if (order == 0) { if (order == 0) {
this.spliceCollection(this.conditionsList[index].children[key].children[order].levelOptions, retArr); this.spliceCollection(
this.conditionsList[index].children[key].children[order]
.levelOptions,
retArr
);
} else if (order == 1) { } else if (order == 1) {
// 各种模板太多了 // 各种模板太多了
if (result.widget.templateCode == 'com002' || result.widget.templateCode == 'com001') { if (
this.spliceCollection(this.conditionsList[index].children[key].children[order].levelOptions, retArr); result.widget.templateCode == "com002" ||
} else if (result.widget.templateCode == 'com007') { result.widget.templateCode == "com001"
this.getSecondFilterData(widgetParam[0].value, result.widgetFieldKey, { index: index, key: key, order: order }, result); ) {
this.spliceCollection(
this.conditionsList[index].children[key].children[order]
.levelOptions,
retArr
);
} else if (result.widget.templateCode == "com007") {
this.getSecondFilterData(
widgetParam[0].value,
result.widgetFieldKey,
{ index: index, key: key, order: order },
result
);
} }
} else if (order == 2) { } else if (order == 2) {
// 输入框 // 输入框
if (result.widget.templateCode == 'com003') { if (result.widget.templateCode == "com003") {
return; return;
} }
// 单选下拉 // 单选下拉
if (result.widget.templateCode == 'com001') { if (result.widget.templateCode == "com001") {
this.spliceCollection(this.conditionsList[index].children[key].children[order].levelOptions, retArr); this.spliceCollection(
this.conditionsList[index].children[key].children[order]
.levelOptions,
retArr
);
} }
} }
}); });
...@@ -1444,9 +1362,8 @@ export default { ...@@ -1444,9 +1362,8 @@ export default {
* @param result 要传递给第二层要的参数 * @param result 要传递给第二层要的参数
*/ */
getSecondFilterData(url, fieldKey, itemList, result) { getSecondFilterData(url, fieldKey, itemList, result) {
console.log(result);
const templateCode = result.widget.templateCode; const templateCode = result.widget.templateCode;
if (templateCode == 'com007' || templateCode == 'com002') { if (templateCode == "com007" || templateCode == "com002") {
const param = { const param = {
requestProject: this.repProjectName, requestProject: this.repProjectName,
key: fieldKey key: fieldKey
...@@ -1456,9 +1373,13 @@ export default { ...@@ -1456,9 +1373,13 @@ export default {
.then(res => { .then(res => {
// 下拉集合 // 下拉集合
const retList = res.data.result; const retList = res.data.result;
this.spliceCollection(this.conditionsList[itemList.index].children[itemList.key].children[itemList.order].levelOptions, retList); this.spliceCollection(
this.conditionsList[itemList.index].children[itemList.key]
.children[itemList.order].levelOptions,
retList
);
}); });
} else if (templateCode == 'com001') { } else if (templateCode == "com001") {
// 单选模板 // 单选模板
const param = { const param = {
requestProject: this.repProjectName, requestProject: this.repProjectName,
...@@ -1466,9 +1387,12 @@ export default { ...@@ -1466,9 +1387,12 @@ export default {
widgetFieldKey: result.widgetFieldKey widgetFieldKey: result.widgetFieldKey
}; };
// 单选获取接口 // 单选获取接口
this.axios.post(`${this.baseUrl}/api-plug/get-screening-chain-detail`, qs.stringify(param)).then(res => { this.axios
console.log(res); .post(
}); `${this.baseUrl}/api-plug/get-screening-chain-detail`,
qs.stringify(param)
)
.then(res => {});
} }
}, },
...@@ -1490,15 +1414,13 @@ export default { ...@@ -1490,15 +1414,13 @@ export default {
// 选择搜索后的列表 // 选择搜索后的列表
changeRemote(e, index, key, ind) { changeRemote(e, index, key, ind) {
var that = this; var that = this;
console.log(e, index, key, ind);
that.conditionsList[index].children[key].columnValue = e.join(" "); //String(e) that.conditionsList[index].children[key].columnValue = e.join(" "); //String(e)
}, },
// 选择 tree 树形结构 // 选择 tree 树形结构
selectTree(e, index, key, ind) { selectTree(e, index, key, ind) {
var that = this; var that = this;
console.log(e, index, key, ind);
// console.log(that.conditionsList[index].children[key].children[ind])
var arr = {}; var arr = {};
setTimeout(function() { setTimeout(function() {
arr = JSON.parse( arr = JSON.parse(
...@@ -1506,26 +1428,17 @@ export default { ...@@ -1506,26 +1428,17 @@ export default {
that.conditionsList[index].children[key].children[ind].levelModel that.conditionsList[index].children[key].children[ind].levelModel
) )
); );
console.log(
JSON.stringify(arr),
that.conditionsList[index].children[key].children[ind].levelModel
);
that.conditionsList[that.andIndex].children[ that.conditionsList[that.andIndex].children[
that.orIndex that.orIndex
].columnValue = arr.join(" "); //String(arr) ].columnValue = arr.join(" "); //String(arr)
console.log(
that.conditionsList[that.andIndex].children[that.orIndex].columnValue
);
}, 100); }, 100);
// var arr = {} // var arr = {}
// arr = JSON.parse(JSON.stringify(that.conditionsList[index].children[key].children[ind])) // arr = JSON.parse(JSON.stringify(that.conditionsList[index].children[key].children[ind]))
// console.log(JSON.stringify(arr),that.conditionsList[index].children[key].children[ind].levelModel)
}, },
// 不选tree // 不选tree
deSelectTree(e, index, key, ind) { deSelectTree(e, index, key, ind) {
var that = this; var that = this;
console.log(e, index, key, ind);
// console.log(that.conditionsList[index].children[key].children[ind])
var arr = {}; var arr = {};
setTimeout(function() { setTimeout(function() {
arr = JSON.parse( arr = JSON.parse(
...@@ -1533,11 +1446,9 @@ export default { ...@@ -1533,11 +1446,9 @@ export default {
that.conditionsList[index].children[key].children[ind].levelModel that.conditionsList[index].children[key].children[ind].levelModel
) )
); );
// console.log(JSON.stringify(arr),that.conditionsList[index].children[key].children[ind].levelModel)
that.conditionsList[that.andIndex].children[ that.conditionsList[that.andIndex].children[
that.orIndex that.orIndex
].columnValue = arr.join(" "); //String(arr) ].columnValue = arr.join(" "); //String(arr)
// console.log(that.conditionsList[that.andIndex].children[that.orIndex].columnValue)
}, 100); }, 100);
}, },
...@@ -1545,7 +1456,6 @@ export default { ...@@ -1545,7 +1456,6 @@ export default {
// 搜索 // 搜索
remoteMethod: _debounce(function(query) { remoteMethod: _debounce(function(query) {
var that = this; var that = this;
console.log("query:", query);
var selectValue = var selectValue =
that.conditionsList[that.andIndex].children[that.orIndex].children[ that.conditionsList[that.andIndex].children[that.orIndex].children[
that.componentIndex that.componentIndex
...@@ -1554,7 +1464,6 @@ export default { ...@@ -1554,7 +1464,6 @@ export default {
that.conditionsList[that.andIndex].children[that.orIndex].children[ that.conditionsList[that.andIndex].children[that.orIndex].children[
that.componentIndex that.componentIndex
].levelOptions; ].levelOptions;
// console.log(selectValue,selectLevelOptions,selectLevelOptions.length)
if (query !== "") { if (query !== "") {
var newOptions = []; var newOptions = [];
if (!!selectLevelOptions && !!selectLevelOptions.length) { if (!!selectLevelOptions && !!selectLevelOptions.length) {
...@@ -1572,7 +1481,6 @@ export default { ...@@ -1572,7 +1481,6 @@ export default {
that.conditionsList[that.andIndex].children[that.orIndex].children[ that.conditionsList[that.andIndex].children[that.orIndex].children[
that.componentIndex - 1 that.componentIndex - 1
].url; ].url;
// console.log("取到当前组前一个保存的",url)
that.getCurrentData(url, query); that.getCurrentData(url, query);
// 获取搜索列表数据 // 获取搜索列表数据
...@@ -1585,7 +1493,6 @@ export default { ...@@ -1585,7 +1493,6 @@ export default {
// 获取门店列表 // 获取门店列表
getStoreList(query, threeLevelValue) { getStoreList(query, threeLevelValue) {
var that = this; var that = this;
// console.log(threeLevelValue)
var para = { var para = {
searchParam: query, searchParam: query,
selectedIds: threeLevelValue ? String(threeLevelValue) : "", selectedIds: threeLevelValue ? String(threeLevelValue) : "",
...@@ -1599,7 +1506,6 @@ export default { ...@@ -1599,7 +1506,6 @@ export default {
qs.stringify(para) qs.stringify(para)
) )
.then(res => { .then(res => {
// console.log(res,res.data,res.data.errorCode)
var resData = res.data; var resData = res.data;
if (resData.errorCode == 0) { if (resData.errorCode == 0) {
resData.result.forEach(function(ele, index) { resData.result.forEach(function(ele, index) {
...@@ -1619,8 +1525,6 @@ export default { ...@@ -1619,8 +1525,6 @@ export default {
}); });
}) })
.catch(function(error) { .catch(function(error) {
console.log(error);
// that.toLogin()
that.$message.error({ that.$message.error({
duration: 1000, duration: 1000,
message: error.message message: error.message
...@@ -1638,11 +1542,6 @@ export default { ...@@ -1638,11 +1542,6 @@ export default {
that.axios that.axios
.post(that.baseUrl + url, qs.stringify(para)) .post(that.baseUrl + url, qs.stringify(para))
.then(res => { .then(res => {
console.log(
that.conditionsList[that.andIndex].children[that.orIndex].children[
that.componentIndex
].levelOptions
);
var resData = res.data; var resData = res.data;
if (resData.errorCode == 0) { if (resData.errorCode == 0) {
resData.result.forEach(function(ele, index) { resData.result.forEach(function(ele, index) {
...@@ -1655,14 +1554,12 @@ export default { ...@@ -1655,14 +1554,12 @@ export default {
].children[that.componentIndex].levelOptions.unshift(ele); ].children[that.componentIndex].levelOptions.unshift(ele);
// that.conditionsList[that.andIndex].children[that.orIndex].children[that.componentIndex].levelOptions = tempOptions;//[...new Set(tempOptions)] // that.conditionsList[that.andIndex].children[that.orIndex].children[that.componentIndex].levelOptions = tempOptions;//[...new Set(tempOptions)]
}); });
// console.log("##转换后:",[...new Set(that.conditionsList[that.andIndex].children[that.orIndex].children[that.componentIndex].levelOptions)])
let obj = {}; let obj = {};
let person = let person =
that.conditionsList[that.andIndex].children[that.orIndex] that.conditionsList[that.andIndex].children[that.orIndex]
.children[that.componentIndex].levelOptions; .children[that.componentIndex].levelOptions;
person = person.reduce((cur, next) => { person = person.reduce((cur, next) => {
// console.log(cur,next)
obj[next.key] ? "" : (obj[next.key] = true && cur.push(next)); obj[next.key] ? "" : (obj[next.key] = true && cur.push(next));
return cur; return cur;
}, []); //设置cur默认类型为数组，并且初始值为空的数组 }, []); //设置cur默认类型为数组，并且初始值为空的数组
...@@ -1670,7 +1567,6 @@ export default { ...@@ -1670,7 +1567,6 @@ export default {
that.componentIndex that.componentIndex
].levelOptions = person; ].levelOptions = person;
// that.conditionsList[that.andIndex].children[that.orIndex].children[that.componentIndex].levelOptions = resData.result // that.conditionsList[that.andIndex].children[that.orIndex].children[that.componentIndex].levelOptions = resData.result
console.log(person);
return; return;
} }
...@@ -1680,8 +1576,6 @@ export default { ...@@ -1680,8 +1576,6 @@ export default {
}); });
}) })
.catch(function(error) { .catch(function(error) {
console.log(error);
// that.toLogin()
that.$message.error({ that.$message.error({
duration: 1000, duration: 1000,
message: error.message message: error.message
...@@ -1692,7 +1586,6 @@ export default { ...@@ -1692,7 +1586,6 @@ export default {
// 省市县选择 // 省市县选择
selected(val) { selected(val) {
var that = this; var that = this;
console.log(val);
if (val.country) { if (val.country) {
that.conditionsList[val.index].children[val.indexKey].columnValue = that.conditionsList[val.index].children[val.indexKey].columnValue =
val.areaId; val.areaId;
...@@ -1701,18 +1594,29 @@ export default { ...@@ -1701,18 +1594,29 @@ export default {
// 删除 cell 条件 // 删除 cell 条件
deleteCell(index, key) { deleteCell(index, key) {
var that = this; this.conditionsList[index].children.splice(key, 1);
console.log(index, key);
// 重新 再渲染一次
that.conditionsList[index].children.splice(key, 1); this.conditionsList.map(v => {
if (that.conditionsList[index].children.length == 0) { if (v.children instanceof Array) {
that.conditionsList.splice(index, 1); v.children.map(w => {
if (w.children[1] && w.children[1].uuid) {
w.children[1].storeFlag = false;
this.$nextTick(_ => {
w.children[1].storeFlag = true;
w.children[1].operateType = true;
});
} }
console.log(that.conditionsList); });
}
});
if (this.conditionsList[index].children.length == 0) {
this.conditionsList.splice(index, 1);
}
//判断隐藏/显示按钮 //判断隐藏/显示按钮
if (that.conditionsList.length === 0) { if (this.conditionsList.length === 0) {
that.$emit("hideBtn", 0); this.$emit("hideBtn", 0);
} }
}, },
...@@ -1726,34 +1630,49 @@ export default { ...@@ -1726,34 +1630,49 @@ export default {
}, },
returnFlag(data) { returnFlag(data) {
var that = this;
var tag = true; var tag = true;
data.forEach(function(ele, index) { data.forEach(function(ele, index) {
ele.children.forEach(function(el, ind) { ele.children.forEach(function(el, ind) {
if (!el.columnValue) { if (!el.columnValue) {
el.children.forEach(item => { el.children.forEach(item => {
el.columnValue = item.uuid ? item.uuid : ''; el.columnValue = item.uuid ? item.uuid : "";
}); });
console.log(el.columnValue);
if (el.columnValue) return;
that.showWarn("请完善筛选条件", "warning");
tag = false;
return;
} }
}); });
}); });
return tag; return tag;
}, },
// 点击编辑模板 // sy 点击编辑模板
editTemp() { editTemp() {
if (this.repId && !this.confirm) {
this.getTempDetail();
} else {
this.conditionsList.map(v => {
if (v.children instanceof Array) {
v.children.map(w => {
w.children[1].storeFlag = false;
if (w.children[1] && w.children[1].uuid) {
w.children[1].operateType = false;
} else {
w.children[1].operateType = true;
}
this.$nextTick(_ => {
w.children[1].storeFlag = true;
});
});
}
});
this.$nextTick(_ => {
this.conditionDetailShow = false; this.conditionDetailShow = false;
this.conditionsShow = true; this.conditionsShow = true;
if (!!this.conditionsList.length) { if (this.conditionsList.length) {
this.$emit("editShow"); this.$emit("editShow");
} else { } else {
this.$emit("hideBtn"); this.$emit("hideBtn");
} }
});
}
}, },
// 点击重置 // 点击重置
...@@ -1761,29 +1680,58 @@ export default { ...@@ -1761,29 +1680,58 @@ export default {
var that = this; var that = this;
that.conditionDetailShow = false; that.conditionDetailShow = false;
that.conditionsShow = true; that.conditionsShow = true;
// 清空数据 // 清空数据
// that.cancelSet() // that.cancelSet()
// 清空所有的条件值 // 清空所有的条件值
that.conditionsList = []; that.conditionsList = [];
that.templateData = []; that.templateData = [];
// 隐藏按钮 // 隐藏按钮
that.$emit("hideBtn"); that.$emit("hideBtn");
// 传递查询数据空的 // 传递查询数据空的
that.$emit("findFilter", ""); that.$emit("findFilter", "");
// 传递列表数据空的 // 传递列表数据空的
that.$emit("getBackData", "");
// 是否 是重置按钮触发
if (this.triggerReset) {
this.$emit("getBackData", "remove");
} else {
this.$emit("getBackData", "");
}
}, },
// 确认设置 // sy 外层确认提交人群筛选器的信息
confirmSet() { confirmSet() {
var that = this; var that = this;
console.log(that.conditionsList); this.confirm = true;
var setData = JSON.parse(JSON.stringify(that.conditionsList)); return new Promise((resolve, reject) => {
(async () => {
// 是否有空的
let emptyFlag;
this.conditionsList.forEach(list => {
list.children.forEach(item => {
if (item.children) {
emptyFlag = item.children.every(ele => {
// 门店组件是没有levelModel值的
if (ele.templateCode != "com020") {
return ele.levelModel != "";
} else {
return true;
}
});
}
});
});
if (!emptyFlag) {
this.$message.warning("请先完善筛选信息！");
return false;
}
var setData = JSON.parse(JSON.stringify(this.conditionsList));
this.newCardList = JSON.parse(JSON.stringify(this.conditionsList));
// {"list":[{"type":"or","list":[{"type":"data","data":{"key":"mainStoreId","compute":"in","value":"0","dealKey":"storeWidget"}}]}],"type":"and"}
// 发送数据 拼接 // 发送数据 拼接
var sendData = { var sendData = {
list: [], list: [],
...@@ -1798,40 +1746,6 @@ export default { ...@@ -1798,40 +1746,6 @@ export default {
return false; return false;
} }
// 存储模板数据到本地数据库
// that.saveIndexDb(setData)
// window.localStorage.setItem('temp',JSON.stringify(setData))
// localforage.setItem('tempData', setData).then(function (value) {
// // 当值被存储后，可执行其他操作
// console.log(value);
// }).catch(function(err) {
// // 当出错时，此处代码运行
// console.log(err);
// });
// setData.forEach(function(ele,index) {
// var obj = {
// type: "or",
// list: [
// ]
// }
// ele.children.forEach(function(el,index) {
// el.children.forEach(function(element,keys) {
// console.log(element.levelModel,keys)
// var ky = keys
// if (element.levelOptions) {
// element.levelOptions.forEach(function(child,k) {
// if (element.levelModel == child.key) {
// el[ky] = child.value
// }
// })
// }
// })
// })
// })
// console.log("setData:",JSON.stringify(setData))
// return;
var birthFlag = true; var birthFlag = true;
setData.forEach(function(ele, index) { setData.forEach(function(ele, index) {
//外层 and //外层 and
...@@ -1847,7 +1761,12 @@ export default { ...@@ -1847,7 +1761,12 @@ export default {
}; };
innerObj.data.key = el.columnKey; innerObj.data.key = el.columnKey;
innerObj.data.compute = el.computeCharacter; innerObj.data.compute = el.computeCharacter;
// 主要的门店的uuid
if (el.dealKey === "storeWidget") {
innerObj.data.value = el.children && el.children[1] && el.children[1].uuid;
} else {
innerObj.data.value = el.columnValue; innerObj.data.value = el.columnValue;
}
if (el.dealKey) { if (el.dealKey) {
innerObj.data.dealKey = el.dealKey; innerObj.data.dealKey = el.dealKey;
} }
...@@ -1864,12 +1783,13 @@ export default { ...@@ -1864,12 +1783,13 @@ export default {
el.children.forEach(function(child, key) { el.children.forEach(function(child, key) {
let emptyArr = []; let emptyArr = [];
if (child.templateCode == "com005") { if (child.templateCode == "com005") {
// console.log(child.levelOptions) if (child.levelOptions && child.levelOptions.length) {
child.levelOptions.forEach(function(obj, k) { child.levelOptions.forEach(function(obj, k) {
if (child.levelModel.indexOf(obj.key) !== -1) { if (child.levelModel.indexOf(obj.key) !== -1) {
emptyArr.push(obj); emptyArr.push(obj);
} }
}); });
}
child.levelOptions = emptyArr; child.levelOptions = emptyArr;
} }
}); });
...@@ -1877,28 +1797,20 @@ export default { ...@@ -1877,28 +1797,20 @@ export default {
}); });
sendData.list.push(obj); sendData.list.push(obj);
}); });
// 过滤之后的数据
const filterData = this.filterPassValue(setData); const filterData = this.filterPassValue(setData);
// 保存过滤的json
this.filterToEcho = JSON.parse(JSON.stringify(filterData));
console.log("filterData:>>>>>", JSON.stringify(filterData)); this.selectDataList = sendData;
console.log("sendData:>>>>>", JSON.stringify(sendData));
that.selectDataList = sendData;
// that.calculateNum(sendData)
setTimeout(function() {
if (!birthFlag) { if (!birthFlag) {
that.showWarn("生日不能跨年", "warning"); this.showWarn("生日不能跨年", "warning");
return false; return false;
} }
that.getAbInfo(sendData, filterData); await this.getAbInfo(sendData, filterData);
}, 100); resolve();
})();
// 获取缩略信息 });
// 隐藏筛选条件 获取缩略信息后显示
// that.conditionsShow = false;
// that.conditionDetailShow = true;
}, },
// 计算选择多少项数据的 // 计算选择多少项数据的
...@@ -1913,12 +1825,12 @@ export default { ...@@ -1913,12 +1825,12 @@ export default {
}); });
} }
// that.$emit('getSelectNum',len)
return len; return len;
}, },
// 获取缩略信息 // 获取缩略信息
getAbInfo(sendData, setData) { getAbInfo(sendData, setData) {
return new Promise((resolve, reject) => {
var that = this; var that = this;
var para = { var para = {
params: JSON.stringify(sendData), params: JSON.stringify(sendData),
...@@ -1926,13 +1838,12 @@ export default { ...@@ -1926,13 +1838,12 @@ export default {
sceneCode: that.repSceneCode sceneCode: that.repSceneCode
}; };
that.axios this.axios
.post( .post(
that.baseUrl + "/api-plug/screening-show-back", this.baseUrl + "/api-plug/screening-show-back",
qs.stringify(para) qs.stringify(para)
) )
.then(res => { .then(res => {
console.log(res, res.data, res.data.errorCode);
var resData = res.data; var resData = res.data;
if (resData.errorCode == 0) { if (resData.errorCode == 0) {
that.templateData = resData.result that.templateData = resData.result
...@@ -1947,43 +1858,51 @@ export default { ...@@ -1947,43 +1858,51 @@ export default {
// 传递查询数据 // 传递查询数据
that.$emit("findFilter", JSON.stringify(sendData)); that.$emit("findFilter", JSON.stringify(sendData));
// 传递列表数据 // 传递列表数据
if (JSON.stringify(setData)) {
that.$emit("getBackData", JSON.stringify(setData)); that.$emit("getBackData", JSON.stringify(setData));
}
// 按钮隐藏 // 按钮隐藏
that.$emit("editHide"); that.$emit("editHide");
resolve();
return;
} }
that.$message.error({
duration: 1000,
message: resData.message
});
}) })
.catch(function(error) { .catch(function(error) {
console.log(error); this.$message.error({
// that.toLogin()
that.$message.error({
duration: 1000, duration: 1000,
message: error.message message: error.message
}); });
}); });
});
}, },
// 取消设置 // 取消设置
cancelSet() { cancelSet() {
var that = this; var that = this;
// that.conditionsShow = false; // sy 老的替换新的uuid 解决编辑 取消但是不保存
// that.conditionDetailShow = true; if (this.editList && this.editList.length) {
this.conditionsList.forEach((ele, i) => {
if (ele.children && ele.children.length) {
ele.children.forEach((e, index) => {
if (
e.children[1] &&
this.editList[i].children[index] &&
this.editList[i].children[index].children.length
) {
e.children[1].uuid = this.editList[i].children[
index
].children[1].uuid;
}
});
}
});
}
// that.$emit('cancelFilter') this.OperateType = false;
if (!!that.templateData && !!that.templateData.length) { if (!!that.templateData && !!that.templateData.length) {
that.conditionsShow = false; that.conditionsShow = false;
that.conditionDetailShow = true; that.conditionDetailShow = true;
that.$emit("editHide"); that.$emit("editHide");
return;
} else { } else {
// 清空所有的条件值 // 清空所有的条件值
that.conditionsList = []; that.conditionsList = [];
...@@ -2011,32 +1930,45 @@ export default { ...@@ -2011,32 +1930,45 @@ export default {
.then(res => { .then(res => {
var resData = res.data; var resData = res.data;
if (resData.errorCode == 0) { if (resData.errorCode == 0) {
if (!!resData.result) { if (resData.result && resData.result.detail) {
const result = JSON.parse(resData.result.detail); const result = JSON.parse(resData.result.detail);
if (!!result && result.length) { // 保存之后的第一次掉回显 防止取消的时候没有传上次的回显数据
this.filterToEcho = resData.result.detail;
if (result && result.length) {
result.forEach((ele, index) => { result.forEach((ele, index) => {
ele.children.forEach((el, key) => { ele.children.forEach((el, key) => {
if (el.esScreeningWidgetChainId =="8b0f770c72c24158bda1105b40d7336c") { if (
let maps = el.children[0] && el.children[0].levelOptions.map( el.esScreeningWidgetChainId ==
item => item.key "8b0f770c72c24158bda1105b40d7336c"
); ) {
let maps =
el.children[0] &&
el.children[0].levelOptions.map(item => item.key);
// addObjKey 所有关联门店门店 // addObjKey 所有关联门店门店
if (maps.indexOf(this.addObjKey.key) == -1) { if (maps.indexOf(this.addObjKey.key) == -1) {
el.children[0].levelOptions.push(this.addObjKey); el.children[0].levelOptions.push(this.addObjKey);
} }
// 判断是不是门店类型 // 判断是不是门店类型
if (el.dealKey === 'storeWidget') { if (el.dealKey === "storeWidget") {
const param = { const param = {
requestProject: this.repProjectName, requestProject: this.repProjectName,
parentChainId: el.esScreeningWidgetChainId, parentChainId: el.esScreeningWidgetChainId,
widgetFieldKey: el.children[0].levelModel widgetFieldKey: el.children[0].levelModel
}; };
this.axios.post(this.baseUrl + "/api-plug/get-screening-chain-detail", qs.stringify(param)).then(res => { this.axios
.post(
this.baseUrl +
"/api-plug/get-screening-chain-detail",
qs.stringify(param)
)
.then(res => {
const storeRes = res.data.result.widget; const storeRes = res.data.result.widget;
const newObj = { const newObj = {
esScreeningWidgetChainId: storeRes.esScreeningWidgetChainId, esScreeningWidgetChainId:
storeRes.esScreeningWidgetChainId,
property: storeRes.property, property: storeRes.property,
levelModel: [], levelModel: [],
templateCode: storeRes.templateCode, templateCode: storeRes.templateCode,
...@@ -2044,7 +1976,9 @@ export default { ...@@ -2044,7 +1976,9 @@ export default {
widgetInstruction: storeRes.widgetInstruction, widgetInstruction: storeRes.widgetInstruction,
widgetName: storeRes.widgetName, widgetName: storeRes.widgetName,
storeOption: el.children[1].storeOption, storeOption: el.children[1].storeOption,
uuid: el.children[1].uuid uuid: el.children[1].uuid,
storeFlag: false,
operateType: true
}; };
el.children[1].levelOptions.push(newObj); el.children[1].levelOptions.push(newObj);
}); });
...@@ -2052,10 +1986,34 @@ export default { ...@@ -2052,10 +1986,34 @@ export default {
} }
}); });
}); });
this.storeFlag = true // this.storeFlag = true
// sy 这里把过滤的数据 请求之后 返回回来 再赋值给conditionsList // sy 这里把过滤的数据 请求之后 返回回来 再赋值给conditionsList
this.conditionsList = result; this.conditionsList = result;
this.$emit("editHide");
this.conditionsList.map(v => {
if (v.children instanceof Array) {
v.children.map(w => {
w.children[1].storeFlag = false;
if (w.children[1] && w.children[1].uuid) {
w.children[1].operateType = false;
} else {
w.children[1].operateType = true;
}
this.$nextTick(_ => {
w.children[1].storeFlag = true;
});
});
}
});
this.$nextTick(_ => {
this.conditionDetailShow = false;
this.conditionsShow = true;
if (!!this.conditionsList.length) {
this.$emit("editShow");
} else {
this.$emit("hideBtn");
}
});
} }
} }
return; return;
...@@ -2066,8 +2024,6 @@ export default { ...@@ -2066,8 +2024,6 @@ export default {
}); });
}) })
.catch(error => { .catch(error => {
console.log(error);
// that.toLogin()
this.$message.error({ this.$message.error({
duration: 1000, duration: 1000,
message: error.message message: error.message
...@@ -2077,11 +2033,10 @@ export default { ...@@ -2077,11 +2033,10 @@ export default {
// 判断并条件类型,添加数据 // 判断并条件类型,添加数据
judgeConditionType(item, levelOptions) { judgeConditionType(item, levelOptions) {
console.log('添加并且条件');
var addObj = {}; var addObj = {};
var length = this.conditionsList.length; var length = this.conditionsList.length;
let widgetName; let widgetName;
if(item.widget.widgetName.indexOf('门店') > -1) { if (item.property === 19 && item.widget.templateCode === "com020") {
widgetName = item.widget.widgetName; widgetName = item.widget.widgetName;
} }
...@@ -2109,7 +2064,6 @@ export default { ...@@ -2109,7 +2064,6 @@ export default {
} }
] ]
}; };
console.log(addObj);
return addObj; return addObj;
}, },
...@@ -2119,7 +2073,9 @@ export default { ...@@ -2119,7 +2073,9 @@ export default {
var para = { var para = {
requestProject: that.repProjectName requestProject: that.repProjectName
}; };
that.axios.post(that.baseUrl + url, qs.stringify(para)).then(res => { that.axios
.post(that.baseUrl + url, qs.stringify(para))
.then(res => {
var resData = res.data; var resData = res.data;
if (resData.errorCode == 0) { if (resData.errorCode == 0) {
resData.result.forEach(function(ele, index) { resData.result.forEach(function(ele, index) {
...@@ -2145,8 +2101,6 @@ export default { ...@@ -2145,8 +2101,6 @@ export default {
}); });
}) })
.catch(function(error) { .catch(function(error) {
console.log(error);
// that.toLogin()
that.$message.error({ that.$message.error({
duration: 1000, duration: 1000,
message: error.message message: error.message
...@@ -2159,7 +2113,7 @@ export default { ...@@ -2159,7 +2113,7 @@ export default {
var that = this; var that = this;
var addObj = {}; var addObj = {};
let widgetName; let widgetName;
if (item.widget.widgetName.indexOf('门店') > -1) { if (item.widget.widgetName.indexOf("门店") > -1) {
widgetName = item.widget.widgetName; widgetName = item.widget.widgetName;
} }
addObj = { addObj = {
...@@ -2183,8 +2137,17 @@ export default { ...@@ -2183,8 +2137,17 @@ export default {
} }
}, },
watch: { watch: {
conditionsList(nv, ov) { flag: {
console.log(nv, "conlist"); immediate: true,
handler(newval) {
this.flagStore = newval;
}
},
isAdd: {
immediate: true,
handler(newval) {
this.OperateType = newval;
}
}, },
projectName: function(newData, oldData) { projectName: function(newData, oldData) {
var that = this; var that = this;
...@@ -2194,14 +2157,13 @@ export default { ...@@ -2194,14 +2157,13 @@ export default {
var that = this; var that = this;
that.repSceneCode = newData || "member"; that.repSceneCode = newData || "member";
}, },
useId: function(newData, oldData) { // useId: function(newData, oldData) {
var that = this; // var that = this;
that.repId = newData; // that.repId = newData;
that.getTempDetail(); // // that.getTempDetail();
}, // },
// sy 回显的数据 当接口返回的时候 newData就是一开始保存选中的数据 // sy 回显的数据 当接口返回的时候 newData就是一开始保存选中的数据
hasSearchData: function(newData, oldData) { hasSearchData: function(newData, oldData) {
console.log("responseData:", newData);
if (!!newData) { if (!!newData) {
this.responseData = JSON.parse(newData); this.responseData = JSON.parse(newData);
this.getAbInfo(this.responseData); this.getAbInfo(this.responseData);
...@@ -2215,12 +2177,10 @@ export default { ...@@ -2215,12 +2177,10 @@ export default {
} }
}, },
mounted() { mounted() {
this.storeFlag = false;
this.getDataList(); this.getDataList();
// 项目名 // 项目名
this.repProjectName = this.projectName || "gic-web"; this.repProjectName = this.projectName || "gic-web";
this.repSceneCode = this.sceneValue || "member"; // 获取场景值 this.repSceneCode = this.sceneValue || "member"; // 获取场景值
this.repId = this.useId; // 获取模板 id this.repId = this.useId; // 获取模板 id
...@@ -2228,13 +2188,11 @@ export default { ...@@ -2228,13 +2188,11 @@ export default {
this.$emit("hideBtn"); this.$emit("hideBtn");
// 数据回显 // 数据回显
if (!!this.repId) { // if (!!this.repId) {
this.getTempDetail(); // this.getTempDetail();
} // }
//
if (!!this.hasSearchData) { if (!!this.hasSearchData) {
console.log("hasSearchData//////////", this.hasSearchData);
this.responseData = JSON.parse(this.hasSearchData); this.responseData = JSON.parse(this.hasSearchData);
this.getAbInfo(this.responseData); this.getAbInfo(this.responseData);
// 显示缩略 显示保存按钮 // 显示缩略 显示保存按钮
...@@ -2252,472 +2210,9 @@ export default { ...@@ -2252,472 +2210,9 @@ export default {
tags, tags,
FilterTxt, FilterTxt,
VueGicDatepicker, VueGicDatepicker,
vueGicStoreNew GicSelect
} }
}; };
</script> </script>
<style lang="scss" scoped> <style src="../style/people.less" lang="less" scoped></style>
.people-content {
width: 100%;
padding: 24px;
-webkit-box-sizing: border-box;
box-sizing: border-box;
background: #f2f3f4;
.people-temp-head {
.member-templates-title {
display: inline-block;
width: 100px;
text-align: right;
margin-right: 30px;
line-height: 32px;
}
.el-select {
width: 195px;
/*height: 40px;*/
border-radius: 4px;
line-height: 32px;
/*border: 1px solid #e7e7eb;*/
position: relative;
cursor: pointer;
color: #888;
}
.input-search-select {
.el-select {
width: 375px;
overflow: hidden;
text-overflow: ellipsis;
/deep/.el-select__tags-text {
max-width: 262px;
overflow: hidden;
text-overflow: ellipsis;
display: inline-block;
vertical-align: top;
}
}
}
}
.el-select .el-input__inner {
border: none !important;
border-radius: 2px !important;
}
}
/*去掉输入框右侧*/
.input-tags /deep/ {
.el-input__suffix-inner {
display: none;
}
}
.el-select > .el-input {
border: none;
}
.temp-select .el-input__inner {
border: none;
border-radius: 2px;
}
.screening-condition {
margin-left: 100px;
margin-top: 14px;
}
.screening-condition .btn-edit-group,
.screening-condition .btn-cancel-group {
color: #909399;
cursor: pointer;
display: inline-block;
font-size: 14px;
margin-left: 4px;
position: relative;
width: 14px;
height: 14px;
top: 1px;
/*background: url('../../images/14x14icon@2x.png') no-repeat center center;*/
}
.screening-condition .btn-edit-group:hover {
color: #1890ff;
}
.screening-condition .el-icon-delete:hover {
color: #f56c6c;
}
.screening-condition .btn-edit-group {
background-position: 0 -355px;
}
.screening-condition .btn-cancel-group {
background-position: -59px -298px;
}
.detail {
display: inline;
cursor: pointer;
/*margin-top: 14px;*/
font-size: 14px;
color: #858585;
line-height: 20px;
}
.detail span {
font-size: 14px;
-webkit-box-sizing: content-box;
-moz-box-sizing: content-box;
box-sizing: content-box;
}
.detail .bg_blue {
display: inline-block;
background: #effcff;
padding: 6px 7px;
border-radius: 3px;
color: #858585;
margin: 0 5px 5px 5px;
height: 18px;
}
.detail .word {
margin: 0px 10px;
}
.detail .bg_yellow {
display: inline-block;
background: #fffeeb;
padding: 6px 7px;
border-radius: 3px;
color: #858585;
margin: 0 5px 5px 5px;
height: 18px;
}
.gic-btn {
height: 36px;
line-height: 36px;
color: #fff;
padding: 0 24px;
font-size: 14px;
border-radius: 2px;
background: #1890ff;
border: none;
outline: none;
cursor: pointer;
margin-top: 30px;
&:hover {
/*background: #fceb88;*/
}
}
/* 筛选条件 */
@media screen and (min-width: 1131px) {
.ration .groupbox {
/*min-width: 1241px;*/
min-width: 750px;
padding-right: 30px;
}
}
@media screen and (max-width: 1131px) {
.ration .groupbox {
/*min-width: 1241px;*/
min-width: 750px;
padding-right: 30px;
}
}
.el-input__inner {
/*border: 0px solid #dcdfe6;*/
}
.filter-message {
position: relative;
background: #fff;
padding: 10px 30px;
}
.filter-content {
margin-top: 0;
min-width: 1100px;
position: relative;
}
.filter-content .member-templates-condition-title {
width: 80px;
vertical-align: top;
position: absolute;
left: 0;
top: 0;
text-align: right;
margin: 0px;
z-index: 2;
font-size: 14px;
line-height: 28px;
color: #303133;
}
.filter-box {
border-left: 10px solid #1890ff;
}
.filter-message {
position: relative;
background: #fff;
padding-left: 30px;
padding-bottom: 10px;
font-size: 0;
}
.fliter-message-title {
margin-right: 7px;
line-height: 32px;
height: 32px;
font-size: 14px;
margin: 0;
}
.marginLeft134 {
margin-left: 100px;
}
.inline-block {
display: inline-block;
vertical-align: top;
}
.filter-or {
display: inline-block;
margin-right: 20px;
}
.filter-button li {
padding: 8px 15px;
display: inline-block;
background: #e3e7ee;
border-radius: 20px;
font-size: 12px;
line-height: 12px;
margin-right: 10px;
cursor: pointer;
box-sizing: border-box;
-webkit-box-sizing: border-box;
}
.filter-button li:hover {
background: #1890ff;
color: #fff;
}
.filter-button .filter-active {
background: #1890ff;
color: #fff;
}
.filter-and {
display: flex;
margin: 10px 10px 10px -10px;
font-size: 14px;
}
.filter-close {
color: #909399;
cursor: pointer;
position: absolute;
right: 10px;
top: 20px;
font-size: 14px;
}
.filter-close:hover {
color: #f56c6c;
}
.filter-button {
margin: 0px 10px 0px 15px;
}
.add-or-box {
display: flex;
margin: 10px 0 0 16px;
}
.add-or-box .add-or-words {
margin-right: 16px;
padding: 3px 0 0;
/*line-height: 30px;*/
font-size: 14px;
}
.andlabels {
margin: 10px 10px 10px -10px;
font-size: 14px;
}
.group_combo > .orlabels {
height: 30px;
line-height: 30px;
margin-left: 15px;
color: #292929;
font-size: 14px;
}
.gic-select-wrap {
position: relative;
margin-left: 8px;
}
/* btns */
.people-temp-btns {
width: 100%;
margin-top: 20px;
display: inline-block;
-webkit-box-sizing: border-box;
box-sizing: border-box;
padding-left: 130px;
}
/*tree*/
.el-tree-out {
position: absolute;
left: 0;
}
.el-tree-contain {
position: relative;
left: 0px;
width: 400px;
height: 300px;
z-index: 91008;
border: 1px solid #e4e7ed;
border-radius: 4px;
background: #fff;
-webkit-box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
-webkit-box-sizing: border-box;
box-sizing: border-box;
}
.el-tree {
position: absolute;
left: 0px;
min-width: 398px;
height: 230px;
overflow: auto;
z-index: 91008;
border-bottom: 1px solid #e4e7ed;
margin: 15px 0;
}
.tree-btns {
position: absolute;
left: 0px;
top: 251px;
min-width: 398px;
height: 50px;
text-align: right;
.el-button.el-button--primary {
margin-right: 30px;
}
}
.select-wrap-input {
width: 100px;
margin-right: 10px;
}
.vue-treeselect /deep/ {
width: 217px;
font-size: 12px;
/deep/ .vue-treeselect__control {
height: 32px;
/*line-height: 36px;*/
cursor: pointer;
}
/deep/ .vue-treeselect__multi-value-item {
color: #909399;
background: #f0f2f5;
}
/deep/ .vue-treeselect__value-remove {
color: #909399;
}
.vue-treeselect__placeholder {
line-height: 32px;
font-size: 13.3333px;
}
.vue-treeselect--searchable:not(.vue-treeselect--disabled)
.vue-treeselect__value-container {
cursor: pointer;
}
.vue-treeselect__control-arrow {
display: none;
}
.vue-treeselect__control-arrow-container {
position: relative;
}
/deep/.vue-treeselect__control-arrow-container:after,
.vue-treeselect__control-arrow-container:before {
border: 6px solid transparent;
border-left: 6px solid #fff;
width: 0;
height: 0;
position: absolute;
top: 50%;
left: 50%;
margin-left: -6px;
content: " ";
margin-top: -3px;
-webkit-transform: rotate(90deg);
-moz-transform: rotate(90deg);
-o-transform: rotate(90deg);
transform: rotate(90deg);
-webkit-transition: -webkit-transform 0.3s;
transition: -webkit-transform 0.3s;
transition: transform 0.3s;
transition: transform 0.3s, -webkit-transform 0.3s;
transition: transform 0.3s, -webkit-transform 0.3s;
}
/deep/ .vue-treeselect__control-arrow-container:before {
border-left-color: #c0c4cc;
top: 52%;
}
&.vue-treeselect--focused .vue-treeselect__control-arrow-container:after,
&.vue-treeselect--focused .vue-treeselect__control-arrow-container:before {
margin-top: -6px;
-webkit-transform: rotateZ(-90deg);
-moz-transform: rotateZ(-90deg);
-o-transform: rotateZ(-90deg);
transform: rotateZ(-90deg);
-webkit-transition: -webkit-transform 0.3s;
transition: -webkit-transform 0.3s;
transition: transform 0.3s;
transition: transform 0.3s, -webkit-transform 0.3s;
transition: transform 0.3s, -webkit-transform 0.3s;
}
&.vue-treeselect--focused .vue-treeselect__control-arrow-container:before {
border-left-color: #c0c4cc;
top: 47%;
}
.vue-treeselect--has-value .vue-treeselect__multi-value {
margin-bottom: 0;
}
}
.gic-select-wrap .el-input__inner {
/*border-width: 1px;*/
}
</style>
\ No newline at end of file
src/main.js
import Vue from 'vue' import Vue from 'vue'
import App from './App.vue' import App from './App.vue'
import ElementUI from 'element-ui'
Vue.use(ElementUI);
new Vue({ new Vue({
el: '#app', el: '#app',
......
src/style/people.less 0 → 100644
.people-content {
width: 100%;
padding: 24px;
-webkit-box-sizing: border-box;
box-sizing: border-box;
background: #f2f3f4;
.people-temp-head {
.member-templates-title {
display: inline-block;
width: 100px;
text-align: right;
margin-right: 30px;
line-height: 32px;
}
.el-select {
width: 195px;
/*height: 40px;*/
border-radius: 4px;
line-height: 32px;
/*border: 1px solid #e7e7eb;*/
position: relative;
cursor: pointer;
color: #888;
}
.input-search-select {
.el-select {
width: 375px;
overflow: hidden;
text-overflow: ellipsis;
/deep/.el-select__tags-text {
max-width: 262px;
overflow: hidden;
text-overflow: ellipsis;
display: inline-block;
vertical-align: top;
}
}
}
}
.el-select .el-input__inner {
border: none !important;
border-radius: 2px !important;
}
}
/*去掉输入框右侧*/
.input-tags /deep/ {
.el-input__suffix-inner {
display: none;
}
}
.el-select > .el-input {
border: none;
}
.temp-select .el-input__inner {
border: none;
border-radius: 2px;
}
.screening-condition {
margin-left: 100px;
margin-top: 14px;
}
.screening-condition .btn-edit-group,
.screening-condition .btn-cancel-group {
color: #909399;
cursor: pointer;
display: inline-block;
font-size: 14px;
margin-left: 4px;
position: relative;
width: 14px;
height: 14px;
top: 1px;
/*background: url('../../images/14x14icon@2x.png') no-repeat center center;*/
}
.screening-condition .btn-edit-group:hover {
color: #1890ff;
}
.screening-condition .el-icon-delete:hover {
color: #f56c6c;
}
.screening-condition .btn-edit-group {
background-position: 0 -355px;
}
.screening-condition .btn-cancel-group {
background-position: -59px -298px;
}
.detail {
display: inline;
cursor: pointer;
/*margin-top: 14px;*/
font-size: 14px;
color: #858585;
line-height: 20px;
}
.detail span {
font-size: 14px;
-webkit-box-sizing: content-box;
-moz-box-sizing: content-box;
box-sizing: content-box;
}
.detail .bg_blue {
display: inline-block;
background: #effcff;
padding: 6px 7px;
border-radius: 3px;
color: #858585;
margin: 0 5px 5px 5px;
height: 18px;
}
.detail .word {
margin: 0px 10px;
}
.detail .bg_yellow {
display: inline-block;
background: #fffeeb;
padding: 6px 7px;
border-radius: 3px;
color: #858585;
margin: 0 5px 5px 5px;
height: 18px;
}
.gic-btn {
height: 36px;
line-height: 36px;
color: #fff;
padding: 0 24px;
font-size: 14px;
border-radius: 2px;
background: #1890ff;
border: none;
outline: none;
cursor: pointer;
margin-top: 30px;
&:hover {
/*background: #fceb88;*/
}
}
/* 筛选条件 */
@media screen and (min-width: 1131px) {
.ration .groupbox {
/*min-width: 1241px;*/
min-width: 750px;
padding-right: 30px;
}
}
@media screen and (max-width: 1131px) {
.ration .groupbox {
/*min-width: 1241px;*/
min-width: 750px;
padding-right: 30px;
}
}
.el-input__inner {
/*border: 0px solid #dcdfe6;*/
}
.filter-message {
position: relative;
background: #fff;
padding: 10px 30px;
}
.filter-content {
margin-top: 0;
min-width: 1100px;
position: relative;
}
.filter-content .member-templates-condition-title {
width: 80px;
vertical-align: top;
position: absolute;
left: 0;
top: 0;
text-align: right;
margin: 0px;
z-index: 2;
font-size: 14px;
line-height: 28px;
color: #303133;
}
.filter-box {
border-left: 10px solid #1890ff;
}
.filter-message {
position: relative;
background: #fff;
padding-left: 30px;
padding-bottom: 10px;
font-size: 0;
}
.fliter-message-title {
margin-right: 7px;
line-height: 32px;
height: 32px;
font-size: 14px;
margin: 0;
}
.marginLeft134 {
margin-left: 100px;
}
.inline-block {
display: inline-block;
vertical-align: top;
}
.filter-or {
display: inline-block;
margin-right: 20px;
}
.filter-button li {
padding: 8px 15px;
display: inline-block;
background: #e3e7ee;
border-radius: 20px;
font-size: 12px;
line-height: 12px;
margin-right: 10px;
cursor: pointer;
box-sizing: border-box;
-webkit-box-sizing: border-box;
}
.filter-button li:hover {
background: #1890ff;
color: #fff;
}
.filter-button .filter-active {
background: #1890ff;
color: #fff;
}
.filter-and {
display: flex;
margin: 10px 10px 10px -10px;
font-size: 14px;
}
.filter-close {
color: #909399;
cursor: pointer;
position: absolute;
right: 10px;
top: 20px;
font-size: 14px;
}
.filter-close:hover {
color: #f56c6c;
}
.filter-button {
margin: 0px 10px 0px 15px;
}
.add-or-box {
display: flex;
margin: 10px 0 0 16px;
}
.add-or-box .add-or-words {
margin-right: 16px;
padding: 3px 0 0;
/*line-height: 30px;*/
font-size: 14px;
}
.andlabels {
margin: 10px 10px 10px -10px;
font-size: 14px;
}
.group_combo > .orlabels {
height: 30px;
line-height: 30px;
margin-left: 15px;
color: #292929;
font-size: 14px;
}
.gic-select-wrap {
position: relative;
margin-left: 8px;
}
/* btns */
.people-temp-btns {
width: 100%;
margin-top: 20px;
display: inline-block;
-webkit-box-sizing: border-box;
box-sizing: border-box;
padding-left: 130px;
}
/*tree*/
.el-tree-out {
position: absolute;
left: 0;
}
.el-tree-contain {
position: relative;
left: 0px;
width: 400px;
height: 300px;
z-index: 91008;
border: 1px solid #e4e7ed;
border-radius: 4px;
background: #fff;
-webkit-box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
-webkit-box-sizing: border-box;
box-sizing: border-box;
}
.el-tree {
position: absolute;
left: 0px;
min-width: 398px;
height: 230px;
overflow: auto;
z-index: 91008;
border-bottom: 1px solid #e4e7ed;
margin: 15px 0;
}
.tree-btns {
position: absolute;
left: 0px;
top: 251px;
min-width: 398px;
height: 50px;
text-align: right;
.el-button.el-button--primary {
margin-right: 30px;
}
}
.select-wrap-input {
width: 100px;
margin-right: 10px;
}
.vue-treeselect /deep/ {
width: 217px;
font-size: 12px;
/deep/ .vue-treeselect__control {
height: 32px;
/*line-height: 36px;*/
cursor: pointer;
}
/deep/ .vue-treeselect__multi-value-item {
color: #909399;
background: #f0f2f5;
}
/deep/ .vue-treeselect__value-remove {
color: #909399;
}
.vue-treeselect__placeholder {
line-height: 32px;
font-size: 13.3333px;
}
.vue-treeselect--searchable:not(.vue-treeselect--disabled)
.vue-treeselect__value-container {
cursor: pointer;
}
.vue-treeselect__control-arrow {
display: none;
}
.vue-treeselect__control-arrow-container {
position: relative;
}
/deep/.vue-treeselect__control-arrow-container:after,
.vue-treeselect__control-arrow-container:before {
border: 6px solid transparent;
border-left: 6px solid #fff;
width: 0;
height: 0;
position: absolute;
top: 50%;
left: 50%;
margin-left: -6px;
content: " ";
margin-top: -3px;
-webkit-transform: rotate(90deg);
-moz-transform: rotate(90deg);
-o-transform: rotate(90deg);
transform: rotate(90deg);
-webkit-transition: -webkit-transform 0.3s;
transition: -webkit-transform 0.3s;
transition: transform 0.3s;
transition: transform 0.3s, -webkit-transform 0.3s;
transition: transform 0.3s, -webkit-transform 0.3s;
}
/deep/ .vue-treeselect__control-arrow-container:before {
border-left-color: #c0c4cc;
top: 52%;
}
&.vue-treeselect--focused .vue-treeselect__control-arrow-container:after,
&.vue-treeselect--focused .vue-treeselect__control-arrow-container:before {
margin-top: -6px;
-webkit-transform: rotateZ(-90deg);
-moz-transform: rotateZ(-90deg);
-o-transform: rotateZ(-90deg);
transform: rotateZ(-90deg);
-webkit-transition: -webkit-transform 0.3s;
transition: -webkit-transform 0.3s;
transition: transform 0.3s;
transition: transform 0.3s, -webkit-transform 0.3s;
transition: transform 0.3s, -webkit-transform 0.3s;
}
&.vue-treeselect--focused .vue-treeselect__control-arrow-container:before {
border-left-color: #c0c4cc;
top: 47%;
}
.vue-treeselect--has-value .vue-treeselect__multi-value {
margin-bottom: 0;
}
}
.gic-select-wrap .el-input__inner {
/*border-width: 1px;*/
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment