li.shaoyi 2 年之前
父節點
當前提交
43601cfc35

+ 0 - 1
src/business/table/columns.ts

@@ -109,7 +109,6 @@ export const pcTableColumnMap = new Map<TableColumnKey, Ermcp.TableColumn[]>([
     ]],
     // 挂牌大厅-我的摘牌
     ['listing_delisting', [
-        { prop: 'buyorsell', label: '类型' },
         { prop: 'matchusername', label: '对手方' },
         { prop: 'zsshapetypedisplay', label: '形状' },
         { prop: 'zscolortype1display', label: '颜色' },

+ 15 - 0
src/packages/pc/components/base/multiple/index.less

@@ -0,0 +1,15 @@
+.app-multiple {
+    &--checkbox {
+        .el-checkbox-group {
+            display: flex;
+            flex-wrap: wrap;
+            gap: 8px;
+        }
+
+        .el-checkbox-button__inner {
+            border: 0 !important;
+            border-radius: var(--el-border-radius-base);
+            background-color: #eef1f3;
+        }
+    }
+}

+ 3 - 3
src/packages/pc/components/base/multiple/index.vue

@@ -1,9 +1,9 @@
 <template>
     <div class="app-multiple app-multiple--checkbox" v-if="checkbox">
         <el-checkbox-group v-model="selectedValue" @change="onChecked">
-            <el-checkbox :label="item.value" v-for="(item, index) in dataList" :key="index">
+            <el-checkbox-button :label="item.value" v-for="(item, index) in dataList" :key="index">
                 {{ item.label }}
-            </el-checkbox>
+            </el-checkbox-button>
         </el-checkbox-group>
     </div>
     <div class="app-multiple app-multiple--select" v-else>
@@ -96,6 +96,6 @@ watch(() => props.dataList, (val) => {
 })
 </script>
 
-<style lang="less" scoped>
+<style lang="less">
 @import './index.less';
 </style>

+ 2 - 2
src/packages/pc/views/bonded/inbound/components/details/index.vue

@@ -1,8 +1,8 @@
 <!-- 保税仓业务-进仓管理-详情 -->
 <template>
     <app-drawer class="g-details" title="详情" :width="960" v-model:show="show">
-        <app-table-details title="发货信息" :label-width="100" :data="selectedRow" :cell-props="deliveryCells" :column="2" />
-        <app-table-details title="签收信息" :label-width="100" :data="selectedRow" :cell-props="receiveCells" :column="2" />
+        <app-table-details title="发货信息" :label-width="110" :data="selectedRow" :cell-props="deliveryCells" :column="2" />
+        <app-table-details title="签收信息" :label-width="110" :data="selectedRow" :cell-props="receiveCells" :column="2" />
         <app-table :data="orderDetailList" :columns="columns" :show-toolbar="false" border>
             <template #header>
                 <h3 class="g-details__title">

+ 2 - 2
src/packages/pc/views/search/diamond/index.vue

@@ -2,7 +2,7 @@
 <template>
     <app-view>
         <template #header>
-            <el-form ref="formRef" label-width="80px" :rules="formRules">
+            <el-form ref="formRef" label-width="80px" size="small" :rules="formRules">
                 <el-form-item label="形状">
                     <app-multiple :data-list="enums.shapeTypeList" v-model="formData.zsshapetype" checkbox />
                 </el-form-item>
@@ -29,7 +29,7 @@
                         <el-option :label="item.warehousename" :value="item.autoid"
                             v-for="(item, index) in warehouseList" :key="index" />
                     </el-select>
-                    </el-form-item> -->
+                                        </el-form-item> -->
                 <el-form-item label="货币">
                     <app-multiple :data-list="enums.currencyTypeList" v-model="formData.zscurrencytype" checkbox />
                 </el-form-item>

+ 3 - 3
src/packages/pc/views/search/diamonds/index.vue

@@ -2,7 +2,7 @@
 <template>
     <app-view>
         <el-form label-width="80px">
-            <el-form-item label="形状">
+            <el-form-item label="形状" size="small">
                 <app-multiple :data-list="enums.shapeTypeList" checkbox />
             </el-form-item>
             <el-form-item label="颜色">
@@ -23,12 +23,12 @@
             <el-form-item label="荧光">
                 <app-multiple :data-list="enums.fluorescenceTypeList" checkbox />
             </el-form-item>
-            <!-- <el-form-item label="仓库">
+        <!-- <el-form-item label="仓库">
                 <el-select placeholder="请选择">
                     <el-option label="Zone one" value="shanghai" />
                     <el-option label="Zone two" value="beijing" />
                 </el-select>
-            </el-form-item> -->
+                </el-form-item> -->
             <el-form-item label="货币">
                 <app-multiple :data-list="enums.currencyTypeList" checkbox />
             </el-form-item>

+ 2 - 2
src/packages/pc/views/search/fancy/index.vue

@@ -2,7 +2,7 @@
 <template>
     <app-view>
         <template #header>
-            <el-form ref="formRef" label-width="80px" :rules="formRules">
+            <el-form ref="formRef" label-width="80px" size="small" :rules="formRules">
                 <el-form-item label="形状">
                     <app-multiple :data-list="enums.shapeTypeList" v-model="formData.zsshapetype" checkbox />
                 </el-form-item>
@@ -26,7 +26,7 @@
                         <el-option :label="item.warehousename" :value="item.autoid"
                             v-for="(item, index) in warehouseList" :key="index" />
                     </el-select>
-                    </el-form-item> -->
+                        </el-form-item> -->
                 <el-form-item label="货币">
                     <app-multiple :data-list="enums.currencyTypeList" v-model="formData.zscurrencytype" checkbox />
                 </el-form-item>

+ 1 - 1
src/packages/pc/views/search/jewelry/index.vue

@@ -2,7 +2,7 @@
 <template>
     <app-view class="search-jewelry">
         <template #header>
-            <el-form ref="formRef" label-width="80px" :rules="formRules">
+            <el-form ref="formRef" label-width="80px" size="small" :rules="formRules">
                 <el-form-item label="款式">
                     <app-multiple :data-list="enums.styleTypeList" v-model="formData.zsstyletype" checkbox />
                 </el-form-item>

+ 0 - 5
src/packages/pc/views/trade/delisting/index.vue

@@ -11,10 +11,6 @@
         </template>
         <!-- 表格数据 -->
         <app-table :data="dataList" v-model:columns="tableColumns" :loading="loading">
-            <!-- 类型 -->
-            <template #buyorsell>
-                {{ getBuyOrSellName(buyOrSell) }}
-            </template>
             <!-- 价格 -->
             <template #price="{ row }">
                 {{ row.zscurrencytypedisplayunit + formatDecimal(row.price) }}
@@ -38,7 +34,6 @@ import { ElMessage } from 'element-plus'
 import { formatDecimal } from '@/filters'
 import { useDataFilter } from '@/hooks/datatable'
 import { Category } from '@/constants/diamond'
-import { getBuyOrSellName } from '@/constants/order'
 import { useDelistingOrder } from '@/business/trade/list'
 import { useComposeTable } from '@pc/components/base/table'
 import AppTable from '@pc/components/base/table/index.vue'