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 71 additions and 49 deletions
package-lock.json
......@@ -23549,7 +23549,7 @@
},
"image-size": {
"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=",
"dev": true
},
......@@ -24652,7 +24652,7 @@
},
"merge-options": {
"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=",
"dev": true,
"requires": {
......@@ -25003,6 +25003,12 @@
"integrity": "sha1-8lc+aHLxtwBnQj/Gi7ydDeLzu+4=",
"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": {
"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",
......@@ -26586,7 +26592,7 @@
},
"posthtml-parser": {
"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=",
"dev": true,
"requires": {
......@@ -26607,7 +26613,7 @@
},
"posthtml-rename-id": {
"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=",
"dev": true,
"requires": {
......@@ -26616,7 +26622,7 @@
},
"posthtml-render": {
"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=",
"dev": true
},
......@@ -28635,13 +28641,13 @@
"dependencies": {
"ansi-styles": {
"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=",
"dev": true
},
"chalk": {
"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=",
"dev": true,
"requires": {
......@@ -28654,7 +28660,7 @@
"dependencies": {
"supports-color": {
"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=",
"dev": true
}
......@@ -28662,7 +28668,7 @@
},
"clone": {
"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=",
"dev": true
},
......@@ -28677,7 +28683,7 @@
},
"extend-shallow": {
"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=",
"dev": true,
"requires": {
......@@ -28686,7 +28692,7 @@
},
"has-flag": {
"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=",
"dev": true
},
......@@ -28726,7 +28732,7 @@
},
"is-descriptor": {
"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=",
"dev": true,
"requires": {
......@@ -28799,7 +28805,7 @@
},
"supports-color": {
"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=",
"dev": true,
"requires": {
......@@ -28821,7 +28827,7 @@
"dependencies": {
"deepmerge": {
"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=",
"dev": true
}
......@@ -28829,7 +28835,7 @@
},
"svg-sprite-loader": {
"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=",
"dev": true,
"requires": {
......@@ -28845,7 +28851,7 @@
"dependencies": {
"deepmerge": {
"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=",
"dev": true
}
......@@ -29430,7 +29436,7 @@
},
"unidecode": {
"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=",
"dev": true
},
src/views/AllPersonnelBase/AllPersonnelBase.vue
......@@ -188,7 +188,7 @@
effect="dark"
content="编辑"
placement="top"
open-delay='200'
:open-delay='200'
@click="handleClick(scope.row)"
>
<div
......@@ -205,8 +205,8 @@
class="item"
effect="dark"
content="收藏"
open-delay='200'
placement="top"
:open-delay='200'
>
<div
class="icon sc"
......@@ -223,7 +223,7 @@
effect="dark"
content="改号"
placement="top"
open-delay='200'
:open-delay='200'
>
<div
class="icon gx"
......@@ -240,11 +240,11 @@
effect="dark"
content="发查询"
placement="top"
open-delay='200'
:open-delay='200'
>
<div
class="icon look"
@click="handleClick(scope.row)"
@click="isShowFcxBtn1(scope.row)"
>
<img
src="../../assets/img/qbryk/search.png"
......@@ -257,7 +257,7 @@
effect="dark"
content="复制数据"
placement="top"
open-delay='200'
:open-delay='200'
>
<div
class="icon bz"
......@@ -274,7 +274,7 @@
effect="dark"
content="打印"
placement="top"
open-delay='200'
:open-delay='200'
>
<div
class="icon print"
......@@ -291,7 +291,7 @@
effect="dark"
content="删除"
placement="top"
open-delay='200'
:open-delay='200'
>
<el-popconfirm
placement="top-start"
......@@ -441,14 +441,14 @@ export default {
methods: {
// 获取全部人员列表请求
search () {
console.info("请求===>", this.reqParam);
// console.info("请求===>", this.reqParam);
this.$axios
.post("/api/personstore/allperson", this.reqParam)
.then(response => {
if (response.data.code === 0) {
this.tableDate = response.data.ret.list;
this.reqParam.page.total = response.data.ret.total;
console.info("查询结果===>", this.tableDate);
// console.info("查询结果===>", this.tableDate);
// this.userInfo = this.getUserInfo(this.tableDate);
} else {
this.$message.error(response.data.message);
......@@ -605,9 +605,17 @@ export default {
this.search()
},
//发查询操作
isShowFcxBtn (val) {
console.log('发查询', val)
//发查询操作(多行)
isShowFcxBtn () {
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.isShowFcx = true;
},
......
src/views/AllPersonnelBase/modules/ggrytm.vue
......@@ -69,7 +69,7 @@ export default {
},
mounted () {
this.dialogVisible = this.isShowGgrytm;
console.log('更改条码类型', this.type)
// console.log('更改条码类型', this.type)
this.type == 'ry' ? this.title = '更改人员条码' : this.title = '更改案件条码'
},
watch: {
......
src/views/AllPersonnelBase/modules/tjddl.vue
......@@ -106,8 +106,8 @@ export default {
labelPosition: 'left', // 标签对齐方式
dialogVisible: false, // 弹窗状态
checkQue: '', //选择队列
delbmp: '', // 删除原图
replacecpr: '',// 覆盖原图
delbmp: '否', // 删除原图
replacecpr: '0',// 覆盖原图
managetype: '',// 处理模式
manageorgCpr: '',//处理对象
reqParam: { // 请求参数
......@@ -116,7 +116,7 @@ export default {
},
mounted () {
this.dialogVisible = this.isShowTjddl;
console.log('添加到队列类型', this.type)
// console.log('添加到队列类型', this.type)
this.type == 'ry' ? this.title = '添加到人员队列' : this.title = '添加到案件队列'
},
watch: {
......@@ -154,7 +154,7 @@ export default {
}
newReqParams.checkQue = this.checkQue
newReqParams.delbmp = this.delbmp
newReqParams.replacecpr = this.replacec
newReqParams.replacecpr = this.replacecpr
newReqParams.managetype = this.managetype
newReqParams.manageorgCpr = this.manageorgCpr
console.log(this.reqParam, '人员添加到队列')
......@@ -180,7 +180,7 @@ export default {
}
newReqParams.checkQue = this.checkQue
newReqParams.delbmp = this.delbmp
newReqParams.replacecpr = this.replacec
newReqParams.replacecpr = this.replacecpr
newReqParams.managetype = this.managetype
newReqParams.manageorgCpr = this.manageorgCpr
console.log(this.reqParam, '案件添加到队列')
......
src/views/AllPersonnelBase/qbalk.vue
......@@ -156,7 +156,7 @@
effect="dark"
content="编辑"
placement="top"
open-delay='200'
:open-delay='200'
>
<div
class="icon bj"
......@@ -173,7 +173,7 @@
effect="dark"
content="收藏"
placement="top"
open-delay='200'
:open-delay='200'
>
<div
class="icon sc"
......@@ -190,7 +190,7 @@
effect="dark"
content="改号"
placement="top"
open-delay='200'
:open-delay='200'
>
<div
class="icon gx"
......@@ -207,11 +207,11 @@
effect="dark"
content="发查询"
placement="top"
open-delay='200'
:open-delay='200'
>
<div
class="icon look"
@click="handleClick(scope.row)"
@click="isShowFcxBtn1(scope.row)"
>
<img
src="../../assets/img/qbryk/search.png"
......@@ -224,7 +224,7 @@
effect="dark"
content="复制数据"
placement="top"
open-delay='200'
:open-delay='200'
>
<div
class="icon bz"
......@@ -241,7 +241,7 @@
effect="dark"
content="打印"
placement="top"
open-delay='200'
:open-delay='200'
>
<div
class="icon print"
......@@ -258,7 +258,7 @@
effect="dark"
content="删除"
placement="top"
open-delay='200'
:open-delay='200'
>
<el-popconfirm
placement="top-start"
......@@ -389,14 +389,14 @@ export default {
methods: {
// 获取案件数据
search () {
console.info("案件请求===>", this.reqParam);
// console.info("案件请求===>", this.reqParam);
this.$axios
.post("/api/casestore/allcase", this.reqParam)
.then(response => {
if (response.data.code === 0) {
this.tableDate = response.data.ret.list;
this.reqParam.page.total = response.data.ret.total;
console.info("案件库返回列表===>", this.tableDate);
// console.info("案件库返回列表===>", this.tableDate);
} else {
this.$message.error(response.data.message);
}
......@@ -558,9 +558,17 @@ export default {
this.isShowFztm = val
this.search()
},
//发查询操作
isShowFcxBtn (val) {
console.log('发查询', val)
//发查询操作(多行)
isShowFcxBtn () {
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.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