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

src/http/moudules/task.js

@@ -639,9 +639,9 @@ export const accountsResult = (data,data1) => {
 }
 
 //获取签单日期结算来源表
-export const signingSourceResult = (data) => {
+export const signingSourceResult = (data,data1) => {
   return axios({
-    url: '/InsReceivable/signingSourceResult?yearMonthStr=' + data,
+    url: '/InsReceivable/signingSourceResult?yearMonthStr=' + data+'&insuranceId='+data1,
     method: "get",
   })
 }
@@ -778,10 +778,11 @@ export const isVisibledataMatching = () => {
   })
 }
 //结算表批量删除
-export const SettlementDeletes = () => {
+export const SettlementDeletes = (data) => {
   return axios({
     url: "/InsReceivable/deleteSettlement",
     method: "post",
+    data
   })
 }
 

src/views/FinancialManagement/ExpenseManagement/ExpenseManagement.vue

@@ -521,7 +521,7 @@ export default {
         {
           prop: "owned",
           label: "所属地",
-          minWidth: 80,
+          minWidth: 100,
           sortable: false,
         },
         {
@@ -581,11 +581,11 @@ export default {
           minWidth: 170,
           sortable: false,
         },
-        { prop: "bank", label: "开户行", minWidth: 100, sortable: false },
+        { prop: "bank", label: "开户行", minWidth: 300, sortable: false },
         {
           prop: "bankName",
           label: "开户行名称",
-          minWidth: 190,
+          minWidth: 300,
           sortable: false,
         },
         { prop: "bankNum", label: "开户行号", minWidth: 150, sortable: false },
@@ -613,6 +613,12 @@ export default {
           minWidth: 120,
           sortable: false,
         },
+        {
+          prop: "pubDayLinesExcess",
+          label: "单日转账笔数剩余",
+          minWidth: 120,
+          sortable: false,
+        },
         {
           prop: "insuranceProfit",
           label: "保险公司回款",
@@ -626,14 +632,14 @@ export default {
           sortable: false,
         },
         {
-          prop: "priSingleLines",
-          label: "对私单笔限额",
+          prop: "priDayLinesExcess",
+          label: "对私单日限额剩余",
           minWidth: 120,
           sortable: false,
         },
         {
-          prop: "priYearExcess",
-          label: "对私年剩余额度",
+          prop: "priSingleLines",
+          label: "对私单笔限额",
           minWidth: 120,
           sortable: false,
         },
@@ -643,18 +649,36 @@ export default {
           minWidth: 120,
           sortable: false,
         },
+        {
+          prop: "priYearExcess",
+          label: "对私年剩余额度",
+          minWidth: 120,
+          sortable: false,
+        },
         {
           prop: "pubDayLines",
           label: "对公单日限额",
           minWidth: 120,
           sortable: false,
         },
+        {
+          prop: "pubDayLinesExcess",
+          label: "对公单日限额剩余",
+          minWidth: 120,
+          sortable: false,
+        },
         {
           prop: "pubSingleLines",
           label: "对公单笔限额",
           minWidth: 120,
           sortable: false,
         },
+        {
+          prop: "pubYearLines",
+          label: "对公年额度",
+          minWidth: 120,
+          sortable: false,
+        },
         {
           prop: "pubYearExcess",
           label: "对公年剩余额度",
@@ -662,8 +686,8 @@ export default {
           sortable: false,
         },
         {
-          prop: "pubYearLines",
-          label: "对公年额度",
+          prop: "spend",
+          label: "支出金额",
           minWidth: 120,
           sortable: false,
         },

src/views/FinancialManagement/ExpenseManagement/PaymentManagement.vue

@@ -568,6 +568,12 @@ export default {
           type: "text",
           minWidth: 100,
         },
+        {
+          prop: "clearFlagName",
+          label: "转账状态",
+          type: "text",
+          minWidth: 100,
+        },
       ],
       detailData: [],
       detailParams: {
@@ -983,6 +989,7 @@ export default {
         .then((res) => {
           if (res.code == 200) {
             res.data.records.forEach((item) => {
+              item.clearFlagName = item.clearFlag==0?'未清':'已清'
               item.invoiceTypeName = this.businessZh(
                 this.invoice_typeData,
                 item.invoiceType,
@@ -995,6 +1002,7 @@ export default {
                   ).label
                 : "";
             });
+           
             this.pageResult = {
               content: res.data.records,
               pageNum: res.data.current,

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

@@ -11,11 +11,10 @@
           <el-col :span="6">
             <el-form-item label="月份选择：">
               <el-date-picker
-                v-model="mounthTime"
-                type="months"
-                @change="mounthChange"
+                v-model="pageRequest.yearMonthStr"
+                type="month"
                 value-format="yyyy-MM"
-               placeholder="选择一个或多个月"
+                placeholder="选择一个月"
                 class="widths"
               >
               </el-date-picker>
@@ -24,12 +23,10 @@
           <el-col :span="6">
             <el-form-item label="保险公司：">
               <el-select
-                v-model="insuranceIdlist"
+                v-model="pageRequest.insuranceId"
                 filterable
                 class="widths"
                 clearable
-                multiple
-                @change="companySelectChange"
                 collapse-tags
               >
                 <el-option
@@ -85,6 +82,7 @@
         button2Background="#F56C6C"
         @handleButton2="accountDelete"
         button2Icon=""
+        :isshowpagination="false"
       >
       </kt-common-table>
     </el-main>
@@ -102,7 +100,6 @@ export default {
   data() {
     return {
       value5: "",
-      mounthTime: [],
       //地区编码数据
       areaOptions: regionData,
       regionalCode: [],
@@ -122,8 +119,9 @@ export default {
         //查询的默认条件
         insuranceId: "", //保险公司
         yearMonthStr: "",
+        pageNum:"1",
+        pageSize:"10",
       },
-      insuranceIdlist: [],
       companyList: [],
       dateTime: [],
       institutionOptions: [],
@@ -151,6 +149,12 @@ export default {
     };
   },
   created() {
+    //获取当前年和月
+    let date = new Date();
+    let month = date.getMonth() + 1;
+    month = month > 9 ? month : "0" + month;
+    let year = date.getFullYear();
+    this.pageRequest.yearMonthStr = year + "-" + month;
     this.companyInt();
   },
   mounted() {},
@@ -171,17 +175,14 @@ export default {
         this.companyList = res.data;
       });
     },
-    //
-    companySelectChange(val) {
-      this.pageRequest.insuranceId = val.toString();
-    },
-    mounthChange(e) {
-      this.pageRequest.yearMonthStr = e.toString();
-    },
     // 右侧列表的方法Start
     findPage(data) {
       // 获取分页数据
       let that = this;
+      if(that.pageRequest.yearMonthStr==''||that.pageRequest.yearMonthStr==null||that.pageRequest.yearMonthStr==undefined){
+        that.$message.error('月份不能为空！')
+        return
+      }
       that.$api.task
         .accountsResult(
           that.pageRequest.yearMonthStr,
@@ -234,7 +235,6 @@ export default {
     //导出
     handlePrint() {
       this.$api.task.excelExport(this.pageRequest).then((res) => {
-        console.log(res);
         let blob = new Blob([res], {
           type: "application/vnd.ms-excel",
         }); // 2.获取请求返回的response对象中的blob 设置文件类型，这里以excel为例
@@ -250,7 +250,6 @@ export default {
     },
     //联级选择器触发事件
     handleChange(val) {
-      console.log(val);
       if (val.length !== 0) {
         this.pageRequest.deptId = val.at(-1);
       } else {
@@ -294,7 +293,6 @@ export default {
       that.$api.dict
         .findByLableName(typeName)
         .then(function (res) {
-          console.log(res);
           that[typeName + "options"] = res.data; // 把获取到的数据赋给this.data
         })
         .catch(function (error) {

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

@@ -7,15 +7,36 @@
         :model="formInline"
         class="demo-form-inline"
       >
-        <el-form-item label="选择年份：">
-          <el-date-picker
-            v-model="formInline.monthValue"
-            type="year"
-            value-format="yyyy"
-            placeholder="选择年"
-          >
-          </el-date-picker>
-        </el-form-item>
+        <el-col :span="6">
+          <el-form-item label="选择年份：">
+            <el-date-picker
+              v-model="formInline.monthValue"
+              type="year"
+              value-format="yyyy"
+              placeholder="选择年"
+            >
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="保险公司：">
+            <el-select
+              v-model="pageRequest.insuranceId"
+              filterable
+              class="widths"
+              clearable
+              @change="companySelectChange"
+              collapse-tags
+            >
+              <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-form-item>
           <el-button type="primary" @click="formQuery">查询</el-button>
         </el-form-item>
@@ -38,6 +59,7 @@
         @findPage="findPage"
         keyName="policyno"
         settledName="批量生成"
+        :isshowpagination="false"
         @handleSettled="handleTableSettled"
       >
       </kt-common-table>
@@ -53,6 +75,8 @@ export default {
   },
   data() {
     return {
+      companyList:[],//保险公司数据
+      insuranceIdlist: [],//保险公司值
       //地区编码数据
       regionalCode: [],
       formInline: {
@@ -60,6 +84,7 @@ export default {
       },
       pageRequest: {
         //查询的默认条件
+        insuranceId:'',
       },
       dateTime: [],
       companyList: [],
@@ -80,14 +105,27 @@ export default {
       ],
     };
   },
-  created() {},
+  created() {
+    this.companyInt();
+  },
   mounted() {
-    this.formInline.monthValue=this.monthProcess();
+    this.formInline.monthValue = this.monthProcess();
   },
   methods: {
+    //选择保险公司change事件
+    companySelectChange(val) {
+      this.pageRequest.insuranceId = val
+    },
+    //获取保险公司数据
+    companyInt() {
+      this.$api.letter.gainTopList().then((res) => {
+        this.companyList = res.data;
+      });
+    },
     formQuery() {
+      // this.findPage();
       this.$api.task
-        .signingSourceResult(this.formInline.monthValue)
+        .signingSourceResult(this.formInline.monthValue,this.pageRequest.insuranceId)
         .then((res) => {
           this.pageResult = res.data;
         });
@@ -123,7 +161,6 @@ export default {
       that.$api.dict
         .findByLableName(typeName)
         .then(function (res) {
-          console.log(res);
           that[typeName + "options"] = res.data; // 把获取到的数据赋给this.data
         })
         .catch(function (error) {
@@ -133,13 +170,17 @@ export default {
     //--数据字典 end --
     // 右侧列表的方法Start
     findPage(data) {
-        let year=this.monthProcess();
+      let year = this.monthProcess();
       // 获取分页数据
       let that = this;
       that.$api.task
-        .signingSourceResult(year)
+        .signingSourceResult(year,that.pageRequest.insuranceId)
         .then((res) => {
-          that.pageResult = res.data;
+          if(res.code==200){
+            that.pageResult = res.data;
+          }else{
+            that.$message.error(res.msg)
+          }
         })
         .then(data != null ? data.callback : "");
     },
@@ -165,5 +206,10 @@ export default {
 .widths {
   width: 220px;
 }
+.demo-form-inline{
+  height: 80px;
+  display: flex;
+  align-items: center;
+}
 </style>