Commit 48ba7b9b by gao_yingdong

Merge branch 'dev_xzeq' of http://47.92.108.28/changchao/founder_vue into dev_xzeq

parents 6fd120ca fd2da11e
...@@ -29,8 +29,12 @@ export const insertTqsp = params => ...@@ -29,8 +29,12 @@ export const insertTqsp = params =>
//审批 //审批
export const insertSpgn = params => export const insertSpgn = params =>
post(`${base.alyIP}/rlqb/insertSpgn`, params); post(`${base.alyIP}/rlqb/insertSpgn`, params);
//提取人力情报xxzjbh
export const TqRlqbxx = params =>
postform(`${base.alyIP}/rlqb/TqRlqbxx`, params);
//一键分析
export const doAnalyse = params =>
postform(`${base.alyIP}/rlqb/doAnalyse`, params);
...@@ -17,7 +17,12 @@ ...@@ -17,7 +17,12 @@
v-for="groupItem in propFormField" v-for="groupItem in propFormField"
:key="groupItem.index" :key="groupItem.index"
> >
<div v-if="(groupItem.title != '法律文书') || (groupItem.title == '法律文书' && groupItem.showPage == true)"> <div
v-if="
groupItem.title != '法律文书' ||
(groupItem.title == '法律文书' && groupItem.showPage == true)
"
>
<div class="subTitle" v-if="groupItem.title"> <div class="subTitle" v-if="groupItem.title">
<div>{{ groupItem.title }}</div> <div>{{ groupItem.title }}</div>
</div> </div>
...@@ -253,7 +258,10 @@ ...@@ -253,7 +258,10 @@
> >
</el-checkbox-group> </el-checkbox-group>
</div> </div>
<div class="zdyInputW" v-else-if="item.type == 'checkboxList'"> <div
class="zdyInputW"
v-else-if="item.type == 'checkboxList'"
>
<el-checkbox-group <el-checkbox-group
v-model="formLabelAlign[item.id]" v-model="formLabelAlign[item.id]"
size="small" size="small"
...@@ -439,7 +447,9 @@ ...@@ -439,7 +447,9 @@
:file-list="fileLists[item.fileId || item.id]" :file-list="fileLists[item.fileId || item.id]"
:accept="item.acceptType" :accept="item.acceptType"
v-model="formLabelAlign[item.id]" v-model="formLabelAlign[item.id]"
v-else-if="item.type == 'flwsfile' && groupItem.showPage == true" v-else-if="
item.type == 'flwsfile' && groupItem.showPage == true
"
> >
<el-button size="small" type="primary">选择上传</el-button> <el-button size="small" type="primary">选择上传</el-button>
</el-upload> </el-upload>
...@@ -506,6 +516,26 @@ ...@@ -506,6 +516,26 @@
</el-input> </el-input>
</div> </div>
<div <div
v-if="item4.type == 'textTq'"
style="position: relative"
>
<el-input
:placeholder="item4.placeholder"
v-model="reakData[item4.id]"
:disabled="item4.disabled"
@focus="item4.focus || ''"
>
<template slot="append"
><span
@click="
messageTq(formLabelAlign[item2.id][0])
"
>提取</span
></template
>
</el-input>
</div>
<div
v-else-if="item4.type == 'datetime'" v-else-if="item4.type == 'datetime'"
style="display: flex; padding-right: 78px" style="display: flex; padding-right: 78px"
> >
...@@ -796,11 +826,11 @@ ...@@ -796,11 +826,11 @@
>保存</el-button >保存</el-button
> >
<el-button <el-button
style="width: 110px" style="width: 110px"
@click="submit('draft')" @click="submit('draft')"
class="finish" class="finish"
v-if="draft" v-if="draft"
>保存并提交</el-button >保存并提交</el-button
> >
<el-button <el-button
@click="examine" @click="examine"
...@@ -822,7 +852,6 @@ ...@@ -822,7 +852,6 @@
<el-dialog :visible.sync="dialogVisible"> <el-dialog :visible.sync="dialogVisible">
<img width="100%" :src="dialogImageUrl" alt="" /> <img width="100%" :src="dialogImageUrl" alt="" />
</el-dialog> --> </el-dialog> -->
</div> </div>
</template> </template>
...@@ -836,7 +865,7 @@ export default { ...@@ -836,7 +865,7 @@ export default {
SelectTreeDialog, SelectTreeDialog,
}, },
props: { props: {
draft:{ draft: {
type: Boolean, type: Boolean,
default: false, default: false,
}, },
...@@ -878,6 +907,17 @@ export default { ...@@ -878,6 +907,17 @@ export default {
ajTq(item) { ajTq(item) {
this.$emit("ajtq", item); this.$emit("ajtq", item);
}, },
messageTq(item) {
console.log(item);
var itemSend = {}
if(item.xm && item.xm != "") {
itemSend.xm = item.xm
}
if(item.zjhm && item.zjhm != "") {
itemSend.zjhm = item.zjhm
}
this.$emit("messageTq", itemSend);
},
choosePeople(item) { choosePeople(item) {
console.log(item); console.log(item);
this.$emit("choosePeople", item); this.$emit("choosePeople", item);
...@@ -1321,7 +1361,7 @@ export default { ...@@ -1321,7 +1361,7 @@ export default {
} }
} }
//另一种状态保存 //另一种状态保存
if(flag === 'draft'){ if (flag === "draft") {
this.$emit("draft"); this.$emit("draft");
} }
this.$emit("submit", params); this.$emit("submit", params);
...@@ -1386,27 +1426,27 @@ export default { ...@@ -1386,27 +1426,27 @@ export default {
var self = this; var self = this;
let isLt1M = ""; let isLt1M = "";
isLt1M = file.raw.size / 1024 / 1024 < 101; isLt1M = file.raw.size / 1024 / 1024 < 101;
// debugger; // debugger;
if (self.fileLists[item.id].length == 0) { if (self.fileLists[item.id].length == 0) {
self.$set(self.fileLists, item.id, []); self.$set(self.fileLists, item.id, []);
} }
if (isLt1M) { if (isLt1M) {
this.fileLists[item.id].push(file); this.fileLists[item.id].push(file);
// this.$refs.formLabelAlign.clearValidate(); // this.$refs.formLabelAlign.clearValidate();
} else { } else {
this.$confirm("上传文件不能超过100M", "提示", { this.$confirm("上传文件不能超过100M", "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning", type: "warning",
}).then(() => { }).then(() => {
fileList.forEach((item, index) => { fileList.forEach((item, index) => {
if (file.raw.uid == item.uid) { if (file.raw.uid == item.uid) {
fileList.splice(index, 1); fileList.splice(index, 1);
} }
});
}); });
} });
this.$emit("flwsInsert",file) }
this.$emit("flwsInsert", file);
}, },
flwsRemove(file, fileList, item, parentItem) { flwsRemove(file, fileList, item, parentItem) {
this.$emit("flwsRemove", file); this.$emit("flwsRemove", file);
...@@ -1481,6 +1521,7 @@ export default { ...@@ -1481,6 +1521,7 @@ export default {
if (val.childrenAsAdd) { if (val.childrenAsAdd) {
val.childrenAsAdd.forEach((val2, index2) => { val.childrenAsAdd.forEach((val2, index2) => {
//遍历list数组 //遍历list数组
debugger
if (val2 == obj) { if (val2 == obj) {
//通过比较两个对象是否相等 将formLabelAlign里绑定的数据复制了一份 //通过比较两个对象是否相等 将formLabelAlign里绑定的数据复制了一份
addObj = JSON.parse( addObj = JSON.parse(
...@@ -1554,7 +1595,6 @@ export default { ...@@ -1554,7 +1595,6 @@ export default {
}); });
} else if (val2.type == "code" || val2.type == "codeTree") { } else if (val2.type == "code" || val2.type == "codeTree") {
if (val2.isLazy) { if (val2.isLazy) {
} else { } else {
if (val2.codeOptions.length == 0) { if (val2.codeOptions.length == 0) {
axios axios
......
...@@ -291,6 +291,12 @@ ...@@ -291,6 +291,12 @@
<slot name="listOperation"></slot> <slot name="listOperation"></slot>
<div <div
class="flTtitle Add" class="flTtitle Add"
@click="oneClickAnalize"
v-if="pageBs == 'queryRlqbxs'">
一键分析
</div>
<div
class="flTtitle Add"
@click="add" @click="add"
v-if=" v-if="
pageBs != 'zdryGl' && pageBs != 'zdryGl' &&
...@@ -1087,6 +1093,12 @@ ...@@ -1087,6 +1093,12 @@
v-if="pageBs == 'queryRlqbxsSH'" v-if="pageBs == 'queryRlqbxsSH'"
>审核</span >审核</span
> >
<span
@click="send(scope)"
class="edit"
v-if="pageBs == 'queryRlqbxs'"
>发送消息</span
>
<!-- <span <!-- <span
@click="$emit('qxfp', scope)" @click="$emit('qxfp', scope)"
class="dele" class="dele"
...@@ -1664,6 +1676,9 @@ export default { ...@@ -1664,6 +1676,9 @@ export default {
audit(scope) { audit(scope) {
this.$emit("audit", scope.row); this.$emit("audit", scope.row);
}, },
send(scope) {
this.$emit("send", scope.row);
},
bqDetail(item, zjhm) { bqDetail(item, zjhm) {
this.bqShuju = []; this.bqShuju = [];
if (item == "团伙作案" || item == "结伙作案") { if (item == "团伙作案" || item == "结伙作案") {
...@@ -1862,6 +1877,9 @@ export default { ...@@ -1862,6 +1877,9 @@ export default {
editMenu(scope) { editMenu(scope) {
this.$emit("editMenu", scope); this.$emit("editMenu", scope);
}, },
oneClickAnalize() {
this.$emit("oneClickAnalize");
},
add() { add() {
this.$emit("add"); this.$emit("add");
}, },
......
...@@ -122,7 +122,7 @@ const xstgz = [ ...@@ -122,7 +122,7 @@ const xstgz = [
{ {
name: "姓名:", name: "姓名:",
id: "xm", id: "xm",
type: "text", type: "textTq",
prop: 'checkEmpty', prop: 'checkEmpty',
value: "", value: "",
placeholder: "请输入", placeholder: "请输入",
...@@ -131,7 +131,7 @@ const xstgz = [ ...@@ -131,7 +131,7 @@ const xstgz = [
{ {
name: "证件号码:", name: "证件号码:",
id: "zjhm", id: "zjhm",
type: "text", type: "textTq",
prop: 'checkEmpty', prop: 'checkEmpty',
value: "", value: "",
placeholder: "请输入", placeholder: "请输入",
...@@ -355,7 +355,7 @@ const jdcxsgl = [ ...@@ -355,7 +355,7 @@ const jdcxsgl = [
value: "", value: "",
placeholder: "请输入", placeholder: "请输入",
col: "2", col: "2",
prop: "wpNumbers", // prop: "wpNumbers",
}, },
{ {
name: "警综物品编号:", name: "警综物品编号:",
...@@ -364,7 +364,7 @@ const jdcxsgl = [ ...@@ -364,7 +364,7 @@ const jdcxsgl = [
value: "", value: "",
placeholder: "请输入", placeholder: "请输入",
col: "2", col: "2",
prop: "wpNumbers", // prop: "wpNumbers",
}, },
{ {
name: "机动车使用性质:", name: "机动车使用性质:",
...@@ -561,6 +561,7 @@ const fjdcxsgl = [ ...@@ -561,6 +561,7 @@ const fjdcxsgl = [
value: "", value: "",
placeholder: "请选择", placeholder: "请选择",
col: "2", col: "2",
prop: 'checkEmpty',
}, },
{ {
name: "物品颜色补充:", name: "物品颜色补充:",
...@@ -587,6 +588,7 @@ const fjdcxsgl = [ ...@@ -587,6 +588,7 @@ const fjdcxsgl = [
codeOptions: [], codeOptions: [],
value: "", value: "",
placeholder: "请选择", placeholder: "请选择",
prop: 'checkEmpty',
col: "2", col: "2",
}, },
] ]
......
...@@ -7,8 +7,40 @@ ...@@ -7,8 +7,40 @@
:propTitle="title" :propTitle="title"
:pageBs="pageBs" :pageBs="pageBs"
@examine="examine" @examine="examine"
@messageTq="messageTq"
> >
</form-compontent> </form-compontent>
<el-dialog
title="提取信息"
:visible.sync="dialogVisiable"
width="35%"
>
<el-table
:data="resultTq"
style="width: 100%">
<el-table-column
align="center"
prop="xxzjbh"
label="信息主键编号"
width="500">
</el-table-column>
<el-table-column
label="操作"
width="150">
<template slot-scope="scope">
<span
@click="extra(scope.row)"
style="margin-right: 16px;color:blue;cursor: pointer;"
>提取</span
>
</template>
</el-table-column>
</el-table>
<span slot="footer" class="dialog-footer">
<el-button @click="dialogVisiable = false">取 消</el-button>
<el-button type="primary" @click="dialogVisiable = false">确 定</el-button>
</span>
</el-dialog>
</div> </div>
</template> </template>
...@@ -20,6 +52,7 @@ import { ...@@ -20,6 +52,7 @@ import {
updateKyxsxx, updateKyxsxx,
getKyxsByxxzjbh, getKyxsByxxzjbh,
insertTqsp, insertTqsp,
TqRlqbxx
} from "@/api/rlqbxs.js"; } from "@/api/rlqbxs.js";
export default { export default {
name: "addRlqbxs", name: "addRlqbxs",
...@@ -174,6 +207,8 @@ export default { ...@@ -174,6 +207,8 @@ export default {
isActive: true, isActive: true,
}, },
], ],
dialogVisiable: false,
resultTq: [],
}; };
}, },
methods: { methods: {
...@@ -217,6 +252,33 @@ export default { ...@@ -217,6 +252,33 @@ export default {
} }
console.log(this.xxzjbh); console.log(this.xxzjbh);
}, },
messageTq(item) {
console.log(item);
var params = new FormData()
params.append("xm",item.xm)
params.append("zjhm",item.zjhm)
TqRlqbxx(params).then((res) => {
if (res.success && res.code == 200) {
this.$message.success("提取成功")
var result = res.data.rows
// this.resultTq =result
result.map((item,index) => {
// this.resultTq.push({ xxzjbh:item })
this.$set(this.resultTq,index,{xxzjbh:item})
})
console.log(this.resultTq);
this.dialogVisiable = true
} else {
loading.close();
this.$message.error("提取失败")
}
});
},
extra(item) {
console.log(item);
this.xxzjbh = item.xxzjbh
this.getshuju()
},
getshuju() { getshuju() {
var self = this; var self = this;
let loading = this.$loading({ let loading = this.$loading({
......
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