feec9292 by renchao@pashanhoo.com

Merge branch 'master' into dev

2 parents 37d7db76 97fee2ab
......@@ -4,6 +4,6 @@
"CODE": "BDCJGPT",
"SERVERAPI": "/bdcsjsb",
"calcHeight": 160,
"echartTextColor": "#FFFFFF",
"echartTextColor": "#4A4A4A",
"MANAGEMENTAPI": "http://192.168.2.38:8090/management"
}
......
.itemForm {
position: relative;
padding: 10px;
/deep/.el-select {
width: 100%;
}
/deep/.el-form-item__error {
right: 25px;
top: 15px;
text-align: right;
pointer-events: none;
}
/deep/.el-date-editor {
width: 100%;
}
/deep/.el-date-editor--date {
width: 100%;
}
/deep/.el-cascader {
width: 100%;
}
// table 样式
/deep/.el-form-item__label {
border-right: none;
text-align: center;
padding: 0;
color: #05bbdb;
line-height: 16px;
font-size: 12px;
margin-top: 8px !important;
}
/deep/.el-form-item__content {
display: flex;
margin-right: -1px;
}
.obligee-item-name,
.receivingInfo-item-name,
.auditInfo-item-name {
background: url("~@/image/itembg.png") no-repeat;
background-size: 100% 100%;
color: #FFFFFF;
}
/deep/.el-textarea__inner {
margin: 5px;
width: 96%;
background: none;
color: #FFFFFF;
border-radius: 2px;
border: 1px solid #6BC1FC;
}
/deep/.el-input-number {
width: 100%;
}
/deep/.el-input-number__increase {
background: #05275B;
color: #FFFFFF;
border: none;
right: 7px;
top: 2px;
}
/deep/.el-input-number__decrease {
background: #05275B;
color: #FFFFFF;
border: none;
right: 7px;
bottom: 10px;
}
/deep/.el-input__inner {
margin: 5px;
width: 96%;
background: #05275B;
border-radius: 2px;
border: 1px solid #6BC1FC;
text-align: left;
}
/deep/.el-form-item {
margin-bottom: 0;
margin-top: -1px;
}
.item-label {
display: flex;
align-items: flex-end;
flex-direction: column;
font-size: 12px;
flex: 0 0 90px;
margin-right: 3px;
p {
line-height: 16px;
white-space: nowrap;
text-align: right;
}
p:nth-child(1) {
position: relative;
right: 5px;
}
}
}
\ No newline at end of file
<!--
* @Description:
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-03-17 10:25:19
-->
......@@ -18,65 +18,29 @@
</div>
</template>
<script>
import { getReceiveDataReportResult } from "@/api/dataReport.js";
export default {
components: {},
props: {
formData: {
type: Object,
default: {}
import { getReceiveDataReportResult } from "@/api/dataReport.js";
export default {
components: {},
props: {
formData: {
type: Object,
default: {}
}
},
data () {
return {
REPMSGXML: '',
ERRORINFO: '',
}
},
created () {
getReceiveDataReportResult(this.formData.bsmReport).then(res => {
let data = res.result
this.REPMSGXML = data.REPMSGXML
this.ERRORINFO = data.ERRORINFO
})
}
},
data () {
return {
REPMSGXML: '',
ERRORINFO: '',
}
},
created () {
getReceiveDataReportResult(this.formData.bsmReport).then(res => {
let data = res.result
this.REPMSGXML = data.REPMSGXML
this.ERRORINFO = data.ERRORINFO
})
}
}
</script>
<style scoped lang='scss'>
.result {
padding: 15px;
height: 100%;
/deep/.el-textarea__inner {
height: 50%;
color: #ffffff;
border: none !important;
color: #ffffff;
}
&-con {
background: #04275B;
border-radius: 2px;
padding: 10px;
box-sizing: border-box;
height: 49%;
p {
color: #2997E8;
font-size: 14px;
position: relative;
padding-left: 10px;
}
p::before {
position: absolute;
content: '';
width: 3px;
height: 10px;
background-color: #2997E8;
left: 0;
top: 3px;
}
}
}
</style>
......
......@@ -12,15 +12,4 @@ export default {
}
}
}
</script>
<style scoped lang="scss">
/deep/.el-textarea__inner {
height: 67vh !important;
border: none !important;
background-color: #08346F !important;
color: #ffffff;
border: none !important;
}
</style>
\ No newline at end of file
</script>
\ No newline at end of file
......
// .dialogCon {
// background: #031A46;
// -webkit-box-shadow: inset 0px 0px 12px 0px #02d9fd;
// box-shadow: inset 0px 0px 12px 0px #02d9fd;
// border-radius: 0px 2px 2px 2px;
// border: 1px solid #6BC1FC;
// padding: 15px;
// }
......@@ -526,6 +526,14 @@
border-radius: 2px;
border: 1px solid #6BC1FC;
margin: 0 18px 10px 18px;
// .el-form-item__label {
// color: #fff;
// }
// .el-form-item__content {
// color: #fff;
// }
}
.item-content-input {
......@@ -666,6 +674,14 @@
// 登簿日志弹出框
.entryJournal {
.el-textarea__inner {
height: 67vh !important;
border: none !important;
background-color: #08346F !important;
color: #ffffff;
border: none !important;
}
.el-tabs__header {
margin: 0;
}
......@@ -1112,4 +1128,121 @@
padding: 0px 120px 0px;
text-align: center;
}
}
\ No newline at end of file
}
// 权利人信息样式
.itemForm {
position: relative;
padding: 10px;
/deep/.el-select {
width: 100%;
}
/deep/.el-form-item__error {
right: 25px;
top: 15px;
text-align: right;
pointer-events: none;
}
/deep/.el-date-editor {
width: 100%;
}
/deep/.el-date-editor--date {
width: 100%;
}
/deep/.el-cascader {
width: 100%;
}
// table 样式
/deep/.el-form-item__label {
border-right: none;
text-align: center;
padding: 0;
color: #05bbdb;
line-height: 16px;
font-size: 12px;
margin-top: 8px !important;
}
/deep/.el-form-item__content {
display: flex;
margin-right: -1px;
}
.obligee-item-name,
.receivingInfo-item-name,
.auditInfo-item-name {
background: url("~@/image/itembg.png") no-repeat;
background-size: 100% 100%;
color: #FFFFFF;
}
/deep/.el-textarea__inner {
margin: 5px;
width: 96%;
background: none;
color: #FFFFFF;
border-radius: 2px;
border: 1px solid #6BC1FC;
}
/deep/.el-input-number {
width: 100%;
}
/deep/.el-input-number__increase {
background: #05275B;
color: #FFFFFF;
border: none;
right: 7px;
top: 2px;
}
/deep/.el-input-number__decrease {
background: #05275B;
color: #FFFFFF;
border: none;
right: 7px;
bottom: 10px;
}
/deep/.el-input__inner {
margin: 5px;
width: 96%;
background: #05275B;
border-radius: 2px;
border: 1px solid #6BC1FC;
text-align: left;
}
/deep/.el-form-item {
margin-bottom: 0;
margin-top: -1px;
}
.item-label {
display: flex;
align-items: flex-end;
flex-direction: column;
font-size: 12px;
flex: 0 0 90px;
margin-right: 3px;
p {
line-height: 16px;
white-space: nowrap;
text-align: right;
}
p:nth-child(1) {
position: relative;
right: 5px;
}
}
}
......
......@@ -85,9 +85,7 @@ input[type="number"] {
// to fixed https://github.com/ElemeFE/element/issues/2461
// refine element ui upload
.el-input.is-disabled .el-input__inner {
color: #FFFFFF !important;
background-color: transparent !important;
border: 1px solid #224C7C !important;
}
.upload-container {
......
<!--
* @Description:
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-03-20 14:45:57
* @LastEditTime: 2023-03-28 14:11:01
-->
<!--
功能:结果
......@@ -18,45 +18,45 @@
</div>
</template>
<script>
import { getReceiveDataReportResult } from "@/api/dataReport.js";
export default {
components: {},
props: {
formData: {
type: Object,
default: {}
import { getReceiveDataReportResult } from "@/api/dataReport.js";
export default {
components: {},
props: {
formData: {
type: Object,
default: {}
}
},
data () {
return {
REPMSGXML: '',
ERRORINFO: '',
}
},
created () {
getReceiveDataReportResult(this.formData.bsmReport).then(res => {
let data = res.result
this.REPMSGXML = data.REPMSGXML
this.ERRORINFO = data.ERRORINFO
})
}
},
data () {
return {
REPMSGXML: '',
ERRORINFO: '',
}
},
created () {
getReceiveDataReportResult(this.formData.bsmReport).then(res => {
let data = res.result
this.REPMSGXML = data.REPMSGXML
this.ERRORINFO = data.ERRORINFO
})
}
}
</script>
<style scoped lang='scss'>
.result {
padding: 15px;
.result {
padding: 15px;
p {
color: #ffffff;
line-height: 26px;
font-size: 18px;
p {
color: #ffffff;
line-height: 26px;
font-size: 18px;
}
}
}
/deep/.el-textarea__inner {
min-height: 33vh !important;
background-color: #08346F !important;
color: #ffffff;
border: none !important;
}
</style>
\ No newline at end of file
/deep/.el-textarea__inner {
min-height: 33vh !important;
background-color: #08346f !important;
color: #ffffff;
border: none !important;
}
</style>
......
......@@ -153,6 +153,7 @@ export default {
{
label: "操作",
width: "80",
fixed: "right",
render: (h, scope) => {
return (
<div>
......
import filter from '@/utils/filter.js'
class data extends filter {
constructor() {
super()
}
columns () {
return [
{
prop: "name",
label: "区县代码",
width: 130
},
{
prop: "description",
label: "业务号"
},
{
prop: "description",
label: "受理业务名称"
},
{
prop: "description",
label: "受理业务编码"
},
{
prop: "description",
label: "受理时间"
},
{
prop: "description",
label: "登记时间"
},
{
prop: "description",
label: "接收时间"
},
{
prop: "description",
label: "读取时间"
}
]
}
}
export default new data()
<!-- 新增 & 修改角色 -->
<template>
<dialogBox
class="PersonnelDialog"
:title="title"
:width="'567px'"
:isMain="true"
@closeDialog="close"
@submitForm="submitForm"
v-model="myValue">
<div class="dialogCon">
<el-form ref="form" :model="dialogForm" :rules="rules" label-width="82px">
<el-row :gutter="24">
<el-col :span="23">
<el-form-item label="角色名称:" prop="roleName">
<el-input
v-model="dialogForm.roleName"
clearable
placeholder="角色名称" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="23">
<el-form-item label="备注:" class="form-item-mb0">
<el-input
v-model="dialogForm.roleTextArea"
clearable
:rows="10"
type="textarea"
placeholder="备注" />
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
<!-- <template slot="footer">
<el-button
class="cancel-button"
@click="handleCloseDialog">取消</el-button>
<el-button
type="primary"
@click="handleSaveRole()">保存</el-button>
</template> -->
</dialogBox>
</template>
<script>
import Dialog from "@/components/Dialog/";
import { api, httpAction } from '@/api/manageApi'
export default {
components: {
Dialog
},
props: {
value: { type: Boolean, default: false },
},
data () {
return {
myValue: this.value,
title: '',
showAddEditDialog: false,
menuType: '',
roleId: '',
sort: 0,
dialogForm: {
roleName: '',
roleType: '',
roleTextArea: ''
},
rules: {
roleName: [
{ required: true, message: '请输入角色名称', trigger: 'blur' }
],
},
roleTypeOptions: [
{ name: '定制', value: '定制' },
{ name: '其他', value: '其他' }
]
}
},
watch: {
value (val) {
this.myValue = val
}
},
methods: {
// 保存新增或关闭事件
submitForm () {
this.$refs.form.validate((valid) => {
if (valid) {
try {
const params = {
category: 2,
description: this.dialogForm.roleTextArea,
name: this.dialogForm.roleName,
sort: this.sort,
type: this.dialogForm.roleType
}
if (this.roleId) {
params.id = this.roleId
httpAction(`${api.roles}/${params.id}`, params, 'post').then(
(res) => {
if (res.status === 1) {
this.$message.success({
message: '修改成功',
showClose: true
})
this.dialogForm = {
roleName: '',
}
// this.showAddEditDialog = val
this.$emit('ok')
} else {
this.$message.error({
message: res.message,
showClose: true
})
}
}
)
} else {
httpAction(api.roles, params, 'post').then((res) => {
if (res.status === 1) {
this.$message.success({
message: '新增成功',
showClose: true
})
this.close()
this.$emit('ok')
// this.showAddEditDialog = val
this.$emit('ok', this.menuType)
} else {
this.$message.error({
message: res.message,
showClose: true
})
}
})
}
} catch (e) {
console.error(e)
}
}
})
},
resetForm () {
this.dialogForm = {
roleName: '',
}
this.$refs.form.resetFields()
},
close () {
this.resetForm()
this.$emit('input', false)
}
}
}
</script>
<style scoped lang="scss">
</style>
<template>
<div class="timedTask from-clues">
<div class="from-clues-header">
<el-form ref="ruleForm" :model="form" label-width="100px">
<el-form-item v-if="BASE_API.THEME=='jg'">
<Breadcrumb />
</el-form-item>
<el-row class="mb-5">
<el-col :span="4">
<el-form-item label="业务号:" prop="ywh">
<el-input v-model="form.ywh" class="width100" clearable placeholder="业务号"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="业务名称" prop="ywmc">
<el-input v-model.trim="form.rolesName" class="width100" clearable placeholder="业务名称"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="开始日期" prop="startTime">
<el-date-picker type="date" class="width100" placeholder="开始日期" :picker-options="pickerOptionsStart"
clearable v-model="form.startTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="结束日期" prop="endTime">
<el-date-picker type="date" class="width100" placeholder="结束日期" :picker-options="pickerOptionsEnd" clearable
v-model="form.endTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
</el-form-item>
</el-col>
<!-- 操作按钮 -->
<el-col :span="4" class="btnColRight">
<btn nativeType="cz" @click="resetForm">重置</btn>
<btn nativeType="cx" @click="handleSearch">查询</btn>
</el-col>
</el-row>
</el-form>
</div>
<div class="from-clues-content">
<lb-table :pagination="false" @size-change="handleSizeChange" :calcHeight="200"
@p-current-change="handleCurrentChange" :column="tableData.columns" :data="listdata" :expand-row-keys="keyList"
row-key="dictid">
</lb-table>
</div>
</div>
</template>
<script>
import {
getUuid,
judgeSort,
realMove,
findParents,
removeTreeListItem,
} from "@/utils/operation";
import { getRolesById, getAuthorityListAction } from "@/api/authorityManage";
import { getUserRoles } from "@/api/personnelManage";
import data from "./data";
import { getMenuInfo } from "@/api/user";
import { api, getAction, deleteAction } from "@/api/manageApi";
import tableMixin from "@/mixins/tableMixin.js";
import EditDialog from "./edit-dialog.vue";
import Roleslistdiglog from "./roleslistdiglog.vue";
import { mapGetters } from "vuex";
import { updateOrder } from "@/api/orders"
export default {
name: "menus",
mixins: [tableMixin],
components: {
EditDialog,
Roleslistdiglog,
},
data () {
return {
// 开始结束日期限制
pickerOptionsStart: {
disabledDate: (time) => {
if (this.form.endTime) {
return time.getTime() >= new Date(this.form.endTime).getTime()
}
}
},
// 结束日期限制
pickerOptionsEnd: {
disabledDate: (time) => {
if (this.form.startTime) {
return time.getTime() < new Date(this.form.startTime).getTime()
}
}
},
listdata: [],
setlistdata: [],
// 表单
form: {
ywh: '',
ywmc: '',
startTime: '',
endTime: '',
currentPage: 1
},
tableData: {
columns: [
{
label: "序号",
type: "index",
width: "50",
index: this.indexMethod,
},
]
.concat(data.columns())
.concat({
prop: "state",
label: "状态",
width: '120',
render: (h, scope) => {
return (
<div>
<span class='adopt' v-show={scope.row.state == 3}>上报失败</span>
<span class='adopt' v-show={scope.row.state == 2}>上报成功</span>
<span class='warehousing' v-show={scope.row.state == 1}>接入上报异常</span>
</div>
)
}
})
.concat([]),
},
data: [],
}
},
created () {
this.getTableData();
},
mounted () { },
methods: {
//查询
searchQuery () {
if (this.form.rolesName) {
this.listdata = this.childrenFn(this.setlistdata, this.form.rolesName);
} else {
this.getTableData()
}
},
childrenFn (arr, key) {
let searchTree = [];
arr.forEach((item, index) => {
if (item.name.indexOf(key) != -1) {
searchTree.push(item);
}
});
if (searchTree != undefined && searchTree.length != 0) {
return judgeSort(searchTree);
}
},
// 获取角色列表
getTableData () {
getRolesById([1, 2])
.then((res) => {
this.listdata = res.content;
this.listdata = judgeSort(this.listdata);
this.setlistdata = res.content;
})
.catch((e) => console.error(e));
},
},
};
</script>
<style scoped lang="scss">
@import "~@/styles/mixin.scss";
// @import "~@/styles/public.scss";
/deep/.el-button.is-disabled.el-button--text {
width: 64px;
height: 28px;
background: rgba(255, 255, 255, 0.1);
border-radius: 16px;
}
</style>
<template>
<!-- 编辑 -->
<dialogBox submitForm="submitForm" class="tableClass" @closeDialog="closeDialog" @submitForm="handleSubmit" width="60%"
<dialogBox submitForm="submitForm" class="tableClass dictionary" @closeDialog="closeDialog" @submitForm="handleSubmit" width="60%"
v-model="myValue" :isMain="true" title="字典信息">
<div class="editDialogBox-box ">
<el-form :model="ruleForm" ref="ruleForm" label-width="100px">
......@@ -159,13 +159,14 @@
},
},
{
width: "130",
width: "200",
label: "移动",
render: (h, scope) => {
return (
<div>
<el-button
type="text"
class='movebtnColor'
disabled={scope.row.isTop}
onClick={() => {
this.moveUpward(scope.$index, scope.row);
......@@ -175,6 +176,7 @@
</el-button>
<el-button
type="text"
class='movebtnColor'
disabled={scope.row.isBottom}
onClick={() => {
this.moveDown(scope.$index, scope.row);
......@@ -187,13 +189,14 @@
},
},
{
width: "100",
width: "200",
label: "操作",
render: (h, scope) => {
return (
<div>
<el-button
type="text"
class='resetbtnColor'
style="margin-right:10px"
onClick={() => {
this.handleAddSubordinate(scope.row);
......@@ -203,6 +206,7 @@
</el-button>
<el-button
type="text"
class='delColor'
style="margin-left:0"
onClick={() => {
this.handleMinus(scope.$index, scope.row);
......
......@@ -208,9 +208,9 @@
message: res.message,
showClose: true
})
this.resetForm()
close()
this.$emit('ok')
} else {
this.$message.error({ message: res.message, showClose: true })
}
......
......@@ -29,24 +29,80 @@
</div>
</template>
<script>
// 定时任务
import data from "./data"
import sjsbTask from '@/api/sjsbTask.js'
import tableMixin from '@/mixins/tableMixin.js'
import addTask from '../components/addTask.vue'
export default {
name: "timedTask",
mixins: [tableMixin],
components: {
addTask
},
data () {
return {
taskData: null,
isDialog: false,
form: {
jobName: '',
currentPage: 1
// 定时任务
import data from "./data"
import sjsbTask from '@/api/sjsbTask.js'
import tableMixin from '@/mixins/tableMixin.js'
import addTask from '../components/addTask.vue'
export default {
name: "timedTask",
mixins: [tableMixin],
components: {
addTask
},
data () {
return {
taskData: null,
isDialog: false,
form: {
jobName: '',
currentPage: 1
},
selectionList: [],
tableData: {
columns: [{
label: '序号',
type: 'index',
width: '50',
index: this.indexMethod,
}].concat(data.columns()).concat([
{
label: "操作",
width: 380,
render: (h, scope) => {
return (
<div>
<el-button type="text"
size="mini"
v-show={scope.row.jobStatus === 0}
class='btnColor'
onClick={() => { this.handleActive(scope.row) }}>激活
</el-button>
<el-button type="text"
size="mini"
v-show={scope.row.jobStatus === -1}
class='btnColor'
onClick={() => { this.recover(scope.row) }}>恢复
</el-button>
<el-button type="text"
size="mini"
class='successColor'
onClick={() => { this.handleEdit(scope.row) }}>编辑
</el-button>
<el-button type="text"
size="mini"
class='successColor'
v-show={scope.row.jobStatus !== -1}
onClick={() => { this.handleDel(scope.row) }}>删除
</el-button>
</div>
);
},
},
]),
data: []
},
pageData: {
total: 0,
pageSize: 15,
current: 1,
},
}
},
methods: {
handleAdd () {
this.taskData = null
this.isDialog = true
},
selectionList: [],
tableData: {
......@@ -97,8 +153,7 @@ export default {
pageSize: 15,
current: 1,
},
}
},
},
methods: {
handleAdd () {
this.taskData = null
......