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

src/views/finance/modules/auditDetail.vue

@@ -666,7 +666,7 @@
               </th>
               <th>
                 <el-input-number v-model="detailData.costRatio.jqInletRatio" controls-position="right" v-if="costShow"
-                  style="width: 80px" :min="0" :max="100" />
+                  style="width: 80px" :min="0" :max="106" />
                 <div v-else>{{ detailData?.costRatio?.jqInletRatio }}%</div>
               </th>
               <th>
@@ -742,7 +742,7 @@
               </th>
               <th>
                 <el-input-number v-model="detailData.costRatio.syInletRatio" controls-position="right" v-if="costShow"
-                  style="width: 80px" :min="0" :max="100" />
+                  style="width: 80px" :min="0" :max="106" />
                 <div v-else>{{ detailData?.costRatio?.syInletRatio }}%</div>
               </th>
               <th>
@@ -818,7 +818,7 @@
               </th>
               <th>
                 <el-input-number v-model="detailData.costRatio.jyInletRatio" controls-position="right" v-if="costShow"
-                  style="width: 80px" :min="0" :max="1000" />
+                  style="width: 80px" :min="0" :max="106" />
                 <div v-else>{{ detailData?.costRatio?.jyInletRatio }}%</div>
               </th>
               <th>

src/views/receivable/documentary/index.vue

@@ -547,6 +547,7 @@
             </div>
             <el-button type="primary" link @click="downloadImportFailedData(importModifyCallback)">下载导入失败文件</el-button>
           </div>
+          <div v-if="uploadMsg" class="text-red">上传错误信息：{{ uploadMsg }}</div>
         </el-tab-pane>
       </el-tabs>
       <template #footer>

src/views/receivable/handingFee/index.vue

@@ -539,7 +539,8 @@
             下载「标准导入模板」，编辑后上传；系统将自动匹配相关字段
             <el-button link type="primary" @click="exportData">下载模板</el-button>
           </div>
-          <el-upload class="upload-demo" drag accept=".xls, .xlsx" :auto-upload="false" :show-file-list="false" @change="uploadJYFile">
+          <el-upload class="upload-demo" drag accept=".xls, .xlsx" :auto-upload="false" :show-file-list="false"
+            @change="uploadJYFile">
             <el-icon class="el-icon--upload"><upload-filled /></el-icon>
             <div class="el-upload__text">
               点击或将文件拖拽到这里上传
@@ -556,11 +557,12 @@
               条正常导入；<span style="color: red;">{{ importModifyCallback?.failedNumber || 0 }}</span> 条不符合要求无法导入。
             </div>
           </div>
+          <div v-if="uploadMsg" class="text-red">上传错误信息：{{ uploadMsg }}</div>
         </el-tab-pane>
       </el-tabs>
       <template #footer>
         <el-button class="border-[#0083FF] color-[#0083FF]" plain @click="batchEditShow = false">取消</el-button>
-        <el-button v-if="subActiveName=='first'" type="primary" @click="handleBatchEditSubmit">确定</el-button>
+        <el-button v-if="subActiveName == 'first'" type="primary" @click="handleBatchEditSubmit">确定</el-button>
       </template>
     </el-dialog>
   </PageMain>
@@ -982,6 +984,7 @@ const handleBatchEditSubmit = async () => {
   }
 }
 let importModifyCallback = ref()// 导入数据回调
+let uploadMsg = ref('')// 上传错误信息
 const uploadJYFile = async (file) => {
   let files = file.raw
   const params = new FormData(); // 声明formData数据类型
@@ -993,6 +996,9 @@ const uploadJYFile = async (file) => {
       message: msg,
       type: 'success'
     })
+    uploadMsg.value = msg
+  } else {
+    uploadMsg.value = msg
   }
 }
 // 下载导入失败文件

src/views/receivable/handingFee/ticket.vue

@@ -538,6 +538,7 @@ const uploadJYFile = async (file) => {
         }
       })
     }
+    uploadMsg.value = msg
     ElMessage({
       message: msg,
       type: 'success'