9.29禅道bug修复

src/components/ApproveBtns/index.vue

@@ -4,7 +4,7 @@
  * @Date: 2024-04-29 11:54:04
 -->
 <template>
-  <div v-if="source != 'edit'" class="ds-approve-btns">
+  <div v-if="source != 'edit' && source != 'copy'" class="ds-approve-btns">
     <div>
       <a-button
         v-repeat

src/components/CostEntry/feeTable.vue

@@ -133,7 +133,8 @@
     feeEnName: '',
     quantity: 1,
     exchangeRate: 1,
-    taxRate: 0,
+    taxRate: 0.00,
+    accTaxRate: 0.00,
     feeType: props.tbType == 'receive' ? 1 : 2,
   }
   // 表格绑定数据
@@ -257,13 +258,18 @@
       width: 60,
       data: 'taxRate',
       type: 'numeric',
+      numericFormat: {
+        pattern: '0,0.00'
+      }
     },
     {
       title: '单价',
       width: 70,
       data: 'taxUnitPrice',
       type: 'numeric',
-      format: '0.00',
+      numericFormat: {
+        pattern: '0,0.00'
+      }
     },
     {
       title: '数量',
@@ -327,6 +333,9 @@
       width: 100,
       data: 'accTaxRate',
       type: 'numeric',
+      numericFormat: {
+        pattern: '0,0.00'
+      }
     },
     {
       title: '销项税额',

src/components/Print/index.vue

@@ -115,7 +115,6 @@
       ids.value = v.map(item => {
         return item.id
       })
-      ids.value = String(ids.value)
       jsonDataStr.value = JSON.stringify(v)
     }
     loading.value = true

src/views/operation/seaexport/detail/components/ladingInfo.tsx

@@ -629,7 +629,7 @@ export const formSchema3: FormSchema[] = [
   },
   {
     label: '包装',
-    field: 'kindPkgs',
+    field: 'kindPkgsName',
     component: 'ApiSelect',
     required: false,
     dynamicDisabled: false,
@@ -637,23 +637,18 @@ export const formSchema3: FormSchema[] = [
     colProps: { span: 12 },
     componentProps: ({ formActionType, formModel }) => {
       return {
-        option: optionsStore.getOptionsByCode('GetPackageSelectList'),
-        allowClear: true,
-        showSearch: true,
+        api: GetPackageSelectList,
         labelField: 'packageName',
-        valueField: 'id',
-        onChange: (e) => {
-          if (e) {
-            GetPackageSelectList().then((res) => {
-              res.data.forEach((item) => {
-                if (item.id == e) {
-                  formModel.kindPkgsName = item.cnExplain
-                }
-              })
-              setTimeout(() => {
-                formActionType ? formActionType.submit() : null
-              }, 10)
-            })
+        valueField: 'packageName',
+        resultField: 'data',
+        immediate: false,
+        onChange: (e, obj) => {
+          if (e && obj) {
+            formModel.kindPkgs = obj.id
+            formActionType ? formActionType.submit() : null
+          }
+          if (!e && !obj) {
+            formModel.kindPkgs = null
           }
         },
         filterOption: (input: string, option: any) => {
@@ -662,6 +657,12 @@ export const formSchema3: FormSchema[] = [
       }
     }
   },
+  {
+    label: '',
+    field: 'kindPkgs',
+    component: 'Input',
+    show: false
+  },
   {
     label: '毛重（公斤）',
     field: 'grossWeight',

src/views/operation/seaexport/detail/components/ladingInfo.vue

@@ -672,7 +672,7 @@
     setFieldsValue4({
       ...props.details
     })
-    console.log(props.details)
+
     // 到付
     if (props.details && props.details.mblFrt == 'FREIGHT COLLECT') {
       setFieldsValue4({
@@ -694,7 +694,7 @@
     }
     setFieldsValue5({
       ...props.details,
-      hblno: null
+      hblno: props.details.customerNo || null
     })
     formData.cntrSealNo = props.details.cntrSealNo
     formData.description = props.details.description
@@ -703,8 +703,10 @@
     if (props.details.ctnInfo && props.details.ctnInfo.length) {
       props.details.ctnInfo.forEach(item => {
         item.id = ''
+        item.bsno = ''
       })
       ctnInfo.value = props.details.ctnInfo
+      console.log(ctnInfo.value)
     }
   }
   // 调入主单信息

src/views/operation/seaexport/detail/index.vue

@@ -166,7 +166,7 @@
 </template>
 
 <script lang="ts" setup>
-  import { ref, computed, nextTick, onMounted, defineAsyncComponent } from 'vue'
+  import { ref, computed, nextTick, onMounted, defineAsyncComponent, watch } from 'vue'
   import { useAppStore } from '/@/store/modules/app'
   import { useMessage } from '/@/hooks/web/useMessage'
   import { useRoute, useRouter } from 'vue-router'
@@ -235,6 +235,19 @@
   const RefediMore = ref(null)
   const RefNoteInfo = ref(null)
   const mainOrderActiveKey = ref('1-1')
+  watch(
+    () => mainOrderActiveKey.value,
+    (v) => {
+      if (v == '1-1') {
+        OtherInfo.value.flag = true
+        RefrightContent.value.flag = true
+      }
+      if (v == '5-5') {
+        OtherInfo.value.flag = false
+        RefrightContent.value.flag = false
+      }
+    }
+  )
   const inPageLoading = ref(false)
   const detailsLoadOver = ref(false)
   // const cargoRules = ref(rules.cargoRules)
@@ -340,7 +353,7 @@
   
   onMounted(() => {
     // 如果详情页，隐藏主页面tab标签页
-    if (source.value != 'edit') document.getElementsByClassName('main-tab')[0].getElementsByClassName('ant-tabs-nav-wrap')[0].style.display = 'none'
+    if (source.value != 'edit' && source.value != 'copy') document.getElementsByClassName('main-tab')[0].getElementsByClassName('ant-tabs-nav-wrap')[0].style.display = 'none'
   })
   init()
   // 初始化
@@ -658,8 +671,6 @@
   // 集装箱 件重尺 更改 整票数据
   function changeTotalFun(data) {
     const { type, val } = data
-    console.log(type)
-    console.log(RefcargoInfo.value)
     if (type === 'totalKgs') {
       RefcargoInfo.value.setFieldsValue2({
         kgs: val
@@ -962,7 +973,7 @@
       font-weight: 600;
       color: #257AFA;
       .icon-liebiao1, .icon-jichupeizhi {
-        
+        width: 300px; 
       }
     }
     .main-bill-box {

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

@@ -2887,11 +2887,13 @@ export const personFormSchema: FormSchema[] = [
               personList.value = res.data.map((item) => {
                 return {
                   label: item.name,
-                  value: item.id,
+                  value: item.name,
+                  id: item.id,
                   email: item.email,
                   mobile: item.mobile,
                 }
               })
+              console.log(personList.value)
             })
           }
         },
@@ -2944,23 +2946,22 @@ export const personFormSchema: FormSchema[] = [
   {
     field: 'name',
     label: '联系人',
-    component: 'ApiSelect',
+    component: 'Select',
     required: false,
     dynamicDisabled: false,
     colProps: { span: 12 },
     componentProps: ({ formModel, formActionType }) => {
       return {
-        option: personList.value,
+        options: personList.value,
         mode: 'SECRET_COMBOBOX_MODE_DO_NOT_USE',
-        labelField: 'label',
-        valueField: 'label',
-        immediate: false,
+        allowClear: true,
+        showSearch: true,
         filterOption: (input: string, option: any) => {
           return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
         },
         onChange: (v, obj) => {
           if (v && obj) {
-            formModel.customerContactId = obj.value
+            formModel.customerContactId = obj.id
             formModel.email = obj.email
             formModel.mobile = obj.mobile
           }

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

@@ -158,11 +158,13 @@
     getFieldsValue,
     updateSchema,
     validate,
+    flag,
     open
   })
 </script>
 <style lang="less">
   .other-info {
+    width: 300px;
     .flex {
       justify-content: space-between;
       .collopse {

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

@@ -71,9 +71,10 @@
             <a-tooltip>
               <template v-if="serive.actDate || serive.actRemark || serive.allotUserList" #title>
                 <div v-for="(item, index) in serive.allotUserList || []" :key="'s-g-' + index">
-                  {{ item.UserName }}({{ item.StatusName }}) {{ item.StatusTime }}
+                  <div v-if="item.StatusTime">创建时间：{{ item.StatusTime }}</div>
+                  {{ item.UserName }}({{ item.StatusName }}) 
                 </div>
-                <div v-if="serive.actDate">时间：{{ serive.actDate }}</div>
+                <div v-if="serive.actDate">完成时间：{{ serive.actDate }}</div>
                 <div v-if="serive.actRemark">备注：{{ serive.actRemark }}</div>
                 <div v-if="serive.actVal">显示天数：{{ serive.actVal }}</div>
               </template>
@@ -1062,11 +1063,13 @@
   })
   defineExpose({
     init,
-    open
+    open,
+    flag
   })
 </script>
 <style lang="less">
 .ds-sea-right-content {
+  width: 300px;
   .flex {
     justify-content: space-between;
     .collopse {

src/views/system/print/components/temModal.vue

@@ -120,10 +120,11 @@
     if (!model.inParamColumn) {
       return createMessage.warning('请先填写入口参数！')
     }
+    const inParamColumn = eval(model.inParamColumn)
     const postData = {
       "tenantId": userStore.getUserInfo.tenantId,
       "templateId": model.id,
-      "paramJsonStr":  model.inParamColumn,
+      "paramJsonStr":  JSON.stringify({id:inParamColumn}),
       "printType": "1"
     }
     GetOpenSqlPrintInfo(postData).then(res => {

src/views/system/user/columns.tsx

@@ -427,6 +427,9 @@ export const formSchema: FormSchema[] = [
     label: '备注',
     component: 'InputTextArea',
     colProps: { span: 24 },
+    componentProps: {
+      disTrans: true,
+    }
   },
   // {
   //   field: 'divider-selects',
@@ -852,6 +855,9 @@ export const BankFormSchema: FormSchema[] = [
     label: '备注',
     component: 'InputTextArea',
     colProps: { span: 24 },
+    componentProps: {
+      disTrans: true
+    }
   },
 ]
 export const infoformSchema: FormSchema[] = [
@@ -999,6 +1005,7 @@ export const infoformSchema: FormSchema[] = [
     colProps: { span: 12 },
     componentProps: {
       rows: 4,
+      disTrans: true
     },
   },
   {
@@ -1008,6 +1015,7 @@ export const infoformSchema: FormSchema[] = [
     colProps: { span: 12 },
     componentProps: {
       rows: 4,
+      disTrans: true
     },
   },
   {

src/views/taskmanage/index.vue

@@ -1147,8 +1147,6 @@
         break
       case 'INFO_CLIENT_AUDIT':
         // 客户/供应商审核
-        console.log(data)
-
         go({
           path: '/approval-infoclient',
           query: {
@@ -1159,7 +1157,12 @@
           },
         })
         break
-
+      case 'FEE_AUDIT': 
+        // 费用审批
+        go({
+          path: '/approve-fee'
+        })
+        break
       case 'WAIT_ORDER_AUDIT':
       case 'WAIT_BOOKING':
       case 'WAIT_BC':