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

config/dev.env.js

@@ -6,9 +6,11 @@ module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
   ENV_CONFIG:'"dev"',
   BASE_URL: '"http://39.98.239.48/web-api"',//测试服务器
+  // BASE_URL: '"https://test.baoxianzhanggui.com/web-api"',//测试服务器
   // BASE_URL:'"http://sxzgkj.baoxianzhanggui.com/web-api"'//正式服务器
   // BASE_URL: '"http://192.168.0.115:8080/"' //凯森
   // BASE_URL: '"http:///192.168.0.253:8082/"',//田智
+  // BASE_URL: '"http:///192.168.0.253:8082/"',//田智
   // BASE_URL: '"http:///192.168.0.36:8080/"',//靖燕龙
 })
 

config/index.js

@@ -49,6 +49,7 @@ module.exports = {
     devEnv: require('./dev.env'),
     prodEnv: require('./prod.env'),
     testEnv: require('./test.env'),
+    preEnv: require('./pre.env'),
     // Template for index.html
     index: path.resolve(__dirname, '../dist/index.html'),
 

config/pre.env.js

@@ -0,0 +1,9 @@
+'use strict'
+const merge = require('webpack-merge')
+const prodEnv = require('./prod.env')
+
+module.exports = merge(prodEnv, {
+  NODE_ENV: '"testing"',
+  ENV_CONFIG:'"test"',
+  BASE_URL: '"https://pre.baoxianzhanggui.com/web-api"',//测试服务器
+})

config/prod.env.js

@@ -2,5 +2,5 @@
 module.exports = {
   NODE_ENV: '"production"',
   ENV_CONFIG:'"prod"',
-  BASE_URL:'"http://sxzgkj.baoxianzhanggui.com/web-api"',
+  BASE_URL:'"https://sxzgkj.baoxianzhanggui.com/web-api"',
 }

config/test.env.js

@@ -5,6 +5,5 @@ const prodEnv = require('./prod.env')
 module.exports = merge(prodEnv, {
   NODE_ENV: '"testing"',
   ENV_CONFIG:'"test"',
-  BASE_URL: '"http://39.98.239.48/web-api"',
-
+  BASE_URL: '"https://test.baoxianzhanggui.com/web-api"',//测试服务器
 })

package.json

@@ -9,7 +9,8 @@
     "start": "npm run dev",
     "build": "node build/build.js",
     "build--test": "cross-env NODE_ENV=production env_config=test node build/build.js",
-    "build--prod": "cross-env NODE_ENV=production env_config=prod node build/build.js"
+    "build--prod": "cross-env NODE_ENV=production env_config=prod node build/build.js",
+    "build--pre": "cross-env NODE_ENV=production env_config=pre node build/build.js"
   },
   "dependencies": {
     "@riophae/vue-treeselect": "^0.4.0",

src/http/moudules/task.js

@@ -275,6 +275,15 @@ export const deptAccountPage = (data) => {
     })
 }
 
+// 账户余额分页查询
+export const findPageAccount = (data) => {
+    return axios({
+        url: '/insPayApply/findPageAccount',
+        method: 'post',
+        data
+    })
+}
+
 
 // 证件识别
 export const imgAI = (data) => {

src/views/FinancialManagement/AcountWithdrawal/AcountBalance.vue

@@ -1,121 +1,165 @@
 <template>
   <div>
-   <div class="queryFrom" title="检索区">
-        <el-form ref="queryFormRef" :model="queryFrom" label-width="80px">
-          <el-row>
-            <el-col :span="5">
-              <el-form-item label="工号">
-                <el-input clearable size="small" placeholder="工号" v-model="queryFrom.id"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item>
-                <el-button size="small" @click="queryBalance">查询</el-button>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
+    <div class="queryFrom" title="检索区">
+      <el-form ref="queryFormRef" :model="queryFrom" label-width="80px">
+        <el-row>
+          <el-col :span="5">
+            <el-form-item label="工号">
+              <el-input
+                clearable
+                size="small"
+                placeholder="工号"
+                v-model="queryFrom.userid"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <el-form-item label="机构名称">
+              <el-cascader
+                class="widths"
+                size="small"
+                :options="institutionOptions"
+                v-model="queryFrom.deptId"
+                :props="{
+                  checkStrictly: true,
+                  value: 'id',
+                  label: 'name',
+                }"
+                @change="handleChange"
+                clearable
+              ></el-cascader>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item>
+              <el-button size="small" @click="queryBalance">查询</el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
     </div>
-     <el-table :border="true" :data="tableData" :header-cell-style="{background:'#F2F7FC',fontWeight: '700',color:'#606266'}" style="width: 100%">
-          <el-table-column header-align="center" align="center" prop="id" label="工号" min-width="180"> </el-table-column>
-          <el-table-column header-align="center" align="center" prop="name" label="姓名" min-width="100"> </el-table-column>
-          <el-table-column header-align="center" align="center" prop="deptId" label="机构代码" min-width="100"> </el-table-column>
-          <el-table-column header-align="center" align="center" prop="mobile" label="电话" min-width="100"> </el-table-column>
-          <el-table-column header-align="center" align="center" prop="totalAmount" label="累计提现" min-width="100"> </el-table-column>
-          <el-table-column header-align="center" align="center" prop="applyAmount" label="提现中" min-width="100"> </el-table-column>
-          <el-table-column header-align="center" align="center" prop="accountBalance" label="可提现金额" min-width="100"> </el-table-column>
-          <el-table-column header-align="center" align="center" prop="payamount" label="已到账" min-width="100"> </el-table-column>
-        </el-table>
+    <kt-common-table
+      :showBatchDelete="false"
+      :showBatchPrint="false"
+      :showOperation="false"
+      :data="pageResult"
+      :columns="columns"
+      @findPage="queryBalance"
+    >
+    </kt-common-table>
   </div>
 </template>
 
 <script>
-  export default {
-    data() {
-      return {
-        queryFrom:{
-          "id":""
-        },
-        tableData:[],
+import KtCommonTable from "@/views/Core/KtCommonTable.vue";
+export default {
+  components: {
+    KtCommonTable,
+  },
+  data() {
+    return {
+      institutionOptions: [], //机构字典
+      pageResult: {
+        
+      },
+      pageRequest: {
+        //查询的默认条件
+        pageNum: 1,
+        pageSize: 10,
+      },
+      queryFrom: {
+        userid: "", //工号
+        deptId: "", //机构
+      },
+      columns: [
+        //数据列
+        { prop: "userid", label: "工号", minWidth: 160 },
+        { prop: "username", label: "姓名", minWidth: 80 },
+        { prop: "mobile", label: "手机号", minWidth: 100 },
+        { prop: "deptid", label: "机构代码", minWidth: 160 },
+        { prop: "deptname", label: "机构名称", minWidth: 100 },
+        { prop: "totalfee", label: "总手续费", minWidth: 100 },
+        { prop: "fxtotalfee", label: "总分销费", minWidth: 100 },
+        { prop: "applyfee", label: "手续费提现总金额", minWidth: 120 },
+        { prop: "payamount", label: "手续费已到账金额", minWidth: 120 },
+        { prop: "apply", label: "手续费支付中金额", minWidth: 120 },
+        { prop: "balance", label: "手续费可用余额", minWidth: 120 },
+        { prop: "fxapplyfee", label: "分销费提现总金额", minWidth: 120 },
+        { prop: "fxpayamount", label: "分销费已到账总金额", minWidth: 130 },
+        { prop: "fxapply", label: "分销费支付中金额", minWidth: 120 },
+        { prop: "fxbalance", label: "分销费可用余额", minWidth: 120 },
+      ],
+    };
+  },
+  created() {
+    //查询机构
+    this.$api.dept.findDeptTree().then((res) => {
+      this.institutionOptions = res.data;
+    });
+  },
+  mounted() {},
+  methods: {
+    //联级选择器触发事件
+    handleChange(val) {
+      if (val.length !== 0) {
+        this.queryFrom.deptId = val.at(-1);
+      } else {
+        this.queryFrom.deptId = "";
       }
     },
-    methods:{
-
-      queryBalance(){
-        var that = this;
-        if(!this.queryFrom.id){
-          return this.$message.info("请输入查询工号")
-        }
-        var id = this.queryFrom.id
-        this.tableData = [];
-        var a = {};
-        this.$api.user.findById(id).then((personRes) => {
-            console.log(personRes)
-            if(personRes.code ==200){
-              Object.assign(a,personRes.data.sysUser);
-              this.$api.task.payAccount(id).then((res) => {
-                if(personRes.code ==200){
-                  Object.assign(a,res.data);
-                  console.log(a)
-                  that.tableData.push(a);
-                }else{
-                  return this.$message.info("查询失败")
-                }
-              })
-
-            }else if(personRes.code ==-9999){
-              return this.$message.info("请输入正确的工号")
-            }else{
-              return this.$message.info("查询失败")
-            }
-        })
-
-
-
-
-        // this.$api.task.payAccount(id).then((res) => {
-        //   console.log(res.data)
-        //   var a = {};
-        //   Object.assign(a,res.data);
-        //   a.id = id;
-        //   console.log(a)
-        //   that.tableData.push(a);
-        // })
+    queryBalance(data) {
+      if (data && data.pageRequest) {
+        this.pageRequest.pageNum = data.pageRequest.pageNum;
+        this.pageRequest.pageSize = data.pageRequest.pageSize;
       }
-
-
-    }
-  }
+      this.$api.task
+        .findPageAccount({
+          ...this.pageRequest,
+          columnFilters: {
+            deptid: { name: "deptid", value: this.queryFrom.deptId },
+            userid: { name: "userid", value: this.queryFrom.userid },
+          },
+        })
+        .then((res) => {
+          if (res.code == 200) {
+            this.pageResult = res.data;
+          }
+        });
+    },
+  },
+};
 </script>
 
 <style scoped>
-  /* 顶部查询条件样式Start */
-  .queryFrom{
-      background: #F2F7FC;
-      position:relative;
-      border:1px solid #ddd;
-      border-radius: 10px;
-      margin: 15px;
-      padding: 20px;
-  }
-  .queryFrom:before{
-      content:attr(title);
-      position:absolute;
-      left:10%;
-      transform:translate(-50%,-130%);
-      padding:0 10px;
-      background-color:#fff;
-  }
-
+/* 顶部查询条件样式Start */
+.queryFrom {
+  background: #f2f7fc;
+  position: relative;
+  border: 1px solid #ddd;
+  border-radius: 10px;
+  margin: 15px;
+  padding: 20px;
+}
+.queryFrom:before {
+  content: attr(title);
+  position: absolute;
+  left: 10%;
+  transform: translate(-50%, -130%);
+  padding: 0 10px;
+  background-color: #fff;
+}
 
-  .queryFrom .el-row {
-    margin: 10px 0px;
-  }
-  .queryFrom .el-form-item {
-    margin-bottom: 0px;
-  }
-  .queryFrom .queryButton .el-form-item__content {
-    margin-left: 0px !important;
-  }
-  /* 顶部查询条件样式End */
+.queryFrom .el-row {
+  margin: 10px 0px;
+}
+.queryFrom .el-form-item {
+  margin-bottom: 0px;
+}
+.queryFrom .queryButton .el-form-item__content {
+  margin-left: 0px !important;
+}
+/* 顶部查询条件样式End */
+.el-cascader {
+  width: 100%;
+}
 </style>

src/views/Letter/Letter.vue

@@ -220,6 +220,13 @@
               </el-input>
             </el-form-item>
           </el-col>
+          <el-col :xs="xscell" :sm="smcell" :md="mdcell" :lg="lgcell" :xl="xlcell">
+            <el-form-item label="核定载质量" prop="limitLoad">
+              <el-input v-model="carInfo.limitLoad" placeholder="请输入核定载质量">
+                <el-button slot="append">千克(KG)</el-button>
+              </el-input>
+            </el-form-item>
+          </el-col>
           <el-col :xs="xscell" :sm="smcell" :md="mdcell" :lg="lgcell" :xl="xlcell">
             <el-form-item label="排量：" prop="enginedesc">
               <el-input v-model="carInfo.enginedesc" placeholder="请输入排量" >
@@ -2752,6 +2759,9 @@
               <el-form-item label="整备质量">
                 <el-input v-model="carform.unladenMass" autocomplete="off"></el-input>
               </el-form-item>
+              <el-form-item label="核定载质量">
+                <el-input v-model="carform.limitLoad" autocomplete="off"></el-input>
+              </el-form-item>
               <el-form-item label="核定载客数">
                 <el-input v-model="carform.approvedPassengersCapacity" autocomplete="off"></el-input>
               </el-form-item>
@@ -3710,6 +3720,7 @@ export default {
         issueDate: "", //发证日期
         grossMass: "", //总质量
         unladenMass: "", //整备质量
+        limitLoad: "", //核定载质量
         approvedPassengersCapacity: "" //核定载客数
       },
       ownerInfoform: {
@@ -4816,6 +4827,7 @@ export default {
     this.getDicType("businessVehicleUse");//（车辆用途）营业
     this.getDicType("outOfBusinessVehicleUse");//（车辆用途）非营业
     this.getDicType("insOrderStatus");//状态
+    
     this.$api.letter.queryCompany().then(res => {
       this.continuousCompanyList = res.data;
     });
@@ -4954,7 +4966,6 @@ export default {
       this.systartDate = this.transformTime1();
       this.syendDate = this.oneYearPast1(this.systartDate);
     }
-
   },
   mounted() {
     this.onScroll()
@@ -8259,6 +8270,7 @@ else{
           this.$message({ message: "请正确选择驾驶证", type: "warning" });
         }
         var carInfo = res.data.carInfo;
+        console.log(carInfo);
         carInfo.issueDate =
           carInfo.issueDate.substring(0, 4) +
           "-" +
@@ -8280,6 +8292,11 @@ else{
         this.carform.issueDate = carInfo.issueDate; //车牌号
         this.carform.grossMass = carInfo.grossMass; //总质量
         this.carform.unladenMass = carInfo.unladenMass; //整备质量
+        this.carform.limitLoad = carInfo.limitLoad; //核定载质量
+        this.carform.category = carInfo.category; //车辆类型
+        this.carform.useNature = carInfo.useNature; //使用性质
+        this.carform.vehicleUse = carInfo.vehicleUse; //车辆用途
+        this.carform.plateType = carInfo.plateType; //车辆种类
         this.carform.approvedPassengersCapacity =
           carInfo.approvedPassengersCapacity; //核定载客数
       });
@@ -8296,6 +8313,11 @@ else{
       this.carInfo.seatCount = this.carform.approvedPassengersCapacity; //核定载客数
       this.carInfo.vehicleweight = this.carform.grossMass; //总质量
       this.carInfo.completeKerbMass = this.carform.unladenMass; //整备质量
+      this.carInfo.limitLoad = this.carform.limitLoad; //核定载质量
+      this.carInfo.cartype = this.carform.category; //车辆类型
+      this.carInfo.useNature = this.carform.useNature; //使用性质
+      this.carInfo.vehicleUse = this.carform.vehicleUse; //车辆用途
+      this.carInfo.cimodelclass = this.carform.plateType; //车辆种类
       if (this.timeformat(this.carform.registerDate) != 'NaN-NaN-NaN') {
         this.carInfo.registerDate = this.carform.registerDate; //车牌号
       }