Merge branch 'master' of http://47.101.159.18:3000/Muchinfo/MTP2.0_WEB

src/common/methods/table/interface.ts

@@ -41,7 +41,7 @@ export interface TableKey {
     table_pcweb_sales_all: string; // 销售_全部
     table_pcweb_sales_pointprice: string; // 销售_待点价
     table_pcweb_sales_settle: string; // 销售_履约交收
-    table_pcweb_stock_aduit: string; // 库存审核-入库
+    table_pcweb_stock_aduit_in: string; // 库存审核-入库
     table_pcweb_stock_aduit_out: string; // 库存审核-出库
     table_pcweb_stock_manage_applylog: string; // 库存管理-当前库存
     table_pcweb_stock_manage_current: string; // 库存管理-当前库存

src/common/setup/user/index.ts

@@ -22,13 +22,15 @@ export function handlerManagerList(loading: Ref<boolean>, type: 1 | 2 | 3, isFil
      * @param code 
      * @returns 
      */
-    function findManagerName(code: string, arr?: ErmcpLoginUserEx[]) {
-        let result = code
+    function findManagerName(id: number, arr?: ErmcpLoginUserEx[]) {
+        console.log('dd', id, arr);
+
+        let result = '--'
         const temp = arr ? arr : tableList.value
         temp.forEach(el => {
             el.userlist.forEach(e => {
-                const { accountname, logincode } = e
-                if (logincode === code) {
+                const { accountname, logincode, loginid } = e
+                if (loginid === id) {
                     result = `${accountname}-${logincode}`
                 }
             })

src/views/information/account_info/compoments/add-business/index.vue

@@ -39,7 +39,7 @@
                        name="logincode">
             <a-input class="dialogInput"
                      style="width: 200px"
-                     v-model:value="formState.logincode"
+                     v-model:value="formState.accountname"
                      placeholder="请输入账户名称" />
           </a-form-item>
         </a-col>
@@ -48,7 +48,7 @@
                        name="accountname">
             <a-input class="dialogInput"
                      style="width: 200px"
-                     v-model:value="formState.accountname"
+                     v-model:value="formState.logincode"
                      placeholder="请输入登录账号" />
           </a-form-item>
         </a-col>

src/views/information/account_info/compoments/add-managers/index.vue

@@ -36,7 +36,7 @@
                        name="logincode">
             <a-input class="dialogInput"
                      style="width: 200px"
-                     v-model:value="formState.logincode"
+                     v-model:value="formState.accountname"
                      placeholder="请输入账户名称" />
           </a-form-item>
         </a-col>
@@ -45,7 +45,7 @@
                        name="accountname">
             <a-input class="dialogInput"
                      style="width: 200px"
-                     v-model:value="formState.accountname"
+                     v-model:value="formState.logincode"
                      placeholder="请输入登录账号" />
           </a-form-item>
         </a-col>

src/views/information/account_info/compoments/setup.ts

@@ -19,8 +19,8 @@ export function handleBusinessForm() {
         logintaaccounts: [],
     })
     const rules = {
-        logincode: [{ required: true, message: '请输入登录账号', trigger: 'blur' }],
-        accountname: [{ required: true, message: '请输入账户名称', trigger: 'blur' }],
+        logincode: [{ required: true, message: '请输入账户名称', trigger: 'blur' }],
+        accountname: [{ required: true, message: '请输入登录账号', trigger: 'blur' }],
         password: [{ required: true, message: '请输入账户密码', trigger: 'blur' }],
         mobile: [{ required: true, message: '请输入手机号码', trigger: 'blur' }],
         userid: [{ required: true, message: '请输入账户权限' }],

src/views/information/goods/components/add/index.vue

@@ -4,7 +4,7 @@
            wrapClassName=""
            title="新增现货品种"
            v-model:visible="visible"
-           @cancel="cancel"
+           @cancel="closeAction"
            centered
            :maskClosable="maskClosableFlag"
            width="850px">
@@ -349,9 +349,7 @@ export default defineComponent({
                     }),
                 };
                 requestResultLoadingAndInfo(addDeliveryGoodsApply, reqParam, loading, ['新增现货品种成功', '新增现货品种失败:']).then(() => {
-                    // 清空数据
-                    Object.assign(formState, initFormData());
-                    cancel();
+                    closeAction();
                     context.emit('refresh');
                 });
             });
@@ -388,12 +386,17 @@ export default defineComponent({
                 value.unitid = obj.agreeunit;
             }
         }
+        function closeAction() {
+            //清空添加成功后的数据，确保在此新增打开是个空数据
+            Object.assign(formState, initFormData());
+            cancel();
+        }
         initData(() => {
             getGoodsGroup();
         });
         return {
             visible,
-            cancel,
+            closeAction,
             formRef,
             formState,
             addOne,

src/views/information/goods/components/modify/index.vue

@@ -343,7 +343,7 @@ export default defineComponent({
             gldwrstandards: {
                 unitid: { required: true, validator: validateUnit, trigger: 'change' },
                 wrstandardname: { required: true, message: '请输入品类', trigger: 'blur' },
-                convertfactor: { required: true, message: '请输入标仓系数', trigger: 'blur' },
+                convertfactor: { required: true, message: '请输入标仓系数', trigger: 'blur', type: 'number' },
             },
             glddgfactoryItems: {
                 dgfactoryitemvalue: { required: true, message: '请输入品牌', trigger: 'blur' },
@@ -416,7 +416,7 @@ export default defineComponent({
                 // 品类
                 formState.gldwrstandards = gmlist.map((e) => {
                     const { wrstandardid, wrstandardname, convertfactor, unitid } = e;
-                    return { wrstandardid, wrstandardname, convertfactor: convertfactor.toString(), unitid };
+                    return { wrstandardid, wrstandardname, convertfactor: convertfactor, unitid };
                 });
                 // 品牌
                 formState.glddgfactoryItems = gblist.map((e) => {

src/views/information/goods/components/modify/interface.ts

@@ -2,7 +2,7 @@ export interface GLDWRStandardEx {
     wrstandardid?: number // uint64 型号ID(修改时有值)
     wrstandardname: string // string 型号名称
     unitid: number | undefined// uint64 单位ID
-    convertfactor: string// double 标仓系数(接口为3.1及以上版本时传)
+    convertfactor: number | null// double 标仓系数(接口为3.1及以上版本时传)
 }
 
 // 现货商品品牌数据 0 29 173

src/views/information/goods/components/modify/setup.ts

@@ -17,7 +17,7 @@ export function handleFromState() {
         type: 1,// int32 类型 1 新增 2 修改
         remark: '', // string 备注
         gldwrstandards: [
-            { wrstandardname: '', unitid: undefined, convertfactor: '', }
+            { wrstandardname: '', unitid: undefined, convertfactor: null, }
         ], //        GLDWRStandardEx 现货商品型号数据
         glddgfactoryItems: [
             { dgfactoryitemvalue: '', }
@@ -33,7 +33,7 @@ export function handleFromState() {
      */
     function addOne(key: Key): void {
         if (key === 'gldwrstandards') {
-            formState[key].push({ wrstandardname: '', unitid: undefined, convertfactor: '' })
+            formState[key].push({ wrstandardname: '', unitid: undefined, convertfactor: null })
         } else if (key === 'glddgfactoryItems') {
             formState[key].push({ dgfactoryitemvalue: '', })
         } else if (key === 'wrsconvertdetails') {

src/views/information/spot-contract/components/add/index.vue

@@ -5,7 +5,7 @@
            v-model:visible="visible"
            centered
            :maskClosable="maskClosableFlag"
-           @cancel="cancel"
+           @cancel="closeAction"
            width="890px">
     <template #footer>
       <a-button key="submit"
@@ -220,8 +220,8 @@
                         style="width: 200px"
                         placeholder="请选择结算币种">
                 <a-select-option v-for="item in payCurrency"
-                                 :key="item.enumitemname"
-                                 :value="item.enumitemname">
+                                 :key="item.enumdicid"
+                                 :value="item.enumdicid">
                   {{item.enumdicname}}
                 </a-select-option>
               </a-select>
@@ -354,9 +354,9 @@
                         style="width: 200px"
                         placeholder="请选择业务员">
                 <a-select-option v-for="item in businesserList"
-                                 :key="item.id"
-                                 :value="item.id">
-                  {{item.name}}
+                                 :key="item.loginid"
+                                 :value="item.loginid">
+                  {{item.accountname}}-{{item.logincode}}
                 </a-select-option>
               </a-select>
             </a-form-item>
@@ -371,9 +371,9 @@
                         style="width: 200px"
                         placeholder="请选择跟单员">
                 <a-select-option v-for="item in merchandiserList"
-                                 :key="item.id"
-                                 :value="item.id">
-                  {{item.name}}
+                                 :key="item.loginid"
+                                 :value="item.loginid">
+                  {{item.accountname}}-{{item.logincode}}
                 </a-select-option>
               </a-select>
             </a-form-item>
@@ -386,9 +386,9 @@
                         v-model:value="formState.TradeUserID"
                         placeholder="请选择期货账户">
                 <a-select-option v-for="item in traderList"
-                                 :key="item.id"
-                                 :value="item.id">
-                  {{item.name}}
+                                 :key="item.roleid"
+                                 :value="item.roleid">
+                  {{item.rolename}}
                 </a-select-option>
               </a-select>
             </a-form-item>
@@ -396,9 +396,11 @@
         </a-row>
         <a-row :gutter="24">
           <a-col :span="24">
-            <a-form-item label="备注">
+            <a-form-item label="备注"
+                         name="Remark">
               <a-input class="dialogInput"
                        style="width: 608px"
+                       v-model:value="formState.Remark"
                        placeholder="请输入备注" />
             </a-form-item>
           </a-col>
@@ -409,7 +411,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, PropType, ref, toRaw } from 'vue';
+import { defineComponent, PropType, ref, toRaw, watchEffect } from 'vue';
 import { closeModal } from '@/common/setup/modal/index';
 import { initData } from '@/common/methods';
 import { addContractReq } from './setup';
@@ -420,10 +422,11 @@ import { ValidateErrorEntity } from 'ant-design-vue/lib/form/interface';
 import { FormState } from '../interface';
 import { formatTime } from '@/common/methods/format';
 import { Ermcp3ContractRsp } from '@/services/go/ermcp/spot-contract/interface';
-import { handleAccountManager } from '../setup';
 import { Moment } from 'moment';
 import { handleFormRule, handleContract, handleDeliveryGoods, handleAmout, handlePrice, handleDate, handleFromState } from '../setup';
 import { validateAction } from '@/common/setup/form';
+import { ErmcpLoginUser } from '@/services/go/ermcp/account/interface';
+import { handlerManagerList } from '@/common/setup/user';
 
 export default defineComponent({
     name: 'add-spot-contract',
@@ -454,11 +457,29 @@ export default defineComponent({
         const { deliveryDate, priceDate, disabledDate } = handleDate();
         // 处理金额
         const { getAmout } = handleAmout(formState);
-        // 账号列表： 交易用户 业务员 跟单员
-        const { traderList, businesserList, merchandiserList, getRoleList, getBusinesserList } = handleAccountManager();
+        // 获取 业务账户
+        const { queryTable: queryBusinessManager, getBusinesserOrMerchandiser } = handlerManagerList(loading, 1);
+        const { tableList: traderList, queryTable: queryTradeManager } = handlerManagerList(loading, 2, true);
+        // 业务员
+        const businesserList = ref<ErmcpLoginUser[]>([]);
+        // 跟单员
+        const merchandiserList = ref<ErmcpLoginUser[]>([]);
         // 现货商品列表
         const goodsList = ref<Goods[]>([]);
+        watchEffect(() => {
+            if (visible.value) {
+                console.log('merchandiserList', merchandiserList);
 
+                queryCustomList();
+                getDeliveryGoods();
+                queryTradeManager();
+                goodsList.value = getGoodsList();
+                queryBusinessManager().then(() => {
+                    businesserList.value = getBusinesserOrMerchandiser('22');
+                    merchandiserList.value = getBusinesserOrMerchandiser('23');
+                });
+            }
+        });
         function submit(OperateType: 1 | 2) {
             validateAction<FormState>(formRef, formState).then((param) => {
                 const id = getUsrId();
@@ -484,25 +505,21 @@ export default defineComponent({
                 }
                 sendReq(param, loading, OperateType)
                     .then((res) => {
-                        //清空添加成功后的数据，确保在此新增打开是个空数据
-                        Object.assign(formState, initFormData());
                         context.emit('refresh');
-                        cancel();
+                        closeAction();
                     })
                     .catch((err) => {});
             });
         }
+        function closeAction() {
+            //清空添加成功后的数据，确保在此新增打开是个空数据
+            Object.assign(formState, initFormData());
+            cancel();
+        }
 
-        initData(() => {
-            queryCustomList();
-            getDeliveryGoods();
-            goodsList.value = getGoodsList();
-            getRoleList();
-            getBusinesserList();
-        });
         return {
             visible,
-            cancel,
+            closeAction,
             submit,
             formRef,
             loading,

src/views/information/spot-contract/components/check/index.vue

@@ -314,6 +314,12 @@ export default defineComponent({
                     merchandiserList.value = getBusinesserOrMerchandiser('23');
                 });
                 queryTradeManager();
+                const { saleuserid, tradeuserid, meruserid, remark } = props.selectedRow;
+
+                saleuserid && (formState.SaleUserID = saleuserid);
+                tradeuserid && (formState.TradeUserID = tradeuserid);
+                meruserid && (formState.MerUserID = meruserid);
+                formState.Remark = remark;
             }
         });
         return {

src/views/information/spot-contract/components/delete/index.vue

@@ -16,7 +16,8 @@
                 :loading="loading"
                 @click="submit">确认删除</a-button>
     </template>
-    <InfoDetail :selectedRow="selectedRow" />
+    <InfoDetail :selectedRow="selectedRow"
+                :businessManager="businessManager" />
   </a-modal>
 </template>
 
@@ -28,6 +29,7 @@ import { Modal } from 'ant-design-vue';
 import { orderContractControl } from '@/views/information/spot-contract/components/setup';
 import { GldErmcpSpotContractOperateReq } from '@/services/proto/spotcontract/interface';
 import InfoDetail from '../infoDetail/index.vue';
+import { ErmcpLoginUserEx } from '@/services/go/ermcp/account/interface';
 
 export default defineComponent({
     name: 'delete-spot-contract',
@@ -39,11 +41,17 @@ export default defineComponent({
             type: Object as PropType<Ermcp3ContractRsp>,
             default: {},
         },
+        businessManager: {
+            type: Array as PropType<ErmcpLoginUserEx[]>,
+            default: [],
+        },
     },
     setup(props, context) {
         const { visible, cancel } = closeModal('spot_contract_btn_delete');
         const loading = ref<boolean>(false);
         const maskClosableFlag = ref<boolean>(false);
+        console.log('selectedRow', props.selectedRow);
+
         // 获取 业务账户
         function submit() {
             Modal.confirm({

src/views/information/spot-contract/components/detail/index.vue

@@ -21,6 +21,7 @@
       </a-tab-pane>
     </a-tabs>
     <InfoDetail :selectedRow="selectedRow"
+                :businessManager="businessManager"
                 v-if="activeKey == 1" />
     <div class="tableDatas"
          v-else>

src/views/information/spot-contract/components/infoDetail/index.vue

@@ -130,21 +130,21 @@
         </a-col>
         <a-col :span="12">
           <a-form-item label="业务员">
-            <span class="white">{{ formatValue(findManagerName(selectedRow.saleuserlogincode, businessManager) ) }}</span>
+            <span class="white">{{ formatValue(findManagerName(selectedRow.saleuserid, businessManager) ) }}</span>
           </a-form-item>
         </a-col>
       </a-row>
       <a-row :gutter="24">
         <a-col :span="12">
           <a-form-item label="跟单员">
-            <span class="white">{{ formatValue(findManagerName(selectedRow.meruserlogincode, businessManager) ) }}</span>
+            <span class="white">{{ formatValue(findManagerName(selectedRow.meruserid, businessManager) ) }}</span>
           </a-form-item>
         </a-col>
-        <a-col :span="12">
+        <!-- <a-col :span="12">
           <a-form-item label="期货账户">
             <span class="white">{{ formatValue(selectedRow.accountid) }}</span>
           </a-form-item>
-        </a-col>
+        </a-col> -->
       </a-row>
       <a-row :gutter="24">
         <a-col :span="12">
@@ -163,6 +163,7 @@ import { Ermcp3ContractRsp } from '@/services/go/ermcp/spot-contract/interface';
 import { formatTime, formatValue } from '@/common/methods';
 import { getBizTypeName, getContractStatusName, getContractTypeName, getPriceTypeName } from '@/views/information/spot-contract/setup';
 import { handlerManagerList } from '@/common/setup/user';
+import { ErmcpLoginUserEx } from '@/services/go/ermcp/account/interface';
 
 export default defineComponent({
     name: 'spot-contract-info-detail',
@@ -172,6 +173,10 @@ export default defineComponent({
             type: Object as PropType<Ermcp3ContractRsp>,
             default: {},
         },
+        businessManager: {
+            type: Array as PropType<ErmcpLoginUserEx[]>,
+            default: [],
+        },
     },
     setup(props, context) {
         const loading = ref<boolean>(false);

src/views/information/spot-contract/components/modify/index.vue

@@ -393,9 +393,11 @@
         </a-row>
         <a-row :gutter="24">
           <a-col :span="24">
-            <a-form-item label="备注">
+            <a-form-item label="备注"
+                         name="Remark">
               <a-input class="dialogInput"
                        style="width: 608px"
+                       v-model:value="formState.Remark"
                        placeholder="请输入备注" />
             </a-form-item>
           </a-col>
@@ -406,17 +408,14 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, onMounted, PropType, ref, toRaw, watchEffect } from 'vue';
+import { defineComponent, PropType, ref, watchEffect } from 'vue';
 import { closeModal } from '@/common/setup/modal/index';
-import { initData } from '@/common/methods';
 import { getUserName, getUsrId } from '@/services/bus/user';
 import { getGoodsList } from '@/services/bus/goods';
 import { Goods } from '@/services/go/ermcp/goodsInfo/interface';
-import { ValidateErrorEntity } from 'ant-design-vue/lib/form/interface';
 import { FormState } from '../interface';
 import { formatTime } from '@/common/methods/format';
 import { Ermcp3ContractRsp } from '@/services/go/ermcp/spot-contract/interface';
-import { handleAccountManager } from '../setup';
 import { Moment } from 'moment';
 import { handleFormRule, handleContract, handleDeliveryGoods, handleAmout, handlePrice, handleDate, handleFromState } from '../setup';
 import { addContractReq } from '@/views/information/spot-contract/components/add/setup';
@@ -466,8 +465,8 @@ export default defineComponent({
         watchEffect(() => {
             // // formState.ContractAttachment = props.selectedRow.attachment
             // formState.ContractAttachment = new Uint8Array()
-            // formState.SpotGoodsBrandID = +props.selectedRow.spotcontractid
             if (visible.value) {
+                contractChange(formState.ContractType);
                 queryCustomList();
                 getDeliveryGoods();
                 goodsList.value = getGoodsList();
@@ -476,13 +475,19 @@ export default defineComponent({
                     merchandiserList.value = getBusinesserOrMerchandiser('23');
                 });
                 queryTradeManager();
-
                 mergeTwoObj(formState, props.selectedRow);
-                const { deliverygoodsid, qty, price } = props.selectedRow;
-                deliverygoodsid && deliveryGoodsChange(deliverygoodsid);
+                const { deliverygoodsid, qty, price, wrstandardid, spotgoodsbrandid } = props.selectedRow;
+                if (deliverygoodsid) {
+                    deliveryGoodsChange(deliverygoodsid);
+                    if (wrstandardid) {
+                        WrStandardChange(wrstandardid);
+                        formState.WrStandardID = wrstandardid;
+                        formState.SpotGoodsBrandID = spotgoodsbrandid;
+                    }
+                }
                 formState.Qty = qty.toString();
                 formState.Price = price.toString();
-                contractChange(formState.ContractType)
+                formState.CurrencyID = props.selectedRow.currencyid;
             }
         });
         function submit() {

src/views/information/spot-contract/components/setup.ts

@@ -3,8 +3,6 @@ import { getGoodsUnitEnumItemName } from "@/common/constants/enumsName";
 import { commonResultInfo, getRequestResultInfo } from "@/common/methods/request";
 import { validateCommon } from "@/common/setup/validate";
 import APP from '@/services';
-import { QueryAccMgrLoginUser } from "@/services/go/ermcp/account";
-import { ErmcpLoginUser } from "@/services/go/ermcp/account/interface";
 import { QueryCustomInfo } from "@/services/go/ermcp/customInfo";
 import { QueryCustomInfoType } from "@/services/go/ermcp/customInfo/interface";
 import { QueryDeliveryGoods } from "@/services/go/ermcp/goodsInfo";
@@ -20,7 +18,6 @@ import { RuleObject } from "ant-design-vue/lib/form/interface";
 import Long from 'long';
 import moment, { Moment } from "moment";
 import { reactive, ref, Ref, UnwrapRef } from "vue";
-import { Value } from "./check/interface";
 import { FormState } from './interface';
 
 
@@ -66,72 +63,6 @@ export function orderContractOperateControl(reqs: SpotContractOperateReq, loadin
     return commonResultInfo(result, sign, loading)
 }
 
-/**
- * 处理 /账号列表： 交易用户 业务员 跟单员
- * @returns 
- */
-export function handleAccountManager() {
-    // 交易用户
-    const traderList = ref<Value[]>([])
-    function getRoleList() {
-        QueryAccMgrLoginUser(2).then(res => {
-            const set = new Set<number>([])
-            traderList.value.length = 0;
-            res.forEach(e => {
-                const { roleid, rolename, accountstatus } = e;
-                if (accountstatus === 4) {  // 账户的状态 - 4 正常
-                    if (!set.has(roleid)) { // 去重
-                        set.add(roleid)
-                        traderList.value.push({ id: roleid, name: rolename })
-                    }
-                }
-            })
-        }).catch(err => message.error(err))
-    }
-    // 处理 跟单员 /  业务员 列表
-    function handleList(el: ErmcpLoginUser, type: string, set: Set<number>): Value | null {
-        const { loginstatus, userid, accountname, logincode, roletype } = el;
-        let result = null
-        if (loginstatus === 1) {// 登录账户状态 - 1:正常 
-            if (roletype.includes(type)) {  // 过滤角色类型
-                if (!set.has(userid)) { // 去重
-                    set.add(userid)
-                    result = { id: userid, name: `${accountname}-${logincode}` }
-                }
-            }
-        }
-        return result
-    }
-    // 业务员
-    const businesserList = ref<Value[]>([])
-    // 跟单员
-    const merchandiserList = ref<Value[]>([])
-    function getBusinesserList() {
-        QueryAccMgrLoginUser(1).then(res => {
-            const bSet = new Set<number>([]);
-            const mSet = new Set<number>([]);
-            const list: ErmcpLoginUser[] = []
-            res.forEach(e => {
-                // eslint-disable-next-line prefer-spread
-                list.push.apply(list, e.userlist)
-            })
-            list.forEach(el => {
-                // 业务员
-                const b = handleList(el, '22', bSet)
-                if (b) {
-                    businesserList.value.push(b)
-                }
-                // 跟单员
-                const m = handleList(el, '23', mSet)
-                if (m) {
-                    merchandiserList.value.push(m)
-                }
-            })
-        }).catch(err => message.error(err))
-    }
-    return { traderList, businesserList, merchandiserList, getRoleList, getBusinesserList }
-}
-
 
 /**
  * 新增和修改的表单数据

src/views/information/spot-contract/list/checkpending/index.vue

@@ -50,12 +50,12 @@
         </template>
         <!-- 业务员 -->
         <template #saleuserlogincode="{ record }">
-          <a>{{ findManagerName(record.saleuserlogincode) }}</a>
+          <a>{{ findManagerName(record.saleuserid) }}</a>
         </template>
 
         <!-- 跟单员 -->
         <template #meruserlogincode="{ record }">
-          <a>{{ findManagerName(record.meruserlogincode) }}</a>
+          <a>{{ findManagerName(record.meruserid) }}</a>
         </template>
 
       </a-table>

src/views/information/spot-contract/list/finished/index.vue

@@ -50,12 +50,12 @@
 
         <!-- 业务员 -->
         <template #saleuserlogincode="{ record }">
-          <a>{{ findManagerName(record.saleuserlogincode) }}</a>
+          <a>{{ findManagerName(record.saleuserid) }}</a>
         </template>
 
         <!-- 跟单员 -->
         <template #meruserlogincode="{ record }">
-          <a>{{ findManagerName(record.meruserlogincode) }}</a>
+          <a>{{ findManagerName(record.meruserid) }}</a>
         </template>
 
       </a-table>

src/views/information/spot-contract/list/performance/index.vue

@@ -50,12 +50,12 @@
         </template>
         <!-- 业务员 -->
         <template #saleuserlogincode="{ record }">
-          <a>{{ findManagerName(record.saleuserlogincode) }}</a>
+          <a>{{ findManagerName(record.saleuserid) }}</a>
         </template>
 
         <!-- 跟单员 -->
         <template #meruserlogincode="{ record }">
-          <a>{{ findManagerName(record.meruserlogincode) }}</a>
+          <a>{{ findManagerName(record.meruserid) }}</a>
         </template>
       </a-table>
     </contextMenu>

src/views/information/spot-contract/list/unsubmitted/index.vue

@@ -50,12 +50,12 @@
         </template>
         <!-- 业务员 -->
         <template #saleuserlogincode="{ record }">
-          <a>{{ findManagerName(record.saleuserlogincode) }}</a>
+          <a>{{ findManagerName(record.saleuserid) }}</a>
         </template>
 
         <!-- 跟单员 -->
         <template #meruserlogincode="{ record }">
-          <a>{{ findManagerName(record.meruserlogincode) }}</a>
+          <a>{{ findManagerName(record.meruserid) }}</a>
         </template>
       </a-table>
     </contextMenu>

src/views/manage/business-review/components/settlementDetail/index.vue

@@ -72,12 +72,12 @@
         <a-row :gutter="24">
           <a-col :span="12">
             <a-form-item label="登记时间">
-              <span class="white">{{ formatValue(selectedRow.applytime) }}</span>
+              <span class="white">{{ formatValue(selectedRow.audittime) }}</span>
             </a-form-item>
           </a-col>
           <a-col :span="12">
             <a-form-item label="登记人">
-              <span class="white">{{ formatValue(selectedRow.applyname) }}</span>
+              <span class="white">{{ formatValue(selectedRow.auditname) }}</span>
             </a-form-item>
           </a-col>
         </a-row>

src/views/manage/business-review/components/somepriceDetail/index.vue

@@ -79,7 +79,7 @@
                     </a-col>
                     <a-col :span="12">
                         <a-form-item label="登记时间">
-                            <span class="white">{{ formatValue(selectedRow.applytime) }}</span>
+                            <span class="white">{{ formatValue(selectedRow.audittime) }}</span>
                         </a-form-item>
                     </a-col>
                 </a-row>

src/views/manage/business-review/list/someprice/index.vue

@@ -87,7 +87,7 @@ export default defineComponent({
             registerColumn('table_pcweb_business_aduit_dj', ['contracttype', 'contractno', 'deliverygoodsname'], (e: Column, item: ColumnType, filtered: any) => {
                 if (e.columnfield === 'buyusernameOrsellusername') {
                     item.onFilter = (value: string, record: QryBusinessDjRsp) => {
-                        const { contracttype, buyusername, sellusername, applystatus } = record;
+                        const { contracttype, buyusername, sellusername } = record;
                         if (contracttype === 1) {
                             // 采购
                             return sellusername.includes(value);

src/views/manage/inventory-review/list/checkin/index.vue

@@ -84,7 +84,7 @@ export default defineComponent({
             // 获取列表数据
             queryTable();
             // 注册表头信息 过滤
-            registerColumn('table_pcweb_stock_aduit', ['contracttype', 'contractno', 'deliverygoodsname'], (e: Column, item: ColumnType, filtered: any) => {
+            registerColumn('table_pcweb_stock_aduit_in', ['contracttype', 'contractno', 'deliverygoodsname'], (e: Column, item: ColumnType, filtered: any) => {
                 if (e.columnfield === 'buyusernameOrsellusername') {
                     item.onFilter = (value: string, record: Ermcp3AreaStockApply) => {
                         const { contracttype, buyusername, sellusername } = record;