9.24禅道bug修复

src/components/CostEntry/feeTable.vue

@@ -61,6 +61,8 @@
   import { useMessage } from '/@/hooks/web/useMessage'
   // 引入字典接口
   import { getDictOption } from '/@/utils/dictUtil'
+  // 汇率列表接口
+  import { GetFeeCurrencyExchangeList } from '/@/views/fee/exchangeRate/api'
   const { createMessage } = useMessage()
   defineComponent({
     HotTable,
@@ -131,6 +133,7 @@
     feeEnName: '',
     quantity: 1,
     exchangeRate: 1,
+    taxRate: 0,
     feeType: props.tbType == 'receive' ? 1 : 2,
   }
   // 表格绑定数据
@@ -483,14 +486,32 @@
             list.value[changes[0][0]]['feeId'] = dict['id']
             list.value[changes[0][0]]['feeEnName'] = dict['enName']
             list.value[changes[0][0]]['currency'] = dict['defaultCurrency']
-            list.value[changes[0][0]]['customerTypeText'] = dict['defaultDebitName']
-            list.value[changes[0][0]]['customerType'] = dict['defaultDebit']
             list.value[changes[0][0]]['isOpen'] = dict['isOpen']
             list.value[changes[0][0]]['isAdvancedPay'] = dict['isAdvancedPay']
             list.value[changes[0][0]]['isInvoice'] = dict['isInvoice']
             list.value[changes[0][0]]['feeFrt'] = dict['feeFrt']
             list.value[changes[0][0]]['feeCode'] = dict['code']
             list.value[changes[0][0]]['taxRate'] = dict['taxRate']
+            // 根据币别带出汇率
+            if (dict['defaultCurrency']) {
+              exchangeRateList.forEach(res => {
+                if (res.currencyCode == dict['defaultCurrency']) {
+                  if (props.tbType == 'receive') {
+                    list.value[changes[0][0]].exchangeRate = res.drValue
+                  } else {
+                    list.value[changes[0][0]].exchangeRate = res.crValue
+                  }
+                }
+              })
+            }
+            // 应收应付带出不同的默认设置客户类型和结算单位
+            if (props.tbType == 'receive') {
+              list.value[changes[0][0]]['customerTypeText'] = dict['defaultDebitName']
+              list.value[changes[0][0]]['customerType'] = dict['defaultDebit']
+            } else {
+              list.value[changes[0][0]]['customerTypeText'] = dict['defaultCreditName']
+              list.value[changes[0][0]]['customerType'] = dict['defaultCredit']
+            }
             // 费用代码维护的单位标准是箱型，默认带出集装箱表格第一条数据，否则带出默认标准
             if (dict.defaultUnit == 'XX') {
               if (props?.details?.ctnInfo && props?.details?.ctnInfo?.length) {
@@ -589,12 +610,17 @@
           
         }
         // 修改币别
-        if (changes[0][1] === 'currencyName') {
-          const item = currencyDict.value.filter((item) => {
-            return item.name === changes[0][3]
+        if (changes[0][1] === 'currency') {
+          // 根据币别带出汇率
+          exchangeRateList.forEach(res => {
+            if (res.currencyCode == changes[0][3]) {
+              if (props.tbType == 'receive') {
+                list.value[changes[0][0]].exchangeRate = res.drValue
+              } else {
+                list.value[changes[0][0]].exchangeRate = res.crValue
+              }
+            }
           })
-          if (item) dict = item[0]
-          list.value[changes[0][0]]['currency'] = dict?.codeName
         }
         // 当前操作的行
         const index = changes[0][0]
@@ -659,9 +685,10 @@
     const postData = {
       BusinessId: props.id,
       items: list.value.filter((res) => {
+        if (!res.taxRate) res.taxRate = 0
         return res.feeStatus == 1 || res.feeStatus == 6
       }),
-      businessType: 1,
+      businessType: 1
     }
     // 如果不存在可保存数据限制保存按钮（后台会报错，这块后台也存在问题，现在前端限制）
     if (postData.items.length == 0) return createMessage.warning('暂无可保存的数据！')
@@ -772,9 +799,8 @@
           if (data.customerTypeText == item[0].defaultCreditName) {
             data.customerTypeText = item[0].defaultDebitName
             data.customerType = item[0].defaultDebit
-          }
-          // 如果当前所选的这一行数据是应付，则把客户类型和客户换成默认应收的数据
-          if (data.customerTypeText == item[0].defaultDebitName) {
+          } else if (data.customerTypeText == item[0].defaultDebitName) {
+            // 如果当前所选的这一行数据是应付，则把客户类型和客户换成默认应收的数据
             data.customerTypeText = item[0].defaultCreditName
             data.customerType = item[0].defaultCredit
           }
@@ -790,7 +816,9 @@
           }
         }
       })
-      emits('broInsert', res)
+      setTimeout(() => {
+        emits('broInsert', res)
+      }, 200)
     } else {
       // 全部插入
       selectData.forEach((item) => {
@@ -825,6 +853,8 @@
     list.value = res
     hotTb.value.hotInstance.loadData(res)
   }
+  // 存储币别汇率列表数据
+  let exchangeRateList = []
   // 页面初始化
   const init = () => {
     loading.value = true
@@ -894,6 +924,17 @@
       .catch(() => {
         loading.value = false
       })
+    // 获取汇率列表数据
+    GetFeeCurrencyExchangeList({
+      "queryCondition": "[]",
+      "pageCondition": {
+          "pageIndex": 1,
+          "pageSize": 100,
+          "sortConditions": []
+      }
+    }).then(res => {
+      exchangeRateList = res.data
+    })
   }
   // 增加行
   const add = () => {
@@ -939,6 +980,7 @@
     (row) => {
       row.forEach((item) => {
         list.value.push(item)
+        hotTb.value.hotInstance.loadData(list.value)
       })
     },
   )

src/components/Form/src/components/InputTextArea.vue

@@ -140,7 +140,7 @@
       }
       // 转换大写
       const textareaBlur = (_, ...args) => {
-        console.log(_, ...args)
+        if (attrs.value.disTrans) return
         emit('blur', _, ...args)
         if (cutList.length == 0 || !state.value) return
         state.value = ToCDB(state.value).toUpperCase()
@@ -152,10 +152,9 @@
         (v) => {
           emit('update:value', v)
           if (v) {
+            if (attrs.value.disTrans) return
             if (enInput) state.value = state.value.replace(/[\u4e00-\u9fa5]/ig,'')
             state.value = ToCDB(state.value).toUpperCase()
-            // 清除每行最后的空格
-            // state.value = removeTrailingSpaces(state.value)
           }
         }
       )

src/views/baseinfo/infoclient/columns.tsx

@@ -1136,7 +1136,7 @@ export const formSchema: FormSchema[] = [
       return {
         api: getOrgList,
         labelField: 'label',
-        valueField: 'value',
+        valueField: 'id',
         resultField: 'data',
         allowClear: true,
         filterOption: (input: string, option: any) => {

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

@@ -21,7 +21,7 @@
                   v-if="(source == 'edit' || source == 'copy') || route.query.status"
                   :id="route.query.id"
                   code="sea_freight_export"
-                  :style="{ width: route.query.status ? '50px' : '301px'}"
+                  :style="{ width: route.query.status ? 'auto' : '301px'}"
                   name="hyck"
                   :save="save"
                   :copy="copyData"
@@ -87,7 +87,7 @@
                     <ediMore ref="RefediMore" :details="bookingDetails"></ediMore>
                   </a-tab-pane>
                   <a-tab-pane key="5-5" tab="应收应付费用" v-if="id">
-                    <costEntry :height="feeHeight" :details="bookingDetails" type="1"></costEntry>
+                    <costEntry :height="feeHeight" :details="bookingDetails" type="1" style="margin-bottom: 20px;"></costEntry>
                   </a-tab-pane>
                 </a-tabs>
                 <ApproveBtns
@@ -880,9 +880,9 @@
   const completeTask = async (type, b) => {
     const status = route.query.status
     const { fullPath } = route //获取当前路径
+    // 提交前先保存
+    await save()
     if (status == 'ORDER_AUDIT_REJECTED') {
-      // 审单驳回再次提交
-      await save()
       SubmitAudit({
         businessId: id.value,
         businessType: 1,
@@ -917,7 +917,7 @@
     }
     .setting-flag {
       position: absolute;
-      z-index: 1111;
+      z-index: 900;
       right: 22px;
       top: 10px;
       >span {

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

@@ -74,7 +74,7 @@
                     <a-input-number v-model:value="item.floorPrice" size="small" :min="0" :max="999999999" placeholder="底价" />
                   </div>
                   <span v-show="model.ctnPriceInfo.length > 1" @click="deleteCtnPrice(model.ctnPriceInfo, index, item)" class="iconfont icon-del"></span>
-                  <span v-show="model.ctnPriceInfo.length != 3" @click="model.ctnPriceInfo.push()" class="iconfont icon-zengjiatianjiajiajian"></span>
+                  <span v-show="model.ctnPriceInfo.length != 3" @click="model.ctnPriceInfo.push({})" class="iconfont icon-zengjiatianjiajiajian"></span>
                 </div>
               </div>
             </a-form-item-rest>

src/views/system/print/columns.tsx

@@ -259,7 +259,8 @@ export const temFormSchema: FormSchema[] = [
     component: 'InputTextArea',
     colProps: { span: 24 },
     componentProps: {
-      autoSize: { minRows: 3, maxRows: 20 }
+      autoSize: { minRows: 3, maxRows: 20 },
+      disTrans: true
     },
     show: ({ values }) => {
       return values.isUseDataSource
@@ -301,7 +302,8 @@ export const temFormSchema: FormSchema[] = [
     component: 'InputTextArea',
     colProps: { span: 24 },
     componentProps: {
-      autoSize: { minRows: 5, maxRows: 20 }
+      autoSize: { minRows: 5, maxRows: 20 },
+      disTrans: true
     }
   }
 ]