Skip to content
Toggle navigation
Toggle navigation
This project
Loading...
Sign in
bdc
/
bdcdj-web
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Issue Boards
Files
Commits
Network
Compare
Branches
Tags
52a7cbd8
authored
2023-11-03 13:20:33 +0800
by
renchao@pashanhoo.com
Browse Files
Options
Browse Files
Tag
Download
Plain Diff
Merge branch 'dev'
2 parents
f0f9680f
48fae78f
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
48 additions
and
25 deletions
src/views/zsgl/zsff/components/addDialog.vue
src/views/zsgl/zsff/zsff.vue
src/views/zsgl/zsrk/components/addDialog.vue
src/views/zsgl/zsrk/zsrk.vue
src/views/zsgl/zsff/components/addDialog.vue
View file @
52a7cbd
...
...
@@ -59,10 +59,11 @@
</template>
<
script
>
import
{
getZsStartNo
,
getZsEndNo
,
zsff
,
getZsglInfo
}
from
"@/api/zsgl.js"
import
{
getSysSerialSingle
}
from
"@/api/sysSerial.js"
import
axios
from
"axios"
;
export
default
{
import
store
from
'@/store/index.js'
import
{
getZsStartNo
,
getZsEndNo
,
zsff
,
getZsglInfo
}
from
"@/api/zsgl.js"
import
{
getSysSerialSingle
}
from
"@/api/sysSerial.js"
import
axios
from
"axios"
;
export
default
{
props
:
{
formData
:
{
type
:
Object
,
...
...
@@ -142,8 +143,8 @@ export default {
* @description: 领取人列表
* @author: renchao
*/
getreceiver
()
{
let
url
=
window
.
_config
.
services
.
management
+
"/management/rest/users?organizationId="
+
this
.
formData
.
organizationId
getreceiver
()
{
let
url
=
window
.
_config
.
services
.
management
+
"/management/rest/users?organizationId="
+
this
.
formData
.
organizationId
axios
.
get
(
url
).
then
(
res
=>
{
res
.
data
.
content
.
forEach
((
item
)
=>
{
this
.
usernames
.
push
(
item
.
name
)
...
...
@@ -156,13 +157,14 @@ export default {
* @author: renchao
*/
submitForm
()
{
store
.
dispatch
(
"user/refreshPage"
,
false
);
zsff
(
this
.
ruleForm
).
then
(
res
=>
{
if
(
res
.
code
==
200
)
{
this
.
$message
.
success
(
'保存成功'
)
this
.
$emit
(
"input"
,
false
);
this
.
$refs
[
'ruleForm'
].
resetFields
();
this
.
resetTableFields
();
this
.
$parent
.
queryClick
(
);
store
.
dispatch
(
"user/refreshPage"
,
true
);
}
else
{
this
.
$message
.
error
(
res
.
message
)
}
...
...
@@ -290,17 +292,17 @@ export default {
this
.
resetTableFields
();
}
}
}
}
</
script
>
<
style
scoped
lang=
"scss"
>
@import
"~@/styles/mixin.scss"
;
@import
"~@/styles/dialogBoxheader.scss"
;
@import
"~@/styles/mixin.scss"
;
@import
"~@/styles/dialogBoxheader.scss"
;
.font-red
{
color
:
red
}
.font-red
{
color
:
red
;
}
.middle-margin-bottom
{
margin-top
:
20px
}
.middle-margin-bottom
{
margin-top
:
20px
;
}
</
style
>
...
...
src/views/zsgl/zsff/zsff.vue
View file @
52a7cbd
...
...
@@ -44,9 +44,9 @@
</div>
</
template
>
<
script
>
import
{
mapGetters
}
from
"vuex"
;
import
table
from
"@/utils/mixin/table"
;
import
{
datas
,
sendThis
}
from
"./zsffdata"
;
import
{
mapGetters
}
from
"vuex"
;
import
{
getZsglffList
,
removeZsgl
,
confirmZsff
}
from
"@/api/zsgl.js"
export
default
{
computed
:
{
...
...
@@ -57,9 +57,20 @@
mounted
()
{
sendThis
(
this
);
},
computed
:
{
...
mapGetters
([
'isRefresh'
])
},
activated
()
{
this
.
queryClick
()
},
watch
:
{
isRefresh
:
{
handler
(
newVal
,
oldVal
)
{
if
(
newVal
)
this
.
queryClick
()
},
immediate
:
true
}
},
data
()
{
return
{
value
:
''
,
...
...
@@ -96,17 +107,16 @@
}
},
methods
:
{
// 查看弹框
/**
* @description: 查看弹框
* @param {*} bsmBatch
* @author: renchao
*/
openDialog
(
bsmBatch
)
{
console
.
log
(
"this.userInfo"
,
this
.
userInfo
);
console
.
log
(
"this.userInfo"
,
this
.
userInfo
);
this
.
$popupDialog
(
"证书分发"
,
"zsgl/zsff/components/addDialog"
,
{
bsmBatch
:
bsmBatch
,
organizationId
:
this
.
userInfo
.
organizationId
organizationId
:
this
.
userInfo
.
organizationId
},
"50%"
)
},
/**
...
...
@@ -122,7 +132,6 @@
}
})
},
//确定证书分发
/**
* @description: 确定证书分发
* @param {*} item
...
...
@@ -149,7 +158,6 @@
});
});
},
//删除证书分发数据
/**
* @description: 删除证书分发数据
* @param {*} item
...
...
src/views/zsgl/zsrk/components/addDialog.vue
View file @
52a7cbd
...
...
@@ -151,13 +151,14 @@
return
;
}
})
store
.
dispatch
(
"user/refreshPage"
,
false
);
zsrk
(
this
.
ruleForm
).
then
(
res
=>
{
if
(
res
.
code
==
200
)
{
this
.
$message
.
success
(
'保存成功'
)
this
.
$popupCacel
()
this
.
$refs
[
'ruleForm'
].
resetFields
()
;
this
.
resetTableFields
()
;
this
.
$parent
.
queryClick
();
this
.
$refs
[
'ruleForm'
].
resetFields
()
this
.
resetTableFields
()
store
.
dispatch
(
"user/refreshPage"
,
true
)
}
else
{
this
.
$message
.
error
(
res
.
message
);
}
...
...
src/views/zsgl/zsrk/zsrk.vue
View file @
52a7cbd
...
...
@@ -42,6 +42,7 @@
</div>
</
template
>
<
script
>
import
{
mapGetters
}
from
'vuex'
import
table
from
"@/utils/mixin/table"
;
import
{
datas
,
sendThis
}
from
"./zsrkdata"
;
import
{
getZsglrkList
,
removeZsgl
,
verifyZsrk
}
from
"@/api/zsgl.js"
;
...
...
@@ -51,9 +52,20 @@
mounted
()
{
sendThis
(
this
);
},
computed
:
{
...
mapGetters
([
'isRefresh'
])
},
activated
()
{
this
.
queryClick
()
},
watch
:
{
isRefresh
:
{
handler
(
newVal
,
oldVal
)
{
if
(
newVal
)
this
.
queryClick
()
},
immediate
:
true
}
},
data
()
{
return
{
ruleForm
:
{
...
...
Please
register
or
sign in
to post a comment