提交 0dd99d3c 编写于 作者: tao.wu's avatar tao.wu

Merge remote-tracking branch 'origin/dev-sensitive-20191111' into dev-sensitive-20191111

<template> <template>
<div class="data-view-message-wrap" > <div class="data-view-message-wrap" >
<template v-if="testDataList && testDataList.outModels && testDataList.outModels.length > 0">
<el-row class="button-wrap"> <el-row class="button-wrap">
<el-button class="each-button" type="primary" @click="showAddConditionModal(true)">添加筛选条件</el-button>
<el-button class="each-button" type="primary" @click="hadnleSearch">查询</el-button> <el-button class="each-button" type="primary" @click="hadnleSearch">查询</el-button>
<el-button class="each-button" type="primary" @click="showAddConditionModal(true)">添加筛选条件</el-button>
</el-row> </el-row>
<el-table <el-table
:data="tableData" :data="testDataList.outModels"
height="100%" height="100%"
border border
style="width: 100%"> style="width: 100%">
<el-table-column <template
prop="date" v-if="testDataList && testDataList.columnList"
align="center" v-for="item in testDataList.columnList"
label="日期"
>
</el-table-column>
<el-table-column
prop="name"
align="center"
label="姓名"
>
</el-table-column>
<el-table-column
prop="province"
align="center"
label="省份"
>
</el-table-column>
<el-table-column
prop="city"
align="center"
label="市区"
>
</el-table-column>
<el-table-column
prop="address"
align="center"
label="地址"
>
</el-table-column>
<el-table-column
prop="zip"
align="center"
label="邮编"
> >
</el-table-column> <el-table-column :prop="item.key" align="center" :label="item.value" show-overflow-tooltip></el-table-column>
</template>
<el-table-column <el-table-column
align="center" align="center"
label="操作" label="操作"
width="100"> width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button @click="handleClick(scope.row)" type="text">查看</el-button> <el-button @click="showRemarkModal(scope.row)" type="text">备注</el-button>
<el-button type="text">编辑</el-button> <el-button type="text">标记处理</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</template>
<!-- 验证弹窗 --> <!-- 验证弹窗 -->
<el-dialog <el-dialog
...@@ -156,128 +129,10 @@ ...@@ -156,128 +129,10 @@
captchaToken: '', // 图片验证码 token captchaToken: '', // 图片验证码 token
addConditioDialogVisible: false, // 添加筛选条件 addConditioDialogVisible: false, // 添加筛选条件
conditionForm : {}, conditionForm : {},
testDataList: { testDataList: {},
outModels: [
{
column1: "上海市",
column5: "123423",
column4: "张三",
column3: "浦东新区",
column2: "上海市",
contentId: 1,
userName: "张三,李四",
dataUserContentId: 1,
status: 2
},
{
column1: "河南省",
column5: "123424",
column4: "李四",
column3: "舞阳县",
column2: "漯河市",
contentId: 2,
userName: "张三",
dataUserContentId: 4,
status: 2
}
],
total: 2,
columnList: [
{
key: "column1",
value: "省"
},
{
key: "column2",
value: "市"
},
{
key: "column3",
value: "区县"
},
{
key: "column4",
value: "姓名"
},
{
key: "column5",
value: "手机"
}
]
},
centerDialogVisible: true, // 验证弹窗 centerDialogVisible: true, // 验证弹窗
tableData: [{ tableData: [],
date: '2016-05-02',
name: '王小虎',
province: '上海',
city: '普陀区',
address: '上海市普陀区金沙江路 1518 弄',
zip: 200333
}, {
date: '2016-05-04',
name: '王小虎',
province: '上海',
city: '普陀区',
address: '上海市普陀区金沙江路 1517 弄',
zip: 200333
}, {
date: '2016-05-01',
name: '王小虎',
province: '上海',
city: '普陀区',
address: '上海市普陀区金沙江路 1519 弄',
zip: 200333
}, {
date: '2016-05-03',
name: '王小虎',
province: '上海',
city: '普陀区',
address: '上海市普陀区金沙江路 1516 弄',
zip: 200333
}, {
date: '2016-05-03',
name: '王小虎',
province: '上海',
city: '普陀区',
address: '上海市普陀区金沙江路 1516 弄',
zip: 200333
}, {
date: '2016-05-03',
name: '王小虎',
province: '上海',
city: '普陀区',
address: '上海市普陀区金沙江路 1516 弄',
zip: 200333
}, {
date: '2016-05-03',
name: '王小虎',
province: '上海',
city: '普陀区',
address: '上海市普陀区金沙江路 1516 弄',
zip: 200333
}, {
date: '2016-05-03',
name: '王小22',
province: '上海',
city: '普陀区',
address: '上海市普陀区金沙江路 1516 弄',
zip: 200333
}, {
date: '2016-05-03',
name: '王小虎333',
province: '上海',
city: '普陀区',
address: '上海市普陀区金沙江路 1516 弄',
zip: 200333
}, {
date: '2016-05-03',
name: '王小虎666',
province: '上海',
city: '普陀区',
address: '上海市普陀区金沙江路 1516 弄',
zip: 200333
}],
captchaCode: '', // 图形验证码 captchaCode: '', // 图形验证码
smsCode: '', // 短信验证码 smsCode: '', // 短信验证码
...@@ -301,42 +156,28 @@ ...@@ -301,42 +156,28 @@
let data = { let data = {
parame: vm.afterParam, parame: vm.afterParam,
}; };
openLoading(this); let callback = (res) => {
vm.$axios.post(localStorage.getItem("lectureUrl") + '/sensitive/mobileCheck/num/mobile', data )
.then((res) => {
// closeLoading(vm);
// debugger;
res = res.data;
if(res.code == '000000'){ if(res.code == '000000'){
vm.dingdingNum = res.data.dingdingNum; vm.dingdingNum = res.data.dingdingNum;
vm.mobilePhone = res.data.mobilePhone; vm.mobilePhone = res.data.mobilePhone;
}else{ }else{
vm.$message.error(res.message); vm.$message.error(res.message);
} }
}
}).catch((error) => { vm.sendRequest( 'post', `/sensitive/mobileCheck/num/mobile`, data, callback );
this.$message.error('网络出现点问题')
})
}, },
// 获取图形验证码 // 获取图形验证码
getCaptcha() { getCaptcha() {
openLoading(this); let callback = (res) => {
this.$axios.get(localStorage.getItem("lectureUrl") + '/account/account/captcha', {} )
.then((res) => {
closeLoading(this);
if(res.status && res.status === 200) {
res = res.data;
}
if(res.code==='000000'){ if(res.code==='000000'){
vm.captchaImg = `data:image/png;base64,${res.data.content}` vm.captchaImg = `data:image/png;base64,${res.data.content}`
vm.captchaToken = res.data.token vm.captchaToken = res.data.token
}else{ }else{
vm.$message.error(res.message); vm.$message.error(res.message);
} }
}).catch((error) => { };
vm.$message.error('网络出现点问题') vm.sendRequest( 'get', `/account/account/captcha`, {}, callback );
})
}, },
// 图片验证码点击 // 图片验证码点击
handleImgClick() { handleImgClick() {
...@@ -348,10 +189,8 @@ ...@@ -348,10 +189,8 @@
// 倒计时过程中不可点 // 倒计时过程中不可点
if( this.countDownNum != 6){ if( this.countDownNum != 6){
console.log('现在倒计时过程中...不可点击') console.log('现在倒计时过程中...不可点击')
return; return;
} }
if( this.captchaCode == '' ){ if( this.captchaCode == '' ){
vm.$message.error('请输入图形验证码'); vm.$message.error('请输入图形验证码');
return; return;
...@@ -363,22 +202,16 @@ ...@@ -363,22 +202,16 @@
pictureCode: vm.captchaCode, pictureCode: vm.captchaCode,
captchaToken: vm.captchaToken, captchaToken: vm.captchaToken,
}; };
openLoading(this);
this.$axios.post(localStorage.getItem("lectureUrl") + '/sensitive/mobileCheck/check/picturecode', data ) let callback = (res) => {
.then((res) => {
closeLoading(this);
res = res.data;
if(res.code == '000000'){ if(res.code == '000000'){
vm.timeCount(); vm.timeCount();
}else{ }else{
vm.$message.error(res.message); vm.$message.error(res.message);
this.getCaptcha(); vm.getCaptcha();
} }
}
}).catch((error) => { vm.sendRequest( 'post', `/sensitive/mobileCheck/check/picturecode`, data, callback );
this.$message.error('网络出现点问题')
})
}, },
timeCount() { timeCount() {
...@@ -410,31 +243,70 @@ ...@@ -410,31 +243,70 @@
parame: vm.afterParam, parame: vm.afterParam,
mobileCode: vm.smsCode, mobileCode: vm.smsCode,
}; };
openLoading(this);
this.$axios.post(localStorage.getItem("lectureUrl") + '/sensitive/mobileCheck/check/mobilecode', data ) let callback = (res) => {
.then((res) => {
closeLoading(this);
debugger
res = res.data;
if(res.code == '000000'){ if(res.code == '000000'){
// vm.timeCount();
vm.getTableList(); vm.getTableList();
}else{ }else{
vm.$message.error(res.message); vm.$message.error(res.message);
vm.getCaptcha();
vm.captchaCode = '';
} }
}).catch((error) => { };
this.$message.error('网络出现点问题') vm.sendRequest( 'post', `/sensitive/mobileCheck/check/mobilecode`, data, callback );
})
}, },
getTableList() { getTableList(isManualClick) {
debugger;
let data = {
parame: vm.afterParam,
pageNo: 1,
pageSize: 15,
};
if( isManualClick ){
// 如果添加了筛选条件,则将其合并到 查询接口的传参中
let stringData = JSON.stringify(vm.conditionForm);
if (stringData != "{}") {
let condition = JSON.parse(stringData);
for (let key in condition) {
data[key] = condition[key];
};
}
}
let callback = (res) => {
if(res.code == '000000'){
vm.centerDialogVisible = false;
vm.captchaCode = '';
vm.smsCode = '';
vm.testDataList = res.data;
}else{
vm.$message.error(res.message);
}
};
vm.sendRequest( 'post', `/sensitive/dataSearch/searchWeb`, data, callback );
}, },
showAddConditionModal(status){ showAddConditionModal(status){
this.addConditioDialogVisible = status ? true : false; this.addConditioDialogVisible = status ? true : false;
}, },
hadnleSearch() { hadnleSearch() {
console.log('查询。。。') console.log('查询。。。')
vm.getTableList(true);
},
showRemarkModal(row) {
alert('未完待续。。。')
},
sendRequest( type, url, params, callback ){
openLoading(this);
url = localStorage.getItem("lectureUrl") + url;
this.$axios[type](url, params )
.then((res) => {
closeLoading(this);
res = res.data;
callback(res);
}).catch((error) => {
this.$message.error('网络出现点问题')
})
}, },
}, },
......
<template> <template>
<div class="data-view-wrap"> <div class="data-view-wrap">
<h2 class="top-title">数据查看</h2> <h2 class="top-title">数据查看</h2>
<el-form :inline="true" :model="ruleForm" :rules="rules" ref="ruleForm" class="search-ruleForm"> <el-form :inline="true" :model="ruleForm" :rules="rules" ref="ruleForm" class="search-ruleForm">
<el-form-item label="钉钉流程审批单号" prop="dingdingNumber"> <el-form-item label="钉钉流程审批单号" prop="dingdingNumber">
<el-input <el-input
...@@ -42,15 +43,15 @@ ...@@ -42,15 +43,15 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item style="margin-left: 100px;"> <el-form-item style="margin-left: 100px;">
<el-button type="primary" @click="showAddConditionModal">添加筛选条件</el-button> <el-button type="primary" @click="showAddConditionModal" v-if="testDataList && testDataList.columnList && testDataList.columnList.length > 0">添加筛选条件</el-button>
<el-button type="primary" @click="handleSend">分发</el-button> <el-button type="primary" @click="handleSend" v-if="showSendBtn">分发</el-button>
<el-button type="primary" @click="submitForm('ruleForm')">查询</el-button> <el-button type="primary" @click="submitForm('ruleForm')">查询</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table <el-table
v-if="testDataList && testDataList.outModels && testDataList.outModels.length > 0"
ref="multipleTable" ref="multipleTable"
:data="testDataList.outModels" :data="testDataList.outModels"
border border
...@@ -59,18 +60,16 @@ ...@@ -59,18 +60,16 @@
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
<el-table-column type="selection" align="center" width="55"></el-table-column> <el-table-column type="selection" align="center" width="55"></el-table-column>
<template <template
v-if="testDataList && testDataList.columnList" v-if="testDataList && testDataList.columnList"
v-for="item in testDataList.columnList" v-for="item in testDataList.columnList"
> >
<el-table-column :prop="item.key" align="center" :label="item.value" show-overflow-tooltip></el-table-column> <el-table-column :prop="item.key" align="center" :label="item.value" show-overflow-tooltip></el-table-column>
</template> </template>
<el-table-column fixed="right" align="center" label="操作" width="200"> <el-table-column fixed="right" align="center" label="操作" width="200">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button @click="handleRemarkClick(scope.row)" type="text" size="small">备注</el-button> <el-button @click="handleRemarkClick(scope.row)" type="text" size="small">备注</el-button>
<el-button type="text" size="small">标记处理</el-button> <el-button @click="handleTagClick(scope.row)" type="text" size="small" :disabled="scope.row.status == 1">{{ scope.row.status == 1 ? '已处理' : '标记处理' }}</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -111,12 +110,12 @@ ...@@ -111,12 +110,12 @@
<span>被选中的需要分发的数据,此处只显示Column1</span> <span>被选中的需要分发的数据,此处只显示Column1</span>
<div class="people-choose"> <div class="people-choose">
<p class="title">人员选择</p> <p class="title">人员选择</p>
<el-select v-model="selectedPeople" placeholder="请选择" class="people-select-comp"> <el-select v-model="dataUserDiss" multiple collapse-tags placeholder="请选择" class="people-select-comp">
<el-option <el-option
v-for="item in peopleList" v-for="item in peopleList"
:key="item.value" :key="item.id"
:label="item.label" :label="item.name"
:value="item.value" :value="item.id"
></el-option> ></el-option>
</el-select> </el-select>
</div> </div>
...@@ -129,30 +128,19 @@ ...@@ -129,30 +128,19 @@
<!-- 备注 弹窗 --> <!-- 备注 弹窗 -->
<el-dialog <el-dialog
title="备注" title="备注"
@close="handleRemarkClose"
:close-on-click-modal="false" :close-on-click-modal="false"
class="remark-modal" class="remark-modal"
:visible.sync="remarkDialogVisible" :visible.sync="remarkDialogVisible"
width="500px" width="500px"
center center
> >
<el-input type="textarea" :rows="3" placeholder="请输入内容" v-model="textarea"></el-input> <el-input type="textarea" :rows="3" placeholder="请输入内容" v-model="newRemark"></el-input>
<el-button type="primary" class="remark-confirm-btn">确 定</el-button> <el-button type="primary" class="remark-confirm-btn" @click="confirmSendRemark">确 定</el-button>
<ul class="history-list"> <ul class="history-list">
<li> <li v-for="item in remarkHistory">
<p class="date">2019-11-09</p> <p class="date">{{ item.createdTime }}</p>
<p class="text">撇价格拉低价格SD卡解放路开始打发就群殴刚叫我去额炯炯拉开距离开发及 来看电视剧弗兰克离开家大师傅了看见爱上大概是打发埃里克国家考虑过</p> <p class="text">{{ item.remark }}</p>
</li>
<li>
<p class="date">2019-11-09</p>
<p class="text">撇价格拉低价格SD卡解放路开始打发就群殴刚叫我去额炯炯拉开距离开发及 来看电视剧弗兰克离开家大师傅了看见爱上大概是打发埃里克国家考虑过</p>
</li>
<li>
<p class="date">2019-11-09</p>
<p class="text">撇价格拉低价格SD卡解放路开始打发就群殴刚叫我去额炯炯拉开距离开发及 来看电视剧弗兰克离开家大师傅了看见爱上大概是打发埃里克国家考虑过</p>
</li>
<li>
<p class="date">2019-11-09</p>
<p class="text">撇价格拉低价格SD卡解放路开始打发就群殴刚叫我去额炯炯拉开距离开发及 来看电视剧弗兰克离开家大师傅了看见爱上大概是打发埃里克国家考虑过</p>
</li> </li>
</ul> </ul>
</el-dialog> </el-dialog>
...@@ -175,6 +163,8 @@ export default { ...@@ -175,6 +163,8 @@ export default {
} }
}; };
return { return {
showSendBtn: false, // 是否显示 分发按钮
remarkHistory: [], // 历史备注列表
ruleForm: { ruleForm: {
dingdingNumber: "", dingdingNumber: "",
dingdingDate: "", dingdingDate: "",
...@@ -189,55 +179,7 @@ export default { ...@@ -189,55 +179,7 @@ export default {
sheet: [{ required: true, message: "请选择sheet名", trigger: "change" }] sheet: [{ required: true, message: "请选择sheet名", trigger: "change" }]
}, },
testDataList: { testDataList: {},
outModels: [
{
column1: "上海市",
column5: "123423",
column4: "张三",
column3: "浦东新区",
column2: "上海市",
contentId: 1,
userName: "张三,李四",
dataUserContentId: 1,
status: 2
},
{
column1: "河南省",
column5: "123424",
column4: "李四",
column3: "舞阳县",
column2: "漯河市",
contentId: 2,
userName: "张三",
dataUserContentId: 4,
status: 2
}
],
total: 2,
columnList: [
{
key: "column1",
value: "省"
},
{
key: "column2",
value: "市"
},
{
key: "column3",
value: "区县"
},
{
key: "column4",
value: "姓名"
},
{
key: "column5",
value: "手机"
}
]
},
addConditioDialogVisible: false, // 添加筛选条件 addConditioDialogVisible: false, // 添加筛选条件
conditionForm: {}, conditionForm: {},
...@@ -245,58 +187,10 @@ export default { ...@@ -245,58 +187,10 @@ export default {
applyDateList: [], applyDateList: [],
sheetsList: [], sheetsList: [],
sendDialogVisible: false, //分发弹窗 sendDialogVisible: false, //分发弹窗
selectedPeople: [], dataUserDiss: [],
peopleList: [ peopleList: [],
{
value: "选项1",
label: "黄金糕"
},
{
value: "选项2",
label: "双皮奶"
}
],
remarkDialogVisible: false, //备注弹窗 remarkDialogVisible: false, //备注弹窗
textarea: "", newRemark: "",
tableData: [
{
date: "2016-05-03",
name: "王小虎",
address: "上海市普陀区金沙江路 1518 弄"
},
{
date: "2016-05-02",
name: "王小虎",
address: "上海市普陀区金沙江路 1518 弄"
},
{
date: "2016-05-04",
name: "王小虎",
address: "上海市普陀区金沙江路 1518 弄"
},
{
date: "2016-05-01",
name: "王小虎",
address: "上海市普陀区金沙江路 1518 弄"
},
{
date: "2016-05-08",
name: "王小虎",
address: "上海市普陀区金沙江路 1518 弄"
},
{
date: "2016-05-06",
name: "王小虎",
address: "上海市普陀区金沙江路 1518 弄"
},
{
date: "2016-05-07",
name: "王小虎",
address: "上海市普陀区金沙江路 1518 弄"
}
],
multipleSelection: [] multipleSelection: []
}; };
}, },
...@@ -304,6 +198,19 @@ export default { ...@@ -304,6 +198,19 @@ export default {
vm = this; vm = this;
}, },
methods: { methods: {
sendRequest( type, url, params, callback ){
openLoading(this);
url = localStorage.getItem("lectureUrl") + url;
this.$axios[type](url, params )
.then((res) => {
closeLoading(this);
res = res.data;
callback(res);
}).catch((error) => {
this.$message.error('网络出现点问题')
})
},
handleDingNumChange(val) { handleDingNumChange(val) {
if (val && val.length == 21) { if (val && val.length == 21) {
this.getApplyDateList(); this.getApplyDateList();
...@@ -325,14 +232,7 @@ export default { ...@@ -325,14 +232,7 @@ export default {
//获取 数据申请日期 //获取 数据申请日期
console.log(">>> 获取数据申请日期"); console.log(">>> 获取数据申请日期");
let params = { let callback = (res) => {
dingdingNumber: this.ruleForm.dingdingNumber
};
openLoading(this);
this.$axios.get(localStorage.getItem("lectureUrl") + '/sensitive/visit/date', { params } )
.then((res) => {
closeLoading(this);
res = res.data ? res.data : null;
if(res.code == "000000") { if(res.code == "000000") {
if(res.data && res.data.length > 0){ if(res.data && res.data.length > 0){
vm.applyDateList = res.data; vm.applyDateList = res.data;
...@@ -342,11 +242,8 @@ export default { ...@@ -342,11 +242,8 @@ export default {
}else { }else {
vm.$message.error(res.message); vm.$message.error(res.message);
} }
}).catch((error) => { }
vm.$message.error('网络出现点问题') vm.sendRequest( 'get', `/sensitive/visit/date?dingdingNumber=${this.ruleForm.dingdingNumber}`, {}, callback );
})
}, },
handleApplyDateChange(val) { handleApplyDateChange(val) {
if (val) { if (val) {
...@@ -365,16 +262,8 @@ export default { ...@@ -365,16 +262,8 @@ export default {
getSheets() { getSheets() {
// 获取 Sheets名 // 获取 Sheets名
console.log(">>> 获取Sheets名"); console.log(">>> 获取Sheets名");
let params = {
dingdingNumber: this.ruleForm.dingdingNumber, let callback = (res) => {
dingdingDate: this.ruleForm.dingdingDate,
};
openLoading(this);
this.$axios.get(localStorage.getItem("lectureUrl") + '/sensitive/visit/sheet', { params } )
.then((res) => {
closeLoading(this);
// debugger;
res = res.data ? res.data : null;
if(res.code == "000000") { if(res.code == "000000") {
if(res.data && res.data.length > 0){ if(res.data && res.data.length > 0){
vm.sheetsList = res.data; vm.sheetsList = res.data;
...@@ -384,14 +273,24 @@ export default { ...@@ -384,14 +273,24 @@ export default {
}else { }else {
vm.$message.error(res.message); vm.$message.error(res.message);
} }
}).catch((error) => { }
vm.$message.error('网络出现点问题') vm.sendRequest( 'get', `/sensitive/visit/sheet?dingdingNumber=${this.ruleForm.dingdingNumber}&dingdingDate=${this.ruleForm.dingdingDate}`, {}, callback );
}) },
confirmSendRemark() { // 添加备注信息
// vm.currentRow
let data = {
dataUserContentId: vm.currentRow.dataUserContentId,
remark: vm.newRemark,
};
let callback = (res) => {
if(res.code == '000000'){
vm.remarkDialogVisible = false;
}else{
vm.$message.error(res.message);
}
}
vm.sendRequest( 'post', `/sensitive/dataRemark`, data, callback );
}, },
showAddConditionModal() { showAddConditionModal() {
this.addConditioDialogVisible = true; this.addConditioDialogVisible = true;
...@@ -408,56 +307,51 @@ export default { ...@@ -408,56 +307,51 @@ export default {
dingdingNum: vm.ruleForm.dingdingNumber, dingdingNum: vm.ruleForm.dingdingNumber,
dingdingDate: vm.ruleForm.dingdingDate, dingdingDate: vm.ruleForm.dingdingDate,
dataSheetName: vm.ruleForm.sheet, dataSheetName: vm.ruleForm.sheet,
// pageNo: 1,
// pageSize: 15,
}; };
openLoading(this);
this.$axios.post(localStorage.getItem("lectureUrl") + '/sensitive/dataSearch/searchUserDis', data )
.then((res) => {
closeLoading(this);
debugger;
// if(res.data.code == '000000'){
// }
}).catch((error) => { let callback = (res) => {
this.$message.error('网络出现点问题') if(res.code == '000000'){
}) vm.peopleList = res.data;
}else{
vm.$message.error(res.message);
}
};
vm.sendRequest( 'post', `/sensitive/dataSearch/searchUserDis`, data, callback );
}, },
submitForm(formName) { submitForm(formName) {
console.log(">>> 查询"); console.log(">>> 查询");
this.$refs[formName].validate(valid => { this.$refs[formName].validate(valid => {
if (valid) { if (valid) {
alert("submit!"); // alert("submit!");
// 如果添加了筛选条件,则将其合并到 查询接口的传参中
let stringData = JSON.stringify(vm.conditionForm);
if (stringData != "{}") {
let condition = JSON.parse(stringData);
for (let key in condition) {
vm.ruleForm[key] = condition[key];
};
}
// 请求查询接口 // 请求查询接口
let data = { let data = {
columnMap: {},
dingdingNum: vm.ruleForm.dingdingNumber, dingdingNum: vm.ruleForm.dingdingNumber,
dingdingDate: vm.ruleForm.dingdingDate, dingdingDate: vm.ruleForm.dingdingDate,
dataSheetName: vm.ruleForm.sheet, dataSheetName: vm.ruleForm.sheet,
pageNo: 1, pageNo: 1,
pageSize: 15, pageSize: 15,
}; };
openLoading(this); // 如果添加了筛选条件,则将其合并到 查询接口的传参中
this.$axios.post(localStorage.getItem("lectureUrl") + '/sensitive/dataSearch/search', data ) let stringData = JSON.stringify(vm.conditionForm);
.then((res) => { if (stringData != "{}") {
closeLoading(this); let condition = JSON.parse(stringData);
debugger; for (let key in condition) {
// if(res.data.code == '000000'){ data.columnMap[key] = condition[key];
// } };
}
}).catch((error) => {
this.$message.error('网络出现点问题')
})
let callback = (res) => {
if(res.code == '000000'){
vm.testDataList = res.data;
if(typeof res.data.dataRole != 'undefined' && res.data.dataRole == 1){
vm.showSendBtn = true;
};
}else{
vm.$message.error(res.message);
}
};
vm.sendRequest( 'post', `/sensitive/dataSearch/search`, data, callback );
} else { } else {
console.log("error submit!!"); console.log("error submit!!");
return false; return false;
...@@ -470,9 +364,54 @@ export default { ...@@ -470,9 +364,54 @@ export default {
handleRemarkClick(row) { handleRemarkClick(row) {
console.log("handleRemarkClick: ", row); console.log("handleRemarkClick: ", row);
this.remarkDialogVisible = true; this.remarkDialogVisible = true;
vm.currentRow = row;
// 获取备注信息
let callback = (res) => {
if(res.code == "000000") {
vm.remarkHistory = res.data.remarks;
}else {
vm.$message.error(res.message);
}
};
vm.sendRequest( 'get', `/sensitive/dataRemark?dataUserContentId=${row.dataUserContentId}`, {}, callback );
},
handleTagClick(row) {
vm.currentRow = row;
let callback = (res) => {
if(res.code == "000000") {
vm.submitForm('ruleForm');
}else {
vm.$message.error(res.message);
}
}
vm.sendRequest( 'get', `/sensitive/dataSearch/changeStatus?dataUserContentId=${row.dataUserContentId}`, {}, callback );
},
handleRemarkClose() {
vm.newRemark = '';
vm.remarkHistory = [];
}, },
handleConfirmSend() { handleConfirmSend() {
console.log("确定分发>>>>"); console.log("确定分发>>>>");
let selectListIds = [];
vm.multipleSelection.map(function(value, index, arr){
selectListIds.push(value.contentId)
})
let data = {
dataUserDiss: vm.dataUserDiss,
dataCountIds: selectListIds,
dataInfoId: vm.testDataList.dataInfoId,
};
let callback = (res) => {
if(res.code == '000000'){
vm.sendDialogVisible = false;
}else{
vm.$message.error(res.message);
}
}
vm.sendRequest( 'post', `/sensitive/dataSearch/postUser`, data, callback );
} }
} }
}; };
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册