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

.env.development

@@ -17,4 +17,4 @@ VITE_APP_DISABLE_DEVTOOL = false
 # 是否开启代理
 VITE_OPEN_PROXY = false
 # 是否开启开发者工具
-VITE_OPEN_DEVTOOLS = true
+VITE_OPEN_DEVTOOLS = false

src/views/finance/modules/auditDetail.vue

@@ -92,6 +92,10 @@
           <span class="label">协议类型</span>
           <span class="words">{{ detailData?.order?.agreementTypeName || '--' }}</span>
         </el-col>
+        <el-col :span="6">
+          <span class="label">车牌号</span>
+          <span class="words">{{ detailData?.carInfoVo?.licenseNo || '--' }}</span>
+        </el-col>
       </el-row>
       <div class="p-[0_24px]">
         <div class="tipsList">
@@ -248,12 +252,12 @@
           <el-col :span="6" class="carMsgItem">
             <span class="label">使用性质</span>
             <span class="value">{{ dictChange(optionObj['car_nature_code'], detailData?.carInfoVo?.carNatureCode)
-            }}</span>
+              }}</span>
           </el-col>
           <el-col :span="6" class="carMsgItem">
             <span class="label">车辆用途</span>
             <span class="value">{{ dictChange(optionObj['vehicle_use_code'], detailData?.carInfoVo?.vehicleUseCode)
-            }}</span>
+              }}</span>
           </el-col>
           <el-col :span="6" class="carMsgItem">
             <span class="label">车辆种类</span>
@@ -263,12 +267,12 @@
           <el-col :span="6" class="carMsgItem">
             <span class="label">车辆类型</span>
             <span class="value">{{ dictChange(optionObj['car_type_code'], detailData?.carInfoVo?.carTypeCode)
-            }}</span>
+              }}</span>
           </el-col>
           <el-col :span="6" class="carMsgItem">
             <span class="label">能源种类</span>
             <span class="value">{{ dictChange(optionObj['energy_type_code'], detailData?.carInfoVo?.energyTypeCode)
-            }}</span>
+              }}</span>
           </el-col>
           <el-col :span="6" class="carMsgItem">
             <span class="label">注册日期</span>
@@ -451,7 +455,7 @@
           <div class="taxList">
             <span class="taxItem" :class="{ 'active': item.bool }" v-for="(item, index) in tbList" :key="index">{{
               item.name
-            }}</span>
+              }}</span>
           </div>
         </div>
         <el-row :gutter="20" v-if="!tbList[0].bool">
@@ -515,7 +519,7 @@
           <div class="taxList">
             <span class="taxItem" :class="{ 'active': item.bool }" v-for="(item, index) in bbList" :key="index">{{
               item.name
-            }}</span>
+              }}</span>
           </div>
         </div>
         <el-row :gutter="20" v-if="!bbList[0].bool && !bbList[1].bool">
@@ -999,7 +1003,7 @@
             <el-tab-pane v-for="(item, index) in infoList" :label="item.label" :name="item.name">
               <el-row :gutter="10" class="list">
                 <el-col :span="4" class="list-item" v-for="sub in item.list">
-                  <img :src="sub.previewUrl"  @click="viewImage(sub)"  />
+                  <img :src="sub.previewUrl" @click="viewImage(sub)" />
                   <div class="tips">{{ sub.imageType === 'C01' ? '行驶证主页' : sub.imageType === 'D01' ? '行驶证副页' :
                     sub.imageType
                       ===
@@ -1068,7 +1072,7 @@
           <el-table-column prop="packagePrice" label="总价" align="center">
             <template #default="scope">
               <div>{{ scope.row.packagePrice * scope.row.rightsCount || scope.row.contractRate * scope.row.rightsCount
-                }}
+              }}
               </div>
             </template>
           </el-table-column>
@@ -1211,7 +1215,7 @@ let optionObj = ref({
   insuranceType: [], // 险种类型
   car_type_code: [], // 车辆类型
 })
-const  viewImage = (item) => {
+const viewImage = (item) => {
   imageUrl.value = item.previewUrl
   imageShow.value = true
 }

src/views/receivable/documentary/index.vue

@@ -205,10 +205,8 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="保险公司">
-                <el-select v-model="receivableForm.companyId" placeholder="请选择" clearable filterable>
-                  <el-option v-for="item in companyList" :key="item.companyCode" :value="item.companyCode"
-                    :label="item.name"></el-option>
-                </el-select>
+                <el-cascader filterable clearable placeholder="请选择" v-model="receivableForm.companyId"
+                  :options="companyList" :props="companyIdprops" style="width: 100%;" @change="handleCompanyChange" />
               </el-form-item>
             </el-col>
             <el-col :span="8">

src/views/receivable/handingFee/index.vue

@@ -218,9 +218,8 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="保险公司">
-                <el-select v-model="receivableForm.companyId" placeholder="请选择" clearable filterable>
-                  <el-option v-for="item in companyList" :key="item.id" :value="item.id" :label="item.name"></el-option>
-                </el-select>
+                <el-cascader filterable clearable placeholder="请选择" v-model="receivableForm.companyId"
+                  style="width: 100%;" :options="companyList" :props="companyIdprops" @change="handleCompanyChange" />
               </el-form-item>
             </el-col>
             <el-col :span="8">

src/views/receivable/handingFee/ticket.vue

@@ -165,7 +165,7 @@
       top="1vh">
       <el-form ref="CountForm" :model="countForm" :rules="countRules" label-width="120">
         <el-form-item prop="invoiceParty" label="开票方">
-          <el-select v-model="countForm.invoiceParty" placeholder="请选择开票方">
+          <el-select v-model="countForm.invoiceParty" placeholder="请选择开票方" @change="countForm.invoiceNo = ''">
             <el-option label="我方开票" value="1"></el-option>
             <el-option label="保司开票" value="2"></el-option>
           </el-select>