commit提货提交

src/common/constants/enumsName.ts

@@ -206,3 +206,55 @@ export function getApplyStatusName(type: number): string {
     }
     return result
 }
+
+/**
+ * 千海金-提货申请-状态
+ * @param type 1:备货中 2:待取货(自提) 3:已取货(自提) 4:待收货(邮寄) 5:已收货(邮寄) 6:自动收货(邮寄) 7:已拒绝 8:已撤销
+ */
+export function getPickUpStateName(type: number): string {
+    let result = "--";
+    switch (type) {
+        case 1:
+            result = "备货中";
+            break
+        case 2:
+            result = "待取货(自提)";
+            break
+        case 3:
+            result = "已取货(自提)";
+            break
+        case 4:
+            result = "待收货(邮寄)";
+            break
+        case 5:
+            result = "已收货(邮寄)";
+            break
+        case 6:
+            result = "自动收货(邮寄)";
+            break
+        case 7:
+            result = "已拒绝";
+            break
+        case 8:
+            result = "已撤销";
+            break
+    }
+    return result
+}
+
+/**
+ * 千海金-收货方式
+ * @param type  2:自提 3:配送(邮寄)
+ */
+export function getTakeStateName(type: number): string {
+    let result = "--";
+    switch (type) {
+        case 2:
+            result = "自提";
+            break
+        case 3:
+            result = "配送(邮寄)";
+            break
+    }
+    return result
+}

src/views/platinum/platinum_customer_info/list/checkpending/index.vue

@@ -41,6 +41,7 @@ import { queryTableList, QueryCustomInfoType } from '../index';
 import { getStatusName } from '@/common/constants/enumsName';
 import { getCardTypeEnumItemName } from '@/common/constants/enumsName';
 import Middle from '@/views/platinum/platinum_customer_info/compoments/controlModal/index.vue';
+import {getUserId} from "@/services/bus/account";
 
 export default defineComponent({
     name: 'custom_info_checkpending',
@@ -61,7 +62,7 @@ export default defineComponent({
         const { loading, tableList, queryTable } = queryTableList();
         initData(() => {
             // 获取列表数据
-            queryTable(2);
+            queryTable(2, getUserId());
             // 注册表头信息 过滤
             registerColumn('table_pcweb_qhj_customer_info', ['userinfotype', 'nickname', 'contactname', 'mobile']);
         });

src/views/platinum/platinum_customer_info/list/normal-use/index.vue

@@ -51,6 +51,7 @@ import { getStatusName } from '@/common/constants/enumsName';
 import { getCardTypeEnumItemName } from '@/common/constants/enumsName';
 import Middle from '@/views/platinum/platinum_customer_info/compoments/controlModal/index.vue';
 import { QhjCustomer } from '@/services/go/ermcp/qhj/interface';
+    import {getUserId} from "@/services/bus/account";
 export default defineComponent({
     name: 'custom-normal',
     components: {
@@ -72,7 +73,7 @@ export default defineComponent({
         const { loading, tableList, queryTable } = queryTableList();
         initData(() => {
             // 获取列表数据
-            queryTable(3);
+            queryTable(3, getUserId())
             // 注册表头信息 过滤
             registerColumn('table_pcweb_qhj_customer_info', ['userinfotype', 'nickname', 'contactname', 'mobile']);
         });

src/views/platinum/platinum_customer_info/list/setup.ts

@@ -14,8 +14,8 @@ export function queryTableList() {
     const loading = ref<boolean>(false);
     // 表格数据
     const tableList = ref<QhjCustomer[]>([]);
-    function queryTable(querytype: 1 | 2 | 3 | 4) {
-        const param = { querytype }
+    function queryTable(querytype: 1 | 2 | 3 | 4, userid: number) {
+        const param = { querytype, userid }
         queryResultLoadingAndInfo(queryCustomerInfo, loading, param).then(res => {
             tableList.value = res
         })

src/views/platinum/platinum_customer_info/list/stop-use/index.vue

@@ -52,6 +52,7 @@ import { getStatusName } from '@/common/constants/enumsName';
 import { getCardTypeEnumItemName } from '@/common/constants/enumsName';
 import Middle from '@/views/platinum/platinum_customer_info/compoments/controlModal/index.vue';
 import { QhjCustomer } from '@/services/go/ermcp/qhj/interface';
+    import {getUserId} from "@/services/bus/account";
 
 export default defineComponent({
     name: 'custom-normal',
@@ -74,7 +75,7 @@ export default defineComponent({
         const { loading, tableList, queryTable } = queryTableList();
         initData(() => {
             // 获取列表数据
-            queryTable(4);
+            queryTable(4, getUserId())
             // 注册表头信息 过滤
             registerColumn('table_pcweb_qhj_customer_info', ['userinfotype', 'nickname', 'contactname', 'mobile']);
         });

src/views/platinum/platinum_customer_info/list/unsubmit/index.vue

@@ -45,6 +45,7 @@ import { getStatusName } from '@/common/constants/enumsName';
 import { getCardTypeEnumItemName } from '@/common/constants/enumsName';
 import Middle from '@/views/platinum/platinum_customer_info/compoments/controlModal/index.vue';
 import { QhjCustomer } from '@/services/go/ermcp/qhj/interface';
+import {getUserId} from "@/services/bus/account";
 
 export default defineComponent({
     name: 'custom_info_unsubmit',
@@ -65,7 +66,7 @@ export default defineComponent({
         const { loading, tableList, queryTable } = queryTableList();
         initData(() => {
             // 获取列表数据
-            queryTable(2);
+            queryTable(2, getUserId())
             // 注册表头信息 过滤
             registerColumn('table_pcweb_qhj_customer_info', ['userinfotype', 'nickname', 'contactname', 'mobile']);
         });

src/views/platinum/platinum_pick_query/list/tab/compoments/complete_stocking/index.vue

@@ -58,7 +58,7 @@ export default defineComponent({
                 CheckRemark: "", // string 审核备注
                 ClientTicket: getUserId().toString(), // string 客户端流水号
             }
-
+            debugger
             requestResultLoadingAndInfo(goodsPickupConfirm, reqParams, loading, ['完成备货成功', '完成备货失败:']).then(() => {
                 cancel();
                 context.emit('refresh');

src/views/platinum/platinum_pick_query/list/tab/compoments/confirm_pickup/index.vue

@@ -21,13 +21,14 @@ import { defineComponent, PropType, ref } from 'vue';
 import { closeModal } from '@/common/setup/modal/index';
 import { QueryCustomInfoType } from '@/services/go/ermcp/customInfo/interface';
 import CommomDetail from '../common-detail/index.vue';
+import {QhjTradeGoodsPickup} from "@/services/go/ermcp/qhj/interface";
 
 export default defineComponent({
     name: 'platinum_pick_query_confirm_pickup',
     components: { CommomDetail },
     props: {
         selectedRow: {
-            type: Object as PropType<QueryCustomInfoType>,
+            type: Object as PropType<QhjTradeGoodsPickup>,
             default: {},
         },
     },

src/views/platinum/platinum_pick_query/list/tab/compoments/controlModal/index.vue

@@ -21,13 +21,14 @@ import CompleteStocking from '../complete_stocking/index.vue';
 import ConfirmPickup from '../confirm_pickup/index.vue';
 import Receipt from '../query_receipt/index.vue';
 import UploadLogistics from '../upload_logistics/index.vue';
+import {QhjTradeGoodsPickup} from "@/services/go/ermcp/qhj/interface";
 
 export default defineComponent({
     name: 'custom-control-modal',
     components: { Detail, CompleteStocking, ConfirmPickup, Receipt, UploadLogistics },
     props: {
         selectedRow: {
-            type: Object as PropType<QueryCustomInfoType>,
+            type: Object as PropType<QhjTradeGoodsPickup>,
             default: {},
         },
     },

src/views/platinum/platinum_pick_query/list/tab/compoments/detail/index.vue

@@ -21,13 +21,14 @@ import { defineComponent, PropType, ref } from 'vue';
 import { closeModal } from '@/common/setup/modal/index';
 import { QueryCustomInfoType } from '@/services/go/ermcp/customInfo/interface';
 import CommomDetail from '../common-detail/index.vue';
+import {QhjTradeGoodsPickup} from "@/services/go/ermcp/qhj/interface";
 
 export default defineComponent({
     name: 'platinum_withdrawal_review_detail-desc',
     components: { CommomDetail },
     props: {
         selectedRow: {
-            type: Object as PropType<QueryCustomInfoType>,
+            type: Object as PropType<QhjTradeGoodsPickup>,
             default: {},
         },
     },

src/views/platinum/platinum_pick_query/list/tab/index.vue

@@ -15,6 +15,14 @@
           <BtnList :btnList="firstBtn"
                    @onClick="btnClick" />
         </template>
+        <!-- 提货状态 -->
+          <template #takeorderstatus="{ record }">
+              <a>{{ getPickUpStateName(record.takeorderstatus) }}</a>
+          </template>
+          <!-- 提货/ 收货人-->
+          <template #takemode="{ record }">
+              <a>{{ getTakeStateName(record.takemode)}}</a>
+          </template>
       </a-table>
     </contextMenu>
     <ControlModal :selectedRow="selectedRow" />
@@ -27,6 +35,7 @@ import Filter from '../../compoments/filter/index.vue';
 import { queryTableList } from './setup';
 import ControlModal from './compoments/controlModal/index.vue';
 import { QhjTradeGoodsPickup } from '@/services/go/ermcp/qhj/interface';
+import {getPickUpStateName, getTakeStateName} from "@/common/constants/enumsName";
 
 export default defineComponent({
     name: 'platinum_pick_query_tab',
@@ -58,6 +67,8 @@ export default defineComponent({
             tableList,
             queryTable,
             btnClick,
+            getPickUpStateName,
+            getTakeStateName,
         };
     },
 });