lihongxiao 2 жил өмнө
parent
commit
6418ffb4db

+ 2 - 2
config/dev.env.js

@@ -8,7 +8,7 @@ module.exports = merge(prodEnv, {
 
   ENV_CONFIG:'"dev"',
   // BASE_URL: '"https://test.baoxianzhanggui.com/web-api"',//测试服务器
-  // BASE_URL:'"https://sxzgkj.baoxianzhanggui.com/web-api"'//正式服务器
+  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/"',//屈晨
@@ -18,7 +18,7 @@ module.exports = merge(prodEnv, {
   // BASE_URL: '"http:///192.168.0.42:8080/"',//武鸿鹏
   // BASE_URL: '"http://192.168.1.101:8080/"',
   // BASE_URL: '"http://192.168.0.250:8080/"',//
-  BASE_URL: '"http:///192.168.0.103:8080/"',//霍续亮
+  // BASE_URL: '"http:///192.168.0.103:8080/"',//霍续亮
 })
 
 

+ 15 - 15
src/views/FinancialManagement/CarInsurance/DeptSettlement/CommissionList.vue

@@ -12,33 +12,39 @@
         <!-- 左侧树End -->
         <!-- 右侧列表页面Start -->
         <SplitArea :size="rightSplitWidth">
-          <el-form class="queryForm" ref="queryFormRef" :model="pageRequest" label-width="80px" size="small">
+          <el-form  ref="queryFormRef" :model="pageRequest" label-width="80px" size="small">
             <el-row style="margin-bottom: 15px">
-              <el-col :span="5">
+              <el-col :span="6">
                 <el-form-item label="机构名称">
-                  <el-input clearable style="width: 220px" placeholder="请输入机构名称"
+                  <el-input clearable style="width: 230px" placeholder="请输入机构名称"
                     v-model="pageRequest.deptName"></el-input>
                 </el-form-item>
               </el-col>
-              <el-col :span="5">
+              <el-col :span="6">
+                <el-form-item label="来源订单">
+                  <el-input clearable style="width: 230px" placeholder="请输入来源订单"
+                    v-model="pageRequest.suborder"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
                 <el-form-item label="类型">
-                  <el-select style="width: 220px" clearable v-model="pageRequest.documentary" placeholder="选择类型">
+                  <el-select style="width: 230px" clearable v-model="pageRequest.documentary" placeholder="选择类型">
                     <el-option label="提现" value="1"></el-option>
                     <el-option label="收入" value="2"></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
+              <el-col :span="6">
                 <el-form-item label="创建时间">
-                  <el-date-picker size="small" v-model="pageRequest.signDate" type="datetimerange" @change="dateChange"
+                  <el-date-picker size="small" style="width: 230px" v-model="pageRequest.signDate" type="datetimerange" @change="dateChange"
                     range-separator="至" value-format="yyyy-MM-dd HH:mm:ss" start-placeholder="开始日期"
                     end-placeholder="结束日期">
                   </el-date-picker>
                 </el-form-item>
               </el-col>
 
-              <el-col :span="2">
-                <el-form-item label-width="20px">
+              <el-col :span="6" >
+                 <el-form-item  >
                   <el-button @click="getOrderList" type="primary" size="small">查询</el-button>
                 </el-form-item>
               </el-col>
@@ -318,11 +324,5 @@ export default {
   height: 100%;
 }
 
-.queryForm .el-row {
-  margin: 0px;
-}
 
-.queryForm .el-form-item {
-  margin-bottom: 0px;
-}
 </style>

+ 0 - 1
src/views/Letter/Wallet/FundsWallet.vue

@@ -213,7 +213,6 @@ export default {
           this.allamount();
           this.withdrawalVisible = false;
         } else {
-          
           this.$message({
             type: 'error',
             message: res.msg,

+ 7 - 5
src/views/Task/daikeComponents/KtLetter.vue

@@ -827,13 +827,13 @@
       <div>
         <div class="companyhead">
           <el-row>
-            <el-col :span="1">
-              <el-checkbox v-if="isLetter !== '3'" style="margin:0 10px 0 10px"
-                @change="handleCheckAllChange"></el-checkbox>
-              <span style="font-size:14px;">全选</span>
+            <el-col :span="1" >
+              <!-- <el-checkbox v-if="isLetter !== '3'" style="margin:0 10px 0 10px"
+                @change="handleCheckAllChange"></el-checkbox>-->
+              <span style="font-size:14px; ">选择</span> 
             </el-col>
             <el-col :span="2" style="margin: 0 42px 0 35px;">
-              <span>保险公司</span>
+              <span >保险公司</span>
             </el-col>
             <el-col :span="5">
               <span>报价协议</span>
@@ -8855,6 +8855,8 @@ export default {
           this.CarBackFile = ""; // 行驶证背面base64
           break;
         case 2:
+
+
           this.userfrontImg = "";
           this.userbackImg = "";
           this.C02File = ""; // 车主正面base64