箱状态查询调整 以及 租箱租入 识别excel 调整

src/components/File/index.vue

@@ -123,6 +123,11 @@
         show: false,
       },
     },
+    // 未传递 ID 时，是否先触发保存
+    TriggerSave: {
+      type: Boolean,
+      default: false,
+    },
   })
   // 弹窗开关
   const visible = ref(false)
@@ -180,15 +185,19 @@
 
   // 打开附件弹窗
   const openFileModel = () => {
-    if (!props.id) {
+    if (props.TriggerSave && !props.id) {
-      return createMessage.warning('未检索到业务id，请先保存数据！')
+      emits('FnTriggerSave')
+    } else {
+      if (!props.id) {
+        return createMessage.warning('未检索到业务id，请先保存数据！')
+      }
+      init()
     }
-    init()
   }
   const fileForm = ref(null)
   // 附件列表组件
   const dsFileList = ref(null)
-  const emits = defineEmits(['handleSuccess'])
+  const emits = defineEmits(['handleSuccess', 'FnTriggerSave'])
   // 提交上传
   const handleOk = async () => {
     const res = await fileForm.value.validateFields()
@@ -237,6 +246,7 @@
   defineExpose({
     init,
     dsFileList,
+    openFileModel,
   })
 </script>
 <style></style>

src/views/ContainerManagement/CurrentState/columns.tsx

@@ -183,7 +183,7 @@ export const searchFormSchema: FormSchema[] = [
     field: 'cntrno',
     label: '箱号',
     component: 'Input',
-    colProps: { span: 4 },
+    colProps: { span: 8 },
   },
   {
     field: 'ctnOwner',

src/views/ContainerManagement/CurrentState/index.vue

@@ -50,7 +50,18 @@
       })
     },
     beforeFetch: (p) => {
-      return formatParams(p, ['ctnOwner', 'ctnSourceId', 'isOnlineId', 'portid'])
+      let Rdata = formatParams(p, ['ctnOwner', 'ctnSourceId', 'isOnlineId', 'portid'])
+      if (!!p.cntrno) {
+        let data = JSON.parse(Rdata.queryCondition)
+        data.forEach((item, index) => {
+          if (item.FieldName == 'cntrno') {
+            console.log(item)
+            item.ConditionalType = 15
+          }
+        })
+        Rdata.queryCondition = JSON.stringify(data)
+      }
+      return Rdata
     },
     columns,
     formConfig: {

src/views/ContainerManagement/RentIn/TenantAuditStepModal.vue

@@ -86,11 +86,14 @@
           </div>
         </div>
       </a-tab-pane>
-      <a-tab-pane key="2" tab="电子文档" :disabled="!rowId">
+      <!-- <a-tab-pane key="2" tab="电子文档" :disabled="!rowId"> -->
+      <a-tab-pane key="2" tab="电子文档">
         <DsFile
           ref="dsFile"
           fileType="infoclient"
+          :TriggerSave="true"
           :id="rowId"
+          @FnTriggerSave="FnTriggerSave"
           :SetSelect="{
             show: true,
           }"
@@ -286,6 +289,7 @@
       })
     })
   }
+
   function GetListDetail() {
     ApiListDetail({
       queryCondition: `[{ FieldName: 'Pid', FieldValue: '${rowId.value}', ConditionalType: 1 }]`,
@@ -366,25 +370,30 @@
     }
   }
   const dsFile = ref()
-  function DealExcel() {
+  async function FnTriggerSave() {
+    await handleSave(false)
     if (rowId.value) {
-      if (dsFile.value.dsFileList.SelectId) {
+      dsFile.value.openFileModel()
-        let ApiData: any = {
+    }
-          id: unref(rowId),
+  }
-          formName: 'CM_RentIn',
+  async function DealExcel() {
-          tableName: '',
+    if (!rowId.value) {
-          fileId: dsFile.value.dsFileList.SelectId,
+      await handleSave(false)
-        }
+    }
-        ApiDealExcel(ApiData).then((res) => {
+    if (dsFile.value.dsFileList.SelectId) {
-          activeKey.value = '1'
+      let ApiData: any = {
-          refresh()
+        id: unref(rowId),
-          notification.success({ message: res.message, duration: 3 })
+        formName: 'CM_RentIn',
-        })
+        tableName: '',
-      } else {
+        fileId: dsFile.value.dsFileList.SelectId,
-        notification.warning({ message: '请先在电子文档中勾选一个文件。', duration: 3 })
       }
+      ApiDealExcel(ApiData).then((res) => {
+        activeKey.value = '1'
+        refresh()
+        notification.success({ message: res.message, duration: 3 })
+      })
     } else {
-      notification.warning({ message: '请先保存', duration: 3 })
+      notification.warning({ message: '请先在电子文档中勾选一个文件。', duration: 3 })
     }
   }
   async function handleSave(exit) {