update

src/business/customs/exit.ts

@@ -49,7 +49,7 @@ export function useGZCJJCOrderDetail(selectedRow: Ermcp.GZCJJCOrderRsp) {
             case 1: {
                 return [
                     { prop: 'gzno', label: '货物编号' },
-                    { prop: 'gzcjshapetypestring', label: '形状', width: 200 },
+                    { prop: 'gzcjshapetype', label: '形状', width: 200 },
                     { prop: 'weight', label: '重量ct' },
                     { prop: 'amount', label: '参考货值USD' },
                     { prop: 'colorinfo', label: '彩钻信息' },
@@ -59,7 +59,7 @@ export function useGZCJJCOrderDetail(selectedRow: Ermcp.GZCJJCOrderRsp) {
             case 2: {
                 return [
                     { prop: 'gzno', label: '货物编号' },
-                    { prop: 'gzcjshapetypestring', label: '形状', width: 200 },
+                    { prop: 'gzcjshapetype', label: '形状', width: 200 },
                     { prop: 'weight', label: '重量ct' },
                     { prop: 'amount', label: '参考货值USD' },
                     { prop: 'gzcjmarktype', label: '刻印服务(证书号/ 其他/ 无)', width: 220 },

src/packages/pc/views/customs/exit/components/details/index.vue

@@ -31,6 +31,10 @@
             <span class="el-descriptions__title">批次信息</span>
         </h3>
         <app-table :data="detailList" :columns="columns" :loading="loading" :show-toolbar="false" border>
+            <!-- 形状 -->
+            <template #gzcjshapetype="{ value }">
+                {{ getGZCJShapeTypeName(value) }}
+            </template>
             <!-- 刻印服务(证书号/ 其他/ 无) -->
             <template #gzcjmarktype="{ value }">
                 {{ getGZCJMarkTypeName(value) }}
@@ -41,7 +45,7 @@
 
 <script lang="ts" setup>
 import { shallowRef, PropType } from 'vue'
-import { getGZCJMarkTypeName, getGZCJStatusList } from '@/constants/customs'
+import { getGZCJMarkTypeName, getGZCJStatusList, getGZCJShapeTypeName } from '@/constants/customs'
 import { useGZCJJCOrderDetail } from '@/business/customs/exit'
 import AppDrawer from '@pc/components/base/drawer/index.vue'
 import AppTable from '@pc/components/base/table/index.vue'

src/packages/pc/views/wms/main/components/payment/index.vue

@@ -1,26 +1,8 @@
 <!-- WMS结算单-支付 -->
 <template>
-    <app-drawer title="确认支付" v-model:show="show" :loading="loading" :refresh="refresh">
-        <el-form ref="formRef" label-width="100px">
-            <el-form-item label="分拣室服务费">
-                {{ formatDecimal(selectedRow.servicefee) }}
-            </el-form-item>
-            <el-form-item label="仓储费">
-                {{ formatDecimal(selectedRow.storagefee) }}
-            </el-form-item>
-            <el-form-item label="保险费">
-                {{ formatDecimal(selectedRow.premium) }}
-            </el-form-item>
-            <el-form-item label="分拣室电费">
-                {{ formatDecimal(selectedRow.powerfee) }}
-            </el-form-item>
-            <el-form-item label="报关费">
-                {{ formatDecimal(selectedRow.customsfee) }}
-            </el-form-item>
-            <el-form-item label="合计费用">
-                {{ formatDecimal(selectedRow.totalfee) }}
-            </el-form-item>
-        </el-form>
+    <app-drawer title="确认支付" :width="400" v-model:show="show" :loading="loading" :refresh="refresh">
+        <app-table-details :title="`WMS结算单【${selectedRow.reckonmonth}】`" :label-width="110" :data="selectedRow"
+            :cell-props="cellProps" />
         <template #footer>
             <el-button @click="onCancel(false)" plain>取消</el-button>
             <el-button type="primary" @click="onSubmit">确认</el-button>
@@ -30,10 +12,10 @@
 
 <script lang="ts" setup>
 import { shallowRef, PropType } from 'vue'
-import { ElMessage, FormInstance } from 'element-plus'
-import { formatDecimal } from '@/filters'
+import { ElMessage } from 'element-plus'
 import { bsWMSReckonPay } from '@/services/api/bonded'
 import AppDrawer from '@pc/components/base/drawer/index.vue'
+import AppTableDetails from '@pc/components/base/table-details/index.vue'
 
 const props = defineProps({
     selectedRow: {
@@ -42,31 +24,35 @@ const props = defineProps({
     },
 })
 
-const formRef = shallowRef<FormInstance>()
 const show = shallowRef(true)
 const refresh = shallowRef(false)
 const loading = shallowRef(false)
 
+const cellProps = [
+    { prop: 'servicefee', label: '分拣室服务费', decimal: 2 },
+    { prop: 'storagefee', label: '仓储费', decimal: 2 },
+    { prop: 'premium', label: '保险费', decimal: 2 },
+    { prop: 'powerfee', label: '分拣室电费', decimal: 2 },
+    { prop: 'customsfee', label: '报关费', decimal: 2 },
+    { prop: 'totalfee', label: '合计费用', decimal: 2 },
+]
+
 const onCancel = (isRefresh = false) => {
     show.value = false
     refresh.value = isRefresh
 }
 
 const onSubmit = () => {
-    formRef.value?.validate((valid) => {
-        if (valid) {
-            loading.value = true
-            bsWMSReckonPay({
-                OrderID: props.selectedRow.orderid
-            }).then(() => {
-                ElMessage.success('提交成功')
-                onCancel(true)
-            }).catch((err) => {
-                ElMessage.error('提交失败：' + err)
-            }).finally(() => {
-                loading.value = false
-            })
-        }
+    loading.value = true
+    bsWMSReckonPay({
+        OrderID: props.selectedRow.orderid
+    }).then(() => {
+        ElMessage.success('提交成功')
+        onCancel(true)
+    }).catch((err) => {
+        ElMessage.error('提交失败：' + err)
+    }).finally(() => {
+        loading.value = false
     })
 }
 </script>

src/packages/pc/views/wms/main/index.vue

@@ -33,7 +33,8 @@ import AppAuthOperation from '@pc/components/modules/auth-operation/index.vue'
 const { filterOptons, getQueryParams } = useDataFilter<Ermcp.GzbscreckonorderReq>()
 const { loading, dataList, total, pageIndex, pageSize, run } = useRequest(queryGzbscreckonorder, {
     params: {
-        paystatus: 2
+        paystatus: 2,
+        pagesize: 20,
     },
     onError: (err) => {
         ElMessage.error(err)
@@ -49,7 +50,6 @@ const tableColumns = shallowRef<Ermcp.TableColumn[]>([
     { prop: 'powerfee', label: '分拣室电费', decimal: 2 },
     { prop: 'customsfee', label: '报关费', decimal: 2 },
     { prop: 'applicanttime', label: '申请时间' },
-    { prop: 'paystatus', label: '状态' },
     { prop: 'paytime', label: '支付时间' },
     { prop: 'operate', label: '操作', fixed: 'right' },
 ])
@@ -58,7 +58,6 @@ filterOptons.selectList = [
     {
         label: '支付状态',
         key: 'paystatus',
-        locked: true,
         selectedValue: 2,
         options: [
             { label: '待支付', value: 2 },