li.shaoyi hace 1 año
padre
commit
d913af573d
Se han modificado 27 ficheros con 154 adiciones y 64 borrados
  1. 2 2
      app/package.json
  2. 0 2
      public/config/appconfig.json
  3. 1 1
      src/packages/gcszt/assets/themes/global/global.less
  4. 1 1
      src/packages/gstj/assets/themes/global/global.less
  5. 0 0
      src/packages/mobile/assets/themes/base/iconfont.less
  6. 1 1
      src/packages/mobile/assets/themes/global/global.less
  7. 21 5
      src/packages/mobile/components/modules/hqchart/candlestick/index.vue
  8. 3 1
      src/packages/mobile/components/modules/hqchart/timeline/index.vue
  9. 1 1
      src/packages/pc/components/modules/hqchart/candlestick/index.vue
  10. 1 1
      src/packages/qdhs/assets/themes/global/global.less
  11. 1 1
      src/packages/qxst/assets/themes/global/global.less
  12. 2 2
      src/packages/sbyj/assets/themes/global/global.less
  13. 21 2
      src/packages/sbyj/router/index.ts
  14. 14 6
      src/packages/sbyj/views/delivery/components/completed/list/index.vue
  15. 15 7
      src/packages/sbyj/views/delivery/components/pending/list/index.vue
  16. 15 7
      src/packages/sbyj/views/delivery/components/processing/list/index.vue
  17. 14 6
      src/packages/sbyj/views/delivery/detail/index.vue
  18. 12 5
      src/packages/sbyj/views/delivery/list/index.vue
  19. 1 2
      src/packages/sbyj/views/market/detail/index.vue
  20. 3 0
      src/packages/sbyj/views/mine/index.vue
  21. 6 1
      src/packages/sbyj/views/order/detail/index.vue
  22. 1 2
      src/packages/sbyj/views/order/list/components/close-holder/index.vue
  23. 9 4
      src/packages/sbyj/views/order/list/components/market-order-delivery/index.vue
  24. 6 1
      src/packages/sbyj/views/order/list/index.vue
  25. 1 1
      src/packages/tc/assets/themes/global/global.less
  26. 1 1
      src/packages/tjmd/assets/themes/global/global.less
  27. 1 1
      src/packages/zrwyt/assets/themes/global/global.less

+ 2 - 2
app/package.json

@@ -1,6 +1,6 @@
 {
-  "name": "trading",
-  "version": "1.0.22",
+  "name": "trading-beta",
+  "version": "1.0.5",
   "main": "main.js",
   "dependencies": {
     "electron-updater": "^6.1.4",

+ 0 - 2
public/config/appconfig.json

@@ -1,10 +1,8 @@
 {
   "appId": "com.muchinfo.app",
-  "appName": "多元世纪",
   "version": "1.0.5",
   "versionCode": "10005",
   "apiUrl": "http://192.168.31.204:8080/cfg?key=test_204",
-  "tradeChannel": "ws",
   "modules": [
     "register",
     "delivery"

+ 1 - 1
src/packages/gcszt/assets/themes/global/global.less

@@ -310,7 +310,7 @@
             li {
                 display: flex;
                 justify-content: space-between;
-                line-height: 20px;
+                line-height: 24px;
                 width: calc(~"50% - 12px");
 
                 span {

+ 1 - 1
src/packages/gstj/assets/themes/global/global.less

@@ -310,7 +310,7 @@
             li {
                 display: flex;
                 justify-content: space-between;
-                line-height: 20px;
+                line-height: 24px;
                 width: calc(~"50% - 12px");
 
                 span {

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
src/packages/mobile/assets/themes/base/iconfont.less


+ 1 - 1
src/packages/mobile/assets/themes/global/global.less

@@ -310,7 +310,7 @@
             li {
                 display: flex;
                 justify-content: space-between;
-                line-height: 20px;
+                line-height: 24px;
                 width: calc(~"50% - 12px");
 
                 span {

+ 21 - 5
src/packages/mobile/components/modules/hqchart/candlestick/index.vue

@@ -72,6 +72,22 @@ const period = computed(() => {
     }
 })
 
+// 获取标题大小
+const getTitleFont = () => {
+    const size = window.devicePixelRatio * 12
+    return size + 'px 微软雅黑'
+}
+
+// 创建窗口指标
+const createWindowsIndex = (Index: string) => ({
+    Index,
+    Change: false,
+    Modify: false,
+    Close: false,
+    FloatPrecision: goods.value?.decimalplace,
+    TitleFont: getTitleFont()
+})
+
 // https://blog.csdn.net/jones2000/article/details/90272733
 const chartOption = {
     Symbol: props.symbol,
@@ -80,9 +96,7 @@ const chartOption = {
     IsApiPeriod: true, // 每次切换周期请求接口数据
     NetworkFilter: (data: NetworkFilterData, callback: NetworkFilterCallback) => networkFilter(data, callback),
     // https://blog.csdn.net/jones2000/article/details/102928907
-    Windows: [
-        { Index: 'MA', Change: false, Modify: false, Close: false }
-    ],
+    Windows: [createWindowsIndex('MA')],
     IsCorssOnlyDrawKLine: true,  // 十字光标只能在K线上
     CorssCursorTouchEnd: true, // 手指离开屏幕 隐藏十字光标
     // https://blog.csdn.net/jones2000/article/details/97682466
@@ -162,10 +176,12 @@ const changeIndex = (index: number) => {
 
 const onReady = (chart: unknown) => {
     if (goods.value?.trademode === 99) {
-        chartOption.Windows.push({ Index: 'MACD', Change: true, Modify: false, Close: false })
+        const windowsIndex = createWindowsIndex('MACD')
+        chartOption.Windows.push(windowsIndex)
     } else {
+        const windowsIndex = createWindowsIndex('VOL')
+        chartOption.Windows.push(windowsIndex)
         tabs.unshift({ label: 'VOL', value: 'VOL' })
-        chartOption.Windows.push({ Index: 'VOL', Change: true, Modify: false, Close: false })
     }
     chartInstance.value = chart
     chartInstance.value.SetOption(chartOption)

+ 3 - 1
src/packages/mobile/components/modules/hqchart/timeline/index.vue

@@ -65,7 +65,9 @@ const chartOption = {
         IsShowTime: false,
     },
     Frame: [
-        {}
+        {
+            IsShowRightText: !!goods.value?.presettle // 是否显示Y轴右侧刻度
+        }
     ],
     OnCreatedCallback: (chart: MinuteChartContainer) => {
         const paint = chart.TitlePaint[0]

+ 1 - 1
src/packages/pc/components/modules/hqchart/candlestick/index.vue

@@ -83,7 +83,7 @@ const chartOption = {
     NetworkFilter: (data: NetworkFilterData, callback: NetworkFilterCallback) => networkFilter(data, callback),
     // https://blog.csdn.net/jones2000/article/details/102928907
     Windows: [
-        { Index: 'MA', Change: false, Close: false }
+        { Index: 'MA', Change: false, Close: false, FloatPrecision: goods.value?.decimalplace }
     ],
     IsCorssOnlyDrawKLine: true,  // 十字光标只能在K线上
     IsShowCorssCursorInfo: true,

+ 1 - 1
src/packages/qdhs/assets/themes/global/global.less

@@ -310,7 +310,7 @@
             li {
                 display: flex;
                 justify-content: space-between;
-                line-height: 20px;
+                line-height: 24px;
                 width: calc(~"50% - 12px");
 
                 span {

+ 1 - 1
src/packages/qxst/assets/themes/global/global.less

@@ -310,7 +310,7 @@
             li {
                 display: flex;
                 justify-content: space-between;
-                line-height: 20px;
+                line-height: 24px;
                 width: calc(~"50% - 12px");
 
                 span {

+ 2 - 2
src/packages/sbyj/assets/themes/global/global.less

@@ -239,7 +239,7 @@
             li {
                 display: flex;
                 justify-content: space-between;
-                line-height: 20px;
+                line-height: 24px;
                 width: calc(~"50% - 12px");
 
                 span {
@@ -431,7 +431,7 @@
     }
 
     .van-radio {
-        width: 25%;
+        width: calc(~'100% / 3');
         padding: 2px;
         margin-right: 0;
 

+ 21 - 2
src/packages/sbyj/router/index.ts

@@ -210,8 +210,27 @@ const routes: Array<RouteRecordRaw> = [
         path: '',
         name: 'delivery-list',
         component: () => import('../views/delivery/list/index.vue'),
-      },
-    ],
+        props: {
+          title: '交料订单',
+          buyorsell: 1
+        }
+      }
+    ]
+  },
+  {
+    path: '/pickup',
+    component: Page,
+    children: [
+      {
+        path: '',
+        name: 'pickup-list',
+        component: () => import('../views/delivery/list/index.vue'),
+        props: {
+          title: '提料订单',
+          buyorsell: 0
+        }
+      }
+    ]
   },
   {
     path: '/mine',

+ 14 - 6
src/packages/sbyj/views/delivery/components/completed/list/index.vue

@@ -15,11 +15,11 @@
                 <div class="g-order-list__content">
                     <ul>
                         <li>
-                            <span>交料重量</span>
+                            <span>{{ getTagName(item.buyorsell) }}重量</span>
                             <span>{{ item.deliveryqty }}{{ getGoodsUnitName(item.goodunitid) }}</span>
                         </li>
                         <li>
-                            <span>实际交料重量</span>
+                            <span>实际{{ getTagName(item.buyorsell) }}重量</span>
                             <span>{{ item.realdeliveryqty }}{{ getGoodsUnitName(item.goodunitid) }}</span>
                         </li>
                         <li>
@@ -27,7 +27,7 @@
                             <span>{{ item.deliverypremium }}</span>
                         </li>
                         <li>
-                            <span>交料价格</span>
+                            <span>{{ getTagName(item.buyorsell) }}价格</span>
                             <span>{{ item.deliveryprice }}</span>
                         </li>
                         <li>
@@ -60,7 +60,6 @@
 </template>
 
 <script lang="ts" setup>
-
 import { shallowRef, defineAsyncComponent } from 'vue'
 import { formatDate, formatDecimal } from '@/filters'
 import { BuyOrSell } from '@/constants/order'
@@ -71,6 +70,10 @@ import { queryMyTradeGoodsDeliveryOfflines } from '@/services/api/order'
 import { Button } from 'vant'
 import AppPullRefresh from '@mobile/components/base/pull-refresh/index.vue'
 
+const props = defineProps({
+    buyorsell: Number
+})
+
 const dataList = shallowRef<Model.MyTradeGoodsDeliveryOfflineRsp[]>([])
 const selectedRow = shallowRef<Model.MyTradeGoodsDeliveryOfflineRsp>()
 const error = shallowRef(false)
@@ -93,16 +96,21 @@ const { loading, pageIndex, pageCount, run } = useRequest(queryMyTradeGoodsDeliv
         if (pageIndex.value === 1) {
             dataList.value = []
         }
-        dataList.value.push(...res.data)
+        const data = res.data.filter((e) => e.buyorsell === props.buyorsell)
+        dataList.value.push(...data)
     },
     onError: () => {
         error.value = true
     }
 })
 
+// 获取标签名称
+const getTagName = (value: number) => {
+    return value === BuyOrSell.Buy ? '提料' : '交料'
+}
+
 const showComponent = (componentName: string, row: Model.MyTradeGoodsDeliveryOfflineRsp) => {
     selectedRow.value = row
     openComponent(componentName)
 }
-
 </script>

+ 15 - 7
src/packages/sbyj/views/delivery/components/pending/list/index.vue

@@ -15,11 +15,11 @@
                 <div class="g-order-list__content">
                     <ul>
                         <li>
-                            <span>交料重量</span>
+                            <span>{{ getTagName(item.buyorsell) }}重量</span>
                             <span>{{ item.deliveryqty }}{{ getGoodsUnitName(item.goodunitid) }}</span>
                         </li>
                         <li>
-                            <span>实际交料重量</span>
+                            <span>实际{{ getTagName(item.buyorsell) }}重量</span>
                             <span>{{ item.realdeliveryqty }}{{ getGoodsUnitName(item.goodunitid) }}</span>
                         </li>
                         <li>
@@ -27,7 +27,7 @@
                             <span>{{ item.deliverypremium }}</span>
                         </li>
                         <li>
-                            <span>交料价格</span>
+                            <span>{{ getTagName(item.buyorsell) }}价格</span>
                             <span>{{ item.deliveryprice }}</span>
                         </li>
                         <li>
@@ -51,9 +51,8 @@
 </template>
 
 <script lang="ts" setup>
-
 import { shallowRef, defineAsyncComponent } from 'vue'
-import { formatDate,formatDecimal } from '@/filters'
+import { formatDate, formatDecimal } from '@/filters'
 import { BuyOrSell } from '@/constants/order'
 import { getGoodsUnitName } from '@/constants/unit'
 import { useComponent } from '@/hooks/component'
@@ -62,6 +61,10 @@ import { queryMyTradeGoodsDeliveryOfflines } from '@/services/api/order'
 import { Button } from 'vant'
 import AppPullRefresh from '@mobile/components/base/pull-refresh/index.vue'
 
+const props = defineProps({
+    buyorsell: Number
+})
+
 const dataList = shallowRef<Model.MyTradeGoodsDeliveryOfflineRsp[]>([])
 const selectedRow = shallowRef<Model.MyTradeGoodsDeliveryOfflineRsp>()
 const error = shallowRef(false)
@@ -83,16 +86,21 @@ const { loading, pageIndex, pageCount, run } = useRequest(queryMyTradeGoodsDeliv
         if (pageIndex.value === 1) {
             dataList.value = []
         }
-        dataList.value.push(...res.data)
+        const data = res.data.filter((e) => e.buyorsell === props.buyorsell)
+        dataList.value.push(...data)
     },
     onError: () => {
         error.value = true
     }
 })
 
+// 获取标签名称
+const getTagName = (value: number) => {
+    return value === BuyOrSell.Buy ? '提料' : '交料'
+}
+
 const showComponent = (componentName: string, row: Model.MyTradeGoodsDeliveryOfflineRsp) => {
     selectedRow.value = row
     openComponent(componentName)
 }
-
 </script>

+ 15 - 7
src/packages/sbyj/views/delivery/components/processing/list/index.vue

@@ -19,11 +19,11 @@
                 <div class="g-order-list__content">
                     <ul>
                         <li>
-                            <span>交料重量</span>
+                            <span>{{ getTagName(item.buyorsell) }}重量</span>
                             <span>{{ item.deliveryqty }}{{ getGoodsUnitName(item.goodunitid) }}</span>
                         </li>
                         <li>
-                            <span>实际交料重量</span>
+                            <span>实际{{ getTagName(item.buyorsell) }}重量</span>
                             <span>{{ item.realdeliveryqty }}{{ getGoodsUnitName(item.goodunitid) }}</span>
                         </li>
                         <li>
@@ -31,7 +31,7 @@
                             <span>{{ item.deliverypremium }}</span>
                         </li>
                         <li>
-                            <span>交料价格</span>
+                            <span>{{ getTagName(item.buyorsell) }}价格</span>
                             <span>{{ item.deliveryprice }}</span>
                         </li>
                         <li>
@@ -67,7 +67,6 @@
 </template>
 
 <script lang="ts" setup>
-
 import { shallowRef, defineAsyncComponent, reactive } from 'vue'
 import { formatDate, formatDecimal, handleRequestBigNumber } from '@/filters'
 import { BuyOrSell } from '@/constants/order'
@@ -80,6 +79,10 @@ import { fullloading, dialog } from '@/utils/vant'
 import AppPullRefresh from '@mobile/components/base/pull-refresh/index.vue'
 import { deliveryClientOperator } from '@/services/api/trade'
 
+const props = defineProps({
+    buyorsell: Number
+})
+
 const dataList = shallowRef<Model.MyTradeGoodsDeliveryOfflineRsp[]>([])
 const selectedRow = shallowRef<Model.MyTradeGoodsDeliveryOfflineRsp>()
 const error = shallowRef(false)
@@ -104,13 +107,19 @@ const { loading, pageIndex, pageCount, run } = useRequest(queryMyTradeGoodsDeliv
         if (pageIndex.value === 1) {
             dataList.value = []
         }
-        dataList.value.push(...res.data)
+        const data = res.data.filter((e) => e.buyorsell === props.buyorsell)
+        dataList.value.push(...data)
     },
     onError: () => {
         error.value = true
     }
 })
 
+// 获取标签名称
+const getTagName = (value: number) => {
+    return value === BuyOrSell.Buy ? '提料' : '交料'
+}
+
 const showComponent = (componentName: string, row: Model.MyTradeGoodsDeliveryOfflineRsp) => {
     selectedRow.value = row
     openComponent(componentName)
@@ -119,7 +128,7 @@ const showComponent = (componentName: string, row: Model.MyTradeGoodsDeliveryOff
 // 交收确认
 const deliveryCommit = (item: Model.MyTradeGoodsDeliveryOfflineRsp) => {
     dialog({
-        message: '是否确认交料?',
+        message: `是否确认${getTagName(item.buyorsell)}?`,
         showCancelButton: true,
     }).then(() => {
         formData.DeliveryOrderID = handleRequestBigNumber(item.deliveryorderid)
@@ -136,5 +145,4 @@ const deliveryCommit = (item: Model.MyTradeGoodsDeliveryOfflineRsp) => {
         })
     })
 }
-
 </script>

+ 14 - 6
src/packages/sbyj/views/delivery/detail/index.vue

@@ -3,15 +3,17 @@
     <app-modal direction="right-top" height="100%" width="100%" v-model:show="showModal" :refresh="refresh">
         <app-view class="g-form">
             <template #header>
-                <app-navbar title="交料详情" @back="closed" />
+                <app-navbar :title="getTagName() + '详情'" @back="closed" />
             </template>
             <div class="g-form__container">
                 <CellGroup inset>
-                    <Cell title="交料单号" :value="selectedRow.deliveryorderid" />
+                    <Cell :title="getTagName() + '单号'" :value="selectedRow.deliveryorderid" />
                     <Cell title="商品代码/名称" :value="selectedRow.goodscode + '/' + selectedRow.goodsname" />
-                    <Cell title="交料重量" :value="selectedRow.deliveryqty + getGoodsUnitName(selectedRow.goodunitid)" />
-                    <Cell title="实际交料重量" :value="selectedRow.realdeliveryqty + getGoodsUnitName(selectedRow.goodunitid)" />
-                    <Cell title="交料价格" :value="selectedRow.deliveryprice" />
+                    <Cell :title="getTagName() + '重量'"
+                        :value="selectedRow.deliveryqty + getGoodsUnitName(selectedRow.goodunitid)" />
+                    <Cell :title="`实际${getTagName()}重量`"
+                        :value="selectedRow.realdeliveryqty + getGoodsUnitName(selectedRow.goodunitid)" />
+                    <Cell :title="getTagName() + '价格'" :value="selectedRow.deliveryprice" />
                     <Cell title="补差价" :value="selectedRow.deliverypremium" />
                     <Cell title="总货款" :value="selectedRow.deliverytotalamount" />
                     <Cell title="已付货款" :value="selectedRow.payedamount" />
@@ -32,11 +34,12 @@
 <script lang="ts" setup>
 import { shallowRef, PropType, defineAsyncComponent } from 'vue'
 import { CellGroup, Cell } from 'vant'
+import { BuyOrSell } from '@/constants/order'
 import { useComponent } from '@/hooks/component'
 import { getGoodsUnitName } from '@/constants/unit'
 import AppModal from '@/components/base/modal/index.vue'
 
-defineProps({
+const props = defineProps({
     selectedRow: {
         type: Object as PropType<Model.MyTradeGoodsDeliveryOfflineRsp>,
         required: true,
@@ -53,6 +56,11 @@ const refresh = shallowRef(false) // 是否刷新父组件数据
 
 const { componentRef, componentId, openComponent, closeComponent } = useComponent()
 
+// 获取标签名称
+const getTagName = () => {
+    return props.selectedRow.buyorsell === BuyOrSell.Buy ? '提料' : '交料'
+}
+
 // 关闭弹窗
 const closed = (isRefresh = false) => {
     refresh.value = isRefresh

+ 12 - 5
src/packages/sbyj/views/delivery/list/index.vue

@@ -1,17 +1,17 @@
 <template>
     <app-view>
         <template #header>
-            <app-navbar title="我的交料" />
+            <app-navbar :title="title" />
         </template>
         <Tabs class="van-tabs--list" v-model:active="active" :swipe-threshold="4">
             <Tab title="待审核">
-                <component :is="componentMap.get('pending')" v-if="active === 0" />
+                <component :is="componentMap.get('pending')" v-bind="{ buyorsell }" v-if="active === 0" />
             </Tab>
             <Tab title="进行中">
-                <component :is="componentMap.get('processing')" v-if="active === 1" />
+                <component :is="componentMap.get('processing')" v-bind="{ buyorsell }" v-if="active === 1" />
             </Tab>
             <Tab title="已完成">
-                <component :is="componentMap.get('completed')" v-if="active === 2" />
+                <component :is="componentMap.get('completed')" v-bind="{ buyorsell }" v-if="active === 2" />
             </Tab>
         </Tabs>
     </app-view>
@@ -21,6 +21,14 @@
 import { shallowRef, defineAsyncComponent } from 'vue'
 import { Tab, Tabs } from 'vant'
 
+defineProps({
+    title: {
+        type: String,
+        default: '交料提料'
+    },
+    buyorsell: Number
+})
+
 const active = shallowRef(0)
 
 const componentMap = new Map<string, unknown>([
@@ -28,5 +36,4 @@ const componentMap = new Map<string, unknown>([
     ['processing', defineAsyncComponent(() => import('../components/processing/list/index.vue'))], // 进行中
     ['completed', defineAsyncComponent(() => import('../components/completed/list/index.vue'))], // 已完成
 ])
-
 </script>

+ 1 - 2
src/packages/sbyj/views/market/detail/index.vue

@@ -175,8 +175,7 @@ const qtyStepList = computed(() => {
     return [
         agreeunit.value * 100,
         agreeunit.value * 500,
-        agreeunit.value * 1000,
-        agreeunit.value * 5000,
+        agreeunit.value * 1000
     ]
 })
 

+ 3 - 0
src/packages/sbyj/views/mine/index.vue

@@ -98,6 +98,9 @@
                 <li @click="routerTo('delivery-list')">
                     <Iconfont label-direction="bottom" icon="g-icon-delivery--line">交料订单</Iconfont>
                 </li>
+                <li @click="routerTo('pickup-list')">
+                    <Iconfont label-direction="bottom" icon="g-icon-pickup--line">提料订单</Iconfont>
+                </li>
             </ul>
         </app-block>
         <app-block class="g-navmenu">

+ 6 - 1
src/packages/sbyj/views/order/detail/index.vue

@@ -35,7 +35,7 @@
                     </Cell>
                     <Cell title="冻结重量"
                         :value="(detail.freezeQty * selectedRow.agreeUnit) + getGoodsUnitName(selectedRow.goodsUnitID)" />
-                    <Cell title="交料重量"
+                    <Cell :title="getTagName() + '重量'"
                         :value="(detail.deliveryQty * selectedRow.agreeUnit) + getGoodsUnitName(selectedRow.goodsUnitID)" />
                     <Cell title="订单时间" :value="detail.tradeTime" />
                 </CellGroup>
@@ -64,6 +64,11 @@ const refresh = shallowRef(false) // 是否刷新父组件数据
 
 const detail = computed(() => props.selectedRow.tHDetailEx)
 
+// 获取标签名称
+const getTagName = () => {
+    return props.selectedRow.tHDetailEx.buyOrSell === BuyOrSell.Buy ? '提料' : '交料'
+}
+
 // 关闭弹窗
 const closed = (isRefresh = false) => {
     refresh.value = isRefresh

+ 1 - 2
src/packages/sbyj/views/order/list/components/close-holder/index.vue

@@ -80,8 +80,7 @@ const qtyStepList = computed(() => {
     return [
         agreeunit.value * 100,
         agreeunit.value * 500,
-        agreeunit.value * 1000,
-        agreeunit.value * 5000,
+        agreeunit.value * 1000
     ]
 })
 

+ 9 - 4
src/packages/sbyj/views/order/list/components/market-order-delivery/index.vue

@@ -3,12 +3,12 @@
     <app-modal direction="right-top" height="100%" width="100%" v-model:show="showModal" :refresh="refresh">
         <app-view class="g-form">
             <template #header>
-                <app-navbar title="交料申请" @back="closed" />
+                <app-navbar :title="getTagName() + '申请'" @back="closed" />
             </template>
             <Form ref="formRef" class="g-form__container" @submit="onSubmit">
                 <CellGroup inset>
                     <Cell title="可用重量" :value="enableqty + getGoodsUnitName(selectedRow.goodsUnitID)" />
-                    <Field name="OrderQty" label="交料重量" :rules="formRules.OrderQty">
+                    <Field name="OrderQty" :label="getTagName() + '重量'" :rules="formRules.OrderQty">
                         <template #input>
                             <div class="g-qty-group">
                                 <div class="g-qty-group__stepper">
@@ -37,6 +37,7 @@
 <script lang="ts" setup>
 import { shallowRef, PropType, onMounted, computed, reactive } from 'vue'
 import { CellGroup, Cell, Button, Stepper, Field, Form, FormInstance, FieldRule, RadioGroup, Radio } from 'vant'
+import { BuyOrSell } from '@/constants/order'
 import { fullloading } from '@/utils/vant'
 import { handleRequestBigNumber } from '@/filters'
 import AppModal from '@/components/base/modal/index.vue'
@@ -64,7 +65,6 @@ const qtyStepList = computed(() => {
         agreeunit.value * 100,
         agreeunit.value * 500,
         agreeunit.value * 1000,
-        agreeunit.value * 5000,
     ]
 })
 
@@ -84,11 +84,16 @@ const formRules: { OrderQty?: FieldRule[] } = {
                 }
                 return orderQty.value % agreeunit.value === 0 ? true : '重量只能是' + agreeunit.value + '的整数倍'
             }
-            return '请输入交料重量'
+            return `请输入${getTagName()}重量`
         }
     }],
 }
 
+// 获取标签名称
+const getTagName = () => {
+    return props.selectedRow.tHDetailEx.buyOrSell === BuyOrSell.Buy ? '提料' : '交料'
+}
+
 const onRadioChange = (value: number) => {
     orderQty.value = Math.min(enableqty.value, value)
 }

+ 6 - 1
src/packages/sbyj/views/order/list/index.vue

@@ -73,7 +73,7 @@
                         <Button size="small" @click="showComponent('supplement', item)" round
                             v-if="item.tHDetailEx.holderQty">补充</Button>
                         <template v-if="enableqty(item)">
-                            <Button size="small" @click="showComponent('delivery', item)" round>交料</Button>
+                            <Button size="small" @click="showComponent('delivery', item)" round>{{ getTagName(item.tHDetailEx.buyOrSell) }}</Button>
                             <Button size="small" @click="showComponent('closeholder', item)" round>终止</Button>
                         </template>
                         <Button size="small" @click="showComponent('detail', item)" round>详情</Button>
@@ -115,6 +115,11 @@ const enableqty = (item: Model.SBYJMyOrderRsp) => {
     return (tHDetailEx.holderQty - tHDetailEx.freezeQty) * agreeUnit
 }
 
+// 获取标签名称
+const getTagName = (value: number) => {
+    return value === BuyOrSell.Buy ? '提料' : '交料'
+}
+
 const showComponent = (componentName: string, row: Model.SBYJMyOrderRsp) => {
     selectedRow.value = row
     openComponent(componentName)

+ 1 - 1
src/packages/tc/assets/themes/global/global.less

@@ -310,7 +310,7 @@
             li {
                 display: flex;
                 justify-content: space-between;
-                line-height: 20px;
+                line-height: 24px;
                 width: calc(~"50% - 12px");
 
                 span {

+ 1 - 1
src/packages/tjmd/assets/themes/global/global.less

@@ -310,7 +310,7 @@
             li {
                 display: flex;
                 justify-content: space-between;
-                line-height: 20px;
+                line-height: 24px;
                 width: calc(~"50% - 12px");
 
                 span {

+ 1 - 1
src/packages/zrwyt/assets/themes/global/global.less

@@ -310,7 +310,7 @@
             li {
                 display: flex;
                 justify-content: space-between;
-                line-height: 20px;
+                line-height: 24px;
                 width: calc(~"50% - 12px");
 
                 span {

Algunos archivos no se mostraron porque demasiados archivos cambiaron en este cambio