Skip to content

F
founder_vue
Commit a9abcf9b by liyuhang19990520
Options

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

parents 09ce27e4 10aa5e5b
Showing with 76 additions and 65 deletions
src/views/AllPersonnelBase/AllPersonnelBase.vue
......@@ -572,7 +572,7 @@ export default {
search () {
// //console.info("请求===>", this.reqParam);
this.$axios
.post("/api/personstore/allperson", this.reqParam)
.post("/api/personstore/person/list", this.reqParam)
.then((response) => {
if (response.data.code === 0) {
this.tableDate = response.data.ret.list;
......
src/views/AllPersonnelBase/gzlb.vue
......@@ -237,6 +237,8 @@
:max-height="height"
ref="multipleTable"
:data="tableDate1"
:class="{delSelection: !selectBoo}"
class="dttable"
tooltip-effect="dark"
style="width: 100%"
row-key="sequenceNumber"
......@@ -249,7 +251,6 @@
<el-table-column
type="selection"
:width="width1"
v-if="isSelected"
>
</el-table-column>
<el-table-column
......@@ -394,9 +395,11 @@
:max-height="height"
ref="multipleTable"
:data="tableDate2"
:class="{delSelection: !selectBoo}"
tooltip-effect="dark"
style="width: 100%"
row-key="sequenceNumber"
class="dttable"
:tree-props="{
children: 'affirmImportRecordGrandchildren',
hasChildren: 'hasChildren',
......@@ -406,7 +409,6 @@
<el-table-column
type="selection"
:width="width1"
v-if="isSelected"
>
</el-table-column>
<el-table-column
......@@ -702,7 +704,6 @@ export default {
isShowDcftpx: false, // 导出FPTX
isShowDcfptx1: false,// 导出FPTX
isSelected: false, // 是否批量操作
isShowTjddl: false, // 添加到队列
isShowFztm: false, //复制条码
isShowFcx: false, //发查询
......@@ -721,10 +722,11 @@ export default {
multipleSelection: [], // 表单选择项目
isShowTip: false, //批量操作提示
selectBoo: false,// 是否批量操作
selectionData: [],
height: 500,
width1: 70,
height: 460,
width1: 50,
width2: 400,
width3: 300,
width4: 200,
......@@ -909,7 +911,7 @@ export default {
//console.log("添加到队列");
if (this.multipleSelection.length === 0) {
this.$message.error("请选择需要添加到队列的数据！");
this.isSelected = true;
this.selectBoo = true;
} else {
if (this.showType == 1) {
this.type = "ry"
......@@ -1017,7 +1019,7 @@ export default {
isShowFcxBtn () {
if (this.multipleSelection.length === 0) {
this.$message.error("请选择需要发查询的数据！");
this.isSelected = true;
this.selectBoo = true;
} else {
if (this.showType == 1) {
this.type = "ry"
......@@ -1073,7 +1075,7 @@ export default {
* @return {*}
*/
batch () {
this.isSelected = !this.isSelected;
this.selectBoo = !this.selectBoo;
this.isShowTip = !this.isShowTip;
this.toggleSelection();
},
......@@ -1265,6 +1267,10 @@ export default {
}
</style>
<style scoped lang="scss">
// 隐藏掉table多选框
.delSelection /deep/.el-table-column--selection .cell {
display: none;
}
/deep/.el-table--scrollable-x .el-table__body-wrapper {
height: 500px;
}
......
src/views/AllPersonnelBase/modules/ajxxk.vue
......@@ -226,7 +226,6 @@ export default {
)
.then((response) => {
if (response.data.code == 0) {
debugger
self.CaseImgNum = response.data.ret.length;
if (self.CaseImgNum > 0) {
......
src/views/AllPersonnelBase/modules/ryxxk.vue
......@@ -853,6 +853,12 @@ export default {
height: 300px;
border-radius: 2px;
border: 1px solid #cccccc;
box-sizing: border-box;
display: flex;
justify-content: center;
img {
height: 300px;
}
}
.zhangwenName {
width: 300px;
......
src/views/AllPersonnelBase/modules/xzaj.vue
......@@ -95,14 +95,14 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item
label="是否命案："
prop="sfmaPdbz"
>
<el-radio-group v-model="ruleForm.sfmaPdbz">
<el-radio label="1">是</el-radio>
<el-radio label="0">否</el-radio>
</el-radio-group>
<el-form-item label="警综案事件编号：">
<el-input
v-model.trim="ruleForm.jzasjbh"
placeholder="请输入警综案事件编号"
maxlength="23"
show-word-limit
clearable
></el-input>
</el-form-item>
</el-col>
</el-row>
......@@ -117,7 +117,17 @@
></Cascader>
</el-form-item>
</el-col>
<el-col :span="12"> </el-col>
<el-col :span="12">
<el-form-item
label="是否命案："
prop="sfmaPdbz"
>
<el-radio-group v-model="ruleForm.sfmaPdbz">
<el-radio label="1">是</el-radio>
<el-radio label="0">否</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
......@@ -312,6 +322,7 @@ export default {
ssjzrmby: "", // 损失价值
xczzhwkbh: "", // 现场掌指纹卡编号
ajlbdm: "", // 案件类别
jzasjbh: '', // 警综案事件编号
sfmaPdbz: "0", // 命案
jyaq: "", // 简要案情
tqdwGajgjgdm: "", // 提取单位代码
......
src/views/AllPersonnelBase/modules/xzry.vue
......@@ -340,11 +340,11 @@
<el-col :span="12">
<el-form-item
label="捺印单位："
prop="nydwGajgmc"
prop="nydwGajgjgdm"
>
<Cascader
:form="ruleForm"
id="nydwGajgmc"
id="nydwGajgjgdm"
></Cascader>
</el-form-item>
</el-col>
......@@ -435,16 +435,7 @@
<script>
import Cascader from "@/components/Cascader.vue";
import SelectCode from "@/components/SelectCode.vue";
const targetOptions = [
"本地案件库",
"比中案件库",
"已破案件库",
"重大案件库",
"B类案件库",
"C类案件库",
"勘查案件库",
"协查案件库",
];
const targetOptions = ['基本人员库', '高危人员库', '非法人员库', '在逃人员库', '布控人员库', '前科人员库', '协查人员库'];
export default {
name: "xzry",
components: {
......@@ -487,10 +478,7 @@ export default {
xzzDzmc: "", // 现住址
bz: "", // 备注
// logicDatabaseCode: [],// 逻辑库代码
// logicDatabaseName: [],//逻辑库名称
nydwGajgmc: "", // 捺印单位
nydwGajgjgdm: "", // 捺印单位
nyryXm: "", // 捺印人姓名
nysj: "", // 捺印时间
nyryGmsfhm: "", // 捺印人身份证号
......@@ -500,6 +488,7 @@ export default {
zwbdxtlxms: "1", // 指纹比对描述
nydwGajgjgdm: "1", // 捺印单位代码
},
logicList: [],// 逻辑库代码
rules: {
ysxtAsjxgrybh: [
{ required: true, message: "请输入人员条码号", trigger: "blur" },
......@@ -545,7 +534,7 @@ export default {
xzzDzmc: [
{ required: true, message: "请输入现住地址", trigger: "blur" },
],
nydwGajgmc: [
nydwGajgjgdm: [
{ required: true, message: "请输入捺印单位", trigger: "change" },
],
nyryXm: [
......@@ -594,42 +583,42 @@ export default {
if (this.checkedTargets.length == 0) {
this.$message.error('请选择逻辑库')
} else {
// for (var i = 0; i <= this.checkedTargets.length; i++) {
// if (this.checkedTargets[i] == '基本人员库') {
// this.logicDatabaseCode.push('1')
// } else if (this.checkedTargets[i] == '高危人员库') {
// this.logicDatabaseCode.push('2')
// } else if (this.checkedTargets[i] == '非法人员库') {
// this.logicDatabaseCode.push('3')
// } else if (this.checkedTargets[i] == '在逃人员库') {
// this.logicDatabaseCode.push('4')
// } else if (this.checkedTargets[i] == '布控人员库') {
// this.logicDatabaseCode.push('5')
// } else if (this.checkedTargets[i] == '前科人员库') {
// this.logicDatabaseCode.push('6')
// } else if (this.checkedTargets[i] == '协查人员库') {
// this.logicDatabaseCode.push('7')
// }
// }
for (var i = 0; i <= this.checkedTargets.length; i++) {
if (this.checkedTargets[i] == '基本人员库') {
this.logicList.push(1)
} else if (this.checkedTargets[i] == '高危人员库') {
this.logicList.push(2)
} else if (this.checkedTargets[i] == '非法人员库') {
this.logicList.push(3)
} else if (this.checkedTargets[i] == '在逃人员库') {
this.logicList.push(4)
} else if (this.checkedTargets[i] == '布控人员库') {
this.logicList.push(5)
} else if (this.checkedTargets[i] == '前科人员库') {
this.logicList.push(6)
} else if (this.checkedTargets[i] == '协查人员库') {
this.logicList.push(7)
}
}
// console.log(this.logicDatabaseCode)
let reqParam = {
personDo: "",
logicList: []
};
reqParam.personDo = this.ruleForm;
reqParam.personDo.ysxtAsjxgrybh = 'R' + this.ruleForm.ysxtAsjxgrybh
// reqParam.personDo.logicDatabaseCode = this.logicDatabaseCode
// reqParam.personDo.logicDatabaseName = this.checkedTargets
// this.$axios
// .post("/api/personstore/personadd", reqParam)
// .then((response) => {
// if (response.data.code === 0) {
// this.$message.success("新增成功");
// this.dialogVisible = false;
reqParam.logicList = this.logicList
this.$axios
.post("/api/personstore/personadd", reqParam)
.then((response) => {
if (response.data.code === 0) {
this.$message.success("新增成功");
this.dialogVisible = false;
// } else {
// this.$message.error("新增失败");
// }
// });
} else {
this.$message.error("新增失败");
}
});
}
} else {
return false;
......
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