Browse Source

Merge branch 'hella_online_20240829' into master_hella

hella_online_20240904
陈薪名 2 months ago
parent
commit
6430de686f
  1. 2
      src/views/login/components/LoginForm.vue
  2. 1
      src/views/login/updatePasswordNewTips.vue
  3. 1
      src/views/wms/basicDataManage/subject/subjectAccount/subjectAccount.data.ts
  4. 4
      src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
  5. 4
      src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
  6. 2
      src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts
  7. 35
      src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts
  8. 19
      src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts
  9. 20
      src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts
  10. 20
      src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts
  11. 10
      src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/inventorymoveRecordRequestMain.data.ts
  12. 170
      src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue
  13. 48
      src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data.ts
  14. 1
      src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
  15. 1
      src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue
  16. 19
      src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts
  17. 17
      src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
  18. 4
      src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts

2
src/views/login/components/LoginForm.vue

@ -279,7 +279,7 @@
}catch (e) {
if(e.code === 1002000010){
setTimeout(function (){
window.location.href = "/updatePasswordNewTips?username="+loginData.loginForm.username
router.push({path:"/updatePasswordNewTips",query:{username:loginData.loginForm.username}})
},3000)
}
} finally {

1
src/views/login/updatePasswordNewTips.vue

@ -31,6 +31,7 @@
</template>
<script lang="ts" setup name="bb">
import type { RouteLocationNormalizedLoaded } from 'vue-router'
import router from "@/router";
import { useIcon } from '@/hooks/web/useIcon'
import { setTenantId, setToken } from '@/utils/auth'
import { usePermissionStore } from '@/store/modules/permission'

1
src/views/wms/basicDataManage/subject/subjectAccount/subjectAccount.data.ts

@ -17,6 +17,7 @@ export const SubjectAccountRules = reactive({
projectId: [required],
projectCode: [required],
available: [required],
isProject: [required],
isFromPlMstr: [required]
})

4
src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts

@ -952,14 +952,14 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
component: 'InputNumber',
componentProps: {
min: 0,
max:9999,
max:999999,
// precision: 6
}
},
tableForm: {
type: 'InputNumber',
min: 0,
max:9999,
max:999999,
// precision: 6
}
},

4
src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts

@ -867,14 +867,14 @@ export const DeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
component: 'InputNumber',
componentProps: {
min: 0,
max:9999,
max:999999,
// precision: 6
}
},
tableForm: {
type: 'InputNumber',
min: 0,
max:9999,
max:999999,
// precision: 6
}
},

2
src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts

@ -742,7 +742,7 @@ export const StockupDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
tableForm: {
type: 'InputNumber',
min: 0,
max:9999,
max:999999,
// precision: 6
},
},

35
src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts

@ -380,6 +380,25 @@ export const ScrapRecordMain = useCrudSchemas(
width: 150
}
},
{
label: '是否已撤销',
field: 'revokeFlag',
sort: 'custom',
dictType: DICT_TYPE.TRUE_FALSE,
table: {
width: 150
},
detail:{
// dictType:'primary',
// valueFilter:(value)=>{
// if(value=='TRUE'){
// return `是`
// }else{
// return '否'
// }
// }
}
},
{
label: '创建时间',
field: 'createTime',
@ -462,22 +481,6 @@ export const ScrapRecordMain = useCrudSchemas(
// width: 150
// },
// },
{
label: '是否可用',
field: 'available',
dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string',
isSearch: false,
isTable: true,
form: {
component: 'Switch',
value: 'TRUE',
componentProps: {
inactiveValue: 'FALSE',
activeValue: 'TRUE'
}
}
},
{
label: '操作',
field: 'action',

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

@ -382,6 +382,25 @@ export const UnplannedissueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
},
isTable: false,
},
{
label: '是否已撤销',
field: 'revokeFlag',
sort: 'custom',
dictType: DICT_TYPE.TRUE_FALSE,
table: {
width: 150
},
detail:{
// dictType:'primary',
// valueFilter:(value)=>{
// if(value=='TRUE'){
// return `是`
// }else{
// return '否'
// }
// }
}
},
{
label: '创建时间',
field: 'createTime',

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

@ -366,6 +366,25 @@ export const UnplannedreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
width: 150
}
},
{
label: '是否已撤销',
field: 'revokeFlag',
sort: 'custom',
dictType: DICT_TYPE.TRUE_FALSE,
table: {
width: 150
},
detail:{
// dictType:'primary',
// valueFilter:(value)=>{
// if(value=='TRUE'){
// return `是`
// }else{
// return '否'
// }
// }
}
},
{
label: '创建时间',
field: 'createTime',
@ -820,6 +839,7 @@ export const UnplannedreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]
width: 150
},
},
// {
// label: '任务明细ID',
// field: 'jobDetailId',

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

@ -773,6 +773,26 @@ export const RepleinshJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
},
isSearch: true,
},
{
label: '从库区',
field: 'fromAreaCode',
sort: 'custom',
table: {
width: 150
},
isSearch: true,
isTable: true
},
{
label: '到库区',
field: 'toAreaCode',
sort: 'custom',
table: {
width: 150
},
isSearch: true,
isTable: true
},
{
label: '物料代码',
field: 'itemCode',

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

@ -61,11 +61,6 @@ export const InventorymoveRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
key: 'isIn',
value: 'out',
isMainValue: false
},
{
key:'available', // 查询列表中字段
value:'TRUE', // 指查询具体值
isMainValue: false // 表示查询条件不是主表的字段的值
}],
isRepeat:true,
verificationParams: [{
@ -96,11 +91,6 @@ export const InventorymoveRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
key: 'isIn',
value: 'out',
isMainValue: false
},
{
key:'available', // 查询列表中字段
value:'TRUE', // 指查询具体值
isMainValue: false // 表示查询条件不是主表的字段的值
}],
verificationParams: [{
key: 'code',

170
src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue

@ -94,7 +94,8 @@ import { formatDate } from '@/utils/formatTime'
import dayjs from 'dayjs'
import { usePageLoading } from '@/hooks/web/usePageLoading'
const { loadStart, loadDone } = usePageLoading()
//
//
// 使
defineOptions({ name: 'InventorymoveRequestMain' })
const message = useMessage() //
@ -115,81 +116,15 @@ const { tableObject, tableMethods } = useTable({
getListApi: InventorymoveRequestDetailApi.getInventorymoveRequestDetailPage //
})
//
/**
* OktoholdRequestMain 合格转隔离
*/
if ( routeName.value == 'OktoholdRequestMain') {
tableObject.params = {
// fromInventoryStatus: 'OK',
// toInventoryStatus:'HOLD',
businessType :'OkToHold'
}
// fromInventoryStatus.value = 'OK'
// toInventoryStatus.value = "HOLD"
businessType.value = 'OkToHold'
importFileName.value = '物料转隔离申请'
}
else if ( routeName.value == 'NoktoholdRequestMain') {
tableObject.params = {
// fromInventoryStatus: 'NOK',
// toInventoryStatus:'HOLD',
businessType :'NokToHold'
}
// fromInventoryStatus.value = 'NOK'
// toInventoryStatus.value = "HOLD"
businessType.value = 'NokToHold'
importFileName.value = '不合格转隔离申请'
}
else if ( routeName.value == 'HoldtookRequestMain') {
tableObject.params = {
// fromInventoryStatus: 'HOLD',
// toInventoryStatus:'OK',
businessType :'HoldToOk'
}
// fromInventoryStatus.value = 'HOLD'
// toInventoryStatus.value = "OK"
businessType.value = 'HoldToOk'
importFileName.value = '隔离转合格申请'
} else if ( routeName.value == 'HoldtoscrapRequestMain') {
tableObject.params = {
// fromInventoryStatus: 'HOLD',
// toInventoryStatus:'SCRAP',
businessType:'HoldToScrap'
}
// fromInventoryStatus.value = 'HOLD'
// toInventoryStatus.value = "SCRAP"
businessType.value = 'HoldToScrap'
importFileName.value = '隔离转报废申请'
} else if ( routeName.value == 'OktoscrapRequestMain') {
tableObject.params = {
// fromInventoryStatus: 'OK',
// toInventoryStatus:'SCRAP',
businessType :'OkToScrap'
}
// fromInventoryStatus.value = 'OK'
// toInventoryStatus.value = "SCRAP"
businessType.value = 'OkToScrap'
importFileName.value = '合格转报废申请'
tableObject.params = {
// fromInventoryStatus: 'OK',
// toInventoryStatus:'HOLD',
businessType :'OkToHold'
}
else if ( routeName.value == 'ScraptoholdRequestMain') {
tableObject.params = {
// fromInventoryStatus: 'SCRAP',
// toInventoryStatus:'HOLD',
businessType :'ScrapToHold'
}
// fromInventoryStatus.value = 'SCRAP'
// toInventoryStatus.value = "HOLD"
businessType.value = 'ScrapToHold'
importFileName.value = '报废转隔离申请'
} else {
tableObject.params = {
businessType :'Move'
}
businessType.value = 'Move'
importFileName.value = '库存移动申请'
}
console.log(99 , businessType.value)
// fromInventoryStatus.value = 'OK'
// toInventoryStatus.value = "HOLD"
businessType.value = 'OkToHold'
importFileName.value = '物料转隔离申请'
InventorymoveRequestMain.allSchemas.tableFormColumns.map(item =>{
if(item.field == 'fromWarehouseCode') {
@ -349,27 +284,20 @@ const updataTableColumns = (val) => {
// -
const getDefaultToLocationCode = async ()=>{
let searchCondition = []
InventorymoveRequestDetail.allSchemas.tableFormColumns.map(item => {
InventorymoveRequestMain.allSchemas.formSchema.map(item => {
if(item.field == "toLocationCode"){
searchCondition = item.tableForm.searchCondition
searchCondition = item.componentProps.searchCondition
}
})
let params = {}
searchCondition.forEach(item=>{
if(item['isMainValue']){
params[item['key']] = formRef.value.formRef.formModel[item['value']]
}else{
params[item['key']] = item['value']
}
params[item['key']] = item['value']
})
console.log('params',params)
let res = await LocationApi.selectBusinessTypeToLocation(params)
console.log('res',res)
console.log('获取到库位默认值',res)
if(res&&res.list.length>0){
tableData.value.forEach(item=>{
if(!item['toLocationCode']){
item['toLocationCode'] = res.list[0]['code']
}
})
formRef.value.formRef.formModel["toLocationCode"] = res.list[0]['code']
}
}
//
@ -389,26 +317,9 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
newRow['fromLocationCode'] = item['locationCode']
newRow['uom'] = item['uom']
newRow['qty'] = item['qty']
if(routeName.value == 'OktoholdRequestMain'){
newRow['toInventoryStatus'] = "HOLD"
}else if(routeName.value == 'NoktoholdRequestMain'){
newRow['toInventoryStatus'] = "HOLD"
}else if ( routeName.value == 'HoldtookRequestMain') {
newRow['toInventoryStatus'] = "OK"
}else if ( routeName.value == 'HoldtoscrapRequestMain') {
newRow['toInventoryStatus'] = "SCRAP"
}else if ( routeName.value == 'OktoscrapRequestMain') {
newRow['toInventoryStatus'] = "SCRAP"
}else if ( routeName.value == 'ScraptoholdRequestMain') {
newRow['toInventoryStatus'] = "HOLD"
}else{
newRow['toInventoryStatus'] = item['inventoryStatus']
}
newRow['toInventoryStatus'] = "HOLD" //
tableData.value.push(newRow)
})
if(routeName.value == 'OktoholdRequestMain'){
getDefaultToLocationCode()
}
} else {
row[formField] = val[0][searchField]
}
@ -446,21 +357,8 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
setV['fromInventoryStatus'] = val[0]['inventoryStatus']
setV['fromLocationCode'] = val[0]['locationCode']
setV['uom'] = val[0]['uom']
if(routeName.value == 'OktoholdRequestMain'){
setV['toInventoryStatus'] = "HOLD"
}else if(routeName.value == 'NoktoholdRequestMain'){
setV['toInventoryStatus'] = "HOLD"
}else if ( routeName.value == 'HoldtookRequestMain') {
setV['toInventoryStatus'] = "OK"
}else if ( routeName.value == 'HoldtoscrapRequestMain') {
setV['toInventoryStatus'] = "SCRAP"
}else if ( routeName.value == 'OktoscrapRequestMain') {
setV['toInventoryStatus'] = "SCRAP"
}else if ( routeName.value == 'ScraptoholdRequestMain') {
setV['toInventoryStatus'] = "HOLD"
}else{
setV['toInventoryStatus'] = val[0]['inventoryStatus']
}
setV['toInventoryStatus'] = "HOLD"
} else {
setV[formField] = val[0][searchField]
}
@ -638,6 +536,8 @@ const openForm =async (type: string, row?: number) => {
}
tableData.value = [] //
formRef.value.open(type, row)
getDefaultToLocationCode()
}
/**
@ -695,27 +595,9 @@ const handleExport = async () => {
//
loadStart()
const excelTitle = ref(route.meta.title)
if(routeName.value == 'OktoholdRequestMain'){
const data = await InventorymoveRequestMainApi.exportOkToHoldRequestMain(tableObject.params)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
}else if ( routeName.value == 'HoldtookRequestMain') {
const data = await InventorymoveRequestMainApi.exportHoldToOkRequestMain(tableObject.params)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
}else if ( routeName.value == 'HoldtoscrapRequestMain') {
const data = await InventorymoveRequestMainApi.exportHoldToScrapRequestMain(tableObject.params)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
}else if ( routeName.value == 'OktoscrapRequestMain') {
const data = await InventorymoveRequestMainApi.exportOkToScrapRequestMain(tableObject.params)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
}
// else if ( routeName.value == 'ScraptoholdRequestMain') {
// const data = await InventorymoveRequestMainApi.exportScrapToHoldRequestMain(tableObject.params)
// download.excel(data, '.xlsx')
// }
else{
const data = await InventorymoveRequestMainApi.exportInventorymoveRequestMain(tableObject.params)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
}
const data = await InventorymoveRequestMainApi.exportOkToHoldRequestMain(tableObject.params)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
loadDone()
@ -754,7 +636,8 @@ const submitForm = async (formType, submitData) => {
if(data.masterId){
data.id = data.masterId
}
let findLocation = tableData.value.find(item=>item.fromLocationCode&&item.toLocationCode&&item.fromLocationCode==item.toLocationCode)
let toLocationCode = data['toLocationCode'] //
let findLocation = tableData.value.find(item=>item.fromLocationCode&&toLocationCode&&item.fromLocationCode==toLocationCode)
if(findLocation){
message.warning('从库位和到库位不能相同')
return
@ -762,6 +645,7 @@ const submitForm = async (formType, submitData) => {
data.subList = tableData.value //
let isExist = false
tableData.value.forEach(item => {
item['toLocationCode'] = toLocationCode
let rs = tableData.value.filter(filterItem => (filterItem.fromPackingNumber&&filterItem.fromPackingNumber == item.fromPackingNumber) )
console.log(rs,5666);
if(rs.length > 1) isExist = true

48
src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data.ts

@ -152,6 +152,44 @@ export const InventorymoveRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
},
isForm: false,
},
{
label: '到库位代码', // 子表数据--新增在form上展示
field: 'toLocationCode',
sort: 'custom',
isForm:true,
isTable:false,
isDetail:false,
form: {
// labelMessage: '信息提示说明!!!',
componentProps: {
enterSearch: true,
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择到库位代码',
searchField: 'code',
searchTitle: '库位信息',
searchAllSchemas: Location.allSchemas,
searchPage: LocationApi.selectBusinessTypeToLocation,
searchCondition: [
{
key: 'businessType',
value: 'OkToHold',
isMainValue: false
},{
key: 'isIn',
value: 'in',
isMainValue: false
}],
verificationParams: [{
key: 'code',
action: '==',
value: '',
isMainValue: false,
isSearch: true,
isFormModel: true,
}], // 失去焦点校验参数
}
}
},
{
label: '截止时间',
field: 'dueTime',
@ -464,6 +502,9 @@ export const InventorymoveRequestMainRules = reactive({
fromWarehouseCode: [
{ required: true, message: '请选择从仓库代码', trigger: 'blur' }
],
toLocationCode: [
{ required: true, message: '请选择到库位代码', trigger: 'change' }
],
status: [
{ required: true, message: '请选择状态', trigger: 'change' }
],
@ -703,7 +744,7 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
table: {
width: 150
},
isTableForm:true,
isTableForm:false, //放在主表展示了--喜婷
tableForm: {
enterSearch: true,
isInpuFocusShow: true, // 开启查询弹窗
@ -751,7 +792,7 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
key: 'isIn',
value: 'in',
isMainValue: false
}],
}],
verificationParams: [{
key: 'code',
action: '==',
@ -940,9 +981,6 @@ export const InventorymoveRequestDetailRules = reactive({
fromInventoryStatus: [
{ required: true, message: '请选择从库存状态', trigger: 'change' }
],
toLocationCode: [
{ required: true, message: '请选择到库位代码', trigger: 'change' }
],
remark: [
{ max: 50, message: '不得超过50个字符', trigger: 'blur' }
],

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

@ -609,6 +609,7 @@ const buttonTableClick = async (val, row) => {
buttonBaseClick('refresh', null)
})
.catch((err) => {
tableObject.loading = false
console.log(err)
})
} else if (val == 'edit') {

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

@ -527,6 +527,7 @@ const buttonTableClick = async (val, row) => {
tableObject.loading = false
buttonBaseClick('refresh',null)
}).catch(err => {
tableObject.loading = false
console.log(err)
})
} else if (val == 'edit') { //

19
src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts

@ -279,6 +279,25 @@ export const ProductscrapRecordMain = useCrudSchemas(
},
isTable: false
},
{
label: '是否已撤销',
field: 'revokeFlag',
sort: 'custom',
dictType: DICT_TYPE.TRUE_FALSE,
table: {
width: 150
},
detail:{
// dictType:'primary',
// valueFilter:(value)=>{
// if(value=='TRUE'){
// return `是`
// }else{
// return '否'
// }
// }
}
},
{
label: '创建者',
field: 'creator',

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

@ -376,6 +376,20 @@ const isASNShowMainButton = (row,val) => {
}
}
//
const isASNShowMainButtonCreateLabel = (row,val) => {
if (val.indexOf(row.status) > -1) {
if(row.sourceType == 'ASN_ExternalReceipt' && row.asnOutLabel == '2'){
return true;
}else{
return false;
}
} else {
return true;
}
}
// -
const butttondata = (row,$index) => {
const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
@ -391,7 +405,7 @@ const butttondata = (row,$index) => {
{
label: '生成标签',
name: 'ssbq',
hide: isASNShowMainButton(row, ['3']),
hide: isASNShowMainButtonCreateLabel(row, ['3']),
type: 'primary',
icon: '',
color: '',
@ -492,6 +506,7 @@ const submitFormLabel = async (formType, submitData) => {
} finally {
formLabelRef.value.formLoading = false
formLabelRef.value.dialogVisible = false
buttonBaseClick('refresh',null);
}
}

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

@ -1766,7 +1766,7 @@ export const SupplierinvoiceRecordMainTransfer = useCrudSchemas(reactive<CrudSch
},
},
{
label: '回转日期',
label: '回转日期11',
field: 'reversepostingdate',
formatter: dateFormatter,
detail: {
@ -1782,7 +1782,7 @@ export const SupplierinvoiceRecordMainTransfer = useCrudSchemas(reactive<CrudSch
componentProps: {
style: {width:'100%'},
type: 'date',
dateFormat: 'YYYY-MM-DD',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
}
},

Loading…
Cancel
Save