Merge branch 'dev' of http://39.101.143.165:8090/dong_k/tenant-Platform into dev

src/views/finance/audit.vue

@@ -53,7 +53,7 @@
                 <el-select v-model="firstForm.orderType" placeholder="请选择" clearable>
                   <el-option label="车险录入" value="1"></el-option>
                   <el-option label="代客录单" value="2"></el-option>
-                  <el-option label="外部订单" value="3"></el-option>
+                  <el-option label="补录订单" value="3"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
@@ -251,7 +251,7 @@
                 <el-select v-model="firstForm.orderType" placeholder="请选择" clearable>
                   <el-option label="车险录入" value="1"></el-option>
                   <el-option label="代客录单" value="2"></el-option>
-                  <el-option label="外部订单" value="3"></el-option>
+                  <el-option label="补录订单" value="3"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
@@ -582,7 +582,7 @@
                 <el-select v-model="firstForm.orderType" placeholder="请选择" clearable>
                   <el-option label="车险录入" value="1"></el-option>
                   <el-option label="代客录单" value="2"></el-option>
-                  <el-option label="外部订单" value="3"></el-option>
+                  <el-option label="补录订单" value="3"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
@@ -622,7 +622,7 @@
           <el-table-column prop="orderType" label="订单类型" width="120">
             <template #default="scope">
               {{ scope.row.orderType == '1' ? '车险录入' : scope.row.orderType == '2' ? '代客录单' : scope.row.orderType ==
-                '3' ? '外部订单' : '--' }}
+                '3' ? '补录订单' : '--' }}
             </template>
           </el-table-column>
           <el-table-column prop="agreementName" label="出单协议" width="120"></el-table-column>

src/views/finance/index.vue

@@ -53,7 +53,7 @@
                 <el-select v-model="firstForm.orderType" placeholder="请选择" clearable>
                   <el-option label="车险录入" value="1"></el-option>
                   <el-option label="代客录单" value="2"></el-option>
-                  <el-option label="外部订单" value="3"></el-option>
+                  <el-option label="补录订单" value="3"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
@@ -249,7 +249,7 @@
                 <el-select v-model="firstForm.orderType" placeholder="请选择" clearable>
                   <el-option label="车险录入" value="1"></el-option>
                   <el-option label="代客录单" value="2"></el-option>
-                  <el-option label="外部订单" value="3"></el-option>
+                  <el-option label="补录订单" value="3"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
@@ -589,7 +589,7 @@
                 <el-select v-model="firstForm.orderType" placeholder="请选择" clearable>
                   <el-option label="车险录入" value="1"></el-option>
                   <el-option label="代客录单" value="2"></el-option>
-                  <el-option label="外部订单" value="3"></el-option>
+                  <el-option label="补录订单" value="3"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>

src/views/finance/modules/auditDetail.vue

@@ -97,8 +97,8 @@
           <span class="words">{{ detailData?.carInfoVo?.licenseNo || '--' }}</span>
         </el-col>
         <el-col :span="6">
-          <span class="label">协议归属</span>
-          <span class="words">{{ detailData?.order?.agreementOwnership || '--' }}</span>
+          <span class="label">协议名称</span>
+          <span class="words">{{ detailData?.order?.agreementName || '--' }}</span>
         </el-col>
       </el-row>
       <div class="p-[0_24px]">

src/views/platform/platformReport.vue

@@ -80,9 +80,8 @@
             <el-col :span="8">
               <el-form-item prop="settlementStatus" label="结算状态">
                 <el-select v-model="recordForm1.settlementStatus" placeholder="请选择">
-                  <el-option :value="0" label="已开票未结清"></el-option>
+                  <el-option :value="0" label="未结清"></el-option>
                   <el-option :value="1" label="已结清"></el-option>
-                  <el-option :value="2" label="未开票"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>

src/views/receivable/handingFee/index.vue

@@ -516,12 +516,12 @@
                   <el-input v-model="editForm.contractUserName"></el-input>
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
+              <!-- <el-col :span="12">
                 <el-form-item label="保险公司">
                   <el-cascader filterable clearable placeholder="请选择" v-model="editForm.companyIds" style="width: 100%;"
                     :options="companyList" :props="companyIdprops1" />
                 </el-form-item>
-              </el-col>
+              </el-col> -->
               <el-col :span="12">
                 <el-form-item label="出单协议">
                   <el-select v-model="editForm.updateAgreementId" placeholder="请选择" clearable filterable>