Skip to content

F
founder_vue
Commit fe3b711e by maxiaohan
Options

Merge remote-tracking branch 'origin/dev_zwpt' into dev_zwpt

parents bc0bf4dd 80a23fae
Showing with 363 additions and 72 deletions
package-lock.json
...@@ -23549,7 +23549,7 @@ ...@@ -23549,7 +23549,7 @@
}, },
"image-size": { "image-size": {
"version": "0.5.5", "version": "0.5.5",
"resolved": "https://registry.npm.taobao.org/image-size/download/image-size-0.5.5.tgz", "resolved": "https://registry.npm.taobao.org/image-size/download/image-size-0.5.5.tgz?cache=0&sync_timestamp=1618422657851&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fimage-size%2Fdownload%2Fimage-size-0.5.5.tgz",
"integrity": "sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w=", "integrity": "sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w=",
"dev": true "dev": true
}, },
...@@ -24652,7 +24652,7 @@ ...@@ -24652,7 +24652,7 @@
}, },
"merge-options": { "merge-options": {
"version": "1.0.1", "version": "1.0.1",
"resolved": "https://registry.npm.taobao.org/merge-options/download/merge-options-1.0.1.tgz?cache=0&sync_timestamp=1606147071422&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmerge-options%2Fdownload%2Fmerge-options-1.0.1.tgz", "resolved": "https://registry.npm.taobao.org/merge-options/download/merge-options-1.0.1.tgz",
"integrity": "sha1-KmSyRFe+zU5NxggoMkfpTOWJqjI=", "integrity": "sha1-KmSyRFe+zU5NxggoMkfpTOWJqjI=",
"dev": true, "dev": true,
"requires": { "requires": {
...@@ -25003,6 +25003,12 @@ ...@@ -25003,6 +25003,12 @@
"integrity": "sha1-8lc+aHLxtwBnQj/Gi7ydDeLzu+4=", "integrity": "sha1-8lc+aHLxtwBnQj/Gi7ydDeLzu+4=",
"dev": true "dev": true
}, },
"nanocolors": {
"version": "0.2.11",
"resolved": "https://registry.npmmirror.com/nanocolors/download/nanocolors-0.2.11.tgz",
"integrity": "sha1-8lc+aHLxtwBnQj/Gi7ydDeLzu+4=",
"dev": true
},
"nanoid": { "nanoid": {
"version": "3.1.28", "version": "3.1.28",
"resolved": "https://registry.npmmirror.com/nanoid/download/nanoid-3.1.28.tgz?cache=0&sync_timestamp=1632644966429&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fnanoid%2Fdownload%2Fnanoid-3.1.28.tgz", "resolved": "https://registry.npmmirror.com/nanoid/download/nanoid-3.1.28.tgz?cache=0&sync_timestamp=1632644966429&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fnanoid%2Fdownload%2Fnanoid-3.1.28.tgz",
...@@ -26586,7 +26592,7 @@ ...@@ -26586,7 +26592,7 @@
}, },
"posthtml-parser": { "posthtml-parser": {
"version": "0.2.1", "version": "0.2.1",
"resolved": "https://registry.nlark.com/posthtml-parser/download/posthtml-parser-0.2.1.tgz?cache=0&sync_timestamp=1630307510188&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fposthtml-parser%2Fdownload%2Fposthtml-parser-0.2.1.tgz", "resolved": "https://registry.nlark.com/posthtml-parser/download/posthtml-parser-0.2.1.tgz",
"integrity": "sha1-NdUw3jhnQMK6JP8usvrznM3ycd0=", "integrity": "sha1-NdUw3jhnQMK6JP8usvrznM3ycd0=",
"dev": true, "dev": true,
"requires": { "requires": {
...@@ -26607,7 +26613,7 @@ ...@@ -26607,7 +26613,7 @@
}, },
"posthtml-rename-id": { "posthtml-rename-id": {
"version": "1.0.12", "version": "1.0.12",
"resolved": "https://registry.nlark.com/posthtml-rename-id/download/posthtml-rename-id-1.0.12.tgz", "resolved": "https://registry.npm.taobao.org/posthtml-rename-id/download/posthtml-rename-id-1.0.12.tgz",
"integrity": "sha1-z39us3FGvxr6wx5o8YxswZrmFDM=", "integrity": "sha1-z39us3FGvxr6wx5o8YxswZrmFDM=",
"dev": true, "dev": true,
"requires": { "requires": {
...@@ -26616,7 +26622,7 @@ ...@@ -26616,7 +26622,7 @@
}, },
"posthtml-render": { "posthtml-render": {
"version": "1.4.0", "version": "1.4.0",
"resolved": "https://registry.nlark.com/posthtml-render/download/posthtml-render-1.4.0.tgz?cache=0&sync_timestamp=1627374519063&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fposthtml-render%2Fdownload%2Fposthtml-render-1.4.0.tgz", "resolved": "https://registry.nlark.com/posthtml-render/download/posthtml-render-1.4.0.tgz?cache=0&sync_timestamp=1627374552910&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fposthtml-render%2Fdownload%2Fposthtml-render-1.4.0.tgz",
"integrity": "sha1-QBFAcMRYgcrLkzR9rj7/U6+8/xM=", "integrity": "sha1-QBFAcMRYgcrLkzR9rj7/U6+8/xM=",
"dev": true "dev": true
}, },
...@@ -28635,13 +28641,13 @@ ...@@ -28635,13 +28641,13 @@
"dependencies": { "dependencies": {
"ansi-styles": { "ansi-styles": {
"version": "2.2.1", "version": "2.2.1",
"resolved": "https://registry.nlark.com/ansi-styles/download/ansi-styles-2.2.1.tgz?cache=0&sync_timestamp=1618995625950&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fansi-styles%2Fdownload%2Fansi-styles-2.2.1.tgz", "resolved": "https://registry.nlark.com/ansi-styles/download/ansi-styles-2.2.1.tgz",
"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
"dev": true "dev": true
}, },
"chalk": { "chalk": {
"version": "1.1.3", "version": "1.1.3",
"resolved": "https://registry.nlark.com/chalk/download/chalk-1.1.3.tgz?cache=0&sync_timestamp=1627646697260&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fchalk%2Fdownload%2Fchalk-1.1.3.tgz", "resolved": "https://registry.nlark.com/chalk/download/chalk-1.1.3.tgz",
"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
"dev": true, "dev": true,
"requires": { "requires": {
...@@ -28654,7 +28660,7 @@ ...@@ -28654,7 +28660,7 @@
"dependencies": { "dependencies": {
"supports-color": { "supports-color": {
"version": "2.0.0", "version": "2.0.0",
"resolved": "https://registry.nlark.com/supports-color/download/supports-color-2.0.0.tgz?cache=0&sync_timestamp=1626703400240&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsupports-color%2Fdownload%2Fsupports-color-2.0.0.tgz", "resolved": "https://registry.nlark.com/supports-color/download/supports-color-2.0.0.tgz?cache=0&sync_timestamp=1626703414084&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsupports-color%2Fdownload%2Fsupports-color-2.0.0.tgz",
"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
"dev": true "dev": true
} }
...@@ -28662,7 +28668,7 @@ ...@@ -28662,7 +28668,7 @@
}, },
"clone": { "clone": {
"version": "2.1.2", "version": "2.1.2",
"resolved": "https://registry.nlark.com/clone/download/clone-2.1.2.tgz", "resolved": "https://registry.npm.taobao.org/clone/download/clone-2.1.2.tgz",
"integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=", "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=",
"dev": true "dev": true
}, },
...@@ -28677,7 +28683,7 @@ ...@@ -28677,7 +28683,7 @@
}, },
"extend-shallow": { "extend-shallow": {
"version": "2.0.1", "version": "2.0.1",
"resolved": "https://registry.nlark.com/extend-shallow/download/extend-shallow-2.0.1.tgz", "resolved": "https://registry.npm.taobao.org/extend-shallow/download/extend-shallow-2.0.1.tgz",
"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
"dev": true, "dev": true,
"requires": { "requires": {
...@@ -28686,7 +28692,7 @@ ...@@ -28686,7 +28692,7 @@
}, },
"has-flag": { "has-flag": {
"version": "1.0.0", "version": "1.0.0",
"resolved": "https://registry.nlark.com/has-flag/download/has-flag-1.0.0.tgz?cache=0&sync_timestamp=1626715907927&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhas-flag%2Fdownload%2Fhas-flag-1.0.0.tgz", "resolved": "https://registry.nlark.com/has-flag/download/has-flag-1.0.0.tgz",
"integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
"dev": true "dev": true
}, },
...@@ -28726,7 +28732,7 @@ ...@@ -28726,7 +28732,7 @@
}, },
"is-descriptor": { "is-descriptor": {
"version": "1.0.2", "version": "1.0.2",
"resolved": "https://registry.nlark.com/is-descriptor/download/is-descriptor-1.0.2.tgz", "resolved": "https://registry.npm.taobao.org/is-descriptor/download/is-descriptor-1.0.2.tgz",
"integrity": "sha1-OxWXRqZmBLBPjIFSS6NlxfFNhuw=", "integrity": "sha1-OxWXRqZmBLBPjIFSS6NlxfFNhuw=",
"dev": true, "dev": true,
"requires": { "requires": {
...@@ -28799,7 +28805,7 @@ ...@@ -28799,7 +28805,7 @@
}, },
"supports-color": { "supports-color": {
"version": "3.2.3", "version": "3.2.3",
"resolved": "https://registry.nlark.com/supports-color/download/supports-color-3.2.3.tgz?cache=0&sync_timestamp=1626703400240&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsupports-color%2Fdownload%2Fsupports-color-3.2.3.tgz", "resolved": "https://registry.nlark.com/supports-color/download/supports-color-3.2.3.tgz?cache=0&sync_timestamp=1626703414084&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsupports-color%2Fdownload%2Fsupports-color-3.2.3.tgz",
"integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
"dev": true, "dev": true,
"requires": { "requires": {
...@@ -28821,7 +28827,7 @@ ...@@ -28821,7 +28827,7 @@
"dependencies": { "dependencies": {
"deepmerge": { "deepmerge": {
"version": "1.3.2", "version": "1.3.2",
"resolved": "https://registry.nlark.com/deepmerge/download/deepmerge-1.3.2.tgz", "resolved": "https://registry.npm.taobao.org/deepmerge/download/deepmerge-1.3.2.tgz?cache=0&sync_timestamp=1606805746825&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdeepmerge%2Fdownload%2Fdeepmerge-1.3.2.tgz",
"integrity": "sha1-FmNpFinU2/42T6EqKk8KqGqjoFA=", "integrity": "sha1-FmNpFinU2/42T6EqKk8KqGqjoFA=",
"dev": true "dev": true
} }
...@@ -28829,7 +28835,7 @@ ...@@ -28829,7 +28835,7 @@
}, },
"svg-sprite-loader": { "svg-sprite-loader": {
"version": "6.0.9", "version": "6.0.9",
"resolved": "https://registry.nlark.com/svg-sprite-loader/download/svg-sprite-loader-6.0.9.tgz", "resolved": "https://registry.nlark.com/svg-sprite-loader/download/svg-sprite-loader-6.0.9.tgz?cache=0&sync_timestamp=1624440852954&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsvg-sprite-loader%2Fdownload%2Fsvg-sprite-loader-6.0.9.tgz",
"integrity": "sha1-8aEInDhgDr1fuNCd+jyDqkQ0orQ=", "integrity": "sha1-8aEInDhgDr1fuNCd+jyDqkQ0orQ=",
"dev": true, "dev": true,
"requires": { "requires": {
...@@ -28845,7 +28851,7 @@ ...@@ -28845,7 +28851,7 @@
"dependencies": { "dependencies": {
"deepmerge": { "deepmerge": {
"version": "1.3.2", "version": "1.3.2",
"resolved": "https://registry.nlark.com/deepmerge/download/deepmerge-1.3.2.tgz", "resolved": "https://registry.npm.taobao.org/deepmerge/download/deepmerge-1.3.2.tgz?cache=0&sync_timestamp=1606805746825&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdeepmerge%2Fdownload%2Fdeepmerge-1.3.2.tgz",
"integrity": "sha1-FmNpFinU2/42T6EqKk8KqGqjoFA=", "integrity": "sha1-FmNpFinU2/42T6EqKk8KqGqjoFA=",
"dev": true "dev": true
} }
...@@ -29430,7 +29436,7 @@ ...@@ -29430,7 +29436,7 @@
}, },
"unidecode": { "unidecode": {
"version": "0.1.8", "version": "0.1.8",
"resolved": "https://registry.nlark.com/unidecode/download/unidecode-0.1.8.tgz", "resolved": "https://registry.npm.taobao.org/unidecode/download/unidecode-0.1.8.tgz",
"integrity": "sha1-77swFTi8RSRqmsjFWdcvAVMFBT4=", "integrity": "sha1-77swFTi8RSRqmsjFWdcvAVMFBT4=",
"dev": true "dev": true
}, },
src/views/AllPersonnelBase/AllPersonnelBase.vue
...@@ -188,7 +188,7 @@ ...@@ -188,7 +188,7 @@
effect="dark" effect="dark"
content="编辑" content="编辑"
placement="top" placement="top"
open-delay='200' :open-delay='200'
@click="handleClick(scope.row)" @click="handleClick(scope.row)"
> >
<div <div
...@@ -205,8 +205,8 @@ ...@@ -205,8 +205,8 @@
class="item" class="item"
effect="dark" effect="dark"
content="收藏" content="收藏"
open-delay='200'
placement="top" placement="top"
:open-delay='200'
> >
<div <div
class="icon sc" class="icon sc"
...@@ -223,7 +223,7 @@ ...@@ -223,7 +223,7 @@
effect="dark" effect="dark"
content="改号" content="改号"
placement="top" placement="top"
open-delay='200' :open-delay='200'
> >
<div <div
class="icon gx" class="icon gx"
...@@ -240,11 +240,11 @@ ...@@ -240,11 +240,11 @@
effect="dark" effect="dark"
content="发查询" content="发查询"
placement="top" placement="top"
open-delay='200' :open-delay='200'
> >
<div <div
class="icon look" class="icon look"
@click="handleClick(scope.row)" @click="isShowFcxBtn1(scope.row)"
> >
<img <img
src="../../assets/img/qbryk/search.png" src="../../assets/img/qbryk/search.png"
...@@ -257,7 +257,7 @@ ...@@ -257,7 +257,7 @@
effect="dark" effect="dark"
content="复制数据" content="复制数据"
placement="top" placement="top"
open-delay='200' :open-delay='200'
> >
<div <div
class="icon bz" class="icon bz"
...@@ -274,7 +274,7 @@ ...@@ -274,7 +274,7 @@
effect="dark" effect="dark"
content="打印" content="打印"
placement="top" placement="top"
open-delay='200' :open-delay='200'
> >
<div <div
class="icon print" class="icon print"
...@@ -291,7 +291,7 @@ ...@@ -291,7 +291,7 @@
effect="dark" effect="dark"
content="删除" content="删除"
placement="top" placement="top"
open-delay='200' :open-delay='200'
> >
<el-popconfirm <el-popconfirm
placement="top-start" placement="top-start"
...@@ -441,14 +441,14 @@ export default { ...@@ -441,14 +441,14 @@ export default {
methods: { methods: {
// 获取全部人员列表请求 // 获取全部人员列表请求
search () { search () {
console.info("请求===>", this.reqParam); // console.info("请求===>", this.reqParam);
this.$axios this.$axios
.post("/api/personstore/allperson", this.reqParam) .post("/api/personstore/allperson", this.reqParam)
.then(response => { .then(response => {
if (response.data.code === 0) { if (response.data.code === 0) {
this.tableDate = response.data.ret.list; this.tableDate = response.data.ret.list;
this.reqParam.page.total = response.data.ret.total; this.reqParam.page.total = response.data.ret.total;
console.info("查询结果===>", this.tableDate); // console.info("查询结果===>", this.tableDate);
// this.userInfo = this.getUserInfo(this.tableDate); // this.userInfo = this.getUserInfo(this.tableDate);
} else { } else {
this.$message.error(response.data.message); this.$message.error(response.data.message);
...@@ -605,9 +605,17 @@ export default { ...@@ -605,9 +605,17 @@ export default {
this.search() this.search()
}, },
//发查询操作 //发查询操作(多行)
isShowFcxBtn (val) { isShowFcxBtn () {
console.log('发查询', val) if (this.multipleSelection.length === 0) {
this.$message.error("请选择需要发查询的数据！");
} else {
this.rowData = this.multipleSelection
this.isShowFcx = true;
}
},
isShowFcxBtn1 (val) {
console.log('单行人员发查询数据', val)
this.rowData = val this.rowData = val
this.isShowFcx = true; this.isShowFcx = true;
}, },
......
src/views/AllPersonnelBase/modules/fcx.vue
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
</div> </div>
</div> </div>
</div> </div>
<!-- 人员 -->
<div <div
class="middle" class="middle"
v-if="this.type== 'ry'" v-if="this.type== 'ry'"
...@@ -54,19 +55,19 @@ ...@@ -54,19 +55,19 @@
</el-radio-group> </el-radio-group>
<el-checkbox-group v-model="ruleForm.cxlx.type"> <el-checkbox-group v-model="ruleForm.cxlx.type">
<el-checkbox <el-checkbox
label="美食/餐厅线上活动" label="无图像，不发送查询"
name="type" name="type"
></el-checkbox> ></el-checkbox>
<el-checkbox <el-checkbox
label="地推活动" label="已比中，不发送查询"
name="type" name="type"
></el-checkbox> ></el-checkbox>
<el-checkbox <el-checkbox
label="线下主题活动" label="已破案，不发送查询"
name="type" name="type"
></el-checkbox> ></el-checkbox>
<el-checkbox <el-checkbox
label="单纯品牌曝光" label="已撤销，不发送查询"
name="type" name="type"
></el-checkbox> ></el-checkbox>
</el-checkbox-group> </el-checkbox-group>
...@@ -86,10 +87,11 @@ ...@@ -86,10 +87,11 @@
prop="yxj" prop="yxj"
> >
<el-radio-group v-model="ruleForm.yxj"> <el-radio-group v-model="ruleForm.yxj">
<el-radio label="低"></el-radio> <el-radio label="5">最低</el-radio>
<el-radio label="普通"></el-radio> <el-radio label="4">低</el-radio>
<el-radio label="高"></el-radio> <el-radio label="3">中</el-radio>
<el-radio label="最高"></el-radio> <el-radio label="2">高</el-radio>
<el-radio label="1">最高</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item <el-form-item
...@@ -122,7 +124,10 @@ ...@@ -122,7 +124,10 @@
label-width="100px" label-width="100px"
class="demo-ruleForm" class="demo-ruleForm"
> >
<el-form-item label="目标逻辑库"> <el-form-item
label="目标逻辑库"
class="mbljk"
>
<el-checkbox <el-checkbox
:indeterminate="isIndeterminate" :indeterminate="isIndeterminate"
v-model="checkAll" v-model="checkAll"
...@@ -139,27 +144,208 @@ ...@@ -139,27 +144,208 @@
>{{city}}</el-checkbox> >{{city}}</el-checkbox>
</el-checkbox-group> </el-checkbox-group>
</el-form-item> </el-form-item>
<div class="tmd">
<div class="tmdLeft">
<el-form-item label="条码段"> <el-form-item label="条码段">
定向查询
<el-input v-model="dynamicValidateForm.email"></el-input>
<i
class="el-icon-circle-plus-outline"
@click="addDomain"
></i>
<!-- <el-button @click="addDomain">新增</el-button> -->
</el-form-item> </el-form-item>
<el-form-item
v-for="(domain) in dynamicValidateForm.domains"
:key="domain.key"
>
<el-input v-model="domain.value"></el-input>
<i
class="el-icon-remove-outline"
@click.prevent="removeDomain(domain)"
></i>
</el-form-item>
</div>
<div class="tmdRight">
<el-form-item>
排除查询
<el-input v-model="dynamicValidateForm.email"></el-input>
<i
class="el-icon-circle-plus-outline"
@click="addDomain"
></i>
</el-form-item>
<el-form-item
v-for="(domain) in dynamicValidateForm.domains"
:key="domain.key"
>
<el-input v-model="domain.value"></el-input>
<i
class="el-icon-remove-outline"
@click.prevent="removeDomain(domain)"
></i>
</el-form-item>
</div>
</div>
<div class="Tip">
<i class="el-icon-warning-outline"></i>提示：可以用“？”代替某一个字符，如：3301*2007？？？？？？？？，表示3301开头的2007年的数据
</div>
</el-form> </el-form>
</el-collapse-item> </el-collapse-item>
</el-collapse> </el-collapse>
</div> </div>
<!-- 案件 -->
<div <div
class="middle" class="middle"
v-else v-else
> >
案件 <div class='barCodeNum'>
<div class="point"></div>源条码号 <span>已选择 <span>3</span> 条</span>
</div>
<el-form
:label-position='labelPosition'
align="left"
:model="ruleForm"
:rules="rules"
ref="ruleForm"
label-width="100px"
class="demo-ruleForm"
>
<el-form-item
label="查询类型"
prop="cxlx"
>
<el-radio-group v-model="ruleForm.cxlx.resource">
<el-radio label="案件正查"></el-radio>
<el-radio label="案件串查"></el-radio>
</el-radio-group>
<el-checkbox-group v-model="ruleForm.cxlx.type">
<el-checkbox
label="无图像，不发送查询"
name="type"
></el-checkbox>
<el-checkbox
label="已比中，不发送查询"
name="type"
></el-checkbox>
<el-checkbox
label="已破案，不发送查询"
name="type"
></el-checkbox>
<el-checkbox
label="已撤销，不发送查询"
name="type"
></el-checkbox>
</el-checkbox-group>
</el-form-item>
<el-form-item
label="优先级"
prop="yxj"
>
<el-radio-group v-model="ruleForm.yxj">
<el-radio label="5">最低</el-radio>
<el-radio label="4">低</el-radio>
<el-radio label="3">中</el-radio>
<el-radio label="2">高</el-radio>
<el-radio label="1">最高</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item
label="候选数"
prop="hxs"
>
<el-radio-group v-model="ruleForm.hxs">
<el-radio label="10"></el-radio>
<el-radio label="50"></el-radio>
<el-radio label="100"></el-radio>
<el-radio label="200"></el-radio>
<el-radio label="500"></el-radio>
<el-radio label="1000"></el-radio>
</el-radio-group>
</el-form-item>
</el-form>
<!-- 折叠面板 --> <!-- 折叠面板 -->
<el-collapse accordion> <el-collapse accordion>
<el-collapse-item <el-collapse-item
title="高级配置" title="高级配置"
name="1" name="1"
> >
<div>与现实生活一致：与现实生活的流程、逻辑保持一致，遵循用户习惯的语言和概念；</div> <el-form
<div>在界面中一致：所有的元素和结构需保持一致，比如：设计样式、图标和文本、元素的位置等。</div> :label-position='labelPosition'
align="left"
:model="ruleForm"
ref="ruleForm"
label-width="100px"
class="demo-ruleForm"
>
<el-form-item
label="目标逻辑库"
class="mbljk"
>
<el-checkbox
:indeterminate="isIndeterminate"
v-model="checkAll"
@change="handleCheckAllChange"
>全选</el-checkbox>
<el-checkbox-group
v-model="checkedCities"
@change="handleCheckedCitiesChange"
>
<el-checkbox
v-for="city in cities"
:label="city"
:key="city"
>{{city}}</el-checkbox>
</el-checkbox-group>
</el-form-item>
<div class="tmd">
<div class="tmdLeft">
<el-form-item label="条码段">
定向查询
<el-input v-model="dynamicValidateForm.email"></el-input>
<i
class="el-icon-circle-plus-outline"
@click="addDomain"
></i>
<!-- <el-button @click="addDomain">新增</el-button> -->
</el-form-item>
<el-form-item
v-for="(domain) in dynamicValidateForm.domains"
:key="domain.key"
>
<el-input v-model="domain.value"></el-input>
<i
class="el-icon-remove-outline"
@click.prevent="removeDomain(domain)"
></i>
</el-form-item>
</div>
<div class="tmdRight">
<el-form-item>
排除查询
<el-input v-model="dynamicValidateForm.email"></el-input>
<i
class="el-icon-circle-plus-outline"
@click="addDomain"
></i>
</el-form-item>
<el-form-item
v-for="(domain) in dynamicValidateForm.domains"
:key="domain.key"
>
<el-input v-model="domain.value"></el-input>
<i
class="el-icon-remove-outline"
@click.prevent="removeDomain(domain)"
></i>
</el-form-item>
</div>
</div>
<div class="Tip">
<i class="el-icon-warning-outline"></i>提示：可以用“？”代替某一个字符，如：3301*2007？？？？？？？？，表示3301开头的2007年的数据
</div>
</el-form>
</el-collapse-item> </el-collapse-item>
</el-collapse> </el-collapse>
</div> </div>
...@@ -179,7 +365,7 @@ ...@@ -179,7 +365,7 @@
</template> </template>
<script> <script>
const cityOptions = ['基本人员库', '高位人员库', '非法人员库', '在逃人员库', '布控人员库', '前科人员库', '协查人员库']; const cityOptions = ['基本人员库', '高危人员库', '非法人员库', '在逃人员库', '布控人员库', '前科人员库', '协查人员库'];
export default { export default {
name: "fcx", name: "fcx",
props: { props: {
...@@ -196,26 +382,30 @@ export default { ...@@ -196,26 +382,30 @@ export default {
}, },
data () { data () {
return { return {
tableDate: '',
checkAll: false, checkAll: false,
checkedCities: ['上海', '北京'], checkedCities: [],
cities: cityOptions, cities: cityOptions,
isIndeterminate: true, isIndeterminate: true,
labelPosition: 'left', // 标签对齐方式 labelPosition: 'left', // 标签对齐方式
dialogVisible: false, // 弹窗状态 dialogVisible: false, // 弹窗状态
title: '', title: '',
reqParam: { // 请求参数 reqParam: { // 请求参数
barcode: '', },
pid: '', dynamicValidateForm: {
cid: '', domains: [{
value: ''
}],
email: ''
}, },
ruleForm: { ruleForm: {
cxlx: { cxlx: {
type: [], type: ["无图像，不发送查询", "已比中，不发送查询"],
resource: '', resource: '',
}, },
sjlx: '', sjlx: '',
yxj: '', yxj: '3',
hxs: '', hxs: '10',
type: [], type: [],
resource: '', resource: '',
}, },
...@@ -237,12 +427,19 @@ export default { ...@@ -237,12 +427,19 @@ export default {
}, },
mounted () { mounted () {
this.dialogVisible = this.isShowFcx; this.dialogVisible = this.isShowFcx;
console.log('更改条码类型', this.type) // console.log('发查询类型', this.type)
this.type == 'ry' ? this.title = '人员发查询' : this.title = '案件发查询' this.type == 'ry' ? this.title = '人员发查询' : this.title = '案件发查询'
this.search()
},
created () {
}, },
watch: { watch: {
isShowFcx (newVal, oldVal) { isShowFcx (newVal, oldVal) {
this.dialogVisible = newVal; this.dialogVisible = newVal;
if (newVal == true) {
this.search()
}
}, },
dialogVisible (val) { dialogVisible (val) {
console.log(this.dialogVisible, 123) console.log(this.dialogVisible, 123)
...@@ -250,6 +447,18 @@ export default { ...@@ -250,6 +447,18 @@ export default {
} }
}, },
methods: { methods: {
addDomain () {
this.dynamicValidateForm.domains.push({
value: '',
key: Date.now()
});
},
removeDomain (item) {
var index = this.dynamicValidateForm.domains.indexOf(item)
if (index !== -1) {
this.dynamicValidateForm.domains.splice(index, 1)
}
},
handleCheckAllChange (val) { handleCheckAllChange (val) {
this.checkedCities = val ? cityOptions : []; this.checkedCities = val ? cityOptions : [];
this.isIndeterminate = false; this.isIndeterminate = false;
...@@ -269,7 +478,22 @@ export default { ...@@ -269,7 +478,22 @@ export default {
this.dialogVisible = false; this.dialogVisible = false;
}) })
.catch(_ => { }); .catch(_ => { });
},
// 获取发查询数据(总条数)
search () {
this.reqParam.userid = 123; this.reqParam.userid = 123;
// console.info("发查询条数请求===>", this.reqParam);
this.$axios
.get("/api/querylimit/select", { params: { userId: 123 } })
.then(response => {
if (response.data.code === 0) {
this.tableDate = response.data.ret.list;
// console.info("发查询条数返回列表===>", this.tableDate);
} else {
this.$message.error(response.data.message);
} }
});
},
} }
}; };
</script> </script>
...@@ -459,5 +683,49 @@ export default { ...@@ -459,5 +683,49 @@ export default {
} }
} }
} }
.mbljk {
/deep/.el-checkbox {
margin-right: 30px;
}
/deep/.el-form-item__content {
display: flex;
}
}
.tmd {
display: flex;
.tmdLeft {
width: 400px;
}
.tmdRight {
width: 400px;
/deep/.el-form-item__content {
margin-left: 0;
}
}
/deep/.el-input {
width: 264px;
height: 32px;
}
/deep/.el-icon-circle-plus-outline {
margin-left: 8px;
font-size: 16px;
color: #055fe7;
}
/deep/.el-icon-remove-outline {
margin-left: 8px;
font-size: 16px;
color: #055fe7;
}
}
.Tip {
i {
margin-right: 4px;
}
font-size: 12px;
font-family: MicrosoftYaHei;
color: #999999;
line-height: 20px;
margin-left: 100px;
}
} }
</style> </style>
\ No newline at end of file
src/views/AllPersonnelBase/modules/ggrytm.vue
...@@ -69,7 +69,7 @@ export default { ...@@ -69,7 +69,7 @@ export default {
}, },
mounted () { mounted () {
this.dialogVisible = this.isShowGgrytm; this.dialogVisible = this.isShowGgrytm;
console.log('更改条码类型', this.type) // console.log('更改条码类型', this.type)
this.type == 'ry' ? this.title = '更改人员条码' : this.title = '更改案件条码' this.type == 'ry' ? this.title = '更改人员条码' : this.title = '更改案件条码'
}, },
watch: { watch: {
......
src/views/AllPersonnelBase/modules/tjddl.vue
...@@ -106,8 +106,8 @@ export default { ...@@ -106,8 +106,8 @@ export default {
labelPosition: 'left', // 标签对齐方式 labelPosition: 'left', // 标签对齐方式
dialogVisible: false, // 弹窗状态 dialogVisible: false, // 弹窗状态
checkQue: '', //选择队列 checkQue: '', //选择队列
delbmp: '', // 删除原图 delbmp: '否', // 删除原图
replacecpr: '',// 覆盖原图 replacecpr: '0',// 覆盖原图
managetype: '',// 处理模式 managetype: '',// 处理模式
manageorgCpr: '',//处理对象 manageorgCpr: '',//处理对象
reqParam: { // 请求参数 reqParam: { // 请求参数
...@@ -116,7 +116,7 @@ export default { ...@@ -116,7 +116,7 @@ export default {
}, },
mounted () { mounted () {
this.dialogVisible = this.isShowTjddl; this.dialogVisible = this.isShowTjddl;
console.log('添加到队列类型', this.type) // console.log('添加到队列类型', this.type)
this.type == 'ry' ? this.title = '添加到人员队列' : this.title = '添加到案件队列' this.type == 'ry' ? this.title = '添加到人员队列' : this.title = '添加到案件队列'
}, },
watch: { watch: {
...@@ -154,7 +154,7 @@ export default { ...@@ -154,7 +154,7 @@ export default {
} }
newReqParams.checkQue = this.checkQue newReqParams.checkQue = this.checkQue
newReqParams.delbmp = this.delbmp newReqParams.delbmp = this.delbmp
newReqParams.replacecpr = this.replacec newReqParams.replacecpr = this.replacecpr
newReqParams.managetype = this.managetype newReqParams.managetype = this.managetype
newReqParams.manageorgCpr = this.manageorgCpr newReqParams.manageorgCpr = this.manageorgCpr
console.log(this.reqParam, '人员添加到队列') console.log(this.reqParam, '人员添加到队列')
...@@ -180,7 +180,7 @@ export default { ...@@ -180,7 +180,7 @@ export default {
} }
newReqParams.checkQue = this.checkQue newReqParams.checkQue = this.checkQue
newReqParams.delbmp = this.delbmp newReqParams.delbmp = this.delbmp
newReqParams.replacecpr = this.replacec newReqParams.replacecpr = this.replacecpr
newReqParams.managetype = this.managetype newReqParams.managetype = this.managetype
newReqParams.manageorgCpr = this.manageorgCpr newReqParams.manageorgCpr = this.manageorgCpr
console.log(this.reqParam, '案件添加到队列') console.log(this.reqParam, '案件添加到队列')
......
src/views/AllPersonnelBase/qbalk.vue
...@@ -156,7 +156,7 @@ ...@@ -156,7 +156,7 @@
effect="dark" effect="dark"
content="编辑" content="编辑"
placement="top" placement="top"
open-delay='200' :open-delay='200'
> >
<div <div
class="icon bj" class="icon bj"
...@@ -173,7 +173,7 @@ ...@@ -173,7 +173,7 @@
effect="dark" effect="dark"
content="收藏" content="收藏"
placement="top" placement="top"
open-delay='200' :open-delay='200'
> >
<div <div
class="icon sc" class="icon sc"
...@@ -190,7 +190,7 @@ ...@@ -190,7 +190,7 @@
effect="dark" effect="dark"
content="改号" content="改号"
placement="top" placement="top"
open-delay='200' :open-delay='200'
> >
<div <div
class="icon gx" class="icon gx"
...@@ -207,11 +207,11 @@ ...@@ -207,11 +207,11 @@
effect="dark" effect="dark"
content="发查询" content="发查询"
placement="top" placement="top"
open-delay='200' :open-delay='200'
> >
<div <div
class="icon look" class="icon look"
@click="handleClick(scope.row)" @click="isShowFcxBtn1(scope.row)"
> >
<img <img
src="../../assets/img/qbryk/search.png" src="../../assets/img/qbryk/search.png"
...@@ -224,7 +224,7 @@ ...@@ -224,7 +224,7 @@
effect="dark" effect="dark"
content="复制数据" content="复制数据"
placement="top" placement="top"
open-delay='200' :open-delay='200'
> >
<div <div
class="icon bz" class="icon bz"
...@@ -241,7 +241,7 @@ ...@@ -241,7 +241,7 @@
effect="dark" effect="dark"
content="打印" content="打印"
placement="top" placement="top"
open-delay='200' :open-delay='200'
> >
<div <div
class="icon print" class="icon print"
...@@ -258,7 +258,7 @@ ...@@ -258,7 +258,7 @@
effect="dark" effect="dark"
content="删除" content="删除"
placement="top" placement="top"
open-delay='200' :open-delay='200'
> >
<el-popconfirm <el-popconfirm
placement="top-start" placement="top-start"
...@@ -389,14 +389,14 @@ export default { ...@@ -389,14 +389,14 @@ export default {
methods: { methods: {
// 获取案件数据 // 获取案件数据
search () { search () {
console.info("案件请求===>", this.reqParam); // console.info("案件请求===>", this.reqParam);
this.$axios this.$axios
.post("/api/casestore/allcase", this.reqParam) .post("/api/casestore/allcase", this.reqParam)
.then(response => { .then(response => {
if (response.data.code === 0) { if (response.data.code === 0) {
this.tableDate = response.data.ret.list; this.tableDate = response.data.ret.list;
this.reqParam.page.total = response.data.ret.total; this.reqParam.page.total = response.data.ret.total;
console.info("案件库返回列表===>", this.tableDate); // console.info("案件库返回列表===>", this.tableDate);
} else { } else {
this.$message.error(response.data.message); this.$message.error(response.data.message);
} }
...@@ -558,9 +558,17 @@ export default { ...@@ -558,9 +558,17 @@ export default {
this.isShowFztm = val this.isShowFztm = val
this.search() this.search()
}, },
//发查询操作 //发查询操作(多行)
isShowFcxBtn (val) { isShowFcxBtn () {
console.log('发查询', val) if (this.multipleSelection.length === 0) {
this.$message.error("请选择需要发查询的数据！");
} else {
this.rowData = this.multipleSelection
this.isShowFcx = true;
}
},
isShowFcxBtn1 (val) {
console.log('单行案件发查询数据', val)
this.rowData = val this.rowData = val
this.isShowFcx = true; this.isShowFcx = true;
}, },
......
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