费用录入问题修复

src/components/CostEntry/actionBar.vue

@@ -12,17 +12,17 @@
             <a-menu>
               <a-menu-item @click="submit">提交审核</a-menu-item>
               <a-menu-item @click="submitAll">{{ tbType == 'receive' ? '应收提交' : '应付提交' }}</a-menu-item>
-              <a-menu-item>整票提交</a-menu-item>
+              <a-menu-item @click="submitRP">整票提交</a-menu-item>
               <a-menu-item @click="revokeSubmit">撤销提交</a-menu-item>
               <a-menu-item>撤销整票提交</a-menu-item>
-              <a-menu-item>申请开票</a-menu-item>
+              <!-- <a-menu-item>申请开票</a-menu-item>
               <a-menu-item>收费申请</a-menu-item>
-              <a-menu-item>费用拆分</a-menu-item>
+              <a-menu-item>费用拆分</a-menu-item> -->
               <a-menu-item @click="openFlowChart">查看工作流</a-menu-item>
-              <a-menu-item>批量更改费用对象</a-menu-item>
+              <!-- <a-menu-item>批量更改费用对象</a-menu-item>
               <a-menu-item>批量修改核算单位</a-menu-item>
               <a-menu-item>禁开发票</a-menu-item>
-              <a-menu-item>费用信息排序</a-menu-item>
+              <a-menu-item>费用信息排序</a-menu-item> -->
             </a-menu>
           </template>
           <a-button type="link">
@@ -93,7 +93,7 @@
           <span class="iconfont icon-tianjia"></span>
           添加
         </a-button>
-        <a-popconfirm
+        <!-- <a-popconfirm
           title="是否取消数据录入?"
           ok-text="确定"
           cancel-text="取消"
@@ -103,7 +103,7 @@
             <span class="iconfont icon-shanchu"></span>
             取消
           </a-button>
-        </a-popconfirm>
+        </a-popconfirm> -->
         <a-popconfirm
           :visible="deleteFlag"
           title="确定要删除勾选的数据?"
@@ -154,6 +154,7 @@
     <!-- 打印组件 -->
     <DsPrint
       ref="dsPrint"
+      code="fee"
       id="1800461928691273728"
     ></DsPrint>
   </div>
@@ -425,6 +426,10 @@
       }
     }
     emits('submit', arr)
+  }
+  // 整票提交
+  const submitRP = () => {
+
   }
   // 提交全部
   const submitAll = () => {

src/components/CostEntry/feeTable.vue

@@ -187,20 +187,6 @@
         process(dict)
       },
     },
-    {
-      title: '费用英文名称',
-      width: 130,
-      data: 'feeEnName',
-      type: 'dropdown',
-      source: async (query, process) => {
-        const res = feeDict.value.length ? feeDict.value : (await GetFeeCodeSelectList())?.data
-        if (!feeDict.value.length) feeDict.value = res
-        const dict = res.map((res) => {
-          return res.enName
-        })
-        process(dict)
-      },
-    },
     {
       title: '客户类别',
       width: 130,
@@ -256,20 +242,14 @@
       },
     },
     {
-      title: '税率',
-      width: 60,
-      data: 'taxRate',
+      title: '单价',
+      width: 70,
+      data: 'taxUnitPrice',
       type: 'numeric',
       numericFormat: {
         pattern: '0,0.00'
       }
     },
-    {
-      title: '单价',
-      width: 70,
-      data: 'taxUnitPrice',
-      type: 'numeric'
-    },
     {
       title: '数量',
       width: 60,
@@ -283,6 +263,9 @@
       data: 'unitPrice',
       type: 'numeric',
       readOnly: true,
+      numericFormat: {
+        pattern: '0,0.00'
+      }
     },
     {
       title: '不含税金额',
@@ -327,13 +310,58 @@
       data: 'exchangeRate',
       type: 'numeric',
     },
+    {
+      title: '结算金额',
+      width: 100,
+      data: 'settlementAmount',
+      readOnly: true,
+      numericFormat: {
+        pattern: '0,0.00'
+      }
+    },
+    {
+      title: '已开票金额',
+      width: 100,
+      data: 'invoiceAmount',
+      readOnly: true,
+      numericFormat: {
+        pattern: '0,0.00'
+      }
+    },
+    {
+      title: '发票申请金额',
+      width: 100,
+      data: 'orderInvoiceAmount',
+      readOnly: true,
+      numericFormat: {
+        pattern: '0,0.00'
+      }
+    },
+    {
+      title: '未开票金额',
+      width: 100,
+      data: 'invoiceAmountRest',
+      readOnly: true,
+      numericFormat: {
+        pattern: '0,0.00'
+      }
+    },
     {
       title: '备注',
       width: 120,
       data: 'note',
     },
     {
-      title: '销项税率',
+      title: '税率',
+      width: 60,
+      data: 'taxRate',
+      type: 'numeric',
+      numericFormat: {
+        pattern: '0,0.00'
+      }
+    },
+    {
+      title: props.tbType == 'receive' ? '销项税率' : '进项税率',
       width: 100,
       data: 'accTaxRate',
       type: 'numeric',
@@ -342,13 +370,13 @@
       }
     },
     {
-      title: '销项税额',
+      title: props.tbType == 'receive' ? '销项税额' : '进项税额',
       width: 100,
       data: 'accTaxAmount',
       readOnly: true,
     },
     {
-      title: '销项金额',
+      title: props.tbType == 'receive' ? '销项税率' : '进项金额',
       width: 100,
       data: 'accAmount',
       readOnly: true,
@@ -393,24 +421,6 @@
       data: 'createTime',
       readOnly: true,
     },
-    {
-      title: '结算金额',
-      width: 100,
-      data: 'settlementAmount',
-      readOnly: true,
-      numericFormat: {
-        pattern: '0,0.00'
-      }
-    },
-    {
-      title: '已开票金额',
-      width: 100,
-      data: 'invoiceAmount',
-      readOnly: true,
-      numericFormat: {
-        pattern: '0,0.00'
-      }
-    },
     {
       title: '对账编号',
       width: 140,
@@ -430,22 +440,18 @@
       readOnly: true,
     },
     {
-      title: '发票申请金额',
-      width: 100,
-      data: 'orderInvoiceAmount',
-      readOnly: true,
-      numericFormat: {
-        pattern: '0,0.00'
-      }
-    },
-    {
-      title: '未开票金额',
-      width: 100,
-      data: 'invoiceAmountRest',
-      readOnly: true,
-      numericFormat: {
-        pattern: '0,0.00'
-      }
+      title: '费用英文名称',
+      width: 130,
+      data: 'feeEnName',
+      type: 'dropdown',
+      source: async (query, process) => {
+        const res = feeDict.value.length ? feeDict.value : (await GetFeeCodeSelectList())?.data
+        if (!feeDict.value.length) feeDict.value = res
+        const dict = res.map((res) => {
+          return res.enName
+        })
+        process(dict)
+      },
     },
     {
       title: '审核人',
@@ -647,10 +653,12 @@
           exchangeRateList.forEach(res => {
             if (res.currencyCode == changes[0][3]) {
               if (props.tbType == 'receive') {
-                list.value[changes[0][0]].exchangeRate = res.drValue
+                list.value[changes[0][0]].exchangeRate = res.drValue || 1
               } else {
-                list.value[changes[0][0]].exchangeRate = res.crValue
+                list.value[changes[0][0]].exchangeRate = res.crValue || 1
               }
+            } else {
+              list.value[changes[0][0]].exchangeRate = 1
             }
           })
         }

src/components/CostEntry/mainInfo.vue

@@ -28,7 +28,7 @@
     { label: '委托编号', field: 'customerNo', span: 4, value: '' },
     { label: '主提单号', field: 'mblno', span: 4, value: '' },
     { label: '箱型箱量', field: 'cntrTotal', span: 4, value: '' },
-    { label: '件数', field: 'pkgs', span: 4, value: '' },
+    { label: '件数/毛重/尺码', field: 'pkgs', span: 4, value: '' },
     { label: '毛重', field: 'kgs', span: 4, value: '' },
     { label: '尺码', field: 'cbm', span: 4, value: '' },
     { label: '委托单位', field: 'customerName', span: 8, value: '' },
@@ -56,13 +56,16 @@
           if (item.field === key) {
             if (key == 'etd' && val[key]) {
               val[key] = val[key].split(' ')[0]
+            } else if (key == 'pkgs') {
+              // val[key] = `${val['pkgs'] || '-'}/${val['kgs'] || '-'}/${val['cbm'] || '-'}`
             }
+            
             item.value = val[key]
           }
         }
       })
     },
-    { immediate: true, deep: true }
+    { immediate: true }
   )
 </script>
 

src/components/File/index.vue

@@ -137,6 +137,7 @@
   // 初始化数据
   const init = () => {
     let code = props.fileType ? `${props.fileType}_file_type` : 'file_type'
+    console.log(code)
     getDictOption(code).then((res) => {
       console.log(res)
       fileTypeList.value = res

src/components/Print/index.vue

@@ -172,7 +172,7 @@
       }
       // 费用打印：paramJsonStr 需要传窜中的费用的id集合
       if (item.templateCode == 'fee') {
-        postData.paramJsonStr = JSON.stringify({ id: ids.value})
+        postData.paramJsonStr = JSON.stringify({ ids: ids.value})
       }
       loading.value = true
       GetOpenSqlPrintInfo(postData).then(res => {

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

@@ -166,7 +166,7 @@
       :reload="init"
       ref="ladHistory"
     />
-    <DsPrint ref="dsPrint" code="op_sea_export_billmanage" :paramJsonStr="'{id:' + props.id + '}'" />
+    <DsPrint ref="dsPrint" code="sea_freight_export" temCode="op_sea_export_billmanage" :paramJsonStr="'{id:' + props.id + '}'" />
   </div>
 </template>
 <script lang="ts" setup>