冲突解决

config/dev.env.js

@@ -5,7 +5,7 @@ const prodEnv = require('./prod.env')
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
   ENV_CONFIG:'"dev"',
-  // BASE_URL: '"http://39.98.239.48/web-api"',//测试服务器
+  BASE_URL: '"http://39.98.239.48/web-api"',//测试服务器
   // BASE_URL:'"http://sxzgkj.baoxianzhanggui.com/web-api"'//正式服务器
   // BASE_URL: '"http://192.168.0.115:8080/"' //凯森
   // BASE_URL: '"http:///192.168.0.106:8080/"',//田智

src/views/Letter/Orderlist.vue

@@ -1901,6 +1901,31 @@ export default {
         }
       })
     },
+    //中煤查询缴费状态
+    updateStatus(item){
+      this.$api.letter.orderStatuszhongmei( {companyId:item.id} ).then(res => {
+        if(res.code==200){
+          this.$message({ message:res.msg?res.msg:'已刷新状态', type: "success" })
+          this.loading = true;
+          this.$api.letter.queryOrders(this.pageRequest).then((res) => {
+            if (res.code == "200") {
+                this.loading = false;
+                this.pageResult = res.data.content;
+                this.pageNum = res.data.pageNum;
+                this.totalSize = res.data.totalSize;
+                this.pageResult.forEach(val => {
+                  this.$set(val, "expanded", false);
+                });
+            } else {
+                this.loading = false;
+            }
+          })
+        }
+        else{
+          this.$message({ message:res.msg, type: "error" })
+        }
+      })
+    },
     //查询缴费状态
     querystatus(item) {
       if (item.inscompany == '紫金财险') {