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

src/views/FinancialManagement/CarInsurance/PlatformSettlement/NonVehicleBalance.vue

@@ -139,8 +139,18 @@
           <el-form-item label="协议选择">
             <el-select size="small" v-model="formDataList.agreementId" placeholder="请选择协议类型" style="width: 100%" filterable>
               <el-option v-for="item in agreementTypeoptions" :key="item.dictValue" :label="item.agreementName"
-                :value="item.id"></el-option>
-              </el-select>
+              :value="item.id"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="手续费金额">
+              <el-input v-model="formDataList.ptCommissionFeevalue" class="inputType"></el-input>
+            </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="跟单费金额">
+              <el-input v-model="formDataList.ptOtherFeevalue" class="inputType"></el-input>
             </el-form-item>
         </el-col>
       </el-row>

src/views/Letter/Wallet/BankCard.vue

@@ -111,6 +111,7 @@
 </template>
 <!-- 行为区域 -->
 <script>
+import Cookies from "js-cookie";
 export default {
   // 数据存放区域
   data() {
@@ -123,6 +124,8 @@ export default {
         "bankAddress": "",
         "realUserName": "",
         "isDefault": 0,
+        userId:"",
+        userName:"",
       },
       bankAddVisible: false,
       Loading: false,
@@ -322,6 +325,9 @@ export default {
   },
   // 生命周期函数
   created() {
+    let user=JSON.parse(localStorage.getItem('user_data'));
+    this.bankAddform.userId=user.id;
+    this.bankAddform.userName=user.name;
     this.banklist();
   },
   // 方法函数

src/views/PeopleManage/Staff/AreaPeople.vue

@@ -50,6 +50,32 @@
     </el-main>
     <!-- 新增修改界面 -->
     <el-dialog :title="dialogTitle" width="50%" :visible.sync="dialogVisible" :close-on-click-modal="false" @close="closeDialog" v-dialogDrag>
+      <el-form ref="queryFormRef1" :model="addQueryForm" label-width="80px" size="small">
+        <el-row>
+          <el-col :span="5">
+            <el-form-item label="工号">
+              <el-input clearable placeholder="工号" v-model="addQueryForm.userId"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="姓名">
+              <el-input clearable placeholder="姓名" v-model="addQueryForm.name"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="机构名称">
+              <el-cascader size="small" v-model="addQueryForm.deptId" :options="deptList"
+              :props="{ label: 'name', value: 'id', children: 'children', checkStrictly: true }" clearable
+              ref="area"></el-cascader>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item>
+              <el-button type="primary" size="small" @click="handleAddButton">筛选</el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
         <el-table :data="addListData" border ref="personneTable" width="100%" size="small"
           align="center" :header-cell-style="{
             background: '#F2F7FC',
@@ -127,10 +153,13 @@ export default {
         total: 0
       },
       deptNBId: '',
+      addQueryForm: {},
+      deptList: [],
     };
   },
   created() {
     this.getLeftData()
+    this.getAllCompany()
   },
   methods: {
     // 删除
@@ -238,24 +267,17 @@ export default {
         this.$message.error('请选择内部机构')
         return
       }
+      let deptId = ''
+      if (this.addQueryForm.deptId) {
+        deptId = this.addQueryForm.deptId[this.addQueryForm.deptId.length-1]
+      }
       this.$api.dept.sysUserLinkDeptInternalAgentFindAllUserList({
-        agentFlag: 0,
-        columnFilters: {
-          additionalProperties1: {
-            name: '',
-            value: ''
-          }
-        },
-        deptId: '',
         deptNBId: this.deptNBId,
-        leaderName: '',
-        mobile: '',
-        name: '',
+        name: this.addQueryForm.name,
         pageNum: this.addListDataPage.pageNum,
         pageSize: this.addListDataPage.pageSize,
-        roleId: '',
-        status: '',
-        userId: ''
+        userId: this.addQueryForm.userId,
+        deptId: deptId,
       }).then((res) => {
         this.addListData = res.data.content
         this.addListDataPage.pageNum = res.data.pageNum
@@ -273,6 +295,13 @@ export default {
     },
     closeDialog() {
       this.dialogVisible = false;
+      this.addQueryForm = {}
+    },
+    // 获取所有机构列表
+    getAllCompany() {
+        this.$api.task.findAllTree().then(res => {
+            this.deptList = res.data
+        });
     },
   },
 };

src/views/Task/daikeComponents/KtOrder.vue

@@ -904,7 +904,6 @@ export default {
       this.querystatusLoaing = true;
       let inscompany = {
         国任财险: "updateOrderInfoGuoren",
-        华泰财险: "updateOrderInfoHuatai",
         大家财险: "updateOrderInfoDajia",
         紫金财险: "getOrderDetail",
         中煤财险: "paymentEnquiry",
@@ -954,7 +953,8 @@ export default {
             ? "pychonverifyPayment"
             : "updateOrderInfoHuatai";
 
-        this.$api.letter[HtApiType](item.apiType == 2 ? { subOrderNo: item.id } : item.id).then(res => {
+        this.$api.letter[HtApiType]({[item.apiType == 2 ? "subOrderNo" : "companyId"]: item.id
+						}).then(res => {
           if (res.code == 200) {
             this.$message({
               message: res.msg ? res.msg : "已刷新状态",