Browse Source

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

linshi20240813
ljlong_2630 3 months ago
parent
commit
e000997aaa
  1. 13
      src/api/wms/location/index.ts
  2. 2
      src/api/wms/productreceiptRecordMain/index.ts
  3. 20
      src/utils/auth.ts
  4. 3
      src/utils/dict.ts
  5. 20
      src/views/qms/inspectionJob/addForm.vue
  6. 1
      src/views/qms/inspectionJob/index.vue
  7. 3
      src/views/qms/inspectionJobProduction/addForm.vue
  8. 3
      src/views/qms/inspectionJobPurchase/addForm.vue
  9. 2
      src/views/qms/inspectionQ1/inspectionQ1.data.ts
  10. 2
      src/views/qms/inspectionQ2/inspectionQ2.data.ts
  11. 41
      src/views/qms/inspectionQ3/index.vue
  12. 19
      src/views/qms/inspectionQ3/inspectionQ3.data.ts
  13. 4
      src/views/qms/inspectionRecord/index.vue
  14. 4
      src/views/qms/inspectionRequest/inspectionRequestMain.data.ts
  15. 4
      src/views/wms/basicDataManage/itemManage/itemarea/index.vue
  16. 19
      src/views/wms/countManage/count/countJobMain/countJobMain.data.ts
  17. 20
      src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/customerreturnJobMain.data.ts
  18. 30
      src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts
  19. 9
      src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts
  20. 19
      src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts
  21. 29
      src/views/wms/inventoryManage/package/index.vue
  22. 588
      src/views/wms/inventoryManage/package/package.data.ts
  23. 9
      src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/packageoverRecordMain.data.ts
  24. 8
      src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/packageoverRetrospect.data.ts
  25. 18
      src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts
  26. 23
      src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/unplannedissueJobMain.data.ts
  27. 4
      src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts
  28. 4
      src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts
  29. 35
      src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts
  30. 4
      src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts
  31. 3
      src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts
  32. 2
      src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts
  33. 26
      src/views/wms/issueManage/issue/issueRecordMain/issueRecordMain.data.ts
  34. 2
      src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/productionreceiptJobMain.data.ts
  35. 23
      src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/productionreceiptRecordMain.data.ts
  36. 19
      src/views/wms/issueManage/productionreturn/productionreturnJobMain/productionreturnJobMain.data.ts
  37. 43
      src/views/wms/issueManage/productionreturn/productionreturnRecordMain/productionreturnRecordMain.data.ts
  38. 46
      src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue
  39. 4
      src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts
  40. 2
      src/views/wms/issueManage/productionscrap/productionscrapRecordMain/index.vue
  41. 2
      src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts
  42. 4
      src/views/wms/issueManage/repleinsh/repleinshRecordMain/repleinshRecordMain.data.ts
  43. 16
      src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts
  44. 115
      src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue
  45. 142
      src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/inventorymoveRecordMainNew.data.ts
  46. 152
      src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/inventorymoveRecordRequestMain.data.ts
  47. 9
      src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts
  48. 20
      src/views/wms/productionManage/productputaway/productputawayJobMain/productputawayJobMain.data.ts
  49. 4
      src/views/wms/productionManage/productputaway/productputawayRecordMain/productputawayRecordMain.data.ts
  50. 19
      src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/productputawayAssembleJobMain.data.ts
  51. 8
      src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRecordMain/productputawayAssembleRecordMain.data.ts
  52. 4
      src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue
  53. 2
      src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/index.vue
  54. 2
      src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/index.vue
  55. 2
      src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue
  56. 1
      src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts
  57. 4
      src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/purchasereceiptRequestMain.data.ts
  58. 2
      src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts
  59. 5
      src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts
  60. 2
      src/views/wms/purchasereceiptManage/putaway/putawayJobMain/putawayJobMain.data.ts
  61. 4
      src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/putawayRecordMain.data.ts
  62. 1
      src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/sparereceiptJobMain.data.ts
  63. 2
      src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts

13
src/api/wms/location/index.ts

@ -34,6 +34,17 @@ export const getLocationPage = async (params) => {
return await request.get({ url: `/wms/location/page`, params })
}
}
export const getLocationMPage = async (params) => {
if (params.isSearch) {
delete params.isSearch
const data = {...params}
return request.post({ url: '/wms/location/Msenior', data })
} else {
return await request.get({ url: `/wms/location/Mpage`, params })
}
}
export const getLocationPageRepleinsh = async (params) => {
if (params.isSearch) {
delete params.isSearch
@ -139,4 +150,4 @@ export const selectConfigToLocation = async (params) => {
// 根据code获取数据列表
export const getLocationByCodes = async (params) => {
return await request.get({ url: `/wms/location/listByCodes`, params })
}
}

2
src/api/wms/productreceiptRecordMain/index.ts

@ -95,7 +95,7 @@ export const exportProductreceiptRecordMain = async (params) => {
params.filters.push(cmd)
delete params.isSearch
const data = {...params}
return await request.post({ url: '/wms/productreceipt-record-main/export-excel-senior', data })
return await request.downloadPost({ url: '/wms/productreceipt-record-main/export-excel-senior', data })
} else {
return await request.download({ url: `/wms/productreceipt-record-main/export-excel`, params })
}

20
src/utils/auth.ts

@ -10,24 +10,32 @@ const RefreshTokenKey = 'REFRESH_TOKEN'
// 获取token
export const getAccessToken = () => {
// 此处与TokenKey相同,此写法解决初始化时Cookies中不存在TokenKey报错
return wsCache.get(AccessTokenKey) ? wsCache.get(AccessTokenKey) : wsCache.get('ACCESS_TOKEN')
// return wsCache.get(AccessTokenKey) ? wsCache.get(AccessTokenKey) : wsCache.get('ACCESS_TOKEN')
return sessionStorage.getItem(AccessTokenKey) ? sessionStorage.getItem(AccessTokenKey) : sessionStorage.getItem('ACCESS_TOKEN')
}
// 刷新token
export const getRefreshToken = () => {
return wsCache.get(RefreshTokenKey)
// return wsCache.get(RefreshTokenKey)
return sessionStorage.getItem(RefreshTokenKey)
}
// 设置token
export const setToken = (token: TokenType) => {
wsCache.set(RefreshTokenKey, token.refreshToken)
wsCache.set(AccessTokenKey, token.accessToken)
// wsCache.set(RefreshTokenKey, token.refreshToken)
// wsCache.set(AccessTokenKey, token.accessToken)
sessionStorage.setItem(RefreshTokenKey,token.refreshToken)
sessionStorage.setItem(AccessTokenKey,token.accessToken)
}
// 删除token
export const removeToken = () => {
wsCache.delete(AccessTokenKey)
wsCache.delete(RefreshTokenKey)
// wsCache.delete(AccessTokenKey)
// wsCache.delete(RefreshTokenKey)
sessionStorage.removeItem(AccessTokenKey)
sessionStorage.removeItem(RefreshTokenKey)
}
/** 格式化token(jwt格式) */

3
src/utils/dict.ts

@ -323,6 +323,9 @@ export enum DICT_TYPE {
QUALITY_NOTIFICATION_PRIORITY = 'quality_notification_priority', // 质量通知优先级
CLAIM_REASON = 'claim_Reason', // 质量通知索赔原因
QMS_CODE = 'qms_code', // 质量通知代码
QMS_Q1_CODE = 'qms_Q1_code',
QMS_Q2_CODE = 'qms_Q2_code',
QMS_Q3_CODE = 'qms_Q3_code',
DEFECT_LOCATION = 'defect_location', // 质量通知缺陷位置
DEFECT_TYPE = 'defect_type', // 质量通知缺陷类型
PROBLEM_REASON = 'problem_reason', // 质量通知问题原因

20
src/views/qms/inspectionJob/addForm.vue

@ -414,6 +414,16 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="备注">
<el-input
v-model="item.inspectionJobCharacteristicsUpdateReqVO.remark"
placeholder="请输入备注"
type="text"
maxlength="200"
/>
</el-form-item>
</el-col>
</el-row>
</div>
</el-form>
@ -502,16 +512,6 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="备注">
<el-input
v-model="cur.remark"
placeholder="请输入备注"
type="text"
maxlength="200"
/>
</el-form-item>
</el-col>
<!-- <el-col :span="12" v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == '1'" >
<el-form-item label="缺陷级别" required>
<el-select v-model="cur.defectLevel" placeholder="请选择缺陷级别" disabled>

1
src/views/qms/inspectionJob/index.vue

@ -180,6 +180,7 @@ const { getList, setSearchParams } = tableMethods
//
const HeadButttondata = [
defaultButtons.defaultExportBtn({ hasPermi: 'qms:inspection-job-main:export' }), //
defaultButtons.defaultFreshBtn(null), //
defaultButtons.defaultFilterBtn(null), //
defaultButtons.defaultSetBtn(null) //

3
src/views/qms/inspectionJobProduction/addForm.vue

@ -502,7 +502,8 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="12" v-if="item.inspectionJobCharacteristicsUpdateReqVO
.recordInspectionQuantifyList?.length-1 == i">
<el-form-item label="备注">
<el-input
v-model="cur.remark"

3
src/views/qms/inspectionJobPurchase/addForm.vue

@ -502,7 +502,8 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="12" v-if="item.inspectionJobCharacteristicsUpdateReqVO
.recordInspectionQuantifyList?.length-1 == i">
<el-form-item label="备注">
<el-input
v-model="cur.remark"

2
src/views/qms/inspectionQ1/inspectionQ1.data.ts

@ -179,7 +179,7 @@ export const Q1 = useCrudSchemas(
label: '编码',
field: 'code',
sort: 'custom',
dictType: DICT_TYPE.QMS_CODE,
dictType: DICT_TYPE.QMS_Q1_CODE,
dictClass: 'string',
isSearch: false,
isTable: true,

2
src/views/qms/inspectionQ2/inspectionQ2.data.ts

@ -286,7 +286,7 @@ export const Q2 = useCrudSchemas(
label: '编码',
field: 'code',
sort: 'custom',
dictType: DICT_TYPE.QMS_CODE,
dictType: DICT_TYPE.QMS_Q2_CODE,
dictClass: 'string',
isSearch: false,
isTable: true,

41
src/views/qms/inspectionQ3/index.vue

@ -55,6 +55,7 @@
:apiCreate="Q3Api.createQ3"
@searchTableSuccess="searchTableSuccess"
:isBusiness="false"
@onChange="onChange"
/>
<!-- 详情 -->
@ -77,6 +78,8 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
import TableHead from '@/components/TableHead/src/TableHead.vue'
import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
import Detail from '@/components/Detail/src/Detail.vue'
import * as ProductionlineitemApi from '@/api/wms/productionlineitem'
import * as StdcostpriceApi from '@/api/wms/stdcostprice'
import { useUserStore } from '@/store/modules/user'
const userStore = useUserStore()
@ -92,12 +95,43 @@ routeName.value = route.name
const tableColumns = ref(Q3.allSchemas.tableColumns)
//
const priceObj = ref()
const searchTableSuccess = (formField, searchField, val, formRef) => {
nextTick(() => {
nextTick(async () => {
const setV = {}
if (formField == 'itemCode') {
console.log(val)
setV['uom'] = val[0]['uom']
console.log(formRef.formModel.qty)
// let res = await ProductionlineitemApi.selectItemCodeToProductionLineCode(val[0].code)
ProductionlineitemApi.selectItemCodeToProductionLineCode(val[0].code).then((res) => {
console.log(res)
if (res?.length > 0) {
formRef.formModel.defectLocation = res[0].productionLineCode
Q3.allSchemas.formSchema.forEach(item=>{
if (item.field == 'defectLocation') {
item.componentProps.options = res
}
})
}
})
const params = {
by: "ASC",
filters: [{column: "itemCode", action: "==", value: val[0].code}],
pageNo: 1,
pageSize: 500,
sort: ""
}
params.isSearch = true
StdcostpriceApi.getStdcostpricePage(params).then((res) => {
if (res.list?.length > 0) {
priceObj.value = res.list[0]
formRef.setValues({
amount: (parseFloat(formRef.formModel.qty) * parseFloat(priceObj.value.price)).toFixed(6)
})
}
})
}
if (formField == 'q1Number') {
//Q1
@ -113,6 +147,11 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
}
})
}
const onChange =(field,e)=>{
if (field == 'qty') {
basicFormRef.value.formRef.formModel.amount = (parseFloat( basicFormRef.value.formRef.formModel.qty) * parseFloat( priceObj.value.price)).toFixed(6)
}
}
//
const updataTableColumns = (val) => {

19
src/views/qms/inspectionQ3/inspectionQ3.data.ts

@ -22,11 +22,11 @@ export const Q3Rules = reactive({
defectLocation: [required],
defectType: [
{ required: true, message: '缺陷类型不能为空', trigger: 'blur' },
{ max: 64, message: '不得超过64个字符', trigger: 'blur' }
{ max: 50, message: '不得超过50个字符', trigger: 'blur' }
],
problemReason: [
{ required: true, message: '问题原因不能为空', trigger: 'blur' },
{ max: 64, message: '不得超过64个字符', trigger: 'blur' }
{ max: 50, message: '不得超过50个字符', trigger: 'blur' }
],
priority: [required],
amount: [required],
@ -214,7 +214,7 @@ export const Q3 = useCrudSchemas(
label: '编码',
field: 'code',
sort: 'custom',
dictType: DICT_TYPE.QMS_CODE,
dictType: DICT_TYPE.QMS_Q3_CODE,
dictClass: 'string',
isSearch: true,
isTable: true,
@ -226,12 +226,19 @@ export const Q3 = useCrudSchemas(
label: '缺陷位置',
field: 'defectLocation',
sort: 'custom',
dictType: DICT_TYPE.DEFECT_LOCATION,
dictClass: 'string',
isSearch: false,
isTable: false,
tableForm: {
type: 'Select'
form: {
component: 'Select',
componentProps: {
options: [],
optionsAlias: {
labelField: 'productionLineName',
valueField: 'productionLineCode'
},
filterable: true,
}
}
},
{

4
src/views/qms/inspectionRecord/index.vue

@ -163,7 +163,7 @@ const { getList, setSearchParams } = tableMethods
//
let HeadButttondata = [
// defaultButtons.defaultExportBtn(null), //
defaultButtons.defaultExportBtn({ hasPermi: 'qms:inspection-recode-main:export' }), //
defaultButtons.defaultFreshBtn(null), //
defaultButtons.defaultFilterBtn(null), //
defaultButtons.defaultSetBtn(null) //
@ -342,7 +342,7 @@ const handleExport = async () => {
//
exportLoading.value = true
const data = await InspectionRecordMainApi.exportInspectionRecordMain(tableObject.params)
download.excel(data, '备件申领记录主.xlsx')
download.excel(data, '检验记录.xlsx')
} catch {
} finally {
exportLoading.value = false

4
src/views/qms/inspectionRequest/inspectionRequestMain.data.ts

@ -440,8 +440,8 @@ export const InspectionMain = useCrudSchemas(
isSearch: true
},
{
label: 'aql',
field: 'aql',
label: 'AQL值',
field: 'aqlValue',
sort: 'custom',
dictType: DICT_TYPE.BASIC_AQL,
dictClass: 'string',

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

@ -52,7 +52,7 @@
:tableData="tableData"
:apiUpdate="ItemareaApi.updateItemarea"
:apiCreate="ItemareaApi.createItemarea"
:isBusiness="true"
:isBusiness="false"
@handleAddTable="handleAddTable"
@handleDeleteTable="handleDeleteTable"
:isShowReduceButtonSelection="true"
@ -68,7 +68,7 @@
<Detail
ref="detailRef"
:isOpenSearchTable="true"
:isBasic="false"
:isBasic="true"
:allSchemas="Itemarea.allSchemas"
:detailAllSchemas="ItemareaDetail.allSchemas"
:detailAllSchemasRules="ItemareaDetailRules"

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

@ -15,6 +15,15 @@ export const CountJobMain = useCrudSchemas(reactive<CrudSchema[]>([
},
isSearch: true
},
{
label: '申请单号',
field: 'requestNumber',
sort: 'custom',
table: {
width: 180
},
isSearch: true
},
{
label: '状态',
field: 'status',
@ -62,15 +71,7 @@ export const CountJobMain = useCrudSchemas(reactive<CrudSchema[]>([
width: 180
},
},
{
label: '申请单号',
field: 'requestNumber',
sort: 'custom',
table: {
width: 180
},
isSearch: true
},
{
label: '阶段',
field: 'stage',

20
src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/customerreturnJobMain.data.ts

@ -19,6 +19,16 @@ export const CustomerreturnJobMain = useCrudSchemas(
},
isSearch: true
},
{
label: '申请单号',
field: 'requestNumber',
sort: 'custom',
table: {
width: 180
},
isTable: true,
isSearch: true
},
{
label: '状态',
field: 'status',
@ -31,16 +41,6 @@ export const CustomerreturnJobMain = useCrudSchemas(
width: 150
}
},
{
label: '申请单号',
field: 'requestNumber',
sort: 'custom',
table: {
width: 180
},
isTable: true,
isSearch: true
},
{
label: '发货记录单号',
field: 'deliverRecordNumber',

30
src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts

@ -19,20 +19,6 @@ export const CustomerreturnRecordMain = useCrudSchemas(
},
isSearch: true
},
{
label: '状态',
field: 'status',
dictType: DICT_TYPE.REQUEST_STATUS,
dictClass: 'string',
isSearch: false,
isTable: false,
isDetail: false,
isForm: false,
sort: 'custom',
table: {
width: 150
}
},
{
label: '申请单号',
field: 'requestNumber',
@ -50,8 +36,22 @@ export const CustomerreturnRecordMain = useCrudSchemas(
table: {
width: 180
},
isTable: false
},
{
label: '状态',
field: 'status',
dictType: DICT_TYPE.REQUEST_STATUS,
dictClass: 'string',
isSearch: false,
isTable: false,
isDetail: false,
isForm: false,
sort: 'custom',
table: {
width: 150
}
},
{
label: '发货记录单号',
field: 'deliverRecordNumber',

9
src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts

@ -17,8 +17,8 @@ export const StockupMainJob = useCrudSchemas(reactive<CrudSchema[]>([
},
},
{
label: '发货计划单号',
field: 'deliverPlanNumber',
label: '申请单号',
field: 'requestNumber',
sort: 'custom',
isForm: false,
table: {
@ -26,14 +26,13 @@ export const StockupMainJob = useCrudSchemas(reactive<CrudSchema[]>([
},
},
{
label: '申请单号',
field: 'requestNumber',
label: '发货计划单号',
field: 'deliverPlanNumber',
sort: 'custom',
isForm: false,
table: {
width: 180
},
isTable: false
},
{
label: '从仓库',

19
src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts

@ -17,34 +17,33 @@ export const StockupMainRecord = useCrudSchemas(reactive<CrudSchema[]>([
},
},
{
label: '发货计划单号',
field: 'deliverPlanNumber',
label: '申请单号',
field: 'requestNumber',
sort: 'custom',
isForm: false,
// isSearch: true,
table: {
width: 180
},
},
{
label: '申请单号',
field: 'requestNumber',
label: '任务单号',
field: 'jobNumber',
sort: 'custom',
// isSearch: true,
table: {
width: 180
},
isTable: false,
},
{
label: '任务单号',
field: 'jobNumber',
label: '发货计划单号',
field: 'deliverPlanNumber',
sort: 'custom',
// isSearch: true,
isForm: false,
table: {
width: 180
},
isTable: false,
},
{
label: '从仓库',
field: 'fromWarehouseCode',

29
src/views/wms/inventoryManage/package/index.vue

@ -65,6 +65,7 @@ import { Package,PackageRules } from './package.data'
import * as PackageApi from '@/api/wms/package'
import * as defaultButtons from '@/utils/disposition/defaultButtons'
import { getJmreportBaseUrl } from '@/utils/systemParam'
import * as EquipmentInspectionRecordMainApi from "@/api/eam/equipmentInspectionRecordMain";
defineOptions({ name: 'package' })
@ -85,15 +86,28 @@ const updataTableColumns = (val) => {
//
const searchTableParams = ref([
])
//
const searchTableSuccess = (formField, searchField, val, basicFormRef, type, row ) => {
const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
nextTick(() => {
const setV = {}
setV[formField] = val[0][searchField]
setV['itemName'] = val[0]['name']
basicFormRef.setValues(setV)
basicFormRef.setValues(setV)
if (formField == 'itemCode'){
setV['itemName'] = val[0]['name']
setV['itemDesc1'] = val[0]['desc1']
setV['itemDesc2'] = val[0]['desc2']
setV['uom'] = val[0]['uom']
setV['altUom'] = val[0]['altUom']
}
else if (formField == 'packUnit'){
setV['packQty'] = val[0]['packQty']
}
else if(formField == 'toWarehouseCode'){
setV['toLocationCode'] = null
}
else if(formField == 'supplierCode'){
setV['supplierItemCode'] = val[0]['supplierItemCode']
}
formRef.setValues(setV)
})
}
@ -106,7 +120,7 @@ const { getList, setSearchParams } = tableMethods
//
const HeadButttondata = [
defaultButtons.defaultAddBtn({hasPermi:'wms:package:create'}), //
// defaultButtons.defaultImportBtn({hasPermi:'wms:package:import'}), //
defaultButtons.defaultImportBtn({hasPermi:'wms:package:import'}), //
defaultButtons.defaultExportBtn({hasPermi:'wms:package:export'}), //
defaultButtons.defaultFreshBtn(null), //
defaultButtons.defaultFilterBtn(null), //
@ -315,7 +329,7 @@ const handleImport = () => {
//
const importTemplateData = reactive({
templateUrl: '',
templateTitle: '包装导入模版.xlsx'
templateTitle: '包装信息导入模板.xlsx'
})
//
@ -335,5 +349,6 @@ const searchFormClick = (searchData) => {
/** 初始化 **/
onMounted(async () => {
getList()
importTemplateData.templateUrl = await PackageApi.importTemplate()
})
</script>

588
src/views/wms/inventoryManage/package/package.data.ts

@ -2,12 +2,32 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
import {Itembasic} from "@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data";
import * as ItembasicApi from "@/api/wms/itembasic";
import {Warehouse} from "@/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data";
import * as WarehouseApi from "@/api/wms/warehouse";
import {Dock} from "@/views/wms/basicDataManage/factoryModeling/dock/dock.data";
import * as DockApi from "@/api/wms/dock";
import {Packageunit} from "@/views/wms/basicDataManage/itemManage/packageunit/packageunit.data";
import * as PackageunitApi from "@/api/wms/packageunit";
import {Location} from "@/views/wms/basicDataManage/factoryModeling/location/location.data";
import * as LocationApi from "@/api/wms/location";
import {Supplier} from "@/views/wms/basicDataManage/supplierManage/supplier/supplier.data";
import * as SupplierApi from "@/api/wms/supplier";
import {Itempackaging} from "@/views/wms/basicDataManage/itemManage/itempackage/itempackage.data";
import * as ItempackagingApi from "@/api/wms/itempackage";
import * as SupplieritemApi from "@/api/wms/supplieritem";
import { formatTime } from '@/utils/index'
import {
Supplieritem
} from "@/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data";
// 表单校验
export const PackageRules = reactive({
number: [required],
// number: [required],
itemCode: [required],
itemName: [required],
packUnit: [required],
packQty: [required],
})
export const Package = useCrudSchemas(reactive<CrudSchema[]>([
{
@ -19,16 +39,17 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
width: 180,
fixed: 'left'
},
isForm:false
},
{
label: '父包装号',
field: 'parentNumber',
sort: 'custom',
isSearch: true,
table: {
width: 180,
},
},
// {
// label: '父包装号',
// field: 'parentNumber',
// sort: 'custom',
// isSearch: true,
// table: {
// width: 180,
// },
// },
{
label: '物料代码',
field: 'itemCode',
@ -50,7 +71,15 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
key: 'available',
value: 'TRUE',
isMainValue: false
}]
}],
verificationParams: [{
key: 'code',
action: '==',
value: '',
isMainValue: false,
isSearch: true,
isFormModel: true,
}], // 失去焦点校验参数
}
},
isSearch: true
@ -70,6 +99,11 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150,
},
form: {
componentProps: {
disabled: true
}
},
},
{
label: '物料描述2',
@ -78,12 +112,20 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150,
},
form: {
componentProps: {
disabled: true
}
},
},
{
label: '批次',
field: 'batch',
sort: 'custom',
isSearch: true,
form:{
value: formatTime(new Date(), 'yyyyMMdd')
},
table: {
width: 150,
},
@ -123,6 +165,7 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
},
form: {
component: 'DatePicker',
value: formatTime(new Date(), 'yyyy-MM-dd'),
componentProps: {
style: {width: '100%'},
type: 'date',
@ -186,7 +229,10 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
dictType: DICT_TYPE.UOM,
dictClass: 'string', // 默认都是字符串类型其他暂不考虑
form: {
component: 'SelectV2'
component: 'SelectV2',
componentProps: {
disabled: true
}
},
table: {
width: 150,
@ -207,7 +253,10 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
dictType: DICT_TYPE.UOM,
dictClass: 'string', // 默认都是字符串类型其他暂不考虑
form: {
component: 'SelectV2'
component: 'SelectV2',
componentProps: {
disabled: true
}
},
table: {
width: 150,
@ -229,14 +278,6 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
width: 150,
},
},
{
label: '包装数量',
field: 'packQty',
sort: 'custom',
table: {
width: 150,
},
},
{
label: '包装规格',
field: 'packUnit',
@ -249,31 +290,134 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150,
},
form: {
// labelMessage: '信息提示说明!!!',
componentProps: {
enterSearch:true,
isSearch:true,
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择物料代码',
searchField: 'packUnit',
searchTitle: '物料包装信息',
searchAllSchemas: Itempackaging.allSchemas,
searchPage: ItempackagingApi.getItempackagingPageTree,
searchCondition: [{
key: 'available',
value: 'TRUE',
isMainValue: false
},{
key:'itemCode', // 查询列表中字段
value:'itemCode', // 指主表某字段
message: '请选择物料代码!', // 当前置条件为空时 弹出信息提示
isMainValue: true, // 表示查询条件是主表的字段的值
action: '==', // 查询拼接条件
}],
verificationParams: [{
key: 'packUnit',
action: '==',
value: '',
isMainValue: false,
isSearch: true,
isFormModel: true,
}], // 失去焦点校验参数
}
}
},
{
label: '仓库代码',
field: 'toWarehouseCode',
sort: 'custom',
table: {
width: 150,
},
},
{
label: '月台代码',
field: 'toDockCode',
label: '包装数量',
field: 'packQty',
sort: 'custom',
table: {
width: 150,
},
},
{
label: '库位代码',
field: 'toLocationCode',
sort: 'custom',
table: {
width: 150,
form: {
componentProps: {
disabled: true
}
},
},
// {
// label: '仓库代码',
// field: 'toWarehouseCode',
// sort: 'custom',
// table: {
// width: 150,
// },
// form: {
// // labelMessage: '信息提示说明!!!',
// componentProps: {
// enterSearch:true,
// isSearch:true,
// isSearchList: true, // 开启查询弹窗
// searchListPlaceholder: '请选择仓库代码', // 输入框占位文本
// searchField: 'code', // 查询弹窗赋值字段
// searchTitle: '仓库信息', // 查询弹窗标题
// searchAllSchemas: Warehouse.allSchemas, // 查询弹窗所需类
// searchPage: WarehouseApi.getWarehousePage, // 查询弹窗所需分页方法
// searchCondition: [{
// key: 'available',
// value: 'TRUE',
// isMainValue: false
// }]
// }
// }
// },
// {
// label: '月台代码',
// field: 'toDockCode',
// sort: 'custom',
// table: {
// width: 150,
// },
// form: {
// // labelMessage: '信息提示说明!!!',
// componentProps: {
// enterSearch: true,
// isSearchList: true,
// searchListPlaceholder: '请选择月台代码',
// searchField: 'code',
// searchTitle: '客户月台',
// searchAllSchemas: Dock.allSchemas,
// searchPage: DockApi.getDockPage,
// searchCondition: [{
// key: 'available',
// value: 'TRUE',
// isMainValue: false
// }],
// }
// }
// },
// {
// label: '库位代码',
// field: 'toLocationCode',
// sort: 'custom',
// table: {
// width: 150,
// },
// form: {
// // labelMessage: '信息提示说明!!!',
// componentProps: {
// enterSearch: true,
// isSearchList: true,
// searchListPlaceholder: '请选择库位代码',
// searchField: 'code',
// searchTitle: '库位信息',
// searchAllSchemas: Location.allSchemas,
// searchPage: LocationApi.getLocationPage,
// searchCondition: [{
// key: 'available',
// value: 'TRUE',
// isMainValue: false
// },{
// key: 'warehouseCode',
// value: 'toWarehouseCode',
// message: '请填写仓库代码!',
// isMainValue: true
// }],
// }
// }
// },
{
label: '供应商代码',
field: 'supplierCode',
@ -281,6 +425,36 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150,
},
form: {
// labelMessage: '信息提示说明!!!',
componentProps: {
enterSearch:true,
isInpuFocusShow: true,
searchListPlaceholder: '请选择物料代码', // 输入框占位文本
searchField: 'supplierCode', // 查询弹窗赋值字段
searchTitle: '供应商物料信息',
isSearchList: true, // 开启查询弹窗
searchAllSchemas: Supplieritem.allSchemas, // 查询弹窗所需类
searchPage: SupplieritemApi.getSupplieritemPage, // 查询弹窗所需分页方法
searchCondition:[{
key: 'itemCode',
value: 'itemCode',
message: '请填写物料代码!',
isMainValue: true
}],
verificationParams: [
{
key: 'supplierCode',
action: '==',
value: '',
isMainValue: false,
isSearch: true,
isFormModel: true
}
] // 失去焦点校验参数
}
}
},
{
label: '供应商物料代码',
@ -289,159 +463,193 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150,
},
form: {
componentProps: {
disabled: true
// enterSearch: true,
// isSearchList: true, // 开启查询弹窗
// searchListPlaceholder: '请选择供应商物料', // 输入框占位文本
// searchField: 'supplierItemCode', // 查询弹窗赋值字段
// searchTitle: '供应商信息', // 查询弹窗标题
// searchAllSchemas: Supplieritem.allSchemas, // 查询弹窗所需类
// searchPage: SupplieritemApi.getSupplieritemPage, // 查询弹窗所需分页方法
// searchCondition: [
// {
// key: 'available',
// value: 'TRUE',
// isMainValue: false
// },{
// key: 'supplierCode',
// value: 'supplierCode',
// message: '请填写物料代码!',
// isMainValue: true
// }
// ],
// verificationParams: [
// {
// key: 'code',
// action: '==',
// value: '',
// isMainValue: false,
// isSearch: true,
// isFormModel: true
// }
// ] // 失去焦点校验参数
}
}
},
{
label: '采购订单号',
field: 'poNumber',
sort: 'custom',
table: {
width: 150,
},
},
{
label: '采购订单行',
field: 'poLine',
sort: 'custom',
table: {
width: 150,
},
},
{
label: '采购计划单号',
field: 'rpNumber',
sort: 'custom',
table: {
width: 150,
},
},
{
label: '发货单号',
field: 'asnNumber',
sort: 'custom',
table: {
width: 182,
},
},
{
label: '生产订单号',
field: 'woNumber',
sort: 'custom',
table: {
width: 150,
},
},
{
label: '生产订单行',
field: 'woLine',
sort: 'custom',
table: {
width: 150,
},
},
{
label: '生产线代码',
field: 'productionLineCode',
sort: 'custom',
table: {
width: 150,
},
},
{
label: '班组代码',
field: 'teamCode',
sort: 'custom',
table: {
width: 150,
},
},
{
label: '班次代码',
field: 'shiftCode',
sort: 'custom',
table: {
width: 150,
},
},
{
label: '客户代码',
field: 'customerCode',
sort: 'custom',
table: {
width: 150,
},
},
{
label: '客户月台代码',
field: 'customerDockCode',
sort: 'custom',
table: {
width: 150,
},
},
{
label: '客户物料代码',
field: 'customerItemCode',
sort: 'custom',
table: {
width: 150,
},
},
{
label: '销售订单号',
field: 'soNumber',
sort: 'custom',
table: {
width: 150,
},
},
{
label: '销售订单行',
field: 'soLine',
sort: 'custom',
table: {
width: 150,
},
},
{
label: '质量等级',
field: 'eqLevel',
sort: 'custom',
table: {
width: 150,
},
},
{
label: '货主代码',
field: 'ownerCode',
sort: 'custom',
table: {
width: 150,
},
},
{
label: '重量',
field: 'weight',
sort: 'custom',
table: {
width: 150,
},
},
{
label: '面积',
field: 'area',
sort: 'custom',
table: {
width: 150,
},
},
{
label: '体积',
field: 'volume',
sort: 'custom',
table: {
width: 150,
},
},
// {
// label: '采购订单号',
// field: 'poNumber',
// sort: 'custom',
// table: {
// width: 150,
// },
// },
// {
// label: '采购订单行',
// field: 'poLine',
// sort: 'custom',
// table: {
// width: 150,
// },
// },
// {
// label: '采购计划单号',
// field: 'rpNumber',
// sort: 'custom',
// table: {
// width: 150,
// },
// },
// {
// label: '发货单号',
// field: 'asnNumber',
// sort: 'custom',
// table: {
// width: 182,
// },
// },
// {
// label: '生产订单号',
// field: 'woNumber',
// sort: 'custom',
// table: {
// width: 150,
// },
// },
// {
// label: '生产订单行',
// field: 'woLine',
// sort: 'custom',
// table: {
// width: 150,
// },
// },
// {
// label: '生产线代码',
// field: 'productionLineCode',
// sort: 'custom',
// table: {
// width: 150,
// },
// },
// {
// label: '班组代码',
// field: 'teamCode',
// sort: 'custom',
// table: {
// width: 150,
// },
// },
// {
// label: '班次代码',
// field: 'shiftCode',
// sort: 'custom',
// table: {
// width: 150,
// },
// },
// {
// label: '客户代码',
// field: 'customerCode',
// sort: 'custom',
// table: {
// width: 150,
// },
// },
// {
// label: '客户月台代码',
// field: 'customerDockCode',
// sort: 'custom',
// table: {
// width: 150,
// },
// },
// {
// label: '客户物料代码',
// field: 'customerItemCode',
// sort: 'custom',
// table: {
// width: 150,
// },
// },
// {
// label: '销售订单号',
// field: 'soNumber',
// sort: 'custom',
// table: {
// width: 150,
// },
// },
// {
// label: '销售订单行',
// field: 'soLine',
// sort: 'custom',
// table: {
// width: 150,
// },
// },
// {
// label: '质量等级',
// field: 'eqLevel',
// sort: 'custom',
// table: {
// width: 150,
// },
// },
// {
// label: '货主代码',
// field: 'ownerCode',
// sort: 'custom',
// table: {
// width: 150,
// },
// },
// {
// label: '重量',
// field: 'weight',
// sort: 'custom',
// table: {
// width: 150,
// },
// },
// {
// label: '面积',
// field: 'area',
// sort: 'custom',
// table: {
// width: 150,
// },
// },
// {
// label: '体积',
// field: 'volume',
// sort: 'custom',
// table: {
// width: 150,
// },
// },
{
label: '创建时间',
field: 'createTime',

9
src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/packageoverRecordMain.data.ts

@ -11,11 +11,18 @@ export const PackageoverMain = useCrudSchemas(reactive<CrudSchema[]>([
width: 180
},
},
{
label: '申请单号',
field: 'requestNumber',
sort: 'custom',
table: {
width: 180
},
},
{
label: '任务单据号',
field: 'jobNumber',
sort: 'custom',
isTable: false,
isSearch: true,
table: {
width: 180

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

@ -15,6 +15,14 @@ export const PackageoverRetrospect = useCrudSchemas(reactive<CrudSchema[]>([
width: 180
},
},
{
label: '申请单号',
field: 'requestNumber',
sort: 'custom',
table: {
width: 180
},
},
{
label: '任务单据号',
field: 'jobNumber',

18
src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts

@ -20,6 +20,15 @@ export const ScrapJobMain = useCrudSchemas(
},
isSearch: true
},
{
label: '申请单号',
field: 'requestNumber',
sort: 'custom',
table: {
width: 180
},
isSearch: true
},
{
label: '状态',
field: 'status',
@ -32,15 +41,6 @@ export const ScrapJobMain = useCrudSchemas(
width: 150
}
},
{
label: '申请单号',
field: 'requestNumber',
sort: 'custom',
table: {
width: 180
},
isSearch: true
},
{
label: 'Q3通知单号',
field: 'q3Number',

23
src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/unplannedissueJobMain.data.ts

@ -25,6 +25,15 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
},
isSearch: true,
},
{
label: '申请单号',
field: 'requestNumber',
sort: 'custom',
table: {
width: 150
},
isSearch: true,
},
{
label: '状态',
field: 'status',
@ -55,15 +64,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
width: 150
},
},
{
label: '申请单号',
field: 'requestNumber',
sort: 'custom',
table: {
width: 150
},
isSearch: true,
},
{
label: '申请时间',
field: 'requestTime',
@ -368,12 +369,12 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
},
{
label: '备注',
field: 'remark',
field: 'remarkMain',
sort: 'custom',
isTable:false,
table: {
width: 150
},
}
},
{
label: '自动完成',

4
src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts

@ -375,11 +375,12 @@ export const UnplannedissueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
},
{
label: '备注',
field: 'remark',
field: 'remarkMain',
sort: 'custom',
table: {
width: 150
},
isTable: false,
},
{
label: '创建时间',
@ -746,7 +747,6 @@ export const UnplannedissueRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
width: 150
},
isTable: true,
hiddenInMain:true,
},
// {
// label: '任务明细ID',

4
src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts

@ -497,13 +497,13 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
},
{
label: '备注',
field: 'remark',
field: 'remarkMain',
sort: 'custom',
table: {
width: 150
},
isTable: false,
sortTableDefault: 1000,
isTable: true,
},
{
label: '直接生成记录',

35
src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts

@ -27,6 +27,15 @@ export const UnplannedreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
},
isSearch: true,
},
{
label: '申请单号',
field: 'requestNumber',
sort: 'custom',
table: {
width: 180
},
isSearch: true,
},
{
label: '状态',
field: 'status',
@ -39,15 +48,6 @@ export const UnplannedreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
width: 150
},
},
{
label: '申请单号',
field: 'requestNumber',
sort: 'custom',
table: {
width: 180
},
isSearch: true,
},
{
label: '申请时间',
field: 'requestTime',
@ -350,14 +350,15 @@ export const UnplannedreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
// width: 150
// },
// },
// {
// label: '备注',
// field: 'remark',
// sort: 'custom',
// table: {
// width: 150
// },
// },
{
label: '备注',
field: 'remarkMain',
sort: 'custom',
table: {
width: 150
},
isTable: false,
},
{
label: '自动完成',
field: 'autoComplete',

4
src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts

@ -350,12 +350,12 @@ export const UnplannedreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
},
{
label: '备注',
field: 'remark',
field: 'remarkMain',
isTable:false,
sort: 'custom',
table: {
width: 150
},
}
},
{
label: '创建时间',

3
src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts

@ -539,11 +539,12 @@ export const UnplannedreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>
},
{
label: '备注',
field: 'remark',
field: 'remarkMain',
sort: 'custom',
table: {
width: 150
},
isTable:false,
sortTableDefault: 1000,
},
{

2
src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts

@ -24,7 +24,7 @@ export const IssueJobMain = useCrudSchemas(
table: {
width: 180
},
isTable: false
sortTableDefault: 1
},
{
label: '供应商代码',

26
src/views/wms/issueManage/issue/issueRecordMain/issueRecordMain.data.ts

@ -18,34 +18,34 @@ export const IssueRecordMain = useCrudSchemas(
isSearch: true
},
{
label: '状态',
field: 'status',
dictType: DICT_TYPE.JOB_STATUS,
dictClass: 'string',
isTable: false,
label: '申请单号',
field: 'requestNumber',
sort: 'custom',
table: {
width: 150
width: 180
},
sortTableDefault: 1
},
{
label: '申请单号',
field: 'requestNumber',
label: '任务单号',
field: 'jobNumber',
sort: 'custom',
table: {
width: 180
},
isTable: false
sortTableDefault: 1
},
{
label: '任务单号',
field: 'jobNumber',
label: '状态',
field: 'status',
dictType: DICT_TYPE.JOB_STATUS,
dictClass: 'string',
isTable: false,
sort: 'custom',
table: {
width: 180
width: 150
},
isTable: false
sortTableDefault: 1
},
{
label: '供应商代码',

2
src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/productionreceiptJobMain.data.ts

@ -23,7 +23,7 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 180
},
isTable: false,
sortTableDefault: 2,
},
{
label: '车间代码',

23
src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/productionreceiptRecordMain.data.ts

@ -17,16 +17,13 @@ export const ProductionreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>
isSearch: true
},
{
label: '状态',
field: 'status',
dictType: DICT_TYPE.JOB_STATUS,
dictClass: 'string',
isTable: false,
label: '申请单号',
field: 'jobNumber',
sort: 'custom',
table: {
width: 150
width: 180
},
sortTableDefault:1,
sortTableDefault: 1,
},
{
label: '发料记录单号',
@ -35,7 +32,19 @@ export const ProductionreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>
table: {
width: 180
},
sortTableDefault: 1
},
{
label: '状态',
field: 'status',
dictType: DICT_TYPE.JOB_STATUS,
dictClass: 'string',
isTable: false,
sort: 'custom',
table: {
width: 150
},
sortTableDefault:1,
},
{
label: '任务单号',

19
src/views/wms/issueManage/productionreturn/productionreturnJobMain/productionreturnJobMain.data.ts

@ -15,6 +15,15 @@ export const ProductionreturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
},
isSearch: true,
},
{
label: '申请单号',
field: 'requestNumber',
sort: 'custom',
table: {
width: 180
},
isSearch: true,
},
{
label: '状态',
field: 'status',
@ -35,16 +44,6 @@ export const ProductionreturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
width: 150
},
},
{
label: '申请单号',
field: 'requestNumber',
sort: 'custom',
table: {
width: 180
},
isSearch: true,
isTable: false,
},
{
label: '从仓库代码',
field: 'fromWarehouseCode',

43
src/views/wms/issueManage/productionreturn/productionreturnRecordMain/productionreturnRecordMain.data.ts

@ -15,26 +15,6 @@ export const ProductionreturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
},
isSearch: true
},
// {
// label: '状态',
// field: 'status',
// dictType: DICT_TYPE.REQUEST_STATUS,
// dictClass: 'string',
// isForm: false,
// isTable: true,
// sort: 'custom',
// table: {
// width: 150
// },
// },
{
label: '车间代码',
field: 'workshopCode',
sort: 'custom',
table: {
width: 150
},
},
{
label: '申请单号',
field: 'requestNumber',
@ -42,7 +22,6 @@ export const ProductionreturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
table: {
width: 180
},
isTable: false,
isSearch: true
},
@ -53,10 +32,30 @@ export const ProductionreturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
table: {
width: 180
},
isTable: false,
isSearch: true
},
// {
// label: '状态',
// field: 'status',
// dictType: DICT_TYPE.REQUEST_STATUS,
// dictClass: 'string',
// isForm: false,
// isTable: true,
// sort: 'custom',
// table: {
// width: 150
// },
// },
{
label: '车间代码',
field: 'workshopCode',
sort: 'custom',
table: {
width: 150
},
},
{
label: '出库事务类型',
field: 'outTransactionType',

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

@ -322,17 +322,17 @@ const butttondata = (row,$index) => {
defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']), hasPermi:'wms:productionreturn-request-main:update'}), //
// defaultButtons.mainListDeleteBtn({hasPermi:'wms:productionreturn-request-main:delete'}), //
//
{
label: '创建标签',
name: 'cjbq',
hide: isShowMainButton(row,['3']),
type: 'primary',
icon: '',
color: '',
hasPermi: '',
link: true, //
},
defaultButtons.mainListPointBtn({hide:isShowMainButton(row,['3','6','8'])}), //
// {
// label: '',
// name: 'cjbq',
// hide: isShowMainButton(row,['3']),
// type: 'primary',
// icon: '',
// color: '',
// hasPermi: '',
// link: true, //
// },
// defaultButtons.mainListPointBtn({hide:isShowMainButton(row,['3','6','8'])}), //
]
}
@ -465,18 +465,18 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'mainHandle') { //
//
let isCreateLabel = false
await PackageApi.getPackagePage({
requestNumber: row.number
}).then(res => {
if (res) {
if (res.list.length > 0) isCreateLabel = true
}
})
if (!isCreateLabel) {
message.warning('请先创建标签')
return
}
// let isCreateLabel = false
// await PackageApi.getPackagePage({
// requestNumber: row.number
// }).then(res => {
// if (res) {
// if (res.list.length > 0) isCreateLabel = true
// }
// })
// if (!isCreateLabel) {
// message.warning('')
// return
// }
tableObject.loading = true
ProductionreturnRequestMainNoApi.handle(row.masterId).then(() => {
message.success(t('common.updateSuccess'))

4
src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts

@ -533,7 +533,8 @@ export const ProductionreturnRequestDetail = useCrudSchemas(
table: {
width: 120
},
isTable: false,
isTable:false,
isTableForm:false,
tableForm: {
isInpuFocusShow: true,
isSearchList: true, // 开启查询弹窗
@ -589,6 +590,7 @@ export const ProductionreturnRequestDetail = useCrudSchemas(
width: 120
},
isTable: false,
isTableForm: false,
tableForm: {
disabled: true
},

2
src/views/wms/issueManage/productionscrap/productionscrapRecordMain/index.vue

@ -156,7 +156,7 @@ const handleExport = async () => {
//
exportLoading.value = true
const data = await ProductionscrapRecordMainApi.exportProductionscrapRecordMain(tableObject.params)
download.excel(data, '线标报废记录.xlsx')
download.excel(data, '线标报废记录.xlsx')
} catch {
} finally {
exportLoading.value = false

2
src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts

@ -23,7 +23,7 @@ export const RepleinshJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 180
},
isTable: false,
sortTableDefault: 1,
},
{
label: '供应商代码',

4
src/views/wms/issueManage/repleinsh/repleinshRecordMain/repleinshRecordMain.data.ts

@ -35,7 +35,7 @@ export const RepleinshRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 180
},
isTable: false,
sortTableDefault:1,
},
{
label: '任务单号',
@ -44,7 +44,7 @@ export const RepleinshRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 180
},
isTable: false,
sortTableDefault: 2,
},
// {
// label: '供应商代码',

16
src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts

@ -16,20 +16,20 @@ export const InventorymoveJobMain = useCrudSchemas(reactive<CrudSchema[]>([
isSearch: true,
},
{
label: '状态',
field: 'status',
dictType: DICT_TYPE.JOB_STATUS,
dictClass: 'string',
isSearch: true,
isTable: true,
label: '申请单号',
field: 'requestNumber',
sort: 'custom',
table: {
width: 150
},
},
{
label: '申请单号',
field: 'requestNumber',
label: '状态',
field: 'status',
dictType: DICT_TYPE.JOB_STATUS,
dictClass: 'string',
isSearch: true,
isTable: true,
sort: 'custom',
table: {
width: 150

115
src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue

@ -1,7 +1,7 @@
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<Search :schema="[...InventorymoveRecordMain.allSchemas.searchSchema,...InventorymoveRecordDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
<Search :schema="[...InventorymoveRecordMainNew.allSchemas.searchSchema,...InventorymoveRecordDetailNew.allSchemas.searchSchema]" @search="setSearchParams({'business_type':'Move'})" @reset="setSearchParams({'business_type':'Move'})" />
</ContentWrap>
<!-- 列表头部 -->
@ -11,8 +11,8 @@
:routeName="routeName"
@updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick"
:allSchemas="InventorymoveRecordMain.allSchemas"
:detailAllSchemas="InventorymoveRecordDetail.allSchemas"
:allSchemas="InventorymoveRecordMainNew.allSchemas"
:detailAllSchemas="InventorymoveRecordDetailNew.allSchemas"
/>
<!-- 列表 -->
@ -66,11 +66,13 @@
<Detail
ref="detailRef"
:isBasic="false"
:allSchemas="InventorymoveRecordMain.allSchemas"
:detailAllSchemas="InventorymoveRecordDetail.allSchemas"
:detailAllSchemasRules="InventorymoveRecordDetailRules"
:allSchemas="InventorymoveRecordMainNew.allSchemas"
:detailAllSchemas="InventorymoveRecordDetailNew.allSchemas"
:detailAllSchemasRules="InventorymoveRecordDetailNewRules"
:apiPage="InventorymoveRecordDetailApi.getInventorymoveRecordDetailPage"
/>
<!-- 标签打印 -->
<SearchTable style="width:905px" ref="searchTableRef" @searchTableSuccess="searchTableSuccessLabel" />
<!-- 导入 -->
<ImportForm ref="importFormRef" url="/wms/inventorymove-record-main/importMove" :importTemplateData="importTemplateData"
@success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" :fromInventoryStatus= "fromInventoryStatus" :toInventoryStatus="toInventoryStatus" />
@ -78,15 +80,23 @@
<script setup lang="ts">
import download from '@/utils/download'
import { InventorymoveRecordMain,InventorymoveRecordMainRules,InventorymoveRecordDetail,InventorymoveRecordDetailRules } from './inventorymoveRecordMain.data'
import { InventorymoveRecordMainNew,InventorymoveRecordDetailNew,InventorymoveRecordDetailNewRules } from './inventorymoveRecordMainNew.data'
import { InventorymoveRequestMain,InventorymoveRequestMainRules,InventorymoveRequestDetail,InventorymoveRequestDetailRules } from './inventorymoveRecordRequestMain.data'
import {
SupplierdeliverRequestPackage
} from '@/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data'
import { getAccessToken } from '@/utils/auth'
import * as PackageApi from '@/api/wms/package'
import { getJmreportBaseUrl } from '@/utils/systemParam'
import * as InventorymoveRequestMainApi from '@/api/wms/inventorymoveRequestMain'
import * as InventorymoveRecordMainApi from '@/api/wms/inventorymoveRecordMain'
import * as InventorymoveRecordDetailApi from '@/api/wms/inventorymoveRecordDetail'
import * as defaultButtons from '@/utils/disposition/defaultButtons'
import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
//
defineOptions({ name: 'InventorymoveRecordMain' })
defineOptions({ name: 'InventorymoveRecordMainNew' })
const message = useMessage() //
const { t } = useI18n() //
@ -95,7 +105,7 @@ const importFileName = ref()
const route = useRoute() //
const routeName = ref()
routeName.value = route.name
const tableColumns = ref([...InventorymoveRecordMain.allSchemas.tableColumns,...InventorymoveRecordDetail.allSchemas.tableMainColumns])
const tableColumns = ref([...InventorymoveRecordMainNew.allSchemas.tableColumns,...InventorymoveRecordDetailNew.allSchemas.tableMainColumns])
console.log(99 , routeName.value)
const fromInventoryStatus = ref()
@ -107,6 +117,7 @@ const updataTableColumns = (val) => {
}
const { tableObject, tableMethods } = useTable({
defaultParams:{'business_type':'Move'},
getListApi: InventorymoveRecordDetailApi.getInventorymoveRecordDetailPage //
})
@ -165,17 +176,77 @@ const openForm =async (type: string, row?: number) => {
formRef.value.open(type, row)
}
// -
// -
const butttondata = (row,$index) => {
const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
if(findIndex>-1&&findIndex<$index){
return []
}
return []
return [
defaultButtons.mainListPointBtn(null), //
]
}
// -
const buttonTableClick = async (val, row) => {
if (val == 'point') { //
labelPrint(row)
}
}
const BASE_URL = getJmreportBaseUrl()
//
const searchTableRef = ref()
const labelType = ref('') //
const labelPrint = async (row) => {
tableObject.loading = true
//
let resType = await PackageApi.getPackagePage({
requestNumber: row.number
})
if(resType.list.length > 0){
if (resType.list[0].productionLineCode != null) {
labelType.value = 'zz'
} else {
labelType.value = 'cg'
}
}
const defaultParams = {'moduleName':'productreceipt_predict','tableName':'record_productreceipt_main','recordNumber':row.number}
const {tableObject:tableObjectPrint ,tableMethods} = useTable({
defaultParams,
getListApi: PackageApi.getLabelDetailPage //
})
//
const { getList:getListPrint } = tableMethods
getListPrint()
tableObject.loading = false
const tableColumns = SupplierdeliverRequestPackage.allSchemas.tableFormColumns
tableColumns.forEach((item) => {
item.width = item.table?.width || 150
})
searchTableRef.value.openData("标签信息",tableObjectPrint,{tableColumns},true)
}
// --
const searchTableSuccessLabel = async (formField, searchField, val, formRef, type, row) => {
console.log('批量打印',val)
if(val.length == 0){
message.warning("请先选择要打印的数据!")
return
}
await PackageApi.batchPrintingLable(val.map(item1=>item1.number).join(',')).then(res => {
console.log(res)
if (labelType.value == 'cg') {
const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
window.open(src.value+'&asn_number='+res)
} else {
const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
window.open(src.value+'&asn_number='+res)
}
}).catch(err => {
console.log(err)
message.error('创建标签失败')
})
}
//
const { wsCache } = useCache()
@ -208,7 +279,7 @@ const handleExport = async () => {
* tableForm方法
*/
const tableFormKeys = {}
InventorymoveRecordDetail.allSchemas.tableFormColumns.forEach(item => {
InventorymoveRecordDetailNew.allSchemas.tableFormColumns.forEach(item => {
tableFormKeys[item.field] = item.default ? item.default : ''
})
const tableData = ref([])
@ -241,6 +312,8 @@ const submitForm = async (formType, submitData) => {
item.toBatch = item.fromBatch
item.fromLocationCode = data.fromLocationCode
item.toLocationCode = data.toLocationCode
item.toInventoryStatus = data.toInventoryStatus
if(item.qty == 0){
message.error(`到数量不能为0!`)
flag.value = true
@ -276,6 +349,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
val.forEach(item=>{
const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
newRow['fromPackingNumber'] = item['packingNumber']
newRow['toPackingNumber'] = item['packingNumber']
newRow['fromContainerNumber'] = item['containerNumber']
newRow['itemCode'] = item['itemCode']
newRow['fromBatch'] = item['batch']
@ -283,10 +357,19 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
newRow['origin_fromLocationCode'] = item['locationCode']
newRow['uom'] = item['uom']
newRow['qty'] = item['qty']
newRow['packUnit'] = item['packUnit']
newRow['packQty'] = item['packQty']
if(item['packingNumber']&&item['packingNumber'].length>0){
newRow['packUnit'] = item['packUnit']
newRow['packQty'] = item['packQty']
}else{
newRow['packUnit'] = ''
newRow['packQty'] = ''
}
tableData.value.push(newRow)
})
}else if(formField == 'packUnit'){
//
row['packUnit'] = val[0]['packUnit']
row['packQty'] = val[0]['packQty']
} else {
row[formField] = val[0][searchField]
}
@ -325,7 +408,11 @@ const importSuccess = () => {
const searchFormClick = (searchData) => {
tableObject.params = {
isSearch: true,
filters: searchData.filters
filters: [...searchData.filters,{
action: "==",
column: "business_type",
value: "Move"
}]
}
getList() //
}

142
src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/inventorymoveRecordMain.data.ts → src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/inventorymoveRecordMainNew.data.ts

@ -4,7 +4,7 @@ import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
/**
* @returns {Array}
*/
export const InventorymoveRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
export const InventorymoveRecordMainNew = useCrudSchemas(reactive<CrudSchema[]>([
{
label: '单据号',
field: 'number',
@ -15,24 +15,24 @@ export const InventorymoveRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
},
isSearch: true
},
{
label: '申请单号',
field: 'requestNumber',
sort: 'custom',
table: {
width: 180
},
isSearch: true
},
{
label: '任务单号',
field: 'jobNumber',
sort: 'custom',
table: {
width: 180
},
isSearch: true
},
// {
// label: '申请单号',
// field: 'requestNumber',
// sort: 'custom',
// table: {
// width: 180
// },
// isSearch: true
// },
// {
// label: '任务单号',
// field: 'jobNumber',
// sort: 'custom',
// table: {
// width: 180
// },
// isSearch: true
// },
// {
// label: '使用在途库',
// field: 'useOnTheWayLocation',
@ -133,15 +133,15 @@ export const InventorymoveRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
// }
// },
// },
{
label: '发货单号',
field: 'asnNumber',
sort: 'custom',
table: {
width: 150
},
isForm: false,
},
// {
// label: '发货单号',
// field: 'asnNumber',
// sort: 'custom',
// table: {
// width: 150
// },
// isForm: false,
// },
{
label: '从仓库代码',
field: 'fromWarehouseCode',
@ -338,10 +338,20 @@ export const InventorymoveRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
// }
// }
// },
{
label: '操作',
field: 'action',
isDetail: false,
isForm: false ,
table: {
width: 120,
fixed: 'right'
},
}
]))
//表单校验
export const InventorymoveRecordMainRules = reactive({
export const InventorymoveRecordMainNewRules = reactive({
requestNumber: [
{ required: true, message: '请选择申请单号', trigger: 'change' }
],
@ -398,7 +408,7 @@ export const InventorymoveRecordMainRules = reactive({
/**
* @returns {Array}
*/
export const InventorymoveRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
export const InventorymoveRecordDetailNew = useCrudSchemas(reactive<CrudSchema[]>([
{
label: '单据号',
field: 'number',
@ -588,41 +598,41 @@ export const InventorymoveRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
width: 150
},
},
{
label: '项目代码',
field: 'projectCode',
sort: 'custom',
table: {
width: 150
},
},
{
label: '从货主代码',
field: 'fromOwnerCode',
sort: 'custom',
table: {
width: 150
},
},
{
label: '到货主代码',
field: 'toOwnerCode',
sort: 'custom',
table: {
width: 150
},
},
{
label: '接口类型',
field: 'interfaceType',
dictType: DICT_TYPE.INTERFACE_TYPE,
dictClass: 'string',
isTable: true,
sort: 'custom',
table: {
width: 150
},
},
// {
// label: '项目代码',
// field: 'projectCode',
// sort: 'custom',
// table: {
// width: 150
// },
// },
// {
// label: '从货主代码',
// field: 'fromOwnerCode',
// sort: 'custom',
// table: {
// width: 150
// },
// },
// {
// label: '到货主代码',
// field: 'toOwnerCode',
// sort: 'custom',
// table: {
// width: 150
// },
// },
// {
// label: '接口类型',
// field: 'interfaceType',
// dictType: DICT_TYPE.INTERFACE_TYPE,
// dictClass: 'string',
// isTable: true,
// sort: 'custom',
// table: {
// width: 150
// },
// },
// {
// label: '备注',
// field: 'remark',
@ -678,7 +688,7 @@ export const InventorymoveRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
]))
//表单校验
export const InventorymoveRecordDetailRules = reactive({
export const InventorymoveRecordDetailNewRules = reactive({
fromPackingNumber: [
{ required: true, message: '请选择从包装号', trigger: 'change' }
],

152
src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/inventorymoveRecordRequestMain.data.ts

@ -7,6 +7,8 @@ import { Balance } from '@/views/wms/inventoryManage/balance/balance.data'
import * as LocationApi from '@/api/wms/location'
import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
import * as ItempackagingApi from '@/api/wms/itempackage'
import { Itempackaging } from '@//views/wms/basicDataManage/itemManage/itempackage/itempackage.data'
import * as WarehouseApi from '@/api/wms/warehouse'
import { Warehouse } from '@/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data'
@ -167,6 +169,27 @@ export const InventorymoveRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
}
}
},
{
label: '到库存状态',
field: 'toInventoryStatus',
dictType: DICT_TYPE.INVENTORY_STATUS,
dictClass: 'string',
isTable: true,
sort: 'custom',
table: {
width: 150
},
tableForm: {
disabled: false,
type: 'Select'
},
form: {
componentProps: {
disabled: false,
modelValue:"OK"
}
}
},
{
label: '截止时间',
field: 'dueTime',
@ -258,12 +281,13 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
},
{
label: '批次',
field: 'fromBatch',
label: '从包装号',
field: 'fromPackingNumber',
sort: 'custom',
table: {
width: 150
},
isTableForm:false,
tableForm: {
disabled: true
},
@ -274,14 +298,28 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
}
},
{
label: '从包装号',
field: 'fromPackingNumber',
label: '到包装号',
field: 'toPackingNumber',
sort: 'custom',
table: {
width: 150
},
isTableForm:false,
isForm: false,
},
{
label: '从库存状态',
field: 'fromInventoryStatus',
dictType: DICT_TYPE.INVENTORY_STATUS,
dictClass: 'string',
isTable: true,
sort: 'custom',
table: {
width: 150
},
tableForm: {
disabled: true
disabled: true,
type: 'Select'
},
form: {
componentProps: {
@ -290,36 +328,79 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
}
},
{
label: '到包装号',
field: 'toPackingNumber',
label: '包装规格',
field: 'packUnit',
sort: 'custom',
table: {
width: 150
},
isTableForm: true,
isForm: false,
tableForm:{
multiple:false,
isInpuFocusShow: true, // 开启查询弹窗
searchListPlaceholder: '请选择物料代码',
searchField: 'packUnit',
searchTitle: '物料包装信息',
searchAllSchemas: Itempackaging.allSchemas,
searchPage: ItempackagingApi.getItempackagingPageTree,
searchCondition: [{
key:'itemCode', // 查询列表中字段
value:'itemCode', // 指主表某字段
message: '请选择物料代码!', // 当前置条件为空时 弹出信息提示
isMainValue: true, // 表示查询条件是主表的字段的值
action: '==', // 查询拼接条件
}]
},
form: {
// labelMessage: '信息提示说明!!!',
componentProps: {
disabled: true,
isSearchList: false, // 开启查询弹窗
searchListPlaceholder: '请选择物料代码',
searchField: 'packUnit',
searchTitle: '物料包装信息',
searchAllSchemas: Itempackaging.allSchemas,
searchPage: ItempackagingApi.getItempackagingPageTree,
searchCondition: [{
key:'itemCode', // 查询列表中字段
value:'itemCode', // 指主表某字段
message: '请选择物料代码!', // 当前置条件为空时 弹出信息提示
isMainValue: true, // 表示查询条件是主表的字段的值
action: '==', // 查询拼接条件
}]
}
}
},
{
label: '包装规格',
field: 'packUnit',
label: '包装数量',
field: 'packQty',
sort: 'custom',
table: {
width: 150
},
isTableForm: false,
tableForm:{
disabled:true
},
isTableForm: true,
isForm: false,
},
{
label: '包装数量',
field: 'packQty',
label: '批次',
field: 'fromBatch',
sort: 'custom',
table: {
width: 150
},
isTableForm: false,
isForm: false,
tableForm: {
disabled: true
},
form: {
componentProps: {
disabled: true
}
}
},
{
label: '数量',
field: 'qty',
@ -360,47 +441,6 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
disabled: true
}
}
},
{
label: '从库存状态',
field: 'fromInventoryStatus',
dictType: DICT_TYPE.INVENTORY_STATUS,
dictClass: 'string',
isTable: true,
sort: 'custom',
table: {
width: 150
},
tableForm: {
disabled: true,
type: 'Select'
},
form: {
componentProps: {
disabled: true
}
}
},
{
label: '到库存状态',
field: 'toInventoryStatus',
dictType: DICT_TYPE.INVENTORY_STATUS,
dictClass: 'string',
isTable: true,
sort: 'custom',
table: {
width: 150
},
tableForm: {
disabled: false,
type: 'Select'
},
form: {
componentProps: {
disabled: true
}
}
}
]))

9
src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts

@ -117,6 +117,8 @@ export const InventorymoveRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable:false,
isTableForm:false,
isForm: false,
},
{
@ -700,6 +702,7 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
table: {
width: 150
},
isTableForm:false,
tableForm: {
enterSearch: true,
isInpuFocusShow: true, // 开启查询弹窗
@ -936,9 +939,9 @@ export const InventorymoveRequestDetailRules = reactive({
fromInventoryStatus: [
{ required: true, message: '请选择从库存状态', trigger: 'change' }
],
toLocationCode: [
{ required: true, message: '请选择到库位代码', trigger: 'change' }
],
// toLocationCode: [
// { required: true, message: '请选择到库位代码', trigger: 'change' }
// ],
remark: [
{ max: 50, message: '不得超过50个字符', trigger: 'blur' }
],

20
src/views/wms/productionManage/productputaway/productputawayJobMain/productputawayJobMain.data.ts

@ -15,6 +15,16 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
},
isSearch: true,
},
{
label: '申请单号',
field: 'requestNumber',
sort: 'custom',
table: {
width: 180
},
isSearch: true,
},
{
label: '状态',
field: 'status',
@ -27,16 +37,6 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
width: 150
},
},
{
label: '申请单号',
field: 'requestNumber',
sort: 'custom',
table: {
width: 180
},
isTable: false,
isSearch: true,
},
// {
// label: '供应商代码',
// field: 'supplierCode',

4
src/views/wms/productionManage/productputaway/productputawayRecordMain/productputawayRecordMain.data.ts

@ -35,7 +35,7 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 180
},
isTable: false,
sortTableDefault: 1,
isSearch: true
},
{
@ -45,7 +45,7 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 180
},
isTable: false,
sortTableDefault: 1,
isSearch: true
},
// {

19
src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/productputawayAssembleJobMain.data.ts

@ -15,6 +15,15 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
},
isSearch: true,
},
{
label: '申请单号',
field: 'requestNumber',
sort: 'custom',
table: {
width: 180
},
isSearch: true,
},
{
label: '状态',
field: 'status',
@ -27,16 +36,6 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
width: 150
},
},
{
label: '申请单号',
field: 'requestNumber',
sort: 'custom',
table: {
width: 180
},
isSearch: true,
isTable: false,
},
// {
// label: '供应商代码',
// field: 'supplierCode',

8
src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRecordMain/productputawayAssembleRecordMain.data.ts

@ -35,8 +35,8 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 180
},
isTable: false,
isSearch: true
isSearch: true,
sortTableDefault: 1,
},
{
label: '任务单号',
@ -45,8 +45,8 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 180
},
isTable: false,
isSearch: true
isSearch: true,
sortTableDefault: 1,
},
// {
// label: '供应商代码',

4
src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue

@ -211,7 +211,7 @@ const buttonTableClick = async (val, row) => {
const BASE_URL = getJmreportBaseUrl()
//
const searchTableRef = ref()
const labelType = ref('') //
const labelType = ref('') //
const labelPrint = async (row) => {
tableObject.loading = true
//
@ -243,7 +243,7 @@ const labelPrint = async (row) => {
// --
const searchTableSuccessLabel = async (formField, searchField, val, formRef, type, row) => {
console.log('批量打印',val)
if(val.length == 0){
message.warning("请先选择要打印的数据!")
return

2
src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/index.vue

@ -287,7 +287,7 @@ const handleExport = async () => {
//
exportLoading.value = true
const data = await ProductreceiptJobMainApi.exportProductreceiptJobMain(tableObject.params)
download.excel(data, '制品收货任务.xlsx')
download.excel(data, route.meta.title+'.xlsx')
} catch {
} finally {
exportLoading.value = false

2
src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/index.vue

@ -199,7 +199,7 @@ const handleExport = async () => {
//
exportLoading.value = true
const data = await ProductreceiptRecordMainApi.exportProductreceiptRecordMain(tableObject.params)
download.excel(data, '制品收货记录主.xlsx')
download.excel(data, route.meta.title+'.xlsx')
} catch {
} finally {
exportLoading.value = false

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

@ -554,7 +554,7 @@ const handleExport = async () => {
//
exportLoading.value = true
const data = await ProductreceiptRequestMainApi.exportProductreceiptRequestMain(tableObject.params)
download.excel(data, '制品收货申请主.xlsx')
download.excel(data, route.meta.title+'.xlsx')
} catch {
} finally {
exportLoading.value = false

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

@ -52,7 +52,6 @@ export const PurchasereceiptJobMain = useCrudSchemas(
label: '供应商代码',
field: 'supplierCode',
sort: 'custom',
sortTableDefault: 1,
table: {
width: 150
},

4
src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/purchasereceiptRequestMain.data.ts

@ -997,13 +997,13 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
}
},
tableForm: {
enterSearch: true,
enterSearch: false,
isInpuFocusShow: true,
searchListPlaceholder: '请选择库位代码', // 输入框占位文本
searchField: 'code', // 查询弹窗赋值字段
searchTitle: '库位信息', // 查询弹窗标题
searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法
searchPage: LocationApi.getLocationMPage, // 查询弹窗所需分页方法
searchCondition: [{
key: 'available',
value: 'TRUE',

2
src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts

@ -27,7 +27,7 @@ export const PurchasereturnJobMain = useCrudSchemas(
table: {
width: 180
},
isTable: false
sortTableDefault: 1
},
{
label: '采购收货记录单号',

5
src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts

@ -28,7 +28,7 @@ export const PurchasereturnRecordMain = useCrudSchemas(
table: {
width: 180
},
isTable: false
sortTableDefault: 1
},
{
label: '任务单号',
@ -37,7 +37,8 @@ export const PurchasereturnRecordMain = useCrudSchemas(
table: {
width: 180
},
isTable: false
sortTableDefault: 1
},
{
label: '采购收货记录单号',

2
src/views/wms/purchasereceiptManage/putaway/putawayJobMain/putawayJobMain.data.ts

@ -23,7 +23,7 @@ export const PutawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 180
},
isTable: false,
sortTableDefault: 1,
},
{
label: '供应商代码',

4
src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/putawayRecordMain.data.ts

@ -23,7 +23,7 @@ export const PutawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 180
},
isTable: false,
sortTableDefault: 1,
},
{
label: '任务单号',
@ -32,7 +32,7 @@ export const PutawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 180
},
isTable: false,
sortTableDefault: 1,
},
{
label: '供应商代码',

1
src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/sparereceiptJobMain.data.ts

@ -49,7 +49,6 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
label: '供应商代码',
field: 'supplierCode',
sort: 'custom',
sortTableDefault:1,
table: {
width: 150
},

2
src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts

@ -24,7 +24,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
width: 180,
},
sortSearchDefault:1,
sortTableDefault:99999,
sortTableDefault:1,
isSearch: true
},
{

Loading…
Cancel
Save