Merge branch 'dev' of http://60.209.125.238:20010/lijingjia/ds-wms-client-web into dev

src/views/finance/feeSettlement/columns.tsx

@@ -1164,6 +1164,7 @@ export const freeSearchFormSchema: FormSchema[] = [
     defaultValue: '1',
     componentProps: () => {
       return {
+        allowClear: false,
         options: [
           {
             label: '应收',
@@ -1179,7 +1180,7 @@ export const freeSearchFormSchema: FormSchema[] = [
   },
   {
     label: '费用名称',
-    field: 'feeName',
+    field: 'feeId',
     component: 'ApiSelect',
     required: false,
     dynamicDisabled: false,
@@ -1190,16 +1191,16 @@ export const freeSearchFormSchema: FormSchema[] = [
           return new Promise((resolve) => {
             GetFeeCodeSelectList().then((res) => {
               res.data.forEach((item) => {
-                item.label = item.code + '-' + item.name
+                item.labelName = item.code + '-' + item.name
               })
               resolve(res)
             })
           })
         },
         immediate: false,
+        labelField: 'labelName',
         valueField: 'id',
         resultField: 'data',
-        // mode: 'multiple',
         filterOption: (input: string, option: any) => {
           return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
         },

src/views/finance/feeSettlement/detail/invoiceTable.vue

@@ -391,7 +391,7 @@ function addInfos() {
             const data = {
               currencyFrom: 'RMB',
               currencyTo: item.currency,
-              feeType: 1
+              feeType: getForm().getFieldsValue().feeType
             }
             GetExchangeRate(data).then(res => {
               exchangarr.value.push(res.data)
@@ -466,7 +466,7 @@ function addInfos() {
             const data = {
               currencyFrom: 'RMB',
               currencyTo: item.currency,
-              feeType: item.feeType
+              feeType: getForm().getFieldsValue().feeType
             }
             GetExchangeRate(data).then(res => {
               exchangarr.value.push(res.data)
@@ -530,7 +530,7 @@ function addInfosFee() {
         const data = {
           currencyFrom: currency.value,
           currencyTo: item.currency,
-          feeType: item.feeType
+          feeType: getForm().getFieldsValue().feeType
         }
         GetExchangeRate(data).then(res => {
           exchangarr.value.push(res.data)

src/views/finance/paymentSettlement/paymentSettlementFree/columns.tsx

@@ -1159,6 +1159,7 @@ export const freeSearchFormSchema: FormSchema[] = [
     defaultValue: '2',
     componentProps: () => {
       return {
+        allowClear: false,
         options: [
           {
             label: '应收',
@@ -1174,7 +1175,7 @@ export const freeSearchFormSchema: FormSchema[] = [
   },
   {
     label: '费用名称',
-    field: 'feeName',
+    field: 'feeId',
     component: 'ApiSelect',
     required: false,
     dynamicDisabled: false,

src/views/finance/paymentSettlement/paymentSettlementFree/invoiceTable.vue

@@ -396,7 +396,7 @@ function addInfos() {
             const data = {
               currencyFrom: 'RMB',
               currencyTo: item.currency,
-              feeType: item.feeType
+              feeType: getForm().getFieldsValue().feeType
             }
             GetExchangeRate(data).then(res => {
               exchangarr.value.push(res.data)
@@ -471,7 +471,7 @@ function addInfos() {
             const data = {
               currencyFrom: 'RMB',
               currencyTo: item.currency,
-              feeType: item.feeType
+              feeType: getForm().getFieldsValue().feeType
             }
             GetExchangeRate(data).then(res => {
               exchangarr.value.push(res.data)
@@ -535,7 +535,7 @@ function addInfosFee() {
         const data = {
           currencyFrom: currency.value,
           currencyTo: item.currency,
-          feeType: item.feeType
+          feeType: getForm().getFieldsValue().feeType
         }
         GetExchangeRate(data).then(res => {
           exchangarr.value.push(res.data)

src/views/operation/invoiceApply/detail/feeTable.vue

@@ -294,6 +294,13 @@ const columns = [
     },
     readOnly: true,
   },
+  {
+    title: '币别',
+    width: 100,
+    data: 'currency',
+    type: 'numeric',
+    readOnly: true,
+  },
 ]
 // 表格配置项
 const settings = {

src/views/operation/invoiceIssue/detail/applyInvoice.vue

@@ -402,9 +402,13 @@ function changeApply() {
                     const data = {
                         currencyFrom: 'RMB',
                         currencyTo: item.currency,
-                        feeType: item.feeType,
                         rateType:1,
                     }
+                    if(route.query.type=='free'){
+                        data.feeType = getFormFree().getFieldsValue().feeType
+                    } else {
+                        data.feeType = getForm().getFieldsValue().feeType
+                    }
                     GetExchangeRate(data).then(res => {
                         exchangarr.value.push(res.data)
                         resolve(true);
@@ -488,9 +492,13 @@ function addDetailFree() {
                     const data = {
                         currencyFrom: 'RMB',
                         currencyTo: item.currency,
-                        feeType: 1,
                         rateType:1,
                     }
+                    if(route.query.type=='free'){
+                        data.feeType = getFormFree().getFieldsValue().feeType
+                    } else {
+                        data.feeType = getForm().getFieldsValue().feeType
+                    }
                     GetExchangeRate(data).then(res => {
                         exchangarr.value.push(res.data)
                         resolve(true);
@@ -819,7 +827,11 @@ function addDetailed(type) {
                     const data = {
                         currencyFrom: 'RMB',
                         currencyTo: item.currency,
-                        feeType: 1
+                    }
+                    if(route.query.type=='free'){
+                        data.feeType = getFormFree().getFieldsValue().feeType
+                    } else {
+                        data.feeType = getForm().getFieldsValue().feeType
                     }
                     GetExchangeRate(data).then(res => {
                         exchangarr.value.push(res.data)

src/views/operation/seaexport/detail/modules/aiRecognition.vue

@@ -17,7 +17,7 @@
                 <div class="left">
                     <iframe width="100%" height="800px" :src="fileUrl" frameborder="0"></iframe>
                 </div>
-                <div class="right">
+                <div class="right goods-table">
                     <BasicForm @register="registerForm">
                     </BasicForm>
                     <hot-table style="margin-top: 20px;" ref="hotmain" :data="list" :settings="settings">
@@ -39,7 +39,7 @@ import { InboxOutlined } from '@ant-design/icons-vue';
 import { BasicForm, useForm } from '/@/components/Form/index'
 import { aiForm } from './baseInfo.tsx'
 import { HotTable } from '@handsontable/vue3'
-import { AddMultiFiles } from '/@/components/File/api.js'
+import { AddMultiFiles } from '../../../../../components/File/api.js'
 import { useRouter, useRoute } from 'vue-router'
 import { getDictOption } from '/@/utils/dictUtil'
 const route = useRoute()
@@ -346,4 +346,19 @@ defineExpose({
 :deep(.ant-drawer-body) {
     padding-bottom: 0px;
 }
+
+</style>
+<style lang='less'>
+.goods-table {
+  .handsontable {
+    .wtHider {
+      max-height: 240px!important;
+      min-height: 160px;
+    }
+    .htCheckboxRendererInput {
+      position: relative;
+      z-index: 999;
+    }
+  }
+}
 </style>

src/views/operation/seaexport/detail/modules/baseInfo.tsx

@@ -214,7 +214,7 @@ export const basicInfoFormSchema: FormSchema[] = [
     componentProps: ({ formModel, formActionType }) => {
       return {
         api: GetSupplierListByCode,
-        params: { code: 'contract' },
+        params: { code: 'isContract' },
         labelField: 'pinYinCode',
         valueField: 'shortName',
         showName: 'shortName',
@@ -328,7 +328,7 @@ export const basicInfoFormSchema: FormSchema[] = [
     componentProps: ({ formModel }) => {
       return {
         api: GetSupplierListByCode,
-        params: { code: 'booking' },
+        params: { code: 'isBooking' },
         labelField: 'pinYinCode',
         valueField: 'shortName',
         showName: 'description',
@@ -2749,7 +2749,7 @@ export const otherInfoFormSchema: FormSchema[] = [
     componentProps: ({ formModel }) => {
       return {
         api: GetSupplierListByCode,
-        params: { code: 'truck' },
+        params: { code: 'isTruck' },
         labelField: 'pinYinCode',
         valueField: 'shortName',
         showName: 'description',
@@ -2783,7 +2783,7 @@ export const otherInfoFormSchema: FormSchema[] = [
     componentProps: ({ formModel }) => {
       return {
         api: GetSupplierListByCode,
-        params: { code: 'agent' },
+        params: { code: 'isAgent' },
         labelField: 'pinYinCode',
         showName: 'description',
         valueField: 'shortName',
@@ -2812,7 +2812,7 @@ export const otherInfoFormSchema: FormSchema[] = [
     componentProps: ({ formModel }) => {
       return {
         api: GetSupplierListByCode,
-        params: { code: 'yard' },
+        params: { code: 'isYard' },
         labelField: 'pinYinCode',
         showName: 'description',
         valueField: 'shortName',
@@ -2847,7 +2847,7 @@ export const otherInfoFormSchema: FormSchema[] = [
     componentProps: ({ formModel }) => {
       return {
         api: GetSupplierListByCode,
-        params: { code: 'shipagency' },
+        params: { code: 'isShipagency' },
         labelField: 'pinYinCode',
         showName: 'description',
         valueField: 'shortName',
@@ -2882,7 +2882,7 @@ export const otherInfoFormSchema: FormSchema[] = [
     componentProps: ({ formModel }) => {
       return {
         api: GetSupplierListByCode,
-        params: { code: 'custom' },
+        params: { code: 'isCustom' },
         labelField: 'pinYinCode',
         valueField: 'shortName',
         showName: 'description',
@@ -2995,7 +2995,7 @@ export const otherInfoFormSchema: FormSchema[] = [
 // 客户类别下拉框数据
 const customTypeDict = ref([])
 const personList = ref([])
-getDictOption('infoclient-ArrclientTag').then((data) => {
+getDictOption('djy_cust_prop').then((data) => {
   customTypeDict.value = data
 })
 // 关系人表单
@@ -3427,7 +3427,7 @@ export const aiForm: FormSchema[] = [
     label: '主提单号',
     labelSlot: 'mblno',
     component: 'Input',
-    colProps: { span: 12 },
+    colProps: { span: 6 },
     componentProps: ({ formModel }) => {
       return {
         oninput: () => {
@@ -3446,7 +3446,7 @@ export const aiForm: FormSchema[] = [
     label: '船名',
     field: 'vessel',
     component: 'ApiSelect',
-    colProps: { span: 12 },
+    colProps: { span: 6 },
     componentProps: ({ formModel }) => {
       return {
         api: GetVesselSelectList,
@@ -3470,7 +3470,7 @@ export const aiForm: FormSchema[] = [
     label: '海关航次',
     field: 'voyno',
     component: 'ApiSelect',
-    colProps: { span: 12 },
+    colProps: { span: 6 },
     componentProps: () => {
       return {
         api: GetVoynoSelectList,
@@ -3492,7 +3492,7 @@ export const aiForm: FormSchema[] = [
     field: 'carrier',
     labelSlot: 'carrierId',
     component: 'ApiSelect',
-    colProps: { span: 12 },
+    colProps: { span: 6 },
     componentProps: ({ formModel, formActionType }) => {
       return {
         api: GetCarrierSelectList,
@@ -3516,7 +3516,7 @@ export const aiForm: FormSchema[] = [
     field: 'service',
     label: '运输条款',
     component: 'ApiSelect',
-    colProps: { span: 12 },
+    colProps: { span: 6 },
     componentProps: ({ formModel }) => {
       return {
         api: GetServiceSelectList,
@@ -3557,7 +3557,7 @@ export const aiForm: FormSchema[] = [
     labelSlot: 'customerName',
     field: 'customerName',
     component: 'ApiSelect',
-    colProps: { span: 12 },
+    colProps: { span: 6 },
     componentProps: ({ formModel, formActionType }) => {
       return {
         api: GetControllerClientList,
@@ -3582,7 +3582,7 @@ export const aiForm: FormSchema[] = [
     label: '客户编号',
     component: 'Input',
     required: false,
-    colProps: { span: 12 },
+    colProps: { span: 6 },
   },
   {
     label: '',
@@ -3601,7 +3601,7 @@ export const aiForm: FormSchema[] = [
     label: '品名',
     component: 'ApiSelect',
     labelSlot: 'goodsName',
-    colProps: { span: 12 },
+    colProps: { span: 6 },
     componentProps: ({ formModel }) => {
       return {
         api: GetClientGoodsList,
@@ -3636,7 +3636,7 @@ export const aiForm: FormSchema[] = [
     label: '装货港',
     field: 'loadPortCode',
     component: 'ApiSelect',
-    colProps: { span: 12 },
+    colProps: { span: 6 },
     componentProps: ({ formModel, formActionType }) => {
       return {
         api: GetClientPortSelectList,
@@ -3662,7 +3662,7 @@ export const aiForm: FormSchema[] = [
     label: '卸货港',
     field: 'dischargePortCode',
     component: 'ApiSelect',
-    colProps: { span: 12 },
+    colProps: { span: 6 },
     componentProps: ({ formModel, formActionType }) => {
       return {
         api: GetClientPortSelectList,
@@ -3692,7 +3692,7 @@ export const aiForm: FormSchema[] = [
     label: '交货地',
     field: 'deliveryPlaceCode',
     component: 'ApiSelect',
-    colProps: { span: 12 },
+    colProps: { span: 6 },
     componentProps: ({ formModel }) => {
       return {
         api: GetClientPortSelectList,
@@ -3718,7 +3718,7 @@ export const aiForm: FormSchema[] = [
     label: '收货地',
     field: 'receiptPlaceCode',
     component: 'ApiSelect',
-    colProps: { span: 12 },
+    colProps: { span: 6 },
     componentProps: ({ formModel }) => {
       return {
         api: GetClientPortSelectList,
@@ -3745,7 +3745,7 @@ export const aiForm: FormSchema[] = [
     field: 'loadPort',
     component: 'Input',
     required: false,
-    colProps: { span: 12 },
+    colProps: { span: 6 },
     componentProps: ({ formModel }) => {
       return {
         oninput: () => {
@@ -3765,7 +3765,7 @@ export const aiForm: FormSchema[] = [
     field: 'dischargePort',
     component: 'Input',
     required: false,
-    colProps: { span: 12 },
+    colProps: { span: 6 },
     componentProps: ({ formModel }) => {
       return {
         oninput: () => {
@@ -3785,7 +3785,7 @@ export const aiForm: FormSchema[] = [
     field: 'deliveryPlace',
     component: 'Input',
     required: false,
-    colProps: { span: 12 },
+    colProps: { span: 6 },
     componentProps: ({ formModel }) => {
       return {
         oninput: () => {
@@ -3805,7 +3805,7 @@ export const aiForm: FormSchema[] = [
     field: 'receiptPlace',
     component: 'Input',
     required: false,
-    colProps: { span: 12 },
+    colProps: { span: 6 },
     componentProps: ({ formModel }) => {
       return {
         oninput: () => {
@@ -3825,7 +3825,7 @@ export const aiForm: FormSchema[] = [
     label: '订舱编号',
     labelSlot: 'bookingNo',
     component: 'Input',
-    colProps: { span: 12 },
+    colProps: { span: 6 },
     componentProps: ({ formModel }) => {
       return {
         oninput: () => {
@@ -3839,7 +3839,7 @@ export const aiForm: FormSchema[] = [
     label: '开船日期',
     labelSlot: 'etd',
     component: 'DatePicker',
-    colProps: { span: 12 },
+    colProps: { span: 6 },
     componentProps: {
       allowClear: true,
       valueFormat: 'YYYY-MM-DD'
@@ -3849,7 +3849,7 @@ export const aiForm: FormSchema[] = [
     field: 'closingDate',
     label: '截港时间',
     component: 'DatePicker',
-    colProps: { span: 12 },
+    colProps: { span: 6 },
     componentProps: {
       showTime: true,
       allowClear: true,
@@ -3860,7 +3860,7 @@ export const aiForm: FormSchema[] = [
     field: 'eta',
     label: '预抵日期',
     component: 'DatePicker',
-    colProps: { span: 12 },
+    colProps: { span: 6 },
     componentProps: {
       allowClear: true,
       valueFormat: 'YYYY-MM-DD',
@@ -3870,7 +3870,7 @@ export const aiForm: FormSchema[] = [
     field: 'openPortDate',
     label: '截VGM时间',
     component: 'DatePicker',
-    colProps: { span: 12 },
+    colProps: { span: 6 },
     componentProps: {
       allowClear: true,
       showTime: true,
@@ -3881,7 +3881,7 @@ export const aiForm: FormSchema[] = [
     field: 'closeDocDate',
     label: '截单时间',
     component: 'DatePicker',
-    colProps: { span: 12 },
+    colProps: { span: 6 },
     componentProps: {
       showTime: true,
       allowClear: true,
@@ -3892,7 +3892,7 @@ export const aiForm: FormSchema[] = [
     label: '签单地代码',
     field: 'issuePlaceCode',
     component: 'ApiSelect',
-    colProps: { span: 12 },
+    colProps: { span: 6 },
     componentProps: ({ formModel }) => {
       return {
         api: GetClientPortSelectList,
@@ -3919,7 +3919,7 @@ export const aiForm: FormSchema[] = [
     field: 'issuePlace',
     component: 'Input',
     required: false,
-    colProps: { span: 12 },
+    colProps: { span: 6 },
     componentProps: ({ formModel }) => {
       return {
         oninput: () => {
@@ -3940,7 +3940,7 @@ export const aiForm: FormSchema[] = [
     component: 'Input',
     required: false,
     dynamicDisabled: false,
-    colProps: { span: 12 },
+    colProps: { span: 6 },
   },
   {
     label: '',
@@ -3952,7 +3952,7 @@ export const aiForm: FormSchema[] = [
     label: '订舱口',
     field: 'forwarder',
     component: 'ApiSelect',
-    colProps: { span: 12 },
+    colProps: { span: 6 },
     componentProps: ({ formModel }) => {
       return {
         api: GetSupplierListByCode,
@@ -3984,7 +3984,7 @@ export const aiForm: FormSchema[] = [
     field: 'shipAgency',
     component: 'ApiSelect',
     labelSlot: 'shipAgencyId',
-    colProps: { span: 12 },
+    colProps: { span: 6 },
     componentProps: ({ formModel }) => {
       return {
         api: GetSupplierListByCode,
@@ -4015,7 +4015,7 @@ export const aiForm: FormSchema[] = [
     field: 'yard',
     label: '场站',
     component: 'ApiSelect',
-    colProps: { span: 12 },
+    colProps: { span: 6 },
     componentProps: ({ formModel }) => {
       return {
         api: GetSupplierListByCode,
@@ -4046,7 +4046,7 @@ export const aiForm: FormSchema[] = [
     label: '客服',
     field: 'customerServiceName',
     component: 'ApiSelect',
-    colProps: { span: 12 },
+    colProps: { span: 6 },
     componentProps: ({ formModel }) => {
       return {
         api: GetCustomerServiceList,

src/views/system/serviceItemList/columns.tsx

@@ -123,25 +123,29 @@ export const detailForm: FormSchema[] = [
     required: true,
     rules: [{ message: '请输入服务项目名称' }],
     component: 'Input',
-    colProps: { span: 4 },
+    colProps: { span: 24 },
   },
   {
     field: 'serviceProjectCode',
     label: '服务项目代码',
+    required: true,
+    rules: [{ message: '请输入服务项目代码' }],
     component: 'Input',
-    colProps: { span: 4 },
+    colProps: { span: 24 },
   },
   {
     field: 'sortNo',
     label: '排序',
     component: 'Input',
-    colProps: { span: 4 },
+    colProps: { span: 24 },
   },
   {
     field: 'serviceProjectNote',
     label: '服务项目说明',
+    required: true,
+    rules: [{ message: '请输入服务项目说明' }],
     component: 'Input',
-    colProps: { span: 4 },
+    colProps: { span: 24 },
   },
 
 

src/views/system/serviceItemList/index.vue

@@ -51,6 +51,11 @@
         </BasicTable>
         <a-modal width="800px" @cancel="open = false" :visible="open" title="服务项目">
             <BasicForm @register="registerForm"></BasicForm>
+            <template #footer>
+                <a-button @click="open=false">取消</a-button>
+                <a-button type="primary"  @click="handleSave">保存</a-button>
+                <a-button type="primary"  @click="handleSave">保存并启用</a-button>
+            </template>
         </a-modal>
     </div>
 </template>
@@ -105,12 +110,15 @@ const [registerForm, { resetFields, setFieldsValue, validate, updateSchema, getF
     labelWidth: 100,
     schemas: detailForm,
     showActionButtonGroup: false,
-    readonly: true,
 })
 function GoDetailed(type) {
     if (!type) {
-
+        open.value = true
+    }
 }
+async function handleSave(){
+    await validate()
+    console.log(getFieldsValue())
 }
 function FnDel() {