From 4bc2bc8d71279b2b558698ff3a460ae578c2f858 Mon Sep 17 00:00:00 2001
From: lijingjia <lijj_xl@163.com>
Date: Tue, 8 Oct 2024 17:34:07 +0800
Subject: [PATCH] =?UTF-8?q?10.8=E7=A6=85=E9=81=93=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ApproveBtns/index.vue          |  1 +
 src/components/CostEntry/actionBar.vue        |  2 --
 src/components/CostEntry/feeStatistic.vue     |  5 ++++-
 src/components/CostEntry/feeTable.vue         |  4 +++-
 src/components/CostEntry/index.vue            |  9 ++++++--
 src/components/Form/src/BasicForm.vue         | 21 ++++++-------------
 src/components/Form/src/hooks/useForm.ts      |  1 +
 .../approve/fee/components/feeRejectModal.vue |  3 ++-
 .../paid/components/feeRejectModal.vue        |  3 ++-
 src/views/operation/seaexport/api/SendCar.js  |  1 -
 src/views/operation/seaexport/columns.tsx     |  2 --
 .../detail/components/ladingInfo.tsx          |  5 +++--
 .../detail/components/ladingInfo.vue          | 11 +++++++---
 .../detail/components/manifestTicket.vue      |  1 -
 .../operation/seaexport/detail/index.vue      |  5 ++---
 .../modules/Letter/OpBusinessTruckColumns.tsx |  2 --
 .../modules/Letter/OpBusinessYardEdit.vue     |  1 -
 .../seaexport/detail/modules/PersonModal.vue  |  7 ++++++-
 .../seaexport/detail/modules/baseInfo.tsx     |  5 ++---
 .../seaexport/detail/modules/basicInfo.vue    |  2 ++
 .../seaexport/detail/modules/cargoInfo.vue    |  3 ---
 .../detail/modules/operationArea.vue          |  1 -
 .../seaexport/detail/modules/otherInfo.vue    | 21 +++++++++++++++++++
 .../seaexport/modules/BatchModification.vue   |  3 ---
 24 files changed, 70 insertions(+), 49 deletions(-)

diff --git a/src/components/ApproveBtns/index.vue b/src/components/ApproveBtns/index.vue
index 57d2150a..4d898c26 100644
--- a/src/components/ApproveBtns/index.vue
+++ b/src/components/ApproveBtns/index.vue
@@ -97,6 +97,7 @@
           minRows: 4,
           maxRows: 4,
         },
+        disTrans: true
       },
     },
   ]
diff --git a/src/components/CostEntry/actionBar.vue b/src/components/CostEntry/actionBar.vue
index a9892b0d..2f326ff3 100644
--- a/src/components/CostEntry/actionBar.vue
+++ b/src/components/CostEntry/actionBar.vue
@@ -317,8 +317,6 @@
   }
   // 保存
   const save = () => {
-    let flag = false
-    const arr = []
     for (let i = 0; i < props.data.length; i++) {
       if (!props.data[i].feeName && props.data[i].feeStatus == 1) {
         createMessage.warning(`费用名称不能为空！`)
diff --git a/src/components/CostEntry/feeStatistic.vue b/src/components/CostEntry/feeStatistic.vue
index c53b8c97..3e3a03f3 100644
--- a/src/components/CostEntry/feeStatistic.vue
+++ b/src/components/CostEntry/feeStatistic.vue
@@ -52,7 +52,7 @@
 
 <script lang="ts" setup>
   import { BasicTable, useTable } from '/@/components/Table'
-  import { onMounted, ref, defineProps, watch } from 'vue'
+  import { onMounted, ref, defineProps, watch, defineExpose } from 'vue'
   import emitter from '/@/utils/Bus'
   import { FeeStatistics } from './api'
   import { currencyColumns, costomerColumns } from './columns'
@@ -115,6 +115,9 @@
     showIndexColumn: true,
     canResize: false
   })
+  defineExpose({
+    init
+  })
 </script>
 
 <style lang="scss">
diff --git a/src/components/CostEntry/feeTable.vue b/src/components/CostEntry/feeTable.vue
index fb940586..e5c949f2 100644
--- a/src/components/CostEntry/feeTable.vue
+++ b/src/components/CostEntry/feeTable.vue
@@ -96,7 +96,7 @@
       default: '300'
     }
   })
-  const emits = defineEmits(['broInsert'])
+  const emits = defineEmits(['broInsert', 'refreshStatic'])
   // 费用名称字典
   const feeDict = ref([])
   // 费用标准字典
@@ -737,6 +737,8 @@
       .then((res) => {
         loading.value = false
         init()
+        // 刷新统计表格数据
+        emits('refreshStatic')
         createMessage.success(res.message)
       })
       .catch(() => {
diff --git a/src/components/CostEntry/index.vue b/src/components/CostEntry/index.vue
index 0a9af2d1..05417dbe 100644
--- a/src/components/CostEntry/index.vue
+++ b/src/components/CostEntry/index.vue
@@ -29,9 +29,10 @@
         :id="details.id"
         :details="details"
         @broInsert="broPay"
+        @refreshStatic="refreshStatic"
       ></FeeTable>
     </div>
-    <FeeStatistic :id="data.id" />
+    <FeeStatistic ref="fees" :id="data.id" />
   </div>
 </template>
 <script lang="ts" setup>
@@ -66,10 +67,14 @@
   const broPay = (v) => {
     broPayData.value = v
   }
+  const fees = ref(null)
+  // 初始化统计表格
+  const refreshStatic = () => {
+    fees.value.init(data.value.id)
+  }
   watch(
     () => props.details,
     (val) => {
-      console.log(val)
       data.value = val
     },
     { immediate: true, deep: true }
diff --git a/src/components/Form/src/BasicForm.vue b/src/components/Form/src/BasicForm.vue
index bd7874ca..eb6b6c0c 100644
--- a/src/components/Form/src/BasicForm.vue
+++ b/src/components/Form/src/BasicForm.vue
@@ -12,7 +12,7 @@
       <slot name="formHeader"></slot>
       <template v-for="schema in getSchema" :key="schema.field">
         <FormItem
-          v-show="(schema.isEdit == 2 || schema.component == 'Divider' || schema.component == 'InputTextArea') && schema.show !== false"
+          v-if="schema.isEdit != 1 || schema.component == 'Divider' || schema.component == 'InputTextArea'"
           :is-advanced="fieldsIsAdvancedMap[schema.field]"
           :table-action="tableAction"
           :form-action-type="formActionType"
@@ -27,7 +27,7 @@
           </template>
         </FormItem>
         <!-- 只读 -->
-        <a-col :span="schema?.colProps?.span || 24" v-show="schema.show !== false && schema.isEdit == 1 && schema.component != 'Divider' && schema.component != 'InputTextArea'">
+        <a-col :span="schema?.colProps?.span || 24" v-if="schema.show !== false && schema.isEdit == 1 && schema.component != 'Divider' && schema.component != 'InputTextArea'">
           <div class="ds-form-onlyread">
             <span class="label">{{ schema.label }}：</span> {{ formModel[schema.field] || '-' }}
             <span v-if="!schema.dynamicDisabled" class="iconfont icon-bianji1" @click="editFormItem(schema)"></span>
@@ -125,23 +125,17 @@
           ...rowProps,
         }
       })
+
       const getBindValue = computed(
         () => ({ ...attrs, ...props, ...unref(getProps) } as Recordable),
       )
-      // 每个表单只执行一次isEdit
-      let editFlag = false
+
       const getSchema = computed((): FormSchema[] => {
         const schemas: FormSchema[] = unref(schemaRef) || (unref(getProps).schemas as any)
         const isReadonly = unref(propsRef).readonly
         for (const schema of schemas) {
-          if (!editFlag) {
-            // 如果表单包含只读属性。处理每个item增加是否可编辑 （只读1）(可编辑2)
-            if (isReadonly) {
-              schema['isEdit'] = 1
-            } else {
-              schema['isEdit'] = 2
-            }
-          }
+          // 如果表单包含只读属性。处理每个item增加是否可编辑
+          if (isReadonly && !schema.isEdit) schema['isEdit'] = 1
           const { defaultValue, component, isHandleDateDefaultValue = true } = schema
           // handle date type
           if (isHandleDateDefaultValue && defaultValue && dateItemType.includes(component)) {
@@ -156,9 +150,6 @@
             }
           }
         }
-        if (schemas.length) {
-          editFlag = true
-        }
         if (unref(getProps).showAdvancedButton) {
           return cloneDeep(
             schemas.filter((schema) => schema.component !== 'Divider') as FormSchema[],
diff --git a/src/components/Form/src/hooks/useForm.ts b/src/components/Form/src/hooks/useForm.ts
index 4bd23aeb..49d55b87 100644
--- a/src/components/Form/src/hooks/useForm.ts
+++ b/src/components/Form/src/hooks/useForm.ts
@@ -114,6 +114,7 @@ export function useForm(props?: Props): UseFormReturnType {
 
     validate: async (nameList?: NamePath[]): Promise<Recordable> => {
       const form = await getForm()
+      console.log(form.validate(nameList))
       return form.validate(nameList)
     },
 
diff --git a/src/views/approve/fee/components/feeRejectModal.vue b/src/views/approve/fee/components/feeRejectModal.vue
index ab701c85..e5e1dfe0 100644
--- a/src/views/approve/fee/components/feeRejectModal.vue
+++ b/src/views/approve/fee/components/feeRejectModal.vue
@@ -54,7 +54,8 @@
       required: true,
       colProps: { span: 24 },
       componentProps: {
-        rows: 4
+        rows: 4,
+        disTrans: true
       }
     }
   ]
diff --git a/src/views/approve/paid/components/feeRejectModal.vue b/src/views/approve/paid/components/feeRejectModal.vue
index 5223199e..a53fb1a9 100644
--- a/src/views/approve/paid/components/feeRejectModal.vue
+++ b/src/views/approve/paid/components/feeRejectModal.vue
@@ -54,7 +54,8 @@
       required: true,
       colProps: { span: 24 },
       componentProps: {
-        rows: 4
+        rows: 4,
+        disTrans: true
       }
     }
   ]
diff --git a/src/views/operation/seaexport/api/SendCar.js b/src/views/operation/seaexport/api/SendCar.js
index d0bbfa8a..0d0746b5 100644
--- a/src/views/operation/seaexport/api/SendCar.js
+++ b/src/views/operation/seaexport/api/SendCar.js
@@ -210,7 +210,6 @@ export function BookingTruckGetYardData(parameter) {
  * 获取场站数据
  */
 export function TaskManageTruckGetYardData(param) {
-  console.log(param)
   const url = '/TaskManageTruck/GetYardData?ids=' + param[0] + '&ids=' + param[1]
   return request({
     url,
diff --git a/src/views/operation/seaexport/columns.tsx b/src/views/operation/seaexport/columns.tsx
index b7111fed..8558f88a 100644
--- a/src/views/operation/seaexport/columns.tsx
+++ b/src/views/operation/seaexport/columns.tsx
@@ -67,7 +67,6 @@ const sourceDetailId = ref([])
 // 箱型 字段转换 改按需的时候不要动
 const CtnMapArr: any = []
 getDictOption('seaexport_ctn_map').then((res) => {
-  console.log(res)
   res.forEach((item) => {
     CtnMapArr.push({
       title: item.value,
@@ -1234,7 +1233,6 @@ export const BatchModificationFormSchema: FormSchema[] = [
           return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
         },
         onChange: (e, obj) => {
-          console.log(obj)
           if (e) {
             formModel.cnName = obj.label
           } else {
diff --git a/src/views/operation/seaexport/detail/components/ladingInfo.tsx b/src/views/operation/seaexport/detail/components/ladingInfo.tsx
index f4ce6ac6..963d4a2e 100644
--- a/src/views/operation/seaexport/detail/components/ladingInfo.tsx
+++ b/src/views/operation/seaexport/detail/components/ladingInfo.tsx
@@ -216,7 +216,7 @@ export const formSchema1: FormSchema[] = [
     field: 'agent',
     label: '国外代理',
     component: 'ApiSelect',
-    required: false,
+    required: true,
     dynamicDisabled: false,
     // defaultValue: '',
     colProps: { span: 24 },
@@ -967,7 +967,8 @@ export const formSchema5: FormSchema[] = [
     label: '分提单号',
     field: 'hblno',
     component: 'Input',
-    defaultValue: '',
+    required: true,
+    defaultValue: null,
     colProps: { span: 12 }
   }
 ]
diff --git a/src/views/operation/seaexport/detail/components/ladingInfo.vue b/src/views/operation/seaexport/detail/components/ladingInfo.vue
index 3f535b3b..ccae3e9f 100644
--- a/src/views/operation/seaexport/detail/components/ladingInfo.vue
+++ b/src/views/operation/seaexport/detail/components/ladingInfo.vue
@@ -352,6 +352,9 @@
     postData.queryCondition = JSON.stringify(condition)
     GetSeaExportBillManageList(postData).then(res => {
       list.value = res.data
+      if (res?.data?.length) {
+        setFormValue(res.data[0])
+      }
     }).catch(() => {
       
     })
@@ -664,7 +667,8 @@
     formData.marks = ''
     setFieldsValue1({
       ...props.details,
-      id: null
+      id: null,
+      agentContent: props.details.consigneeContent
     })
     setFieldsValue2({
       ...props.details
@@ -673,7 +677,9 @@
       ...props.details
     })
     setFieldsValue4({
-      ...props.details
+      ...props.details,
+      mblFrt: null,
+      mblFrtCode: null
     })
 
     // 到付
@@ -709,7 +715,6 @@
         item.bsno = ''
       })
       ctnInfo.value = props.details.ctnInfo
-      console.log(ctnInfo.value)
     }
   }
   // 调入主单信息
diff --git a/src/views/operation/seaexport/detail/components/manifestTicket.vue b/src/views/operation/seaexport/detail/components/manifestTicket.vue
index ac9937cb..dbea2386 100644
--- a/src/views/operation/seaexport/detail/components/manifestTicket.vue
+++ b/src/views/operation/seaexport/detail/components/manifestTicket.vue
@@ -299,7 +299,6 @@
     loading.value = true
     EditShippingBillPartCtn({ partList: list.value, businessId: props.id }).then(res => {
       loading.value = false
-      console.log(res)
     })
   }
   // 导入成功数据处理
diff --git a/src/views/operation/seaexport/detail/index.vue b/src/views/operation/seaexport/detail/index.vue
index 714d9919..1101391d 100644
--- a/src/views/operation/seaexport/detail/index.vue
+++ b/src/views/operation/seaexport/detail/index.vue
@@ -312,7 +312,6 @@
       const { data } = res
       if (data && data.id) {
         const content = JSON.parse(data.content).columns
-        console.log(content)
         // 提单确认的时候，下列字段为必填项
         const status = route.query.status
         if (status == 'WAIT_BILL_CONFIRM') {
@@ -334,7 +333,6 @@
             })
           }
         }
-        console.log(content)
         // 存在修改实则表单规则
         OtherInfo.value.updateSchema(content)
         RefbasicInfo.value.updateSchema(content)
@@ -513,6 +511,7 @@
       ediInfo: ediFrom,
       ctnInfo
     }
+    if (id.value) postData['id'] = id.value
     // 发送请求
     loading.value = true
     BookingOrderSave(postData)
@@ -535,7 +534,7 @@
               go(`/BookingDetail?id=${res.data}&source=edit`)
             }, 50)
           }
-          init()
+          if (route.query.source != 'copy') init()
         }
       })
       .catch(() => {
diff --git a/src/views/operation/seaexport/detail/modules/Letter/OpBusinessTruckColumns.tsx b/src/views/operation/seaexport/detail/modules/Letter/OpBusinessTruckColumns.tsx
index 82ddaa7a..79b8a311 100644
--- a/src/views/operation/seaexport/detail/modules/Letter/OpBusinessTruckColumns.tsx
+++ b/src/views/operation/seaexport/detail/modules/Letter/OpBusinessTruckColumns.tsx
@@ -282,7 +282,6 @@ export const formSchema: FormSchema[] = [
         },
         onChange: (e, obj) => {
           if (obj) {
-            console.log(obj)
             formModel.truckName = obj.label
             formModel.truckCode = obj.codeName
           } else {
@@ -848,7 +847,6 @@ export const formSchema: FormSchema[] = [
         },
         onChange: (e, obj) => {
           if (obj) {
-            console.log(obj)
             formModel.dispatcherName = obj.userName
           } else {
             formModel.dispatcherName = ''
diff --git a/src/views/operation/seaexport/detail/modules/Letter/OpBusinessYardEdit.vue b/src/views/operation/seaexport/detail/modules/Letter/OpBusinessYardEdit.vue
index 79ce0264..835a22c0 100644
--- a/src/views/operation/seaexport/detail/modules/Letter/OpBusinessYardEdit.vue
+++ b/src/views/operation/seaexport/detail/modules/Letter/OpBusinessYardEdit.vue
@@ -184,7 +184,6 @@
     const data = getFieldsValue()
     loading.value = true
     BatchDelOpBusinessYard({ ids: [data.id] }).then(res => {
-      console.log(res)
       createMessage.success('删除成功！')
       resetFields()
       init(details)
diff --git a/src/views/operation/seaexport/detail/modules/PersonModal.vue b/src/views/operation/seaexport/detail/modules/PersonModal.vue
index ad9cf0d1..a1110177 100644
--- a/src/views/operation/seaexport/detail/modules/PersonModal.vue
+++ b/src/views/operation/seaexport/detail/modules/PersonModal.vue
@@ -53,7 +53,7 @@
   const loading = ref(false)
   const rowId = ref('')
   const { createMessage } = useMessage()
-  const [registerForm, { resetFields, setFieldsValue, validate, updateSchema }] =
+  const [registerForm, { resetFields, setFieldsValue, validate, updateSchema, getFieldsValue }] =
     useForm({
       labelWidth: 100,
       schemas: personFormSchema,
@@ -71,9 +71,11 @@
       updateFormField(updateSchema)
       rowId.value = data.record.id
       const res: API.DataResult = await GetBusinessOrderContactInfo({ id: unref(rowId) })
+      console.log(res)
       if (res.succeeded) {
         setFieldsValue({
           ...res.data,
+          id: res.data.id
         })
       }
     } else {
@@ -111,6 +113,9 @@
       const values = await validate()
       if (!values.mobile && !values.tel) return createMessage.warning('请填写电话或者手机！')
       values['businessId'] = id.value
+      if (getFieldsValue().id) {
+        values['id'] = getFieldsValue().id
+      }
       loading.value = true
       setModalProps({ confirmLoading: true, loading: true })
       const res: API.DataResult = await EditBusinessOrderContact(values)
diff --git a/src/views/operation/seaexport/detail/modules/baseInfo.tsx b/src/views/operation/seaexport/detail/modules/baseInfo.tsx
index 45ef90c1..412ecfe4 100644
--- a/src/views/operation/seaexport/detail/modules/baseInfo.tsx
+++ b/src/views/operation/seaexport/detail/modules/baseInfo.tsx
@@ -1882,7 +1882,7 @@ export const cargoInfoFormSchema2: FormSchema[] = [
               formModel.hsCode = obj.hsCode
             }
           }
-          if (!v && !obj.id) {
+          if (!v && !obj?.id) {
             formModel.goodsId = null
             formModel.hsCode = null
           }
@@ -2079,7 +2079,7 @@ export const cargoInfoFormSchema3: FormSchema[] = [
     },
   },
   {
-    label: '联系人',
+    label: '危险品联系人',
     field: 'dangerAttn',
     component: 'Input',
     required: false,
@@ -2941,7 +2941,6 @@ export const personFormSchema: FormSchema[] = [
                   mobile: item.mobile,
                 }
               })
-              console.log(personList.value)
             })
           }
         },
diff --git a/src/views/operation/seaexport/detail/modules/basicInfo.vue b/src/views/operation/seaexport/detail/modules/basicInfo.vue
index 07edfa9a..73945ff5 100644
--- a/src/views/operation/seaexport/detail/modules/basicInfo.vue
+++ b/src/views/operation/seaexport/detail/modules/basicInfo.vue
@@ -182,6 +182,8 @@
   }
   // 切换出单方式
   const toggleIssuingWay = (v) => {
+    // 分单：国外代理必填
+    emitter.emit('setBillType', v)
     if (v == 'zd') {
       formData.issuingWay = 'fd'
     } else {
diff --git a/src/views/operation/seaexport/detail/modules/cargoInfo.vue b/src/views/operation/seaexport/detail/modules/cargoInfo.vue
index 38d4ccf4..142c2547 100644
--- a/src/views/operation/seaexport/detail/modules/cargoInfo.vue
+++ b/src/views/operation/seaexport/detail/modules/cargoInfo.vue
@@ -385,7 +385,6 @@
   watch(
     () => props.details,
     (nval) => {
-      console.log(nval)
       if (Object.keys(nval).length) {
         setFieldsValue1({ marks: nval.marks, description: nval.description })
         setFieldsValue2(nval)
@@ -407,7 +406,6 @@
   const source = ref(route.query.source || 'edit') 
   onMounted(() => {
     const nval = props.details
-    console.log(nval)
     if (nval.id) {
       setFieldsValue1({ marks: nval.marks, description: nval.description })
       setFieldsValue2(nval)
@@ -418,7 +416,6 @@
   })
   // 选择箱型触发
   const ctnChange = (v, item) => {
-    console.log(item)
     let data = {}
     ctnOptions.value.forEach(row => {
       if (row.ctnName == v) {
diff --git a/src/views/operation/seaexport/detail/modules/operationArea.vue b/src/views/operation/seaexport/detail/modules/operationArea.vue
index efefdc8a..78dedb7f 100644
--- a/src/views/operation/seaexport/detail/modules/operationArea.vue
+++ b/src/views/operation/seaexport/detail/modules/operationArea.vue
@@ -1401,7 +1401,6 @@
       }).then((res) => {
         Rdata.value = res.data
         Bx.value = x.value + width.value
-        console.log(Bx)
         By.value = y.value + height.value
         CvBoxType.value = true
       })
diff --git a/src/views/operation/seaexport/detail/modules/otherInfo.vue b/src/views/operation/seaexport/detail/modules/otherInfo.vue
index 39ebcd95..61302609 100644
--- a/src/views/operation/seaexport/detail/modules/otherInfo.vue
+++ b/src/views/operation/seaexport/detail/modules/otherInfo.vue
@@ -124,6 +124,12 @@
     () => props.details,
     (v) => {
       setFieldsValue(v)
+      if (v.issuingWay == 'fd') {
+        updateSchema({
+          field: 'agent',
+          required: true
+        })
+      }
     }
   )
   onMounted(() => {
@@ -142,10 +148,25 @@
         ...v
       })
     })
+    // 切换直单分单来设置国外代理是否必填
+    emitter.on('setBillType', (v) => {
+      if (v == 'zd') {
+        updateSchema({
+          field: 'agent',
+          required: true
+        })
+      } else {
+        updateSchema({
+          field: 'agent',
+          required: false
+        })
+      }
+    })
   })
   onUnmounted(() => {
     emitter.off('setSeaLane')
     emitter.off('customerBack')
+    emitter.off('setBillType')
   })
   // 带出edi操作信息
   const linkageForm = (item) => {
diff --git a/src/views/operation/seaexport/modules/BatchModification.vue b/src/views/operation/seaexport/modules/BatchModification.vue
index b880e6bb..231848a8 100644
--- a/src/views/operation/seaexport/modules/BatchModification.vue
+++ b/src/views/operation/seaexport/modules/BatchModification.vue
@@ -60,9 +60,6 @@
     try {
       const values = await validate()
       setModalProps({ confirmLoading: true, loading: true })
-      // TODO custom api
-      console.log(values)
-      // loading.value = true;
       const res: API.DataResult = await SeaExportBatchEdit({ ...values, ids: ids.value })
       if (res.succeeded) {
         createMessage.success(res.message)