Merge branch 'zth' into dev

src/components/File/index.vue

@@ -224,7 +224,6 @@
   }
   async function ChangeUpload() {
     let FnUp = (id) => {
-      console.log('FnUp', 1111111111)
       const postData = new FormData()
       const list = unref(upFileList)
       // list.forEach((item) => {

src/views/ContainerManagement/BuyCtn/TenantAuditStepModal.vue

@@ -86,12 +86,26 @@
         </div> -->
       </a-tab-pane>
       <a-tab-pane key="2" tab="电子文档">
+        <!-- <DsFile
+          ref="dsFile"
+          fileType="infoclient"
+          :TriggerSave="true"
+          :id="rowId"
+          @FnTriggerSave="FnTriggerSave"
+          :SetSelect="{
+            show: true,
+          }"
+        /> -->
         <DsFile
           ref="dsFile"
           fileType="infoclient"
+          :dynamicDisabled="3"
           :TriggerSave="true"
+          :succinct="true"
           :id="rowId"
           @FnTriggerSave="FnTriggerSave"
+          @FnUpload="FnUpload"
+          @handleSuccess="handleSuccess"
           :SetSelect="{
             show: true,
           }"
@@ -356,12 +370,34 @@
     }
   }
   const dsFile = ref()
+  async function FnUpload(FnUp) {
+    if (!rowId.value) {
+      await handleSave(false)
+    }
+    FnUp(rowId.value)
+  }
   async function FnTriggerSave() {
     await handleSave(false, true)
     if (rowId.value) {
       dsFile.value.openFileModel()
     }
   }
+  function handleSuccess(data) {
+    const id = data.id.split('.')[0]
+    let ApiData: any = {
+      id: unref(rowId),
+      formName: 'CM_BuyCtn',
+      tableName: '',
+      fileId: id,
+    }
+    ApiDealExcel(ApiData).then((res) => {
+      if (res.succeeded) {
+        activeKey.value = '1'
+        refresh()
+        notification.success({ message: res.message, duration: 3 })
+      }
+    })
+  }
   async function DealExcel() {
     if (!rowId.value) {
       await handleSave(false, false)
@@ -374,9 +410,11 @@
         fileId: dsFile.value.dsFileList.SelectId,
       }
       ApiDealExcel(ApiData).then((res) => {
-        activeKey.value = '1'
+        if (res.succeeded) {
-        refresh()
+          activeKey.value = '1'
-        notification.success({ message: res.message, duration: 3 })
+          refresh()
+          notification.success({ message: res.message, duration: 3 })
+        }
       })
     } else {
       notification.warning({ message: '请先在电子文档中勾选一个文件。', duration: 3 })

src/views/ContainerManagement/RentIn/TenantAuditStepModal.vue

@@ -91,9 +91,13 @@
         <DsFile
           ref="dsFile"
           fileType="infoclient"
+          :dynamicDisabled="3"
           :TriggerSave="true"
+          :succinct="true"
           :id="rowId"
           @FnTriggerSave="FnTriggerSave"
+          @FnUpload="FnUpload"
+          @handleSuccess="handleSuccess"
           :SetSelect="{
             show: true,
           }"
@@ -418,12 +422,34 @@
     }
   }
   const dsFile = ref()
+  async function FnUpload(FnUp) {
+    if (!rowId.value) {
+      await handleSave(false)
+    }
+    FnUp(rowId.value)
+  }
   async function FnTriggerSave() {
     await handleSave(false, true)
     if (rowId.value) {
       dsFile.value.openFileModel()
     }
   }
+  function handleSuccess(data) {
+    const id = data.id.split('.')[0]
+    let ApiData: any = {
+      id: unref(rowId),
+      formName: 'CM_RentIn',
+      tableName: '',
+      fileId: id,
+    }
+    ApiDealExcel(ApiData).then((res) => {
+      if (res.succeeded) {
+        activeKey.value = '1'
+        refresh(true)
+        notification.success({ message: res.message, duration: 3 })
+      }
+    })
+  }
   async function DealExcel() {
     if (!rowId.value) {
       await handleSave(false, false)
@@ -436,9 +462,11 @@
         fileId: dsFile.value.dsFileList.SelectId,
       }
       ApiDealExcel(ApiData).then((res) => {
-        activeKey.value = '1'
+        if (res.succeeded) {
-        refresh()
+          activeKey.value = '1'
-        notification.success({ message: res.message, duration: 3 })
+          refresh()
+          notification.success({ message: res.message, duration: 3 })
+        }
       })
     } else {
       notification.warning({ message: '请先在电子文档中勾选一个文件。', duration: 3 })

src/views/ContainerManagement/RentOneWay/TenantAuditStepModal.vue

@@ -90,9 +90,13 @@
         <DsFile
           ref="dsFile"
           fileType="infoclient"
+          :dynamicDisabled="3"
           :TriggerSave="true"
+          :succinct="true"
           :id="rowId"
           @FnTriggerSave="FnTriggerSave"
+          @FnUpload="FnUpload"
+          @handleSuccess="handleSuccess"
           :SetSelect="{
             show: true,
           }"
@@ -355,12 +359,34 @@
     }
   }
   const dsFile = ref()
+  async function FnUpload(FnUp) {
+    if (!rowId.value) {
+      await handleSave(false)
+    }
+    FnUp(rowId.value)
+  }
   async function FnTriggerSave() {
     await handleSave(false)
     if (rowId.value) {
       dsFile.value.openFileModel()
     }
   }
+  function handleSuccess(data) {
+    const id = data.id.split('.')[0]
+    let ApiData: any = {
+      id: unref(rowId),
+      formName: 'CM_RentOneWay',
+      tableName: '',
+      fileId: id,
+    }
+    ApiDealExcel(ApiData).then((res) => {
+      if (res.succeeded) {
+        activeKey.value = '1'
+        refresh(true)
+        notification.success({ message: res.message, duration: 3 })
+      }
+    })
+  }
   async function DealExcel() {
     if (!rowId.value) {
       await handleSave(false)
@@ -374,9 +400,11 @@
         fileId: dsFile.value.dsFileList.SelectId,
       }
       ApiDealExcel(ApiData).then((res) => {
-        activeKey.value = '1'
+        if (res.succeeded) {
-        refresh()
+          activeKey.value = '1'
-        notification.success({ message: res.message, duration: 3 })
+          refresh()
+          notification.success({ message: res.message, duration: 3 })
+        }
       })
     } else {
       notification.warning({ message: '请先在电子文档中勾选一个文件。', duration: 3 })

src/views/ContainerManagement/RentOneWayIn/TenantAuditStepModal.vue

@@ -55,9 +55,13 @@
         <DsFile
           ref="dsFile"
           fileType="infoclient"
+          :dynamicDisabled="3"
           :TriggerSave="true"
+          :succinct="true"
           :id="rowId"
           @FnTriggerSave="FnTriggerSave"
+          @FnUpload="FnUpload"
+          @handleSuccess="handleSuccess"
           :SetSelect="{
             show: true,
           }"
@@ -301,12 +305,34 @@
     }
   }
   const dsFile = ref()
+  async function FnUpload(FnUp) {
+    if (!rowId.value) {
+      await handleSave(false)
+    }
+    FnUp(rowId.value)
+  }
   async function FnTriggerSave() {
     await handleSave(false)
     if (rowId.value) {
       dsFile.value.openFileModel()
     }
   }
+  function handleSuccess(data) {
+    const id = data.id.split('.')[0]
+    let ApiData: any = {
+      id: unref(rowId),
+      formName: 'CM_RentOneWay',
+      tableName: '',
+      fileId: id,
+    }
+    ApiDealExcel(ApiData).then((res) => {
+      if (res.succeeded) {
+        activeKey.value = '1'
+        refresh(true)
+        notification.success({ message: res.message, duration: 3 })
+      }
+    })
+  }
   async function DealExcel() {
     if (!rowId.value) {
       await handleSave(false)
@@ -319,9 +345,11 @@
         fileId: dsFile.value.dsFileList.SelectId,
       }
       ApiDealExcel(ApiData).then((res) => {
-        activeKey.value = '1'
+        if (res.succeeded) {
-        refresh()
+          activeKey.value = '1'
-        notification.success({ message: res.message, duration: 3 })
+          refresh()
+          notification.success({ message: res.message, duration: 3 })
+        }
       })
     } else {
       notification.warning({ message: '请先在电子文档中勾选一个文件。', duration: 3 })

src/views/ContainerManagement/RentOut/TenantAuditStepModal.vue

@@ -92,9 +92,13 @@
         <DsFile
           ref="dsFile"
           fileType="infoclient"
+          :dynamicDisabled="3"
           :TriggerSave="true"
+          :succinct="true"
           :id="rowId"
           @FnTriggerSave="FnTriggerSave"
+          @FnUpload="FnUpload"
+          @handleSuccess="handleSuccess"
           :SetSelect="{
             show: true,
           }"
@@ -430,12 +434,34 @@
     }
   }
   const dsFile = ref()
+  async function FnUpload(FnUp) {
+    if (!rowId.value) {
+      await handleSave(false, true)
+    }
+    FnUp(rowId.value)
+  }
   async function FnTriggerSave() {
     await handleSave(false, true)
     if (rowId.value) {
       dsFile.value.openFileModel()
     }
   }
+  function handleSuccess(data) {
+    const id = data.id.split('.')[0]
+    let ApiData: any = {
+      id: unref(rowId),
+      formName: 'CM_RentOut',
+      tableName: '',
+      fileId: id,
+    }
+    ApiDealExcel(ApiData).then((res) => {
+      if (res.succeeded) {
+        activeKey.value = '1'
+        refresh()
+        notification.success({ message: res.message, duration: 3 })
+      }
+    })
+  }
   async function DealExcel() {
     if (!rowId.value) {
       await handleSave(false, false)
@@ -448,9 +474,11 @@
         fileId: dsFile.value.dsFileList.SelectId,
       }
       ApiDealExcel(ApiData).then((res) => {
-        activeKey.value = '1'
+        if (res.succeeded) {
-        refresh()
+          activeKey.value = '1'
-        notification.success({ message: res.message, duration: 3 })
+          refresh()
+          notification.success({ message: res.message, duration: 3 })
+        }
       })
     } else {
       notification.warning({ message: '请先在电子文档中勾选一个文件。', duration: 3 })

src/views/ContainerManagement/SellCtn/TenantAuditStepModal.vue

@@ -90,9 +90,13 @@
         <DsFile
           ref="dsFile"
           fileType="infoclient"
+          :dynamicDisabled="3"
           :TriggerSave="true"
+          :succinct="true"
           :id="rowId"
           @FnTriggerSave="FnTriggerSave"
+          @FnUpload="FnUpload"
+          @handleSuccess="handleSuccess"
           :SetSelect="{
             show: true,
           }"
@@ -406,12 +410,34 @@
     }
   }
   const dsFile = ref()
+  async function FnUpload(FnUp) {
+    if (!rowId.value) {
+      await handleSave(false)
+    }
+    FnUp(rowId.value)
+  }
   async function FnTriggerSave() {
     await handleSave(false, true)
     if (rowId.value) {
       dsFile.value.openFileModel()
     }
   }
+  function handleSuccess(data) {
+    const id = data.id.split('.')[0]
+    let ApiData: any = {
+      id: unref(rowId),
+      formName: 'CM_SellCtn',
+      tableName: '',
+      fileId: id,
+    }
+    ApiDealExcel(ApiData).then((res) => {
+      if (res.succeeded) {
+        activeKey.value = '1'
+        refresh(true)
+        notification.success({ message: res.message, duration: 3 })
+      }
+    })
+  }
   async function DealExcel() {
     if (!rowId.value) {
       await handleSave(false, false)
@@ -424,9 +450,11 @@
         fileId: dsFile.value.dsFileList.SelectId,
       }
       ApiDealExcel(ApiData).then((res) => {
-        activeKey.value = '1'
+        if (res.succeeded) {
-        refresh()
+          activeKey.value = '1'
-        notification.success({ message: res.message, duration: 3 })
+          refresh()
+          notification.success({ message: res.message, duration: 3 })
+        }
       })
     } else {
       notification.warning({ message: '请先在电子文档中勾选一个文件。', duration: 3 })