Browse Source

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

linshi20240813
parent
commit
4b08401e04
  1. 5
      src/views/wms/basicDataManage/itemManage/bom/index.vue
  2. 6
      src/views/wms/basicDataManage/itemManage/itemarea/index.vue
  3. 7
      src/views/wms/basicDataManage/itemManage/itembasic/index.vue
  4. 5
      src/views/wms/basicDataManage/itemManage/itempackage/index.vue
  5. 5
      src/views/wms/basicDataManage/itemManage/itemwarehouse/index.vue
  6. 5
      src/views/wms/basicDataManage/itemManage/packageunit/index.vue
  7. 5
      src/views/wms/basicDataManage/itemManage/productionitemcodeSpareitemcode/index.vue
  8. 5
      src/views/wms/basicDataManage/itemManage/productionlineitem/index.vue
  9. 5
      src/views/wms/basicDataManage/itemManage/stdcostprice/index.vue

5
src/views/wms/basicDataManage/itemManage/bom/index.vue

@ -68,6 +68,7 @@ import TableHead from '@/components/TableHead/src/TableHead.vue'
import ImportForm from '@/components/ImportForm/src/ImportForm.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
import Detail from '@/components/Detail/src/Detail.vue' import Detail from '@/components/Detail/src/Detail.vue'
import * as ProcessApi from "@/api/wms/process"; import * as ProcessApi from "@/api/wms/process";
import { formatDate } from '@/utils/formatTime'
// bom // bom
defineOptions({ name: 'Bom' }) defineOptions({ name: 'Bom' })
@ -258,7 +259,7 @@ const handleExport = async () => {
// //
exportLoading.value = true exportLoading.value = true
const data = await BomApi.exportBom(tableObject.params) const data = await BomApi.exportBom(tableObject.params)
download.excel(data, '物料清单信息 .xlsx') download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
} catch { } catch {
} finally { } finally {
exportLoading.value = false exportLoading.value = false
@ -273,7 +274,7 @@ const handleImport = () => {
// //
const importTemplateData = reactive({ const importTemplateData = reactive({
templateUrl: '', templateUrl: '',
templateTitle: '物料清单信息导入模版.xlsx' templateTitle: `${route.meta.title}】导入模版.xlsx`
}) })
// //
const importSuccess = () => { const importSuccess = () => {

6
src/views/wms/basicDataManage/itemManage/itemarea/index.vue

@ -97,7 +97,7 @@ import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
  import TableHead from '@/components/TableHead/src/TableHead.vue'   import TableHead from '@/components/TableHead/src/TableHead.vue'
  import ImportForm from '@/components/ImportForm/src/ImportForm.vue'   import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
  import Detail from '@/components/Detail/src/Detail.vue'   import Detail from '@/components/Detail/src/Detail.vue'
  import { formatDate } from '@/utils/formatTime'
// //
defineOptions({ name: 'Itemarea' }) defineOptions({ name: 'Itemarea' })
@ -335,7 +335,7 @@ const handleExport = async () => {
// //
exportLoading.value = true exportLoading.value = true
const data = await ItemareaApi.exportItemarea(tableObject.params) const data = await ItemareaApi.exportItemarea(tableObject.params)
download.excel(data, '物料库区配置管理主.xlsx') download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
} catch { } catch {
} finally { } finally {
exportLoading.value = false exportLoading.value = false
@ -398,7 +398,7 @@ const handleImport = () => {
// //
const importTemplateData = reactive({ const importTemplateData = reactive({
templateUrl: '', templateUrl: '',
templateTitle: '物料库区配置导入模版.xlsx' templateTitle: `${route.meta.title}】导入模版.xlsx`
}) })
// //

7
src/views/wms/basicDataManage/itemManage/itembasic/index.vue

@ -88,6 +88,9 @@ import { Expectin } from '@/views/wms/inventoryManage/expectin/expectin.data'
import * as ExpectinApi from '@/api/wms/expectin' import * as ExpectinApi from '@/api/wms/expectin'
import { formatDate } from '@/utils/formatTime'
// //
defineOptions({ name: 'Itembasic' }) defineOptions({ name: 'Itembasic' })
@ -185,7 +188,7 @@ const handleImport = () => {
// //
const importTemplateData = reactive({ const importTemplateData = reactive({
templateUrl: '', templateUrl: '',
templateTitle: '物料基础信息导入模版.xlsx' templateTitle: `${route.meta.title}】导入模版.xlsx`
}) })
// //
@ -284,7 +287,7 @@ const handleExport = async () => {
// //
exportLoading.value = true exportLoading.value = true
const data = await ItembasicApi.exportItembasic(tableObject.params) const data = await ItembasicApi.exportItembasic(tableObject.params)
download.excel(data, '物料基本信息.xlsx') download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
} catch { } catch {
} finally { } finally {
exportLoading.value = false exportLoading.value = false

5
src/views/wms/basicDataManage/itemManage/itempackage/index.vue

@ -81,6 +81,7 @@ import * as ItembasicApi from '@/api/wms/itembasic'
import { Itembasic } from '../itembasic/itembasic.data' import { Itembasic } from '../itembasic/itembasic.data'
import * as PackageunitApi from '@/api/wms/packageunit' import * as PackageunitApi from '@/api/wms/packageunit'
import { Packageunit } from '../packageunit/packageunit.data' import { Packageunit } from '../packageunit/packageunit.data'
import { formatDate } from '@/utils/formatTime'
defineOptions({ name: 'Itempackaging' }) defineOptions({ name: 'Itempackaging' })
@ -325,7 +326,7 @@ const handleExport = async () => {
// //
exportLoading.value = true exportLoading.value = true
const data = await ItempackagingApi.exportItempackaging(tableObject.params) const data = await ItempackagingApi.exportItempackaging(tableObject.params)
download.excel(data, '物料包装信息.xlsx') download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
} catch { } catch {
} finally { } finally {
exportLoading.value = false exportLoading.value = false
@ -340,7 +341,7 @@ const handleImport = () => {
// //
const importTemplateData = reactive({ const importTemplateData = reactive({
templateUrl: '', templateUrl: '',
templateTitle: '物料包装信息导入模版.xlsx' templateTitle: `${route.meta.title}】导入模版.xlsx`
}) })
// //
const importSuccess = () => { const importSuccess = () => {

5
src/views/wms/basicDataManage/itemManage/itemwarehouse/index.vue

@ -67,6 +67,7 @@ import TableHead from '@/components/TableHead/src/TableHead.vue'
import ImportForm from '@/components/ImportForm/src/ImportForm.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
import Detail from '@/components/Detail/src/Detail.vue' import Detail from '@/components/Detail/src/Detail.vue'
import * as WarehouseApi from "@/api/wms/warehouse"; import * as WarehouseApi from "@/api/wms/warehouse";
import { formatDate } from '@/utils/formatTime'
defineOptions({ name: 'Itemwarehouse' }) defineOptions({ name: 'Itemwarehouse' })
@ -229,7 +230,7 @@ const handleExport = async () => {
// //
exportLoading.value = true exportLoading.value = true
const data = await ItemwarehouseApi.exportItemwarehouse(tableObject.params) const data = await ItemwarehouseApi.exportItemwarehouse(tableObject.params)
download.excel(data, '物料仓库默认配置.xlsx') download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
} catch { } catch {
} finally { } finally {
exportLoading.value = false exportLoading.value = false
@ -244,7 +245,7 @@ const handleImport = () => {
// //
const importTemplateData = reactive({ const importTemplateData = reactive({
templateUrl: '', templateUrl: '',
templateTitle: '物料仓库默认配置导入模版.xlsx' templateTitle: `${route.meta.title}】导入模版.xlsx`
}) })
// //
const importSuccess = () => { const importSuccess = () => {

5
src/views/wms/basicDataManage/itemManage/packageunit/index.vue

@ -66,6 +66,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
import TableHead from '@/components/TableHead/src/TableHead.vue' import TableHead from '@/components/TableHead/src/TableHead.vue'
import ImportForm from '@/components/ImportForm/src/ImportForm.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
import Detail from '@/components/Detail/src/Detail.vue' import Detail from '@/components/Detail/src/Detail.vue'
import { formatDate } from '@/utils/formatTime'
defineOptions({ name: 'Packageunit' }) defineOptions({ name: 'Packageunit' })
@ -265,7 +266,7 @@ const handleExport = async () => {
// //
exportLoading.value = true exportLoading.value = true
const data = await PackageunitApi.exportPackageunit(tableObject.params) const data = await PackageunitApi.exportPackageunit(tableObject.params)
download.excel(data, '物品包装规格信息 .xlsx') download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
} catch { } catch {
} finally { } finally {
exportLoading.value = false exportLoading.value = false
@ -280,7 +281,7 @@ const handleImport = () => {
// //
const importTemplateData = reactive({ const importTemplateData = reactive({
templateUrl: '', templateUrl: '',
templateTitle: '物品包装规格信息导入模版.xlsx' templateTitle: `${route.meta.title}】导入模版.xlsx`
}) })
// //
const importSuccess = () => { const importSuccess = () => {

5
src/views/wms/basicDataManage/itemManage/productionitemcodeSpareitemcode/index.vue

@ -65,6 +65,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
import TableHead from '@/components/TableHead/src/TableHead.vue' import TableHead from '@/components/TableHead/src/TableHead.vue'
import ImportForm from '@/components/ImportForm/src/ImportForm.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
import Detail from '@/components/Detail/src/Detail.vue' import Detail from '@/components/Detail/src/Detail.vue'
import { formatDate } from '@/utils/formatTime'
defineOptions({ name: 'ProductionitemcodeSpareitemcode' }) defineOptions({ name: 'ProductionitemcodeSpareitemcode' })
@ -239,7 +240,7 @@ const handleExport = async () => {
// //
exportLoading.value = true exportLoading.value = true
const data = await ProductionitemcodeSpareitemcodeApi.exportProductionitemcodeSpareitemcode(tableObject.params) const data = await ProductionitemcodeSpareitemcodeApi.exportProductionitemcodeSpareitemcode(tableObject.params)
download.excel(data, '量产件备件关系.xlsx') download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
} catch { } catch {
} finally { } finally {
exportLoading.value = false exportLoading.value = false
@ -254,7 +255,7 @@ const handleImport = () => {
// //
const importTemplateData = reactive({ const importTemplateData = reactive({
templateUrl: '', templateUrl: '',
templateTitle: '量产件备件关系导入模版.xlsx' templateTitle: `${route.meta.title}】导入模版.xlsx`
}) })
// //
const importSuccess = () => { const importSuccess = () => {

5
src/views/wms/basicDataManage/itemManage/productionlineitem/index.vue

@ -66,6 +66,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
import TableHead from '@/components/TableHead/src/TableHead.vue' import TableHead from '@/components/TableHead/src/TableHead.vue'
import ImportForm from '@/components/ImportForm/src/ImportForm.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
import Detail from '@/components/Detail/src/Detail.vue' import Detail from '@/components/Detail/src/Detail.vue'
import { formatDate } from '@/utils/formatTime'
//线 //线
defineOptions({ name: 'Productionlineitem' }) defineOptions({ name: 'Productionlineitem' })
@ -245,7 +246,7 @@ const handleExport = async () => {
// //
exportLoading.value = true exportLoading.value = true
const data = await ProductionlineitemApi.exportProductionlineitem(tableObject.params) const data = await ProductionlineitemApi.exportProductionlineitem(tableObject.params)
download.excel(data, '生产线物料关系.xlsx') download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
} catch { } catch {
} finally { } finally {
exportLoading.value = false exportLoading.value = false
@ -260,7 +261,7 @@ const handleImport = () => {
// //
const importTemplateData = reactive({ const importTemplateData = reactive({
templateUrl: '', templateUrl: '',
templateTitle: '生产线物料关系导入模版.xlsx' templateTitle: `${route.meta.title}】导入模版.xlsx`
}) })
// //
const importSuccess = () => { const importSuccess = () => {

5
src/views/wms/basicDataManage/itemManage/stdcostprice/index.vue

@ -67,6 +67,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
import TableHead from '@/components/TableHead/src/TableHead.vue' import TableHead from '@/components/TableHead/src/TableHead.vue'
import ImportForm from '@/components/ImportForm/src/ImportForm.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
import Detail from '@/components/Detail/src/Detail.vue' import Detail from '@/components/Detail/src/Detail.vue'
import { formatDate } from '@/utils/formatTime'
// //
defineOptions({ name: 'Stdcostprice' }) defineOptions({ name: 'Stdcostprice' })
@ -238,7 +239,7 @@ const handleExport = async () => {
// //
exportLoading.value = true exportLoading.value = true
const data = await StdcostpriceApi.exportStdcostprice(tableObject.params) const data = await StdcostpriceApi.exportStdcostprice(tableObject.params)
download.excel(data, '标准成本价格单 .xlsx') download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
} catch { } catch {
} finally { } finally {
exportLoading.value = false exportLoading.value = false
@ -253,7 +254,7 @@ const handleImport = () => {
// //
const importTemplateData = reactive({ const importTemplateData = reactive({
templateUrl: '', templateUrl: '',
templateTitle: '标准成本价格单导入模版.xlsx' templateTitle: `${route.meta.title}】导入模版.xlsx`
}) })
// //
const importSuccess = () => { const importSuccess = () => {

Loading…
Cancel
Save