Browse Source

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

master_hella_20240701
gaojs 5 months ago
parent
commit
46276eaa1c
  1. 2
      .env.development
  2. 2
      .env.prod
  3. 2
      .env.test
  4. 2
      .env.test-scp
  5. 2
      src/views/wms/countManage/count/countJobMain/index.vue
  6. 6
      src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/index.vue
  7. 12
      src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue
  8. 6
      src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/index.vue
  9. 6
      src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue
  10. 6
      src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue
  11. 6
      src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue
  12. 6
      src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue
  13. 6
      src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue
  14. 6
      src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue
  15. 6
      src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue
  16. 6
      src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue
  17. 6
      src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue
  18. 6
      src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue
  19. 6
      src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue
  20. 6
      src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/index.vue
  21. 6
      src/views/wms/issueManage/issue/issueRequestMain/index.vue
  22. 6
      src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue
  23. 12
      src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue
  24. 12
      src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue
  25. 6
      src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue
  26. 6
      src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue
  27. 6
      src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
  28. 6
      src/views/wms/productionManage/offlinesettlement/offlinesettlementRequestMain/index.vue
  29. 6
      src/views/wms/productionManage/processproduction/processproductionRequest/index.vue
  30. 6
      src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue
  31. 12
      src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts
  32. 12
      src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts
  33. 12
      src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts
  34. 12
      src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts
  35. 113
      src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue
  36. 6
      src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue
  37. 6
      src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/index.vue
  38. 12
      src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
  39. 15
      src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
  40. 12
      src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue
  41. 15
      src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts
  42. 12
      src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue
  43. 6
      src/views/wms/productionManage/productredress/productredressRequestMain/index.vue
  44. 6
      src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue
  45. 6
      src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
  46. 6
      src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue
  47. 12
      src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
  48. 12
      src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
  49. 6
      src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue
  50. 12
      src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue
  51. 6
      src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue
  52. 6
      src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
  53. 12
      src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
  54. 6
      src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue
  55. 3
      src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
  56. 6
      src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue

2
.env.development

@ -37,7 +37,7 @@ VITE_INTERFACE_URL='http://localhost:12080/magic/web/index.html'
VITE_JMREPORT_BASE_URL='http://localhost:12080'
# 租户配置
VITE_TENANT='["长春","成都"]'
VITE_TENANT='["长春1379","成都1397","长春2379"]'
# 查看质检报告环境
VITE_REPORT_URL = 'http://dev.ccwin-in.com:25400'

2
.env.prod

@ -37,7 +37,7 @@ VITE_INTERFACE_URL='http://dev.ccwin-in.com:25310/magic/web/index.html'
VITE_JMREPORT_BASE_URL='http://dev.ccwin-in.com:25310'
# 租户配置
VITE_TENANT='["长春","成都"]'
VITE_TENANT='["长春1379","成都1397","长春2379"]'
# 查看质检报告环境
VITE_REPORT_URL = 'http://dev.ccwin-in.com:25400'

2
.env.test

@ -37,7 +37,7 @@ VITE_INTERFACE_URL='http://dev.ccwin-in.com:25310/magic/web/index.html'
VITE_JMREPORT_BASE_URL='http://dev.ccwin-in.com:25310'
# 租户配置
VITE_TENANT='["长春","成都"]'
VITE_TENANT='["长春1379","成都1397","长春2379"]'
# 查看质检报告环境
VITE_REPORT_URL = 'http://dev.ccwin-in.com:25400'

2
.env.test-scp

@ -38,7 +38,7 @@ VITE_JMREPORT_BASE_URL='http://dev.ccwin-in.com:25311'
# 租户配置
VITE_TENANT='["长春","成都"]'
VITE_TENANT='["长春1379","成都1397","长春2379"]'
# 查看质检报告环境
VITE_REPORT_URL = 'http://dev.ccwin-in.com:25400'

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

@ -208,7 +208,7 @@ const butttondata = (row,$index) => {
{
label: '导入',
name: 'importCountJob',
hide: isShowMainButton(row,['1','2']),
hide: isShowMainButton(row,['2']),
type: 'success',
color: '',
link: true, //

6
src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/index.vue

@ -357,7 +357,11 @@ const tableSelectionDelete = (selection) => {
tableData.value = tableData.value.filter(item => !selection.includes(item))
}
//
const submitForm = async (formType, data) => {
const submitForm = async (formType, submitData) => {
let data = {...submitData}
if(data.masterId){
data.id = data.masterId
}
data.subList = tableData.value //
try {
if (formType === 'create') {

12
src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue

@ -437,7 +437,11 @@ const { tableObject: detatableData, tableMethods: detatableMethods } =useTable({
})
const { getList:getDetailList } = detatableMethods
//
const submitFormLabel = async (formType, data) => {
const submitFormLabel = async (formType, submitData) => {
let data = {...submitData}
if(data.masterId){
data.id = data.masterId
}
try {
console.log("formType==",formType)
console.log("data==",data)
@ -706,7 +710,11 @@ const tableSelectionDelete = (selection) => {
const flag = ref(false)
//
const submitForm = async (formType, data) => {
const submitForm = async (formType, submitData) => {
let data = {...submitData}
if(data.masterId){
data.id = data.masterId
}
data.subList = tableData.value //
data.subList.forEach(obj => {
if(obj.qty == 0){

6
src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/index.vue

@ -368,7 +368,11 @@ const tableSelectionDelete = (selection) => {
tableData.value = tableData.value.filter(item => !selection.includes(item))
}
//
const submitForm = async (formType, data) => {
const submitForm = async (formType, submitData) => {
let data = {...submitData}
if(data.masterId){
data.id = data.masterId
}
data.subList = tableData.value //
try {
if (formType === 'create') {

6
src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue

@ -506,7 +506,11 @@ const tableSelectionDelete = (selection) => {
const flag = ref(false)
//
const submitForm = async (formType, data) => {
const submitForm = async (formType, submitData) => {
let data = {...submitData}
if(data.masterId){
data.id = data.masterId
}
flag.value = false
data.subList = tableData.value //
data.subList.forEach(item=>{

6
src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue

@ -463,7 +463,11 @@ const tableSelectionDelete = (selection) => {
const flag = ref(false)
//
const submitForm = async (formType, data) => {
const submitForm = async (formType, submitData) => {
let data = {...submitData}
if(data.masterId){
data.id = data.masterId
}
data.subList = tableData.value //
data.subList.forEach(item=>{
item.toWarehouseCode = data.toWarehouseCode

6
src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue

@ -328,7 +328,11 @@ const openForm = (type: string, row?: any) => {
//
const submitForm = async (formType, data) => {
const submitForm = async (formType, submitData) => {
let data = {...submitData}
if(data.masterId){
data.id = data.masterId
}
data.subList = tableData.value //
let isExist = false
tableData.value.forEach(item => {

6
src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue

@ -438,7 +438,11 @@ const tableSelectionDelete = (selection) => {
const flag = ref(false)
//
const submitForm = async (formType, data) => {
const submitForm = async (formType, submitData) => {
let data = {...submitData}
if(data.masterId){
data.id = data.masterId
}
data.subList = tableData.value //
let isExist = false
tableData.value.forEach(item => {

6
src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue

@ -440,7 +440,11 @@ const tableSelectionDelete = (selection) => {
const flag = ref()
// form
const submitForm = async (formType,data) => {
const submitForm = async (formType,submitData) => {
let data = {...submitData}
if(data.masterId){
data.id = data.masterId
}
data.subList = tableData.value //
data.subList.forEach(item => {
if(item.toQty == 0){

6
src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue

@ -392,7 +392,11 @@ const tableSelectionDelete = (selection) => {
const flag = ref()
// form
const submitForm = async (formType,data) => {
const submitForm = async (formType,submitData) => {
let data = {...submitData}
if(data.masterId){
data.id = data.masterId
}
data.subList = tableData.value //
data.subList.forEach(item => {
if(item.qty == 0){

6
src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue

@ -418,7 +418,11 @@ const tableSelectionDelete = (selection) => {
const flag = ref()
// form
const submitForm = async (formType,data) => {
const submitForm = async (formType,submitData) => {
let data = {...submitData}
if(data.masterId){
data.id = data.masterId
}
data.subList = tableData.value //
data.subList.forEach(item => {
if(item.qty == 0){

6
src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue

@ -417,7 +417,11 @@ const tableSelectionDelete = (selection) => {
tableData.value = tableData.value.filter(item => !selection.includes(item))
}
//
const submitForm = async (formType, data) => {
const submitForm = async (formType, submitData) => {
let data = {...submitData}
if(data.masterId){
data.id = data.masterId
}
data.subList = tableData.value //
try {
if (formType === 'create') {

6
src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue

@ -386,7 +386,11 @@ const handleDeleteTable = (item, index) => {
}
//
const submitForm = async (formType, data) => {
const submitForm = async (formType, submitData) => {
let data = {...submitData}
if(data.masterId){
data.id = data.masterId
}
data.subList = tableData.value //
if(tableData.value.find(item => (item.toPackUnit == item.fromPackUnit))) {
message.warning('从包装规格与到包装规格不能相同')

6
src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue

@ -399,7 +399,11 @@ const tableSelectionDelete = (selection) => {
tableData.value = tableData.value.filter(item => !selection.includes(item))
}
//
const submitForm = async (formType, data) => {
const submitForm = async (formType, submitData) => {
let data = {...submitData}
if(data.masterId){
data.id = data.masterId
}
data.subList = tableData.value //
try {
if (formType === 'create') {

6
src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue

@ -407,7 +407,11 @@ const tableSelectionDelete = (selection) => {
tableData.value = tableData.value.filter(item => !selection.includes(item))
}
//
const submitForm = async (formType, data) => {
const submitForm = async (formType, submitData) => {
let data = {...submitData}
if(data.masterId){
data.id = data.masterId
}
data.subList = tableData.value //
try {
console.log("【调拨出库子列表】",data.subList)

6
src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/index.vue

@ -388,7 +388,11 @@ const tableSelectionDelete = (selection) => {
tableData.value = tableData.value.filter(item => !selection.includes(item))
}
//
const submitForm = async (formType, data) => {
const submitForm = async (formType, submitData) => {
let data = {...submitData}
if(data.masterId){
data.id = data.masterId
}
data.subList = tableData.value //
try {
if (formType === 'create') {

6
src/views/wms/issueManage/issue/issueRequestMain/index.vue

@ -386,7 +386,11 @@ const tableSelectionDelete = (selection) => {
tableData.value = tableData.value.filter(item => !selection.includes(item))
}
//
const submitForm = async (formType, data) => {
const submitForm = async (formType, submitData) => {
let data = {...submitData}
if(data.masterId){
data.id = data.masterId
}
data.subList = tableData.value //
if(tableData.value.find(item => (item.qty <= 0))) {
message.warning('数量必须大于0')

6
src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue

@ -441,7 +441,11 @@ const tableSelectionDelete = (selection) => {
tableData.value = tableData.value.filter(item => !selection.includes(item))
}
//
const submitForm = async (formType, data) => {
const submitForm = async (formType, submitData) => {
let data = {...submitData}
if(data.masterId){
data.id = data.masterId
}
data.subList = tableData.value //
try {
if (formType === 'create') {

12
src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue

@ -629,7 +629,11 @@ const tableSelectionDelete = (selection) => {
}
//
const submitForm = async (formType, data) => {
const submitForm = async (formType, submitData) => {
let data = {...submitData}
if(data.masterId){
data.id = data.masterId
}
data.subList = tableData.value //
let isZC = true //
data.subList.forEach(item => {
@ -667,7 +671,11 @@ const submitForm = async (formType, data) => {
}
//
const submitFormLabel = async (formType, data) => {
const submitFormLabel = async (formType, submitData) => {
let data = {...submitData}
if(data.masterId){
data.id = data.masterId
}
try {
detatableData.tableList.forEach(async (item) => {
item.toLocationCode = item.fromLocationCode

12
src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue

@ -563,7 +563,11 @@ const handleDeleteTable = (item, index) => {
}
//
const submitForm = async (formType, data) => {
const submitForm = async (formType, submitData) => {
let data = {...submitData}
if(data.masterId){
data.id = data.masterId
}
data.subList = tableData.value //
// 退 isOK
data.isOK = false // false
@ -592,7 +596,11 @@ const submitForm = async (formType, data) => {
}
//
const submitFormLabel = async (formType, data) => {
const submitFormLabel = async (formType, submitData) => {
let data = {...submitData}
if(data.masterId){
data.id = data.masterId
}
try {
detatableData.tableList.forEach(async (item) => {
await PackageApi.createPackageLabel({...item,toLocationCode:item.fromLocationCode}).then(res => {

6
src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue

@ -361,7 +361,11 @@ const tableSelectionDelete = (selection) => {
tableData.value = tableData.value.filter(item => !selection.includes(item))
}
//
const submitForm = async (formType, data) => {
const submitForm = async (formType, submitData) => {
let data = {...submitData}
if(data.masterId){
data.id = data.masterId
}
data.subList = tableData.value //
if(tableData.value.find(item => (item.qty <= 0))) {
message.warning('数量必须大于0')

6
src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue

@ -430,7 +430,11 @@ const tableSelectionDelete = (selection) => {
const flag = ref()
//
const submitForm = async (formType, data) => {
const submitForm = async (formType, submitData) => {
let data = {...submitData}
if(data.masterId){
data.id = data.masterId
}
data.subList = tableData.value //
const duplicateItems = tableData.value.filter((item, index) => {
return tableData.value.findIndex((el) => el.itemCode === item.itemCode) !== index;

6
src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue

@ -667,7 +667,11 @@ const tableSelectionDelete = (selection) => {
const flag = ref()
//
const submitForm = async (formType, data) => {
const submitForm = async (formType, submitData) => {
let data = {...submitData}
if(data.masterId){
data.id = data.masterId
}
data.subList = tableData.value //
let isExist = false
tableData.value.forEach(item => {

6
src/views/wms/productionManage/offlinesettlement/offlinesettlementRequestMain/index.vue

@ -312,7 +312,11 @@ const tableSelectionDelete = (selection) => {
}
//
const submitForm = async (formType, data) => {
const submitForm = async (formType, submitData) => {
let data = {...submitData}
if(data.masterId){
data.id = data.masterId
}
data.subList = tableData.value //
try {
if (formType === 'create') {

6
src/views/wms/productionManage/processproduction/processproductionRequest/index.vue

@ -310,7 +310,11 @@ const handleDelete = async (id: number) => {
//
const submitForm = async (formType, data) => {
const submitForm = async (formType, submitData) => {
let data = {...submitData}
if(data.masterId){
data.id = data.masterId
}
data.subList = tableData.value //
try {
if (formType === 'create') {

6
src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue

@ -547,7 +547,11 @@ const tableSelectionDelete = (selection) => {
tableData.value = tableData.value.filter(item => !selection.includes(item))
}
//
const submitForm = async (formType, data) => {
const submitForm = async (formType, submitData) => {
let data = {...submitData}
if(data.masterId){
data.id = data.masterId
}
data.subList = tableData.value //
// bom
let childListRs = true

12
src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts

@ -576,12 +576,12 @@ export const ProductionMainRules = reactive({
productionLine: [
{ required: true, message: '请选择生产线', trigger: 'change' }
],
shift: [
{ required: true, message: '请选择班次', trigger: 'change' }
],
team: [
{ required: true, message: '请选择班组', trigger: 'change' }
],
// shift: [
// { required: true, message: '请选择班次', trigger: 'change' }
// ],
// team: [
// { required: true, message: '请选择班组', trigger: 'change' }
// ],
planDate: [
{ required: true, message: '请输入计划日期', trigger: 'blur' }
],

12
src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts

@ -567,12 +567,12 @@ export const ProductionMainRules = reactive({
productionLine: [
{ required: true, message: '请选择生产线', trigger: 'change' }
],
shift: [
{ required: true, message: '请选择班次', trigger: 'change' }
],
team: [
{ required: true, message: '请选择班组', trigger: 'change' }
],
// shift: [
// { required: true, message: '请选择班次', trigger: 'change' }
// ],
// team: [
// { required: true, message: '请选择班组', trigger: 'change' }
// ],
planDate: [
{ required: true, message: '请输入计划日期', trigger: 'blur' }
],

12
src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts

@ -567,12 +567,12 @@ export const ProductionMainRules = reactive({
productionLine: [
{ required: true, message: '请选择生产线', trigger: 'change' }
],
shift: [
{ required: true, message: '请选择班次', trigger: 'change' }
],
team: [
{ required: true, message: '请选择班组', trigger: 'change' }
],
// shift: [
// { required: true, message: '请选择班次', trigger: 'change' }
// ],
// team: [
// { required: true, message: '请选择班组', trigger: 'change' }
// ],
planDate: [
{ required: true, message: '请输入计划日期', trigger: 'blur' }
],

12
src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts

@ -568,12 +568,12 @@ export const ProductionMainRules = reactive({
productionLine: [
{ required: true, message: '请选择生产线', trigger: 'change' }
],
shift: [
{ required: true, message: '请选择班次', trigger: 'change' }
],
team: [
{ required: true, message: '请选择班组', trigger: 'change' }
],
// shift: [
// { required: true, message: '请选择班次', trigger: 'change' }
// ],
// team: [
// { required: true, message: '请选择班组', trigger: 'change' }
// ],
planDate: [
{ required: true, message: '请输入计划日期', trigger: 'blur' }
],

113
src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue

@ -75,6 +75,8 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
import {getAccessToken} from "@/utils/auth";
import { getJmreportBaseUrl } from '@/utils/systemParam'
import * as SwitchApi from '@/api/wms/switch'
//
defineOptions({ name: 'ProductputawayJobMain' })
@ -116,13 +118,38 @@ const { tableObject, tableMethods } = useTable({
//
const { getList, setSearchParams } = tableMethods
const switchproductPutawayJobPrint = ref(false)
const getSwitchStatus = async ()=>{
let res = await SwitchApi.getSwitchPage({
pageSize: 20,
pageNo: 1,
code: 'productPutawayJobPrint'
})
console.log('getSwitchStatus',res)
if(res&&res.list){
switchproductPutawayJobPrint.value = res.list[0].effectiveSetValue == 'TRUE'
}
}
//
const HeadButttondata = [
const HeadButttondata = computed(()=>{
return [
defaultButtons.defaultExportBtn({hasPermi:'wms:productputaway-job-main:export'}), //
{
label: '待处理状态全部打印',
name: 'printAllPending',
hide: !switchproductPutawayJobPrint.value,
type: 'primary',
icon: '',
color: '',
hasPermi: ''
},
defaultButtons.defaultFreshBtn(null), //
defaultButtons.defaultFilterBtn(null), //
defaultButtons.defaultSetBtn(null), //
]
})
//
const buttonBaseClick = (val, item) => {
@ -137,6 +164,9 @@ const buttonBaseClick = (val, item) => {
getList()
}
} else if (val == 'filtrate') { //
} else if(val == 'printAllPending'){
//
handleDocumentPrintAll()
}else { //
console.log('其他按钮', item)
}
@ -158,7 +188,7 @@ const butttondata = (row,$index) => {
return []
}
return [
defaultButtons.mainListDocumentPrintBtn(null), //
defaultButtons.mainListDocumentPrintBtn({hide:!switchproductPutawayJobPrint.value}), //
defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), //
defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), //
defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), //
@ -169,75 +199,7 @@ const butttondata = (row,$index) => {
// -
const buttonTableClick = async (val, row) => {
if (val == 'mainJobExe') { //
let aaa = {
"id": "1809190000111838147",
"requestNumber": "REC4620231214-0004",
"supplierCode": null,
"fromWarehouseCode": "W1",
"toWarehouseCode": null,
"fromAreaCodes": "",
"toAreaCodes": "",
"fromAreaTypes": "WIP,RAW",
"toAreaTypes": "SEMI,FG",
"completetime": 1702545291000,
"requestTime": 1702524283000,
"requestDueTime": 1689562428000,
"status": "2",
"expiredTime": null,
"updateTime": 1702545291000,
"updater": "1",
"jobStageStatus": null,
"priority": null,
"priorityIncrement": null,
"departmentCode": "103",
"acceptUserId": "1",
"acceptTime": 1702552206000,
"completeUserId": null,
"number": "JOB2220231214-0007",
"businessType": "ProductPutaway",
"remark": "111100",
"createTime": 1702545291000,
"creator": "1",
"autoComplete": "FALSE",
"allowModifyLocation": "FALSE",
"allowModifyQty": "TRUE",
"allowBiggerQty": "TRUE",
"allowSmallerQty": "TRUE",
"allowModifyInventoryStatus": "TRUE",
"allowContinuousScanning": "TRUE",
"allowPartialComplete": "TRUE",
"allowModifyBatch": "FALSE",
"allowModifyPackingNumber": "FALSE",
"inInventoryStatuses": "OK",
"outInventoryStatuses": "OK",
subList: [
{
"id": "1809190001814017359",
"packingNumber": "12",
"containerNumber": "001",
"batch": "21",
"inventoryStatus": "OK",
"poNumber": null,
"poLine": "item01",
"fromLocationCode": "H03",
"toLocationCode": "L-R-001-002-1-02",
"itemCode": "item01",
"itemName": "物料01",
"itemDesc1": "",
"itemDesc2": "",
"projectCode": "xm01",
"qty": 3,
"uom": "EA",
"number": "JOB2220231214-0007",
"remark": "00",
"createTime": 1702545291000,
"creator": "1",
"fromOwnerCode": null,
"toOwnerCode": null
}
]
}
ProductputawayJobMainApi.executeProductputawayMain(aaa)
// ProductputawayJobMainApi.executeProductputawayMain(aaa)
} else if (val == 'mainJobAba') { //
await ProductputawayJobMainApi.abandonProductputawayMain(row.masterId)
getList()
@ -268,6 +230,13 @@ const handleDocumentPrint = async (row) => {
window.open(src.value+'&id='+row.masterId)
}
/**
* 待处理全部打印
*/
const handleDocumentPrintAll = async () => {
window.open(src.value+'&id=printAllPending')
}
/** 导出按钮操作 */
const exportLoading = ref(false) //
const handleExport = async () => {
@ -293,8 +262,10 @@ const searchFormClick = (searchData) => {
getList() //
}
/** 初始化 **/
onMounted(async () => {
await getSwitchStatus()
getList()
})
</script>

6
src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue

@ -374,7 +374,11 @@ const tableSelectionDelete = (selection) => {
}
//
const submitForm = async (formType, data) => {
const submitForm = async (formType, submitData) => {
let data = {...submitData}
if(data.masterId){
data.id = data.masterId
}
data.type = 'predict'
data.subList = tableData.value //
if(data.subList.find(item => (item.qty <= 0))) {

6
src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/index.vue

@ -364,7 +364,11 @@ const tableSelectionDelete = (selection) => {
tableData.value = tableData.value.filter(item => !selection.includes(item))
}
//
const submitForm = async (formType, data) => {
const submitForm = async (formType, submitData) => {
let data = {...submitData}
if(data.masterId){
data.id = data.masterId
}
data.type = 'assemble'
data.subList = tableData.value //
if(data.subList.find(item => (item.qty <= 0))) {

12
src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue

@ -565,7 +565,11 @@ const tableSelectionDelete = (selection) => {
tableData.value = tableData.value.filter(item => !selection.includes(item))
}
//
const submitForm = async (formType, data) => {
const submitForm = async (formType, submitData) => {
let data = {...submitData}
if(data.masterId){
data.id = data.masterId
}
tableData.value.forEach((row, index) => {
row['expireDate'] = row['expireTime']?addDay(row['produceDate'],row['expireTime']).valueOf():dayjs('2099-12-31').valueOf()
})
@ -619,7 +623,11 @@ const searchFormClick = (searchData) => {
}
//
const submitFormLabel = async (formType, data) => {
const submitFormLabel = async (formType, submitData) => {
let data = {...submitData}
if(data.masterId){
data.id = data.masterId
}
try {
console.log("aaaaa",data);
data.subList=detatableData.tableList

15
src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts

@ -526,12 +526,12 @@ export const ProductreceiptRequestMainRules = reactive({
workshopCode: [
{ required: true, message: '请选择车间代码', trigger: 'change' }
],
team: [
{ required: true, message: '请选择班组代码', trigger: 'change' }
],
shift: [
{ required: true, message: '请选择班次代码', trigger: 'change' }
],
// team: [
// { required: true, message: '请选择班组代码', trigger: 'change' }
// ],
// shift: [
// { required: true, message: '请选择班次代码', trigger: 'change' }
// ],
// departmentCode: [
// { required: true, message: '请输入部门', trigger: 'blur' }
// ],
@ -996,7 +996,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
width: 150
},
tableForm: {
type: 'Select'
type: 'Select',
disabled: true
}
},

12
src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue

@ -568,7 +568,11 @@ const tableSelectionDelete = (selection) => {
}
//
const submitForm = async (formType, data) => {
const submitForm = async (formType, submitData) => {
let data = {...submitData}
if(data.masterId){
data.id = data.masterId
}
tableData.value.forEach((row, index) => {
row['expireDate'] = row['expireTime']?addDay(row['produceDate'],row['expireTime']).valueOf():dayjs('2099-12-31').valueOf()
})
@ -622,7 +626,11 @@ const searchFormClick = (searchData) => {
}
//
const submitFormLabel = async (formType, data) => {
const submitFormLabel = async (formType, submitData) => {
let data = {...submitData}
if(data.masterId){
data.id = data.masterId
}
try {
console.log("aaaaa",data);
data.subList=detatableData.tableList

15
src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts

@ -527,12 +527,12 @@ export const ProductreceiptRequestMainRules = reactive({
workshopCode: [
{ required: true, message: '请选择车间代码', trigger: 'change' }
],
team: [
{ required: true, message: '请选择班组代码', trigger: 'change' }
],
shift: [
{ required: true, message: '请选择班次代码', trigger: 'change' }
],
// team: [
// { required: true, message: '请选择班组代码', trigger: 'change' }
// ],
// shift: [
// { required: true, message: '请选择班次代码', trigger: 'change' }
// ],
// departmentCode: [
// { required: true, message: '请输入部门', trigger: 'blur' }
// ],
@ -997,7 +997,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
width: 150
},
tableForm: {
type: 'Select'
type: 'Select',
disabled: true
}
},
{

12
src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue

@ -558,7 +558,11 @@ const tableSelectionDelete = (selection) => {
}
//
const submitForm = async (formType, data) => {
const submitForm = async (formType, submitData) => {
let data = {...submitData}
if(data.masterId){
data.id = data.masterId
}
data.subList = tableData.value //
if(data.subList.find(item => (item.qty <= 0))) {
message.warning('数量必须大于0')
@ -611,7 +615,11 @@ const searchFormClick = (searchData) => {
}
//
const submitFormLabel = async (formType, data) => {
const submitFormLabel = async (formType, submitData) => {
let data = {...submitData}
if(data.masterId){
data.id = data.masterId
}
try {
detatableData.tableList.forEach(async (item) => {
//

6
src/views/wms/productionManage/productredress/productredressRequestMain/index.vue

@ -408,7 +408,11 @@ const tableSelectionDelete = (selection) => {
}
//
const submitForm = async (formType, data) => {
const submitForm = async (formType, submitData) => {
let data = {...submitData}
if(data.masterId){
data.id = data.masterId
}
data.subList = tableData.value //
if(data.subList.find(item => (item.qty <= 0))) {
message.warning('数量必须大于0')

6
src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue

@ -580,7 +580,11 @@ const handleDeleteTable = (item, index) => {
}
//
const submitForm = async (formType, data) => {
const submitForm = async (formType, submitData) => {
let data = {...submitData}
if(data.masterId){
data.id = data.masterId
}
data.subList = tableData.value //
// bom
let childListRs = true

6
src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue

@ -647,7 +647,11 @@ const tableSelectionDelete = (selection) => {
}
//
const submitForm = async (formType, data) => {
const submitForm = async (formType, submitData) => {
let data = {...submitData}
if(data.masterId){
data.id = data.masterId
}
data.subList = tableData.value //
// bom
let childListRs = true

6
src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue

@ -354,7 +354,11 @@
}
//
const submitForm = async (formType, data) => {
const submitForm = async (formType, submitData) => {
let data = {...submitData}
if(data.masterId){
data.id = data.masterId
}
data.subList = tableData.value //
try {
if (formType === 'create') {

12
src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue

@ -420,7 +420,11 @@ const { tableObject: detatableData, tableMethods: detatableMethods } =useTable({
const { getList:getDetailList } = detatableMethods
//
const submitFormLabel = async (formType, data) => {
const submitFormLabel = async (formType, submitData) => {
let data = {...submitData}
if(data.masterId){
data.id = data.masterId
}
try {
console.log("formType==",formType)
console.log("data==",data)
@ -714,7 +718,11 @@ const onEnter = async (field,value)=>{
getSearchTableData(value,true)
}
//
const submitForm = async (formType, data) => {
const submitForm = async (formType, submitData) => {
let data = {...submitData}
if(data.masterId){
data.id = data.masterId
}
tableData.value.forEach((row, index) => {
row['expireDate'] = row['expireTime']?addDay(row['produceDate'],row['expireTime']).valueOf():dayjs('2099-12-31').valueOf()
})

12
src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue

@ -177,7 +177,11 @@ const { tableObject: detatableData, tableMethods: detatableMethods } =useTable({
const { getList:getDetailList } = detatableMethods
//
const submitFormLabel = async (formType, data) => {
const submitFormLabel = async (formType, submitData) => {
let data = {...submitData}
if(data.masterId){
data.id = data.masterId
}
try {
console.log("formType==",formType)
console.log("data==",data)
@ -832,7 +836,11 @@ const tableSelectionDelete = (selection) => {
}
//
const submitForm = async (formType, data) => {
const submitForm = async (formType, submitData) => {
let data = {...submitData}
if(data.masterId){
data.id = data.masterId
}
console.log('submitForm',tableData.value)
// if(tableData.value.find(item=>Number(item.returnedQty)>Number(item.receiptQty))){
// message.warning("退")

6
src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue

@ -439,7 +439,11 @@ const tableSelectionDelete = (selection) => {
}
//
const submitForm = async (formType, data) => {
const submitForm = async (formType, submitData) => {
let data = {...submitData}
if(data.masterId){
data.id = data.masterId
}
data.subList = tableData.value //
try {
if (formType === 'create') {

12
src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue

@ -417,7 +417,11 @@ const { tableObject: detatableData, tableMethods: detatableMethods } =useTable({
const { getList:getDetailList } = detatableMethods
//
const submitFormLabel = async (formType, data) => {
const submitFormLabel = async (formType, submitData) => {
let data = {...submitData}
if(data.masterId){
data.id = data.masterId
}
try {
await message.confirm(t('ts.是否为此数据生成标签?'))
await PurchasereceiptRequestMainApi.genLabel(genLabelId.value)
@ -578,7 +582,11 @@ const tableSelectionDelete = (selection) => {
}
//
const submitForm = async (formType, data) => {
const submitForm = async (formType, submitData) => {
let data = {...submitData}
if(data.masterId){
data.id = data.masterId
}
data.subList = tableData.value //
try {
if (formType === 'create') {

6
src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue

@ -368,7 +368,11 @@ const tableSelectionDelete = (selection) => {
}
//
const submitForm = async (formType, data) => {
const submitForm = async (formType, submitData) => {
let data = {...submitData}
if(data.masterId){
data.id = data.masterId
}
data.subList = tableData.value //
try {
if (formType === 'create') {

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

@ -614,7 +614,11 @@ const handleSelectionPublish = async ()=>{
}
//
const submitForm = async (formType, data) => {
const submitForm = async (formType, submitData) => {
let data = {...submitData}
if(data.masterId){
data.id = data.masterId
}
data.subList = []
let flag = false
for (let item of tableData.value) {

12
src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue

@ -825,7 +825,11 @@ const { getList:getDetailList } = detatableMethods
//
const submitFormLabel = async (formType, data) => {
const submitFormLabel = async (formType, submitData) => {
let data = {...submitData}
if(data.masterId){
data.id = data.masterId
}
try {
console.log("formType==",formType)
console.log("data==",data)
@ -952,7 +956,11 @@ const handleDeleteTable = (item, index) => {
}
//
const submitForm = async (formType, data) => {
const submitForm = async (formType, submitData) => {
let data = {...submitData}
if(data.masterId){
data.id = data.masterId
}
data.subList = tableData.value //
let isHave = data.subList.some((item) => {
console.log("CCCCC",item.expireDate)

6
src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue

@ -278,7 +278,11 @@ const getSearchTableData = async (number,formField,searchField)=>{
//
const submitForm = async (formType, data) => {
const submitForm = async (formType, submitData) => {
let data = {...submitData}
if(data.masterId){
data.id = data.masterId
}
data.subList = tableData.value //
let isHave = data.subList.some((item) => {
console.log("CCCCC",item.expireDate)

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

@ -1098,6 +1098,9 @@ export const SupplierdeliverRequestDetailRules = reactive({
// packingNumber: [
// { required: true, message: '请输入包装号', trigger: 'blur' }
// ],
qty:[
{ required: true, message: '请输入发货数量', trigger: 'change' },
],
batch: [
{ required: true, message: '请输入批次', trigger: 'blur' },
{ max: 50, message: '不得超过50个字符', trigger: 'blur' },

6
src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue

@ -454,7 +454,11 @@ import { getJmreportBaseUrl } from '@/utils/systemParam'
}
//
const submitForm = async (formType, data) => {
const submitForm = async (formType, submitData) => {
let data = {...submitData}
if(data.masterId){
data.id = data.masterId
}
data.subList = tableData.value //
try {
if (formType === 'create') {

Loading…
Cancel
Save