Browse Source

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

hella_online_20240819
zhaoxuebing 3 months ago
parent
commit
b46436fe6b
  1. 2
      src/api/wms/productputawayRecordDetail/index.ts
  2. 8
      src/api/wms/productputawayRecordMain/index.ts
  3. 8
      src/views/login/components/LoginForm.vue
  4. 94
      src/views/qms/inspectionQ2/inspectionQ2.data.ts
  5. 89
      src/views/qms/inspectionQ3/inspectionQ3.data.ts
  6. 9
      src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts
  7. 12
      src/views/wms/basicDataManage/supplierManage/supplieritem/index.vue
  8. 2
      src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue
  9. 9
      src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue
  10. 10
      src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
  11. 19
      src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue
  12. 5
      src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRecordSpareMain/index.vue
  13. 3
      src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRequestSpareMain/index.vue
  14. 3
      src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue
  15. 3
      src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/index.vue
  16. 3
      src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue
  17. 3
      src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/index.vue
  18. 3
      src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/index.vue
  19. 3
      src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue
  20. 3
      src/views/wms/supplierManage/purchaseclaim/purchaseclaimRecordMain/index.vue
  21. 3
      src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue
  22. 40
      src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
  23. 2
      src/views/wms/supplierManage/supplierinvoiceInvoiced/supplierinvoiceInvoiced.data.ts

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

@ -54,7 +54,7 @@ export const getProductputawayRecordDetailPage = async (params) => {
// 查询制品上架记录子列表
export const getProductputawayRecordDetailPageAssemble = async (params) => {
  params.type = 'assemble'
params.type = 'assemble'
if (params.isSearch) {
const cmd = {
'column':'type',

8
src/api/wms/productputawayRecordMain/index.ts

@ -74,8 +74,14 @@ export const deleteProductputawayRecordMain = async (id: number) => {
// 导出制品上架记录主 Excel
export const exportProductputawayRecordMain = async (params) => {
params.type = 'predict'
params.type = 'assemble'
if (params.isSearch) {
const cmd = {
'column':'type',
'action':'==',
'value':'assemble'
}
params.filters.push(cmd)
delete params.isSearch
const data = {...params}
return await request.downloadPost({ url: '/wms/productputaway-record-main/export-excel-senior', data })

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

@ -33,7 +33,7 @@
:prefix-icon="iconLock" show-password type="password" @keyup.enter="getCode()" style="height: 42px;" />
</el-form-item>
</el-col>
<el-col :span="24" style="padding-right: 10px; padding-left: 10px" v-if="needCode!='false'">
<el-col :span="24" style="padding-right: 10px; padding-left: 10px" v-if="needCode">
<el-form-item prop="code">
<div class="flex w-[100%]">
<el-input v-model="loginData.loginForm.code" :placeholder="t('login.codePlaceholder')"
@ -97,7 +97,7 @@
import * as DeptApi from '@/api/system/dept'
import { getTenant } from '@/utils/systemParam'
import { getSystermUpdateAlert,getSystermUpdateUrl,getNeedCode } from '@/utils/systemParam'
const needCode = ref(getNeedCode())
const needCode = ref(getNeedCode()==true||getNeedCode()=='true')
defineOptions({ name: 'LoginForm' })
@ -174,7 +174,7 @@
// }
// }
function getCode() {
if(needCode.value=='false'){
if(!needCode.value){
return
}
getCodeImg().then(res => {
@ -234,7 +234,7 @@
return
}
let res = null
if(needCode.value=='false'){
if(!needCode.value){
res = await LoginApi.loginNoCode(loginData.loginForm)
}else{
res = await LoginApi.login(loginData.loginForm)

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

@ -49,50 +49,7 @@ export const Q2 = useCrudSchemas(
fixed: 'left'
}
},
{
label: 'Q1通知单号',
field: 'q1Number',
sort: 'custom',
table: {
width: 150
},
form: {
// labelMessage: '信息提示说明!!!',
componentProps: {
enterSearch: true,
multiple: true,
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择Q1通知单', // 输入框占位文本
searchField: 'number', // 查询弹窗赋值字段
searchTitle: 'Q1通知单', // 查询弹窗标题
searchAllSchemas: Q1.allSchemas, // 查询弹窗所需类
searchPage: InspectionQ1Api.getQ1Page, // 查询弹窗所需分页方法
searchCondition: [
{
key: 'available',
value: 'TRUE',
isMainValue: false
},
{
key: 'status',
value: '0',
isMainValue: false
}
],
verificationParams: [
{
key: 'number',
action: '==',
value: '',
isMainValue: false,
isSearch: true,
isFormModel: true
}
] // 失去焦点校验参数
}
},
isSearch: true
},
{
label: '状态',
field: 'status',
@ -380,6 +337,7 @@ export const Q2 = useCrudSchemas(
}
}
},
{
label: '索赔日期',
field: 'claimTime',
@ -422,6 +380,50 @@ export const Q2 = useCrudSchemas(
}
}
},
{
label: 'Q1通知单号',
field: 'q1Number',
sort: 'custom',
table: {
width: 150
},
form: {
// labelMessage: '信息提示说明!!!',
componentProps: {
enterSearch: true,
multiple: true,
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择Q1通知单', // 输入框占位文本
searchField: 'number', // 查询弹窗赋值字段
searchTitle: 'Q1通知单', // 查询弹窗标题
searchAllSchemas: Q1.allSchemas, // 查询弹窗所需类
searchPage: InspectionQ1Api.getQ1Page, // 查询弹窗所需分页方法
searchCondition: [
{
key: 'available',
value: 'TRUE',
isMainValue: false
},
{
key: 'status',
value: '0',
isMainValue: false
}
],
verificationParams: [
{
key: 'number',
action: '==',
value: '',
isMainValue: false,
isSearch: true,
isFormModel: true
}
] // 失去焦点校验参数
}
},
isSearch: true
},
{
label: '描述',
field: 'desc',
@ -473,8 +475,8 @@ export const Q2 = useCrudSchemas(
valueFormat: 'YYYY-MM-DD HH:mm:ss',
type: 'daterange',
defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
},
},
}
}
},
{
label: '操作',

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

@ -48,50 +48,7 @@ export const InspectionQ3Main = useCrudSchemas(
fixed: 'left'
}
},
{
label: 'Q1通知单号',
field: 'q1Number',
sort: 'custom',
isSearch: true,
table: {
width: 150
},
form: {
// labelMessage: '信息提示说明!!!',
componentProps: {
enterSearch: true,
multiple: true,
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择Q1通知单', // 输入框占位文本
searchField: 'number', // 查询弹窗赋值字段
searchTitle: 'Q1通知单', // 查询弹窗标题
searchAllSchemas: Q1.allSchemas, // 查询弹窗所需类
searchPage: InspectionQ1Api.getQ1Page, // 查询弹窗所需分页方法
searchCondition: [
{
key: 'available',
value: 'TRUE',
isMainValue: false
},
{
key: 'status',
value: '0',
isMainValue: false
}
],
verificationParams: [
{
key: 'number',
action: '==',
value: '',
isMainValue: false,
isSearch: true,
isFormModel: true
}
] // 失去焦点校验参数
}
}
},
{
label: '负责用户',
field: 'responUser',
@ -157,6 +114,50 @@ export const InspectionQ3Main = useCrudSchemas(
}
}
},
{
label: 'Q1通知单号',
field: 'q1Number',
sort: 'custom',
isSearch: true,
table: {
width: 150
},
form: {
// labelMessage: '信息提示说明!!!',
componentProps: {
enterSearch: true,
multiple: true,
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择Q1通知单', // 输入框占位文本
searchField: 'number', // 查询弹窗赋值字段
searchTitle: 'Q1通知单', // 查询弹窗标题
searchAllSchemas: Q1.allSchemas, // 查询弹窗所需类
searchPage: InspectionQ1Api.getQ1Page, // 查询弹窗所需分页方法
searchCondition: [
{
key: 'available',
value: 'TRUE',
isMainValue: false
},
{
key: 'status',
value: '0',
isMainValue: false
}
],
verificationParams: [
{
key: 'number',
action: '==',
value: '',
isMainValue: false,
isSearch: true,
isFormModel: true
}
] // 失去焦点校验参数
}
}
},
{
label: '描述',
field: 'desc',

9
src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts

@ -446,8 +446,14 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
label: '超过高储是否允许叫料',
field: 'allowIssueRequest',
sort: 'custom',
isSearch: false,
dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string',
// colorType: 'danger',
isTable: true,
table: {
width: 150
},
form: {
component: 'Switch',
value: 'TRUE',
@ -456,7 +462,6 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
activeValue: 'TRUE'
}
},
isTable: false
},
// {
// label: '优先空库位',
@ -771,7 +776,7 @@ export const ItemareaDetail = useCrudSchemas(reactive<CrudSchema[]>([
isFormModel: true,
}],
verificationPage: LocationApi.getLocationByCodes, // 校验数去焦点输入是否正确的方法
isShowTableFormSearch: true, //
isShowTableFormSearch: true, //
},
form: {
// labelMessage: '信息提示说明!!!',

12
src/views/wms/basicDataManage/supplierManage/supplieritem/index.vue

@ -77,14 +77,14 @@ const route = useRoute() //路由信息
const routeName = ref()
routeName.value = route.name
const tableColumns = ref(Supplieritem.allSchemas.tableColumns)
if(routeName.value.includes('SCP')){
tableColumns.value = tableColumns.value.filter(item=>item.field!='action')
}
// if(routeName.value.includes('SCP')){
// tableColumns.value = tableColumns.value.filter(item=>item.field!='action')
// }
//
const updataTableColumns = (val) => {
if(routeName.value.includes('SCP')){
val = val.filter(item=>item.field!='action')
}
// if(routeName.value.includes('SCP')){
// val = val.filter(item=>item.field!='action')
// }
tableColumns.value = val
}
const { tableObject, tableMethods } = useTable({

2
src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue

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

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

@ -305,6 +305,15 @@ const handleExport = async () => {
//
const searchFormClick = (searchData) => {
const cmd = {
'column':'type',
'action':'==',
'value':'predict'
}
if (!Array.isArray(searchData.filters)) {
searchData.filters = [];
}
searchData.filters.push(cmd)
tableObject.params = {
isSearch: true,
filters: searchData.filters

10
src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts

@ -48,6 +48,16 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
isSearch: false,
sortTableDefault:3
},
{
label: '明细备注',
field: 'remark',
sort: 'custom',
table: {
width: 180
},
isSearch: false,
sortTableDefault:3
},
{
label: '发货单号',
field: 'asnNumber',

19
src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue

@ -83,7 +83,7 @@
</template>
</BasicForm>
<!-- 添加明细采购收货记录单号 -->
<SearchTable ref="searchTableRef" @searchTableSuccess="searchTableSuccess1" >
<SearchTable ref="searchTableRef" :hiddenFilterBtn="true" @searchTableSuccess="searchTableSuccess1" >
<template #searchQueryhahaha>
<el-form :inline="true">
<el-form-item label="供应商">
@ -278,10 +278,13 @@ const searchTableSuccess = async (formField, searchField, val, formRef, type, ro
setV['asnNumber'] = ''
tableData.value = []
getSupplierOptions(val[0][searchField])
}
formRef.setValues(setV)
if(formField=='itemCode'){
onChangeForm('itemCode',null,formRef)
}
}
})
}
@ -788,7 +791,6 @@ const handleAddTable = () => {
// })
}
const onChangeForm = async (field, cur, formRef)=>{
console.log('onChangeForm',field, cur, formRef)
if(field=='supplierCode'){
//
PurchasereturnRequestMainNew.allSchemas.formSchema.forEach(item=>{
@ -799,11 +801,16 @@ const onChangeForm = async (field, cur, formRef)=>{
formRef.value.setValues(setV)
}
})
}else if(field == 'locationCode'){
}else if(field == 'locationCode' || field == 'itemCode'){
// 退
let itemCode = field == 'locationCode'?formRef.value.formModel.itemCode:formRef.formModel.itemCode
let fromLocationCode = field == 'locationCode'?formRef.value.formModel.locationCode:formRef.formModel.locationCode
if(!itemCode||!fromLocationCode){
return
}
let subList = await PurchasereturnRequestDetailApi.getBalancePurchaseReceiptReturn({
itemCode:formRef.value.formModel.itemCode,
fromLocationCode:formRef.value.formModel.locationCode
itemCode,
fromLocationCode
})
console.log('subList',subList)

5
src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRecordSpareMain/index.vue

@ -169,12 +169,13 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
if(routeName.value.includes('SCP')){
const data = await PurchasereturnRecordMainApi.exportPurchasereturnRecordMainSCP(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
}else{
const data = await PurchasereturnRecordMainApi.exportPurchasereturnRecordMainSpare(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
}
} catch {

3
src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRequestSpareMain/index.vue

@ -706,10 +706,11 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await PurchasereturnRequestMainApi.exportPurchasereturnRequestMainSpare(
tableObject.params
)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

3
src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue

@ -348,8 +348,9 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await PutawayJobMainApi.exportPutawayJobMain(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

3
src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/index.vue

@ -211,8 +211,9 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await PutawayRecordMainApi.exportPutawayRecordMain(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

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

@ -406,8 +406,9 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await PutawayRequestMainApi.exportPutawayRequestMain(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

3
src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/index.vue

@ -259,8 +259,9 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await PurchasereceiptJobMainApi.exportSparereceiptJobMain(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

3
src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/index.vue

@ -160,8 +160,9 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await PurchasereceiptRecordMainApi.exportSparereceiptRecordMain(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

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

@ -560,8 +560,9 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await PurchasereceiptRequestMainApi.exportSparereceiptRequestMain(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

3
src/views/wms/supplierManage/purchaseclaim/purchaseclaimRecordMain/index.vue

@ -156,8 +156,9 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await PurchaseclaimRecordMainApi.exportPurchaseclaimRecordMain(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

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

@ -414,8 +414,9 @@ import { getJmreportBaseUrl } from '@/utils/systemParam'
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await PurchaseclaimRequestMainApi.exportPurchaseclaimRequestMain(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

40
src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue

@ -702,16 +702,16 @@ const buttonTableClick = async (val, row) => {
handleRepeal(row.id)
}
}
const procurementCreators = ref([])
SupplierinvoiceRequestMainApi.queryUserInfoByRoleCode({
roleCode: 'purchase',
pageSize: 1000,
pageNo: 1,
sort: '',
by: 'ASC'
}).then((res) => {
procurementCreators.value = res.list
})
// const procurementCreators = ref([])
// SupplierinvoiceRequestMainApi.queryUserInfoByRoleCode({
// roleCode: 'purchase',
// pageSize: 1000,
// pageNo: 1,
// sort: '',
// by: 'ASC'
// }).then((res) => {
// procurementCreators.value = res.list
// })
/** 添加/修改操作 */
const formRef = ref()
const openForm = async (type: string, row?: any) => {
@ -787,10 +787,10 @@ const openForm = async (type: string, row?: any) => {
item.componentProps.disabled = false
}
if (item.field == 'procurementCreator') {
item.componentProps.options = procurementCreators.value
// if (item.field == 'procurementCreator') {
// item.componentProps.options = procurementCreators.value
}
// }
})
}
if (row && (row.status == '3' || row.status == '7')) {
@ -813,13 +813,13 @@ const openForm = async (type: string, row?: any) => {
}
tableData.value = [] //
formRef.value.open(type, row)
if(type=='create'){
nextTick(() => {
formRef.value.formRef.setValues({
procurementCreator:procurementCreators.value[0].id
})
})
}
// if(type=='create'){
// nextTick(() => {
// formRef.value.formRef.setValues({
// procurementCreator:procurementCreators.value[0].id
// })
// })
// }
})
}
const defaultSupplierCode = ref('')

2
src/views/wms/supplierManage/supplierinvoiceInvoiced/supplierinvoiceInvoiced.data.ts

@ -154,7 +154,7 @@ export const SupplierinvoiceInvoiced = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isSearch: true,
isSearch: false,
form: {
value: '1',
componentProps: {

Loading…
Cancel
Save