t

src/views/room/components/popup/IndexEdit.vue

@@ -68,7 +68,7 @@
                   type="video/mp4" 
                   />
                 </video>
-              <div class="tip">上传新的视频：先选取视频，然后点击上传服务器，<span class="b">上传成功</span>后再点击保存</div>
+              <div class="tip">上传新的视频：请等待<span class="b">上传成功</span>后再点击顶部的确定保存</div>
               <el-upload
                 class="upload-demo"
                 ref="upload"
@@ -79,11 +79,13 @@
                 :limit="1"
                 :file-list="fileList"
                 @change="fileChange"
-                :auto-upload="false">
-                <el-button slot="trigger" size="small" type="primary">1选取视频</el-button>
-                <el-button v-if="fileNextResObj.total && fileNextResObj.total.percent === 100" style="margin-left: 10px;" size="small" type="success">{{ fileNextResObj.total ? fileNextResObj.total.percent === 100 ? '上传成功' :`上传中${parseInt(fileNextResObj.total.percent)}%` : '上传到服务器'}}</el-button>
-                <el-button v-else style="margin-left: 10px;" size="small" type="primary" @click="submitUpload">{{fileNextResObj.total ? `上传中...(${parseInt(fileNextResObj.total.percent)}%)` : '2上传到服务器'}}</el-button>
+                :http-request="submitUpload"
+                :auto-upload="true">
+                <el-button slot="trigger" size="small" type="primary">选取新视频</el-button>
+                <el-button v-if="fileNextResObj.total && fileNextResObj.total.percent === 100" size="small" type="success" style="margin-left: 10px;">{{ fileNextResObj.total ? fileNextResObj.total.percent === 100 ? '上传成功' :`上传中${parseInt(fileNextResObj.total.percent)}%` : '上传到服务器'}}</el-button>
+                <el-progress v-else-if="fileNextResObj.total" class="tip3" :text-inside="true" :stroke-width="20" :percentage="fileNextResObj.total.percent"></el-progress>
                 <!-- <div slot="tip" class="el-upload__tip">只能上传jpg/png文件，且不超过500kb</div> -->
+                <!-- v-else-if="fileNextResObj.total"  fileNextResObj.total.percent-->
               </el-upload>
             </div>
           </div>
@@ -190,6 +192,10 @@ export default {
   },
   methods: {
     submitUpload() {
+      if (this.fileNextResObj.total) {
+        this.$msgConfrm('正在上传中，如需重新上传，请保存当前页面重新上传')
+        return
+      }
       const upload = this.$refs.upload || {}
       const curFile = upload.uploadFiles[0] || {}
 
@@ -222,6 +228,10 @@ export default {
       // this.$refs.upload.submit();
     },
     handleRemove(file, fileList) {
+      this.fileNextResObj = {}
+      let cObj = this.cObj
+      cObj.video = ''
+      this.cObj = {...cObj}
       console.log(file, fileList);
     },
     handlePreview(file) {
@@ -567,6 +577,16 @@ export default {
         font-size: 20px;
       }
     }
+    .tip2 {
+      display: inline-block;
+      width: 300px;
+      color: #606266;
+    }
+    .tip3 {
+      display: inline-block;
+      margin-left: 10px;
+      width: 300px;
+    }
     .i {
       border: 0;
       border-bottom: 1px solid #dcdcdc;

src/views/room/components/searchForm/Index.vue

@@ -34,10 +34,10 @@ export default {
         { label: '所属楼盘', key: 'estate_id', type: 'selectRemote',
           remoteParams: { skey: 'estate_name', api: `house.admestatelist?estate_tag=二手`, opKey: 'estate_name', opVal: 'id' }
         },
-        // { label: '置业经理', key: 'sale_id', type: 'selectRemote',
-        //   remoteParams: { skey: 'sale_name', api: `user.admsaleuserlist?page_size=999`, opKey: 'sale_name', opVal: 'id' }
-        // },
-        { label: '所属区域', key: 'area_type', type: 'select', options: this.$dictData.area_type},
+        { label: '置业经理', key: 'sale_id', type: 'selectRemote',
+          remoteParams: { skey: 'sale_name', api: `user.admsaleuserlist?page_size=999&show_status=1`, opKey: 'sale_name', opVal: 'id' }
+        },
+        // { label: '所属区域', key: 'area_type', type: 'select', options: this.$dictData.area_type},
         { label: '状态', key: 'hide_status', type: 'select', options: this.$dictData.hide_status},
         // { label: '楼盘类型', key: 'product_type', type: 'select', options: this.$dictData.product_type},
         // { label: '房源户型', key: 'house_type', type: 'select', options: this.$dictData.house_type},