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 devops

Browse Source
This commit is contained in:
aixianling
2024-10-18 09:31:36 +08:00
parent 576553e962 3f41df22a9
commit b64b102682
4 changed files with 34 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
project/biaopin/AppFormReview/AppFormReview.vue → project/biaopin/AppFormReview/AppGridReview.vue
View File

@@ -1,5 +1,5 @@
<template>
<div class="AppFormReview">
<div class="AppGridReview">
<keep-alive :include="['List']">
<component ref="component" :is="component" :permissions="permissions " @change="onChange" :params="params" :instance="instance" :dict="dict"></component>
</keep-alive>
@@ -11,7 +11,7 @@
import Detail from './components/Detail'
export default {
name: 'AppFormReview',
name: 'AppGridReview',
label: '网格动态',
props: {
@@ -56,7 +56,7 @@
</script>
<style lang="scss">
.AppFormReview {
.AppGridReview {
height: 100%;
background: #F3F6F9;
overflow: auto;

32
project/biaopin/AppFormReview/components/Detail.vue
View File

@@ -14,11 +14,12 @@
<template #content>
<ai-wrapper label-width="120px">
<ai-info-item label="内容" isLine :value="info.content"></ai-info-item>
<ai-info-item label="类型" isLine >{{dict.getLabel("wyGirdNewsType", info.type)}}</ai-info-item>
<ai-info-item label="所属网格" isLine :value="info.girdName"></ai-info-item>
<ai-info-item label="网格员姓名" isLine :value="info.name"></ai-info-item>
<ai-info-item label="状态" isLine >{{dict.getLabel("auditStatus", info.status)}}</ai-info-item>
<ai-info-item label="发布时间" isLine :value="info.createTime"></ai-info-item>
<ai-info-item label="类型" >{{dict.getLabel("wyGirdNewsType", info.type)}}</ai-info-item>
<ai-info-item label="地址" >{{info.address}}</ai-info-item>
<ai-info-item label="网格员姓名" :value="info.name"></ai-info-item>
<ai-info-item label="状态" >{{dict.getLabel("auditStatus", info.status)}}</ai-info-item>
<ai-info-item label="发布时间" :value="info.createTime"></ai-info-item>
<ai-info-item label="图片" isLine>
<div class="files">
<div class="file-item" v-for="(item, index) in info.files" :key="index">
@@ -28,6 +29,15 @@
</ai-info-item>
</ai-wrapper>
</template>
</ai-card>
<ai-card title="审核信息" v-if="info.status != 0">
<template #content>
<ai-wrapper label-width="120px">
<ai-info-item label="审批意见" isLine :value="info.examineOpinion"></ai-info-item>
<ai-info-item label="审批人" :value="info.examineUserName"></ai-info-item>
<ai-info-item label="审批时间" :value="info.examineTime"></ai-info-item>
</ai-wrapper>
</template>
</ai-card>
<ai-dialog
:visible.sync="isShowExamine"
@@ -42,10 +52,10 @@
<el-radio label="0">否</el-radio>
</el-radio-group>
</el-form-item>
<!-- <el-form-item label="处理意见" prop="content" style="width: 100%;" :rules="[{ required: true, message: '请输入处理意见' }]">
<el-input type="textarea" :rows="5" :maxlength="500" v-model="form.content" clearable placeholder="请输入处理意见" show-word-limit></el-input>
<el-form-item label="审批意见" prop="opinion" style="width: 100%;" >
<el-input type="textarea" :rows="5" :maxlength="500" v-model="form.opinion" clearable placeholder="请输入审批意见" show-word-limit></el-input>
</el-form-item>
<el-form-item label="图片" prop="files" style="width: 100%;">
<!-- <el-form-item label="图片" prop="files" style="width: 100%;">
<ai-uploader
:instance="instance"
isShowTip
@@ -75,7 +85,7 @@
info: {},
id: '',
isShowExamine: false,
form: {status: ''}
form: {status: '', opinion: ''}
}
},
@@ -101,7 +111,7 @@
handleEvent() {
this.$refs.form.validate(v => {
if (v) {
this.instance.post(`/app/appgirdnews/examine?id=${this.params.id}&pass=${this.form.status}`).then(res => {
this.instance.post(`/app/appgirdnews/examine?id=${this.params.id}&pass=${this.form.status}&opinion=${this.form.opinion}`).then(res => {
if (res?.code == 0) {
this.isShowExamine = false
this.getDetail()
@@ -129,8 +139,8 @@
align-items: center;
flex-wrap: wrap;
.file-item {
width: 240px;
height: 240px;
width: 150px;
height: 150px;
margin: 0 20px 20px 0;
img, video {

3
project/biaopin/AppFormReview/components/List.vue
View File

@@ -82,8 +82,9 @@
total: 0,
colConfigs: [
{ prop: 'content', label: '内容', align: 'left', width: '200px' },
{ prop: 'type', align: 'center', label: '类型', dict:"wyGirdNewsType"},
{ prop: 'girdName', label: '所属网格', align: 'center' },
{ prop: 'type', align: 'center', label: '类型', dict:"wyGirdNewsType"},
{ prop: 'address', label: '地址', align: 'center' },
{ prop: 'name', label: '网格员姓名', align: 'center' },
{ prop: 'status', align: 'center', label: '状态', dict:"auditStatus"},
{ prop: 'createTime', label: '发布时间', align: 'center' }

8
project/wuxi/AppIntegratingSupermarket/components/AddStore.vue
View File

@@ -11,6 +11,12 @@
<el-form-item style="width: 100%" label="店铺名称" prop="title" :rules="[{required: true, message: '请输入店铺名称', trigger: 'blur'}]">
<el-input type="input" size="small" v-model="form.title" clearable placeholder="请输入店铺名称" :maxlength="50" show-word-limit></el-input>
</el-form-item>
<el-form-item style="width: 50%" label="店家" prop="shopkeeper">
<el-input type="input" size="small" v-model="form.shopkeeper" clearable placeholder="请输入店家名字" :maxlength="10" show-word-limit></el-input>
</el-form-item>
<el-form-item style="width: 50%" label="联系电话" prop="phone" :rules="[{required: true, message: '请输入联系电话', trigger: 'blur'}]">
<el-input type="number" size="small" v-model="form.phone" clearable placeholder="请输入联系电话" :maxlength="11" show-word-limit></el-input>
</el-form-item>
<el-form-item style="width: 100%" label="店铺类型" prop="type" :rules="[{required: true, message: '请选择店铺类型', trigger: 'change'}]">
<ai-select
v-model="form.type"
@@ -227,6 +233,8 @@
isShow: false,
form: {
title: '',
shopkeeper: '',
phone: '',
type: '',
serviceType: '0',
visibleNames: '',