Bug Fixs

src/packages/sbyj/views/bank/wallet/components/deposit/index.vue

@@ -36,7 +36,7 @@
                     <span class="msg_tips" :data-clipboard-text="msg_323" v-copy="onCopy">{{ msg_323 }}</span>
                 </div>
             </div>
-            <CellGroup class="paybar" inset>
+            <CellGroup class="paybar" inset v-if="dataList.length != 0">
                 <Cell label="请线下转账后再提交付款申请">
                     <template #title>
                         <b>线下收款账号</b>

src/packages/sbyj/views/inventory/components/inOut/index.vue

@@ -7,7 +7,12 @@
             <Form ref="formRef" class="g-form__container" @submit="onSubmit">
                 <CellGroup inset>
                     <Field label="商品" readonly :model-value="`${selectedRow.goodscode}/${selectedRow.goodsname}`"></Field>
-                    <Field label="数量" type="number" name="Qty" v-model.trim="formData.Qty" placeholder="请输入数量" :rules="formRules.Qty" />
+                    <Field label="数量" type="number" name="Qty" v-model.trim="formData.Qty" placeholder="请输入数量" :rules="formRules.Qty">
+                        <template #button>
+                            <span>{{ selectedRow.goodunit }}</span>
+                        </template>
+                    </Field>
+                    <Field label="库存量" v-if="inOutType != 1" readonly :model-value="`${selectedRow.curqty}${selectedRow.goodunit}`"></Field>
                     <Field label="方式" v-if="inOutType != 1" v-model="InOutModel" name="InOutModel" :rules="formRules.InOutModel" is-link @click-input="show = true" />
                     <Field type="textarea" maxlength="250" autosize show-word-limit name="Remark" label="备注" v-model.trim="formData.Remark" placeholder="请输入备注" />
                 </CellGroup>
@@ -79,7 +84,10 @@ const formRules: { [key in keyof Proto.GoodsInventoryApplyReq]?: FieldRule[] } =
     Qty: [{
         message: '请输入数量',
         required: true,
-        validator: () => {
+        validator: (val) => {
+            if (props.inOutType === 2 && val > props.selectedRow.curqty) {
+                return '超过库存量'
+            }
             return !!formData.Qty
         }
     }],

src/packages/sbyj/views/inventory/components/logs/index.vue

@@ -13,8 +13,10 @@
                                 <h4>
                                     {{ formatDate(item.applytime) }}
                                 </h4>
-                                <span :class="item.inouttype === 1 ? 'g-price-up' : 'g-price-down'">{{ getInoutTypeName(item.inouttype) }} {{ getAppointmentModelOutName(item.inoutmodel) }}</span>
-                                <span>{{ getInoutApplyStatusName(item.applystatus) }}</span>
+                            </div>
+                            <div class="right">
+                                <span :class="item.inouttype === 1 ? 'g-price-up' : 'g-price-down'">{{ getInoutTypeName(item.inouttype) }}{{ item.inouttype === 1 ? '' : getAppointmentModelOutName(item.inoutmodel) }}</span>
+                                <span style="padding-left: 5px;">{{ getInoutApplyStatusName(item.applystatus) }}</span>
                             </div>
                         </div>
                         <div class="g-order-list__content">
@@ -25,7 +27,7 @@
                                 </li>
                                 <li>
                                     <span>数量：</span>
-                                    <span>{{ item.qty }}{{ item.goodunit }}</span>
+                                    <span>{{ formatDecimal(item.qty) }}{{ item.goodunit }}</span>
                                 </li>
                                 <li>
                                     <span>备注：</span>
@@ -37,7 +39,7 @@
                                 </li>
                                 <li>
                                     <span>审核时间：</span>
-                                    <span>{{ formatDate(item.audittime) }}</span>
+                                    <span>{{ item.applystatus === 2 ? formatDate(item.audittime) : "--" }}</span>
                                 </li>
                                 <li>
                                     <span>审核备注：</span>
@@ -56,7 +58,7 @@
 import { shallowRef } from 'vue'
 import { useRequest } from '@/hooks/request'
 import { queryUserGoodsInventoryLog } from '@/services/api/order'
-import { formatDate } from '@/filters';
+import { formatDate, formatDecimal } from '@/filters';
 import { getAppointmentModelOutName, getInoutApplyStatusName, getInoutTypeName } from '@/constants/order'
 import AppPullRefresh from '@mobile/components/base/pull-refresh/index.vue'
 import AppModal from '@/components/base/modal/index.vue'

src/packages/sbyj/views/market/detail/index.vue

@@ -237,11 +237,15 @@ const enableqty = (item: Model.SBYJMyOrderRsp) => {
 const qtyStepList = computed(() => {
     // 任务 #6013
     const param1009 = userStore.getSystemParamValue('1009') ?? 1
+
+    const { traderules = [], agreeunit = 0 } = quote.value ?? {}
+    const { ParamValue = 1 } = traderules.find((e) => e.RuleID === 103) ?? {}
+    const min = ParamValue * agreeunit // ParamValue 是数量
     return [
-        agreeunit.value * 1 * (+param1009),
-        agreeunit.value * 5 * (+param1009),
-        agreeunit.value * 10 * (+param1009),
-        agreeunit.value * 50 * (+param1009)
+        agreeunit * 1 * (+param1009) * min,
+        agreeunit * 5 * (+param1009) * min,
+        agreeunit * 10 * (+param1009) * min,
+        agreeunit * 50 * (+param1009) * min
     ]
 })
 
@@ -261,7 +265,6 @@ const canClose = computed(() => {
     //1. 获取用户交易个性化设置（sbyj/QueryUserTradeSettings）
     // 若有GoodsId对应配置，且goodstradetype in (1:可建可平, 3:不可建可平) 时则显示
     const setting = settings.value.find(e => e.goodsid === goods?.goodsid)
-    console.log(setting)
     if (setting) {
         const goodstradetype = setting.goodstradetype
         return ['1', '3'].includes(goodstradetype)

src/packages/sbyj/views/market/list/index.vue

@@ -144,7 +144,7 @@ if (loginStore.token) {
     // 获取游客商品列表
     queryTouristGoods({
         data: {
-            trademodes: '52'
+            trademodes: '52,99,97'
         }
     }).then((res) => {
         if (res.data.length) {