suzhou-jichuang-lanhai
/
jin_ji_hu
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

用户管理新增政务通账户名/发布申报任务增加字段

Browse Source
des
吕天方 7 months ago
parent 3d41ca2207
commit 004c866dc3
4 changed files with 52 additions and 21 deletions
Show Stats Download Patch File Download Diff File

4
.env.development
Unescape View File

@ -5,8 +5,8 @@ VUE_APP_TITLE = 金鸡湖现代服务业品牌管理系统
ENV = 'development'
# 金鸡湖现代服务业品牌管理系统/开发环境
# VUE_APP_BASE_API = 'http://192.168.0.118:9040'
VUE_APP_BASE_API = 'http://39.101.188.84:9040'
VUE_APP_BASE_API = 'http://192.168.0.108:9040'
# VUE_APP_BASE_API = 'http://39.101.188.84:9040'
# VUE_APP_BASE_API = 'https://idp.sipac.gov.cn/api'
# 路由懒加载

2
package.json
Unescape View File

@ -1,6 +1,6 @@
{
"name": "ruoyi",
"version": "1.0.202406240902",
"version": "1.0.202406241047",
"description": "金鸡湖现代服务业品牌管理系统",
"author": "若依",
"license": "MIT",

49
src/views/onlineDeclaration/enterpriseDirectory/index.vue
Unescape View File

@ -61,7 +61,7 @@
<el-table-column prop="templateName" label="模版名称" min-width="180" :show-overflow-tooltip="true"></el-table-column>
<el-table-column label="状态" min-width="50" >
<template slot-scope="scope">
<span :class="scope.row.status == 2 ? 'tab-green' : scope.row.status == 1 ? 'tab-red' : scope.row.status == 0 ? 'tab-blue' : ''">{{ scope.row.status == 2 ? '有效' : scope.row.status == 1 ? '过期' : scope.row.status == 0 ? '未开始' : '' }}</span>
<span :class="scope.row.status == 2 ? 'tab-green' : scope.row.status == 1 ? 'tab-red' : scope.row.status == 0 ? 'tab-blue' : scope.row.status == 3 ? 'tab-green' : ''">{{ scope.row.status == 2 ? '有效' : scope.row.status == 1 ? '过期' : scope.row.status == 0 ? '未开始' : scope.row.status == 3 ? '长期有效' : '' }}</span>
</template>
</el-table-column>
<!-- <el-table-column label="级别" min-width="60">
@ -77,7 +77,8 @@
<!-- <el-table-column align="center" label="开放时间" :show-overflow-tooltip="true" min-width="180" > -->
<el-table-column align="center" label="任务填报时间" :show-overflow-tooltip="true" min-width="180" >
<template slot-scope="scope">
<span>{{ scope.row.startTime }}~{{ scope.row.endTime }}</span>
<span v-if="scope.row.startTime && scope.row.endTime">{{ scope.row.startTime }}~{{ scope.row.endTime }}</span>
<span v-else>长期有效</span>
</template>
</el-table-column>
<el-table-column prop="status" label="责任单位" min-width="80">
@ -190,8 +191,19 @@
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="是否限时" prop="isTime">
<el-radio-group v-model="form.isTime">
<el-radio :label="0">限时</el-radio>
<el-radio :label="1">不限时</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="24" v-show="form.isTime == 0">
<!-- <el-form-item label="申报时间" prop="reportTime"> -->
<el-form-item label="任务填报时间" prop="reportTime">
<el-form-item label="任务填报时间" prop="reportTime"
:rules="form.isTime == 0 ? rules.reportTime : [
{required: false, message: '请选择填报时间', trigger: 'change' }]"
>
<el-date-picker
v-model="form.reportTime"
type="daterange"
@ -371,6 +383,9 @@ export default {
isFrame: [
{ required: true, message: "名录维护方式不能为空", trigger: "blur" }
],
isTime: [
{ required: true, message: "是否限时", trigger: "blur" }
],
fileList: [
{ required: true, message: "请上传企业名录", trigger: "blur" }
]
@ -452,6 +467,7 @@ export default {
notes: undefined,
orderNum: undefined,
isFrame: 0,
isTime: 0,
};
this.resetForm("form");
},
@ -471,6 +487,7 @@ export default {
this.isReplace = false;
this.fileList = [];
this.form.isFrame = 0;
this.form.isTime = 0;
this.title = "发布申报任务";
},
/** 补录按钮操作 */
@ -494,11 +511,19 @@ export default {
} else {
this.$set(this.form, 'isFrame', 0)
}
if(this.form.startTime && this.form.endTime) {
let arr = []
arr.push(this.form.startTime, this.form.endTime)
this.$set(this.form, 'reportTime', arr)
this.$set(this.form, 'isTime', 0)
} else {
this.$set(this.form, 'isTime', 1)
}
this.form.fileList = this.form.fileName || []
this.fileList = this.form.fileName || []
let arr = []
arr.push(this.form.startTime, this.form.endTime)
this.$set(this.form, 'reportTime', arr)
// let arr = []
// arr.push(this.form.startTime, this.form.endTime)
// this.$set(this.form, 'reportTime', arr)
this.templateList = this.templateListLock.filter((item) => {
return item.responsibilityUnit == this.form.responsibilityUnit
})
@ -524,11 +549,17 @@ export default {
} else {
this.$set(this.form, 'isFrame', 0)
}
if(this.form.startTime && this.form.endTime) {
let arr = []
arr.push(this.form.startTime, this.form.endTime)
this.$set(this.form, 'reportTime', arr)
this.$set(this.form, 'isTime', 0)
} else {
this.$set(this.form, 'isTime', 1)
}
this.form.fileList = this.form.fileName || []
this.fileList = this.form.fileName || []
let arr = []
arr.push(this.form.startTime, this.form.endTime)
this.$set(this.form, 'reportTime', arr)
// console.log(this.form,"form");
this.templateList = this.templateListLock.filter((item) => {

18
src/views/system/user/index.vue
Unescape View File

@ -204,8 +204,8 @@
</el-row>
<!-- 添加或修改用户配置对话框 -->
<el-dialog :title="title" :visible.sync="open" width="600px" append-to-body :close-on-click-modal="false">
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-dialog :title="title" :visible.sync="open" width="700px" append-to-body :close-on-click-modal="false">
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row>
<el-col :span="12">
<el-form-item label="用户昵称" prop="nickName">
@ -295,6 +295,13 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="政务通账户名" prop="zwuser">
<el-input v-model="form.zwuser" placeholder="请输入政务通账户名" maxlength="30" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="用户类型" prop="userType">
@ -309,13 +316,6 @@
</el-form-item>
</el-col>
</el-row>
<!-- <el-row>
<el-col :span="24">
<el-form-item label="政务通账户名" prop="userType">
<el-input v-model="form.userName" placeholder="请输入政务通账户名" maxlength="30" />
</el-form-item>
</el-col>
</el-row> -->
<el-row>
<el-col :span="24">
<el-form-item label="企业信息" prop="enterpriseId">

Write Preview
Loading…
Cancel
Save