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

config/dev.env.js

@@ -11,10 +11,10 @@ module.exports = merge(prodEnv, {
   // BASE_URL:'"https://sxzgkj.baoxianzhanggui.com/web-api"'//正式服务器
   // BASE_URL:'"https://sxzgkj.baoxianzhanggui.com/web-api"'//正式服务器
   // BASE_URL: '"http://192.168.0.115:8080/"' //凯森
-  // BASE_URL: '"http:///192.168.0.106:8080/"',//屈晨
+  BASE_URL: '"http:///192.168.0.106:8080/"',//屈晨
   // BASE_URL: '"http://192.168.0.253:8080/"',//田智
   // BASE_URL: '"http:///192.168.0.42:8080/"',//武鸿鹏
-  BASE_URL: '"http:///192.168.0.253:8080/"',//田智
+  // BASE_URL: '"http:///192.168.0.253:8080/"',//田智
   // BASE_URL: '"http:///192.168.0.42:8080/"',//武鸿鹏
   // BASE_URL: '"http://192.168.1.101:8080/"',
   // BASE_URL: '"http://192.168.0.250:8080/"',//

src/views/Task/daikeComponents/KtOrder.vue

@@ -47,7 +47,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="险种">
-              <el-select v-model="pageRequest.product" multiple placeholder="选择险种" style="width: 100%"
+              <el-select v-model="pageRequest.productid"  placeholder="选择险种" style="width: 100%"
                 >
                 <el-option v-for="item in productsTypeoptions" :key="item.dictValue" :label="item.dictTag"
                   :value="item.dictValue"></el-option>

src/views/Task/mixin.js

@@ -141,12 +141,13 @@ export const mixin = { // 导出混入对象
         // { prop: "insCompany", label: "保险公司", minWidth: 120 },
         { prop: "partnerCompaniesName", label: "已承保公司", minWidth: 120 },
         // { prop: "agreementName", label: "协议", minWidth: 160 },
+        { prop: "taxamount", label: "车船税", minWidth: 160 },
         { prop: "jqpremium", label: "交强险保费", minWidth: 160 },
         { prop: "sypremium", label: "商业险保费", minWidth: 160 },
         { prop: "jypremium", label: "驾意险保费", minWidth: 160 },
         
         { prop: "licenseno", label: "车牌号", minWidth: 160 },
-        { prop: "isExternal", label: "外部订单", formatter: this.isExternalFormatter},
+        // { prop: "isExternal", label: "外部订单", formatter: this.isExternalFormatter},
         { prop: "insuredname", label: "投保人姓名", minWidth: 120 },
         { prop: "product", label: "投保险种", minWidth: 100 },
         { prop: "createtime", label: "录单日期", minWidth: 160},