Merge remote-tracking branch 'origin/master'

src/assets/styles/mixin.less

@@ -188,7 +188,7 @@
     .ant-select-item {
         color:@m-grey1;
     }
-     
+
     .ant-select-item-option-active,.ant-select-item-option-selected,.ant-select-item-option-hover {
         background: @m-blue0;
         color: @m-white1;
@@ -228,7 +228,7 @@
                     color: @m-white1;
                 }
             }
-            tr.ant-table-expanded-row:hover { //tr.ant-table-expanded-row, 
+            tr.ant-table-expanded-row:hover { //tr.ant-table-expanded-row,
                 td {
                     background-color: @m-blue3;
                 }
@@ -297,7 +297,7 @@
                     overflow: hidden;
                 }
             }
-            tr.ant-table-expanded-row:hover { //tr.ant-table-expanded-row, 
+            tr.ant-table-expanded-row:hover { //tr.ant-table-expanded-row,
                 td {
                     background-color: @m-blue3;
                 }
@@ -365,7 +365,7 @@
                     overflow: hidden;
                 }
             }
-            tr.ant-table-expanded-row:hover { //tr.ant-table-expanded-row, 
+            tr.ant-table-expanded-row:hover { //tr.ant-table-expanded-row,
                 td {
                     background-color: @m-blue3;
                 }
@@ -659,8 +659,8 @@
         .ant-select-selection-placeholder {
             color: @m-grey10;
         }
-        
-    } 
+
+    }
     .ant-select-arrow {
         right: 8px;
         color: #3A87F7 !important;
@@ -690,8 +690,8 @@
         .ant-select-selection-placeholder {
             color: @m-grey10;
         }
-        
-    } 
+
+    }
     .ant-select-arrow {
         right: 8px;
         color: @m-blue0;
@@ -848,6 +848,9 @@
 .mr10 {
     margin-right: 10px;
 }
+.red {
+    color: @m-red0;
+}
 .grey {
     color: @m-grey2;
 }
@@ -1081,8 +1084,8 @@
         line-height: 30px;
         border: 0;
         color: @m-white1;
-        
-        
+
+
     }
     .ant-calendar-picker-icon {
         color: @m-grey1;
@@ -1148,7 +1151,7 @@
                             color: @m-grey1;
                         }
                     }
-                    
+
                     .ant-calendar-body {
                         border-top-color: @m-grey1;
                         .ant-calendar-column-header-inner {
@@ -1168,7 +1171,7 @@
                         .ant-calendar-last-day-of-month,.ant-calendar-next-month-btn-day {
                             .ant-calendar-date {
                                 color: @m-white1;
-                                
+
                             }
                         }
                         .ant-calendar-disabled-cell {
@@ -1194,7 +1197,7 @@
                     color: @m-white1;
                 }
             }
-            
+
         }
         .ant-calendar-footer {
             border-top-color: @m-grey1;

src/common/setup/user/index.ts

@@ -6,10 +6,10 @@ import { Ref, ref } from "vue";
 /**
  * 获取(业务账户, 交易账户, 管理账户)
  * 因没有数据更新推送，为了防止新增的时候，导致数据不能及时更新，故每次进入页面都请求一次数据
- * @param loading 
+ * @param loading
  * @param type 查询类型 1-业务账户 2-交易账户 3-管理账户
  * @param isFilter 是否过滤.false，不过滤，true: 过滤正常账号数据，
- * @returns 
+ * @returns
  */
 export function handlerManagerList(loading: Ref<boolean>, type: 1 | 2 | 3, isFilter = false) {
     const tableList = ref<ErmcpLoginUserEx[]>([]);
@@ -23,16 +23,16 @@ export function handlerManagerList(loading: Ref<boolean>, type: 1 | 2 | 3, isFil
     }
     /**
      * 根据code 查找业务员、跟单员对应的名字
-     * @param code 
-     * @returns 
+     * @param code
+     * @returns
      */
     function findManagerName(id: number, arr?: ErmcpLoginUserEx[]) {
         let result = '--'
         const temp = arr ? arr : tableList.value
         temp.forEach(el => {
             el.userlist.forEach(e => {
-                const { accountname, logincode, loginid } = e
-                if (loginid === id) {
+                const { accountname, logincode, userid } = e
+                if (userid === id) {
                     result = `${accountname}-${logincode}`
                 }
             })
@@ -42,7 +42,7 @@ export function handlerManagerList(loading: Ref<boolean>, type: 1 | 2 | 3, isFil
     /**
      * 获取业务员、跟单员
      * @param roletype '22':业务员 '23':跟单员
-     * @returns 
+     * @returns
      */
     function getBusinesserOrMerchandiser(roletype: '22' | '23', isFilter = false): ErmcpLoginUser[] {
         const result: ErmcpLoginUser[] = []

src/layout/components/menu.vue

@@ -5,7 +5,7 @@
           v-model:selectedKeys="selectedKeys"
           v-model:openKeys="openKeys"
           @click="menuClick">
-    <a-sub-menu v-for="item in menuList"
+    <a-sub-menu v-for="item in filterMenu()"
                 :key="item.code">
       <template #title>
         <span>
@@ -89,9 +89,10 @@ export default defineComponent({
                 openKeys.value = preOpenKeys.value;
             }
         });
+        const filterMenu = () => menuList.value.filter((e: OperationTabMenu) => e.type === 1);
         initData(() => {
             // 处理路由跳转到菜单栏里第一个对应的页面
-            const list = unref(menuList);
+            const list = filterMenu();
             if (list.length && list[0].children && list[0].children.length) {
                 // 处理修改具体某个菜单栏，主要处理页面刷新
                 let firstIndex = 0,
@@ -113,7 +114,7 @@ export default defineComponent({
                 context.emit('chooseMenu', temp);
             }
         });
-        return { selectedKeys, openKeys, menuList, menuClick, fontIcon };
+        return { selectedKeys, openKeys, filterMenu, menuClick, fontIcon };
     },
 });
 </script>

src/services/go/ermcp/qhj/index.ts

@@ -1,7 +1,7 @@
 /** ================================= 前海金相关接口 ================================**/
-import {getSelectedAccountId} from "@/services/bus/account";
-import {getUsrId} from "@/services/bus/user";
-import {commonSearch_go} from "@/services/go";
+import { getSelectedAccountId } from "@/services/bus/account";
+import { getUsrId } from "@/services/bus/user";
+import { commonSearch_go } from "@/services/go";
 import {
     Ermcp3SpotGoodsPrice, Ermcp3SpotGoodsPriceLog,
     QhjAccountOutInApply, QhjAgreementChangeLog, QhjAgreementConfig,
@@ -41,7 +41,7 @@ import {
  */
 export function queryTradeGoodsPickup(): Promise<QhjTradeGoodsPickup[]> {
     const userid = getUsrId()
-    return commonSearch_go('/Qhj/QueryTradeGoodsPickup', {userid}).catch((err) => {
+    return commonSearch_go('/Qhj/QueryTradeGoodsPickup', { userid }).catch((err) => {
         throw new Error(`查询提货: ${err}`);
     });
 }
@@ -67,7 +67,7 @@ export function queryRSTriggerLog(status?: 1 | 2 | 3): Promise<QhjRSTriggerLog[]
     // fixme 不传userid
     // const userid = getUsrId();
     // const param = status ? { userid, status } : { userid }
-    const param = status ? {status} : {}
+    const param = status ? { status } : {}
     return commonSearch_go('/Qhj/QueryRSTriggerLog', param).catch((err) => {
         throw new Error(`查询定投记录: ${err}`);
     });
@@ -81,7 +81,7 @@ export function queryRSTriggerLog(status?: 1 | 2 | 3): Promise<QhjRSTriggerLog[]
 export function queryRStrategy(status?: 1 | 2 | 3): Promise<QhjRStrategy[]> {
     // fixme 不传userid
     // const userid = getUsrId();
-    const param = status ? {status} : {}
+    const param = status ? { status } : {}
     return commonSearch_go('/Qhj/QueryRStrategy', param).catch((err) => {
         throw new Error(`查询定投设置: ${err}`);
     });
@@ -107,7 +107,7 @@ export function queryContractLog(param: QueryContractLogReq): Promise<QueryContr
  */
 export function queryParentAreaList(): Promise<QhjParentAreaList[]> {
     const userid = getUsrId()
-    return commonSearch_go('/Qhj/QueryParentAreaList', {userid}).catch((err) => {
+    return commonSearch_go('/Qhj/QueryParentAreaList', { userid }).catch((err) => {
         throw new Error(`查询所属机构列表: ${err}`);
     });
 }
@@ -188,7 +188,7 @@ export function queryCustomerInfo(req: QueryContractLogReq): Promise<QhjCustomer
  * @param req 状态(可多选,逗号隔开) - 1:正常 2:停用 3:注销
  */
 export function queryPickGoods(status?: string): Promise<QhjPickGoods[]> {
-    const param = status ? {status} : {}
+    const param = status ? { status } : {}
     return commonSearch_go('/QhjMgr/QueryPickGoods', param).catch((err) => {
         throw new Error(`查询提货商品: ${err}`);
     });

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

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

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

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

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

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

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

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

src/views/platinum/platinum_document_query/list/waiting/index.vue

@@ -20,6 +20,9 @@
         <template #userinfotype="{ record }">
           <a>{{ record.userinfotype === 1 ? "个人" : "企业" }}</a>
         </template>
+        <template #paylimitedtime="{ record }">
+          <a>{{ isOverTime(record.paylimitedtime) }}</a>
+        </template>
       </a-table>
     </contextMenu>
     <!-- <ControlModal :selectedRow="selectedRow" /> -->
@@ -32,6 +35,7 @@ import { getUserId } from '@/services/bus/account';
 import { queryTradePayOrder } from '@/services/go/ermcp/qhj';
 import { QhjPayOrder, QueryTradePayOrderReq } from '@/services/go/ermcp/qhj/interface';
 import Filter from './compoments/filter/index.vue';
+import moment from 'moment';
 // import ControlModal from './compoments/controlModal/index.vue';
 
 export default defineComponent({
@@ -61,6 +65,7 @@ export default defineComponent({
             };
             queryTable(queryTradePayOrder, param);
         }
+        const isOverTime = (value: string) => (moment().isAfter(moment(value)) ? '付款超时' : value);
         initData(() => {
             // 获取列表数据
             queryTable(queryTradePayOrder, { userid: getUserId(), payflag: '1,3,5' });
@@ -70,6 +75,7 @@ export default defineComponent({
 
         return {
             search,
+            isOverTime,
             columns,
             expandedRowKeys,
             selectedRow,

src/views/platinum/platinum_pick_query/compoments/filter/index.vue

@@ -56,6 +56,8 @@ export default defineComponent({
         const { selectList, inputList, fixedBtnList } = handleFilter(select, input, context, getFilterRangeTime(date));
         initData(() => {
             queryPickGoods('1').then((res) => {
+                console.log('范围时间内过滤', res);
+
                 select.value[0].list = res.map((e) => {
                     return { value: e.pickupgoodsid, lable: e.pickupgoodsname };
                 });