Просмотр исходного кода

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

@dongkboy 2 лет назад
Родитель
Сommit
9726a2fc38

+ 2 - 2
config/dev.env.js

@@ -9,11 +9,11 @@ module.exports = merge(prodEnv, {
   ENV_CONFIG:'"dev"',
   // BASE_URL: '"https://test.baoxianzhanggui.com/web-api"',//测试服务器
   // BASE_URL:'"https://sxzgkj.baoxianzhanggui.com/web-api"'//正式服务器
-  // BASE_URL:'"https://sxzgkj.baoxianzhanggui.com/web-api"'//正式服务器
+  BASE_URL:'"https://sxzgkj.baoxianzhanggui.com/web-api"'//正式服务器
   // BASE_URL: '"http://192.168.0.115:8080/"' //凯森
   // BASE_URL: '"http:///192.168.0.106:8080/"',//屈晨
   // BASE_URL: '"http:///192.168.0.253:8080/"',//田智
-  BASE_URL: '"http:///192.168.0.42:8080/"',//武鸿鹏
+  // BASE_URL: '"http:///192.168.0.42:8080/"',//武鸿鹏
   // BASE_URL: '"http:///192.168.0.253:8080/"',//田智
   // BASE_URL: '"http:///192.168.0.42:8080/"',//武鸿鹏
   // BASE_URL: '"http://192.168.1.101:8080/"',

+ 51 - 34
src/views/FinancialManagement/CarInsurance/CompanySettlement/CarInsurance/DocumentaryFeesDetail.vue

@@ -40,78 +40,74 @@
     <el-button   size="small" type="primary" @click="onSubmit">保存</el-button>
   </span>
 </el-dialog>
-<el-dialog
-    title="新增"
-    :visible.sync="dialogVisibleAdd"
-    width="55%"
-    :before-close="handleCloseadd">
-    <el-form ref="form" :model="formDataAdd" label-width="130px">
+<el-dialog title="新增"  :visible.sync="dialogVisibleAdd" width="55%" :before-close="handleCloseadd">
+      <el-form ref="formDataAdd" :rules="rulesAdd" :model="formDataAdd" label-width="130px">
         <el-row>
           <el-col :span="8">
-            <el-form-item label="车牌号">
+            <el-form-item label="车牌号" prop="licenseno">
               <el-input v-model="formDataAdd.licenseno" size="small"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="被保险人">
+            <el-form-item label="被保险人" prop="insuredName">
               <el-input v-model="formDataAdd.insuredName" size="small"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="交强保单号">
+            <el-form-item label="交强保单号" prop="policyno">
               <el-input v-model="formDataAdd.policyno" size="small"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="商业保单号">
+            <el-form-item label="商业保单号" prop="syPolicyno">
               <el-input v-model="formDataAdd.syPolicyno" size="small"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="交强险保费">
+            <el-form-item label="交强险保费" prop="jqPremium">
               <el-input v-model="formDataAdd.jqPremium" size="small"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="车船税">
+            <el-form-item label="车船税" prop="taxamount">
               <el-input v-model="formDataAdd.taxamount" size="small"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="商业险保费">
+            <el-form-item label="商业险保费" prop="syPremium">
               <el-input v-model="formDataAdd.syPremium" size="small"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="交强跟单比例">
-              <el-input v-model="formDataAdd.jqOtherCostsProportion" size="small"></el-input>
+            <el-form-item label="交强手续费比例" prop="jqSuperviseCostsProportion">
+              <el-input v-model="formDataAdd.jqSuperviseCostsProportion" size="small"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="商业跟单比例">
-              <el-input v-model="formDataAdd.syOtherCostsProportion" size="small"></el-input>
+            <el-form-item label="商业手续费比例" prop="sySuperviseCostsProportion">
+              <el-input v-model="formDataAdd.sySuperviseCostsProportion" size="small"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="跟单费金额">
+            <el-form-item label="跟单费金额" prop="otherFeevalue">
               <el-input v-model="formDataAdd.otherFeevalue" size="small"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="保司机构">
+            <el-form-item label="保司机构" prop="partnerCompaniesId">
               <el-cascader v-model="formDataAdd.partnerCompaniesId" size="small" :show-all-levels="false" ize="small"
                 :options="ztreeNodes" :props="optionProps" clearable filterable></el-cascader>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="保险公司">
+            <el-form-item label="保险公司" prop="companyId">
               <el-select size="small" clearable v-model="formDataAdd.companyId" filterable>
                 <el-option v-for="(s, i) in InsCompanyList" :key="i" :label="s.name" :value="s.id"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="险种">
+            <el-form-item label="险种" prop="riskcode">
               <el-select v-model="formDataAdd.riskcode" multiple placeholder="选择险种" size="small">
                 <el-option v-for="item in InsInsuranceKindoptions" :key="item.dictValue" :label="item.dictTag"
                   :value="item.dictValue"></el-option>
@@ -119,7 +115,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="协议类型" prop="agreementType">
+            <el-form-item label="协议名称" prop="agreementId">
               <el-select size="small" v-model="formDataAdd.agreementId" placeholder="请选择协议类型" style="width: 100%">
                 <el-option v-for="item in agreementTypeoptions" :key="item.dictValue" :label="item.dictTag"
                   :value="item.dictValue"></el-option>
@@ -127,12 +123,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="类型">
-              <el-input v-model="formDataAdd.remarks" size="small"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="签单日期">
+            <el-form-item label="签单日期" prop="signDate">
               <el-date-picker size="small" v-model="formDataAdd.signDate" type="date" placeholder="选择日期"
                 value-format="yyyy-MM-dd">
               </el-date-picker>
@@ -140,11 +131,11 @@
           </el-col>
         </el-row>
       </el-form>
-    <span slot="footer" class="dialog-footer">
-    <el-button size="small" @click="dialogVisibleAdd = false">取消</el-button>
-    <el-button   size="small" type="primary" @click="onSubmitAdd">保存</el-button>
-  </span>
-  </el-dialog>
+      <span slot="footer" class="dialog-footer">
+        <el-button size="small" @click="dialogVisibleAdd = false">取消</el-button>
+        <el-button size="small" type="primary" @click="onSubmitAdd('formDataAdd')">保存</el-button>
+      </span>
+    </el-dialog>
   <el-dialog  :visible.sync="dialogVisibleradio" width="40%" >
       <el-upload style="margin-bottom:10px" action="#" class="upload-demo" :limit="1" :auto-upload="false"
             :on-change="drivinguploadRadio"  ref="upload3" :file-list="fileListRadio">
@@ -227,6 +218,26 @@ export default {
   },
   data() {
     return {
+      rulesAdd: {
+        signDate: [
+          { required: true, message: '请输入签单日期', trigger: 'blur' },
+        ],
+        licenseno: [
+          { required: true, message: '请输入车牌号', trigger: 'blur' },
+        ],
+        syPolicyno: [
+          { required: true, message: '请输入交强保单号', trigger: 'blur' },
+        ],
+        otherFeevalue: [
+          { required: true, message: '请输入跟单费金额', trigger: 'blur' },
+        ],
+        companyId: [
+          { required: true, message: '请选择保险公司', trigger: 'change' }
+        ],
+        partnerCompaniesId: [
+          { required: true, message: '请选择保司机构', trigger: 'change' }
+        ],
+      },
       tableDataRadio:{},
       fileListRadio:[],
       dialogVisibleradio:false,
@@ -758,7 +769,9 @@ export default {
     handleCloseadd(){
       this.dialogVisibleAdd=false
     },
-    onSubmitAdd(){
+    onSubmitAdd(formName){
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
       let data = {
         isNotCar: 0,
         isNotDocumentary: 1,
@@ -779,6 +792,10 @@ export default {
               this.$message.error(res.msg)
             }
           });
+      } else {
+        return false;
+      }
+    });
     },
     selectionChange(val,ref) {
       this.selectionList = val;      

+ 14 - 5
src/views/FinancialManagement/CarInsurance/CompanySettlement/CarInsurance/DocumentaryFeesSettled.vue

@@ -51,7 +51,6 @@ export default {
             },
       dialogVisiblerecordDetail: false,
       dialogVisiblerecord: false,
-      recorddetailids:'',
       tableConfigDetailrecorddetail: {
                 columns: [
                     {
@@ -239,8 +238,7 @@ export default {
         },
     haldRecordDetail(row) {
             this.dialogVisiblerecordDetail = true
-            this.getListrecorddetail()
-            this.recorddetailids = row.ids
+            this.getListrecorddetail(row)
         },
         getListrecorddetail(data) {
             this.findPageDetailrecorddatail(data)
@@ -248,11 +246,22 @@ export default {
         findPageDetailrecorddatail(data) {
             this.tableConfigDetailrecorddetail.loading = true;
             this.$api.task
-                .fncplyFeeQuery({ ...data,ids:this.recorddetailids })
+                .fncplyFeeQuery({ 
+                  partnerCompaniesId: data.partnerCompaniesId,
+                  agreementType: '2',
+                  handlingFeesStatus: '1',
+                  isNotCar:'0',
+                  ...this.pageDatarecorddetail
+                })
                 .then(res => {
                     if (res.code == 200) {
+                      this.recordDetailData = res.data.content;
+                      this.pageDatarecorddetail = {
+                        pageNum: res.data.pageNum,
+                        pageSize: res.data.pageSize,
+                        totalSize: res.data.totalSize,
+                      }
                         this.tableConfigDetailrecorddetail.loading = false;
-                        this.recordDetailData = res.data.content ? res.data.content : []
                     }
                     else {
                         this.tableConfigDetailrecorddetail.loading = false;

+ 105 - 83
src/views/FinancialManagement/CarInsurance/CompanySettlement/CarInsurance/HandlingFees.vue

@@ -3,7 +3,7 @@
   <div class="container" style="width: 99%; margin-top: 0px">
     <templateTable custom :formList="formList" ref="templateTable" :searchData.sync="searchData"
       :tableConfig="tableConfig" :data="tableData" :btnGroup="btnGroup" @findPage="findPage"
-      @handleSearchList="handleSearchList" :pagination="pageData" @getList="getList">
+      @handleSearchList="handleSearchList" @areaSelectChange="areaSelectChange" :pagination="pageData" @getList="getList">
       <!-- <template slot="内部机构">
         <el-select v-model="labelData" placeholder="请选择" :popper-append-to-body="false" style="width: 100%" size="small">
           <el-option :value="selectTree" class="deptOption" disabled>
@@ -105,74 +105,74 @@
         <el-button size="small" type="primary" @click="handleSumbit('InvoicingData')">确 定</el-button>
       </span>
     </el-dialog>
-    <el-dialog title="新增" :visible.sync="dialogVisibleAdd" width="55%" :before-close="handleCloseadd">
-      <el-form ref="form" :model="formDataAdd" label-width="130px">
+    <el-dialog title="新增"  :visible.sync="dialogVisibleAdd" width="55%" :before-close="handleCloseadd">
+      <el-form ref="formDataAdd" :rules="rulesAdd" :model="formDataAdd" label-width="130px">
         <el-row>
           <el-col :span="8">
-            <el-form-item label="车牌号">
+            <el-form-item label="车牌号" prop="licenseno">
               <el-input v-model="formDataAdd.licenseno" size="small"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="被保险人">
+            <el-form-item label="被保险人" prop="insuredName">
               <el-input v-model="formDataAdd.insuredName" size="small"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="交强保单号">
+            <el-form-item label="交强保单号" prop="policyno">
               <el-input v-model="formDataAdd.policyno" size="small"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="商业保单号">
+            <el-form-item label="商业保单号" prop="syPolicyno">
               <el-input v-model="formDataAdd.syPolicyno" size="small"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="交强险保费">
+            <el-form-item label="交强险保费" prop="jqPremium">
               <el-input v-model="formDataAdd.jqPremium" size="small"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="车船税">
+            <el-form-item label="车船税" prop="taxamount">
               <el-input v-model="formDataAdd.taxamount" size="small"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="商业险保费">
+            <el-form-item label="商业险保费" prop="syPremium">
               <el-input v-model="formDataAdd.syPremium" size="small"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="交强手续费比例">
+            <el-form-item label="交强手续费比例" prop="jqSuperviseCostsProportion">
               <el-input v-model="formDataAdd.jqSuperviseCostsProportion" size="small"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="商业手续费比例">
+            <el-form-item label="商业手续费比例" prop="sySuperviseCostsProportion">
               <el-input v-model="formDataAdd.sySuperviseCostsProportion" size="small"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="手续费金额">
+            <el-form-item label="手续费金额" prop="commissionFeevalue">
               <el-input v-model="formDataAdd.commissionFeevalue" size="small"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="保司机构">
+            <el-form-item label="保司机构" prop="partnerCompaniesId">
               <el-cascader v-model="formDataAdd.partnerCompaniesId" size="small" :show-all-levels="false" ize="small"
                 :options="ztreeNodes" :props="optionProps" clearable filterable></el-cascader>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="保险公司">
+            <el-form-item label="保险公司" prop="companyId">
               <el-select size="small" clearable v-model="formDataAdd.companyId" filterable>
                 <el-option v-for="(s, i) in InsCompanyList" :key="i" :label="s.name" :value="s.id"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="险种">
+            <el-form-item label="险种" prop="riskcode">
               <el-select v-model="formDataAdd.riskcode" multiple placeholder="选择险种" size="small">
                 <el-option v-for="item in InsInsuranceKindoptions" :key="item.dictValue" :label="item.dictTag"
                   :value="item.dictValue"></el-option>
@@ -180,7 +180,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="协议类型" prop="agreementType">
+            <el-form-item label="协议名称" prop="agreementId">
               <el-select size="small" v-model="formDataAdd.agreementId" placeholder="请选择协议类型" style="width: 100%">
                 <el-option v-for="item in agreementTypeoptions" :key="item.dictValue" :label="item.dictTag"
                   :value="item.dictValue"></el-option>
@@ -188,12 +188,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="类型">
-              <el-input v-model="formDataAdd.remarks" size="small"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="签单日期">
+            <el-form-item label="签单日期" prop="signDate">
               <el-date-picker size="small" v-model="formDataAdd.signDate" type="date" placeholder="选择日期"
                 value-format="yyyy-MM-dd">
               </el-date-picker>
@@ -203,15 +198,15 @@
       </el-form>
       <span slot="footer" class="dialog-footer">
         <el-button size="small" @click="dialogVisibleAdd = false">取消</el-button>
-        <el-button size="small" type="primary" @click="onSubmitAdd">保存</el-button>
+        <el-button size="small" type="primary" @click="onSubmitAdd('formDataAdd')">保存</el-button>
       </span>
     </el-dialog>
-    <el-dialog  :visible.sync="dialogVisibleprogress" width="25%" >
+    <el-dialog :visible.sync="dialogVisibleprogress" width="25%">
       <el-upload style="margin-bottom:10px" action="#" class="upload-demo" :limit="1" :auto-upload="false"
-            :on-change="drivingupload" :on-progress="handleProgress" ref="upload3" :file-list="fileList">
-            <el-button size="small" type="primary">点击上传</el-button>
-          </el-upload>
-      <el-progress  :percentage="progressPercent" :text-inside="true" :stroke-width="16" status="exception"> </el-progress>
+        :on-change="drivingupload" :on-progress="handleProgress" ref="upload3" :file-list="fileList">
+        <el-button size="small" type="primary">点击上传</el-button>
+      </el-upload>
+      <el-progress :percentage="progressPercent" :text-inside="true" :stroke-width="16" status="exception"> </el-progress>
     </el-dialog>
 
   </div>
@@ -233,9 +228,29 @@ export default {
   },
   data() {
     return {
-      fileList:[],
-      progressPercent:0,
-      dialogVisibleprogress:false,
+      rulesAdd: {
+        signDate: [
+          { required: true, message: '请输入签单日期', trigger: 'blur' },
+        ],
+        licenseno: [
+          { required: true, message: '请输入车牌号', trigger: 'blur' },
+        ],
+        syPolicyno: [
+          { required: true, message: '请输入交强保单号', trigger: 'blur' },
+        ],
+        commissionFeevalue: [
+          { required: true, message: '请输入手续费金额', trigger: 'blur' },
+        ],
+        companyId: [
+          { required: true, message: '请选择保险公司', trigger: 'change' }
+        ],
+        partnerCompaniesId: [
+          { required: true, message: '请选择保司机构', trigger: 'change' }
+        ],
+      },
+      fileList: [],
+      progressPercent: 0,
+      dialogVisibleprogress: false,
       InsInsuranceKindoptions: [],
       ztreeNodes: [],
       optionProps: {
@@ -322,7 +337,7 @@ export default {
           label: "险种",
           prop: "riskcode",
           type: "select",
-          options:[]
+          options: []
         },
 
         {
@@ -677,12 +692,12 @@ export default {
       this.$api.insCompany.dicType(type).then((res) => {
         if (res.code == 200) {
           this[type + "options"] = res.data.ddList;
-          if(type=='InsInsuranceKind'){
-              this.formList.forEach(e=>{
-                if(e.prop=='riskcode'){
-                  e.options=res.data.ddList
-                }
-              }) 
+          if (type == 'InsInsuranceKind') {
+            this.formList.forEach(e => {
+              if (e.prop == 'riskcode') {
+                e.options = res.data.ddList
+              }
+            })
           }
         }
       });
@@ -700,37 +715,44 @@ export default {
     handleCloseadd() {
       this.dialogVisibleAdd = false
     },
-    onSubmitAdd() {
-      let data = {
-        isNotCar: 0,
-        isNotDocumentary: 0,
-        companyName: this.formDataAdd.companyId ? this.InsCompanyList.find(val => val.id == this.formDataAdd.companyId).name : '',
-        partnerCompaniesName: this.formDataAdd.partnerCompaniesId ? this.InsCompanyList.find(val => val.id == this.formDataAdd.partnerCompaniesId).name : '',
-      }
-      this.$api.task.fncplyFeeInsert({ ...this.formDataAdd, ...data })
-        .then(res => {
-          if (res.code == 200) {
-            this.$message({
-              message: '新增成功' || res.msg,
-              type: 'success'
-            })
-            this.findPage()
-            this.dialogVisibleAdd = false
-          }
-          else {
-            this.$message.error(res.msg)
+    onSubmitAdd(formName) {
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          let data = {
+            isNotCar: 0,
+            isNotDocumentary: 0,
+            companyName: this.formDataAdd.companyId ? this.InsCompanyList.find(val => val.id == this.formDataAdd.companyId).name : '',
+            partnerCompaniesName: this.formDataAdd.partnerCompaniesId ? this.InsCompanyList.find(val => val.id == this.formDataAdd.partnerCompaniesId).name : '',
           }
-        });
+          this.$api.task.fncplyFeeInsert({ ...this.formDataAdd, ...data })
+            .then(res => {
+              if (res.code == 200) {
+                this.$message({
+                  message: '新增成功' || res.msg,
+                  type: 'success'
+                })
+                this.findPage()
+                this.dialogVisibleAdd = false
+              }
+              else {
+                this.$message.error(res.msg)
+              }
+            });
+        } else {
+          return false;
+        }
+      });
+
     },
-    handImport(){
-      this.fileList=[]
-      this.dialogVisibleprogress=true
+    handImport() {
+      this.fileList = []
+      this.dialogVisibleprogress = true
       this.progressPercent = 0
     },
     handleProgress(event) {
-        if (this.progressPercent < 99) {
-            this.progressPercent = parseInt(event.percent)
-        }
+      if (this.progressPercent < 99) {
+        this.progressPercent = parseInt(event.percent)
+      }
     },
     drivingupload(file, fileList) {
       this.progressPercent = 0
@@ -740,12 +762,12 @@ export default {
       params.append("isNotCar", "0");
       this.$api.task.bxImportData(params).then(res => {
         if (res.code == "200") {
-          this.fileList=fileList
-          this.progressPercent =100
+          this.fileList = fileList
+          this.progressPercent = 100
         }
         else {
-          this.fileList=[]
-          this.progressPercent =0
+          this.fileList = []
+          this.progressPercent = 0
           this.$message.error(res.msg)
         }
       });
@@ -754,8 +776,8 @@ export default {
 
       this.$refs[formName].validate((valid) => {
         if (valid) {
-          if(!this.selectionList[0].uploadUrl){
-            this.$message.error('请选择导出路径的数据!')
+          if(this.selectionList[0].uploadUrl){
+            this.$message.error('请选择导出路径为空的数据!')
             return false
           }
           let data = {
@@ -852,7 +874,7 @@ export default {
     getList(data) {
       this.findPage(data)
     },
-    handExport(){
+    handExport() {
 
     },
     tablePageChange(val) {
@@ -867,7 +889,7 @@ export default {
       this.assembly('bxHandlingExcel', 1)
     },
     uploadUrlClick(e) {
-      let url = process.env.BASE_URL +e; // 3.创建一个临时的url指向blob对象
+      let url = process.env.BASE_URL + e; // 3.创建一个临时的url指向blob对象
       let a = document.createElement("a");
       a.href = url;
       a.download = "导出文件.xlsx";
@@ -916,20 +938,20 @@ export default {
       this.dialogVisibleBatch = true
       this.findPagegbatch()
     },
-    selectAll (selection,ref){
-          ref.clearSelection()
-          return
+    selectAll(selection, ref) {
+      ref.clearSelection()
+      return
     },
-    selectionChange(val,ref) {
-      if(val.length > 1){
-          const del_row = val.shift()
-          ref.toggleRowSelection(del_row,false) //设置这一行取消选中
-        }
-    this.selectionList = val;      
+    selectionChange(val, ref) {
+      if (val.length > 1) {
+        const del_row = val.shift()
+        ref.toggleRowSelection(del_row, false) //设置这一行取消选中
+      }
+      this.selectionList = val;
     },
     findPagegbatch() {
       this.tableConfigbatch.loading = true
-      this.$api.task.importAsyncQuery({...this.pageDataPro,handStatus:0})
+      this.$api.task.importAsyncQuery({ ...this.pageDataPro, handStatus: 0 })
         .then(res => {
           if (res.code == 200) {
             this.tableConfigbatch.loading = false

+ 50 - 33
src/views/FinancialManagement/CarInsurance/CompanySettlement/NoCarInsurance/DocumentaryFeesDetail.vue

@@ -29,58 +29,54 @@
     <el-button   size="small" type="primary" @click="onSubmit">保存</el-button>
   </span>
 </el-dialog>
-<el-dialog
-    title="新增"
-    :visible.sync="dialogVisibleAdd"
-    width="55%"
-    :before-close="handleCloseadd">
-    <el-form ref="form" :model="formDataAdd" label-width="130px">
+<el-dialog title="新增"  :visible.sync="dialogVisibleAdd" width="55%" :before-close="handleCloseadd">
+      <el-form ref="formDataAdd" :rules="rulesAdd" :model="formDataAdd" label-width="140px">
         <el-row>
           <el-col :span="8">
-            <el-form-item label="车牌号">
+            <el-form-item label="车牌号" prop="licenseno">
               <el-input v-model="formDataAdd.licenseno" size="small"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="被保险人">
+            <el-form-item label="被保险人" prop="insuredName">
               <el-input v-model="formDataAdd.insuredName" size="small"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="跟单费金额费金额">
-              <el-input v-model="formDataAdd.otherFeevalue" size="small"></el-input>
+            <el-form-item label="非车保单号" prop="noPolicyno">
+              <el-input v-model="formDataAdd.noPolicyno" size="small"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="非车保单号">
-              <el-input v-model="formDataAdd.noPolicyno" size="small"></el-input>
+            <el-form-item label="非车保费" prop="noPremium">
+              <el-input v-model="formDataAdd.noPremium" size="small"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="非车保费">
-              <el-input v-model="formDataAdd.noPremium" size="small"></el-input>
+            <el-form-item label="非车手续费比例" prop="noSuperviseCostsProportion">
+              <el-input v-model="formDataAdd.noSuperviseCostsProportion" size="small"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="非车跟单比例">
-              <el-input v-model="formDataAdd.noOtherCostsProportion" size="small"></el-input>
+            <el-form-item label="跟单费金额费金额" prop="otherFeevalue">
+              <el-input v-model="formDataAdd.otherFeevalue" size="small"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="保司机构">
+            <el-form-item label="保司机构" prop="partnerCompaniesId">
               <el-cascader v-model="formDataAdd.partnerCompaniesId" size="small" :show-all-levels="false" ize="small"
                 :options="ztreeNodes" :props="optionProps" clearable filterable></el-cascader>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="保险公司">
+            <el-form-item label="保险公司" prop="companyId">
               <el-select size="small" clearable v-model="formDataAdd.companyId" filterable>
                 <el-option v-for="(s, i) in InsCompanyList" :key="i" :label="s.name" :value="s.id"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="险种">
+            <el-form-item label="险种" prop="riskcode">
               <el-select v-model="formDataAdd.riskcode" multiple placeholder="选择险种" size="small">
                 <el-option v-for="item in InsInsuranceKindoptions" :key="item.dictValue" :label="item.dictTag"
                   :value="item.dictValue"></el-option>
@@ -88,7 +84,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="协议类型" prop="agreementType">
+            <el-form-item label="协议名称" prop="agreementId">
               <el-select size="small" v-model="formDataAdd.agreementId" placeholder="请选择协议类型" style="width: 100%">
                 <el-option v-for="item in agreementTypeoptions" :key="item.dictValue" :label="item.dictTag"
                   :value="item.dictValue"></el-option>
@@ -96,12 +92,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="类型">
-              <el-input v-model="formDataAdd.remarks" size="small"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="签单日期">
+            <el-form-item label="签单日期" prop="signDate">
               <el-date-picker size="small" v-model="formDataAdd.signDate" type="date" placeholder="选择日期"
                 value-format="yyyy-MM-dd">
               </el-date-picker>
@@ -109,11 +100,11 @@
           </el-col>
         </el-row>
       </el-form>
-    <span slot="footer" class="dialog-footer">
-    <el-button size="small" @click="dialogVisibleAdd = false">取消</el-button>
-    <el-button   size="small" type="primary" @click="onSubmitAdd">保存</el-button>
-  </span>
-  </el-dialog>
+      <span slot="footer" class="dialog-footer">
+        <el-button size="small" @click="dialogVisibleAdd = false">取消</el-button>
+        <el-button size="small" type="primary" @click="onSubmitAdd('formDataAdd')">保存</el-button>
+      </span>
+    </el-dialog>
   <el-dialog  :visible.sync="dialogVisibleradio" width="40%" >
       <el-upload style="margin-bottom:10px" action="#" class="upload-demo" :limit="1" :auto-upload="false"
             :on-change="drivinguploadRadio"  ref="upload3" :file-list="fileListRadio">
@@ -195,6 +186,26 @@ export default {
   },
   data() {
     return {
+      rulesAdd: {
+        signDate: [
+          { required: true, message: '请输入签单日期', trigger: 'blur' },
+        ],
+        licenseno: [
+          { required: true, message: '请输入车牌号', trigger: 'blur' },
+        ],
+        noPolicyno: [
+          { required: true, message: '请输入非车保单号', trigger: 'blur' },
+        ],
+        otherFeevalue: [
+          { required: true, message: '请输入跟单费金额费金额', trigger: 'blur' },
+        ],
+        companyId: [
+          { required: true, message: '请选择保险公司', trigger: 'change' }
+        ],
+        partnerCompaniesId: [
+          { required: true, message: '请选择保司机构', trigger: 'change' }
+        ],
+      },
       fileListBatchId:'',
       tableDataRadio:{},
       fileListRadio:[],
@@ -399,7 +410,7 @@ export default {
           },
           {
             prop: "noSuperviseCostsPremiums",
-            label: "非车跟单费金额",
+            label: "非车跟单费金额费金额",
             type: "text"
           },
           {
@@ -696,7 +707,9 @@ drivinguploadBatchs(file, fileList){
     handleCloseadd(){
       this.dialogVisibleAdd=false
     },
-    onSubmitAdd(){
+    onSubmitAdd(formName){
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
       let data={
         isNotCar:1,
         isNotDocumentary:1,
@@ -717,6 +730,10 @@ drivinguploadBatchs(file, fileList){
               this.$message.error(res.msg)
             }
           });
+        } else {
+          return false;
+        }
+      });
     },
     selectionChange(val,ref) {
       this.selectionList = val;      

+ 19 - 4
src/views/FinancialManagement/CarInsurance/CompanySettlement/NoCarInsurance/DocumentaryFeesSettled.vue

@@ -191,6 +191,11 @@ export default {
             type: 'primary',
             label: '记录',
             click: (row, index) => { return this.haldRecord(row) },
+          },
+          {
+              type: 'primary',
+              label: '明细',
+              click: (row, index) => { return this.haldRecordDetail(row) },
           }
         ]
 
@@ -215,8 +220,7 @@ export default {
         },
     haldRecordDetail(row) {
             this.dialogVisiblerecordDetail = true
-            this.getListrecorddetail()
-            this.recorddetailids = row.ids
+            this.getListrecorddetail(row)
         },
         getListrecorddetail(data) {
             this.findPageDetailrecorddatail(data)
@@ -224,11 +228,22 @@ export default {
         findPageDetailrecorddatail(data) {
             this.tableConfigDetailrecorddetail.loading = true;
             this.$api.task
-                .fncplyFeeQuery({ ...data,ids:this.recorddetailids })
+                .fncplyFeeQuery({ 
+                  partnerCompaniesId: data.partnerCompaniesId,
+                  agreementType: '2',
+                  handlingFeesStatus: '1',
+                  isNotCar:'1',
+                  ...this.pageDatarecorddetail
+                 })
                 .then(res => {
                     if (res.code == 200) {
+                      this.recordDetailData = res.data.content;
+                      this.pageDatarecorddetail = {
+                        pageNum: res.data.pageNum,
+                        pageSize: res.data.pageSize,
+                        totalSize: res.data.totalSize,
+                      }
                         this.tableConfigDetailrecorddetail.loading = false;
-                        this.recordDetailData = res.data.content ? res.data.content : []
                     }
                     else {
                         this.tableConfigDetailrecorddetail.loading = false;

+ 47 - 32
src/views/FinancialManagement/CarInsurance/CompanySettlement/NoCarInsurance/HandlingFees.vue

@@ -74,55 +74,54 @@
         <el-button size="small" type="primary" @click="handleSumbit('InvoicingData')">确 定</el-button>
       </span>
     </el-dialog>
-    <el-dialog title="新增" :visible.sync="dialogVisibleAdd" width="55%" :before-close="handleCloseadd">
-      <el-form ref="form" :model="formDataAdd" label-width="130px">
+    <el-dialog title="新增"  :visible.sync="dialogVisibleAdd" width="55%" :before-close="handleCloseadd">
+      <el-form ref="formDataAdd" :rules="rulesAdd" :model="formDataAdd" label-width="130px">
         <el-row>
           <el-col :span="8">
-            <el-form-item label="车牌号">
+            <el-form-item label="车牌号" prop="licenseno">
               <el-input v-model="formDataAdd.licenseno" size="small"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="被保险人">
+            <el-form-item label="被保险人" prop="insuredName">
               <el-input v-model="formDataAdd.insuredName" size="small"></el-input>
             </el-form-item>
           </el-col>
-
           <el-col :span="8">
-            <el-form-item label="手续费金额">
-              <el-input v-model="formDataAdd.commissionFeevalue" size="small"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="非车保单号">
+            <el-form-item label="非车保单号" prop="noPolicyno">
               <el-input v-model="formDataAdd.noPolicyno" size="small"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="非车保费">
+            <el-form-item label="非车保费" prop="noPremium">
               <el-input v-model="formDataAdd.noPremium" size="small"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="非车手续费比例">
+            <el-form-item label="非车手续费比例" prop="noSuperviseCostsProportion">
               <el-input v-model="formDataAdd.noSuperviseCostsProportion" size="small"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="保司机构">
+            <el-form-item label="手续费金额" prop="commissionFeevalue">
+              <el-input v-model="formDataAdd.commissionFeevalue" size="small"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="保司机构" prop="partnerCompaniesId">
               <el-cascader v-model="formDataAdd.partnerCompaniesId" size="small" :show-all-levels="false" ize="small"
                 :options="ztreeNodes" :props="optionProps" clearable filterable></el-cascader>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="保险公司">
+            <el-form-item label="保险公司" prop="companyId">
               <el-select size="small" clearable v-model="formDataAdd.companyId" filterable>
                 <el-option v-for="(s, i) in InsCompanyList" :key="i" :label="s.name" :value="s.id"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="险种">
+            <el-form-item label="险种" prop="riskcode">
               <el-select v-model="formDataAdd.riskcode" multiple placeholder="选择险种" size="small">
                 <el-option v-for="item in InsInsuranceKindoptions" :key="item.dictValue" :label="item.dictTag"
                   :value="item.dictValue"></el-option>
@@ -130,7 +129,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="协议类型" prop="agreementType">
+            <el-form-item label="协议名称" prop="agreementId">
               <el-select size="small" v-model="formDataAdd.agreementId" placeholder="请选择协议类型" style="width: 100%">
                 <el-option v-for="item in agreementTypeoptions" :key="item.dictValue" :label="item.dictTag"
                   :value="item.dictValue"></el-option>
@@ -138,12 +137,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="类型">
-              <el-input v-model="formDataAdd.remarks" size="small"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="签单日期">
+            <el-form-item label="签单日期" prop="signDate">
               <el-date-picker size="small" v-model="formDataAdd.signDate" type="date" placeholder="选择日期"
                 value-format="yyyy-MM-dd">
               </el-date-picker>
@@ -153,7 +147,7 @@
       </el-form>
       <span slot="footer" class="dialog-footer">
         <el-button size="small" @click="dialogVisibleAdd = false">取消</el-button>
-        <el-button size="small" type="primary" @click="onSubmitAdd">保存</el-button>
+        <el-button size="small" type="primary" @click="onSubmitAdd('formDataAdd')">保存</el-button>
       </span>
     </el-dialog>
     <el-dialog  :visible.sync="dialogVisibleprogress" width="25%" >
@@ -182,6 +176,26 @@ export default {
   },
   data() {
     return {
+      rulesAdd: {
+        signDate: [
+          { required: true, message: '请输入签单日期', trigger: 'blur' },
+        ],
+        licenseno: [
+          { required: true, message: '请输入车牌号', trigger: 'blur' },
+        ],
+        noPolicyno: [
+          { required: true, message: '请输入非车保单号', trigger: 'blur' },
+        ],
+        commissionFeevalue: [
+          { required: true, message: '请输入手续费金额', trigger: 'blur' },
+        ],
+        companyId: [
+          { required: true, message: '请选择保险公司', trigger: 'change' }
+        ],
+        partnerCompaniesId: [
+          { required: true, message: '请选择保司机构', trigger: 'change' }
+        ],
+      },
       pageDataPro: {
         pageNum: 1,
         pageSize: 20,
@@ -389,11 +403,6 @@ export default {
             label: "被保险人",
             type: "text"
           },
-          {
-            prop: "companyName",
-            label: "保险公司",
-            type: "text"
-          },
           {
             prop: "riskcode",
             label: "险种",
@@ -661,7 +670,9 @@ export default {
     handleCloseadd() {
       this.dialogVisibleAdd = false
     },
-    onSubmitAdd() {
+    onSubmitAdd(formName) {
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
       let data = {
         isNotCar: 1,
         isNotDocumentary: 0,
@@ -682,6 +693,10 @@ export default {
             this.$message.error(res.msg)
           }
         });
+      } else {
+          return false;
+        }
+      });
     },
     handImport(){
       this.fileList=[]
@@ -846,8 +861,8 @@ export default {
     handleSumbit(formName) {
       this.$refs[formName].validate((valid) => {
         if (valid) {
-          if(!this.selectionList[0].uploadUrl){
-            this.$message.error('请选择导出路径的数据!')
+          if(this.selectionList[0].uploadUrl){
+            this.$message.error('请选择导出路径为空的数据!')
             return false
           }
           let data = {

+ 9 - 1
src/views/FinancialManagement/WithdrawalManagement/GeneralizationEnd.vue

@@ -9,9 +9,15 @@
           label-width="130px"
           size="small"
         >
-          <el-form-item label="业务员工号">
+        <el-form-item label="业务员工号">
             <el-input v-model="queryForm.userId" placeholder="业务员工号" clearable></el-input>
           </el-form-item>
+          <el-form-item label="业务员姓名">
+            <el-input v-model="queryForm.userName" placeholder="业务员姓名" clearable></el-input>
+          </el-form-item>
+          <el-form-item label="电话">
+            <el-input v-model="queryForm.mobile" placeholder="电话" clearable></el-input>
+          </el-form-item>
           <el-form-item label="提现单号">
             <el-input v-model="queryForm.id" placeholder="提现单号" clearable></el-input>
           </el-form-item>
@@ -67,11 +73,13 @@ export default {
         { prop: "id", label: "提现单号" },
         { prop: "userId", label: "业务员工号" },
         { prop: "userName", label: "业务员姓名" },
+        { prop: "mobile", label: "电话" },
         { prop: "deptId", label: "机构代码" },
         { prop: "deptName", label: "机构名称" },
         { prop: "amount", label: "提现金额" },
         { prop: "surplusAmount", label: "账户余额" },
         { prop: "bankAccount", label: "开户行" },
+        { prop: "bankAccount", label: "银行" },
         { prop: "bankNumber", label: "账号" },
         { prop: "voucherId", label: "凭证号" },
         { prop: "createTime", label: "提现时间" }

+ 9 - 1
src/views/FinancialManagement/WithdrawalManagement/GeneralizationPending.vue

@@ -9,9 +9,15 @@
           label-width="130px"
           size="small"
         >
-          <el-form-item label="业务员工号">
+        <el-form-item label="业务员工号">
             <el-input v-model="queryForm.userId" placeholder="业务员工号" clearable></el-input>
           </el-form-item>
+          <el-form-item label="业务员姓名">
+            <el-input v-model="queryForm.userName" placeholder="业务员姓名" clearable></el-input>
+          </el-form-item>
+          <el-form-item label="电话">
+            <el-input v-model="queryForm.mobile" placeholder="电话" clearable></el-input>
+          </el-form-item>
           <el-form-item label="提现单号">
             <el-input v-model="queryForm.id" placeholder="提现单号" clearable></el-input>
           </el-form-item>
@@ -99,11 +105,13 @@ export default {
         { prop: "id", label: "提现单号" },
         { prop: "userId", label: "业务员工号" },
         { prop: "userName", label: "业务员姓名" },
+        { prop: "mobile", label: "电话" },
         { prop: "deptId", label: "机构代码" },
         { prop: "deptName", label: "机构名称" },
         { prop: "amount", label: "提现金额" },
         { prop: "surplusAmount", label: "账户余额" },
         { prop: "bankAccount", label: "开户行" },
+        { prop: "bankAccount", label: "银行" },
         { prop: "bankNumber", label: "账号" },
         { prop: "createTime", label: "提现时间" }
       ],

+ 9 - 1
src/views/FinancialManagement/WithdrawalManagement/NonDocumentaryEnd.vue

@@ -9,9 +9,15 @@
           label-width="130px"
           size="small"
         >
-          <el-form-item label="业务员工号">
+        <el-form-item label="业务员工号">
             <el-input v-model="queryForm.userId" placeholder="业务员工号" clearable></el-input>
           </el-form-item>
+          <el-form-item label="业务员姓名">
+            <el-input v-model="queryForm.userName" placeholder="业务员姓名" clearable></el-input>
+          </el-form-item>
+          <el-form-item label="电话">
+            <el-input v-model="queryForm.mobile" placeholder="电话" clearable></el-input>
+          </el-form-item>
           <el-form-item label="提现单号">
             <el-input v-model="queryForm.id" placeholder="提现单号" clearable></el-input>
           </el-form-item>
@@ -67,11 +73,13 @@ export default {
         { prop: "id", label: "提现单号" },
         { prop: "userId", label: "业务员工号" },
         { prop: "userName", label: "业务员姓名" },
+        { prop: "mobile", label: "电话" },
         { prop: "deptId", label: "机构代码" },
         { prop: "deptName", label: "机构名称" },
         { prop: "amount", label: "提现金额" },
         { prop: "surplusAmount", label: "账户余额" },
         { prop: "bankAccount", label: "开户行" },
+        { prop: "bankAccount", label: "银行" },
         { prop: "bankNumber", label: "账号" },
         { prop: "voucherId", label: "凭证号" },
         { prop: "createTime", label: "提现时间" }

+ 9 - 1
src/views/FinancialManagement/WithdrawalManagement/NonDocumentaryPending.vue

@@ -9,9 +9,15 @@
           label-width="130px"
           size="small"
         >
-          <el-form-item label="业务员工号">
+        <el-form-item label="业务员工号">
             <el-input v-model="queryForm.userId" placeholder="业务员工号" clearable></el-input>
           </el-form-item>
+          <el-form-item label="业务员姓名">
+            <el-input v-model="queryForm.userName" placeholder="业务员姓名" clearable></el-input>
+          </el-form-item>
+          <el-form-item label="电话">
+            <el-input v-model="queryForm.mobile" placeholder="电话" clearable></el-input>
+          </el-form-item>
           <el-form-item label="提现单号">
             <el-input v-model="queryForm.id" placeholder="提现单号" clearable></el-input>
           </el-form-item>
@@ -99,12 +105,14 @@ export default {
         { prop: "id", label: "提现单号" },
         { prop: "userId", label: "业务员工号" },
         { prop: "userName", label: "业务员姓名" },
+        { prop: "mobile", label: "电话" },
         { prop: "deptId", label: "机构代码" },
         { prop: "deptName", label: "机构名称" },
         { prop: "amount", label: "提现金额" },
         { prop: "surplusAmount", label: "账户余额" },
         { prop: "bankAccount", label: "开户行" },
         { prop: "bankNumber", label: "账号" },
+        { prop: "bankNumber", label: "账号" },
         { prop: "createTime", label: "提现时间" }
       ],
     };

+ 10 - 2
src/views/FinancialManagement/WithdrawalManagement/WithdrawalProceduresEnd.vue

@@ -9,9 +9,15 @@
           label-width="130px"
           size="small"
         >
-          <el-form-item label="业务员工号">
+        <el-form-item label="业务员工号">
             <el-input v-model="queryForm.userId" placeholder="业务员工号" clearable></el-input>
           </el-form-item>
+          <el-form-item label="业务员姓名">
+            <el-input v-model="queryForm.userName" placeholder="业务员姓名" clearable></el-input>
+          </el-form-item>
+          <el-form-item label="电话">
+            <el-input v-model="queryForm.mobile" placeholder="电话" clearable></el-input>
+          </el-form-item>
           <el-form-item label="提现单号">
             <el-input v-model="queryForm.id" placeholder="提现单号" clearable></el-input>
           </el-form-item>
@@ -67,11 +73,13 @@ export default {
         { prop: "id", label: "提现单号" },
         { prop: "userId", label: "业务员工号" },
         { prop: "userName", label: "业务员姓名" },
+        { prop: "mobile", label: "电话" },
         { prop: "deptId", label: "机构代码" },
         { prop: "deptName", label: "机构名称" },
         { prop: "amount", label: "提现金额" },
         { prop: "surplusAmount", label: "账户余额" },
-        { prop: "bankAccount", label: "开户行" },
+        { prop: "bankAddress", label: "开户行" },
+        { prop: "bankAccount", label: "银行" },
         { prop: "bankNumber", label: "账号" },
         { prop: "voucherId", label: "凭证号" },
         { prop: "createTime", label: "提现时间" }

+ 1 - 1
src/views/FinancialManagement/WithdrawalManagement/WithdrawalProceduresPending.vue

@@ -110,8 +110,8 @@ export default {
         { prop: "deptName", label: "机构名称" },
         { prop: "amount", label: "提现金额" },
         { prop: "surplusAmount", label: "账户余额" },
-        { prop: "bankAccount", label: "银行" },
         { prop: "bankAddress", label: "开户行" },
+        { prop: "bankAccount", label: "银行" },
         { prop: "bankNumber", label: "账号" },
         { prop: "createTime", label: "提现时间" }
       ],

+ 2 - 2
src/views/Task/daikeComponents/KtLetter.vue

@@ -8062,7 +8062,7 @@ export default {
 
           this.$api.letter.getThemeByUserId().then(res => {
             if (res.code == 200) {
-              if (res.data.themeCode == 'GD') {
+              if(res.data[0]=='GD'){
                 this.$refs.quotationDialogPro.setBackupVisible(true);
               }
               else {
@@ -8100,7 +8100,7 @@ export default {
           let qrCodeUrl = res.data.qrCodeUrl
           this.$api.letter.getThemeByUserId().then(res => {
             if (res.code == 200) {
-              if (res.data.themeCode == 'GD') {
+              if(res.data[0]=='GD'){
                 this.codedialogVisiblePro = true;
                 this.qrcodeWidth = "154";
                 this.qrcodeHeight = "154";

+ 2 - 2
src/views/Task/daikeComponents/KtOrder.vue

@@ -881,7 +881,7 @@ export default {
           this.queryOrders = data;
           this.$api.letter.getThemeByUserId().then(res => {
             if (res.code==200) {
-              if(res.data.themeCode=='GD'){
+              if(res.data[0]=='GD'){
                 this.$refs.quotationDialogPro.setBackupVisible(true);
               }
               else {
@@ -1145,7 +1145,7 @@ export default {
           let qrCodeUrl=res.data.qrCodeUrl
           this.$api.letter.getThemeByUserId().then(res => {
             if (res.code==200) {
-              if(res.data.themeCode=='GD'){
+              if(res.data[0]=='GD'){
                 this.codedialogVisiblePro = true;
                 this.qrcodeWidth = "154";
                 this.qrcodeHeight = "154";