'1'

杨鑫
1 parent 3658193b
Showing 3 changed files with 50 additions and 11 deletions
admin-web-master/src/utils/request.js
admin-web-master/src/views/activity/activityBz.vue
admin-web-master/src/views/activity/index.vue
@@ -17,6 +17,7 @@ let baseURL =  &#39;&#39;
 if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529'  ) {
   // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
   baseURL = 'http://192.168.2.225:9003';
+  // baseURL = 'http://192.168.2.36:9003';
 } else {
   console.error('---------------------')
   console.error(hostall)
@@ -119,8 +119,9 @@
                   </el-row>
                   <el-row :gutter="20">
                     <el-col :span="12">
-                      <el-form-item label="活动封面海报" prop="cover_poster" class="grid-content bg-purple">
-                        <upimg v-model="ruleForm.coverPoster" :limit="1" :fileSize="1" :isShowTip="false"></upimg>
+                      <el-form-item label="活动封面海报" prop="coverPoster" class="grid-content bg-purple">
+                        <upimg filePath="act" :value="ruleForm.coverPoster" inputtype="coverPoster" :limit="1" @changimg="e=>changimg(e,'coverPoster')"></upimg>
+                        <!-- <upimg v-model="ruleForm.coverPoster" :limit="1" :fileSize="1" :isShowTip="false"></upimg> -->
                       </el-form-item>
                     </el-col>
                   </el-row>
@@ -280,13 +281,14 @@
             <div style="padding: 10px 13px;font-size: 12px;border-bottom: 1px solid #E5E5E5;display: flex;">
               <div>相关附件</div>
               <div>
-                <el-upload class="upload-demo" ref="upload" :on-preview="handlePreview" :on-remove="handleRemove"
+                <upfile filePath="act" inputtype="otherImageVideos" :value="ruleForm.otherImageVideos" @changimg="e=>changimg(e,'otherImageVideos')"></upfile>
+                <!-- <el-upload class="upload-demo" ref="upload" :on-preview="handlePreview" :on-remove="handleRemove"
                   :action="uploadFileUrl" :on-success="handleUploadSuccess" :file-list="fileData"
                   :show-file-list="false">
                   <div style="color: #2d8a58;margin-left: 10px;" slot="trigger">
                     上传附件
                   </div>
-                </el-upload>
+                </el-upload> -->
               </div>
             </div>
             <div style="padding: 15px;">
@@ -382,6 +384,7 @@
   } from '@/utils/request'
   import html2canvas from 'html2canvas'
   import jsPDF from 'jspdf'
+  import upfile from "@/components/fujianUpload/fujianList"
   export default {
     props: {
       showAdd: {
@@ -398,7 +401,8 @@
     name: 'activityBz',
     components: {
       wangEditor,
-      upimg
+      upimg,
+      upfile
     },
  
     data() {
@@ -509,6 +513,10 @@ lishiList:&#39;&#39;,
         this.lishi()
     },
     methods: {
+      changimg(e,type) {
+        this.ruleForm[type] = e
+        console.log(e)
+      },
       //获取当前时间
       updateCurrentTime() {
         const now = new Date();
@@ -543,6 +551,7 @@ lishiList:&#39;&#39;,
         this.$refs.upload.submit();
       },
       handleUploadSuccess(response, file, fileList) {
+        console.log(response, file, fileList)
         this.dataList.push(file)
       },
       handleRemove(file, fileList) {
@@ -140,7 +140,7 @@
     <div style="width: 100%;">
       <div style="display: flex;padding:0px 20px 20px 20px; ">
         <div style="width: 150px;height: 80px;" v-if="secondData.coverPoster">
-          <img :src="secondData.coverPoster" alt="" style="width: 100%;height: 80px;" />
+          <img :src="$baseURL+secondData.coverPoster" alt="" style="width: 100%;height: 80px;" />
         </div>
         <div
           style="display: flex;flex-direction: column;justify-content: space-around;padding: 0 10px;font-size: 12px;">
@@ -961,9 +961,7 @@
                                        </el-table-column>
                                        <el-table-column label="类型" prop="planType" width="80">
                                        </el-table-column>
-                                       <el-table-column label="发布状态" width="80" >
  
-                                       </el-table-column>
                                        <el-table-column label="审批状态"  width="150">
                                          <template slot-scope="scope">
                                            {{scope.row.state == ''?'待提交':scope.row.state == '1'?'待审批':scope.row.state == '2'?'部门领导审批':scope.row.state == '3'?'公司领导审批':scope.row.state == '4'?'其他审批':scope.row.state == '5'?'审核通过':'已驳回'}}
@@ -971,14 +969,12 @@
                                        </el-table-column>
                                        <el-table-column label="修改时间" prop="createDate"width="250" >
                                        </el-table-column>
-                                       <el-table-column prop="createUser" label="上传人员" width="80">
  
-                                       </el-table-column>
                                        <el-table-column label="操作" width="350">
                                          <template slot-scope="scope">
                                            <div @click="shiyong(scope.row)" class="tableBtn greens">使用</div>
                                            <!-- <div @click="actBian(scope.row)" class="tableBtn greens" v-if="scope.row.state == ''">修改</div> -->
-                                           <div @click="handleDelete(scope.row)" class="tableBtn greens">删除</div>
+                                           <div @click="handleDel(scope.row)" class="tableBtn greens">删除</div>
                                        </template>
                                      </el-table-column>
                                           </el-table>
@@ -1378,6 +1374,39 @@
           })
         }
       },
+      handleDel(val){
+
+
+            const h = this.$createElement;
+            this.$msgbox({
+              title: '消息',
+              message: h('p', null, [
+                h('span', null, '是否删除 '),
+              ]),
+              showCancelButton: true,
+              showClose: false,
+              confirmButtonText: '确定',
+              cancelButtonText: '取消',
+              customClass: 'oe-dialog-btn',
+              beforeClose: (action, instance, done) => {
+                if (action === 'confirm') {
+                  deleteById({
+                   id:val.id
+                  }).then(res => {
+                    this.$message({
+                      message: '删除成功',
+                      type: 'success'
+                    })
+                    this.getAll()
+                    done();
+                  })
+                } else {
+                  done();
+                }
+              }
+            })
+
+      },
       //查询
       async onSubmit() {
         if (this.planName != '' && this.eventTheme == '') {