Merge remote-tracking branch 'origin/master_hella' into master_hella

src/api/wms/countJobMain/index.ts

@@ -89,5 +89,13 @@ export const importTemplate = () => {
 
 // 关闭盘点任务主
 export const closeCountJobMain = (id: number) => {
-  return request.download({ url: '/wms/count-job-main/close?id=' + id })
+  return request.put({ url: '/wms/count-job-main/close?id=' + id })
 }
+
+// 关闭盘点任务主
+export const handleExportCountJob = async (id: number) => {
+  let params = {
+    masterId:id
+  }
+  return await request.download({ url: `/wms/count-job-main/export-excel-single`, params })
+}

src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts

@@ -16,7 +16,7 @@ import { t } from '@/hooks/web/useI18n'
 
 export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '物品代码',
+    label: '物料代码',
     field: 'itemCode',
     sort: 'custom',
     isSearch: true,
@@ -752,4 +752,4 @@ export const ItemareaDetail = useCrudSchemas(reactive<CrudSchema[]>([
 // 表单校验
 export const ItemareaDetailRules = reactive({
 
-})
+})

src/views/wms/basicDataManage/itemManage/itemwarehouse/itemwarehouse.data.ts

@@ -9,7 +9,7 @@ import { Itempackaging } from '../itempackage/itempackage.data'
 
 export const Itemwarehouse = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '物品代码',
+    label: '物料代码',
     field: 'itemCode',
     sort: 'custom',
     isSearch: true,

src/views/wms/countManage/count/countJobMain/countJobMain.data.ts

@@ -501,7 +501,7 @@ export const CountJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     isDetail: false,
     isForm: false,
     table: {
-      width: 120,
+      width: 180,
       fixed: 'right'
     },
   }

src/views/wms/countManage/count/countJobMain/index.vue

@@ -186,7 +186,25 @@ const butttondata = (row,$index) => {
   }
   return [
     // defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
-    defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:count-job-main:close'}), // 关闭
+    defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1','2']),hasPermi:'wms:count-job-main:close'}), // 关闭
+    {
+      label: '导出',
+      name: 'exportCountJob',
+      hide: isShowMainButton(row,['1','2']),
+      type: 'success',
+      color: '',
+      link: true, //文本展现按钮
+      hasPermi: '' // wms:count-job-main:exportCountJob
+    },
+    {
+      label: '导入',
+      name: 'importCountJob',
+      hide: isShowMainButton(row,['1','2']),
+      type: 'success',
+      color: '',
+      link: true, //文本展现按钮
+      hasPermi: '' // wms:count-job-main:importCountJob
+    }
     // defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
     // defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
   ]
@@ -202,6 +220,8 @@ const buttonTableClick = async (val, row) => {
     handleClose(row.masterId)
   } else if (val == 'mainJobAcc') { // 承接
     console.log('列表-操作按钮事件-承接')
+  } else if (val == 'exportCountJob'){// 当前任务导出
+    handleExportCountJob(row.masterId,row.number)
   }
 }
 
@@ -240,6 +260,19 @@ const handleExport = async () => {
   }
 }
 
+/** 单条任务导出 */
+const handleExportCountJob = async (id: number,number: string) => {
+  try {
+    await message.exportConfirm()
+    exportLoading.value = true
+    const data = await CountJobMainApi.handleExportCountJob(id)
+    download.excel(data, '盘点任务主'+number+'.xlsx')
+  } catch {
+  }finally {
+    exportLoading.value = false
+  }
+}
+
 // 筛选提交
 const searchFormClick = (searchData) => {
   tableObject.params = {

src/views/wms/deliversettlementManage/saleShipmentMainRecord/saleShipmentMainRecord.data.ts

@@ -201,7 +201,7 @@ export const SaleShipmentDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
     isTable:false
   },
   {
-    label: '物品代码',
+    label: '物料代码',
     field: 'itemCode',
     sort: 'custom',
     table: {

src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/packageoverJobMain.data.ts

@@ -545,7 +545,7 @@ export const PackageoverJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物品代码',
+    label: '物料代码',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -818,4 +818,4 @@ export const PackageoverJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
 // 表单校验
 export const PackageoverJobDetailRules = reactive({
 
-})
+})

src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/packageoverRetrospect.data.ts

@@ -56,7 +56,7 @@ export const PackageoverRetrospect = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物品代码',
+    label: '物料代码',
     field: 'itemCode',
     sort: 'custom',
     isSearch: true,

src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts

@@ -1028,7 +1028,7 @@ export const ProductreceiptDetailb = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true,
   },
   {
-    label: '物品代码',
+    label: '物料代码',
     field: 'itemCode',
     sort: 'custom',
     isSearch: true,