Merge branch 'master' of http://www.baoxianzhanggui.com:8090/sxzgd/vue-insagent-pc

config/dev.env.js

@@ -7,7 +7,8 @@ module.exports = merge(prodEnv, {
   ENV_CONFIG:'"dev"',
   // 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.115:8080/"' //凯森
+  // BASE_URL: '"http:///192.168.0.106:8080/"',//田智
 })
 
 

src/http/moudules/letter.js

@@ -581,6 +581,15 @@ export const orderStatusyongcheng = (id) => {
         method: "get",
     })
 }
+
+//永城缴费状态查询
+export const orderStatuszhongmei = (data) => {
+    return axios({
+        url: "/order/zhongMeiApi/auditStatusQuery",
+        method: "post",
+        data
+    })
+}
 //国任缴费状态查询
 export const updateOrderInfoGuoren = (data) => {
     return axios({

src/views/Letter/Letter.vue

@@ -1059,7 +1059,11 @@
         <el-table size="small" :data="HistoryList" height="250" border style="width: 100%" v-loading="loading"
           :header-cell-style="{ background: '#F2F7FC', fontWeight: '700', color: '#ee7000' }" highlight-current-row>
           <el-table-column prop="inscompany" label="保险公司" align="center"></el-table-column>
-          <el-table-column prop="username" label="业务员" align="center"></el-table-column>
+          <el-table-column prop="username" label="业务员" align="center">
+            <template slot-scope="scope">
+              <span>{{scope.row.userName}}({{scope.row.userId}})</span>
+            </template>
+          </el-table-column>
           <el-table-column prop="licenseno" label="车牌号" align="center"></el-table-column>
           <el-table-column prop="createtime" label="报价时间" align="center"></el-table-column>
           <el-table-column prop="jqpremium" label="交强险" align="center"></el-table-column>
@@ -4309,7 +4313,6 @@ export default {
       this.$api.letter.queryQuoteHistory(params).then(res => {
         res.data.forEach(item => {
           item.accidentInfo.constructor=== Object?[res.data.accidentInfo]:res.data.accidentInfo
-          item.username = this.paramsEdit.username+'('+this.paramsEdit.userid+')'
         })
         this.HistoryList = res.data;
       });

src/views/Letter/Orderlist.vue

@@ -99,6 +99,9 @@
                 v-if="item.orderstatus == '1' && item.inscompany=='永诚财险'"
                 @click="refreshStatus(item)" style="color:#f56c6c">更新订单</el-button>
                 <el-button size="mini" type="text"
+                v-if="item.orderstatus == '1' && item.inscompany=='中煤财险'"
+                @click="updateStatus(item)" style="color:#f56c6c">更新订单</el-button>
+                <el-button size="mini" type="text"
                 v-if="item.orderstatus == '2' && item.inscompany=='国任财险'"
                 @click="refreshStatusGuoren(item)" style="color:#f56c6c">状态更新</el-button>
                 <el-button size="mini" type="text"
@@ -1898,32 +1901,6 @@ export default {
         }
       })
     },
-    // 国任查询缴费状态
-    refreshStatusGuoren(item){
-      this.$api.letter.updateOrderInfoGuoren( {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 == '紫金财险') {