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

.env.development

@@ -3,7 +3,7 @@ VITE_APP_SETTING = true
 # 页面标题
 VITE_APP_TITLE = 租户平台
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-VITE_APP_API_BASEURL = https://tennat.baoxianzhanggui.com/api #默认地址
+VITE_APP_API_BASEURL = https://tennat.baoxianzhanggui.com/test_api #默认地址
 # VITE_APP_API_BASEURL = http://192.168.5.249:8001  #田智
 # VITE_APP_API_BASEURL = http://192.168.0.19:8001  #董鑫
 # VITE_APP_API_BASEURL = http://192.168.5.14:8001  #李鹏飞

src/views/receivable/documentary/index.vue

@@ -31,7 +31,7 @@
               <el-form-item label="出单协议">
                 <el-select v-model="receivableForm.agreementId" placeholder="请选择" clearable filterable>
                   <el-option v-for="item in agreementList" :key="item.id" :value="item.id"
-                  :label="item.agreementTitle"></el-option>
+                    :label="item.agreementTitle"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
@@ -129,7 +129,9 @@
             <el-button class="radius-2px width-100" type="primary" @click="handleExport(1)">导出</el-button>
           </div>
           <span class="col-108 m-r-8">
-            <el-button class="radius-2px width-100" :disabled="selectedList.some(item => item.invoiceStatusName === '已开票')" @click="handleBatchEdit">批量修改比例</el-button>
+            <el-button class="radius-2px width-100"
+              :disabled="selectedList.some(item => item.invoiceStatusName === '已开票')"
+              @click="handleBatchEdit">批量修改比例</el-button>
           </span>
           <span class="col-108 m-r-8">
             <el-dropdown class="width-100" trigger="click" placement="bottom" @command="dropdownCommand">
@@ -224,7 +226,7 @@
               <el-form-item label="出单协议">
                 <el-select v-model="receivableForm.agreementId" placeholder="请选择" clearable filterable>
                   <el-option v-for="item in agreementList" :key="item.id" :value="item.id"
-                  :label="item.agreementTitle"></el-option>
+                    :label="item.agreementTitle"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
@@ -476,20 +478,27 @@
           <el-form :model="editForm">
             <el-radio v-model="feeRate">跟单比例</el-radio>
             <el-row :gutter="20">
-              <el-col :span="12">
+              <el-col :span="12" v-if="activeName === '1'">
                 <el-form-item label="交强险跟单费比例">
                   <el-input v-model="editForm.jqInsurance">
                     <template #append>%</template>
                   </el-input>
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
+              <el-col :span="12" v-if="activeName === '1'">
                 <el-form-item label="商业险跟单费比例">
                   <el-input v-model="editForm.syInsurance">
                     <template #append>%</template>
                   </el-input>
                 </el-form-item>
               </el-col>
+              <el-col :span="12" v-if="activeName === '2'">
+                <el-form-item label="驾意跟单费比例">
+                  <el-input v-model="editForm.jyOtherCostsProportion">
+                    <template #append>%</template>
+                  </el-input>
+                </el-form-item>
+              </el-col>
             </el-row>
             <el-radio v-model="signTime">签单时间</el-radio>
             <el-row :gutter="20">
@@ -854,8 +863,8 @@ const handleInvoiceSubmit = () => {
   myRouter.push({
     name: 'documentaryTicket',
     query: {
-        invoiceType: activeName.value == '1' ? '2' : activeName.value == '2' ? '4' : ''
-      }
+      invoiceType: activeName.value == '1' ? '2' : activeName.value == '2' ? '4' : ''
+    }
   })
 }
 
@@ -1088,7 +1097,7 @@ const getOtherReceivableList = () => {
     jqEndDate: receivableForm.value?.jqDate?.[1],
     syStartDate: receivableForm.value?.syDate?.[0],
     syEndDate: receivableForm.value?.syDate?.[1],
-    invoiceType:'2'
+    invoiceType: '2'
   }
   api.financeApi.getOtherReceivableList({
     ...params,
@@ -1129,7 +1138,7 @@ const getJyOtherReceivableList = () => {
     jqEndDate: receivableForm.value?.jqDate?.[1],
     syStartDate: receivableForm.value?.syDate?.[0],
     syEndDate: receivableForm.value?.syDate?.[1],
-    invoiceType:'4'
+    invoiceType: '4'
   }
   api.financeApi.getJyOtherReceivableList({
     ...params,

src/views/receivable/handingFee/index.vue

@@ -474,20 +474,28 @@
           <el-form :model="editForm">
             <el-radio v-model="feeRate">手续费比例</el-radio>
             <el-row :gutter="20">
-              <el-col :span="12" v-if="activeName === '1'">
-                <el-form-item label="驾意险手续费比例">
-                  <el-input v-model="editForm.jySuperviseCostsProportion">
+              <el-col :span="12"  v-if="activeName === '1'">
+                <el-form-item label="交强险手续费比例">
+                  <el-input v-model="editForm.jqInsurance">
+                    <template #append>%</template>
+                  </el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12"  v-if="activeName === '1'">
+                <el-form-item label="商业险手续费比例">
+                  <el-input v-model="editForm.syInsurance">
                     <template #append>%</template>
                   </el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="12" v-if="activeName === '2'">
-                <el-form-item label="驾意跟单费比例">
-                  <el-input v-model="editForm.jyOtherCostsProportion">
+                <el-form-item label="驾意险手续费比例">
+                  <el-input v-model="editForm.jySuperviseCostsProportion">
                     <template #append>%</template>
                   </el-input>
                 </el-form-item>
               </el-col>
+
             </el-row>
             <el-radio v-model="signTime">签单时间</el-radio>
             <el-row :gutter="20">