Merge branch 'zth' into dev

src/components/File/index.vue

@@ -1,8 +1,3 @@
-<!--
- * @Author: lijj
- * @Date: 2024-05-06 09:18:47
- * @Description: 附近上传组件
--->
 <template>
   <div class="ds-file">
     <a-button v-if="show" type="primary" @click="openFileModel">附件上传</a-button>
@@ -94,8 +89,8 @@
       type: Boolean,
       default: true,
     },
-     // 是否显示文件列表
-     showFileList: {
+    // 是否显示文件列表
+    showFileList: {
       type: Boolean,
       default: true,
     },
@@ -198,7 +193,7 @@
           loading.value = false
           visible.value = false
           upFileList.value = []
-          if(props.showFileList){
+          if (props.showFileList) {
             dsFileList.value.init()
           } else {
             emits('handleSuccess')

src/views/ContainerManagement/CheckCntrno/api.ts

@@ -0,0 +1,15 @@
+// @ts-ignore
+import { request } from '/@/utils/request'
+import { DataResult, PageRequest } from '/@/api/model/baseModel'
+enum Api {
+  check = '/containerManagementApi/CM_BaseInfo/CM_CheckCntrno',
+  
+}
+// 列表 (Auth)
+export function ApiCheck(data: PageRequest) {
+  return request<DataResult>({
+    url: Api.check,
+    method: 'post',
+    data,
+  })
+}

src/views/ContainerManagement/CheckCntrno/index.vue

@@ -0,0 +1,61 @@
+<template>
+  <div class="mainBox">
+    <div class="TopBox">
+      <p>待校验箱号</p>
+      <a-textarea :rows="8" v-model:value="waitingData" />
+    </div>
+    <a-button type="primary" class="CheckButton" @click="FnCheck">校验</a-button>
+    <a-row class="BottomBox" type="flex" justify="space-between">
+      <a-col :span="11">
+        <p>已通过箱号</p>
+        <a-textarea :rows="20" v-model:value="passData" />
+      </a-col>
+      <a-col :span="11">
+        <p>未通过箱号</p>
+        <a-textarea :rows="20" v-model:value="failData" />
+      </a-col>
+    </a-row>
+  </div>
+</template>
+<script lang="ts" setup>
+  import { ref } from 'vue'
+  import { useMessage } from '/@/hooks/web/useMessage'
+  const { notification } = useMessage()
+  import { ApiCheck } from './api'
+  let waitingData = ref()
+  let passData = ref()
+  let failData = ref()
+  function FnCheck() {
+    ApiCheck({ cntrno: waitingData.value })
+      .then((res) => {
+        console.log(res)
+        failData.value = res.data.wrongCntrnoList
+        passData.value = res.data.rightCntrnoList
+        notification.success({ message: '校验完成', duration: 3 })
+      })
+      .catch((err) => {
+        notification.warning({ message: err, duration: 3 })
+      })
+  }
+</script>
+<style lang="less" scoped>
+  .mainBox {
+    padding: 5% 30%;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    .TopBox {
+      width: 100%;
+    }
+    .CheckButton {
+      width: 150px;
+      margin: 16px;
+    }
+    .BottomBox {
+      width: 100%;
+    }
+    p {
+      margin: 0;
+    }
+  }
+</style>

src/views/ContainerManagement/RentIn/TenantAuditStepModal.vue

@@ -86,7 +86,14 @@
         </div>
       </a-tab-pane>
       <a-tab-pane key="2" tab="电子文档" :disabled="!rowId">
-        <DsFile ref="dsFile" fileType="infoclient" :id="rowId" />
+        <DsFile
+          ref="dsFile"
+          fileType="infoclient"
+          :id="rowId"
+          :SetSelect="{
+            show: true,
+          }"
+        />
       </a-tab-pane>
       <a-tab-pane key="3" tab="费用" :disabled="!rowId">
         <div class="fee-card-box mt15">
@@ -130,6 +137,14 @@
       >
         取消执行
       </a-button>
+      <a-button
+        pre-icon="ant-design:check-circle-outlined"
+        type="primary"
+        :loading="loading"
+        @click="Cancel()"
+      >
+        识别excel表格
+      </a-button>
       <a-button
         pre-icon="ant-design:close-outlined"
         type="warning"