update

src/business/table/index.ts

@@ -34,7 +34,7 @@ const pcTableColumnMap = new Map<TableColumnKey, Ermcp.TableColumn[]>([
         { prop: 'zspolishtype1display', label: '抛光' },
         { prop: 'zssymmetrytype1display', label: '对称' },
         { prop: 'zsfluorescencetype1display', label: '荧光' },
-        { prop: 'size1', label: '尺寸' },
+        { prop: 'sizedisplay', label: '尺寸' },
         { prop: 'price', label: '价格' },
         { prop: 'weight', label: '克拉重量' },
         { prop: 'priceper', label: '克拉单价' },

src/constants/bank.ts

@@ -1,7 +1,7 @@
 import { useEnumStore } from '@/stores'
 
 const { getEnumTypes, getEnumTypeList, getEnumTypeName } = useEnumStore()
-const enumKeys = ['applystatus', 'executetype'] as const
+const enumKeys = ['signstatus', 'applystatus', 'executetype'] as const
 const enumMap = getEnumTypes(...enumKeys)
 
 /**
@@ -17,6 +17,22 @@ export enum SignStatus {
 }
 
 /**
+ * 获取签约状态列表
+ * @returns 
+ */
+export function getSignStatusList() {
+    return getEnumTypeList(enumMap.get('signstatus'))
+}
+
+/**
+ * 获取签约状态名称
+ * @returns 
+ */
+export function getSignStatusName(value: number) {
+    return getEnumTypeName(getSignStatusList(), value)
+}
+
+/**
  * 获取出入金申请状态列表
  * @returns 
  */

src/packages/pc/views/bargain/buy/components/audit/index.vue

@@ -1,10 +1,9 @@
-<!-- 询价消息-卖方询价-同意/拒绝 -->
+<!-- 询价消息-买方询价-同意/拒绝 -->
 <template>
-    <app-drawer :title="code === 'bargain_sell_agree' ? '同意' : '拒绝'" :width="480" v-model:show="show" :loading="loading"
-        :refresh="refresh">
+    <app-drawer title="提示" :width="480" v-model:show="show" :loading="loading" :refresh="refresh">
         <el-form ref="formRef" label-width="60px" :model="formData" :rules="formRules">
             <el-form-item>
-                <span>是否{{ code === 'bargain_sell_agree' ? '同意' : '拒绝' }}此询价？</span>
+                <span>是否{{ code === 'bargain_buy_agree' ? '同意' : '拒绝' }}此询价？</span>
             </el-form-item>
             <el-form-item label="备注" prop="AuditRemark">
                 <el-input type="textarea" :rows="3" v-model="formData.AuditRemark" />

src/packages/pc/views/bargain/sell/components/audit/index.vue

@@ -1,7 +1,6 @@
 <!-- 询价消息-卖方询价-同意/拒绝 -->
 <template>
-    <app-drawer :title="code === 'bargain_sell_agree' ? '同意' : '拒绝'" :width="480" v-model:show="show" :loading="loading"
-        :refresh="refresh">
+    <app-drawer title="提示" :width="480" v-model:show="show" :loading="loading" :refresh="refresh">
         <el-form ref="formRef" label-width="60px" :model="formData" :rules="formRules">
             <el-form-item>
                 <span>是否{{ code === 'bargain_sell_agree' ? '同意' : '拒绝' }}此询价？</span>

src/packages/pc/views/mine/profile/index.vue

@@ -21,7 +21,7 @@
             <el-descriptions-item label="余额">{{ accountInfo.balance }}</el-descriptions-item>
             <el-descriptions-item label="冻结资金">{{ accountInfo.freezemargin }}</el-descriptions-item>
             <el-descriptions-item label="可用资金">{{ accountInfo.usedmargin }}</el-descriptions-item>
-            <template v-if="bankInfo?.signstatus === SignStatus.Signed">
+            <template v-if="bankInfo">
                 <el-descriptions-item label="托管银行">{{ bankInfo.cusbankid }}</el-descriptions-item>
                 <el-descriptions-item label="开户银行">{{ bankInfo.bankname }}</el-descriptions-item>
                 <el-descriptions-item label="证件类型">{{ bankInfo.cardtype ?
@@ -32,6 +32,7 @@
                 <el-descriptions-item label="银行子账号">{{ handleNoneValue(bankInfo.bankchildaccount) }}
                 </el-descriptions-item>
                 <el-descriptions-item label="手机号">{{ handleNoneValue(bankInfo.mobilephone) }}</el-descriptions-item>
+                <el-descriptions-item label="签约状态">{{ getSignStatusName(bankInfo.signstatus) }}</el-descriptions-item>
             </template>
         </el-descriptions>
         <app-auth-operation :menus="handleTableButtons" :options="{ bankInfo }" @closed="getBankAccountSign" />
@@ -44,7 +45,7 @@ import { useAccount } from '@/business/account'
 import { decryptAES } from '@/utils/websocket/crypto'
 import { handleNoneValue } from '@/filters'
 import { getCertificateTypeName } from '@/constants/certificate'
-import { SignStatus } from '@/constants/bank'
+import { SignStatus, getSignStatusName } from '@/constants/bank'
 import AppAuthOperation from '@pc/components/modules/auth-operation/index.vue'
 
 const { loading, loginInfo, userInfo, accountInfo, bankInfo, getBankAccountSign } = useAccount()

src/packages/pc/views/warehousing/goods/components/buy/index.vue

@@ -1,9 +1,9 @@
 <!-- 商品详情-立即购买 -->
 <template>
-    <app-drawer title="提示" v-model:show="show" :loading="loading">
+    <app-drawer title="提示" v-model:show="show" :loading="loading" :refresh="refresh">
         <div style="font-size:16px;text-align:center">是否购买该商品？</div>
         <template #footer>
-            <el-button @click="onCancel" plain>取消</el-button>
+            <el-button @click="onCancel(false)" plain>取消</el-button>
             <el-button type="primary" @click="onSubmit">确认</el-button>
         </template>
     </app-drawer>
@@ -24,15 +24,17 @@ const props = defineProps({
 
 const { loading, formSubmit } = useBuyOrderDesting(props.selectedRow)
 const show = shallowRef(true)
+const refresh = shallowRef(false)
 
-const onCancel = () => {
+const onCancel = (isRefresh = false) => {
     show.value = false
+    refresh.value = isRefresh
 }
 
 const onSubmit = () => {
     formSubmit().then(() => {
         ElMessage.success('提交成功')
-        onCancel()
+        onCancel(true)
     }).catch((err) => {
         ElMessage.error('提交失败：' + err)
     })

src/packages/pc/views/warehousing/goods/components/details/index.vue

@@ -141,7 +141,7 @@ const props = defineProps({
 
 const { getUserId } = useLoginStore()
 const { details, showFavorite, getDiamondDetails } = useDiamondDetails(props.selectedRow.goodsno)
-const { componentId, openComponent, closeComponent } = useComponent()
+const { componentId, openComponent, closeComponent } = useComponent(getDiamondDetails)
 
 // 不能购买自己上架的商品
 const showButton = computed(() => {

src/packages/pc/views/warehousing/warehouse/index.vue

@@ -5,6 +5,9 @@
             <template #header>
                 <app-auth-operation :menus="['add']" @closed="getWarehouseList" />
             </template>
+            <template #address="{ row }">
+                {{ [row.provincename, row.cityname, row.districtname, row.address].join(' ') }}
+            </template>
             <!-- 操作 -->
             <template #operate="{ row }">
                 <app-auth-operation :menus="['edit']" :options="{ selectedRow: row }" @closed="getWarehouseList" />

src/types/ermcp/goods.d.ts

@@ -43,6 +43,7 @@ declare namespace Ermcp {
         size1: string; // 尺寸1 - 类型：2，4，5
         size2: string; // 尺寸2 - 类型：2，4，5
         size3: string; // 尺寸3 - 类型：2，4，5
+        sizedisplay: string; // 尺寸
         stonedesc: string; // 配石描述 - 类型：4
         subnum: number; // 提单子单号
         userid: number; // 用户ID

src/types/ermcp/warehouse.d.ts

@@ -11,22 +11,26 @@ declare namespace Ermcp {
 
     /** 查询仓库信息 响应 */
     interface WarehouseInfoRsp {
-        address: string;//详细地址
-        areauserid: number;//所属机构
-        autoid: number;//自增ID(仓库ID)
-        cityid: number;//市
-        contactname: string;//联系人
-        contactnum: string;//联系电话
-        countryid: number;//国家
-        createtime: string;//创建时间
-        districtid: number;//区
-        hasvideo: number;//是否有视频 - number; //:无 1:有
-        provinceid: number;//省
-        remark: string;//审核备注
-        videourl: string;//视频地址
-        warehousecode: string;//仓库代码
-        warehousename: string;//仓库名称
-        warehousestatus: number;//仓库状态 - 1:正常 2:注销 3:待审核 4:审核拒绝
-        warehousetype: number;//仓库类型 - 1 厂库 2 自有库 3 合作库
+        address: string; // 详细地址
+        areauserid: number; // 所属机构
+        autoid: number; // 自增ID
+        cityid: number; // 市
+        cityname: string; // 城市名称
+        contactname: string; // 联系人
+        contactnum: string; // 联系电话
+        countryid: number; // 国家
+        countryname: string; // 国家名称
+        createtime: string; // 创建时间
+        districtid: number; // 区
+        districtname: string; // 地区名称
+        hasvideo: number; // 是否有视频 - 0:无 1:有
+        provinceid: number; // 省
+        provincename: string; // 省名称
+        remark: string; // 审核备注
+        videourl: string; // 视频地址
+        warehousecode: string; // 仓库代码
+        warehousename: string; // 仓库名称
+        warehousestatus: number; // 仓库状态 - 1:正常 2:注销 3:待审核 4:审核拒绝
+        warehousetype: number; // 仓库类型 - 1 厂库 2 自有库 3 合作库
     }
 }