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

src/http/moudules/task.js

@@ -919,6 +919,13 @@ export const fncSettlementSumFees = (data) => {
   })
 }
 
+export const fncSettlementQueryRecord = (data) => {
+  return axios({
+    url: "/fnc/SettlementFees/queryRecord",
+    method: "post",
+    data
+  })
+}
 // 保险公司结算-非跟单结算页面单行结算保存
 export const documentarySettle = (data) => {
   return axios({

src/views/FinancialManagement/CarInsurance/CompanySettlement/CarInsurance/DocumentaryFeesDetail.vue

@@ -139,7 +139,7 @@
             <el-form-item label="险种" prop="riskcode">
               <el-select v-model="formDataAdd.riskcode"  placeholder="选择险种" size="small">
                 <el-option v-for="item in productsTypeoptions" :key="item.dictValue" :label="item.dictTag"
-                  :value="item.dictValue"></el-option>
+                  :value="item.dictTag"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -248,6 +248,9 @@ export default {
       process:process.env.BASE_URL,
       dockingPersonOption: [],
       rulesAdd: {
+        agreeId: [
+          { required: true, message: '请选择协议类型', trigger: 'change' },
+        ],
         signDate: [
           { required: true, message: '请输入签单日期', trigger: 'blur' },
         ],

src/views/FinancialManagement/CarInsurance/CompanySettlement/CarInsurance/DocumentaryFeesSettled.vue

@@ -316,7 +316,8 @@ export default {
     findPageDetailrecord(data) {
       this.tableConfigDetailrecord.loading = true
       this.$api.task
-        .settlementFeesQuery({
+        // .settlementFeesQuery({
+          this.$api.task.fncSettlementQueryRecord({
           partnerCompaniesId: data.partnerCompaniesId,
           agreementType: '2',
           handlingFeesStatus: '1',
@@ -326,7 +327,7 @@ export default {
         })
         .then(res => {
           if (res.code == 200) {
-            this.formTableDatarecord = res.data.content;
+            this.formTableDatarecord = res.data;
             this.pageDatarecord = {
               pageNum: res.data.pageNum,
               pageSize: res.data.pageSize,

src/views/FinancialManagement/CarInsurance/CompanySettlement/CarInsurance/DocumentaryUnsettled.vue

@@ -424,15 +424,18 @@ export default {
     },
     getListrecord(data) {
       this.findPageDetailrecord({...data})
-    },findPageDetailrecord(data) {
+    },
+    findPageDetailrecord(data) {
       this.tableConfigDetailrecord.loading = true
-      this.$api.task.fncSettlementSumFees({
+      
+      // this.$api.task.fncSettlementSumFees({
+        this.$api.task.fncSettlementQueryRecord({
         settlementSumId: this.settlementSumId,
         settlementStatus: '2',
       })
       .then(res => {
         if (res.code == 200) {
-          this.formTableDatarecord = res.data.content
+          this.formTableDatarecord = res.data
           this.tableConfigDetailrecord.loading = false
         } else {
           this.$message.error(res.msg)

src/views/FinancialManagement/CarInsurance/CompanySettlement/CarInsurance/HandlingFees.vue

@@ -244,6 +244,9 @@ export default {
           },
       ],
       rulesAdd: {
+        agreeId: [
+          { required: true, message: '请选择协议类型', trigger: 'change' },
+        ],
         signDate: [
           { required: true, message: '请输入签单日期', trigger: 'blur' },
         ],

src/views/FinancialManagement/CarInsurance/CompanySettlement/NoCarInsurance/DocumentaryFeesDetail.vue

@@ -99,7 +99,7 @@
             <el-form-item label="险种" prop="riskcode">
               <el-select v-model="formDataAdd.riskcode"  placeholder="选择险种" size="small">
                 <el-option v-for="item in productsTypeoptions" :key="item.dictValue" :label="item.dictTag"
-                  :value="item.dictValue"></el-option>
+                  :value="item.dictTag"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -208,6 +208,9 @@ export default {
       dockingPersonOption: [],
       riskcodeList: [],
       rulesAdd: {
+        agreeId: [
+          { required: true, message: '请选择协议类型', trigger: 'change' },
+        ],
         signDate: [
           { required: true, message: '请输入签单日期', trigger: 'blur' },
         ],

src/views/FinancialManagement/CarInsurance/CompanySettlement/NoCarInsurance/DocumentaryFeesSettled.vue

@@ -299,7 +299,8 @@ export default {
     findPageDetailrecord(data) {
       this.tableConfigDetailrecord.loading = true
       this.$api.task
-        .settlementFeesQuery({
+        // .settlementFeesQuery({
+        this.$api.task.fncSettlementQueryRecord({
           partnerCompaniesId: data.partnerCompaniesId,
           agreementType: '2',
           handlingFeesStatus: '1',
@@ -309,7 +310,7 @@ export default {
         })
         .then(res => {
           if (res.code == 200) {
-            this.formTableDatarecord = res.data.content;
+            this.formTableDatarecord = res.data;
             this.pageDatarecord = {
               pageNum: res.data.pageNum,
               pageSize: res.data.pageSize,

src/views/FinancialManagement/CarInsurance/CompanySettlement/NoCarInsurance/DocumentaryUnsettled.vue

@@ -441,13 +441,14 @@ export default {
     },
     findPageDetailrecord(data) {
       this.tableConfigDetailrecord.loading = true
-      this.$api.task.fncSettlementSumFees({
+      // this.$api.task.fncSettlementSumFees({
+      this.$api.task.fncSettlementQueryRecord({
         settlementSumId: this.settlementSumId,
         settlementStatus: '2',
       })
       .then(res => {
         if (res.code == 200) {
-          this.formTableDatarecord = res.data.content
+          this.formTableDatarecord = res.data
           this.tableConfigDetailrecord.loading = false
         } else {
           this.$message.error(res.msg)

src/views/FinancialManagement/CarInsurance/CompanySettlement/NoCarInsurance/HandlingFees.vue

@@ -225,6 +225,9 @@ export default {
   data() {
     return {
       rulesAdd: {
+        agreeId: [
+          { required: true, message: '请选择协议类型', trigger: 'change' },
+        ],
         signDate: [
           { required: true, message: '请输入签单日期', trigger: 'blur' },
         ],
@@ -685,6 +688,7 @@ export default {
       this.$api.task.updateNoHand(this.formDataEdit).then(res => {
         if (res.code == 200) {
           this.$message.success(res.msg)
+          this.dialogVisibleEdit = false
           this.getList()
         } else {
           this.$message.error(res.msg)