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

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

@@ -71,6 +71,7 @@
       :operationWidth="150"
         permsDelete="sys:user:delete"
         :showOperation="true"
+        :SerialShow="false"
         :showBatchDelete="false"
         :showBatchSettled="false"
         :showBatchPrint="false"
@@ -375,15 +376,14 @@ export default {
       columns: [
         //数据列
         { prop: "orderno", label: "订单号", minWidth: 160 },
-        { prop: "policyno", label: "保单号", minWidth: 160 },
-        { prop: "deptName", label: "机构", minWidth: 160 },
+        { prop: "policyno", label: "保单号", minWidth: 180 },
+        { prop: "deptName", label: "机构", minWidth: 120 },
         { prop: "riskcode", label: "险种", minWidth: 100 },
 
         {
           prop: "companyName",
           label: "保险公司",
-          minWidth: 100,
-          formatter: this.inscompanyFormatter,
+          minWidth: 200,
         },
         { prop: "agreementId", label: "协议号", minWidth: 80 },
         { prop: "licenseno", label: "车牌号", minWidth: 120 },
@@ -469,16 +469,7 @@ export default {
         data: agreetype,
       });
     },
-    inscompanyFormatter(row, column) {
-      //协议类型
-      let inscompany = row.inscompany;
-      return CommonUtil.getDataName({
-        dataList: this.global.insCompanyList,
-        value: "code",
-        label: "name",
-        data: inscompany,
-      });
-    },
+
     totalmoenyFormatter(row, column) {
       //协议类型
       let inscompany = row.inscompany;

src/views/FinancialManagement/CarInsurance/Verifytasks/Verifyuntasks.vue

@@ -5,7 +5,7 @@
     <el-table size="small" :data="pageResult" height="590" border v-loading="loading" highlight-current-row stripe
       @expand-change="handleRowChange" ref="expandTable"
       :header-cell-style="{ background: '#F2F7FC', fontWeight: '700', color: '#606266' }">
-      <el-table-column prop="orderno" label="订单号" align="center"></el-table-column>
+      <el-table-column prop="subOrderId" label="订单号" align="center"></el-table-column>
       <el-table-column prop="username" label="业务员" align="center">
         <template slot-scope="scope">
           <span>{{ scope.row.username }}({{ scope.row.userid }})</span>

src/views/Letter/Orderlist.vue

@@ -310,7 +310,7 @@
       </span>
     </el-dialog>
     <!-- 车辆报价新页面 -->
-    <detailsDialog ref="detailsDialog" :orderInfo="orderInfo"></detailsDialog>
+    <detailsDialog ref="detailsDialog" :orderInfo="orderInfo" :Feepermissions="false"></detailsDialog>
     <!-- 订单轨迹 -->
     <el-dialog :visible.sync="ddgjdialogVisible" width="430px">
       <div slot="title" class=" dialog-title">