Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

src/model/defalutConfig/indexRx.js

@@ -9,10 +9,23 @@ const instance = axios.create({
 
 instance.interceptors.request.use(
   (config) => {
-    // console.info(config.url, 'config.url')
-    if (ignoreUrl.indexOf(config.url) === -1) {
-      EventBus.$emit('showLoading')
+    if(config.params){
+      if(config.params.loadingstatus){
+        // EventBus.$emit('hideLoading')
+      }else{
+        if (ignoreUrl.indexOf(config.url) === -1) {
+          EventBus.$emit('showLoading')
+        }
+      }
+    }else{
+      if (ignoreUrl.indexOf(config.url) === -1) {
+        EventBus.$emit('showLoading')
+      }
     }
+    
+    // console.info(config.url, 'config.url')
+    console.log(config, 'config.url')
+    
     return config
   },
   (error) => {

src/views/houseSelfCollect/inspectionManagementNew.vue

@@ -30,8 +30,10 @@
         </el-col>
         <el-col :span="8">
           <div style='text-align:right;'>
+            <el-button @click='refreshClick' type="primary">{{refresh}}</el-button>
             <el-button @click='record' type="primary">记录</el-button>
           </div>
+          
         </el-col>
       </el-row>
     </div>
@@ -435,6 +437,8 @@
 },
     data() {
       return {
+        
+        refresh:60,
         //分页
         currentPage: 1,
         cost:'',
@@ -591,6 +595,34 @@
     mounted (){
     },
     methods: {
+      refreshClick(){
+         getinspectList({
+            compId: localStorage.getItem('ws-pf_compId'),
+            currentPage: this.currentPage,
+            pageSize: this.pageSize,
+            warehouseName: this.warehouseName,
+            managementType: 1,
+            statusType:this.statusType,
+            serviceManagementType:this.serviceManagementType,
+            loadingstatus:1,
+          })
+          .toPromise()
+          .then((response) => {
+            this.inspect = response.records
+            this.deptBudgetTotal = response.total
+            // this.$forceUpdate();
+          })
+             this.timer = setInterval(function(){
+
+            //         axios({
+            //   method: 'post',
+            //   url: 'https://www.zthymaoyi.com/upload/admin',
+            //   data: formdata
+            // }).then((response) => {
+        
+            // })
+         }, 1000);
+      },
       binNumberChange(e){
         for (let i = 0; i < this.positionInfos.length; i++) {
           if(this.positionInfos[i].binNumber==e){