二维码第一次不显示问题；财务结算修改

src/main.js

@@ -79,7 +79,6 @@ Vue.directive('watermark', {
     // watermarkDiv.style.backgroundSize = '100% 100%';
     // watermarkDiv.style.backgroundColor = 'rgba(255,255,255,0.1)';
     watermarkDiv.style.zIndex = '1000';
-    console.log(el.offsetHeight,222222222222);
     el.appendChild(watermarkDiv);
   }
 });

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

@@ -127,7 +127,6 @@ export default {
         pageSize: 20,
         agreementType :2,
         handlingFeesStatus : 0,
-        documentaryFeesStatus: 0,
         isNotCar: 0,
         isNotDocumentary:  1,
       },
@@ -223,21 +222,6 @@ export default {
             label: "商业跟单金额",
             type: "text"
           },
-          {
-          label: "结算状态",
-          prop: "handlingFeesStatus",
-          type: "statMap",
-          options:[
-            {
-              label:'已结算',
-              value:'1'
-            },{
-              label:'未结算',
-              value:'0'
-            }
-          ],
-          
-        }, 
         ],
         isPaginationShow:true,
         loading: true,

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

@@ -1,6 +1,6 @@
 <template>
   <!--布局容器-->
-  <div class="container" style="width: 99%; margin-top: 0px">
+  <div class="invoiceAnd" style="width: 99%; margin-top: 0px">
     <templateTable :formList="formList" :searchData.sync="searchData" :tableConfig="tableConfig" :data="tableData"
       @findPage="findPage" @handleSearchList="handleSearchList" :pagination="pageData">
       <template slot="data">
@@ -77,7 +77,7 @@ export default {
             label: "已开票未结算跟单费",
             type: "text"
           }, {
-            prop: "noInvoicCommissionFeev",
+            prop: "noInvoicCommissionFeevalue",
             label: "未开票跟单费",
             type: "text"
           },
@@ -146,5 +146,10 @@ export default {
 };
 </script>
     
-<style scoped></style>
+<style scoped>
+
+.invoiceAnd >>>.el-table__body-wrapper {
+    overflow-y: auto !important;
+    height: auto !important;
+  }</style>
     

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

@@ -76,7 +76,7 @@ export default {
             type: "text"
           },
           {
-            prop: "unsettledAmount",
+            prop: "unSettledAmount",
             label: "未结算跟单费",
             type: "text"
           },
@@ -129,7 +129,7 @@ export default {
             type:'primary',
             label:'结算',
             hide:(row)=>{
-              return row.handlingFeesStatus == 0?true:false
+              return row.invoicCommissionFeevalue?true:false
             },
             click:(row, index) => {return this.openBalanceFun(row)},
         },

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

@@ -533,7 +533,7 @@ export default {
     },
     templateDownload(){
       let a = document.createElement('a')
-      a.href = `${process.env.BASE_URL}template/handlingFeeTemplate.xlsx`;
+      a.href = `${process.env.BASE_URL}/template/handlingFeeTemplate.xlsx`;
       a.click();
     },
     haldUpload(row){

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

@@ -1,6 +1,6 @@
 <template>
     <!--布局容器-->
-    <div class="container" style="width: 99%; margin-top: 0px">
+    <div class="invoiceAnd" style="width: 99%; margin-top: 0px">
         <templateTable :formList="formList" :searchData.sync="searchData" :tableConfig="tableConfig" :data="tableData"
             @findPage="findPage" @handleSearchList="handleSearchList" :pagination="pageData" @getList="getList">
             <template slot="data">
@@ -86,7 +86,7 @@ export default {
                 loading: true,
                 isPaginationShow: true,
                 showSummary:true,
-                tableHeight:'none'
+                tableHeight:'auto'
                 // optBtns: [
                 //     {
                 //         type: 'primary',
@@ -180,6 +180,11 @@ export default {
     }
 };
 </script>
-  
-<style scoped></style>
+
+<style scoped>
+.invoiceAnd >>>.el-table__body-wrapper {
+    overflow-y: auto !important;
+    height: auto !important;
+  }
+  </style>
   

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

@@ -117,7 +117,6 @@ export default {
         pageSize: 20,
         agreementType :2,
         handlingFeesStatus : 0,
-        documentaryFeesStatus: 0,
         isNotCar: 1,
         isNotDocumentary:  1,
       },
@@ -178,21 +177,6 @@ export default {
             label: "跟单费比例",
             type: "text"
           },
-          {
-          label: "结算状态",
-          prop: "handlingFeesStatus",
-          type: "statMap",
-          options:[
-            {
-              label:'已结算',
-              value:'1'
-            },{
-              label:'未结算',
-              value:'0'
-            }
-          ],
-          
-        }, 
         ],
         isPaginationShow:true,
         loading: true,

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

@@ -1,6 +1,6 @@
 <template>
   <!--布局容器-->
-  <div class="container" style="width: 99%; margin-top: 0px">
+  <div class="invoiceAnd" style="width: 99%; margin-top: 0px">
     <templateTable :formList="formList" :searchData.sync="searchData" :tableConfig="tableConfig" :data="tableData"
       @findPage="findPage" @handleSearchList="handleSearchList" :pagination="pageData">
       <template slot="data">
@@ -78,7 +78,7 @@ export default {
             label: "已开票未结算跟单费",
             type: "text"
           }, {
-            prop: "noInvoicCommissionFeev",
+            prop: "noInvoicCommissionFeevalue",
             label: "未开票跟单费",
             type: "text"
           },
@@ -147,5 +147,9 @@ export default {
 };
 </script>
     
-<style scoped></style>
-    
+<style scoped>
+
+.invoiceAnd >>>.el-table__body-wrapper {
+    overflow-y: auto !important;
+    height: auto !important;
+  }</style>

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

@@ -75,7 +75,7 @@ export default {
             type: "text"
           },
           {
-            prop: "unsettledAmount",
+            prop: "unSettledAmount",
             label: "未结算跟单费",
             type: "text"
           },
@@ -129,7 +129,7 @@ export default {
             type:'primary',
             label:'结算',
             hide:(row)=>{
-              return row.handlingFeesStatus == 0?true:false
+              return row.invoicCommissionFeevalue?true:false
             },
             click:(row, index) => {return this.openBalanceFun(row)},
         },

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

@@ -1,6 +1,6 @@
 <template>
     <!--布局容器-->
-    <div class="container" style="width: 99%; margin-top: 0px">
+    <div class="invoiceAnd" style="width: 99%; margin-top: 0px">
         <templateTable :formList="formList" :searchData.sync="searchData" :tableConfig="tableConfig" :data="tableData"
             @findPage="findPage" @handleSearchList="handleSearchList" :pagination="pageData" @getList="getList">
             <template slot="data">
@@ -180,5 +180,10 @@ export default {
 };
 </script>
   
-<style scoped></style>
+<style scoped>
+
+.invoiceAnd >>>.el-table__body-wrapper {
+    overflow-y: auto !important;
+    height: auto !important;
+  }</style>
   

src/views/FinancialManagement/CarInsurance/DeptSettlement/UnsettledCommissionListExamine.vue

@@ -21,10 +21,30 @@
 
       <kt-common-table :operationWidth="240" :showBatchDelete="false" :showBatchPrint="false"
         permsButton3="sys:unsettledCommissionListExamine:audit" :data="pageResult" :columns="columns" @findPage="findPage"
-        button3Name="审核" button3Background="#00B0F0" @handleButton3="handleButton3" @handlePrint="handlePrint">
+        button3Name="审核驳回" button3Type="text"  @handleButton3="handleButton3" 
+        button4Type="text"  button4Name="审核通过"  @handleButton4="handleButton4" @handlePrint="handlePrint">
       </kt-common-table>
     </el-main>
-
+    <el-dialog
+      :visible.sync="dialogVisibleBatch"
+      width="35%"
+      :before-close="handleCloseBatch">
+      <p >凭证号 ：<el-input style="width: 200px;" v-model="voucherId" placeholder="请输入凭证号"></el-input></p>
+      <div style="display: flex">上传图片：  <el-upload
+                action="#"
+                :auto-upload="false"
+                accept=".png, .jpg, .jpeg"
+                :show-file-list="false"
+                :on-change="drivingupload">
+                <img v-if="qrCodeImage" :src="qrCodeImage"  class="avatar">
+                <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+              </el-upload>
+          </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button size="small" @click="dialogVisibleBatch = false">取 消</el-button>
+        <el-button size="small" type="primary" @click="handleSumbit()">确 定</el-button>
+      </span>
+    </el-dialog>
 
   </div>
 </template>
@@ -33,10 +53,6 @@ import Cookies from "js-cookie"
 import KtCommonTable from "@/views/Core/KtCommonTable.vue"; //表格组件
 import KtButton from "@/views/Core/KtButton";
 import CommonUtil from "@/utils/comutil.js";
-import {
-  formatWithSeperator,
-  format
-} from "@/utils/datetime.js";
 export default {
   components: {
     KtCommonTable,
@@ -44,9 +60,13 @@ export default {
   },
   data() {
     return {
+      dialogVisibleBatch:false,
+      voucherId:'',
+      qrCodeImage:'',
+      picId:'',
       peopleid: "",
       peopledeptid: "",
-
+      rowlist:{},
       // 右侧列表查询数据Start
       queryForm: {},
       pageResult: {},
@@ -62,22 +82,11 @@ export default {
         { prop: "amount", label: "提现金额" },
         { prop: "createTime", label: "申请时间" }
       ],
-      //------------协议下拉框数据   begin-----------------
       agreementtypeoptions: [], //协议类型
-      //------------协议下拉框数据   end-----------------
     };
   },
   created() {
-    // this.peopleid = Cookies.get('user');
-    // if(this.peopleid!='admin'){
-    //   this.peopledeptid = Cookies.get('user').split('D')[0];
-    //   this.pageRequest.columnFilters.deptid.value=this.peopledeptid;
-    // }else{
-    //   this.peopledeptid = '9';
-    //   this.pageRequest.columnFilters.deptid.value=this.peopledeptid;
-    // }
-    //获取所有下拉框数据
-    this.getDictItems("agreementtype");
+    // this.getDictItems("agreementtype");
   },
   mounted() {
 
@@ -168,17 +177,52 @@ export default {
         this.pageRequest.createTimeEnd = e[1];
       }
     },
+    drivingupload(file) {
+      let fileRaw = file.raw;
+      this.qrCodeImage = window.URL.createObjectURL(fileRaw);
+      const params = new FormData(); // 声明formData数据类型
+      params.append("multipartFile", fileRaw);
+      params.append("type", "image");
+      this.$api.letter.uploadFile(params).then(res => {
+        if (res.code == "200") {
+          this.picId=res.data.id
+        } else {
+          this.$message({ message: res.msg, type: "warning" });
+        }
+      });
+    },
+    handleCloseBatch() {
+      this.dialogVisibleBatch=false
+    },
+    handleButton4({ row, index }) {
+      this.rowlist=row
+      this.dialogVisibleBatch=true
+    },
+    handleSumbit(){
+      this.$api.task.withdraAaudit({ ...this.rowlist, status: '1',picId:this.picId,voucherId:this.voucherId }).then(res => {
+          if (res.code == 200) {
+            this.dialogVisibleBatch = false
+            this.findPage(null);
+            this.$message({
+              type: 'success',
+              message: '审核通过'
+            });
+          }
+          else {
+            this.$message.error(res.msg)
+          }
+        })
+    },
     handleButton3({ row, index }) {
-      this.$prompt('是否审核通过，输入驳回原因', '提示', {
+      this.$prompt('输入驳回原因', '提示', {
         distinguishCancelAndClose: true,
-        confirmButtonText: '审核驳回',
-        cancelButtonText: '审核通过',
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
         inputPattern: /^.+$/,
-        inputErrorMessage: '输输入驳回原因!'
+        inputErrorMessage: '输入驳回原因!'
       }).then(({ value }) => {
         this.$api.task.withdraAaudit({ ...row, status: '2', remark: value }).then(res => {
           if (res.code == 200) {
-            this.dialogVisible = false
             this.findPage(null);
             this.$message({
               type: 'success',
@@ -189,23 +233,45 @@ export default {
             this.$message.error(res.msg)
           }
         });
-      }).catch((action) => {
-        if (action === 'cancel') {
-          this.$api.task.withdraAaudit({ ...row, status: '1' }).then(res => {
-            if (res.code == 200) {
-              this.dialogVisible = false
-              this.findPage(null);
-              this.$message({
-                type: 'success',
-                message: '审核通过'
-              });
-            }
-            else {
-              this.$message.error(res.msg)
-            }
-          })
-        }
-      });
+      }).catch(() => {
+        });
+      // this.$prompt('是否审核通过，输入驳回原因', '提示', {
+      //   distinguishCancelAndClose: true,
+      //   confirmButtonText: '审核驳回',
+      //   cancelButtonText: '审核通过',
+      //   inputPattern: /^.+$/,
+      //   inputErrorMessage: '输输入驳回原因!'
+      // }).then(({ value }) => {
+      //   this.$api.task.withdraAaudit({ ...row, status: '2', remark: value }).then(res => {
+      //     if (res.code == 200) {
+      //       this.dialogVisible = false
+      //       this.findPage(null);
+      //       this.$message({
+      //         type: 'success',
+      //         message: '审核驳回通过'
+      //       });
+      //     }
+      //     else {
+      //       this.$message.error(res.msg)
+      //     }
+      //   });
+      // }).catch((action) => {
+      //   if (action === 'cancel') {
+      //     this.$api.task.withdraAaudit({ ...row, status: '1' }).then(res => {
+      //       if (res.code == 200) {
+      //         this.dialogVisible = false
+      //         this.findPage(null);
+      //         this.$message({
+      //           type: 'success',
+      //           message: '审核通过'
+      //         });
+      //       }
+      //       else {
+      //         this.$message.error(res.msg)
+      //       }
+      //     })
+      //   }
+      // });
     },
 
     // 格式化日期，如月、日、时、分、秒保证为2位数
@@ -249,4 +315,28 @@ export default {
 .queryForm .el-form-item {
   margin-bottom: 0px;
 }
+.avatar-uploader .el-upload {
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+}
+.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 150px;
+  height: 150px;
+  line-height: 150px;
+  text-align: center;
+  border: 1px dashed #d9d9d9;
+}
+.avatar {
+  border: 1px dashed #d9d9d9;
+  padding: 5px;
+  border-radius: 6px;
+  width: 150px;
+  height: 150px;
+  display: block;
+}
 </style>

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

@@ -11,19 +11,10 @@
       :btnGroup="btnGroup"
       :data="tableData"
       @findPage="findPage"
+      @getList="findPage"
       @handleSearchList="handleSearchList"
       :pagination="pageData"
     >
-    <template slot="导入">
-      <el-upload
-        class="upload-demo"
-        action="#"
-        :show-file-list="false"
-        :auto-upload="false"
-        :on-change="handImport">
-        <el-button size="small" type="primary">导入</el-button>
-      </el-upload>
-    </template>
     <template slot="data">
       <yearMonthYay ref="yearMonthYay" @getYearData="getYearData"  @getMonthData="getMonthData"  @getDayData="getDayData"></yearMonthYay>
     </template>
@@ -149,6 +140,47 @@
     <el-button   size="small" type="primary" @click="onSubmitBatch">保存</el-button>
   </span>
   </el-dialog>
+  <el-dialog
+  :visible.sync="dialogVisibleImport"
+  width="35%"
+  :before-close="handleCloseImport">
+  <el-row>
+  <el-col :span="8">总手续费 ：{{ importData.totalAmount }}</el-col>
+  <el-col :span="8">总跟单费 ：{{ importData.totalHandingAmount }}</el-col>
+  <el-col :span="8">总金额 ：{{ importData.totalOtherAmount }}</el-col>
+</el-row>
+  <el-upload style="margin-top:20px" action="#" class="upload-demo"  :limit="1" :auto-upload="false"
+        :on-change="handImport"  ref="upload3"  :file-list="fileList">
+        <el-button size="small" type="primary">点击上传</el-button>
+  </el-upload>
+    <el-table
+    v-if="importData.resultList"
+        border
+        height="250"
+      :data="importData.resultList"
+      style="width: 100%">
+      <el-table-column
+        prop="licenseno"
+        label="车牌号">
+      </el-table-column>
+      <el-table-column
+        prop="noPolicyno"
+        label="非车保单号">
+      </el-table-column>
+      <el-table-column
+        prop="policyno"
+        label="交强保单号">
+      </el-table-column>
+      <el-table-column
+      label="商业保单号"
+        prop="syPolicyno">
+      </el-table-column>
+    </el-table>
+  <span slot="footer" class="dialog-footer">
+    <el-button size="small" @click="dialogVisibleImport = false">取消</el-button>
+    <el-button size="small" @click="submitImport">确定</el-button>
+  </span>
+</el-dialog>
   </div>
 </template>
   <script>
@@ -169,6 +201,9 @@ export default {
   },
   data() {
     return {
+      importData:{},
+      fileList:[],
+      dialogVisibleImport:false,
       formDataList:{},
       formDataId:'',
       dialogVisibleDetail:false,
@@ -266,8 +301,7 @@ export default {
       },
       {
         name:'导入',
-        slot:true,
-        // click:(row, index) => {return this.handImport()},
+        click:(row, index) => {return this.handImportPro()},
       },
       {
         name:'导出',
@@ -603,8 +637,6 @@ export default {
       if(row &&row.length>0){
         this.selectionList=row.map(e=>e.id)
       }
-      console.log(this.selectionList,1111111);
-
     },
     // 查询
     handleSearchList(data) {
@@ -724,21 +756,48 @@ export default {
             }
           });
     },
-    handImport(file){
+    handleCloseImport(){
+      this.dialogVisibleImport=false
+    },
+    handImportPro(){
+      this.dialogVisibleImport=true
+      this.fileList=[]
+      this.importData={}
+    },
+    handImport(file, fileList){
+      this.fileList=[]
       var file = file.raw;
-      let files = window.URL.createObjectURL(file); //转临时路径
-      this.carfrontImg = files;
       const params = new FormData(); // 声明formData数据类型
       params.append("multipartFile", file);
       params.append("type", "image");
       this.$api.task.importData(params).then(res => {
         if (res.code == "200") {
-          this.$message({ message: '导入成功', type: "success" });
+          this.importData=res.data
+          this.fileList = fileList
+          // this.$message({ message: '导入成功', type: "success" });
+
         } else {
           this.$message({ message: res.msg, type: "warning" });
         }
       });
     },
+    submitImport(){
+      this.$api.task
+          .batchPinBalance({selectIds:this.importData.ids.split(',')})
+          .then(res => {
+            if (res.code==200) {
+              this.$message({
+                    message: '导入成功',
+                    type: 'success'
+                })
+                this.findPage()
+                this.dialogVisibleImport=false
+            }
+            else{
+              this.$message.error(res.msg)
+            }
+          });
+    },
     // 结算
     balanceFun(row){
         this.$api.task.plyFeebalance(row).then(res => {

src/views/Task/DaikeLetter.vue

@@ -195,12 +195,14 @@ export default {
       }
       if(tab.index==1){
         this.$refs.KtOrder.userIdPor=this.salespersonForm.userId
+        this.$refs.KtOrder.deptIdPor=this.salespersonForm.deptId
         this.$refs.KtOrder.statusPor=tab.name
         this.$refs.KtOrder.findPage()
       }
       if(tab.index>1){
         let ref = eval('this.$refs.refName' + Number(tab.name))[0]
         ref.userIdPor=this.salespersonForm.userId
+        ref.deptIdPor=this.salespersonForm.deptId
         ref.statusPor=tab.name
         ref.findPage()
       }

src/views/Task/daikeComponents/KtLetter.vue

@@ -7857,17 +7857,7 @@ export default {
           this.jqstartdate = res.data.jqStartDate; //交强起保日期
           this.systartdate = res.data.syStartDate; //商业起保日期
           // this.mobile = res.data.applyinfo.mobile;//投保人手机号
-          this.$nextTick(() => {
-            if (item.inscompany == "太平财险") {
-              let anresult = res.data.qrCodeUrl.replace(/[\r\n]/g, "");
-              let animgBase64 = `data:image/png;base64,${anresult}`;
-              base64ToPath(animgBase64).then(path => {
-                this.paycodeimg = path;
-              });
-            } else {
-              this.creatQrCode(res.data.qrCodeUrl);
-            }
-          });
+          let qrCodeUrl=res.data.qrCodeUrl
           this.$api.letter.getThemeByUserId().then(res => {
             if (res.code==200) {
               if(res.data.themeCode=='GD'){
@@ -7878,7 +7868,18 @@ export default {
               else {
                 this.codedialogVisible = true;
               }
-            } 
+              this.$nextTick (function () {
+                if (item.inscompany == "太平财险") {
+                  let anresult = qrCodeUrl.replace(/[\r\n]/g, "");
+                  let animgBase64 = `data:image/png;base64,${anresult}`;
+                  base64ToPath(animgBase64).then(path => {
+                    this.paycodeimg = path;
+                  });
+                } else {
+                  this.creatQrCode(qrCodeUrl);
+                }
+              });
+                } 
           })
         } else {
           this.$message({ message: res.msg, type: "warning" });

src/views/Task/daikeComponents/KtOrder.vue

@@ -203,7 +203,7 @@
                 size="mini"
                 type="text"
                 v-if="item.orderstatus == '2'"
-                @click="carcode(scope.row.userid,item )"
+                @click="carcode(item )"
                 class="red_color"
               >二维码</el-button>
               <el-button
@@ -542,7 +542,7 @@
                 size="small"
                 v-show="scope.row.orderstatus == '2'"
                 type="text"
-                @click="carcode(scope.row.userId, scope.row)"
+                @click="carcode(scope.row)"
               >付款码</el-button>
               <el-button
                 size="mini"
@@ -696,6 +696,7 @@ export default {
       natureOfVehicleUseoptions: [],
       userIdPor:'',
       statusPor:'',
+      deptIdPor:''
     };
   },
   components: { quotationDialog, detailsDialog, quotationDialogPro },
@@ -707,15 +708,15 @@ export default {
     this.$api.insCompany.dicType("insOrderStatus").then(res => {
       this.optionsStatus = res.data.ddList;
     });
-    this.pageRequest.deptId = JSON.parse(
-      localStorage.getItem("user_data")
-    ).deptId;
     this.peopleid = Cookies.get("user");
     this.$api.dept.findDeptTree().then(res => {
       this.institutionOptions = res.data;
     });
     // this.findPage();
     if(this.isLetterOrder){
+      this.pageRequest.deptId = JSON.parse(
+        localStorage.getItem("user_data")
+      ).deptId;
       if (this.peopleid != "admin") {
         this.pageRequest.userId = this.peopleid;
         this.findPage();
@@ -1117,7 +1118,7 @@ export default {
       });
     },
     //二维码
-    carcode(userId, item) {
+    carcode( item) {
       this.$api.letter.getQrCode(item.id).then(res => {
         if (res.code == "200") {
           this.inscompany = res.data.inscompany; //保险公司
@@ -1131,17 +1132,7 @@ export default {
           this.jqstartdate = res.data.jqStartDate; //交强起保日期
           this.systartdate = res.data.syStartDate; //商业起保日期
           // this.mobile = res.data.applyinfo.mobile;//投保人手机号
-          this.$nextTick(() => {
-            if (item.inscompany == "太平财险") {
-              let anresult = res.data.qrCodeUrl.replace(/[\r\n]/g, "");
-              let animgBase64 = `data:image/png;base64,${anresult}`;
-              base64ToPath(animgBase64).then(path => {
-                this.paycodeimg = path;
-              });
-            } else {
-              this.creatQrCode(res.data.qrCodeUrl);
-            }
-          });
+          let qrCodeUrl=res.data.qrCodeUrl
           this.$api.letter.getThemeByUserId().then(res => {
             if (res.code==200) {
               if(res.data.themeCode=='GD'){
@@ -1152,7 +1143,18 @@ export default {
               else {
                 this.codedialogVisible = true;
               }
-            } 
+              this.$nextTick (function () {
+                if (item.inscompany == "太平财险") {
+                  let anresult = qrCodeUrl.replace(/[\r\n]/g, "");
+                  let animgBase64 = `data:image/png;base64,${anresult}`;
+                  base64ToPath(animgBase64).then(path => {
+                    this.paycodeimg = path;
+                  });
+                } else {
+                  this.creatQrCode(qrCodeUrl);
+                }
+              });
+                } 
           })
         } else {
           this.$message({ message: res.msg, type: "warning" });
@@ -1219,6 +1221,7 @@ export default {
       //   }
       // })
     },
+
     orderTrajectory(row, item) {
       this.$api.letter.queryBySuborder(item.id).then(res => {
         if (res.code == 200 && res.data.length > 0) {
@@ -2155,7 +2158,7 @@ export default {
       else{
         orderStatus = this.statusPor == 888 ? "" : this.statusPor;
         this.$api.task
-        .queryPageHospitalityOrder({ ...this.pageRequest, orderStatus,userId:this.userIdPor })
+        .queryPageHospitalityOrder({ ...this.pageRequest, orderStatus,userId:this.userIdPor,deptId:this.deptIdPor })
         .then(res => {
           if (res.code == "200") {
             this.orderLoaing = false;
@@ -2193,29 +2196,29 @@ export default {
         this.pageRequest.endDate = e[1];
       }
     },
-    downloadFile(url, fileName, type) {
-      const xhr = new XMLHttpRequest();
-      xhr.open("GET", url, true);
-      xhr.responseType = "blob"; // 获取文件blob数据
-      xhr.onload = function() {
-        if (xhr.status !== 200) {
-          this.$notify.error({
-            title: "错误",
-            message: "下载出现错误"
-          });
-          return;
-        }
-        const newUrl = window.URL.createObjectURL(xhr.response); // 生成一个可用的临时url
-        const a = document.createElement("a"); // 生成a标签调用点击事件
-        a.setAttribute("href", newUrl);
-        a.setAttribute("target", "_blank");
-        a.setAttribute("download", fileName); // 自定义文件名
-        document.body.appendChild(a);
-        a.click();
-        document.body.removeChild(a);
-      };
-      xhr.send();
-    }
+    // downloadFile(url, fileName, type) {
+    //   const xhr = new XMLHttpRequest();
+    //   xhr.open("GET", url, true);
+    //   xhr.responseType = "blob"; // 获取文件blob数据
+    //   xhr.onload = function() {
+    //     if (xhr.status !== 200) {
+    //       this.$notify.error({
+    //         title: "错误",
+    //         message: "下载出现错误"
+    //       });
+    //       return;
+    //     }
+    //     const newUrl = window.URL.createObjectURL(xhr.response); // 生成一个可用的临时url
+    //     const a = document.createElement("a"); // 生成a标签调用点击事件
+    //     a.setAttribute("href", newUrl);
+    //     a.setAttribute("target", "_blank");
+    //     a.setAttribute("download", fileName); // 自定义文件名
+    //     document.body.appendChild(a);
+    //     a.click();
+    //     document.body.removeChild(a);
+    //   };
+    //   xhr.send();
+    // }
   }
 };
 </script>