Merge branch 'master' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui

src/api/wms/purchasereceiptRecordMain/index.ts

@@ -66,7 +66,12 @@ export const deletePurchasereceiptRecordMain = async (id: number) => {
 
 // 导出采购收货记录主 Excel
 export const exportPurchasereceiptRecordMain = async (params) => {
-  return await request.download({ url: `/wms/purchasereceipt-record-main/export-excel`, params })
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/purchasereceipt-record-main/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/purchasereceipt-record-main/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板

src/components/TableForm/src/TableForm.vue

@@ -112,7 +112,7 @@
               :allow-create="headerItem?.tableForm.allowCreate"
               style="width: 100%" 
               :placeholder="headerItem?.tableForm?.placeholder || '请选择' + headerItem.label"
-              @change="formSelectChange(row[headerItem.field], $event)">
+              @change="formSelectChange(headerItem.field, $event)">
               <el-option 
                 v-for="op in initSelectOptions(headerItem)" 
                 :label="op.label" 

src/utils/dict.ts

@@ -222,6 +222,7 @@ export enum DICT_TYPE {
   REQEUST_MODE = 'reqeust_mode', // 申请模式
   TIME_UNIT = 'time_unit', // 时间单位
   COUNT_TYPE = 'count_type', // 盘点类型
+  COUNT_SCOPE_TYPE = 'count_scope_type', // 盘点范围类型
   BARCODE_PREFIX = 'barcode_prefix', // 条码前缀
   SETTLEMENT_TYPE = 'settlement_type', // 结算类型
   FROZEN_REASON = 'frozen_reason', // 冻结原因

src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts

@@ -260,59 +260,59 @@ export const DeliverPlanMainRules = reactive({
  * @returns {Array} 发货计划子表
  */
 export const DeliverPlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
-  {
+  // {
-    label: '销售订单号',
+  //   label: '销售订单号',
-    field: 'soNumber',
+  //   field: 'soNumber',
-    sort: 'custom',
+  //   sort: 'custom',
-    table: {
+  //   table: {
-      width: 150
+  //     width: 150
-    },
+  //   },
-    tableForm:{
+  //   tableForm:{
-      isInpuFocusShow: true, // 开启查询弹窗
+  //     isInpuFocusShow: true, // 开启查询弹窗
-      searchListPlaceholder: '请选择销售订单号',
+  //     searchListPlaceholder: '请选择销售订单号',
-      searchField: 'number',
+  //     searchField: 'number',
-      searchTitle: '销售订单信息',
+  //     searchTitle: '销售订单信息',
-      searchAllSchemas: SaleDetail.allSchemas,
+  //     searchAllSchemas: SaleDetail.allSchemas,
-      searchPage: SaleDetailApi.getSaleDetailPage,
+  //     searchPage: SaleDetailApi.getSaleDetailPage,
-      searchCondition: [{
+  //     searchCondition: [{
-        key: 'available',
+  //       key: 'available',
-        value: 'TRUE',
+  //       value: 'TRUE',
-        isMainValue: false
+  //       isMainValue: false
-      }]
+  //     }]
-    },
+  //   },
-    form: {
+  //   form: {
-      // labelMessage: '信息提示说明！！！',
+  //     // labelMessage: '信息提示说明！！！',
-      componentProps: {
+  //     componentProps: {
-        isSearchList: true,
+  //       isSearchList: true,
-        searchListPlaceholder: '请选择销售订单号',
+  //       searchListPlaceholder: '请选择销售订单号',
-        searchField: 'number',
+  //       searchField: 'number',
-        searchTitle: '销售订单信息',
+  //       searchTitle: '销售订单信息',
-        searchAllSchemas: SaleDetail.allSchemas,
+  //       searchAllSchemas: SaleDetail.allSchemas,
-        searchPage: SaleDetailApi.getSaleDetailPage,
+  //       searchPage: SaleDetailApi.getSaleDetailPage,
-        searchCondition: [{
+  //       searchCondition: [{
-          key: 'available',
+  //         key: 'available',
-          value: 'TRUE',
+  //         value: 'TRUE',
-          isMainValue: false
+  //         isMainValue: false
-        }]
+  //       }]
-      }
+  //     }
-    }
+  //   }
-  },
+  // },
-  {
+  // {
-    label: '销售订单行',
+  //   label: '销售订单行',
-    field: 'soLine',
+  //   field: 'soLine',
-    sort: 'custom',
+  //   sort: 'custom',
-    table: {
+  //   table: {
-      width: 150
+  //     width: 150
-    },
+  //   },
-    tableForm: {
+  //   tableForm: {
-      disabled: true
+  //     disabled: true
-    },
+  //   },
-    form: {
+  //   form: {
-      componentProps: {
+  //     componentProps: {
-        disabled: true
+  //       disabled: true
-      }
+  //     }
-    }
+  //   }
-  },
+  // },
   {
     label: '客户月台',
     field: 'customerDockCode',

src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts

@@ -219,7 +219,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '承接人',
-    field: 'acceptUserId',
+    field: 'acceptUserName',
     sort: 'custom',
     table: {
       width: 150
@@ -247,7 +247,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '完成人',
-    field: 'completeUserId',
+    field: 'completeUserName',
     sort: 'custom',
     table: {
       width: 150

src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue

@@ -138,7 +138,7 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
-    const data = await PurchasereceiptRecordMainApi.exportPurchasereceiptRecordMain(setSearchParams)
+    const data = await PurchasereceiptRecordMainApi.exportPurchasereceiptRecordMain(tableObject.params)
     download.excel(data, '采购收货记录主.xlsx')
   } catch {
   } finally {

src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue

@@ -103,13 +103,14 @@
       setV[formField] = val[0][searchField]
       setV['poNumber'] = val[0]['number']
       setV['poLine'] = val[0]['lineNumber']
+      formRef.setValues(setV)
       await PurchaseDetailApi.getPurchaseDetailPage({
         number: setV['poNumber'],
         lineNumber: setV['poLine'],
       }).then(res => {
         if (res.list.length == 1) {
+         // 叶佳兴
           setV['itemCode'] = res.list[0].itemCode
-          formRef.setValues(setV)
         }
       })
     })

src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts

@@ -304,7 +304,7 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
       searchPage: PurchaseDetailApi.getPurchaseDetailPage,
       searchCondition: [{
         key: 'number',
-        value: 'poNumber',
+        value: 'number',
         isMainValue: true
       },
       {
@@ -324,7 +324,7 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
         searchPage: PurchaseDetailApi.getPurchaseDetailPage,
         searchCondition: [{
           key: 'number',
-          value: 'number',
+          value: 'poNumber',
           isMainValue: true
         },
         {

src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts

@@ -57,7 +57,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       width: 150
     },
     isSearch: true,
-    isForm: false
+    isForm: true
   },
   {
     label: '供应商代码',
@@ -1011,4 +1011,4 @@ export const SupplierdeliverRequestDetailRules = reactive({
   itemCode: [
     { required: true, message: '请选择物品代码', trigger: 'change' }
   ],
-})
+})