kubbo/dvcp_v2_webapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
aixianling
2022-10-27 18:07:16 +08:00
parent 31cbb5d2bf 96acf75571
commit 531ab674f3
10 changed files with 69 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
project/pingchang/apps/AppCommunityMember/Add.vue
View File

@@ -50,7 +50,7 @@
value-format="yyyy-MM-dd HH:mm:ss">
</el-date-picker>
</el-form-item>
<el-form-item label="截至时间" prop="stopSignupTime" style="width: 50%">
<el-form-item label="报名截止时间" prop="stopSignupTime" style="width: 50%">
<el-date-picker size="small" :picker-options="pickerOptions"
v-model="form.stopSignupTime"
type="date"

37
project/pingchang/apps/AppCommunityMember/Detail.vue
View File

@@ -16,11 +16,11 @@
<ai-info-item isLine label="发布地区">{{ info.areaName }}</ai-info-item>
<ai-info-item isLine label="标题">{{ info.title }}</ai-info-item>
<ai-info-item isLine label="活动地点">{{ info.address }}</ai-info-item>
<ai-info-item isLine label="参与名额">{{ info.total }}</ai-info-item>
<ai-info-item isLine label="参与名额">{{ info.total > 0 ? info.total : '无限制' }}</ai-info-item>
<ai-info-item label="报名状态">{{ dict.getLabel('partyReportSignupStatus', info.signupStatus) }}</ai-info-item>
<ai-info-item label="活动状态">{{ dict.getLabel('activityStatus', info.actionStatus) }}</ai-info-item>
<ai-info-item label="活动状态">{{ dict.getLabel('partyReportActionStatus', info.actionStatus) }}</ai-info-item>
<ai-info-item label="活动时间">{{ info.beginTime }} 至 {{ info.endTime }}</ai-info-item>
<ai-info-item label="截至时间">{{ info.stopSignupTime }}</ai-info-item>
<ai-info-item label="报名截止时间">{{ info.stopSignupTime }}</ai-info-item>
<ai-info-item label="联系人">{{ info.contactPerson }}</ai-info-item>
<ai-info-item label="联系电话">{{ info.contactPhone }}</ai-info-item>
</ai-wrapper>
@@ -51,7 +51,8 @@
<el-table-column slot="options" width="120px" fixed="right" label="操作" align="center">
<template slot-scope="{ row }">
<div class="table-options">
<el-button type="text" @click="viewUser(row)">查看日志</el-button>
<el-button type="text" @click="viewUser(row)" v-if="row.logStatus > 0">查看日志</el-button>
<el-button type="text" @click="viewUser(row)" v-else disabled>查看日志</el-button>
</div>
</template>
</el-table-column>
@@ -72,6 +73,16 @@
</ai-uploader>
</ai-info-item>
</ai-wrapper>
<div v-if="userInfo.logStatus==1">
<p style="display: inline-block;">审核结果：</p>
<el-radio-group v-model="logCheck">
<el-radio label="2">合格</el-radio>
<el-radio label="3">不合格</el-radio>
</el-radio-group>
</div>
<div slot="footer" style="text-align: center;" v-if="userInfo.logStatus==1">
<el-button style="width:92px" size="small" type="primary" @click="logCheckFn()">提交</el-button>
</div>
</ai-dialog>
</div>
</template>
@@ -105,7 +116,8 @@ export default {
],
userList: [],
showDialog: false,
userInfo: {}
userInfo: {},
logCheck: '2'
}
},
@@ -114,7 +126,7 @@ export default {
},
created() {
this.dict.load('activityStatus', 'partyReportSignupStatus', 'partyReportSignupReportType', 'partyReportPersonSignupStatus', 'partyReportSignupLogStatus').then(() => {
this.dict.load('partyReportActionStatus', 'partyReportSignupStatus', 'partyReportSignupReportType', 'partyReportPersonSignupStatus', 'partyReportSignupLogStatus').then(() => {
this.getInfo()
this.getList()
})
@@ -148,6 +160,7 @@ export default {
if (res.code == 0) {
this.userInfo = {...res.data}
this.userInfo.userName = row.partyName
this.userInfo.logStatus = row.logStatus
this.showDialog = true
}
});
@@ -155,6 +168,18 @@ export default {
cancel() {
this.$emit("goBack")
},
logCheckFn(){
this.instance.post(`/app/apppartyreport/log-check`, {
id: this.userInfo.id,
logStatus: this.logCheck
}).then(res => {
if (res.code == 0) {
this.showDialog = false
this.getList()
this.logCheck = '2'
}
});
},
},
};
</script>

8
project/pingchang/apps/AppCommunityMember/List.vue
View File

@@ -4,7 +4,7 @@
<ai-search-bar>
<template #left>
<el-button size="small" type="primary" icon="iconfont iconAdd" @click="toAdd()">发起活动</el-button>
<ai-select v-model="search.actionStatus" placeholder="请选择活动状态" :selectList="dict.getDict('activityStatus')"
<ai-select v-model="search.actionStatus" placeholder="请选择活动状态" :selectList="dict.getDict('partyReportActionStatus')"
@change="getListInit"></ai-select>
<ai-select v-model="search.signupStatus" placeholder="请选择报名状态" :selectList="dict.getDict('partyReportSignupStatus')"
@change="getListInit"></ai-select>
@@ -75,9 +75,9 @@ export default {
{prop: 'title', label: '活动名称', align: 'center'},
{prop: 'areaName', label: '发布地区', align: 'center'},
{slot: 'activeTime'},
{prop: 'total', label: '报名人数', align: 'center', width: 120},
{prop: 'signupCount', label: '报名人数', align: 'center', width: 120},
{prop: 'signupStatus', label: '报名状态', align: 'center', dict: 'partyReportSignupStatus', width: 120},
{prop: 'actionStatus', label: '活动状态', align: 'center', dict: 'activityStatus', width: 120},
{prop: 'actionStatus', label: '活动状态', align: 'center', dict: 'partyReportActionStatus', width: 120},
{slot: 'option'},
],
tableData: [],
@@ -88,7 +88,7 @@ export default {
...mapState(['user']),
},
created() {
this.dict.load('activityStatus', 'partyReportSignupStatus').then(() => {
this.dict.load('partyReportActionStatus', 'partyReportSignupStatus').then(() => {
this.getList()
})

5
project/pingchang/apps/AppCommunityMember/Organization.vue
View File

@@ -320,5 +320,10 @@ export default {
}
}
}
::v-deep .organizations_tree .el-tree .is-current>.el-tree-node__content {
background-color: #26f;
color: #fff;
}
}
</style>

7
project/pingchang/apps/AppCommunityMember/Statistics.vue
View File

@@ -110,7 +110,7 @@
size="small"
placeholder="请输入姓名"
clearable
@change="(search.current = 1), searchList()"
@change="(page.current = 1), searchList()"
suffix-icon="iconfont iconSearch"
/>
</template>
@@ -502,7 +502,7 @@ export default {
.middle {
width: 100%;
height: 320px;
height: 346px;
margin-top: 16px;
background-color: #fff;
border-radius: 4px;
@@ -653,5 +653,8 @@ export default {
background-color: none!important;
padding: 0!important;
}
::v-deep .el-tree .is-current>.el-tree-node__content {
min-width: 100%!important;
}
}
</style>

7
project/pingchang/apps/AppNewEconomics/components/Add.vue
View File

@@ -135,7 +135,7 @@
</el-form-item>
<!-- 网格归属 -->
<el-form-item label="网格归属" prop="girdId" class="girdId">
<!-- <el-form-item label="网格归属" prop="girdId" class="girdId">
<el-cascader
v-model="formData.girdId"
:options="gridTree"
@@ -143,7 +143,7 @@
clearable
size="small"
/>
</el-form-item>
</el-form-item> -->
</div>
</ai-card>
@@ -389,7 +389,8 @@ export default {
administratorIdNumber: [
{
required: true,
trigger: "change"
trigger: "change",
message: "请输入法人身份证",
},
{ validator: IdCard }
],

4
project/pingchang/apps/AppNewSociety/components/Add.vue
View File

@@ -142,7 +142,7 @@
</el-form-item>
<!-- 网格归属 -->
<el-form-item label="网格归属" prop="girdId" >
<!-- <el-form-item label="网格归属" prop="girdId" >
<el-cascader
v-model="formData.girdId"
:options="gridTree"
@@ -150,7 +150,7 @@
clearable
size="small"
/>
</el-form-item>
</el-form-item> -->
</div>
</ai-card>
<ai-card title="治保负责人信息">

5
project/pingchang/apps/AppRecruitPartyMembers/components/Add.vue
View File

@@ -219,7 +219,7 @@
:instance="instance"
v-model="form.fileList"
fileType="file"
acceptType=".zip, .rar, .doc, .docx, .xls, .ppt, .pptx, .pdf, .txt, .jpg, .png"
acceptType=".zip,.rar,.doc,.docx,.xls,.ppt,.pptx,.pdf,.txt,.jpg,.png,.xlsx"
:limit="9">
<template slot="tips">
最多上传9个附件,单个文件最大10MB<br/>
@@ -593,6 +593,9 @@ export default {
if(!this.isEdit) {
this.form.partyOrgId = this.$route.query.partyOrgId
}
if (this.form.fileList.length > 0) {
this.form.files = JSON.stringify(this.form.fileList)
}
this.instance.post(`/app/apppartydevelop/addOrUpdate`, {...this.form}).then((res) => {
if (res.code == 0) {
this.$message.success(this.isEdit ? "编辑成功" : "添加成功");

13
project/pingchang/apps/AppRecruitPartyMembers/components/List.vue
View File

@@ -21,8 +21,8 @@
<ai-select v-model="search.sex" placeholder="请选择性别" :selectList="dict.getDict('sex')"
@change="search.current = 1, getList()"></ai-select>
<ai-search label="年龄">
<ai-range v-model="search.age" ref="resetagefoo" @change="search.current = 1, getList()"
@closeVal="search.age = []"/>
<ai-range v-model="age" ref="resetagefoo" @change="search.current = 1, getList()"
@closeVal="age = []"/>
</ai-search>
<ai-search label="入党时间">
<el-date-picker
@@ -120,7 +120,6 @@ export default {
current: 1,
size: 10,
con: '',
age: [],
sex: '',
joinPartyStart: '',
joinPartyEnd: ''
@@ -138,6 +137,7 @@ export default {
],
tableData: [],
ids: '',
age: []
}
},
computed: {
@@ -181,10 +181,15 @@ export default {
this.loading = true
partyOrgId = partyOrgId || this.selected.id
this.instance.post(`/app/apppartydevelop/list`, null, {
params: {partyOrgId, ...this.search, ageStart: this.search.age[0] || '', ageEnd: this.search.age[1] || '',}
params: {partyOrgId, ...this.search, ageStart: this.age[0] || '', ageEnd: this.age[1] || '',}
}).then(res => {
this.loading = false
if (res?.data) {
res.data.records.map((item) => {
if(item.applyJoinPartyTime) {
item.applyJoinPartyTime = item.applyJoinPartyTime.substring(0, 10)
}
})
this.tableData = res.data.records
this.total = res.data.total
}

4
project/pingchang/apps/AppTwoNewOrganizationSta/staPane.vue
View File

@@ -406,5 +406,9 @@ export default {
.pad-l32 {
padding-left: 32px;
}
::v-deep .el-tree .is-current>.el-tree-node__content {
background-color: #26f;
color: #fff;
}
}
</style>