修改机构排序

src/http/moudules/task.js

@@ -698,4 +698,11 @@ export const SourceUpdate = (data) => {
     data
   })
 }
-
+//应收应付表
+export const receivableAndSettlement = (data) => {
+  return axios({
+    url: "/InsReceivable/receivableAndSettlement",
+    method: "post",
+    data
+  })
+}

src/views/FinancialManagement/ReconciliationSystem/ReceivablePayableCollection/ReceivablePayableCollection.vue

@@ -9,84 +9,83 @@
       >
         <el-row>
           <el-col :span="6">
-            <el-form-item label="车牌号">
+            <el-form-item label="渠道">
               <el-input
-                v-model="pageRequest.licenseno"
-                placeholder="请输入车牌号"
+                v-model="pageRequest.channel"
+                placeholder="请输入渠道"
                 class="widths"
                 clearable
               ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="险种">
+            <el-form-item label="渠道分类">
               <el-input
-                v-model="pageRequest.risk"
-                placeholder="请输入险种"
+                v-model="pageRequest.channelClassification"
+                placeholder="请输入渠道分类"
                 class="widths"
                 clearable
               ></el-input>
             </el-form-item>
           </el-col>
+
           <el-col :span="6">
-            <el-form-item label="保险公司">
-              <el-select
-                v-model="pageRequest.insuranceId"
-                filterable
-                class="widths"
-                clearable
-              >
-                <el-option
-                  v-for="val in companyList"
-                  :key="val.id"
-                  :label="val.name"
-                  :value="val.id"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="被保险人">
+            <el-form-item label="被保人">
               <el-input
                 v-model="pageRequest.insuredName"
-                placeholder="请输入被保险人"
+                placeholder="请输入被保人"
                 class="widths"
                 clearable
               ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="交强保单号">
+            <el-form-item label="车牌号">
               <el-input
-                v-model="pageRequest.jqPolicyId"
-                placeholder="请输入交强保单号"
+                v-model="pageRequest.licenseNo"
+                placeholder="请输入车牌号"
                 class="widths"
                 clearable
               ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="商业保单号">
+            <el-form-item label="运营团队">
               <el-input
-                v-model="pageRequest.syPolicyId"
-                placeholder="请输入商业保单号"
+                v-model="pageRequest.operationsTeam"
+                placeholder="请输入运营团队"
                 class="widths"
                 clearable
               ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="非车保单号">
-              <el-input
-                v-model="pageRequest.nonCarPolicyId"
-                placeholder="请输入非车保单号"
+            <el-form-item label="结算状态">
+              <el-select v-model="pageRequest.clearingState" placeholder="请选择状态" class="widths">
+                <el-option label="未结算" value="0"></el-option>
+                <el-option label="已结算" value="1"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="保险公司">
+              <el-select
+                v-model="pageRequest.insuranceId"
+                filterable
                 class="widths"
                 clearable
-              ></el-input>
+              >
+                <el-option
+                  v-for="val in companyList"
+                  :key="val.id"
+                  :label="val.name"
+                  :value="val.id"
+                ></el-option>
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="结算日期">
+            <el-form-item label="代理结算日期">
               <el-date-picker
                 v-model="clearingTime"
                 type="daterange"
@@ -102,11 +101,11 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="出单日期">
+            <el-form-item label="签单日期">
               <el-date-picker
-                v-model="signingTime"
+                v-model="signDateTime"
                 type="daterange"
-                @change="signingTimeChange"
+                @change="signDateTimeChange"
                 start-placeholder="开始日期"
                 end-placeholder="结束日期"
                 class="widths"
@@ -142,7 +141,7 @@
       <kt-common-table
         :SerialShow="false"
         :operationWidth="150"
-        :showOperation="true"
+        :showOperation="false"
         permsDelete="sys:user:delete"
         :showBatchDelete="false"
         :showBatchSettled="false"
@@ -157,93 +156,9 @@
         settledName="批量生成"
         @handleSettled="handleTableSettled"
         @handlePrint="handlePrint"
-        button1Name="修改"
-        button1Background="#E6A23C"
-        @handleButton1="sourceUpdate"
-        button1Icon=""
       >
       </kt-common-table>
     </el-main>
-    <el-dialog title="信息修改" :visible.sync="dialogFormVisible" width="60%">
-      <el-form
-        :model="updateform"
-        :inline="true"
-        label-width="130px"
-        size="small"
-      >
-        <el-form-item label="险种：">
-          <el-input
-            v-model="updateform.risk"
-            autocomplete="off"
-            class="widths"
-          ></el-input>
-        </el-form-item>
-        <el-form-item label="交强保费：">
-          <el-input
-            v-model="updateform.jqPremiumTax"
-            autocomplete="off"
-            class="widths"
-          ></el-input>
-        </el-form-item>
-        <el-form-item label="商业保费：">
-          <el-input
-            v-model="updateform.syPremiumTax"
-            autocomplete="off"
-            class="widths"
-          ></el-input>
-        </el-form-item>
-        <el-form-item label="非车保费：">
-          <el-input
-            v-model="updateform.nonCarPremiumTax"
-            autocomplete="off"
-            class="widths"
-          ></el-input>
-        </el-form-item>
-        <el-form-item label="被保险人：">
-          <el-input
-            v-model="updateform.insuredName"
-            autocomplete="off"
-            class="widths"
-          ></el-input>
-        </el-form-item>
-        <el-form-item label="车牌号：">
-          <el-input
-            v-model="updateform.licenseno"
-            autocomplete="off"
-            class="widths"
-          ></el-input>
-        </el-form-item>
-        <el-form-item label="交强应收比例：">
-          <el-input
-            v-model="updateform.jqReceivableRatio"
-            autocomplete="off"
-            class="widths"
-          ></el-input>
-        </el-form-item>
-        <el-form-item label="商业应收比例：">
-          <el-input
-            v-model="updateform.syReceivableRatio"
-            autocomplete="off"
-            class="widths"
-          ></el-input>
-        </el-form-item>
-        <el-form-item label="非车应收比例：">
-          <el-input
-            v-model="updateform.nonCarReceivableRatio"
-            autocomplete="off"
-            class="widths"
-          ></el-input>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button size="small" @click="dialogFormVisible = false"
-          >取 消</el-button
-        >
-        <el-button size="small" type="primary" @click="updateSubmit"
-          >确 定</el-button
-        >
-      </div>
-    </el-dialog>
   </div>
 </template>
 <script>
@@ -255,98 +170,93 @@ export default {
   },
   data() {
     return {
-      clearingTime:[],
-      signingTime:[],
+      clearingTime: [],
+      signDateTime: [],
       pageRequest: {
         //查询的默认条件
         pageNum: 1,
         pageSize: 20,
-        licenseno: "", //车牌号
-        risk: "", //险种
+        agencySettlementTimeStartTime: "", //代理时间
+        agencySettlementTimeEndTime: "",
+        signDateStartTime: "", //签约时间
+        signDateEndTime: "",
+        channel: "", //渠道
+        channelClassification: "", //渠道分类
+        clearingState: "", //结算状态
+        insuranceDeptId:"",//
         insuranceId: "", //保险公司
-        insuredName: "", //被保险人
-        clearingTime: "", //结算日期
-        signingTime: "", //出单日期
-        jqPolicyId: "", //交强保单号
-        syPolicyId: "", //商业保单号
-        nonCarPolicyId: "", //非车保单号
+        insuredName: "",
+        licenseNo: "",
+        operationsTeam: "",
       },
-      dialogFormVisible: false,
       // 右侧列表查询数据Start
       pageResult: [],
-      updateform: {
-        risk: "",
-        jqPremiumTax: "",
-        syPremiumTax: "",
-        nonCarPremiumTax: "",
-        insuredName: "",
-        licenseno: "",
-        jqReceivableRatio: "",
-        syReceivableRatio: "",
-        nonCarReceivableRatio: "",
-      },
       columns: [
         //数据列
-        { prop: "id", label: " 编号", minWidth: 160 },
-        { prop: "insuranceId", label: "保司编码", minWidth: 160 },
-        { prop: "insuranceName", label: "保司名称", minWidth: 160 },
-        { prop: "insuranceDept", label: "保司机构", minWidth: 160 },
-        { prop: "insuranceDeptId", label: "保司机构代码", minWidth: 100 },
-        { prop: "risk", label: "险种", minWidth: 160 },
+        { prop: "operationsTeam", label: "运营团队", minWidth: 160 },
+        { prop: "channelClassification", label: "渠道分类", minWidth: 160 },
+        { prop: "signDate", label: "签约日期", minWidth: 160 },
+        { prop: "channel", label: "渠道", minWidth: 100 },
+        { prop: "licenseNo", label: "车牌号", minWidth: 160 },
+        { prop: "insuredName", label: "被保险人", minWidth: 160 },
+        { prop: "insuranceId", label: "保险id", minWidth: 160 },
+        { prop: "insuranceCompany", label: "保险公司", minWidth: 160 },
+        { prop: "insuranceDeptId", label: "部门id", minWidth: 160 },
+        { prop: "insuranceDept", label: "保险部门", minWidth: 160 },
+        { prop: "insuranceType", label: "险种", minWidth: 160 },
+        { prop: "businessOwner", label: "业务所有者", minWidth: 160 },
         { prop: "jqPolicyId", label: "交强保单号", minWidth: 160 },
-        { prop: "jqPremiumTax", label: "交强险保费", minWidth: 160 },
+        { prop: "jqPremiumTax", label: "交强险税额", minWidth: 160 },
+        { prop: "jqPremium", label: "交强险保费", minWidth: 160 },
+        { prop: "syPolicyId", label: "商业保单号", minWidth: 160 },
+        { prop: "syPremiumTax", label: "商业险税额", minWidth: 160 },
+        { prop: "syPremium", label: "商业险保费", minWidth: 160 },
+        { prop: "nonCarPolicyId", label: "非车保单号", minWidth: 160 },
+        { prop: "nonCarPremiumTax", label: "非车险税额", minWidth: 160 },
+        { prop: "nonCarPremium", label: "非车险保费", minWidth: 160 },
+        { prop: "agencySettlementTime", label: "代理结算时间", minWidth: 160 },
+        { prop: "taxAmount", label: "税额", minWidth: 160 },
+        { prop: "jqReceivableRatio", label: "交强险应收比例", minWidth: 160 },
+        { prop: "jqPremiumRatio", label: "交强险保费比例", minWidth: 160 },
+        { prop: "jqNonCopyingRatio", label: "交强险非复制比例", minWidth: 160 },
+        { prop: "syReceivableRatio", label: "商业险应收比例", minWidth: 160 },
+        { prop: "syPremiumRatio", label: "商业险保费比例", minWidth: 160 },
+        { prop: "syNonCopyingRatio", label: "商业险非复制比例", minWidth: 160 },
         {
-          prop: "jqPremium",
-          label: "交强险保费不含税",
+          prop: "nonCarReceivableRatio",
+          label: "非车险应收比例",
           minWidth: 160,
         },
-        { prop: "syPolicyId", label: "商业保单号", minWidth: 160 },
-        { prop: "syPremiumTax", label: "商业险保费", minWidth: 160 },
-        { prop: "syPremium", label: "商业险保费不含税", minWidth: 160 },
-        { prop: "nonCarPolicyId", label: "非车保单号", minWidth: 160 },
-        { prop: "nonCarPremiumTax", label: "非车保费", minWidth: 160 },
-        { prop: "nonCarPremium", label: "非车险保费不含税", minWidth: 160 },
-        { prop: "insuredName", label: "被保险人", minWidth: 160 },
-        { prop: "licenseno", label: "车牌号", minWidth: 160 },
-        { prop: "signingTime", label: "出单日期", minWidth: 160 },
-        { prop: "clearingTime", label: "结算日期", minWidth: 160 },
-        { prop: "taxamount", label: "车船税", minWidth: 160 },
-        { prop: "jqReceivableRatio", label: "交强应收比例", minWidth: 160 },
-        { prop: "jqPremiumRatio", label: "交强手续费比例", minWidth: 160 },
-        { prop: "jqNonCopyingRatio", label: "交强非跟单比例", minWidth: 160 },
-        { prop: "syReceivableRatio", label: "商业应收比例", minWidth: 160 },
-        { prop: "syPremiumRatio", label: "商业手续费比例", minWidth: 160 },
-        { prop: "syNonCopyingRatio", label: "商业非跟单比例", minWidth: 160 },
-        { prop: "nonCarReceivableRatio", label: "非车应收比例", minWidth: 160 },
-        { prop: "nonCarPremiumRatio", label: "非车手续费比例", minWidth: 160 },
+        { prop: "nonCarPremiumRatio", label: "非车险保费比例", minWidth: 160 },
         {
           prop: "nonCarNonCopyingRatio",
-          label: "非车非跟单比例",
+          label: "非车险非复制比例",
           minWidth: 160,
         },
         { prop: "premium", label: "手续费金额", minWidth: 160 },
         { prop: "nonCopying", label: "非跟单金额", minWidth: 160 },
-        { prop: "receivable", label: "应收金额", minWidth: 160 },
+        { prop: "receivable", label: "应收", minWidth: 160 },
+        { prop: "subsidyRatio", label: "补贴比例", minWidth: 160 },
+        { prop: "subsidyAmount", label: "补贴金额", minWidth: 160 },
         {
           prop: "maxJqReceivableRatio",
-          label: "最大交强应付比例",
+          label: "最大交强险应收比例",
           minWidth: 160,
         },
         {
           prop: "maxSyReceivableRatio",
-          label: "最大商业应付比例",
+          label: "最大商业险应收比例",
           minWidth: 160,
         },
         {
           prop: "maxNonCarReceivableRatio",
-          label: "最大非车应付比例",
+          label: "最大非车险应收比例",
           minWidth: 160,
         },
-        { prop: "maxReceivable", label: "最大应付金额", minWidth: 160 },
         { prop: "clearingState", label: "结算状态", minWidth: 160 },
       ],
       row: {},
-      companyList:[],
+      companyList: [],
     };
   },
   created() {
@@ -354,13 +264,13 @@ export default {
   },
   mounted() {},
   methods: {
-    clearingTimeChange(e){
-      console.log(e)
-      this.pageRequest.clearingTime=e.toString();
+    clearingTimeChange(e) {
+      this.pageRequest.agencySettlementTimeStartTime = e[0];
+      this.pageRequest.agencySettlementTimeEndTime = e[1];
     },
-    signingTimeChange(e){
-      this.pageRequest.signingTime=e.toString();
-
+    signDateTimeChange(e) {
+      this.pageRequest.signDateStartTime = e[0];
+      this.pageRequest.signDateEndTime = e[1];
     },
     //保险公司查询
     companyInt() {
@@ -471,7 +381,7 @@ export default {
         this.pageRequest.pageSize = data.pageRequest.pageSize;
       }
       that.$api.task
-        .SourceExcelPage(that.pageRequest)
+        .receivableAndSettlement(that.pageRequest)
         .then((res) => {
           that.pageResult = res.data;
         })

src/views/Sys/Deptall.vue

@@ -761,7 +761,7 @@ export default {
         });
       }
       let that = this;
-      
+
       that.operType = "EDIT";
       if (data.deptType == "C") {
         //编辑机构
@@ -777,7 +777,7 @@ export default {
             this.transitionFun('province',that.dataForm.province)
             this.transitionFun('city',that.dataForm.city)
             this.transitionFun('area',that.dataForm.area)
-           
+
             let cityArr = that.provinces.filter(item=>{
               return that.dataForm.province == item.areaCode
             })
@@ -834,9 +834,9 @@ export default {
           that.$message({
             type: 'info',
             message: '已取消删除'
-          });          
+          });
         });
-    
+
     },
     handleDeleteFlag(data) {
       let that = this;
@@ -879,7 +879,7 @@ export default {
       let that = this;
       this.$refs["dataForm"].validate((valid) => {
         if (valid) {
-          this.dataForm.orderNum = 1;
+          // this.dataForm.orderNum = 1;
           let params = Object.assign({}, this.dataForm);
           if (that.operType === "ADD" || that.operType === "ADDC") {
             let paramData = {
@@ -1024,7 +1024,7 @@ export default {
         area: false,
       };
     },
-  
+
     //关闭部门弹框
     closeDeptDialog() {
       // this.$refs.deptDataForm.resetFields();
@@ -1039,7 +1039,7 @@ export default {
         if(!objName){ //当级别大于3时需先赋值在清空对应校验规则
           this.dataRule[key] = []
         }
-        if(objName!=key){ 
+        if(objName!=key){
           delete this.dataRule[key] //删除其他两个校验规则
           this.disabledAddress[key] = false; //设置其他选择框不可点击
         }else{