Browse Source

bug处理

@dongkboy 2 years ago
parent
commit
7f681158d1

+ 3 - 4
src/views/Core/components/detailsDialog.vue

@@ -526,7 +526,7 @@
                   <span v-else>-</span>
                   <span v-else>-</span>
                 </template>
                 </template>
               </el-table-column>
               </el-table-column>
-                
+
                 <el-table-column prop="profitMarginPremiums" label="利润差值">
                 <el-table-column prop="profitMarginPremiums" label="利润差值">
                   <template slot-scope="scope">
                   <template slot-scope="scope">
                     <span>¥{{ scope.row.profitMarginPremiums }}</span>
                     <span>¥{{ scope.row.profitMarginPremiums }}</span>
@@ -715,7 +715,7 @@
               </el-form-item>
               </el-form-item>
             </el-col>
             </el-col>
           </el-row>
           </el-row>
-          <el-row>
+          <el-row v-if="['单交', '交三', '交商'].includes(orderInfo.agreementProductCostsSave.productName)">
             <h4 style="color: tomato">交强险费用</h4>
             <h4 style="color: tomato">交强险费用</h4>
             <el-col :span="5" :offset="1">
             <el-col :span="5" :offset="1">
               <el-form-item label="费用比例" prop="jqCarCostsProportion">
               <el-form-item label="费用比例" prop="jqCarCostsProportion">
@@ -774,9 +774,8 @@
               </el-form-item>
               </el-form-item>
             </el-col>
             </el-col>
           </el-row>
           </el-row>
-          <el-row>
+          <el-row v-if="['单商', '单三', '交商', '交三'].includes(orderInfo.agreementProductCostsSave.productName)">
             <h4 style="color: tomato">商业险费用</h4>
             <h4 style="color: tomato">商业险费用</h4>
-
             <el-col :span="5" :offset="1">
             <el-col :span="5" :offset="1">
               <el-form-item label="费用比例" prop="syCarCostsProportion">
               <el-form-item label="费用比例" prop="syCarCostsProportion">
                 <el-input v-model="orderInfo.agreementProductCostsSave.syCarCostsProportion"
                 <el-input v-model="orderInfo.agreementProductCostsSave.syCarCostsProportion"

+ 1 - 1
src/views/FinancialManagement/ExpenseManagement/ViewExpenseReport.vue

@@ -47,7 +47,7 @@
           <el-input v-model="queryFrom.applyAmount" placeholder="请输入支出金额" class="widths" clearable></el-input>
           <el-input v-model="queryFrom.applyAmount" placeholder="请输入支出金额" class="widths" clearable></el-input>
         </el-form-item>
         </el-form-item>
         <el-form-item label="成本分类" prop="label">
         <el-form-item label="成本分类" prop="label">
-          <el-select v-model="queryFrom.label" filterable clearable placeholder="收款账户">
+          <el-select v-model="queryFrom.label" filterable clearable placeholder="成本分类">
             <el-option v-for="(item, index) in costTypelist" :key="index" :label="item.label"
             <el-option v-for="(item, index) in costTypelist" :key="index" :label="item.label"
               :value="item.label">
               :value="item.label">
             </el-option>
             </el-option>

+ 42 - 31
src/views/Task/daikeComponents/KtOrder.vue

@@ -47,18 +47,16 @@
         </el-col>
         </el-col>
         <el-col :span="6">
         <el-col :span="6">
           <el-form-item label="险种">
           <el-form-item label="险种">
-            <el-select v-model="pageRequest.productid" clearable filterable placeholder="选择险种" style="width: 100%">
+            <el-select v-model="pageRequest.productid" clearable filterable placeholder="选择险种" class="widths">
               <el-option v-for="item in productsTypeoptions" :key="item.dictValue" :label="item.dictTag"
               <el-option v-for="item in productsTypeoptions" :key="item.dictValue" :label="item.dictTag"
                 :value="item.dictValue"></el-option>
                 :value="item.dictValue"></el-option>
             </el-select>
             </el-select>
           </el-form-item>
           </el-form-item>
         </el-col>
         </el-col>
-        <el-col :span="3">
-          <el-button type="primary" size="small" @click="onSubmit">查询</el-button>
-        </el-col>
+
       </el-row>
       </el-row>
-      <el-row v-if="isLetterOrder">
-        <el-col :span="21">
+      <el-row>
+        <el-col :span="21" v-if="isLetterOrder">
           <el-form-item label="订单状态">
           <el-form-item label="订单状态">
             <el-radio-group v-model="pageRequest.orderStatus">
             <el-radio-group v-model="pageRequest.orderStatus">
               <el-radio label="888">全部</el-radio>
               <el-radio label="888">全部</el-radio>
@@ -67,10 +65,13 @@
             </el-radio-group>
             </el-radio-group>
           </el-form-item>
           </el-form-item>
         </el-col>
         </el-col>
+        <el-col :span="3">
+          <el-button type="primary" size="small" @click="onSubmit">查询</el-button>
+        </el-col>
       </el-row>
       </el-row>
     </el-form>
     </el-form>
     <el-table size="small" :data="pageResult" border v-loading="orderLoaing" highlight-current-row stripe
     <el-table size="small" :data="pageResult" border v-loading="orderLoaing" highlight-current-row stripe
-      @expand-change="handleRowChange" ref="expandTable" height="550" :header-cell-style="{
+      @expand-change="handleRowChange" ref="expandTable" :height="tabelHeight" :header-cell-style="{
         background: '#F2F7FC',
         background: '#F2F7FC',
         fontWeight: '700',
         fontWeight: '700',
         color: '#606266',
         color: '#606266',
@@ -148,7 +149,7 @@
                 item.orderstatus == '4') &&
                 item.orderstatus == '4') &&
                 ['紫金财险'].includes(item.inscompany)
                 ['紫金财险'].includes(item.inscompany)
                 " @click="cancelorder(item)" class="red_color">撤单</el-button>
                 " @click="cancelorder(item)" class="red_color">撤单</el-button>
-              <el-button size="mini" type="text" v-if="item.orderstatus == '2' " @click="carcode(item)"
+              <el-button size="mini" type="text" v-if="item.orderstatus == '2'" @click="carcode(item)"
                 class="red_color">二维码</el-button>
                 class="red_color">二维码</el-button>
               <!-- <el-button  size="mini"  class="red_color" v-if="item.orderstatus == '2' && item.inscompany == '平安财险'" type="text" @click="signature(item)">生成签章</el-button> -->
               <!-- <el-button  size="mini"  class="red_color" v-if="item.orderstatus == '2' && item.inscompany == '平安财险'" type="text" @click="signature(item)">生成签章</el-button> -->
               <el-button size="mini" type="text" class="green_color"
               <el-button size="mini" type="text" class="green_color"
@@ -176,7 +177,10 @@
               <el-button v-if="item.orderstatus !== '2'" size="mini" type="text" class="blue_color"
               <el-button v-if="item.orderstatus !== '2'" size="mini" type="text" class="blue_color"
                 @click="orderTrajectory(scope.row, item)">订单轨迹</el-button>
                 @click="orderTrajectory(scope.row, item)">订单轨迹</el-button>
               <el-button size="mini" type="primary" @click="bjdpreview(item.id, scope.row.userid)">报价单</el-button>
               <el-button size="mini" type="primary" @click="bjdpreview(item.id, scope.row.userid)">报价单</el-button>
-              <el-button v-if="(item.orderstatus == '1' || item.orderstatus == '4' )&& item.inscompany=='平安财险' && item.fileStatus" size="mini" type="text" class="green_color" @click="additionalInformation(item.id,scope.row)">补充资料</el-button>
+              <el-button
+                v-if="(item.orderstatus == '1' || item.orderstatus == '4') && item.inscompany == '平安财险' && item.fileStatus"
+                size="mini" type="text" class="green_color"
+                @click="additionalInformation(item.id, scope.row)">补充资料</el-button>
               <!-- <el-button size="mini" type="text" @click="CloseEdit(scope.$index, scope.row)">编辑</el-button> -->
               <!-- <el-button size="mini" type="text" @click="CloseEdit(scope.$index, scope.row)">编辑</el-button> -->
               <el-button type="text" size="mini" v-if="item.orderstatus == '2'">
               <el-button type="text" size="mini" v-if="item.orderstatus == '2'">
                 <el-dropdown trigger="click">
                 <el-dropdown trigger="click">
@@ -190,7 +194,7 @@
                         @click="orderTrajectory(scope.row, item)">订单轨迹</el-button>
                         @click="orderTrajectory(scope.row, item)">订单轨迹</el-button>
                     </el-dropdown-item>
                     </el-dropdown-item>
                     <el-dropdown-item v-if="item.inscompany !== '平安财险'">
                     <el-dropdown-item v-if="item.inscompany !== '平安财险'">
-                      <el-button  type="text" size="mini" style="color: #2d4d89"
+                      <el-button type="text" size="mini" style="color: #2d4d89"
                         @click="revokeCode(item.id)">撤销二维码</el-button>
                         @click="revokeCode(item.id)">撤销二维码</el-button>
                     </el-dropdown-item>
                     </el-dropdown-item>
                   </el-dropdown-menu>
                   </el-dropdown-menu>
@@ -201,17 +205,16 @@
         </template>
         </template>
       </el-table-column>
       </el-table-column>
       <el-table-column prop="orderno" label="订单号" align="center" width="180"></el-table-column>
       <el-table-column prop="orderno" label="订单号" align="center" width="180"></el-table-column>
-      <el-table-column prop="username" label="业务员" align="center" width="180">
+      <el-table-column prop="username" :label="managementSource==1?'会员名称':'业务员'" align="center" width="180">
         <template slot-scope="scope">
         <template slot-scope="scope">
           <span>{{ scope.row.username }}</span>
           <span>{{ scope.row.username }}</span>
         </template>
         </template>
       </el-table-column>
       </el-table-column>
-      <el-table-column prop="username" label="业务员工号" align="center" width="180">
+      <el-table-column prop="username" :label="managementSource==1?'会员号':'业务员工号'" align="center" width="180">
         <template slot-scope="scope">
         <template slot-scope="scope">
           <span>{{ scope.row.userid }}</span>
           <span>{{ scope.row.userid }}</span>
         </template>
         </template>
       </el-table-column>
       </el-table-column>
-
       <el-table-column prop="insCompany" label="承保公司" width="100" align="center">
       <el-table-column prop="insCompany" label="承保公司" width="100" align="center">
         <template slot-scope="scope">
         <template slot-scope="scope">
           <span>{{ scope.row.insCompany ? scope.row.insCompany : "--" }}</span>
           <span>{{ scope.row.insCompany ? scope.row.insCompany : "--" }}</span>
@@ -447,7 +450,7 @@
               <el-button type="text" size="small" style="color: #2d4d89"
               <el-button type="text" size="small" style="color: #2d4d89"
                 @click="OrderDetails(quotationhistoryRow, scope.row)">查看详情</el-button>
                 @click="OrderDetails(quotationhistoryRow, scope.row)">查看详情</el-button>
               <el-button size="small" type="text" @click="bjdpreview(scope.row.id, scope.row.userId)">报价单</el-button>
               <el-button size="small" type="text" @click="bjdpreview(scope.row.id, scope.row.userId)">报价单</el-button>
-              <el-button size="small" v-show="scope.row.orderstatus == '2' " type="text"
+              <el-button size="small" v-show="scope.row.orderstatus == '2'" type="text"
                 @click="carcode(scope.row)">付款码</el-button>
                 @click="carcode(scope.row)">付款码</el-button>
               <!-- <el-button  size="small"  v-if="scope.row.orderstatus == '2' && scope.row.inscompany == '平安财险'" type="text" @click="signature(item)">生成签章</el-button> -->
               <!-- <el-button  size="small"  v-if="scope.row.orderstatus == '2' && scope.row.inscompany == '平安财险'" type="text" @click="signature(item)">生成签章</el-button> -->
               <el-button size="mini" type="text" v-if="(scope.row.orderstatus == '1' ||
               <el-button size="mini" type="text" v-if="(scope.row.orderstatus == '1' ||
@@ -455,7 +458,8 @@
                 scope.row.orderstatus == '4') &&
                 scope.row.orderstatus == '4') &&
                 ['紫金财险'].includes(scope.row.inscompany)
                 ['紫金财险'].includes(scope.row.inscompany)
                 " @click="cancelorder(scope.row)">撤单</el-button>
                 " @click="cancelorder(scope.row)">撤单</el-button>
-              <el-button  type="text" size="mini" style="color: #2d4d89" v-if="scope.row.orderstatus == '2' &&  scope.row.inscompany !== '平安财险'"
+              <el-button type="text" size="mini" style="color: #2d4d89"
+                v-if="scope.row.orderstatus == '2' && scope.row.inscompany !== '平安财险'"
                 @click="revokeCode(scope.row.id)">撤销二维码</el-button>
                 @click="revokeCode(scope.row.id)">撤销二维码</el-button>
               <el-button type="text" size="mini" style="color: #2d4d89" v-if="scope.row.orderstatus == '2' &&
               <el-button type="text" size="mini" style="color: #2d4d89" v-if="scope.row.orderstatus == '2' &&
                 [
                 [
@@ -484,8 +488,8 @@
     </el-dialog>
     </el-dialog>
     <!-- 生成签章 -->
     <!-- 生成签章 -->
     <el-dialog :visible.sync="signaturedialogVisible" title="生成签章" width="14%">
     <el-dialog :visible.sync="signaturedialogVisible" title="生成签章" width="14%">
-      <div >
-        <img :src="resultMessageImg"  alt style="width: 100%" />
+      <div>
+        <img :src="resultMessageImg" alt style="width: 100%" />
         <!-- <div  id="signaturecode" ref="signaturecode"></div> -->
         <!-- <div  id="signaturecode" ref="signaturecode"></div> -->
       </div>
       </div>
     </el-dialog>
     </el-dialog>
@@ -779,7 +783,7 @@ import { debounce } from 'lodash';
 export default {
 export default {
   data() {
   data() {
     return {
     return {
-      companyId:'',
+      companyId: '',
       orderLoaing: false,
       orderLoaing: false,
       qrcodeWidth: "180",
       qrcodeWidth: "180",
       qrcodeHeight: "180",
       qrcodeHeight: "180",
@@ -865,6 +869,7 @@ export default {
       productsTypeoptions: [],
       productsTypeoptions: [],
       InsInsuranceKindoptions: [],
       InsInsuranceKindoptions: [],
       width: document.documentElement.clientWidth,
       width: document.documentElement.clientWidth,
+      tabelHeight: document.documentElement.clientHeight - 360,
       insAreaCompanyList: [], //子订单list
       insAreaCompanyList: [], //子订单list
       companyList: [], //保险公司
       companyList: [], //保险公司
       querystatusLoaing: false,
       querystatusLoaing: false,
@@ -880,8 +885,8 @@ export default {
       statusPor: "",
       statusPor: "",
       deptIdPor: "",
       deptIdPor: "",
       apiType: "",
       apiType: "",
-      resultMessageImg:'',
-      institutionOptions:[],
+      resultMessageImg: '',
+      institutionOptions: [],
       imageUploaddialogVisible: false,
       imageUploaddialogVisible: false,
       tabLiIndex: 0,
       tabLiIndex: 0,
       tabLimenu: [
       tabLimenu: [
@@ -926,13 +931,15 @@ export default {
       imageList5: [],
       imageList5: [],
       showViewer: false,
       showViewer: false,
       ProViewImg: "",
       ProViewImg: "",
-
+      managementSource:"",
     };
     };
   },
   },
   components: {
   components: {
-    quotationDialog, detailsDialog, quotationDialogPro,imageDialog, "el-image-viewer": () =>
-      import("element-ui/packages/image/src/image-viewer")},
+    quotationDialog, detailsDialog, quotationDialogPro, imageDialog, "el-image-viewer": () =>
+      import("element-ui/packages/image/src/image-viewer")
+  },
   created() {
   created() {
+    this.managementSource = JSON.parse(localStorage.getItem("user_data")).managementSource;
     this.getDicType("natureOfVehicleUse"); //车辆使用性质
     this.getDicType("natureOfVehicleUse"); //车辆使用性质
     this.getDicType("vehicleType"); //车辆种类
     this.getDicType("vehicleType"); //车辆种类
     this.getDicType("trafficManagementVehicleType"); //车辆类型
     this.getDicType("trafficManagementVehicleType"); //车辆类型
@@ -972,6 +979,7 @@ export default {
   },
   },
   mounted() {
   mounted() {
     window.addEventListener("resize", this.getDimensions);
     window.addEventListener("resize", this.getDimensions);
+
   },
   },
   beforeCreate() {
   beforeCreate() {
     _self = this;
     _self = this;
@@ -1020,8 +1028,8 @@ export default {
     },
     },
   },
   },
   methods: {
   methods: {
-    additionalInformation(companyId,row){
-        this.companyId=companyId
+    additionalInformation(companyId, row) {
+      this.companyId = companyId
       this.$refs.imageDialog.imageEcho(row.quoteno)
       this.$refs.imageDialog.imageEcho(row.quoteno)
       this.$refs.imageDialog.setBackupVisible(true);
       this.$refs.imageDialog.setBackupVisible(true);
     },
     },
@@ -1364,6 +1372,8 @@ export default {
     },
     },
     getDimensions() {
     getDimensions() {
       this.width = document.documentElement.clientWidth - 350 + "px";
       this.width = document.documentElement.clientWidth - 350 + "px";
+      this.tabelHeight = document.documentElement.clientHeight - 330 + "px";
+
     },
     },
     //订单修改
     //订单修改
     CloseEdit(index, row) {
     CloseEdit(index, row) {
@@ -1796,9 +1806,9 @@ export default {
     signature(row) {
     signature(row) {
       this.$api.letter.pingAnsignEleApply({ companyId: row.id }).then((res) => {
       this.$api.letter.pingAnsignEleApply({ companyId: row.id }).then((res) => {
         if (res.code == 200 && res.data) {
         if (res.code == 200 && res.data) {
-          this.resultMessageImg=process.env.BASE_URL+res.data.resultMessage
+          this.resultMessageImg = process.env.BASE_URL + res.data.resultMessage
           this.signaturedialogVisible = true;
           this.signaturedialogVisible = true;
-              // 查找并删除旧的二维码DOM元素
+          // 查找并删除旧的二维码DOM元素
           // let element = document.getElementById("signaturecode");
           // let element = document.getElementById("signaturecode");
           // while (element.firstChild) {
           // while (element.firstChild) {
           //   element.removeChild(element.firstChild);
           //   element.removeChild(element.firstChild);
@@ -2592,14 +2602,14 @@ export default {
                             this.oldfileList.push({
                             this.oldfileList.push({
                               fileTitle: "交强电子保单",
                               fileTitle: "交强电子保单",
                               filename: this.orderInfo.jqpolicyno,
                               filename: this.orderInfo.jqpolicyno,
-                              fileurl: process.env.BASE_URL+res.data.jqxPolicyUrl,
+                              fileurl: process.env.BASE_URL + res.data.jqxPolicyUrl,
                             });
                             });
                           }
                           }
                           if (res.data.jqxFlagUrl) {
                           if (res.data.jqxFlagUrl) {
                             this.oldfileList.push({
                             this.oldfileList.push({
                               fileTitle: "交强电子标志",
                               fileTitle: "交强电子标志",
                               filename: this.orderInfo.jqpolicyno,
                               filename: this.orderInfo.jqpolicyno,
-                              fileurl: process.env.BASE_URL+res.data.jqxFlagUrl,
+                              fileurl: process.env.BASE_URL + res.data.jqxFlagUrl,
                             });
                             });
                           }
                           }
                           if (res.data.syxPolicyUrl) {
                           if (res.data.syxPolicyUrl) {
@@ -2617,7 +2627,7 @@ export default {
                               accidentList.push({
                               accidentList.push({
                                 fileTitle: "驾意险保单",
                                 fileTitle: "驾意险保单",
                                 filename: "驾意险保单",
                                 filename: "驾意险保单",
-                                fileurl: process.env.BASE_URL+val.jyx_policy_url,
+                                fileurl: process.env.BASE_URL + val.jyx_policy_url,
                               });
                               });
                             });
                             });
                           }
                           }
@@ -3685,4 +3695,5 @@ export default {
 .styleB .el-upload--picture-card {
 .styleB .el-upload--picture-card {
   // display: none;
   // display: none;
   opacity: 0;
   opacity: 0;
-}</style>
+}
+</style>