sfms3.0
/
sfms3.0-ui
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

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

master_hella_20240701
zhaoxuebing 5 months ago
parent
311e19d930 266784bf34
commit
7766dd8ad8
21 changed files with 261 additions and 164 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      src/api/wms/package/index.ts
  2. 2
      src/directives/permission/clientTable.ts
  3. 39
      src/layout/components/CategoryHeader.vue
  4. 42
      src/layout/components/Logo/src/Logo.vue
  5. 2
      src/layout/components/Menu/src/Menu.vue
  6. 100
      src/layout/components/useRenderLayout.tsx
  7. 17
      src/store/modules/app.ts
  8. 4
      src/styles/var.css
  9. 2
      src/views/wms/inventoryManage/balance/balance.data.ts
  10. 23
      src/views/wms/inventoryManage/balance/index.vue
  11. 53
      src/views/wms/inventoryManage/package/index.vue
  12. 6
      src/views/wms/issueManage/issue/issueJobMain/index.vue
  13. 14
      src/views/wms/issueManage/issue/issueRequestMain/index.vue
  14. 6
      src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/index.vue
  15. 6
      src/views/wms/issueManage/productionreturn/productionreturnJobMain/index.vue
  16. 16
      src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue
  17. 16
      src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue
  18. 18
      src/views/wms/productionManage/productionplan/productionMain/index.vue
  19. 18
      src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue
  20. 18
      src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue
  21. 18
      src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue

5
src/api/wms/package/index.ts
View File

@ -105,3 +105,8 @@ export const batchPrintingLable = async (data: any) => {
export const getLabel = async (id: number) => { export const getLabel = async (id: number) => {
return await request.get({ url: `/wms/package/getLabel?id=` + id }) return await request.get({ url: `/wms/package/getLabel?id=` + id })
} }
// 根据库存余额获取包装信息进行打印标签
export const getBalanceToPackage = async (packingNumber: String) => {
return await request.get({ url: `/wms/package/getBalanceToPackage?packingNumber=` + packingNumber})
}

2
src/directives/permission/clientTable.ts
View File

@ -8,7 +8,7 @@ export function clientTable(app: App<Element>) {
nextTick(() => { nextTick(() => {
const top = el.getBoundingClientRect().top const top = el.getBoundingClientRect().top
////--top-tool-height:50 --tags-view-height:35 ////--top-tool-height:50 --tags-view-height:35
const qustionHeight = 85 const qustionHeight = 20
let paginationHeight = 0 let paginationHeight = 0
if(el.children&&el.children.length>1){ if(el.children&&el.children.length>1){
paginationHeight = 70 paginationHeight = 70

39
src/layout/components/CategoryHeader.vue
View File

@ -56,11 +56,12 @@ export default defineComponent({
appStore.setCategoryRoutePath(currentPath) appStore.setCategoryRoutePath(currentPath)
} }
} }
const activeMenu = computed(() => { const activeMenu = computed(() => {
return appStore.getCategoryRoutePath return appStore.getCategoryRoutePath
}) })
return () => ( return () => (
<div class="category-container">
<div class="line"></div>
<ElMenu <ElMenu
defaultActive={unref(activeMenu)} defaultActive={unref(activeMenu)}
id={`${variables.namespace}-tool-header`} id={`${variables.namespace}-tool-header`}
@ -69,9 +70,7 @@ export default defineComponent({
prefixCls, prefixCls,
'h-[var(--top-category-height)] relative px-[var(--top-tool-p-x)] flex items-center ', 'h-[var(--top-category-height)] relative px-[var(--top-tool-p-x)] flex items-center ',
'dark:bg-[var(--el-bg-color)]', 'dark:bg-[var(--el-bg-color)]',
{
'width':'200px'
}
]} ]}
mode="horizontal" mode="horizontal"
backgroundColor="white" backgroundColor="white"
@ -102,6 +101,7 @@ export default defineComponent({
} }
}} }}
</ElMenu> </ElMenu>
</div>
) )
} }
}) })
@ -115,8 +115,24 @@ $prefix-cls: #{$namespace}-tool-header;
.#{$prefix-cls} { .#{$prefix-cls} {
transition: left var(--transition-time-02); transition: left var(--transition-time-02);
} }
.category-container{
background-color: transparent;
position: relative;
.line{
position: absolute;
width: 1px;
height:20px;
background: #fff;
top:calc(50% - 10px);
left:0;
z-index: 999;
}
}
.categoryheader{ .categoryheader{
padding-left: 20px; padding-left: 20px;
background: #0069ef;
border:1px solid #0069ef;
} }
@ -125,11 +141,20 @@ $prefix-cls: #{$namespace}-tool-header;
height: 40px; height: 40px;
margin-right: 10px; margin-right: 10px;
margin-bottom: 2px; margin-bottom: 2px;
background: rgb(242, 245, 248); // background: rgb(242, 245, 248);
border: 1px solid #ccc; background-color: hsla(0, 100%, 100%, 0.3);
color:#fff;
&:hover{
background: #fff !important;
color:#0069ef !important;
}
// border: 1px solid #ccc;
} }
::v-deep(.el-menu-item.is-active){ ::v-deep(.el-menu-item.is-active){
background: var(--el-menu-hover-bg-color) // background: var(--el-menu-hover-bg-color)
// background: #085cf4;
color:#0069ef !important;
background: #fff;
} }
</style> </style>

42
src/layout/components/Logo/src/Logo.vue
View File

@ -24,26 +24,26 @@ onMounted(() => {
if (unref(collapse)) show.value = false if (unref(collapse)) show.value = false
}) })
watch( // watch(
() => collapse.value, // () => collapse.value,
(collapse: boolean) => { // (collapse: boolean) => {
if (unref(layout) === 'topLeft' || unref(layout) === 'cutMenu') { // if (unref(layout) === 'topLeft' || unref(layout) === 'cutMenu') {
show.value = true // show.value = true
return // return
} // }
if (!collapse) { // if (!collapse) {
timer.value = setTimeout(() => { // timer.value = setTimeout(() => {
show.value = !collapse // show.value = !collapse
if(timer.value){ // if(timer.value){
clearTimeout(timer.value) // clearTimeout(timer.value)
timer.value = 0 // timer.value = 0
} // }
}, 400) // }, 400)
} else { // } else {
show.value = !collapse // show.value = !collapse
} // }
} // }
) // )
onBeforeUnmount(() => { onBeforeUnmount(() => {
if(timer.value){ if(timer.value){
clearTimeout(timer.value) clearTimeout(timer.value)
@ -78,7 +78,7 @@ watch(
to="/" to="/"
> >
<img <img
class="h-[calc(var(--logo-height)-24px)] w-[calc(var(--logo-height)-10px)]" class="h-24px w-[calc(var(--logo-height)-20px)]"
src="@/assets/imgs/logo.png" src="@/assets/imgs/logo.png"
/> />
<div <div

2
src/layout/components/Menu/src/Menu.vue
View File

@ -150,7 +150,7 @@ $prefix-cls: #{$namespace}-menu;
right: 0; right: 0;
width: 4px; width: 4px;
height: 100%; height: 100%;
background-color: var(--el-color-primary); // background-color: var(--el-color-primary);
content: ''; content: '';
} }

100
src/layout/components/useRenderLayout.tsx
View File

@ -38,30 +38,41 @@ const mobile = computed(() => appStore.getMobile)
const fixedMenu = computed(() => appStore.getFixedMenu) const fixedMenu = computed(() => appStore.getFixedMenu)
// 搜索图片 // 搜索图片
const search = computed(() => appStore.search) const search = computed(() => appStore.search)
const scrollBarHeight = computed(() => {
return (window.innerHeight - appStore.getCategoryMenuHeight - 85)+'px'
})
export const useRenderLayout = () => { export const useRenderLayout = () => {
const renderClassic = () => { const renderClassic = () => {
return ( return (
<> <>
<div <div style="display:flex;flex-direction:row;width:100%;background:#0069ef;" class={['h-[var(--top-category-height)]']}>
class={[ {logo.value ? (
'absolute top-0 left-0 h-full layout-border__right', <Logo
{ '!fixed z-3000': mobile.value }
]}
>
{logo.value ? (
<Logo
class={[ class={[
'bg-[var(--left-menu-bg-color)] relative', 'h-[var(--top-category-height)]',
'bg-[var(--el-color-primary)] relative',
'w-[var(--left-menu-max-width)]',
{ {
'!pl-0': mobile.value && collapse.value, '!pl-0': mobile.value && collapse.value,
'w-[var(--left-menu-min-width)]': appStore.getCollapse,
'w-[var(--left-menu-max-width)]': !appStore.getCollapse
} }
]} ]}
style="transition: all var(--transition-time-02);" style="transition: all var(--transition-time-02);background:#0069ef;"
></Logo> ></Logo>
) : undefined} ) : undefined}
{appStore.getShowCategoryMenu?(<CategoryHeader class={[
'bg-[var(--top-header-bg-color)]',
{
'layout-border__bottom': !tagsView.value
}
]}></CategoryHeader>):undefined}
</div>
<div
class={[
'absolute top-[var(--top-category-height)] left-0 h-full layout-border__right1',
{ '!fixed z-3000': mobile.value }
]}
>
{/* {search.value && !appStore.getCollapse? (<div class={[ {/* {search.value && !appStore.getCollapse? (<div class={[
prefixCls, prefixCls,
'h-[var(--top-tool-height)] relative px-[var(--top-tool-p-x)] flex items-center justify-between' 'h-[var(--top-tool-height)] relative px-[var(--top-tool-p-x)] flex items-center justify-between'
@ -73,12 +84,12 @@ export const useRenderLayout = () => {
'w-[var(--left-menu-max-width)]': !appStore.getCollapse 'w-[var(--left-menu-max-width)]': !appStore.getCollapse
} }
]} isModal={false} /> </div>) : undefined} */} ]} isModal={false} /> </div>) : undefined} */}
<Menu class={[{ '!h-[calc(100%-var(--logo-height))]': logo.value }]}></Menu> <Menu class={['top-0',{ '!h-[calc(100%-var(--logo-height))]': logo.value }]}></Menu>
</div> </div>
<div <div
class={[ class={[
`${prefixCls}-content`, `${prefixCls}-content`,
'absolute top-[var(--top-category-height)] h-[calc(100%-var(--top-category-height))]', 'absolute top-[var(--top-category-height)]',
{ {
'w-[calc(100%-var(--left-menu-min-width))] left-[var(--left-menu-min-width)]': 'w-[calc(100%-var(--left-menu-min-width))] left-[var(--left-menu-min-width)]':
collapse.value && !mobile.value && !mobile.value, collapse.value && !mobile.value && !mobile.value,
@ -89,49 +100,44 @@ export const useRenderLayout = () => {
]} ]}
style="transition: all var(--transition-time-02);" style="transition: all var(--transition-time-02);"
> >
<ElScrollbar <div
v-loading={pageLoading.value}
class={[ class={[
`${prefixCls}-content-scrollbar`,
{ {
'!h-[calc(100%-var(--top-tool-height)-var(--top-category-height)-var(--tags-view-height))] mt-[calc(var(--top-tool-height)+var(--tags-view-height))]': 'top-[var(--top-category-height) left-0 z-10': fixedHeader.value,
fixedHeader.value 'w-[calc(100%-var(--left-menu-min-width))] !left-[var(--left-menu-min-width)]':
collapse.value && fixedHeader.value && !mobile.value,
'w-[calc(100%-var(--left-menu-max-width))] !left-[var(--left-menu-max-width)]':
!collapse.value && fixedHeader.value && !mobile.value,
'!w-full !left-0': mobile.value
} }
]} ]}
style="transition: all var(--transition-time-02);width:100%;"
> >
<div
<ToolHeader
class={[ class={[
'bg-[var(--top-header-bg-color)]',
{ {
'fixed top-0 left-0 z-10': fixedHeader.value, 'layout-border__bottom': !tagsView.value
'w-[calc(100%-var(--left-menu-min-width))] !left-[var(--left-menu-min-width)]':
collapse.value && fixedHeader.value && !mobile.value,
'w-[calc(100%-var(--left-menu-max-width))] !left-[var(--left-menu-max-width)]':
!collapse.value && fixedHeader.value && !mobile.value,
'!w-full !left-0': mobile.value
} }
]} ]}
style="transition: all var(--transition-time-02);" ></ToolHeader>
>
{appStore.getShowCategoryMenu?(<CategoryHeader class={[
'bg-[var(--top-header-bg-color)]',
{
'layout-border__bottom': !tagsView.value
}
]}></CategoryHeader>):undefined}
<ToolHeader
class={[
'bg-[var(--top-header-bg-color)]',
{
'layout-border__bottom': !tagsView.value
}
]}
></ToolHeader>
{tagsView.value ? (
<TagsView class="layout-border__bottom layout-border__top"></TagsView>
) : undefined}
</div>
{tagsView.value ? (
<TagsView class="layout-border__bottom layout-border__top"></TagsView>
) : undefined}
</div>
<ElScrollbar
v-loading={pageLoading.value}
height={scrollBarHeight.value}
class={[
`${prefixCls}-content-scrollbar`,
{
'!h-[calc(100%-var(--app-content-padding)-var(--top-tool-height)-var(--top-category-height)-var(--tags-view-height))] ':
fixedHeader.value
}
]}
>
<AppView></AppView> <AppView></AppView>
</ElScrollbar> </ElScrollbar>
</div> </div>

17
src/store/modules/app.ts
View File

@ -38,6 +38,7 @@ interface AppState {
fixedMenu: boolean fixedMenu: boolean
categoryRoutePath:string categoryRoutePath:string
showCategoryMenu: boolean showCategoryMenu: boolean
categoryMenuHeight:number
} }
export const useAppStore = defineStore('app', { export const useAppStore = defineStore('app', {
@ -76,17 +77,17 @@ export const useAppStore = defineStore('app', {
// 左侧菜单边框颜色 // 左侧菜单边框颜色
leftMenuBorderColor: 'inherit', leftMenuBorderColor: 'inherit',
// 左侧菜单背景颜色 // 左侧菜单背景颜色
leftMenuBgColor: '#001529', leftMenuBgColor: 'rgb(241,243,244)',
// 左侧菜单浅色背景颜色 // 左侧菜单浅色背景颜色
leftMenuBgLightColor: '#0f2438', leftMenuBgLightColor: 'rgb(241,243,244)',
// 左侧菜单选中背景颜色 // 左侧菜单选中背景颜色
leftMenuBgActiveColor: 'var(--el-color-primary)', leftMenuBgActiveColor: 'rgb(241,243,244)',
// 左侧菜单收起选中背景颜色 // 左侧菜单收起选中背景颜色
leftMenuCollapseBgActiveColor: 'var(--el-color-primary)', leftMenuCollapseBgActiveColor: 'var(--el-color-primary)',
// 左侧菜单字体颜色 // 左侧菜单字体颜色
leftMenuTextColor: '#bfcbd9', leftMenuTextColor: '#666',
// 左侧菜单选中字体颜色 // 左侧菜单选中字体颜色
leftMenuTextActiveColor: '#fff', leftMenuTextActiveColor: '#0069ef',
// logo字体颜色 // logo字体颜色
logoTitleTextColor: '#fff', logoTitleTextColor: '#fff',
// logo边框颜色 // logo边框颜色
@ -101,7 +102,8 @@ export const useAppStore = defineStore('app', {
topToolBorderColor: '#eee' topToolBorderColor: '#eee'
}, },
categoryRoutePath:'', categoryRoutePath:'',
showCategoryMenu:true // true:顶部展示一级菜单栏 false:只有左侧菜单栏 showCategoryMenu:true, // true:顶部展示一级菜单栏 false:只有左侧菜单栏
categoryMenuHeight:60 // true:顶部展示一级菜单栏 false:只有左侧菜单栏
} }
}, },
getters: { getters: {
@ -186,6 +188,9 @@ export const useAppStore = defineStore('app', {
getShowCategoryMenu():boolean { getShowCategoryMenu():boolean {
return this.showCategoryMenu return this.showCategoryMenu
}, },
getCategoryMenuHeight():number {
return this.categoryMenuHeight
}
}, },
actions: { actions: {
setBreadcrumb(breadcrumb: boolean) { setBreadcrumb(breadcrumb: boolean) {

4
src/styles/var.css
View File

@ -1,5 +1,5 @@
:root { :root {
--login-bg-color: #293146; --login-bg-color: #0069ef;
--left-menu-max-width: 200px; --left-menu-max-width: 200px;
@ -19,7 +19,7 @@
/* left menu end */ /* left menu end */
/* logo start */ /* logo start */
--logo-height: 50px; --logo-height: 60px;
--logo-title-text-color: #fff; --logo-title-text-color: #fff;
/* logo end */ /* logo end */

2
src/views/wms/inventoryManage/balance/balance.data.ts
View File

@ -429,7 +429,7 @@ export const Balance = useCrudSchemas(reactive<CrudSchema[]>([
isDetail: false, isDetail: false,
isForm: false, isForm: false,
table: { table: {
width: 100, width: 200,
fixed: 'right' fixed: 'right'
}, },
} }

23
src/views/wms/inventoryManage/balance/index.vue
View File

@ -59,12 +59,14 @@
<script setup lang="ts"> <script setup lang="ts">
import download from '@/utils/download' import download from '@/utils/download'
import * as BalanceApi from '@/api/wms/balance' import * as BalanceApi from '@/api/wms/balance'
import * as PackageApi from '@/api/wms/package'
import BasicForm from '@/components/BasicForm/src/BasicForm.vue' import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
import { Balance, BalanceRules } from './balance.data' import { Balance, BalanceRules } from './balance.data'
import * as defaultButtons from '@/utils/disposition/defaultButtons' 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 { getAccessToken } from '@/utils/auth'
// 库存余额 // 库存余额
defineOptions({ name: 'Balance' }) defineOptions({ name: 'Balance' })
@ -142,6 +144,7 @@ const butttondata = [
float:'right', float:'right',
hasPermi: '' hasPermi: ''
}, },
defaultButtons.mainListPointBtn(null), // 标签打印
// defaultButtons.mainListEditBtn({hasPermi:'wms:balance:update'}), // 编辑 // defaultButtons.mainListEditBtn({hasPermi:'wms:balance:update'}), // 编辑
// defaultButtons.mainListDeleteBtn({hasPermi:'wms:balance:delete'}), // 删除 // defaultButtons.mainListDeleteBtn({hasPermi:'wms:balance:delete'}), // 删除
] ]
@ -151,6 +154,8 @@ const buttonTableClick = async (val, row) => {
if (val == 'bqxx') { if (val == 'bqxx') {
let aaa = 'HPQ;V1.0;I'+row.itemCode+';P'+row.packingNumber+';B'+row.batch+';Q'+row.qty+';U'+row.uom let aaa = 'HPQ;V1.0;I'+row.itemCode+';P'+row.packingNumber+';B'+row.batch+';Q'+row.qty+';U'+row.uom
alert(aaa) alert(aaa)
}else if (val == 'point') { // 标签打印
handlePoint(row)
} }
// if (val == 'edit') { // 编辑 // if (val == 'edit') { // 编辑
// // const res = await BalanceApi.getItempackaging(row.id) // // const res = await BalanceApi.getItempackaging(row.id)
@ -172,6 +177,24 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
detailRef.value.openDetail(row, titleName, titleValue,'transactionBalance') detailRef.value.openDetail(row, titleName, titleValue,'transactionBalance')
} }
const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
// 标签打印
const handlePoint = async (row) => {
console.log(row.packingNumber,445555555555555);
PackageApi.getBalanceToPackage(row.packingNumber).then(res => {
console.log(res,66666666666);
// 判断是采购还是制造
if (res.asnNumber !== null && res.asnNumber !== '') {
const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
window.open(src.value+'&id='+res.id)
} else {
const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
window.open(src.value+'&id='+res.id)
}
})
}
/** 删除按钮操作 */ /** 删除按钮操作 */
const handleDelete = async (id: number) => { const handleDelete = async (id: number) => {
try { try {

53
src/views/wms/inventoryManage/package/index.vue
View File

@ -41,7 +41,7 @@
<!-- 表单弹窗：添加/修改 --> <!-- 表单弹窗：添加/修改 -->
<BasicForm <BasicForm
ref="basicFormRef" ref="basicFormRef"
@success="getList" @success="formsSuccess"
:rules="PackageRules" :rules="PackageRules"
:formAllSchemas="Package.allSchemas" :formAllSchemas="Package.allSchemas"
:searchTableParams="searchTableParams" :searchTableParams="searchTableParams"
@ -122,6 +122,8 @@ const HeadButttondata = [
const buttonBaseClick = (val, item) => { const buttonBaseClick = (val, item) => {
if (val == 'add') { // 新增 if (val == 'add') { // 新增
openForm('create') openForm('create')
} else if (val == 'update') { // 导入
openForm('update')
} else if (val == 'import') { // 导入 } else if (val == 'import') { // 导入
handleImport() handleImport()
} else if (val == 'export') { // 导出 } else if (val == 'export') { // 导出
@ -149,18 +151,10 @@ const buttonBaseClick = (val, item) => {
// } // }
// } // }
// 列表-操作按钮
// const butttondata = (row) => {
// return [
// defaultButtons.mainListEditBtn({hasPermi:'wms:package:update'}), // 编辑
// defaultButtons.mainListDeleteBtn({hasPermi:'wms:package:delete'}), // 删除
// defaultButtons.mainListPointBtn(null), // 标签打印
// ]
// }
// 列表-操作按钮 // 列表-操作按钮
const butttondata = [ const butttondata = [
// defaultButtons.mainListEditBtn({hasPermi:'wms:package:update'}), // 编辑 defaultButtons.mainListEditBtn({hasPermi:'wms:package:update'}), // 编辑
// defaultButtons.mainListDeleteBtn({hasPermi:'wms:package:delete'}), // 删除 // defaultButtons.mainListDeleteBtn({hasPermi:'wms:package:delete'}), // 删除
defaultButtons.mainListPointBtn(null), // 标签打印 defaultButtons.mainListPointBtn(null), // 标签打印
] ]
@ -179,6 +173,31 @@ const buttonTableClick = async (val, row) => {
/** 添加/修改操作 */ /** 添加/修改操作 */
const basicFormRef = ref() const basicFormRef = ref()
const openForm =async (type: string, row?: number) => { const openForm =async (type: string, row?: number) => {
if(type == "update"){
Package.allSchemas.formSchema.forEach((item) => {
if (item.field == 'number') {
item.componentProps.disabled = true
}
if (item.field == 'itemCode') {
item.componentProps.disabled = true
}
if (item.field == 'itemName') {
item.componentProps.disabled = true
}
})
}else {
Package.allSchemas.formSchema.forEach((item) => {
if (item.field == 'number') {
item.componentProps.disabled = false
}
if (item.field == 'itemCode') {
item.componentProps.disabled = true
}
if (item.field == 'itemName') {
item.componentProps.disabled = true
}
})
}
basicFormRef.value.open(type, row) basicFormRef.value.open(type, row)
} }
@ -221,8 +240,22 @@ const handleExport = async () => {
const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
// form表单提交
const formsSuccess = async (formType,data) => {
if (formType === 'create') {
await PackageApi.createPackage(data)
message.success(t('common.createSuccess'))
} else {
await PackageApi.updatePackage(data)
message.success(t('common.updateSuccess'))
}
basicFormRef.value.dialogVisible = false
getList()
}
// 标签打印 // 标签打印
const handlePoint = async (row) => { const handlePoint = async (row) => {
console.log(row,66666666666);
// 判断是采购还是制造 // 判断是采购还是制造
if (row.asnNumber !== null && row.asnNumber !== '') { if (row.asnNumber !== null && row.asnNumber !== '') {
const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken()) const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())

6
src/views/wms/issueManage/issue/issueJobMain/index.vue
View File

@ -270,11 +270,11 @@ const buttonTableClick = async (val, row) => {
} }
IssueJobMainApi.executeIssueMain(aaa) IssueJobMainApi.executeIssueMain(aaa)
} else if (val == 'mainJobAba') { // 放弃 } else if (val == 'mainJobAba') { // 放弃
IssueJobMainApi.abandonIssueMain(row.id) IssueJobMainApi.abandonIssueMain(row.masterId)
} else if (val == 'mainJobClo') { // 关闭 } else if (val == 'mainJobClo') { // 关闭
IssueJobMainApi.closeIssueMain(row.id) IssueJobMainApi.closeIssueMain(row.masterId)
} else if (val == 'mainJobAcc') { // 承接 } else if (val == 'mainJobAcc') { // 承接
IssueJobMainApi.acceptIssueMain(row.id) IssueJobMainApi.acceptIssueMain(row.masterId)
} }
} }
// 获取部门 用于详情 部门回显 // 获取部门 用于详情 部门回显

14
src/views/wms/issueManage/issue/issueRequestMain/index.vue
View File

@ -218,7 +218,7 @@ const buttonTableClick = async (val, row) => {
if (val == 'mainClose') { // 关闭 if (val == 'mainClose') { // 关闭
await message.confirm('确认要关闭吗？') await message.confirm('确认要关闭吗？')
tableObject.loading = true tableObject.loading = true
IssueRequestMainApi.close(row.id).then(() => { IssueRequestMainApi.close(row.masterId).then(() => {
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
tableObject.loading = false tableObject.loading = false
getList() getList()
@ -229,7 +229,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'mainReAdd') { // 重新添加 } else if (val == 'mainReAdd') { // 重新添加
await message.confirm('确认要重新添加吗？') await message.confirm('确认要重新添加吗？')
tableObject.loading = true tableObject.loading = true
IssueRequestMainApi.reAdd(row.id).then(() => { IssueRequestMainApi.reAdd(row.masterId).then(() => {
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
tableObject.loading = false tableObject.loading = false
getList() getList()
@ -240,7 +240,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'mainSubmit') { // 提交审批 } else if (val == 'mainSubmit') { // 提交审批
await message.confirm('确认要提交审批吗？') await message.confirm('确认要提交审批吗？')
tableObject.loading = true tableObject.loading = true
IssueRequestMainApi.submit(row.id).then(() => { IssueRequestMainApi.submit(row.masterId).then(() => {
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
tableObject.loading = false tableObject.loading = false
getList() getList()
@ -251,7 +251,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'mainTurnDown') { // 驳回 } else if (val == 'mainTurnDown') { // 驳回
await message.confirm('确认要驳回吗？') await message.confirm('确认要驳回吗？')
tableObject.loading = true tableObject.loading = true
IssueRequestMainApi.refused(row.id).then(() => { IssueRequestMainApi.refused(row.masterId).then(() => {
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
tableObject.loading = false tableObject.loading = false
getList() getList()
@ -262,7 +262,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'mainApprove') { // 审批通过 } else if (val == 'mainApprove') { // 审批通过
await message.confirm('确认要审批通过吗？') await message.confirm('确认要审批通过吗？')
tableObject.loading = true tableObject.loading = true
IssueRequestMainApi.agree(row.id).then(() => { IssueRequestMainApi.agree(row.masterId).then(() => {
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
tableObject.loading = false tableObject.loading = false
getList() getList()
@ -273,7 +273,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'mainHandle') { // 处理 } else if (val == 'mainHandle') { // 处理
await message.confirm('确认要处理吗？') await message.confirm('确认要处理吗？')
tableObject.loading = true tableObject.loading = true
IssueRequestMainApi.handle(row.id).then(() => { IssueRequestMainApi.handle(row.masterId).then(() => {
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
tableObject.loading = false tableObject.loading = false
getList() getList()
@ -284,7 +284,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'edit') { // 编辑 } else if (val == 'edit') { // 编辑
openForm('update', row) openForm('update', row)
} else if (val == 'delete') { // 删除 } else if (val == 'delete') { // 删除
handleDelete(row.id) handleDelete(row.masterId)
} }
} }

6
src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/index.vue
View File

@ -271,11 +271,11 @@ const buttonTableClick = async (val, row) => {
} }
ProductionreceiptJobMainApi.executeIssueMain(aaa) ProductionreceiptJobMainApi.executeIssueMain(aaa)
} else if (val == 'mainJobAba') { // 放弃 } else if (val == 'mainJobAba') { // 放弃
ProductionreceiptJobMainApi.abandonIssueMain(row.id) ProductionreceiptJobMainApi.abandonIssueMain(row.masterId)
} else if (val == 'mainJobClo') { // 关闭 } else if (val == 'mainJobClo') { // 关闭
ProductionreceiptJobMainApi.closeIssueMain(row.id) ProductionreceiptJobMainApi.closeIssueMain(row.masterId)
} else if (val == 'mainJobAcc') { // 承接 } else if (val == 'mainJobAcc') { // 承接
ProductionreceiptJobMainApi.acceptIssueMain(row.id) ProductionreceiptJobMainApi.acceptIssueMain(row.masterId)
} }
} }
// 获取部门 用于详情 部门回显 // 获取部门 用于详情 部门回显

6
src/views/wms/issueManage/productionreturn/productionreturnJobMain/index.vue
View File

@ -243,11 +243,11 @@ const buttonTableClick = async (val, row) => {
} }
ProductionreturnJobMainApi.executeProductionreturnMain(aaa) ProductionreturnJobMainApi.executeProductionreturnMain(aaa)
} else if (val == 'mainJobAba') { // 放弃 } else if (val == 'mainJobAba') { // 放弃
ProductionreturnJobMainApi.abandonProductionreturnMain(row.id) ProductionreturnJobMainApi.abandonProductionreturnMain(row.masterId)
} else if (val == 'mainJobClo') { // 关闭 } else if (val == 'mainJobClo') { // 关闭
ProductionreturnJobMainApi.closeProductionreturnMain(row.id) ProductionreturnJobMainApi.closeProductionreturnMain(row.masterId)
} else if (val == 'mainJobAcc') { // 承接 } else if (val == 'mainJobAcc') { // 承接
ProductionreturnJobMainApi.acceptProductionreturnMain(row.id) ProductionreturnJobMainApi.acceptProductionreturnMain(row.masterId)
} }
} }
// 获取部门 用于详情 部门回显 // 获取部门 用于详情 部门回显

16
src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue
View File

@ -330,7 +330,7 @@ const buttonTableClick = async (val, row) => {
if (val == 'mainClose') { // 关闭 if (val == 'mainClose') { // 关闭
await message.confirm('确认要关闭吗？') await message.confirm('确认要关闭吗？')
tableObject.loading = true tableObject.loading = true
ProductionreturnRequestMainApi.close(row.id).then(() => { ProductionreturnRequestMainApi.close(row.masterId).then(() => {
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
tableObject.loading = false tableObject.loading = false
getList() getList()
@ -341,7 +341,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'mainReAdd') { // 重新添加 } else if (val == 'mainReAdd') { // 重新添加
await message.confirm('确认要重新添加吗？') await message.confirm('确认要重新添加吗？')
tableObject.loading = true tableObject.loading = true
ProductionreturnRequestMainApi.reAdd(row.id).then(() => { ProductionreturnRequestMainApi.reAdd(row.masterId).then(() => {
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
tableObject.loading = false tableObject.loading = false
getList() getList()
@ -352,7 +352,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'mainSubmit') { // 提交审批 } else if (val == 'mainSubmit') { // 提交审批
await message.confirm('确认要提交审批吗？') await message.confirm('确认要提交审批吗？')
tableObject.loading = true tableObject.loading = true
ProductionreturnRequestMainApi.submit(row.id).then(() => { ProductionreturnRequestMainApi.submit(row.masterId).then(() => {
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
tableObject.loading = false tableObject.loading = false
getList() getList()
@ -363,7 +363,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'mainTurnDown') { // 驳回 } else if (val == 'mainTurnDown') { // 驳回
await message.confirm('确认要驳回吗？') await message.confirm('确认要驳回吗？')
tableObject.loading = true tableObject.loading = true
ProductionreturnRequestMainApi.refused(row.id).then(() => { ProductionreturnRequestMainApi.refused(row.masterId).then(() => {
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
tableObject.loading = false tableObject.loading = false
getList() getList()
@ -374,7 +374,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'mainApprove') { // 审批通过 } else if (val == 'mainApprove') { // 审批通过
await message.confirm('确认要审批通过吗？') await message.confirm('确认要审批通过吗？')
tableObject.loading = true tableObject.loading = true
ProductionreturnRequestMainApi.agree(row.id).then(() => { ProductionreturnRequestMainApi.agree(row.masterId).then(() => {
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
tableObject.loading = false tableObject.loading = false
getList() getList()
@ -397,7 +397,7 @@ const buttonTableClick = async (val, row) => {
return return
} }
detatableData.params = { detatableData.params = {
masterId:row.id masterId:row.masterId
} }
await getDetailList() await getDetailList()
// 打开创建标签页面 // 打开创建标签页面
@ -467,7 +467,7 @@ const buttonTableClick = async (val, row) => {
return return
} }
tableObject.loading = true tableObject.loading = true
ProductionreturnRequestMainApi.handle(row.id).then(() => { ProductionreturnRequestMainApi.handle(row.masterId).then(() => {
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
tableObject.loading = false tableObject.loading = false
getList() getList()
@ -478,7 +478,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'edit') { // 编辑 } else if (val == 'edit') { // 编辑
openForm('update', row) openForm('update', row)
} else if (val == 'delete') { // 删除 } else if (val == 'delete') { // 删除
handleDelete(row.id) handleDelete(row.masterId)
} else if (val == 'point') { // 标签打印 } else if (val == 'point') { // 标签打印
handlePoint(row) handlePoint(row)
} }

16
src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue
View File

@ -323,7 +323,7 @@ const buttonTableClick = async (val, row) => {
if (val == 'mainClose') { // 关闭 if (val == 'mainClose') { // 关闭
await message.confirm('确认要关闭吗？') await message.confirm('确认要关闭吗？')
tableObject.loading = true tableObject.loading = true
ProductionreturnRequestMainNoApi.close(row.id).then(() => { ProductionreturnRequestMainNoApi.close(row.masterId).then(() => {
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
tableObject.loading = false tableObject.loading = false
getList() getList()
@ -334,7 +334,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'mainReAdd') { // 重新添加 } else if (val == 'mainReAdd') { // 重新添加
await message.confirm('确认要重新添加吗？') await message.confirm('确认要重新添加吗？')
tableObject.loading = true tableObject.loading = true
ProductionreturnRequestMainNoApi.reAdd(row.id).then(() => { ProductionreturnRequestMainNoApi.reAdd(row.masterId).then(() => {
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
tableObject.loading = false tableObject.loading = false
getList() getList()
@ -345,7 +345,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'mainSubmit') { // 提交审批 } else if (val == 'mainSubmit') { // 提交审批
await message.confirm('确认要提交审批吗？') await message.confirm('确认要提交审批吗？')
tableObject.loading = true tableObject.loading = true
ProductionreturnRequestMainNoApi.submit(row.id).then(() => { ProductionreturnRequestMainNoApi.submit(row.masterId).then(() => {
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
tableObject.loading = false tableObject.loading = false
getList() getList()
@ -356,7 +356,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'mainTurnDown') { // 驳回 } else if (val == 'mainTurnDown') { // 驳回
await message.confirm('确认要驳回吗？') await message.confirm('确认要驳回吗？')
tableObject.loading = true tableObject.loading = true
ProductionreturnRequestMainNoApi.refused(row.id).then(() => { ProductionreturnRequestMainNoApi.refused(row.masterId).then(() => {
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
tableObject.loading = false tableObject.loading = false
getList() getList()
@ -367,7 +367,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'mainApprove') { // 审批通过 } else if (val == 'mainApprove') { // 审批通过
await message.confirm('确认要审批通过吗？') await message.confirm('确认要审批通过吗？')
tableObject.loading = true tableObject.loading = true
ProductionreturnRequestMainNoApi.agree(row.id).then(() => { ProductionreturnRequestMainNoApi.agree(row.masterId).then(() => {
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
tableObject.loading = false tableObject.loading = false
getList() getList()
@ -390,7 +390,7 @@ const buttonTableClick = async (val, row) => {
return return
} }
detatableData.params = { detatableData.params = {
masterId:row.id masterId:row.masterId
} }
await getDetailList() await getDetailList()
// 打开创建标签页面 // 打开创建标签页面
@ -460,7 +460,7 @@ const buttonTableClick = async (val, row) => {
return return
} }
tableObject.loading = true tableObject.loading = true
ProductionreturnRequestMainNoApi.handle(row.id).then(() => { ProductionreturnRequestMainNoApi.handle(row.masterId).then(() => {
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
tableObject.loading = false tableObject.loading = false
getList() getList()
@ -471,7 +471,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'edit') { // 编辑 } else if (val == 'edit') { // 编辑
openForm('update', row) openForm('update', row)
} else if (val == 'delete') { // 删除 } else if (val == 'delete') { // 删除
handleDelete(row.id) handleDelete(row.masterId)
} else if (val == 'point') { // 标签打印 } else if (val == 'point') { // 标签打印
handlePoint(row) handlePoint(row)
} }

18
src/views/wms/productionManage/productionplan/productionMain/index.vue
View File

@ -238,7 +238,7 @@ const butttondata = (row,$index) => {
const buttonTableClick = async (val, row) => { const buttonTableClick = async (val, row) => {
if (val == 'mainPlanOpe') { // 打开 if (val == 'mainPlanOpe') { // 打开
tableObject.loading = true tableObject.loading = true
await ProductionMainApi.open(row.id).then(() => { await ProductionMainApi.open(row.masterId).then(() => {
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
tableObject.loading = false tableObject.loading = false
getList() getList()
@ -249,7 +249,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'mainPlanClo') { // 关闭 } else if (val == 'mainPlanClo') { // 关闭
await message.confirm('确认要关闭吗？') await message.confirm('确认要关闭吗？')
tableObject.loading = true tableObject.loading = true
await ProductionMainApi.close(row.id).then(() => { await ProductionMainApi.close(row.masterId).then(() => {
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
tableObject.loading = false tableObject.loading = false
getList() getList()
@ -261,7 +261,7 @@ const buttonTableClick = async (val, row) => {
if (row.available == 'FALSE') return message.warning('当前数据：【不可用】') if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
await message.confirm('确认要提交审批吗？') await message.confirm('确认要提交审批吗？')
tableObject.loading = true tableObject.loading = true
await ProductionMainApi.submit(row.id).then(() => { await ProductionMainApi.submit(row.masterId).then(() => {
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
tableObject.loading = false tableObject.loading = false
getList() getList()
@ -272,7 +272,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'mainPlanTur') { // 驳回 } else if (val == 'mainPlanTur') { // 驳回
await message.confirm('确认要驳回吗？') await message.confirm('确认要驳回吗？')
tableObject.loading = true tableObject.loading = true
await ProductionMainApi.reject(row.id).then(() => { await ProductionMainApi.reject(row.masterId).then(() => {
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
tableObject.loading = false tableObject.loading = false
getList() getList()
@ -284,7 +284,7 @@ const buttonTableClick = async (val, row) => {
if (row.available == 'FALSE') return message.warning('当前数据：【不可用】') if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
await message.confirm('确认要审批通过吗？') await message.confirm('确认要审批通过吗？')
tableObject.loading = true tableObject.loading = true
await ProductionMainApi.agree(row.id).then(() => { await ProductionMainApi.agree(row.masterId).then(() => {
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
tableObject.loading = false tableObject.loading = false
getList() getList()
@ -297,7 +297,7 @@ const buttonTableClick = async (val, row) => {
await message.confirm('确认要发布吗？') await message.confirm('确认要发布吗？')
// 物料含有不可用时 是否继续执行 // 物料含有不可用时 是否继续执行
let isAvailable = true let isAvailable = true
await ProductionMainApi.getProductionDetail(row.id).then(async res =>{ await ProductionMainApi.getProductionDetail(row.masterId).then(async res =>{
if (res.length > 0) { if (res.length > 0) {
let rs = '' let rs = ''
res.forEach(item => { res.forEach(item => {
@ -312,7 +312,7 @@ const buttonTableClick = async (val, row) => {
return return
} }
tableObject.loading = true tableObject.loading = true
await ProductionMainApi.publish(row.id).then(() => { await ProductionMainApi.publish(row.masterId).then(() => {
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
tableObject.loading = false tableObject.loading = false
getList() getList()
@ -323,7 +323,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'mainPlanRes') { // 重置 } else if (val == 'mainPlanRes') { // 重置
await message.confirm('确认要重置吗？') await message.confirm('确认要重置吗？')
tableObject.loading = true tableObject.loading = true
await ProductionMainApi.resetting(row.id).then(() => { await ProductionMainApi.resetting(row.masterId).then(() => {
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
tableObject.loading = false tableObject.loading = false
getList() getList()
@ -346,7 +346,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'edit') { // 编辑 } else if (val == 'edit') { // 编辑
openForm('update', row) openForm('update', row)
} else if (val == 'delete') { // 删除 } else if (val == 'delete') { // 删除
handleDelete(row.id) handleDelete(row.masterId)
} }
} }

18
src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue
View File

@ -237,7 +237,7 @@ const butttondata = (row,$index) => {
const buttonTableClick = async (val, row) => { const buttonTableClick = async (val, row) => {
if (val == 'mainPlanOpe') { // 打开 if (val == 'mainPlanOpe') { // 打开
tableObject.loading = true tableObject.loading = true
await ProductionMainApi.open(row.id).then(() => { await ProductionMainApi.open(row.masterId).then(() => {
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
tableObject.loading = false tableObject.loading = false
getList() getList()
@ -248,7 +248,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'mainPlanClo') { // 关闭 } else if (val == 'mainPlanClo') { // 关闭
await message.confirm('确认要关闭吗？') await message.confirm('确认要关闭吗？')
tableObject.loading = true tableObject.loading = true
await ProductionMainApi.close(row.id).then(() => { await ProductionMainApi.close(row.masterId).then(() => {
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
tableObject.loading = false tableObject.loading = false
getList() getList()
@ -260,7 +260,7 @@ const buttonTableClick = async (val, row) => {
if (row.available == 'FALSE') return message.warning('当前数据：【不可用】') if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
await message.confirm('确认要提交审批吗？') await message.confirm('确认要提交审批吗？')
tableObject.loading = true tableObject.loading = true
await ProductionMainApi.submit(row.id).then(() => { await ProductionMainApi.submit(row.masterId).then(() => {
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
tableObject.loading = false tableObject.loading = false
getList() getList()
@ -271,7 +271,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'mainPlanTur') { // 驳回 } else if (val == 'mainPlanTur') { // 驳回
await message.confirm('确认要驳回吗？') await message.confirm('确认要驳回吗？')
tableObject.loading = true tableObject.loading = true
await ProductionMainApi.reject(row.id).then(() => { await ProductionMainApi.reject(row.masterId).then(() => {
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
tableObject.loading = false tableObject.loading = false
getList() getList()
@ -283,7 +283,7 @@ const buttonTableClick = async (val, row) => {
if (row.available == 'FALSE') return message.warning('当前数据：【不可用】') if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
await message.confirm('确认要审批通过吗？') await message.confirm('确认要审批通过吗？')
tableObject.loading = true tableObject.loading = true
await ProductionMainApi.agree(row.id).then(() => { await ProductionMainApi.agree(row.masterId).then(() => {
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
tableObject.loading = false tableObject.loading = false
getList() getList()
@ -296,7 +296,7 @@ const buttonTableClick = async (val, row) => {
await message.confirm('确认要发布吗？') await message.confirm('确认要发布吗？')
// 物料含有不可用时 是否继续执行 // 物料含有不可用时 是否继续执行
let isAvailable = true let isAvailable = true
await ProductionMainApi.getProductionDetail(row.id).then(async res =>{ await ProductionMainApi.getProductionDetail(row.masterId).then(async res =>{
if (res.length > 0) { if (res.length > 0) {
let rs = '' let rs = ''
res.forEach(item => { res.forEach(item => {
@ -311,7 +311,7 @@ const buttonTableClick = async (val, row) => {
return return
} }
tableObject.loading = true tableObject.loading = true
await ProductionMainApi.publish(row.id).then(() => { await ProductionMainApi.publish(row.masterId).then(() => {
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
tableObject.loading = false tableObject.loading = false
getList() getList()
@ -322,7 +322,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'mainPlanRes') { // 重置 } else if (val == 'mainPlanRes') { // 重置
await message.confirm('确认要重置吗？') await message.confirm('确认要重置吗？')
tableObject.loading = true tableObject.loading = true
await ProductionMainApi.resetting(row.id).then(() => { await ProductionMainApi.resetting(row.masterId).then(() => {
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
tableObject.loading = false tableObject.loading = false
getList() getList()
@ -345,7 +345,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'edit') { // 编辑 } else if (val == 'edit') { // 编辑
openForm('update', row) openForm('update', row)
} else if (val == 'delete') { // 删除 } else if (val == 'delete') { // 删除
handleDelete(row.id) handleDelete(row.masterId)
} }
} }

18
src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue
View File

@ -237,7 +237,7 @@ const butttondata = (row,$index) => {
const buttonTableClick = async (val, row) => { const buttonTableClick = async (val, row) => {
if (val == 'mainPlanOpe') { // 打开 if (val == 'mainPlanOpe') { // 打开
tableObject.loading = true tableObject.loading = true
await ProductionMainApi.open(row.id).then(() => { await ProductionMainApi.open(row.masterId).then(() => {
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
tableObject.loading = false tableObject.loading = false
getList() getList()
@ -248,7 +248,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'mainPlanClo') { // 关闭 } else if (val == 'mainPlanClo') { // 关闭
await message.confirm('确认要关闭吗？') await message.confirm('确认要关闭吗？')
tableObject.loading = true tableObject.loading = true
await ProductionMainApi.close(row.id).then(() => { await ProductionMainApi.close(row.masterId).then(() => {
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
tableObject.loading = false tableObject.loading = false
getList() getList()
@ -260,7 +260,7 @@ const buttonTableClick = async (val, row) => {
if (row.available == 'FALSE') return message.warning('当前数据：【不可用】') if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
await message.confirm('确认要提交审批吗？') await message.confirm('确认要提交审批吗？')
tableObject.loading = true tableObject.loading = true
await ProductionMainApi.submit(row.id).then(() => { await ProductionMainApi.submit(row.masterId).then(() => {
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
tableObject.loading = false tableObject.loading = false
getList() getList()
@ -271,7 +271,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'mainPlanTur') { // 驳回 } else if (val == 'mainPlanTur') { // 驳回
await message.confirm('确认要驳回吗？') await message.confirm('确认要驳回吗？')
tableObject.loading = true tableObject.loading = true
await ProductionMainApi.reject(row.id).then(() => { await ProductionMainApi.reject(row.masterId).then(() => {
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
tableObject.loading = false tableObject.loading = false
getList() getList()
@ -283,7 +283,7 @@ const buttonTableClick = async (val, row) => {
if (row.available == 'FALSE') return message.warning('当前数据：【不可用】') if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
await message.confirm('确认要审批通过吗？') await message.confirm('确认要审批通过吗？')
tableObject.loading = true tableObject.loading = true
await ProductionMainApi.agree(row.id).then(() => { await ProductionMainApi.agree(row.masterId).then(() => {
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
tableObject.loading = false tableObject.loading = false
getList() getList()
@ -296,7 +296,7 @@ const buttonTableClick = async (val, row) => {
await message.confirm('确认要发布吗？') await message.confirm('确认要发布吗？')
// 物料含有不可用时 是否继续执行 // 物料含有不可用时 是否继续执行
let isAvailable = true let isAvailable = true
await ProductionMainApi.getProductionDetail(row.id).then(async res =>{ await ProductionMainApi.getProductionDetail(row.masterId).then(async res =>{
if (res.length > 0) { if (res.length > 0) {
let rs = '' let rs = ''
res.forEach(item => { res.forEach(item => {
@ -311,7 +311,7 @@ const buttonTableClick = async (val, row) => {
return return
} }
tableObject.loading = true tableObject.loading = true
await ProductionMainApi.publish(row.id).then(() => { await ProductionMainApi.publish(row.masterId).then(() => {
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
tableObject.loading = false tableObject.loading = false
getList() getList()
@ -322,7 +322,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'mainPlanRes') { // 重置 } else if (val == 'mainPlanRes') { // 重置
await message.confirm('确认要重置吗？') await message.confirm('确认要重置吗？')
tableObject.loading = true tableObject.loading = true
await ProductionMainApi.resetting(row.id).then(() => { await ProductionMainApi.resetting(row.masterId).then(() => {
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
tableObject.loading = false tableObject.loading = false
getList() getList()
@ -345,7 +345,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'edit') { // 编辑 } else if (val == 'edit') { // 编辑
openForm('update', row) openForm('update', row)
} else if (val == 'delete') { // 删除 } else if (val == 'delete') { // 删除
handleDelete(row.id) handleDelete(row.masterId)
} }
} }

18
src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue
View File

@ -237,7 +237,7 @@ const butttondata = (row,$index) => {
const buttonTableClick = async (val, row) => { const buttonTableClick = async (val, row) => {
if (val == 'mainPlanOpe') { // 打开 if (val == 'mainPlanOpe') { // 打开
tableObject.loading = true tableObject.loading = true
await ProductionMainApi.open(row.id).then(() => { await ProductionMainApi.open(row.masterId).then(() => {
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
tableObject.loading = false tableObject.loading = false
getList() getList()
@ -248,7 +248,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'mainPlanClo') { // 关闭 } else if (val == 'mainPlanClo') { // 关闭
await message.confirm('确认要关闭吗？') await message.confirm('确认要关闭吗？')
tableObject.loading = true tableObject.loading = true
await ProductionMainApi.close(row.id).then(() => { await ProductionMainApi.close(row.masterId).then(() => {
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
tableObject.loading = false tableObject.loading = false
getList() getList()
@ -260,7 +260,7 @@ const buttonTableClick = async (val, row) => {
if (row.available == 'FALSE') return message.warning('当前数据：【不可用】') if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
await message.confirm('确认要提交审批吗？') await message.confirm('确认要提交审批吗？')
tableObject.loading = true tableObject.loading = true
await ProductionMainApi.submit(row.id).then(() => { await ProductionMainApi.submit(row.masterId).then(() => {
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
tableObject.loading = false tableObject.loading = false
getList() getList()
@ -271,7 +271,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'mainPlanTur') { // 驳回 } else if (val == 'mainPlanTur') { // 驳回
await message.confirm('确认要驳回吗？') await message.confirm('确认要驳回吗？')
tableObject.loading = true tableObject.loading = true
await ProductionMainApi.reject(row.id).then(() => { await ProductionMainApi.reject(row.masterId).then(() => {
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
tableObject.loading = false tableObject.loading = false
getList() getList()
@ -283,7 +283,7 @@ const buttonTableClick = async (val, row) => {
if (row.available == 'FALSE') return message.warning('当前数据：【不可用】') if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
await message.confirm('确认要审批通过吗？') await message.confirm('确认要审批通过吗？')
tableObject.loading = true tableObject.loading = true
await ProductionMainApi.agree(row.id).then(() => { await ProductionMainApi.agree(row.masterId).then(() => {
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
tableObject.loading = false tableObject.loading = false
getList() getList()
@ -296,7 +296,7 @@ const buttonTableClick = async (val, row) => {
await message.confirm('确认要发布吗？') await message.confirm('确认要发布吗？')
// 物料含有不可用时 是否继续执行 // 物料含有不可用时 是否继续执行
let isAvailable = true let isAvailable = true
await ProductionMainApi.getProductionDetail(row.id).then(async res =>{ await ProductionMainApi.getProductionDetail(row.masterId).then(async res =>{
if (res.length > 0) { if (res.length > 0) {
let rs = '' let rs = ''
res.forEach(item => { res.forEach(item => {
@ -311,7 +311,7 @@ const buttonTableClick = async (val, row) => {
return return
} }
tableObject.loading = true tableObject.loading = true
await ProductionMainApi.publish(row.id).then(() => { await ProductionMainApi.publish(row.masterId).then(() => {
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
tableObject.loading = false tableObject.loading = false
getList() getList()
@ -322,7 +322,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'mainPlanRes') { // 重置 } else if (val == 'mainPlanRes') { // 重置
await message.confirm('确认要重置吗？') await message.confirm('确认要重置吗？')
tableObject.loading = true tableObject.loading = true
await ProductionMainApi.resetting(row.id).then(() => { await ProductionMainApi.resetting(row.masterId).then(() => {
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
tableObject.loading = false tableObject.loading = false
getList() getList()
@ -345,7 +345,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'edit') { // 编辑 } else if (val == 'edit') { // 编辑
openForm('update', row) openForm('update', row)
} else if (val == 'delete') { // 删除 } else if (val == 'delete') { // 删除
handleDelete(row.id) handleDelete(row.masterId)
} }
} }

Write Preview
Loading…
Cancel
Save