update

public/config/appconfig.json

@@ -1,5 +1,5 @@
 {
   "version": "1.0.0",
   "versionCode": "100000",
-  "apiUrl": "http://218.17.158.45:23015/cfg?key=test_gzzs"
+  "apiUrl": "http://192.168.31.104:8080/cfg?key=test_104"
 }

src/business/trade/listing.ts

@@ -207,7 +207,7 @@ export function useListingCancel(wrtradeorderid: string, buyorsell: number) {
             data: {
                 UserID: userId, // 用户ID
                 AccountID: getFirstAccountId(), // 资金账号
-                OldWRTradeOrderID: Long.fromString(wrtradeorderid), // 目标仓单贸易委托单ID
+                OldWRTradeOrderID: Long.fromString(wrtradeorderid || '0'), // 目标仓单贸易委托单ID
                 OrderSrc: 1, // 委托来源
                 ClientType: ClientType.Web, // 终端类型
                 OperatorID: userId, // 操作员账号ID

src/packages/pc/views/customs/bonded/components/advance-payment/index.vue

@@ -9,19 +9,20 @@
             <el-descriptions-item label="综合服务费">{{ details.servicefee }}</el-descriptions-item>
             <el-descriptions-item label="其它费用">{{ details.otherfee }}</el-descriptions-item>
             <el-descriptions-item label="总共">{{ details.totalfee }}</el-descriptions-item>
-            <el-descriptions-item label="预付款详情文件"></el-descriptions-item>
-            <el-descriptions-item label="账户可用余额"></el-descriptions-item>
+            <el-descriptions-item label="预付款详情文件">请下载文件“付款通知书(预付款).pdf”</el-descriptions-item>
+            <el-descriptions-item label="账户可用余额">{{ accountInfo?.balance ?? 0 }}</el-descriptions-item>
         </el-descriptions>
         <template #footer>
             <el-button @click="onCancel(false)" plain>取消</el-button>
-            <el-button type="primary" @click="onSubmit">确认</el-button>
+            <el-button type="primary" :disabled="disabled" @click="onSubmit">确认</el-button>
         </template>
     </app-drawer>
 </template>
 
 <script lang="ts" setup>
-import { shallowRef, PropType } from 'vue'
+import { shallowRef, PropType, computed } from 'vue'
 import { ElMessage } from 'element-plus'
+import { useAccountStore } from '@/stores'
 import { useBSFWOrderOperate, useBSFWMemberOperate } from '@/business/customs/bonded'
 import AppDrawer from '@pc/components/base/drawer/index.vue'
 
@@ -34,9 +35,16 @@ const props = defineProps({
 
 const { details, getFworderoperate } = useBSFWOrderOperate(props.selectedRow)
 const { loading, formData, formSubmit } = useBSFWMemberOperate(props.selectedRow.orderid)
+const { accountInfo } = useAccountStore()
 const show = shallowRef(true)
 const refresh = shallowRef(false)
 
+const disabled = computed(() => {
+    const { balance = 0 } = accountInfo.value ?? {}
+    const { totalfee = 0 } = details.value ?? {}
+    return totalfee > balance
+})
+
 const onCancel = (isRefresh = false) => {
     show.value = false
     refresh.value = isRefresh

src/packages/pc/views/customs/bonded/components/payment/index.vue

@@ -10,21 +10,22 @@
             <el-descriptions-item label="其它费用">{{ details.otherfee }}</el-descriptions-item>
             <el-descriptions-item label="总应收款">{{ details.settleamount }}</el-descriptions-item>
             <el-descriptions-item label="预收款">{{ details.advanceamount }}</el-descriptions-item>
-            <el-descriptions-item label="应收\退款">{{ details.settleamount - details.advanceamount
+            <el-descriptions-item label="应收\退款">{{ arrearage }}</el-descriptions-item>
+            <el-descriptions-item label="结算费用详情文件">请下载文件“付款通知书(结算费用).pdf”</el-descriptions-item>
+            <el-descriptions-item label="账户可用余额" v-if="arrearage >= 0">{{ accountInfo?.balance ?? 0
             }}</el-descriptions-item>
-            <el-descriptions-item label="结算费用详情文件"></el-descriptions-item>
-            <el-descriptions-item label="账户可用余额"></el-descriptions-item>
         </el-descriptions>
         <template #footer>
             <el-button @click="onCancel(false)" plain>取消</el-button>
-            <el-button type="primary" @click="onSubmit">确认</el-button>
+            <el-button type="primary" :disabled="disabled" @click="onSubmit">确认</el-button>
         </template>
     </app-drawer>
 </template>
 
 <script lang="ts" setup>
-import { shallowRef, PropType } from 'vue'
+import { shallowRef, PropType, computed } from 'vue'
 import { ElMessage } from 'element-plus'
+import { useAccountStore } from '@/stores'
 import { useBSFWOrderOperate, useBSFWMemberOperate } from '@/business/customs/bonded'
 import AppDrawer from '@pc/components/base/drawer/index.vue'
 
@@ -37,9 +38,21 @@ const props = defineProps({
 
 const { details, getFworderoperate } = useBSFWOrderOperate(props.selectedRow)
 const { loading, formData, formSubmit } = useBSFWMemberOperate(props.selectedRow.orderid)
+const { accountInfo } = useAccountStore()
 const show = shallowRef(true)
 const refresh = shallowRef(false)
 
+// 应收\退款
+const arrearage = computed(() => {
+    const { settleamount = 0, advanceamount = 0 } = details.value ?? {}
+    return settleamount - advanceamount
+})
+
+const disabled = computed(() => {
+    const { balance = 0 } = accountInfo.value ?? {}
+    return arrearage.value > balance
+})
+
 const onCancel = (isRefresh = false) => {
     show.value = false
     refresh.value = isRefresh

src/packages/pc/views/customs/exit/components/advance-payment/index.vue

@@ -10,19 +10,20 @@
             <el-descriptions-item label="综合服务费">{{ details.servicefee }}</el-descriptions-item>
             <el-descriptions-item label="其它费用">{{ details.otherfee }}</el-descriptions-item>
             <el-descriptions-item label="总共">{{ details.totalfee }}</el-descriptions-item>
-            <el-descriptions-item label="预付款详情文件"></el-descriptions-item>
-            <el-descriptions-item label="账户可用余额"></el-descriptions-item>
+            <el-descriptions-item label="预付款详情文件">请下载文件“付款通知书(预付款).pdf”</el-descriptions-item>
+            <el-descriptions-item label="账户可用余额">{{ accountInfo?.balance ?? 0 }}</el-descriptions-item>
         </el-descriptions>
         <template #footer>
             <el-button @click="onCancel(false)" plain>取消</el-button>
-            <el-button type="primary" @click="onSubmit">确认</el-button>
+            <el-button type="primary" :disabled="disabled" @click="onSubmit">确认</el-button>
         </template>
     </app-drawer>
 </template>
 
 <script lang="ts" setup>
-import { shallowRef, PropType } from 'vue'
+import { shallowRef, PropType, computed } from 'vue'
 import { ElMessage } from 'element-plus'
+import { useAccountStore } from '@/stores'
 import { useCJJCOrderOperate, useCJJCMemberOperate } from '@/business/customs/exit'
 import AppDrawer from '@pc/components/base/drawer/index.vue'
 
@@ -35,9 +36,16 @@ const props = defineProps({
 
 const { details, getGzcjjcorderoperate } = useCJJCOrderOperate(props.selectedRow)
 const { loading, formData, formSubmit } = useCJJCMemberOperate(props.selectedRow.orderidstr)
+const { accountInfo } = useAccountStore()
 const show = shallowRef(true)
 const refresh = shallowRef(false)
 
+const disabled = computed(() => {
+    const { balance = 0 } = accountInfo.value ?? {}
+    const { totalfee = 0 } = details.value ?? {}
+    return totalfee > balance
+})
+
 const onCancel = (isRefresh = false) => {
     show.value = false
     refresh.value = isRefresh

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

@@ -11,21 +11,22 @@
             <el-descriptions-item label="其它费用">{{ details.otherfee }}</el-descriptions-item>
             <el-descriptions-item label="总共">{{ details.settleamount }}</el-descriptions-item>
             <el-descriptions-item label="预收款">{{ details.advanceamount }}</el-descriptions-item>
-            <el-descriptions-item label="应收\退款">{{ details.settleamount - details.advanceamount
+            <el-descriptions-item label="应收\退款">{{ arrearage }}</el-descriptions-item>
+            <el-descriptions-item label="结算费用详情文件">请下载文件“付款通知书(结算费用).pdf”</el-descriptions-item>
+            <el-descriptions-item label="账户可用余额" v-if="arrearage >= 0">{{ accountInfo?.balance ?? 0
             }}</el-descriptions-item>
-            <el-descriptions-item label="结算费用详情文件"></el-descriptions-item>
-            <el-descriptions-item label="账户可用余额"></el-descriptions-item>
         </el-descriptions>
         <template #footer>
             <el-button @click="onCancel(false)" plain>取消</el-button>
-            <el-button type="primary" @click="onSubmit">确认</el-button>
+            <el-button type="primary" :disabled="disabled" @click="onSubmit">确认</el-button>
         </template>
     </app-drawer>
 </template>
 
 <script lang="ts" setup>
-import { shallowRef, PropType } from 'vue'
+import { shallowRef, PropType, computed } from 'vue'
 import { ElMessage } from 'element-plus'
+import { useAccountStore } from '@/stores'
 import { useCJJCOrderOperate, useCJJCMemberOperate } from '@/business/customs/exit'
 import AppDrawer from '@pc/components/base/drawer/index.vue'
 
@@ -38,9 +39,21 @@ const props = defineProps({
 
 const { details, getGzcjjcorderoperate } = useCJJCOrderOperate(props.selectedRow)
 const { loading, formData, formSubmit } = useCJJCMemberOperate(props.selectedRow.orderidstr)
+const { accountInfo } = useAccountStore()
 const show = shallowRef(true)
 const refresh = shallowRef(false)
 
+// 应收\退款
+const arrearage = computed(() => {
+    const { settleamount = 0, advanceamount = 0 } = details.value ?? {}
+    return settleamount - advanceamount
+})
+
+const disabled = computed(() => {
+    const { balance = 0 } = accountInfo.value ?? {}
+    return arrearage.value > balance
+})
+
 const onCancel = (isRefresh = false) => {
     show.value = false
     refresh.value = isRefresh

src/packages/pc/views/order/main/components/details/index.vue

@@ -55,11 +55,11 @@
                             <span>卖方今日收款</span>
                             <span>{{ handleNumberValue(selectedRow.selltodayamount) }}</span>
                         </li>
-                        <li>
+                        <li v-if="selectedRow.buyerinfo">
                             <span>买方联络信息</span>
                             <span>{{ buyerInfo }}</span>
                         </li>
-                        <li>
+                        <li v-if="selectedRow.sellerinfo">
                             <span>卖方联络信息</span>
                             <span>{{ sellerInfo }}</span>
                         </li>
@@ -125,8 +125,8 @@ const props = defineProps({
 
 const { dataList, columns, getPlanStepList } = usePerformancePlanStep(props.selectedRow.performanceplanid)
 const currentStepIndex = computed(() => dataList.value.findIndex((e) => e.performancestepid === props.selectedRow.curstepid)) // 当前步骤索引位置
-const buyerInfo = JSON.parse(props.selectedRow.buyerinfo)
-const sellerInfo = JSON.parse(props.selectedRow.sellerinfo)
+const buyerInfo = JSON.parse(props.selectedRow.buyerinfo || '{}')
+const sellerInfo = JSON.parse(props.selectedRow.sellerinfo || '{}')
 
 const rowStyle = ({ rowIndex }: { rowIndex: number }) => {
     if (currentStepIndex.value > rowIndex) {