Commit 98bc35a2bd2e9e40068142af80bbb00ea3a61055

Authored by wesley88
1 parent 72bf72f0

1

admin-web-master/src/components/ImageUpload/index.vue
@@ -253,6 +253,7 @@ @@ -253,6 +253,7 @@
253 async handleSetCover(file, i) { 253 async handleSetCover(file, i) {
254 console.error(file, i) 254 console.error(file, i)
255 this.onforIndex = i 255 this.onforIndex = i
  256 + this.$emit('changfmindex',this.onforIndex)
256 }, 257 },
257 filesCheck(files) { 258 filesCheck(files) {
258 const { 259 const {
admin-web-master/src/components/add/addinformation.vue
@@ -102,7 +102,7 @@ @@ -102,7 +102,7 @@
102 </el-form-item> 102 </el-form-item>
103 <el-form-item label="宣传图" prop="displayMainImage"> 103 <el-form-item label="宣传图" prop="displayMainImage">
104 <upimg filePath="sp" inputtype="displayMainImage" :value="ruleForm.displayMainImage" 104 <upimg filePath="sp" inputtype="displayMainImage" :value="ruleForm.displayMainImage"
105 - @changimg="e=>changimg(e,'displayMainImage')"></upimg> 105 + @changimg="e=>changimg(e,'displayMainImage')" @changfmindex="changfmindex"></upimg>
106 </el-form-item> 106 </el-form-item>
107 <el-form-item label="其他视频" prop="otherImageVideos"> 107 <el-form-item label="其他视频" prop="otherImageVideos">
108 <upfile filePath="sp" inputtype="otherImageVideos" :value="ruleForm.otherImageVideos" @changimg="e=>changimg(e,'otherImageVideos')"></upfile> 108 <upfile filePath="sp" inputtype="otherImageVideos" :value="ruleForm.otherImageVideos" @changimg="e=>changimg(e,'otherImageVideos')"></upfile>
@@ -263,6 +263,9 @@ @@ -263,6 +263,9 @@
263 this.lat = e.lat 263 this.lat = e.lat
264 this.lng = e.lng 264 this.lng = e.lng
265 }, 265 },
  266 + changfmindex(e) {
  267 + console.error(e)
  268 + },
266 changimg(e, type) { 269 changimg(e, type) {
267 this.ruleForm[type] = e 270 this.ruleForm[type] = e
268 console.error(this.ruleForm[type]) 271 console.error(this.ruleForm[type])
admin-web-master/src/components/fujianUpload/fujianList.vue
@@ -15,7 +15,7 @@ @@ -15,7 +15,7 @@
15 <div class="tips" style="margin-left: 10px;">不超过{{ options.limitSize }}MB</div> 15 <div class="tips" style="margin-left: 10px;">不超过{{ options.limitSize }}MB</div>
16 </div> 16 </div>
17 </div> 17 </div>
18 - <div v-for="(file, i) in localValue" :key="'upload-BaseImage' + i" style="display: flex;justify-content: space-between;width: 100%;"> 18 + <div v-if="islist" v-for="(file, i) in localValue" :key="'upload-BaseImage' + i" style="display: flex;justify-content: space-between;width: 100%;">
19 <div>文件{{i+1}}</div> 19 <div>文件{{i+1}}</div>
20 <div title="删除" class="delete-box" 20 <div title="删除" class="delete-box"
21 @click="handleDeleteImg(file, i)"> 21 @click="handleDeleteImg(file, i)">
@@ -39,6 +39,10 @@ @@ -39,6 +39,10 @@
39 }, 39 },
40 name: 'BaseUpload', 40 name: 'BaseUpload',
41 props: { 41 props: {
  42 + islist: {
  43 + type: Boolean,
  44 + default: true,
  45 + },
42 value: { 46 value: {
43 type: String, 47 type: String,
44 default: '', 48 default: '',
@@ -62,6 +66,10 @@ @@ -62,6 +66,10 @@
62 type: Number, 66 type: Number,
63 default: 1, 67 default: 1,
64 }, 68 },
  69 + accept: {
  70 + type: String,
  71 + default: '.mp4',
  72 + },
65 }, 73 },
66 data() { 74 data() {
67 return { 75 return {
@@ -97,6 +105,12 @@ @@ -97,6 +105,12 @@
97 }, 105 },
98 immediate: true, 106 immediate: true,
99 }, 107 },
  108 + accept: {
  109 + handler() {
  110 + this.options.accept= this.accept
  111 + },
  112 + immediate: true,
  113 + },
100 cmpOption: { 114 cmpOption: {
101 handler() { 115 handler() {
102 this.setOptions(); 116 this.setOptions();
admin-web-master/src/components/resourceCommodity/index.vue
@@ -223,7 +223,21 @@ @@ -223,7 +223,21 @@
223 </el-tab-pane> --> 223 </el-tab-pane> -->
224 </el-tabs> 224 </el-tabs>
225 </div> 225 </div>
  226 + <div v-if="editbgid.publishStatus == '3' && issp == '2'" style="border-top: 2px solid #eee;padding-top: 25px;">
  227 + <el-form :model="editbgid" label-width="80px" class="demo-ruleForm">
  228 + <el-form-item label="状态">
  229 + <el-radio v-model="radio" label="1">同意</el-radio>
  230 + <el-radio v-model="radio" label="4">拒绝</el-radio>
  231 + </el-form-item>
  232 + <el-form-item label="审核意见">
  233 + <el-input maxlength="200" show-word-limit rows="4" v-model="editbgid.reviewComments" placeholder="请输入审核意见"
  234 + type="textarea" />
  235 + </el-form-item>
  236 + </el-form>
  237 + </div>
226 <div> 238 <div>
  239 + <el-button v-if="editbgid.publishStatus == '3' && issp == '2'" @click="minSev"
  240 + style="background-color: #3F9B6A;color: #fff;">确定</el-button>
227 <el-button class="buttonHover" 241 <el-button class="buttonHover"
228 style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;margin-top: 20px;" 242 style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;margin-top: 20px;"
229 @click="changetype">返回</el-button> 243 @click="changetype">返回</el-button>
@@ -240,6 +254,9 @@ @@ -240,6 +254,9 @@
240 cereBusinessOperationqueryByPage 254 cereBusinessOperationqueryByPage
241 } from '@/api/newly'; 255 } from '@/api/newly';
242 import newmap from "@/components/newmap/index"; 256 import newmap from "@/components/newmap/index";
  257 + import {
  258 + editList
  259 + } from '@/api/information.js';
243 export default { 260 export default {
244 components: { 261 components: {
245 TitleWithCircle, 262 TitleWithCircle,
@@ -253,9 +270,16 @@ @@ -253,9 +270,16 @@
253 return {}; 270 return {};
254 }, 271 },
255 }, 272 },
  273 + issp: {
  274 + type: String,
  275 + default: function() {
  276 + return '1';
  277 + },
  278 + },
256 }, 279 },
257 data() { 280 data() {
258 return { 281 return {
  282 + radio: '1',
259 totalsxj:0, 283 totalsxj:0,
260 pagequerysxj:{ 284 pagequerysxj:{
261 pageNumber: 0, 285 pageNumber: 0,
@@ -303,6 +327,33 @@ @@ -303,6 +327,33 @@
303 327
304 }, 328 },
305 methods: { 329 methods: {
  330 + minSev() {
  331 + console.error({
  332 + ...this.editbgid,
  333 + 'publishStatus': this.radio,
  334 + reviewComments: this.editbgid.reviewComments
  335 + })
  336 + // return
  337 + editList({
  338 + ...this.editbgid,
  339 + 'publishStatus': this.radio,
  340 + reviewComments: this.editbgid.reviewComments
  341 + }).then(res => {
  342 + console.error(res)
  343 + if (res.code == 200) {
  344 + this.$message({
  345 + message: '处理成功',
  346 + type: 'success'
  347 + })
  348 + this.info.publishStatus = this.radio
  349 + } else {
  350 + this.$message({
  351 + message: '处理失败',
  352 + type: 'error'
  353 + })
  354 + }
  355 + })
  356 + },
306 357
307 handleCurrentChangesxj(val) { 358 handleCurrentChangesxj(val) {
308 this.pagequerysxj.pageNumber = val - 1 359 this.pagequerysxj.pageNumber = val - 1
admin-web-master/src/views/detect/examine/index.vue
@@ -83,11 +83,12 @@ @@ -83,11 +83,12 @@
83 </el-table-column> 83 </el-table-column>
84 <el-table-column label="操作" fixed="right"> 84 <el-table-column label="操作" fixed="right">
85 <template slot-scope="scope"> 85 <template slot-scope="scope">
86 - <div @click="details(scope.row.cereBasicInformationShop)" class="tableBtn greens">查看</div>  
87 - <div v-if="scope.row.cereBasicInformationShop.publishStatus=='3'" class="tableBtn greens" 86 + <div @click="details(scope.row.cereBasicInformationShop,'1')" class="tableBtn greens">查看</div>
  87 + <div @click="details(scope.row.cereBasicInformationShop,'2')" class="tableBtn greens">审核</div>
  88 + <!-- <div v-if="scope.row.cereBasicInformationShop.publishStatus=='3'" class="tableBtn greens"
88 @click="removeinfozz(scope.row.cereBasicInformationShop,'1','通过')">通过</div> 89 @click="removeinfozz(scope.row.cereBasicInformationShop,'1','通过')">通过</div>
89 <div v-if="scope.row.cereBasicInformationShop.publishStatus=='3'" class="tableBtn greens" 90 <div v-if="scope.row.cereBasicInformationShop.publishStatus=='3'" class="tableBtn greens"
90 - @click="removeinfozz(scope.row.cereBasicInformationShop,'4','驳回')">驳回</div> 91 + @click="removeinfozz(scope.row.cereBasicInformationShop,'4','驳回')">驳回</div> -->
91 </template> 92 </template>
92 </el-table-column> 93 </el-table-column>
93 </el-table> 94 </el-table>
@@ -132,10 +133,11 @@ @@ -132,10 +133,11 @@
132 <el-table-column label="操作" fixed="right"> 133 <el-table-column label="操作" fixed="right">
133 <template slot-scope="scope"> 134 <template slot-scope="scope">
134 <div @click="details(scope.row.cereAdvertisingInformation)" class="tableBtn greens">查看</div> 135 <div @click="details(scope.row.cereAdvertisingInformation)" class="tableBtn greens">查看</div>
135 - <div v-if="scope.row.cereAdvertisingInformation.publishStatus=='3'" class="tableBtn greens" 136 + <div @click="details(scope.row.cereAdvertisingInformation)" class="tableBtn greens">审核</div>
  137 + <!-- <div v-if="scope.row.cereAdvertisingInformation.publishStatus=='3'" class="tableBtn greens"
136 @click="removeinfozz(scope.row.cereAdvertisingInformation,'1','通过')">通过</div> 138 @click="removeinfozz(scope.row.cereAdvertisingInformation,'1','通过')">通过</div>
137 <div v-if="scope.row.cereAdvertisingInformation.publishStatus=='3'" class="tableBtn greens" 139 <div v-if="scope.row.cereAdvertisingInformation.publishStatus=='3'" class="tableBtn greens"
138 - @click="removeinfozz(scope.row.cereAdvertisingInformation,'4','驳回')">驳回</div> 140 + @click="removeinfozz(scope.row.cereAdvertisingInformation,'4','驳回')">驳回</div> -->
139 </template> 141 </template>
140 </el-table-column> 142 </el-table-column>
141 </el-table> 143 </el-table>
@@ -238,13 +240,13 @@ @@ -238,13 +240,13 @@
238 </div> 240 </div>
239 </div> 241 </div>
240 <div v-if="ontype == '1'"> 242 <div v-if="ontype == '1'">
241 - <resourceCommodity :editbgid="detailsinfo" @removeonaction="removeonaction"></resourceCommodity> 243 + <resourceCommodity :issp="issp" :editbgid="detailsinfo" @removeonaction="removeonaction"></resourceCommodity>
242 </div> 244 </div>
243 <div v-if="ontype == '2'"> 245 <div v-if="ontype == '2'">
244 - <chakanmap :editbgid="detailsinfo" @removeonaction="removeonaction" :leixing="leixing"></chakanmap> 246 + <chakanmap :issp="issp" :editbgid="detailsinfo" @removeonaction="removeonaction" :leixing="leixing"></chakanmap>
245 </div> 247 </div>
246 <div v-if="ontype == '3'"> 248 <div v-if="ontype == '3'">
247 - <chakancd :editbgid="detailsinfo" @removeonaction="removeonaction"></chakancd> 249 + <chakancd :issp="issp" :editbgid="detailsinfo" @removeonaction="removeonaction"></chakancd>
248 </div> 250 </div>
249 </div> 251 </div>
250 <div class="zhuti" v-if="onaction == '4'"> 252 <div class="zhuti" v-if="onaction == '4'">
@@ -304,6 +306,7 @@ @@ -304,6 +306,7 @@
304 export default { 306 export default {
305 data() { 307 data() {
306 return { 308 return {
  309 + issp:'1',
307 publishStatus:'', 310 publishStatus:'',
308 clName:'', 311 clName:'',
309 name:'', 312 name:'',
@@ -368,13 +371,14 @@ @@ -368,13 +371,14 @@
368 }; 371 };
369 } 372 }
370 } else { 373 } else {
371 - console.error(rowIndex % row.num) 374 +
372 if ((rowIndex+1) % row.num === 0) { 375 if ((rowIndex+1) % row.num === 0) {
373 return { 376 return {
374 rowspan: row.num, 377 rowspan: row.num,
375 colspan: 1 378 colspan: 1
376 }; 379 };
377 } else { 380 } else {
  381 + console.error(rowIndex)
378 return { 382 return {
379 rowspan: 0, 383 rowspan: 0,
380 colspan: 0 384 colspan: 0
@@ -539,7 +543,8 @@ @@ -539,7 +543,8 @@
539 543
540 }) 544 })
541 }, 545 },
542 - details(row) { 546 + details(row,e) {
  547 + this.issp = e
543 this.detailsinfo = row 548 this.detailsinfo = row
544 this.onaction = '3' 549 this.onaction = '3'
545 }, 550 },
admin-web-master/src/views/detect/information/index.vue
@@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
14 <el-input v-model="pagequery.shopName" placeholder="请输入" maxlength="50"></el-input> 14 <el-input v-model="pagequery.shopName" placeholder="请输入" maxlength="50"></el-input>
15 </el-form-item> 15 </el-form-item>
16 <el-form-item label="所属区域" prop="belongingRegion"> 16 <el-form-item label="所属区域" prop="belongingRegion">
17 - <el-select v-model="pagequery.belongingRegion" placeholder="请选择" style="width: 168px;margin-right: 15px"> 17 + <el-select v-model="pagequery.belongingRegion" clearable placeholder="请选择" style="width: 168px;margin-right: 15px">
18 <el-option v-for="(item,index) in regionOptions" 18 <el-option v-for="(item,index) in regionOptions"
19 :key="index" :label="item.label" :value="item.value"></el-option> 19 :key="index" :label="item.label" :value="item.value"></el-option>
20 </el-select> 20 </el-select>
@@ -64,10 +64,15 @@ @@ -64,10 +64,15 @@
64 </el-table-column> 64 </el-table-column>
65 <el-table-column prop="detailedLocation" width="180" label="详细地址" show-overflow-tooltip> 65 <el-table-column prop="detailedLocation" width="180" label="详细地址" show-overflow-tooltip>
66 </el-table-column> 66 </el-table-column>
67 - <el-table-column label="实际使用面积" prop="actualUsableArea" show-overflow-tooltip> 67 + <!-- <el-table-column label="实际使用面积" prop="actualUsableArea" show-overflow-tooltip>
68 <template slot-scope="scope"> 68 <template slot-scope="scope">
69 {{scope.row.actualUsableArea || '无'}} 69 {{scope.row.actualUsableArea || '无'}}
70 </template> 70 </template>
  71 + </el-table-column> -->
  72 + <el-table-column label="归属部门" prop="belongingDepartment" show-overflow-tooltip>
  73 + <template slot-scope="scope">
  74 + {{scope.row.belongingDepartment || '无'}}
  75 + </template>
71 </el-table-column> 76 </el-table-column>
72 <el-table-column label="负责人" prop="head" show-overflow-tooltip> 77 <el-table-column label="负责人" prop="head" show-overflow-tooltip>
73 <template slot-scope="scope"> 78 <template slot-scope="scope">
admin-web-master/src/views/detect/map/index.vue
@@ -311,7 +311,7 @@ @@ -311,7 +311,7 @@
311 }) 311 })
312 cereBusinessOperationadd({ 312 cereBusinessOperationadd({
313 type:tit, 313 type:tit,
314 - resourceId: 'sp'+row.id, 314 + resourceId: 'gg'+row.id,
315 operator: localStorage.getItem('roleName'), 315 operator: localStorage.getItem('roleName'),
316 operationTime: that.gettime() 316 operationTime: that.gettime()
317 }).then(res => { 317 }).then(res => {