update

src/services/socket/protobuf/buildReq.ts

@@ -291,20 +291,13 @@ export function protoMiddleware<T>(param: T, reqName: string, rspName: string, h
                     reject(result);
                 }
 
-
-                // 下单调试#3124
-                if (rspName === 'ChannelOrderRsp') {
-                    document.body.innerText = JSON.stringify(parseProtoRsp50(res, rspName));
-                }
+                console.log(rspName + '成功回调调试================================', parseProtoRsp50(res, rspName))
             },
             onFail: (err) => {
-                console.log(`proto:${reqName}错误消息：${err}`)
+                //console.log(`proto:${reqName}错误消息：${err}`)
                 reject(err.message)
 
-                // 下单调试#3124
-                if (rspName === 'ChannelOrderRsp') {
-                    document.body.innerText = err.message;
-                }
+                console.log(rspName + '失败回调调试================================', err)
             },
         } as Callback);
     });

src/views/business/purchase/components/invoice/index.vue

@@ -84,10 +84,9 @@
         <a-row :gutter="24">
           <a-col :span="12">
             <a-form-item label="收票金额" class="relative mb40" name="InvoiceAmount">
-              <a-input-number v-model:value="formState.InvoiceAmount" class="dialogInput" style="width: 200px" :min="0" suffix="元" placeholder="请输入收票金额" />
-              <div class="tip">
+              <a-input-number v-model:value="formState.InvoiceAmount" class="dialogInput" style="width: 200px" suffix="元" placeholder="请输入收票金额" />
+              <div class="tip mt10">
                 <div>应收票额：{{ handleNoneValue(selectedRow.daikaiamount, ' 元') }} </div>
-                <div><a class="blue fr">全部登记</a></div>
               </div>
             </a-form-item>
           </a-col>

src/views/business/purchase/components/invoice/setup.ts

@@ -20,7 +20,7 @@ export function handleForm() {
     }
 
     const rules = {
-        InvoiceAmount: [{ required: true, validator: (rule: RuleObject, value: number) => validate(value) }],
+        InvoiceAmount: [{ required: true, validator: (rule: RuleObject, value: number) => validate(value, '金额不能小于0') }],
     }
     return { rules, formState, formRef }
 }

src/views/manage/finance-review/list/invoice/index.vue

@@ -15,8 +15,8 @@
           <a>{{ getContractTypeName(text) }}</a>
         </template>
         <!-- 发票类型-->
-        <template #invoicetype="{ text }">
-          <a>{{ getReceiptName(text) }}</a>
+        <template #invoicetype="{ record }">
+          <a>{{ getReceiptName(record.contracttype) }}</a>
         </template>
         <!-- 状态 -->
         <template #applystatus="{ text }">

src/views/search/inventory/components/add/index.vue

@@ -54,7 +54,7 @@
         </a-col>
         <a-col :span="12">
           <a-form-item :label="`${inOrOut()}数量`" name="Qty">
-            <a-input-number class="dialogInput" style="width: 200px" v-model:value="formState.Qty" :min="0" :max="9999999999" :placeholder="`请输入${inOrOut()}数量`" />
+            <a-input-number class="dialogInput" style="width: 200px" v-model:value="formState.Qty" :placeholder="`请输入${inOrOut()}数量`" />
           </a-form-item>
         </a-col>
       </a-row>
@@ -63,7 +63,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, PropType, ref, toRaw, watchEffect } from 'vue';
+import { defineComponent, PropType, ref } from 'vue';
 import { _closeModal } from '@/common/setup/modal/modal';
 import { initData } from '@/common/methods';
 import { Ermcp3ContractRsp } from '@/services/go/ermcp/spot-contract/interface';

src/views/search/inventory/components/add/setup.ts

@@ -24,9 +24,9 @@ export function handleFormState() {
     }
     const formState: UnwrapRef<FormState> = reactive(initFormData())
 
-    const validate = async (value: number, message: string) => {
-        if (value <= 0) {
-            return Promise.reject(message)
+    const validate = async (rule: RuleObject, value: number) => {
+        if (value <= 0 || value > 9999999999) {
+            return Promise.reject('请输入1-10位数以内的数量')
         }
     }
 
@@ -35,7 +35,7 @@ export function handleFormState() {
         SpotGoodsBrandID: [{ required: true, message: '请选择现货品牌' }],
         DeliveryGoodsID: [{ required: true, message: '请选择现货品种' }],
         WarehouseInfo: [{ required: true, message: '请选择现货仓库' }],
-        Qty: [{ required: true, validator: (rule: RuleObject, value: number) => validate(value, '数量不能小于0') }],
+        Qty: [{ required: true, validator: validate }],
     }
     return { rules, formState, formRef, initFormData }
 }