webapp / GreenwayWeb

Commit a54f027fb48551b1db2946007c572ddc762a0be3

Authored by 杨鑫
1 parent 3caa08e1

'1'

Inline Side-by-side
Showing 11 changed files with 946 additions and 331 deletions
admin-web-master/dist.zip deleted
View file @3caa08e
No preview for this file type
admin-web-master/src/api/information.js
  View file @a54f027
... ... @@ -106,3 +106,24 @@ export function statistical(data) {
106 106 data
107 107 })
108 108 }
  109 +
  110 +// 商户导入管理模板
  111 +export const excelAdd = (data = {}) => {
  112 + return request({
  113 + url: '/cereBasicInformationShop/excelAdd',
  114 + method: 'post',
  115 + data,
  116 + headers: {
  117 + 'Content-type': 'multipart/form-data'
  118 + }
  119 + })
  120 +}
  121 +
  122 +// 租赁信息
  123 +export function zulxin(data) {
  124 + return request({
  125 + url: `cereBasicInformationShop/${data.venueNumber}`,
  126 + method: 'get',
  127 + data
  128 + })
  129 +}
... ...
admin-web-master/src/api/kefuServeBao.js
  View file @a54f027
... ... @@ -16,6 +16,14 @@ export function ReportDel(data) {
16 16 data
17 17 })
18 18 }
  19 +// 报修修改
  20 +export function Reportedit(data) {
  21 + return request({
  22 + url: '/cereReportIssuesRepairs/edit',
  23 + method: 'post',
  24 + data
  25 + })
  26 +}
19 27 // 投诉
20 28 export function ComplaintGetAll(data) {
21 29 return request({
... ...
admin-web-master/src/utils/request2.js
  View file @a54f027
... ... @@ -15,7 +15,7 @@ let hostall = window.location.href;
15 15 // const baseURL = 'http://192.168.2.38:9003';
16 16 let baseURL = ''
17 17 // || host === 'localhost:9528'
18   -if(host === 'localhost:8080' || host === 'localhost:8081'|| host === 'localhost:9528' || host === '192.168.31.45:9528') {
  18 +if(host === 'localhost:8080' || host === 'localhost:8081'|| host === 'localhost:9528' || host === '192.168.31.45:9528'|| host === '192.168.31.45:9529') {
19 19 // baseURL = 'https://zhld.028wlkj.com:49008/cdwlMall/business-server';
20 20 baseURL = 'http://172.16.61.125:9004';
21 21 } else {
... ...
admin-web-master/src/views/serve/MarkActivity/index.vue
  View file @a54f027
1 1 <template>
2 2 <div style="background-color:#f7f7f7;padding:10px 10px;">
3   - <div class="zhuti" v-if="onaction == '1'">
  3 + <div class="zhuti">
4 4 <div style="height:58px;line-height:58px;">
5 5 <div style="color:#0006"> <span>客服服务管理</span> <span style="padding:0 5px;">></span> <span
6 6 style="color:#000000e6">营销推广活动</span></div>
7 7 </div>
8   - <!-- 线上 -->
9 8 <div>
10 9 <!-- 搜索 -->
11 10 <div class="formSearch">
12   - <el-form :inline="true" :model="pagequery">
13   - <el-form-item label="名称">
14   - <el-input v-model="pagequery.name" placeholder="请输入" style="width:168px;" />
  11 + <el-form :inline="true" :model="formSel">
  12 + <el-form-item label="活动标题">
  13 + <el-input v-model="formSel.title" placeholder="请输入" style="width:168px;" />
15 14 </el-form-item>
16   - </el-form>
17 15  
  16 + <el-form-item label="联系人">
  17 + <el-input v-model="formSel.contactPerson" placeholder="请输入" style="width:168px;" />
  18 + </el-form-item>
  19 + <el-form-item label="联系电话">
  20 + <el-input v-model="formSel.contactPhone" placeholder="请输入" style="width:168px;" />
  21 + </el-form-item>
  22 + <el-form-item label="起止时间">
  23 + <el-select v-model="formSel.startTime" placeholder="请选择" style="width:168px;margin-right: 15px">
  24 + <el-option label="" value="" />
  25 + </el-select>
  26 + </el-form-item>
  27 + </el-form>
18 28 <div>
19 29 <el-button @click="onSubmit" style="background-color: #3F9B6A;color: #fff">查询
20 30 </el-button>
... ... @@ -23,277 +33,696 @@
23 33 </el-button>
24 34 </div>
25 35 </div>
26   - <div style="margin-bottom:20px;">
27   - <el-button @click="removeonaction('2')" icon="el-icon-circle-plus-outline" style="background-color: #3F9B6A;color: #fff;">新增
28   - </el-button>
29   - </div>
  36 + <div style="margin-bottom: 20px;width:20%">
  37 + <div>
  38 + <el-button
  39 + style="background-color: #3F9B6A;color: #fff;padding:8px 15px;" icon="el-icon-circle-plus-outline"
  40 + @click="ggXin = true">新增</el-button>
  41 + </div>
  42 + </div>
30 43 <!-- 表格 -->
31 44  
32   - <el-table :data="tableData"
33   - :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
34   - <el-table-column label="序号" width="50">
35   - <template slot-scope="scope">
36   - {{scope.$index + 1}}
37   - </template>
  45 + <el-table :data="tableData.slice((currentPage - 1) * pageSize, currentPage * pageSize)"
  46 + :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
  47 + >
  48 + <el-table-column label="序号" min-width="150">
  49 + <template slot-scope="scope">
  50 + {{scope.$index +1 }}
  51 + </template>
38 52 </el-table-column>
39   - <el-table-column label="活动标题" prop="title">
  53 + <el-table-column label="活动标题" min-width="200" prop="title">
40 54 </el-table-column>
41   - <el-table-column label="场地名称" prop="venue">
  55 + <el-table-column label="场地名称" min-width="150" prop="venue">
42 56 </el-table-column>
43   - <el-table-column label="起止时间" prop="startTime" >
  57 + <el-table-column label="起止时间" prop="startTime" min-width="250">
44 58 </el-table-column>
45   - <el-table-column label="联系人" prop="contactPerson" >
  59 + <el-table-column label="联系人" prop="contactPerson" min-width="150">
46 60  
47 61 </el-table-column>
48   - <el-table-column label="联系电话" prop="contactPhone" >
  62 + <el-table-column label="联系电话" prop="contactPhone" min-width="150">
49 63  
50 64 </el-table-column>
51   - <el-table-column label="已参与报名人数" prop="registeredCount" >
  65 + <el-table-column label="已参与报名人数" prop="registeredCount" min-width="150">
52 66 </el-table-column>
53   - <el-table-column prop="createdAt" label="创建时间" >
  67 + <el-table-column prop="createdAt" label="创建时间" min-width="250">
54 68  
55 69 </el-table-column>
56   - <el-table-column label="创建人" prop="createdBy" >
57   - </el-table-column>
58   - <el-table-column prop="reviewStatus" label="状态" >
  70 +
  71 + <el-table-column prop="reviewStatus" label="状态" min-width="150">
59 72 <template slot-scope="scope">
60 73 {{scope.row.reviewStatus=='1'?'未发布':'已发布'}}
61 74 </template>
62 75 </el-table-column>
63   - <el-table-column label="操作" fixed="right">
  76 + <el-table-column label="操作" min-width="350" fixed="right">
64 77 <template slot-scope="scope">
65 78 <div @click="details(scope.row)" class="tableBtn greens">查看</div>
66   - <!-- <div @click="openyujingSet(scope.row)" class="tableBtn greens">审核</div> -->
  79 + <div @click="fabu(scope.row,'2')" class="tableBtn greens" v-if="scope.row.reviewStatus=='1'">发布</div>
  80 + <div @click="fabu(scope.row,'1')" class="tableBtn greens" v-if="scope.row.reviewStatus=='2'">下架</div>
  81 + <div @click="zhongzhi(scope.row)" class="tableBtn greens" v-if="scope.row.reviewStatus =='1'">编辑</div>
  82 + <div @click="getMing(scope.row.id)" class="tableBtn greens" v-if="scope.row.reviewStatus!='1'">报名名单</div>
  83 + <div @click="deltab(scope.row)" class="tableBtn greens" v-if="scope.row.reviewStatus =='1'">删除</div>
  84 + <div @click="Qcode(scope.row)" class="tableBtn greens" >活动二维码</div>
67 85 </template>
68 86 </el-table-column>
69 87 </el-table>
70   - <div style="display: flex;justify-content: space-between;" class="bom">
71   - <div style="font-size: 14px;">共 <span style="color: #3F9B6A;">{{total}}</span> 项数据</div>
72   - <el-pagination :current-page="pagequery.pageNumber+1" :page-sizes="[10, 20, 50, 100]" :page-size="10"
73   - background small layout="prev, pager, next" :total="total" @size-change="handleSizeChange"
74   - @current-change="handleCurrentChange">
75   - </el-pagination>
  88 + <div class="fenye">
  89 + <el-pagination :hide-on-single-page='flag' background small size="mini" :current-page="currentPage"
  90 + :page-sizes="[10, 20, 50, 100]" layout="prev, pager, next,total" :total="total "
  91 + @size-change="handleSizeChange" @current-change="handleCurrentChange" />
76 92 </div>
77   -
78 93 </div>
79 94  
80 95 </div>
81   -
82   -
83   -
84   -
85   -
86   -
87   - <el-dialog title="审核" :visible.sync="yujingSet" style="padding: 0;" width="60%" center :close-on-click-modal="false" :show-close="false" top="20vh">
88   - <div>
89   - <div style="margin-bottom: 20px;">
90   - <el-form ref="form" :model="detailsinfo" label-width="120px">
91   - <el-form-item label="审核状态" prop="checkState">
92   - <el-select v-model="detailsinfo.checkState" placeholder="请选择" style="width: 100%;">
93   - <!-- <el-option label="待审核" value="1"></el-option> -->
94   - <el-option label="同意" value="2"></el-option>
95   - <el-option label="拒绝" value="3"></el-option>
96   - </el-select>
  96 + <!-- 详情框 -->
  97 + <el-dialog :visible.sync="detbox" custom-class='tongyong_css' style="padding: 0;" width="65%" center
  98 + :close-on-click-modal="false" :show-close="false">
  99 + <div style="padding:20px;">
  100 + <div style="font-size: 14px;padding-bottom: 20px;color: #000;">详情页</div>
  101 + <div>
  102 +
  103 + <el-form ref="form" :model="xiangData" label-width="120px">
  104 + <el-form-item label="营销活动标题" prop="title">
  105 + <el-input placeholder="请输入" v-model="xiangData.title" :disabled="edit" ></el-input>
97 106 </el-form-item>
98   - <el-form-item label="审核意见">
99   - <el-input maxlength="200" show-word-limit rows="4" v-model="detailsinfo.checkOpinion" placeholder="请输入审核意见" type="textarea" />
  107 + <el-form-item label="内容" prop="content" tyle="width: 100%;">
  108 + <wang-editor v-model="xiangData.content" ref="editor" :height="200" v-if="!edit"></wang-editor>
  109 + <div v-html="xiangData.content" style="line-height:40px" v-else></div>
100 110 </el-form-item>
101 111 </el-form>
102   -
  112 + <div style="border:1px solid #DCDFE6;font-size:14px;margin-bottom:10px;">
  113 + <div style="padding: 10px 20px;border-bottom: 1px solid #DCDFE6;display: flex;justify-content: space-between;">
  114 + <div>场地选择</div>
  115 + <div style="color: #3F9B6A;margin-left: 10px;" @click="addziyuan = true" v-if="!edit">
  116 + 添加
  117 + </div>
  118 + </div>
  119 + <div style="padding:20px;">
  120 + <el-table :data="addziyuanData.slice((currentPage - 1) * pageSize, currentPage * pageSize)"
  121 + :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
  122 + >
  123 + <el-table-column label="序号" width="80" >
  124 + <template slot-scope="scope">
  125 + {{scope.$index + 1}}
  126 + </template>
  127 + </el-table-column>
  128 +
  129 + </el-table-column>
  130 + <el-table-column label="场地名称" prop="venueName"
  131 + width="150">
  132 +
  133 + </el-table-column>
  134 + <el-table-column label="所属区域" prop="district" min-width="150">
  135 + </el-table-column>
  136 + <el-table-column label="场地类型" prop="venueType" width="150">
  137 +
  138 + </el-table-column>
  139 + <el-table-column label="详细位置" prop="detailedLocation" min-width="150">
  140 + </el-table-column>
  141 +
  142 + </el-table>
  143 + </div>
  144 + </div>
  145 + <el-form ref="form" :model="xiangData" label-width="120px">
  146 + <el-form-item label="起止时间">
  147 + <el-date-picker style="width: 100%;" v-model="plan_Time" value-format="yyyy-MM-dd HH:mm:ss" :disabled="edit"
  148 + type="datetimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" align="right">
  149 + </el-date-picker>
  150 + </el-form-item>
  151 + <el-form-item label="联系人" prop="contactPerson">
  152 + <el-input placeholder="请输入" v-model="xiangData.contactPerson" :disabled="edit"></el-input>
  153 + </el-form-item>
  154 + <el-form-item label="联系电话" prop="contactPhone">
  155 + <el-input placeholder="请输入" v-model="xiangData.contactPhone" :disabled="edit"></el-input>
  156 + </el-form-item>
  157 + <el-form-item label="封面图片" prop="coverImage">
  158 + <upimg v-model="xiangData.coverImage" :limit="1" :fileSize="1" :isShowTip="false" v-if="!edit"></upimg>
  159 + <img :src="xiangData.coverImage" alt="" v-else>
  160 + </el-form-item>
  161 +
  162 + </el-form>
103 163 </div>
104   - <div style="display: flex;justify-content: flex-end;">
105   - <el-button @click="yuclose" class="buttonHover"
106   - style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">返回</el-button>
107   - <el-button @click="yuChenk" style="background-color: #3F9B6A;color: #fff">确定</el-button>
  164 +
  165 + <div style="padding-top:20px;display:flex;justify-content: flex-end;">
  166 + <el-button class="buttonHover" style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;"
  167 + @click="closeFn(2)">返回</el-button>
  168 + <el-button @click="edit = false" style="background-color: #3F9B6A;color: #fff" v-if="edit && xiangData.reviewStatus!='2'">编辑</el-button>
  169 + <el-button @click="addbuss(2)" style="background-color: #3F9B6A;color: #fff" v-else>确认</el-button>
  170 +
  171 +
108 172 </div>
109 173 </div>
  174 +
110 175 </el-dialog>
111   - <div class="zhuti" v-if="onaction == '2'">
112   - <div style="height:58px;line-height:58px;">
113   - <div style="color:#0006"> <span>营销推广活动</span> <span style="padding:0 5px;">></span> <span
114   - style="color:#000000e6">新增</span></div>
115   - </div>
116 176  
117   - <div style="padding: 20px 20px 20px 0;">
118   - <add @removeonaction="removeonaction"></add>
  177 + <!-- 新增 -->
  178 + <el-dialog title="新增" :visible.sync="ggXin" custom-class="diaslog_zhong" style="padding: 0;" width="50%"
  179 + class="dialog_css_Xq" center :close-on-click-modal="false" :show-close="false">
  180 + <div style="margin-bottom: 20px;">
  181 + <el-form ref="form" :model="formInline" label-width="120px">
  182 + <el-form-item label="营销活动标题" prop="title">
  183 + <el-input placeholder="请输入" v-model="formInline.title" ></el-input>
  184 + </el-form-item>
  185 + <el-form-item label="内容" prop="content" tyle="width: 100%;">
  186 + <wang-editor v-model="formInline.content" ref="editor" :height="200"></wang-editor>
  187 + </el-form-item>
  188 + </el-form>
119 189 </div>
120   - </div>
121   - <div class="zhuti" v-if="onaction == '3'">
122   - <div style="height:58px;line-height:58px;">
123   - <div style="color:#0006"> <span>营销推广活动</span> <span style="padding:0 5px;">></span> <span
124   - style="color:#000000e6">查看</span></div>
  190 +
  191 + <div style="border:1px solid #DCDFE6;font-size:14px;margin-bottom:10px;">
  192 + <div style="padding: 10px 20px;border-bottom: 1px solid #DCDFE6;display: flex;justify-content: space-between;">
  193 + <div>场地选择</div>
  194 + <div style="color: #3F9B6A;margin-left: 10px;" @click="addziyuan = true">
  195 + 添加
  196 + </div>
  197 + </div>
  198 + <div style="padding:20px;">
  199 + <el-table :data="addziyuanData.slice((currentPage - 1) * pageSize, currentPage * pageSize)"
  200 + :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
  201 + >
  202 + <el-table-column label="序号" width="80" >
  203 + <template slot-scope="scope">
  204 + {{scope.$index + 1}}
  205 + </template>
  206 + </el-table-column>
  207 +
  208 +
  209 + <el-table-column label="场地名称" prop="venueName"
  210 + width="150">
  211 +
  212 + </el-table-column>
  213 + <el-table-column label="所属区域" prop="district" min-width="150">
  214 + </el-table-column>
  215 + <el-table-column label="场地类型" prop="venueType" width="150">
  216 +
  217 + </el-table-column>
  218 + <el-table-column label="详细位置" prop="detailedLocation" min-width="150">
  219 + </el-table-column>
  220 + <el-table-column label="操作" min-width="150">
  221 + <template slot-scope="scope">
  222 + <div class="tableBtn greens" @click="addziyuanData = []" >删除</div>
  223 + </template>
  224 + </el-table-column>
  225 + </el-table>
  226 + </div>
125 227 </div>
126   - <div>
127   - <merchantInformation :info="detailsinfo" @removeonaction="removeonaction"></merchantInformation>
  228 + <el-form ref="form" :model="formInline" label-width="120px">
  229 + <el-form-item label="起止时间">
  230 + <el-date-picker style="width: 100%;" v-model="plan_Time" value-format="yyyy-MM-dd HH:mm:ss"
  231 + type="datetimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" align="right">
  232 + </el-date-picker>
  233 + </el-form-item>
  234 + <el-form-item label="联系人" prop="currentStage">
  235 + <el-input placeholder="请输入" v-model="formInline.contactPerson" ></el-input>
  236 + </el-form-item>
  237 + <el-form-item label="联系电话">
  238 + <el-input placeholder="请输入" v-model="formInline.contactPhone" ></el-input>
  239 + </el-form-item>
  240 + <el-form-item label="封面图片">
  241 + <upimg v-model="formInline.coverImage" :limit="1" :fileSize="1" :isShowTip="false"></upimg>
  242 + </el-form-item>
  243 +
  244 + </el-form>
  245 + <div style="display: flex;justify-content: flex-end;">
  246 + <el-button @click="closeFn(1)" class="buttonHover"
  247 + style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">返回</el-button>
  248 + <el-button @click="addCheck(4)" style="background-color: #3F9B6A;color: #fff">确定</el-button>
128 249 </div>
129   - <!-- <div>
130   - <el-button class="buttonHover"
131   - style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;margin-top: 20px;"
132   - @click="removeonaction('1')">返回</el-button>
133   - </div> -->
134   - </div>
  250 + <!-- 场地选择 -->
  251 + <el-dialog :visible.sync="addziyuan" custom-class='XDD_css' style="padding: 0;" width="50%"
  252 + append-to-body center :close-on-click-modal="false" :close-on-press-escape="false" :show-close="false">
  253 + <div style="padding: 10px 13px;font-size: 14px;border-bottom: 1px solid #E5E5E5;display: flex;justify-content: space-between;">
  254 + <div>添加</div>
  255 + </div>
  256 + <div style="padding: 15px;width:100%">
  257 +
  258 + <div style="border: 1px solid #E5E5E5;padding: 1px" id="huodong">
  259 + <div style="padding: 10px 13px;font-size: 14px;border-bottom: 1px solid #E5E5E5;display: flex;justify-content: space-between;">
  260 + <div>选择场地</div>
  261 + </div>
  262 + <div style="padding: 15px;">
  263 + <div style="padding: 0px 20px 0px 0px">
  264 + <el-table :data="ziyuanData"
  265 + highlight-current-row
  266 + @current-change="handleSelectionChange"
  267 + :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
  268 + >
  269 +
  270 + <el-table-column label="序号" min-width="8%" >
  271 + <template slot-scope="scope">
  272 + {{scope.$index + 1}}
  273 + </template>
  274 + </el-table-column>
  275 +
  276 + <el-table-column label="场地名称" prop="venueName" min-width="15%">
  277 +
  278 + </el-table-column>
  279 + <el-table-column label="场地类型" prop="venueType" min-width="15%">
  280 +
  281 + </el-table-column>
  282 + <!-- <el-table-column prop="notes" label="对应策略" min-width="15%">
  283 + </el-table-column> -->
  284 + </el-table>
  285 + </div>
  286 + </div>
  287 + </div>
  288 + </div>
  289 + <div style="display: flex;justify-content: flex-end;padding: 10px 20px 10px 0">
  290 + <el-button @click="mingClose" class="buttonHover"
  291 + style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">取消
  292 + </el-button>
  293 + <el-button @click="minSev" style="background-color: #3F9B6A;color: #fff;">确定
  294 + </el-button>
  295 +
  296 + </div>
  297 + </el-dialog>
  298 +
  299 + </el-dialog>
  300 + <el-dialog :visible.sync="showQF" custom-class='tongyong_css' style="padding: 0;" width="25%" center
  301 + :close-on-click-modal="false" :show-close="false">
  302 + <div style="padding:20px;">
  303 + <div style="font-size: 14px;padding-bottom: 20px;color: #000;">活动二维码</div>
  304 + <div style="padding:20px;">
  305 + <!-- <img :src="qfUrl" alt="" style="height:330px;width:80%"> -->
  306 + <el-image
  307 + style="width:200px; height: 200px"
  308 + :src="qfUrl"
  309 + fit="fill"></el-image>
  310 + </div>
  311 + <div style="padding-top:20px;display:flex;justify-content: flex-end;">
  312 + <el-button class="buttonHover" style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;"
  313 + @click="showQF =false">返回</el-button>
  314 + </div>
  315 + </div>
135 316  
  317 + </el-dialog>
  318 + <!-- 报名名单 -->
  319 + <el-dialog :visible.sync="baoming" custom-class='tongyong_css' style="padding: 0;" width="55%" center
  320 + :close-on-click-modal="false" :show-close="false">
  321 + <div style="padding:20px;">
  322 + <div style="font-size: 14px;padding-bottom: 20px;color: #000;">报名名单</div>
  323 + <div style="padding:20px;">
  324 + <el-table :data="mingList"
  325 + :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
  326 + >
  327 + <el-table-column label="序号" min-width="150">
  328 + <template slot-scope="scope">
  329 + {{scope.$index +1 }}
  330 + </template>
  331 + </el-table-column>
  332 + <el-table-column label="联系人" prop="userName" min-width="150">
  333 +
  334 + </el-table-column>
  335 + <el-table-column label="联系电话" prop="userPhone" min-width="150">
  336 +
  337 + </el-table-column>
  338 + </el-table>
  339 + </div>
  340 + <div style="padding-top:20px;display:flex;justify-content: flex-end;">
  341 + <el-button class="buttonHover" style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;"
  342 + @click="baoming =false">返回</el-button>
  343 + </div>
  344 + </div>
  345 +
  346 + </el-dialog>
136 347 </div>
137   - <!-- </div> -->
  348 +
138 349  
139 350 </template>
140 351  
141 352 <script>
142   - import add from '@/components/add/addMarkActivity.vue'
143 353 import {
144   - MarkGetAll,
145   - MarkAdd,
146   - MarkEdit,
147   - MarkDel,
148   - QRcode,
149   - Registration
  354 + async
  355 + } from 'q'
  356 + import axios from 'axios'
  357 + import wangEditor from "@/components/editor/index";
  358 + import {
  359 + MarkGetAll,
  360 + MarkAdd,
  361 + MarkEdit,
  362 + MarkDel,
  363 + QRcode,
  364 + Registration
150 365 } from '../../../api/MarkActivity.js'
151   - import merchantInformation from '../../../components/merchantInformation/index.vue'
152   - import wangEditor from "@/components/editor/index"
  366 + import upimg from "@/components/ImageUpload/index"
  367 + import {
  368 + changAlls
  369 + } from '../../../api/information.js'
  370 +
153 371 export default {
  372 + components: {
  373 + upimg,
  374 + wangEditor
  375 + },
154 376 data() {
155 377 return {
156   - zhong: {
157   -
158   - },
159   - yujingSet: false,
160   - detailsinfo: {},
161   - pagequery: {
162   - pageNumber: 0,
163   - pageSize: 10,
164   - checkState:'2',
165   - name: '',
166   -
  378 + hetongBox: false,
  379 + detbox: false, //详情
  380 + leixing: true, //切换
  381 + currentPage: 1,
  382 + total: 10,
  383 + flag: false,
  384 + pageSize: 10,
  385 + ggXin: false,
  386 + formInline: {
  387 + title:'',
  388 + content:'',
  389 + venue:'',
  390 + contactPerson:'',
  391 + contactPhone:'',
  392 + coverImage:'',
  393 + registeredCount:'',
167 394 },
  395 + plan_Time:[],
  396 + followUpTime:[],
168 397 tableData: [],
169   - total: 0,
170   - onaction: '1',
171   - info: {}
  398 + secondData: {},
  399 + formSel: {
  400 + title:'',
  401 + venue:'',
  402 + contactPerson:'',
  403 + contactPhone:'',
  404 + },
  405 + pageindex: {
  406 + pageNumber: 1,
  407 + pageSize: 10,
  408 + },
  409 + bianjiBox: 1,
  410 + chengeTatle: 1,
  411 + zhong: {},
  412 + edit: true, //编辑切换
  413 + xiangTabs:'first',
  414 + addkehu:false,
  415 + addziyuan:false,
  416 + ziyuanData:[],//资源
  417 + addziyuanData:[],
  418 + multipleSelection:[],
  419 + xiangData:{},
  420 + showQF:false,
  421 + qfUrl:'',
  422 + baoming:false,
  423 + mingList:[]
172 424 }
173 425 },
174   - components: {
175   - add,
176   - merchantInformation,
177   - wangEditor
178   - },
179 426 created() {
180 427 this.getAll()
  428 + },
  429 + computed: {
181 430  
182 431 },
183 432 methods: {
184   - calculateDaysUntilExpiration(endDateString) {
185   - const endDate = new Date(endDateString);
186   - const today = new Date();
187   - const timeDifference = endDate - today;
188   - const daysDifference = Math.ceil(timeDifference / (1000 * 60 * 60 * 24));
189   - return daysDifference >= 0 ? daysDifference : '已过期';
190   - },
191   - yuclose() {
192   - this.yujingSet = false
193   - },
194   - yuChenk() {
195   - console.error(this.detailsinfo)
196   - cerePlatformMerchantedit(this.detailsinfo).then(res => {
197   - console.error(res)
198   - if (res.code == 200) {
199   - this.$message({
200   - message: '处理成功',
201   - type: 'success'
202   - })
203   - this.yujingSet = false
204   - } else {
205   - this.$message({
206   - message: '处理失败',
207   - type: 'error'
208   - })
  433 + // 获取时间
  434 + currentTime() {
  435 + let date = new Date();
  436 + let year = date.getFullYear(); //月份从0~11，所以加一
  437 + let month = date.getMonth();
  438 + let dateArr = [date.getMonth() + 1, date.getDate(), date.getHours()]
  439 + for (let i = 0; i < dateArr.length; i++) {
  440 + if (dateArr[i] >= 1 && dateArr[i] <= 9) {
  441 + dateArr[i] = '0' + dateArr[i]
209 442 }
210   - })
211   -
212   - },
213   - openyujingSet(row) {
214   - // cereReminderSet({
215   - // reminderType: '1'
216   - // }).then(res => {
217   - // console.error(res)
218   - // this.zhong = res.data
219   - // })
220   - this.detailsinfo = JSON.parse(JSON.stringify(row))
221   - this.yujingSet = true
  443 + }
  444 + let strDate = year + '-' + dateArr[0] + '-' + dateArr[1]
  445 + return strDate
222 446 },
223   - details(row) {
224   - this.detailsinfo = row
225   - this.onaction = '3'
  447 + chenge(val) {
  448 + this.formSel = {
  449 + title:'',
  450 + venue:'',
  451 + contactPerson:'',
  452 + contactPhone:'',}
  453 + this.leixing = !this.leixing
  454 + this.chengeTatle = val
226 455 },
227   - biangeng(row) {
228   - alert(`合同变更 - 店铺ID: ${row.id}`);
  456 + async getAll() {
  457 + const res = await MarkGetAll(this.pageindex)
  458 + this.tableData = res.data.content
  459 + this.total = res.data.content.length
  460 + const ziyuan = await changAlls(this.pageindex)
  461 + this.ziyuanData = [...ziyuan.data.content]
  462 +
229 463 },
230   - xuyue(row) {
231   - alert(`合同续约 - 店铺ID: ${row.id}`);
  464 +
  465 + // 新增确定按钮
  466 + async addCheck(val) {
  467 + if(this.addziyuanData.length !=0){
  468 + this.formInline.venue = this.addziyuanData.map(item => item.id).join(',');
  469 + }
  470 + if(this.plan_Time.length !=0){
  471 + this.formInline.startTime = this.plan_Time[0]
  472 + this.formInline.endTime = this.plan_Time[1]
  473 + }
  474 + this.formInline.reviewStatus = '2'
  475 + this.formInline.createdAt = this.currentTime()
  476 + await MarkAdd(this.formInline)
  477 + this.ggXin = false
  478 + this.formInline = {
  479 + title:'',
  480 + content:'',
  481 + venue:'',
  482 + contactPerson:'',
  483 + contactPhone:'',
  484 + coverImage:'',
  485 + registeredCount:'',
  486 +
  487 + }
  488 +
  489 + this.plan_Time =[]
  490 + this.addziyuanData =[]
  491 + this.getAll()
232 492 },
233   - zhongzhi(row) {
234   - alert(`合同终止 - 店铺ID: ${row.id}`);
  493 + // 获取时间
  494 + currentTime() {
  495 + let date = new Date();
  496 + let year = date.getFullYear();
  497 + let month = date.getMonth() + 1; // 月份从0~11，所以加一
  498 + let day = date.getDate();
  499 + let hours = date.getHours();
  500 + let minutes = date.getMinutes();
  501 + let seconds = date.getSeconds();
  502 +
  503 + // 为月、日、小时、分钟和秒添加前导零（如果需要）
  504 + month = month < 10 ? '0' + month : month;
  505 + day = day < 10 ? '0' + day : day;
  506 + hours = hours < 10 ? '0' + hours : hours;
  507 + minutes = minutes < 10 ? '0' + minutes : minutes;
  508 + seconds = seconds < 10 ? '0' + seconds : seconds;
  509 +
  510 + // 返回格式化的日期和时间字符串
  511 + return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
235 512 },
236   - async getAll() {
237   - const res = await MarkGetAll(this.pagequery)
238   - this.tableData = res.data.content
239   - this.total = res.data.totalElements
  513 +
  514 + //详情
  515 + details(item) {
  516 + this.plan_Time[0] = item.startTime
  517 + this.plan_Time[1] = item.endTime
  518 + this.edit = true
  519 + this.xiangData = item
  520 + this.detbox = true
  521 + let ids= []
  522 + ids = item.venue.split(',')
  523 + ids.map(res=>{
  524 + changAlls({id:res,pageNumber: 1,pageSize: 10,}).then(item=>{
  525 + console.log(item)
  526 + item.data.content.map(ids=>{
  527 + this.addziyuanData.push(ids)
  528 + })
  529 +
  530 + })
  531 + })
  532 +
  533 +
  534 +
  535 +
240 536 },
241   - removeonaction(e) {
242   - console.error(e)
243   - this.onaction = e
244   - this.onSubmit()
  537 + zhongzhi(item){
  538 + this.edit = false
  539 + this.xiangData = item
  540 + this.detbox = true
  541 + this.plan_Time[0] = item.startTime
  542 + this.plan_Time[1] = item.endTime
245 543 },
246   - handleCurrentChange(val) {
247   - this.pagequery.pageNumber = val - 1
  544 + async addbuss() {
  545 + if(this.plan_Time.length !=0){
  546 + this.xiangData.startTime = this.plan_Time[0]
  547 + this.xiangData.endTime = this.plan_Time[1]
  548 + }
  549 +
  550 + await MarkEdit(this.xiangData)
  551 + this.plan_Time = []
  552 + this.detbox = false
248 553 this.getAll()
249 554 },
250 555 handleSizeChange(val) {
251   - this.pagequery.pageSize = val
  556 + this.pageSize = val
  557 + },
  558 + handleCurrentChange(val) {
  559 + this.currentPage = val
  560 + },
  561 +
  562 + closeFn(val) {
  563 + this.plan_Time =[]
  564 + this.addziyuanData =[]
  565 + this.formInline = {
  566 + title:'',
  567 + content:'',
  568 + venue:'',
  569 + contactPerson:'',
  570 + contactPhone:'',
  571 + coverImage:'',
  572 + registeredCount:'',
  573 +
  574 + }
  575 + this.bianjiBox = 1
  576 + if (val == 1) {
  577 + this.ggXin = false
  578 + } else {
  579 + this.detbox = false
  580 + }
  581 + },
  582 + //查看合同
  583 + lookHetong(val) {
  584 + this.hetongBox = true
252 585 },
253 586 // 查询按钮
254 587 async onSubmit() {
255   - this.pagequery.pageNumber = 0
256   - this.getAll()
  588 + this.formSel.pageNumber = 1
  589 + this.formSel.pageSize = 10
  590 + const res = await MarkGetAll(this.formSel)
  591 + this.tableData = res.data.content
  592 + this.total = res.data.content.length
  593 + this.formSel = {
  594 + title:'',
  595 + venue:'',
  596 + contactPerson:'',
  597 + contactPhone:'',
  598 + }
257 599 },
258 600 //重置按钮
259 601 resetting() {
260   - this.pagequery = {
261   - pageNumber: 0,
262   - pageSize: 10,
263   - checkState:'2',
264   - name: ''
265   - },
  602 + this.formSel = {
  603 + title:'',
  604 + venue:'',
  605 + contactPerson:'',
  606 + contactPhone:'',}
266 607 this.getAll()
267 608 },
268   - }
269 609  
  610 + minSev() {
  611 + this.addziyuanData = this.multipleSelection
  612 + this.addziyuan = false
  613 + this.multipleSelection =[]
  614 + },
  615 + mingClose(){
  616 + this.multipleSelection =[]
  617 + this.addziyuan = false
  618 + },
  619 + handleSelectionChange(val) {
  620 +
  621 + this.multipleSelection.push(val)
  622 + },
  623 + deltab(item){
  624 + const h = this.$createElement;
  625 + this.$msgbox({
  626 + title: '消息',
  627 + message: h('p', null, [
  628 + h('span', null, '是否删除 '),
  629 + ]),
  630 + showCancelButton: true,
  631 + showClose:false,
  632 + confirmButtonText: '确定',
  633 + cancelButtonText: '取消',
  634 + customClass:'oe-dialog-btn',
  635 + beforeClose: (action, instance, done) => {
  636 + if (action === 'confirm') {
  637 + MarkDel({id:item.id}).then(res=>{
  638 + this.getAll()
  639 + done();
  640 + })
  641 + } else {
  642 + done();
  643 + }
  644 + }
  645 + })
  646 + },
  647 + fabu(item,val){
  648 + const h = this.$createElement;
  649 + this.$msgbox({
  650 + title: '消息',
  651 + message: h('p', null, [
  652 + h('span', null, '是否处理'),
  653 + ]),
  654 + showCancelButton: true,
  655 + showClose:false,
  656 + confirmButtonText: '确定',
  657 + cancelButtonText: '取消',
  658 + customClass:'oe-dialog-btn',
  659 + beforeClose: (action, instance, done) => {
  660 + if (action === 'confirm') {
  661 + MarkEdit({id:item.id,reviewStatus:val}).then(res=>{
  662 + this.getAll()
  663 + done();
  664 + })
  665 + } else {
  666 + done();
  667 + }
  668 + }
  669 + })
  670 +
  671 + },
  672 + Qcode(items){
  673 + this.showQF = true
  674 + let pgs={
  675 + scene:`item='${items.id}'`,
  676 + // scene:items,
  677 + page:"pages/marketing/marketingDetail/marketingDetail"
  678 + }
  679 + QRcode(pgs).then(res=>{
  680 + this.qfUrl = res.data
  681 + })
  682 + },
  683 + async getMing(ids){
  684 + let page={
  685 + activityId:ids
  686 + }
  687 + const res = await Registration(page)
  688 + this.mingList = res.data
  689 + this.baoming = true
  690 +
  691 + }
  692 +
  693 + }
270 694 }
271 695 </script>
272 696  
273 697 <style scoped>
274 698 .zhuti {
275   - padding: 0 20px 20px 20px;
  699 + padding: 0 20px 20px 20px;
276 700 min-height: calc(100vh - 50px - 20px);
277 701 background-color: #Fff;
278 702  
279 703 }
280   - .chengeXia{
281   - border-bottom: 6px solid #3F9B6A;padding-bottom: 4px;color: #3F9B6A;
  704 +
  705 + .chengeXia {
  706 + border-bottom: 6px solid #3F9B6A;
  707 + padding-bottom: 4px;
  708 + color: #3F9B6A;
282 709 }
283 710  
284 711 /deep/ .el-form-item__content {
285   - /* line-height: 0; */
  712 + line-height: 0;
286 713 }
287 714  
288   -
  715 + .tableBtn {
  716 + display: inline-block;
  717 + margin-right: 10px;
  718 + color: #ACACAC;
  719 + }
289 720  
290 721 .formSearch {
291 722 display: flex;
292 723 width: 100%;
293 724 font-size: 14px;
294 725 justify-content: space-between;
295   - padding-bottom: 10px;
296   -
297 726 }
298 727  
299 728 .greens {
... ... @@ -302,8 +731,8 @@
302 731  
303 732 /deep/ .el-table__row {
304 733 font-size: 14px;
305   - color:#000000e6;
306   - height:42px;
  734 + color: #000000e6;
  735 + height: 42px;
307 736 }
308 737  
309 738 .fenye {
... ... @@ -354,21 +783,25 @@
354 783 background: #fff;
355 784 height: 50px;
356 785 }
357   - /deep/ .bg-purple[data-v-3bebae82]{
  786 +
  787 + /deep/ .bg-purple[data-v-3bebae82] {
358 788 background: #fff;
359 789 height: 50px;
360 790 }
361 791  
362   -::v-deep .bg-purple{
  792 + ::v-deep .bg-purple {
363 793 background: #fff;
364 794 height: 50px;
365 795 }
  796 +
366 797 /deep/ .el-form--label-top .el-form-item__label {
367 798 padding: 0;
368 799 }
369   -::v-deep .el-form-item{
370   - margin-bottom:16px;
371   -}
  800 +
  801 + ::v-deep .el-form-item {
  802 + margin-bottom: 16px;
  803 + }
  804 +
372 805 .device-form .el-form-item__label::after {
373 806 content: "*";
374 807 color: #1A1A1A;
... ... @@ -382,133 +815,162 @@
382 815 background-color: #FAFAFA;
383 816 }
384 817 }
385   - ::v-deep .el-input__inner:focus {
386   - border: #3F9B6A 1px solid;
387   - }
  818 +
  819 + ::v-deep .el-input__inner:focus {
  820 + border: #3F9B6A 1px solid;
  821 + }
  822 +
388 823 .dialog-footer {
389 824 display: flex;
390 825 justify-content: flex-end;
391 826 border-top: solid rgba(209, 209, 209, 0.2) 2px;
392 827 padding-top: 20px;
393 828 }
394   - ::v-deep .el-input__inner:focus {
395   - border: #3F9B6A 1px solid;
396   - }
397   - ::v-deep .el-input__inner:hover {
398   - border: #3F9B6A 1px solid;
399   - }
400   - ::v-deep .el-select .el-input.is-focus .el-input__inner{
401   - border-color:#3F9B6A
402   - }
403   -::v-deep .btn .el-button:focus,
404   -.el-button:hover {
405   - border: 1px solid #3F9B6A;
406   -}
407   -.el-select-dropdown__item.selected{
  829 +
  830 + ::v-deep .el-input__inner:focus {
  831 + border: #3F9B6A 1px solid;
  832 + }
  833 +
  834 + ::v-deep .el-input__inner:hover {
  835 + border: #3F9B6A 1px solid;
  836 + }
  837 +
  838 + ::v-deep .el-select .el-input.is-focus .el-input__inner {
  839 + border-color: #3F9B6A
  840 + }
  841 +
  842 + .el-select-dropdown__item.selected {
408 843 color: #3F9B6A;
409   -}
  844 + }
410 845  
411   -.el-pagination__sizes .el-input .el-input__inner:hover{
  846 + .el-pagination__sizes .el-input .el-input__inner:hover {
412 847 border-color: #3F9B6A;
413   -}
414   -::v-deep .el-dialog__wrapper{
  848 + }
415 849  
416   - .dialog_css{
  850 + ::v-deep .el-dialog__wrapper {
  851 +
  852 + .dialog_css {
417 853 margin-right: 12px;
418   - margin-top:61px !important;
  854 + margin-top: 61px !important;
  855 +
419 856 .el-dialog__title {
420 857 font-size: 16px !important;
421 858 font-weight: 600;
422 859 color: #000;
423 860 }
  861 + }
  862 +
  863 + .diaslog_zhong {
  864 + margin-left: 25%;
  865 + margin-top: 61px !important;
  866 + }
  867 +
  868 + }
  869 +
  870 + ::v-deep .diaslog_zhong {
  871 + margin-left: 20%;
  872 + margin-top: 61px !important;
  873 +
  874 + .el-dialog__header {
  875 + background-color: #fff;
  876 + border-bottom: 1px solid #EFEFEF;
  877 +
  878 + .el-dialog__title {
  879 + font-size: 14px;
  880 + color: #000000e6;
  881 + }
  882 + }
  883 +
  884 + .el-dialog__body {
  885 + padding: 10px 30px 30px 20px
  886 + }
424 887 }
425   - .diaslog_zhong{
426   - margin-left: 20%;
427   - margin-top:61px !important;
428   - }
429   -
430   -}
431   - ::v-deep .diaslog_zhong{
432   - margin-left: 20%;
433   - margin-top:61px !important;
434   - .el-dialog__header{
435   - background-color:#fff;
436   - border-bottom:1px solid #EFEFEF;
437   - .el-dialog__title{
438   - font-size: 14px;
439   - color: #000000e6;
440   - }
441   - }
442   - .el-dialog__body{
443   - padding:10px 20px 30px 20px
444   - }
  888 +
  889 + /deep/ .el-table_1_column_8 .hetong {
  890 + color: #7DBB9A;
  891 + text-decoration: underline;
445 892 }
446 893  
447   - /deep/ .el-table_1_column_8 .hetong{
448   - color:#7DBB9A;
449   - text-decoration: underline;
450   -}
451   -/deep/ .first-column-bg {
  894 + /deep/ .first-column-bg {
452 895 background-color: #FAFAFA !important;
453 896 }
454 897  
455   -.el-table tr{
456   - height:56px;
457   -}
  898 + ::v-deep .textarea {
  899 + width: 85%;
458 900  
459   -::v-deep .table3{
460   - .el-table__empty-block{
461   - display:none;
  901 + .el-textarea__inner {
  902 + width: 100%;
  903 + }
462 904 }
463   -}
464   -::v-deep .textarea{
465   - width: 85%;
466   - .el-textarea__inner{
  905 +
  906 + ::v-deep .pass_input {
467 907 width: 100%;
  908 +
  909 + .el-input__inner {
  910 + border: none;
  911 + padding: 0;
  912 + }
468 913 }
469   -}
470   -::v-deep .el-button--mini{
471   - padding: 7px 10px;
472   -}
473   -::v-deep .pass_input{
  914 +
  915 + ::v-deep .pass_select {
474 916 width: 100%;
  917 +
475 918 .el-input__inner {
476 919 border: none;
477   - padding:0;
478   - }
479   - }
480   -::v-deep .pass_select{
481   - width: 100%;
482   - .el-input__inner {
483   - border: none;
484   - padding:0;
  920 + padding: 0;
485 921 }
486   - .el-icon-arrow-up:before{
487   - content:''
488   - }
489 922  
490   -}
491   - /deep/ .el-table--enable-row-hover .el-table__body tr:hover>td.el-table__cell{
492   - background-color: #fff;
493   -}
  923 + .el-icon-arrow-up:before {
  924 + content: ''
  925 + }
494 926  
  927 + }
495 928  
  929 + /deep/ .el-table--enable-row-hover .el-table__body tr:hover>td.el-table__cell {
  930 + background-color: #fff;
  931 + }
496 932 </style>
497 933 <style lang="scss" scoped>
498   - ::v-deep .bian_css{
499   - .el-dialog__header{
500   - padding:0px;
  934 + ::v-deep .bian_css {
  935 + .el-dialog__header {
  936 + padding: 0px;
  937 + }
  938 +
  939 + .el-input__inner {
  940 + height: 18px;
  941 + border: 0px;
  942 + margin-top: 0px;
  943 + }
  944 +
  945 + .el-input__inner:hover {
  946 + border: 0px;
  947 + }
  948 +
  949 + .el-input__inner:focus {
  950 + border: 0px;
501 951 }
502 952 }
503   - ::v-deep .buttonHover:hover{
504   - color:#3f9b6a !important;
  953 +
  954 + ::v-deep .buttonHover:hover {
  955 + color: #3f9b6a !important;
505 956 border-color: #c5e1d2 !important;
506 957 background-color: #ecf5f0 !important;
507 958 outline: none;
508 959 }
509   - ::v-deep .el-pagination__total{
510   - position: absolute;
511   - left: 33px;
  960 +
  961 + ::v-deep .el-pagination__total {
  962 + position: absolute;
  963 + left: 33px;
512 964 }
513   -</style>
514 965  
  966 + ::v-deep .diaslog_zhong {
  967 + .el-dialog__body {
  968 + padding: 10px 20px 20px 20px;
  969 + }
  970 +
  971 + .el-upload--picture-card {
  972 + width: 130px;
  973 + height: 130px;
  974 + }
  975 + }
  976 +</style>
... ...
admin-web-master/src/views/serve/Merchant/index.vue
  View file @a54f027
... ... @@ -12,9 +12,7 @@
12 12 <el-form-item label="商务合作标题">
13 13 <el-input v-model="formSel.title" placeholder="请输入" style="width:168px;" />
14 14 </el-form-item>
15   - <el-form-item label="场地名称">
16   - <el-input v-model="formSel.venue" placeholder="请输入" style="width:168px;" />
17   - </el-form-item>
  15 +
18 16 <el-form-item label="联系人">
19 17 <el-input v-model="formSel.contactPerson" placeholder="请输入" style="width:168px;" />
20 18 </el-form-item>
... ... @@ -30,7 +28,7 @@
30 28 </el-select>
31 29 </el-form-item>
32 30 </el-form>
33   - <div>
  31 + <div style="width:20%">
34 32 <el-button @click="onSubmit" style="background-color: #3F9B6A;color: #fff">查询
35 33 </el-button>
36 34 <el-button @click="resetting" class="buttonHover"
... ... @@ -69,17 +67,14 @@
69 67 </el-table-column>
70 68 <el-table-column label="邮箱" prop="email" min-width="150">
71 69 </el-table-column>
72   - <el-table-column prop="caretTime" label="创建时间" min-width="250">
73 70  
74   - </el-table-column>
75   - <el-table-column label="创建人" prop="caretUser" min-width="150">
76   - </el-table-column>
  71 +
77 72 <el-table-column prop="status" label="发布状态" min-width="150">
78 73 <template slot-scope="scope">
79 74 {{scope.row.status=='2'?'未发布':'已发布'}}
80 75 </template>
81 76 </el-table-column>
82   - <el-table-column label="操作" min-width="300">
  77 + <el-table-column label="操作" min-width="300" fixed="right">
83 78 <template slot-scope="scope">
84 79 <div @click="details(scope.row)" class="tableBtn greens">查看</div>
85 80 <div @click="fabu(scope.row,'1')" class="tableBtn greens" v-if="scope.row.status=='2'">发布</div>
... ... @@ -129,10 +124,6 @@
129 124 {{scope.$index + 1}}
130 125 </template>
131 126 </el-table-column>
132   - <el-table-column label="资源编号" prop="id" width="150">
133   -
134   - </el-table-column>
135   - </el-table-column>
136 127 <el-table-column label="场地名称" prop="venueName"
137 128 width="150">
138 129  
... ... @@ -195,7 +186,7 @@
195 186 </el-dialog>
196 187  
197 188 <!-- 新增 -->
198   - <el-dialog title="新增" :visible.sync="ggXin" custom-class="diaslog_zhong" style="padding: 0;" width="50%"
  189 + <el-dialog title="新增" :visible.sync="ggXin" custom-class="diaslog_zhong" style="padding: 0;" width="70%"
199 190 class="dialog_css_Xq" center :close-on-click-modal="false" :show-close="false">
200 191 <div style="margin-bottom: 20px;">
201 192 <el-form ref="form" :model="formInline" label-width="120px">
... ... @@ -241,7 +232,7 @@
241 232 </el-table-column>
242 233 <el-table-column label="操作" min-width="150">
243 234 <template slot-scope="scope">
244   - <div class="tableBtn greens" @click="addziyuanData = []" >删除</div>
  235 + <div class="tableBtn greens" @click="handleDelete(scope.$index)" >删除</div>
245 236 </template>
246 237 </el-table-column>
247 238 </el-table>
... ... @@ -593,6 +584,9 @@
593 584 }
594 585 })
595 586  
  587 + },
  588 + handleDelete(index){
  589 + this.addziyuanData.splice(index, 1)
596 590 }
597 591 }
598 592 }
... ...
admin-web-master/src/views/serve/PerWorkstation/index.vue
  View file @a54f027
... ... @@ -42,17 +42,20 @@
42 42 </el-table-column>
43 43 <el-table-column label="标题" prop="title" width="auto" min-width="12%" />
44 44 <el-table-column label="接收商家" prop="receiverMerchant" width="auto" min-width="12%" />
45   - <el-table-column label="发布类型" prop="postType" width="auto" min-width="12%" />
46   - <el-table-column label="发布时间" prop="publishTime" width="auto" min-width="12%" />
  45 + <!-- <el-table-column label="发布类型" prop="postType" width="auto" min-width="12%" />
  46 + <el-table-column label="发布时间" prop="publishTime" width="auto" min-width="12%" /> -->
47 47 <el-table-column label="发布状态" prop="status" width="auto" min-width="12%" />
48   - <el-table-column label="创建人" prop="creator" width="auto" min-width="12%" />
  48 +
49 49 <el-table-column label="创建时间" prop="createdAt" width="auto" min-width="12%" />
50 50  
51   - <el-table-column label="操作" width="auto" min-width="17%">
  51 + <el-table-column label="操作" width="auto" min-width="25%">
52 52 <template slot-scope="scope">
53   - <div class="tableBtn greens" @click="handleEditForm(scope.row)">
54   - 查看
  53 + <!-- <div class="tableBtn greens" @click="handleEditForm(scope.row,1)">
  54 + 消息提醒查看
55 55 </div>
  56 + <div class="tableBtn greens" @click="handleEditForm(scope.row,2)" >
  57 + 推送提醒查看
  58 + </div> -->
56 59 <!-- <div class="tableBtn greens">
57 60 再次发布
58 61 </div> -->
... ... @@ -74,7 +77,7 @@
74 77 padding: 0 20px;
75 78 line-height: 42px;
76 79 ">
77   - 详情
  80 + 查看
78 81 </div>
79 82 <div style="padding: 0 20px">
80 83 <div style="
... ... @@ -86,12 +89,12 @@
86 89 <el-form-item label="标题">
87 90 <el-input v-model="secondData.title" disabled style="width: 90%;" />
88 91 </el-form-item>
89   - <el-form-item label="接收商家">
  92 + <el-form-item label="接收商家" v-if="xian ==1">
90 93 <el-select v-model="secondData.receiverMerchant" style="width: 90%;" disabled>
91 94 <el-option label="电商商家" value="电商商家" />
92 95 </el-select>
93 96 </el-form-item>
94   - <el-form-item label="发布类型">
  97 + <el-form-item label="发布类型" v-if="xian ==1">
95 98 <el-radio-group v-model="secondData.postType" @input="radioClick" disabled>
96 99 <el-radio label="立即发布">立即发布</el-radio>
97 100 <!-- <el-radio label="定时发布">定时发布</el-radio> -->
... ... @@ -244,6 +247,7 @@
244 247 pageSize: 10,
245 248 },
246 249 fabutype:'1',
  250 + xian:1,
247 251 }
248 252 },
249 253  
... ... @@ -264,7 +268,7 @@
264 268 const minutes = now.getMinutes().toString().padStart(2, '0');
265 269 const seconds = now.getSeconds().toString().padStart(2, '0');
266 270  
267   - return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
  271 + return `${year}-${month}-${day} ${hours}:${minutes}`;
268 272 },
269 273 handleSelectionChange(val) {
270 274 this.multipleSelection = val;
... ... @@ -304,10 +308,11 @@
304 308 },
305 309  
306 310 // 详情点击
307   - handleEditForm(item) {
  311 + handleEditForm(item,val) {
308 312 this.secondData = item
309 313 this.detbox = true
310 314 this.msgid = item.id
  315 + this.xian = val
311 316 },
312 317 // 详情编辑确定
313 318 async msgeditS() {
... ... @@ -331,9 +336,9 @@
331 336 async addCheck() {
332 337 this.ruleForm.publishTime = this.updateCurrentTime()
333 338 this.ruleForm.createdAt = this.updateCurrentTime()
334   - if(this.ruleForm.postType == '立即发布'){
335   - this.ruleForm.publishTime = ''
336   - }
  339 + // if(this.ruleForm.postType == '立即发布'){
  340 + // this.ruleForm.publishTime = ''
  341 + // }
337 342 const res = await ManaAdd(this.ruleForm)
338 343 this.getAll();
339 344 this.ggXin = false;
... ... @@ -418,7 +423,10 @@
418 423 width: 80%;
419 424 }
420 425  
421   -
  426 + .tableBtn {
  427 + display: inline-block;
  428 + margin-right: 10px;
  429 + }
422 430  
423 431 .formSearch {
424 432 display: flex;
... ...
admin-web-master/src/views/serve/actSp.vue
  View file @a54f027
... ... @@ -58,7 +58,7 @@
58 58 </template>
59 59  
60 60 </el-table-column>
61   - <el-table-column label="操作" min-width="250" >
  61 + <el-table-column label="操作" min-width="250" fixed="right">
62 62 <template slot-scope="scope">
63 63 <div @click="handleEditForm(scope.row,1)" class="tableBtn greens">查看</div>
64 64 <div @click="shenhe(scope.row)" class="tableBtn greens" v-if="scope.row.auditStatus =='2'">审核</div>
... ... @@ -451,7 +451,11 @@
451 451 <div style="padding:20px;">
452 452 <div style="font-size: 14px;padding-bottom: 20px;color: #000;">活动二维码</div>
453 453 <div style="padding:20px;">
454   - <img :src="qfUrl" alt="" style="height:330px;width:80%">
  454 + <!-- <img :src="qfUrl" alt="" style="height:330px;width:80%"> -->
  455 + <el-image
  456 + style="width:200px; height: 200px"
  457 + :src="qfUrl"
  458 + fit="fill"></el-image>
455 459 </div>
456 460 <div style="padding-top:20px;display:flex;justify-content: flex-end;">
457 461 <el-button class="buttonHover" style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;"
... ... @@ -623,7 +627,10 @@ this.total = res.data.content.length
623 627 line-height: 3;
624 628 }
625 629  
626   -
  630 + .tableBtn {
  631 + display: inline-block;
  632 + margin-right: 10px;
  633 + }
627 634  
628 635  
629 636  
... ...
admin-web-master/src/views/serve/kefuServe/index.vue
  View file @a54f027
... ... @@ -7,23 +7,15 @@
7 7 </div>
8 8 <!-- 搜索 -->
9 9 <!-- <div class="formSearch">
10   - <el-form :inline="true" :model="formSel">
11   - <el-form-item label="标题">
12   - <el-input v-model="formSel.title" placeholder="请输入" style="width:168px;" />
13   - </el-form-item>
14   - </el-form>
15 10 <div>
16   - <el-button @click="onSubmit" style="background-color: #3F9B6A;color: #fff">查询
17   - </el-button>
18   - <el-button @click="resetting" class="buttonHover"
19   - style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">重置
  11 + <el-button @click="setPei" style="background-color: #3F9B6A;color: #fff">报修流程配置
20 12 </el-button>
21 13 </div>
22 14 </div> -->
23 15 <div>
24 16 <!-- 搜索 -->
25 17 <div style="margin-bottom:20px;">
26   - 保修记录
  18 + 报修记录
27 19 </div>
28 20  
29 21 <!-- 表格 -->
... ... @@ -39,20 +31,27 @@
39 31 {{scope.$index+1}}
40 32 </template>
41 33 </el-table-column>
42   - <el-table-column label="保修类型" prop="deviceType" width="auto" min-width="12%" />
  34 + <el-table-column label="报修类型" prop="deviceType" width="auto" min-width="12%" />
43 35 <el-table-column label="问题描述" prop="warrantyIssue" width="auto" min-width="12%" />
44 36 <el-table-column label="设备名称" prop="deviceName" width="auto" min-width="12%" />
45 37 <el-table-column label="备注" prop="memo" width="auto" min-width="12%" />
46 38  
47   - <el-table-column label="申请时间" prop="applicationTime" width="auto" min-width="12%" />
48 39  
  40 + <el-table-column label="申请时间" prop="applicationTime" width="auto" min-width="12%" />
  41 + <el-table-column label="报修到期时间" prop="repairEndTime" width="auto" min-width="12%" />
  42 + <el-table-column label="报修人" prop="repairman" width="auto" min-width="12%" />
  43 +<!-- <el-table-column label="状态" prop="repairStatus" width="auto" min-width="12%" >
  44 + <template slot-scope="scope">
  45 + {{scope.row.repairStatus==0?'暂未派单':scope.row.repairStatus==1?'已派单':scope.row.repairStatus==2?'已完成':scope.row.repairStatus==3?'已过期':''}}
  46 + </template>
  47 + </el-table-column> -->
49 48 <el-table-column label="操作" width="auto" min-width="17%">
50 49 <template slot-scope="scope">
51 50 <div class="tableBtn greens" @click="handleEditForm(scope.row)">
52 51 查看
53 52 </div>
54   - <!-- <div class="tableBtn greens">
55   - 再次发布
  53 +<!-- <div class="tableBtn greens" @click="setPei(scope.row)">
  54 + 报修流程配置
56 55 </div> -->
57 56 <div class="tableBtn greens" @click="delGuan(scope.row,1)">
58 57 删除
... ... @@ -86,6 +85,7 @@
86 85 <el-table-column label="问题描述" prop="problemDescription" width="auto" min-width="12%" />
87 86 <el-table-column label="备注" prop="remark" width="auto" min-width="12%" />
88 87 <el-table-column label="申请时间" prop="applicationTime" width="auto" min-width="12%" />
  88 +
89 89 <el-table-column label="操作" width="auto" min-width="17%">
90 90 <template slot-scope="scope">
91 91 <div class="tableBtn greens" @click="handleEditForm(scope.row)">
... ... @@ -158,6 +158,31 @@
158 158  
159 159 </div>
160 160 </div>
  161 + <el-dialog :visible.sync="setPeiShow" custom-class='bian_css' style="padding: 0;" width="45%"
  162 + :close-on-press-escape="false" center :close-on-click-modal="false" class="dialog_css_Xq" :show-close="false">
  163 + <div style="padding:20px;">
  164 + <div style="font-size: 14px;padding-bottom: 20px;color: #000;">报修流程配置</div>
  165 + <el-form label-position="right" ref="jibenFrom" :model="peiForm" label-width="140px"
  166 + style="position: relative">
  167 + <el-form-item label="报修到期时间" class="grid-content bg-purple device-from" prop="repairEndTime">
  168 + <el-date-picker style="width:240px;margin-right:5px" v-model="peiForm.repairEndTime"
  169 + value-format="yyyy-MM-dd HH:mm:ss" type="datetime" prefix-icon="none" >
  170 + </el-date-picker>
  171 + </el-form-item>
  172 + <el-form-item label="报修人" class="grid-content bg-purple device-from" prop="repairman">
  173 + <el-input v-model="peiForm.repairman" placeholder="请输入" style="margin-top:5px;" maxlength="20"/>
  174 + </el-form-item>
  175 + </el-form>
  176 + <div style="padding-top:20px;display:flex;justify-content: flex-end;">
  177 + <el-button style="background-color: #3F9B6A;color: #fff"
  178 + @click="peiCheck">确定</el-button>
  179 + <el-button @click="setPeiShow = false" style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;" class="buttonHover">取消</el-button>
  180 +
  181 + </div>
  182 +
  183 + </div>
  184 +
  185 + </el-dialog>
161 186 </div>
162 187 </template>
163 188  
... ... @@ -172,6 +197,7 @@
172 197 ReportDel,
173 198 ComplaintGetAll,
174 199 ComplaintDel,
  200 + Reportedit
175 201 } from '../../../api/kefuServeBao.js'
176 202  
177 203 export default {
... ... @@ -210,6 +236,15 @@
210 236 pageSize: 10,
211 237 },
212 238 fabutype:'1',
  239 + setPeiShow:false,
  240 + peiForm:{
  241 + repairEndTime:'',
  242 + repairman:'',
  243 + peiId:'',
  244 + id:''
  245 + }
  246 +
  247 +
213 248 }
214 249 },
215 250  
... ... @@ -359,7 +394,26 @@
359 394 },
360 395 radioClick(tiem){
361 396 this.ruleForm.time =''
362   - }
  397 + },
  398 + setPei(item){
  399 + this.peiForm = {
  400 + repairEndTime:'',
  401 + repairman:'',
  402 + id:'',
  403 + }
  404 +
  405 + this.peiForm.id= item.id
  406 + this.setPeiShow = true
  407 + },
  408 + async peiCheck(){
  409 + if (this.peiForm.repairEndTime) {
  410 + this.peiForm.repairEndTime = new Date(this.peiForm.repairEndTime);
  411 + }
  412 + await Reportedit(this.peiForm)
  413 + this.setPeiShow = false
  414 + this.getAll()
  415 +
  416 + },
363 417 }
364 418 };
365 419 </script>
... ... @@ -378,7 +432,10 @@
378 432 width: 80%;
379 433 }
380 434  
381   -
  435 + .tableBtn {
  436 + display: inline-block;
  437 + margin-right: 10px;
  438 + }
382 439  
383 440 .formSearch {
384 441 display: flex;
... ...
admin-web-master/src/views/serve/procedure.vue
  View file @a54f027
... ... @@ -42,19 +42,19 @@
42 42 width="auto"
43 43 min-width="12%"
44 44 />
45   -
46 45 <el-table-column
47   - label="创建时间"
48   - prop="releaseTime"
  46 + label="信息类型"
  47 + prop="informationType"
49 48 width="auto"
50 49 min-width="12%"
51 50 />
52 51 <el-table-column
53   - label="创建人"
54   - prop="publisher"
  52 + label="创建时间"
  53 + prop="releaseTime"
55 54 width="auto"
56 55 min-width="12%"
57 56 />
  57 +
58 58 <el-table-column label="操作" width="auto" min-width="17%">
59 59 <template slot-scope="scope">
60 60 <div class="tableBtn greens" @click="handleEditForm(scope.row)">
... ... @@ -165,6 +165,49 @@
165 165 "
166 166 >
167 167 <span style="font-size: 14px; color: #000"
  168 + >信息类型</span
  169 + >
  170 + </div>
  171 + <div
  172 + v-if="edit"
  173 + style="
  174 + height: 38px;
  175 + line-height: 38px;
  176 + border: 1px solid #ebeef5;
  177 + padding: 0 20px;
  178 + font-size: 14px;
  179 + "
  180 + >
  181 + {{secondData.informationType}}
  182 + </div>
  183 + <el-select v-model="secondData.informationType" placeholder="请选择" v-else>
  184 + <el-option label="通知" value="通知" />
  185 + <el-option label="热点租赁信息" value="热点租赁信息" />
  186 + <el-option label="广告信息" value="广告信息" />
  187 + <el-option label="活动信息" value="活动信息" />
  188 + </el-select>
  189 + </el-form-item>
  190 + </el-form>
  191 + </el-col>
  192 + </el-row>
  193 + <el-row style="height: 38px; margin-bottom: 15px">
  194 + <el-col :span="24">
  195 + <el-form
  196 +
  197 + :inline="true"
  198 + label-width="100px"
  199 + >
  200 + <el-form-item prop="name" style="width: 100%">
  201 + <div
  202 + slot="label"
  203 + style="
  204 + text-align: left;
  205 + height: 38px;
  206 + line-height: 38px;
  207 + padding-left: 10px;
  208 + "
  209 + >
  210 + <span style="font-size: 14px; color: #000"
168 211 >公告内容</span
169 212 >
170 213 </div>
... ... @@ -249,6 +292,14 @@
249 292 size="mini"
250 293 />
251 294 </el-form-item>
  295 + <el-form-item label="信息类型" prop="informationType">
  296 + <el-select v-model="ruleForm.informationType" placeholder="请选择" style="width: 168px;">
  297 + <el-option label="通知" value="通知" />
  298 + <el-option label="热点租赁信息" value="热点租赁信息" />
  299 + <el-option label="广告信息" value="广告信息" />
  300 + <el-option label="活动信息" value="活动信息" />
  301 + </el-select>
  302 + </el-form-item>
252 303 <el-form-item label="公告内容">
253 304 <div style="border: 1px solid #ccc">
254 305 <wang-editor v-model="ruleForm.announcementContent" ref="editor"></wang-editor>
... ... @@ -321,6 +372,7 @@ export default {
321 372 },
322 373 ruleForm: {
323 374 announcementTitle:'',//公告标题
  375 + informationType:'',
324 376 announcementContent:'',//公告内容
325 377 releaseTime:''//时间
326 378 },
... ... @@ -472,7 +524,10 @@ export default {
472 524 width: 80%;
473 525 }
474 526  
475   -
  527 +.tableBtn {
  528 + display: inline-block;
  529 + margin-right: 10px;
  530 +}
476 531  
477 532 .formSearch {
478 533 display: flex;
... ...
admin-web-master/src/views/serve/salesStatistics.vue
  View file @a54f027
... ... @@ -362,7 +362,10 @@ option &amp;&amp; myChart.setOption(option);
362 362 line-height: 0;
363 363 }
364 364  
365   -
  365 +.tableBtn {
  366 + display: inline-block;
  367 + margin-right: 10px;
  368 +}
366 369  
367 370 .formSearch {
368 371 position: relative;
... ...