Merge branch 'master' of http://39.98.150.180/webapp/GreenwayWeb

杨鑫
2 parents 4dd4b07b 4c59d645
Showing 7 changed files with 94 additions and 15 deletions
admin-web-master/src/components/ImageUpload/index.vue
admin-web-master/src/components/add/addinformation.vue
admin-web-master/src/components/fujianUpload/fujianList.vue
admin-web-master/src/components/resourceCommodity/index.vue
admin-web-master/src/views/detect/examine/index.vue
admin-web-master/src/views/detect/information/index.vue
admin-web-master/src/views/detect/map/index.vue
@@ -253,6 +253,7 @@
       async handleSetCover(file, i) {
         console.error(file, i)
         this.onforIndex = i
+        this.$emit('changfmindex',this.onforIndex)
       },
       filesCheck(files) {
         const {
@@ -102,7 +102,7 @@
       </el-form-item>
       <el-form-item label="宣传图" prop="displayMainImage">
         <upimg filePath="sp" inputtype="displayMainImage" :value="ruleForm.displayMainImage"
-          @changimg="e=>changimg(e,'displayMainImage')"></upimg>
+          @changimg="e=>changimg(e,'displayMainImage')" @changfmindex="changfmindex"></upimg>
       </el-form-item>
       <el-form-item label="其他视频" prop="otherImageVideos">
         <upfile filePath="sp" inputtype="otherImageVideos" :value="ruleForm.otherImageVideos" @changimg="e=>changimg(e,'otherImageVideos')"></upfile>
@@ -263,6 +263,9 @@
         this.lat = e.lat
         this.lng = e.lng
       },
+      changfmindex(e) {
+        console.error(e)
+      },
       changimg(e, type) {
         this.ruleForm[type] = e
         console.error(this.ruleForm[type])
@@ -15,7 +15,7 @@
           <div class="tips" style="margin-left: 10px;">不超过{{ options.limitSize }}MB</div>
         </div>
       </div>
-      <div v-for="(file, i) in localValue" :key="'upload-BaseImage' + i" style="display: flex;justify-content: space-between;width: 100%;">
+      <div v-if="islist" v-for="(file, i) in localValue" :key="'upload-BaseImage' + i" style="display: flex;justify-content: space-between;width: 100%;">
         <div>文件{{i+1}}</div>
         <div title="删除" class="delete-box"
           @click="handleDeleteImg(file, i)">
@@ -39,6 +39,10 @@
     },
     name: 'BaseUpload',
     props: {
+      islist: {
+        type: Boolean,
+        default: true,
+      },
       value: {
         type: String,
         default: '',
@@ -62,6 +66,10 @@
         type: Number,
         default: 1,
       },
+      accept: {
+        type: String,
+        default: '.mp4',
+      },
     },
     data() {
       return {
@@ -97,6 +105,12 @@
         },
         immediate: true,
       },
+      accept: {
+        handler() {
+          this.options.accept= this.accept
+        },
+        immediate: true,
+      },
       cmpOption: {
         handler() {
           this.setOptions();
@@ -223,7 +223,21 @@
           </el-tab-pane> -->
       </el-tabs>
     </div>
+    <div v-if="editbgid.publishStatus == '3' && issp == '2'" style="border-top: 2px solid #eee;padding-top: 25px;">
+      <el-form :model="editbgid" label-width="80px" class="demo-ruleForm">
+        <el-form-item label="状态">
+          <el-radio v-model="radio" label="1">同意</el-radio>
+        <el-radio v-model="radio" label="4">拒绝</el-radio>
+        </el-form-item>
+        <el-form-item label="审核意见">
+          <el-input maxlength="200" show-word-limit rows="4" v-model="editbgid.reviewComments" placeholder="请输入审核意见"
+            type="textarea" />
+        </el-form-item>
+      </el-form>
+    </div>
     <div>
+      <el-button v-if="editbgid.publishStatus == '3' && issp == '2'" @click="minSev"
+      style="background-color: #3F9B6A;color: #fff;">确定</el-button>
       <el-button class="buttonHover"
         style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;margin-top: 20px;"
         @click="changetype">返回</el-button>
@@ -240,6 +254,9 @@
     cereBusinessOperationqueryByPage
   } from '@/api/newly';
   import newmap from "@/components/newmap/index";
+  import {
+    editList
+  } from '@/api/information.js';
   export default {
     components: {
       TitleWithCircle,
@@ -253,9 +270,16 @@
           return {};
         },
       },
+      issp: {
+        type: String,
+        default: function() {
+          return '1';
+        },
+      },
     },
     data() {
       return {
+        radio: '1',
         totalsxj:0,
         pagequerysxj:{
           pageNumber: 0,
@@ -303,6 +327,33 @@
     },
     methods: {
+      minSev() {
+        console.error({
+          ...this.editbgid,
+          'publishStatus': this.radio,
+          reviewComments: this.editbgid.reviewComments
+        })
+        // return
+        editList({
+          ...this.editbgid,
+          'publishStatus': this.radio,
+          reviewComments: this.editbgid.reviewComments
+        }).then(res => {
+          console.error(res)
+          if (res.code == 200) {
+            this.$message({
+              message: '处理成功',
+              type: 'success'
+            })
+            this.info.publishStatus = this.radio
+          } else {
+            this.$message({
+              message: '处理失败',
+              type: 'error'
+            })
+          }
+        })
+      },
       handleCurrentChangesxj(val) {
         this.pagequerysxj.pageNumber = val - 1
@@ -83,11 +83,12 @@
           </el-table-column>
           <el-table-column label="操作" fixed="right">
             <template slot-scope="scope">
-              <div @click="details(scope.row.cereBasicInformationShop)" class="tableBtn greens">查看</div>
-              <div v-if="scope.row.cereBasicInformationShop.publishStatus=='3'" class="tableBtn greens" 
+              <div @click="details(scope.row.cereBasicInformationShop,'1')" class="tableBtn greens">查看</div>
+              <div @click="details(scope.row.cereBasicInformationShop,'2')" class="tableBtn greens">审核</div>
+              <!-- <div v-if="scope.row.cereBasicInformationShop.publishStatus=='3'" class="tableBtn greens" 
                 @click="removeinfozz(scope.row.cereBasicInformationShop,'1','通过')">通过</div>
               <div v-if="scope.row.cereBasicInformationShop.publishStatus=='3'" class="tableBtn greens"
-                @click="removeinfozz(scope.row.cereBasicInformationShop,'4','驳回')">驳回</div>
+                @click="removeinfozz(scope.row.cereBasicInformationShop,'4','驳回')">驳回</div> -->
             </template>
           </el-table-column>
         </el-table>
@@ -132,10 +133,11 @@
           <el-table-column label="操作" fixed="right">
             <template slot-scope="scope">
               <div @click="details(scope.row.cereAdvertisingInformation)" class="tableBtn greens">查看</div>
-              <div v-if="scope.row.cereAdvertisingInformation.publishStatus=='3'" class="tableBtn greens" 
+              <div @click="details(scope.row.cereAdvertisingInformation)" class="tableBtn greens">审核</div>
+              <!-- <div v-if="scope.row.cereAdvertisingInformation.publishStatus=='3'" class="tableBtn greens" 
                 @click="removeinfozz(scope.row.cereAdvertisingInformation,'1','通过')">通过</div>
               <div v-if="scope.row.cereAdvertisingInformation.publishStatus=='3'" class="tableBtn greens"
-                @click="removeinfozz(scope.row.cereAdvertisingInformation,'4','驳回')">驳回</div>
+                @click="removeinfozz(scope.row.cereAdvertisingInformation,'4','驳回')">驳回</div> -->
             </template>
           </el-table-column>
         </el-table>
@@ -238,13 +240,13 @@
         </div>
       </div>
       <div v-if="ontype == '1'">
-        <resourceCommodity :editbgid="detailsinfo" @removeonaction="removeonaction"></resourceCommodity>
+        <resourceCommodity :issp="issp" :editbgid="detailsinfo" @removeonaction="removeonaction"></resourceCommodity>
       </div>
       <div v-if="ontype == '2'">
-        <chakanmap :editbgid="detailsinfo" @removeonaction="removeonaction" :leixing="leixing"></chakanmap>
+        <chakanmap :issp="issp" :editbgid="detailsinfo" @removeonaction="removeonaction" :leixing="leixing"></chakanmap>
       </div>
       <div v-if="ontype == '3'">
-        <chakancd :editbgid="detailsinfo" @removeonaction="removeonaction"></chakancd>
+        <chakancd :issp="issp" :editbgid="detailsinfo" @removeonaction="removeonaction"></chakancd>
       </div>
     </div>
     <div class="zhuti" v-if="onaction == '4'">
@@ -304,6 +306,7 @@
   export default {
     data() {
       return {
+        issp:'1',
         publishStatus:'',
         clName:'',
         name:'',
@@ -368,13 +371,14 @@
               };
             }
           } else {
-            console.error(rowIndex % row.num)
+            
             if ((rowIndex+1) % row.num === 0) {
               return {
                 rowspan: row.num,
                 colspan: 1
               };
             } else {
+              console.error(rowIndex)
               return {
                 rowspan: 0,
                 colspan: 0
@@ -539,7 +543,8 @@
         })
       },
-      details(row) {
+      details(row,e) {
+        this.issp = e
         this.detailsinfo = row
         this.onaction = '3'
       },
@@ -14,7 +14,7 @@
               <el-input v-model="pagequery.shopName" placeholder="请输入" maxlength="50"></el-input>
             </el-form-item>
             <el-form-item label="所属区域" prop="belongingRegion">
-              <el-select v-model="pagequery.belongingRegion" placeholder="请选择" style="width: 168px;margin-right: 15px">
+              <el-select v-model="pagequery.belongingRegion" clearable placeholder="请选择" style="width: 168px;margin-right: 15px">
                 <el-option v-for="(item,index) in regionOptions"
                 :key="index" :label="item.label" :value="item.value"></el-option>
               </el-select>
@@ -64,10 +64,15 @@
           </el-table-column>
           <el-table-column prop="detailedLocation" width="180" label="详细地址" show-overflow-tooltip>
           </el-table-column>
-          <el-table-column label="实际使用面积" prop="actualUsableArea" show-overflow-tooltip>  
+          <!-- <el-table-column label="实际使用面积" prop="actualUsableArea" show-overflow-tooltip>  
             <template slot-scope="scope">
               {{scope.row.actualUsableArea || '无'}}
             </template>
+          </el-table-column> -->
+          <el-table-column label="归属部门" prop="belongingDepartment" show-overflow-tooltip>  
+            <template slot-scope="scope">
+              {{scope.row.belongingDepartment || '无'}}
+            </template>
           </el-table-column>
           <el-table-column label="负责人" prop="head" show-overflow-tooltip>
             <template slot-scope="scope">
@@ -311,7 +311,7 @@
               })
               cereBusinessOperationadd({
                 type:tit,
-                resourceId: 'sp'+row.id,
+                resourceId: 'gg'+row.id,
                 operator: localStorage.getItem('roleName'),
                 operationTime: that.gettime()
               }).then(res => {