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

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

intex_online20250327
songguoqiang 1 month ago
parent
854e6ba8c5 4efc33b661
commit
70e75537be
6 changed files with 982 additions and 959 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      src/views/login/components/LoginForm.vue
  2. 2
      src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue
  3. 83
      src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue
  4. 24
      src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts
  5. 416
      src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
  6. 2
      src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue

6
src/views/login/components/LoginForm.vue
View File

@ -71,7 +71,7 @@
</el-col> </el-col>
<el-col :span="24" style="padding-right: 10px; padding-left: 10px"> <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
<el-form-item> <el-form-item>
<XButton :loading="loginLoading" :title="t('login.login')" class="w-[100%]" type="primary" <XButton :disabled="needCode&&!capctchaCheck" :loading="loginLoading" :title="t('login.login')" class="w-[100%]" type="primary"
@click="handleLogin()" /> @click="handleLogin()" />
</el-form-item> </el-form-item>
@ -224,16 +224,19 @@ import { getSwitchByCode } from '@/api/wms/switch'
name: 'ForgetPassword', name: 'ForgetPassword',
}) })
}; };
const capctchaCheck = ref(false)
// 滑块校验成功 // 滑块校验成功
const capctchaCheckSuccess = async ({captchaVerification})=>{ const capctchaCheckSuccess = async ({captchaVerification})=>{
console.log('capctchaCheckSuccess',captchaVerification) console.log('capctchaCheckSuccess',captchaVerification)
if(captchaVerification){ if(captchaVerification){
capctchaCheck.value = true
loginData.loginForm.code = captchaVerification loginData.loginForm.code = captchaVerification
await handleLogin() await handleLogin()
} }
} }
// 滑块校验失败 // 滑块校验失败
const capctchaCheckError = ()=>{ const capctchaCheckError = ()=>{
capctchaCheck.value = false
console.log('capctchaCheckError') console.log('capctchaCheckError')
} }
@ -339,6 +342,7 @@ import { getSwitchByCode } from '@/api/wms/switch'
wsCache.set('ShowPackingNumber', res == 'TRUE' ? true : false) wsCache.set('ShowPackingNumber', res == 'TRUE' ? true : false)
}) })
}catch (e){ }catch (e){
capctchaCheck.value = false
if(e.code === 1002000008){ if(e.code === 1002000008){
setTimeout(function (){ setTimeout(function (){
router.push({path:"/updatePasswordNewTips",query:{username:loginData.loginForm.username}}) router.push({path:"/updatePasswordNewTips",query:{username:loginData.loginForm.username}})

2
src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue
View File

@ -206,7 +206,7 @@ const butttondata = (row,$index) => {
return [ return [
defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:countadjust-request-main:close'}), // 关闭 defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:countadjust-request-main:close'}), // 关闭
// defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['5']),hasPermi:'wms:countadjust-request-main:reAdd'}), //重新添加 defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4']),hasPermi:'wms:countadjust-request-main:reAdd'}), //重新添加
defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:countadjust-request-main:submit'}), // 提交审批 defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:countadjust-request-main:submit'}), // 提交审批
defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:countadjust-request-main:refused'}), // 驳回 defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:countadjust-request-main:refused'}), // 驳回
defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:countadjust-request-main:agree'}), // 审批通过 defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:countadjust-request-main:agree'}), // 审批通过

83
src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue
View File

@ -92,6 +92,9 @@
<Detail <Detail
ref="detailRef" ref="detailRef"
:isBasic="false" :isBasic="false"
:detailButtonIsShowAdd="false"
:detailButtonIsShowEdit="false"
:detailButtonIsShowDelete="false"
:allSchemas="UnplannedreceiptRequestMain.allSchemas" :allSchemas="UnplannedreceiptRequestMain.allSchemas"
:detailAllSchemas="UnplannedreceiptRequestDetail.allSchemas" :detailAllSchemas="UnplannedreceiptRequestDetail.allSchemas"
:detailAllSchemasRules="UnplannedreceiptRequestDetailRules" :detailAllSchemasRules="UnplannedreceiptRequestDetailRules"
@ -631,11 +634,10 @@ const buttonTableClick = async (val, row) => {
} }
}) })
}) })
}finally { } finally {
tableObject.loading = false tableObject.loading = false
} }
} }
} }
/** 关闭按钮操作 */ /** 关闭按钮操作 */
@ -866,7 +868,7 @@ const submitForm = async (formType, submitData) => {
try { try {
let newVal = data.subList.some((item) => item.isEnableBuy == 'TRUE') let newVal = data.subList.some((item) => item.isEnableBuy == 'TRUE')
let newVal1 = data.subList.some((item) => item.isEnableBuy == 'FALSE') let newVal1 = data.subList.some((item) => item.isEnableBuy == 'FALSE')
console.log(newVal,newVal1) console.log(newVal, newVal1)
if (newVal && newVal1) { if (newVal && newVal1) {
message.warning('不能同时选择可制造和可采购的物料') message.warning('不能同时选择可制造和可采购的物料')
return return
@ -955,25 +957,29 @@ const submitFormLabel = async (formType, data) => {
try { try {
formLabelRef.value.formLoading = true formLabelRef.value.formLoading = true
detatableData.tableList.forEach(async (item) => { detatableData.tableList.forEach(async (item) => {
const unitConversion = await UnitConversionApi.getUnitConversionByCode(item.itemCode); const unitConversion = await UnitConversionApi.getUnitConversionByCode(item.itemCode)
let convertRate = 1//转换率 let convertRate = 1 //转换率
let purchaseUom = item.uom//采购计量单位 let purchaseUom = item.uom //采购计量单位
let purchaseStdQty//采购标包数量 let purchaseStdQty //采购标包数量
if(unitConversion!=null){ if (unitConversion != null) {
if(unitConversion.convertRate!=null&&unitConversion.convertRate!='' && unitConversion.convertRate!=0){ if (
convertRate = unitConversion.convertRate; unitConversion.convertRate != null &&
} unitConversion.convertRate != '' &&
if(unitConversion.purchaseUom!=null&&unitConversion.purchaseUom!='' ){ unitConversion.convertRate != 0
purchaseUom = unitConversion.purchaseUom; ) {
} convertRate = unitConversion.convertRate
} }
let purchaseQty = (item.qty / convertRate).toFixed(5);//采购每包中实际的数量 if (unitConversion.purchaseUom != null && unitConversion.purchaseUom != '') {
purchaseStdQty = (item.packQty / convertRate).toFixed(5);//采购每包中实际的数量 purchaseUom = unitConversion.purchaseUom
item.purchaseQty = purchaseQty;//采购实际每包数量 }
item.convertRate = convertRate;//转换率 }
item.purchaseStdQty = purchaseStdQty;//采购标包数量 let purchaseQty = (item.qty / convertRate).toFixed(5) //采购每包中实际的数量
item.purchaseUom = purchaseUom;//采购计量单位 purchaseStdQty = (item.packQty / convertRate).toFixed(5) //采购每包中实际的数量
console.log('item======================',item) item.purchaseQty = purchaseQty //采购实际每包数量
item.convertRate = convertRate //转换率
item.purchaseStdQty = purchaseStdQty //采购标包数量
item.purchaseUom = purchaseUom //采购计量单位
console.log('item======================', item)
await PackageApi.createPackageLabel(item) await PackageApi.createPackageLabel(item)
.then((res) => { .then((res) => {
isCreateLabel.value = true isCreateLabel.value = true
@ -1067,13 +1073,15 @@ const labelPrint = async (row) => {
try { try {
await PackageApi.getPackagePage({ await PackageApi.getPackagePage({
requestNumber: row.number requestNumber: row.number
}).then((res) => { })
.then((res) => {
if (res.list.length > 0) { if (res.list.length > 0) {
isCreateLabel.value = true isCreateLabel.value = true
} else { } else {
isCreateLabel.value = false isCreateLabel.value = false
} }
}).catch((err) => { })
.catch((err) => {
isCreateLabel.value = false isCreateLabel.value = false
console.log(err) console.log(err)
}) })
@ -1082,18 +1090,35 @@ const labelPrint = async (row) => {
// labelPrint(row) // labelPrint(row)
await UnplannedreceiptRequestDetailApi.getDetailList(row.masterId).then(async (res) => { await UnplannedreceiptRequestDetailApi.getDetailList(row.masterId).then(async (res) => {
if (res.length > 0) { if (res.length > 0) {
const itemType = res.some((item) => item.itemType == '可采购' && item.itemBasicType =='TOOL')//跳转协定品标签 const itemType = res.some(
const itemType2 = res.some((item) => item.itemType == '可采购' && item.itemBasicType !='TOOL') (item) => item.itemType == '可采购' && item.itemBasicType == 'TOOL'
) //跳转协定品标签
const itemType2 = res.some(
(item) => item.itemType == '可采购' && item.itemBasicType != 'TOOL'
)
const itemType1 = res.some((item) => item.itemType == '可制造') const itemType1 = res.some((item) => item.itemType == '可制造')
if (itemType) { if (itemType) {
window.open( BASE_URL + '/jmreport/view/1028102732077142016?token=' + getAccessToken() + '&request_number=' + row.number ) window.open(
BASE_URL +
'/jmreport/view/1028102732077142016?token=' +
getAccessToken() +
'&request_number=' +
row.number
)
} }
if (itemType2) { if (itemType2) {
window.open( BASE_URL + '/jmreport/view/1016234988731322368?token=' + getAccessToken() + '&request_number=' + row.number ) window.open(
BASE_URL +
'/jmreport/view/1016234988731322368?token=' +
getAccessToken() +
'&request_number=' +
row.number
)
} }
if (itemType1) { if (itemType1) {
// window.open(src.value + '&request_number=' + row.number) // window.open(src.value + '&request_number=' + row.number)
await PackageApi.batchPrintingLableForYT(row.number).then((res) => { await PackageApi.batchPrintingLableForYT(row.number)
.then((res) => {
console.log(res) console.log(res)
const src = ref( const src = ref(
BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken() BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken()

24
src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts
View File

@ -1423,18 +1423,18 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
isTableForm: false, isTableForm: false,
isForm: false isForm: false
}, },
{ // {
label: '操作', // label: '操作',
field: 'action', // field: 'action',
isDetail: false, // isDetail: false,
hiddenInMain:true, // hiddenInMain:true,
isForm: false , // isForm: false ,
table: { // table: {
width: 150, // width: 150,
fixed: 'right' // fixed: 'right'
}, // },
isTableForm:false, // isTableForm:false,
} // }
])) ]))
function validateQty(rule, value, callback) { function validateQty(rule, value, callback) {
if (value>0) { if (value>0) {

416
src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
View File

@ -15,28 +15,29 @@ const { t } = useI18n() // 国际化
// 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值 // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
const queryParams = { const queryParams = {
pageSize:10, pageSize: 10,
pageNo:1, pageNo: 1,
code:'RepleinmentRequest', code: 'RepleinmentRequest',
businessTypeCode: 'Repleinment' businessTypeCode: 'Repleinment'
} }
const data = await getRequestsettingApi.getRequestsettingPage(queryParams) const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
const requestsettingData =data?.list[0]||{} const requestsettingData = data?.list[0] || {}
// 获取当前操作人的部门 // 获取当前操作人的部门
import { useUserStore } from '@/store/modules/user' import { useUserStore } from '@/store/modules/user'
import { TableColumn } from '@/types/table' import { TableColumn } from '@/types/table'
import {getLocationPageRepleinsh} from "@/api/wms/location"; import { getLocationPageRepleinsh } from '@/api/wms/location'
const userStore = useUserStore() const userStore = useUserStore()
const userDept = userStore.userSelfInfo.dept const userDept = userStore.userSelfInfo.dept
// id 转str 否则form回显匹配不到 // id 转str 否则form回显匹配不到
userDept.id = userDept.id.toString() userDept.id = userDept.id.toString()
const userDeptArray:any = [userDept] const userDeptArray: any = [userDept]
/** /**
* @returns {Array} 补料申请主表 * @returns {Array} 补料申请主表
*/ */
export const RepleinshRequestMain = useCrudSchemas(reactive<CrudSchema[]>([ export const RepleinshRequestMain = useCrudSchemas(
reactive<CrudSchema[]>([
{ {
label: '单据号', label: '单据号',
field: 'number', field: 'number',
@ -47,18 +48,18 @@ export const RepleinshRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
}, },
isForm: false, isForm: false,
isSearch: true, isSearch: true,
sortSearchDefault:1, sortSearchDefault: 1
}, },
{ {
label: '状态', label: '状态',
field: 'status', field: 'status',
dictType: DICT_TYPE.REQUEST_STATUS, dictType: DICT_TYPE.REQUEST_STATUS,
dictClass: 'string', dictClass: 'string',
isForm:false, isForm: false,
isTable: true, isTable: true,
isSearch: true, isSearch: true,
sort: 'custom', sort: 'custom',
sortTableDefault:1, sortTableDefault: 1,
table: { table: {
width: 150 width: 150
}, },
@ -69,65 +70,6 @@ export const RepleinshRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
} }
} }
}, },
{
label: '到库位代码',
field: 'toLocationCode',
sort: 'custom',
table: {
width: 150
},
hiddenInMain:true,
// isTableForm: false,
form: {
// labelMessage: '信息提示说明！！！',
componentProps: {
enterSearch:true,
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择到库位代码', // 输入框占位文本
searchField: 'code', // 查询弹窗赋值字段
searchTitle: '库位信息', // 查询弹窗标题
searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
searchPage: LocationApi.getLocationPageRepleinsh, // 查询弹窗所需分页方法
searchCondition:[{
key: 'available',
value: 'TRUE',
isMainValue: false
}],
verificationParams: [{
key: 'code',
action: '==',
value: '',
isMainValue: false,
isSearch: true,
isFormModel: true,
}], // 失去焦点校验参数
}
},
tableForm:{
isInpuFocusShow: true,
searchListPlaceholder: '请选择到库位代码', // 输入框占位文本
searchField: 'code', // 查询弹窗赋值字段
searchTitle: '库位信息', // 查询弹窗标题
searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
searchPage: LocationApi.getLocationPageRepleinsh, // 查询弹窗所需分页方法
searchCondition:[{
key: 'available',
value: 'TRUE',
isMainValue: false
}]
},
},
{
label: '来源',
field: 'sourceType',
sort: 'custom',
table: {
width: 150
},
isForm: false,
isTable: true,
isDetail: true
},
{ {
label: '生产线代码', label: '生产线代码',
field: 'productionLineCode', field: 'productionLineCode',
@ -150,9 +92,9 @@ export const RepleinshRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
isTable: true, isTable: true,
isDetail: true isDetail: true
}, },
{ {
label: '日期', label: '日期',
sortTableDefault:5, sortTableDefault: 5,
field: 'day', field: 'day',
sort: 'custom', sort: 'custom',
isDetail: true, isDetail: true,
@ -182,9 +124,75 @@ export const RepleinshRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
width: 150 width: 150
}, },
detail: { detail: {
dateFormat:'YYYY-MM-DD' dateFormat: 'YYYY-MM-DD'
} }
}, },
{
label: '到库位代码',
field: 'toLocationCode',
sort: 'custom',
table: {
width: 150
},
hiddenInMain: true,
// isTableForm: false,
form: {
// labelMessage: '信息提示说明！！！',
componentProps: {
enterSearch: true,
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择到库位代码', // 输入框占位文本
searchField: 'code', // 查询弹窗赋值字段
searchTitle: '库位信息', // 查询弹窗标题
searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
searchPage: LocationApi.getLocationPageRepleinsh, // 查询弹窗所需分页方法
searchCondition: [
{
key: 'available',
value: 'TRUE',
isMainValue: false
}
],
verificationParams: [
{
key: 'code',
action: '==',
value: '',
isMainValue: false,
isSearch: true,
isFormModel: true
}
] // 失去焦点校验参数
}
},
tableForm: {
isInpuFocusShow: true,
searchListPlaceholder: '请选择到库位代码', // 输入框占位文本
searchField: 'code', // 查询弹窗赋值字段
searchTitle: '库位信息', // 查询弹窗标题
searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
searchPage: LocationApi.getLocationPageRepleinsh, // 查询弹窗所需分页方法
searchCondition: [
{
key: 'available',
value: 'TRUE',
isMainValue: false
}
]
}
},
{
label: '来源',
field: 'sourceType',
sort: 'custom',
table: {
width: 150
},
isForm: false,
isTable: true,
isDetail: true
},
{ {
label: '便次', label: '便次',
field: 'deliNo', field: 'deliNo',
@ -193,12 +201,12 @@ export const RepleinshRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable:true, isTable: true,
form: { form: {
component: 'InputNumber', component: 'InputNumber',
componentProps: { componentProps: {
min: 1, min: 1
}, }
} }
}, },
{ {
@ -211,7 +219,7 @@ export const RepleinshRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isForm: false, isForm: false
}, },
{ {
label: '到库区类型范围', label: '到库区类型范围',
@ -223,7 +231,7 @@ export const RepleinshRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isForm: false, isForm: false
}, },
{ {
label: '从库区代码范围', label: '从库区代码范围',
@ -233,7 +241,7 @@ export const RepleinshRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
width: 150 width: 150
}, },
isTable: false, isTable: false,
isForm: false, isForm: false
}, },
{ {
label: '到库区代码范围', label: '到库区代码范围',
@ -243,7 +251,7 @@ export const RepleinshRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
width: 150 width: 150
}, },
isTable: false, isTable: false,
isForm: false, isForm: false
}, },
{ {
label: '申请时间', label: '申请时间',
@ -260,13 +268,13 @@ export const RepleinshRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
style: { width:'100%'}, style: { width: '100%' },
type: 'datetime', type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss', dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x', valueFormat: 'x'
} }
}, },
isForm: false, isForm: false
}, },
{ {
label: '截止时间', label: '截止时间',
@ -283,18 +291,18 @@ export const RepleinshRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
style: { width:'100%'}, style: { width: '100%' },
type: 'datetime', type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss', dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x', valueFormat: 'x'
}
} }
},
}, },
{ {
label: '部门', label: '部门',
field: 'departmentCode', field: 'departmentCode',
sort: 'custom', sort: 'custom',
isForm:false, isForm: false,
table: { table: {
width: 150 width: 150
}, },
@ -322,14 +330,14 @@ export const RepleinshRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable:false, isTable: false,
form: { form: {
value: 'Repleinment', value: 'Repleinment',
componentProps: { componentProps: {
disabled: true disabled: true
} }
}, },
isForm: false, isForm: false
}, },
{ {
label: '备注', label: '备注',
@ -388,7 +396,7 @@ export const RepleinshRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
dictType: DICT_TYPE.TRUE_FALSE, dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string', dictClass: 'string',
isTable: false, isTable: false,
isForm:false, isForm: false,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
@ -408,7 +416,7 @@ export const RepleinshRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'autoAgree', field: 'autoAgree',
dictType: DICT_TYPE.TRUE_FALSE, dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string', dictClass: 'string',
isForm:false, isForm: false,
isTable: false, isTable: false,
sort: 'custom', sort: 'custom',
table: { table: {
@ -429,7 +437,7 @@ export const RepleinshRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'autoExecute', field: 'autoExecute',
dictType: DICT_TYPE.TRUE_FALSE, dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string', dictClass: 'string',
isForm:false, isForm: false,
isTable: false, isTable: false,
sort: 'custom', sort: 'custom',
table: { table: {
@ -482,7 +490,7 @@ export const RepleinshRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
componentProps: { componentProps: {
type: 'datetime', type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss', dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x', valueFormat: 'x'
} }
}, },
isForm: false, isForm: false,
@ -493,8 +501,8 @@ export const RepleinshRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
valueFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'YYYY-MM-DD HH:mm:ss',
type: 'daterange', type: 'daterange',
defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
}, }
}, }
}, },
{ {
label: '创建者', label: '创建者',
@ -504,7 +512,7 @@ export const RepleinshRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
width: 150 width: 150
}, },
isTable: true, isTable: true,
isForm: false, isForm: false
}, },
{ {
label: '最后更新时间', label: '最后更新时间',
@ -518,18 +526,18 @@ export const RepleinshRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
width: 180 width: 180
}, },
isDetail: true, isDetail: true,
hiddenInMain:true, hiddenInMain: true,
isTable: false, isTable: false,
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
style: { width:'100%'}, style: { width: '100%' },
type: 'datetime', type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss', dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x', valueFormat: 'x'
} }
}, },
isForm: false, isForm: false
}, },
{ {
label: '最后更新者', label: '最后更新者',
@ -538,11 +546,11 @@ export const RepleinshRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
hiddenInMain:true, hiddenInMain: true,
isTable: false, isTable: false,
isDetail: true, isDetail: true,
isForm: false, isForm: false
}, }
// { // {
// label: '操作', // label: '操作',
// field: 'action', // field: 'action',
@ -573,52 +581,32 @@ export const RepleinshRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
// }, // },
// sortTableDefault:8, // sortTableDefault:8,
// }, // },
])) ])
)
//表单校验 //表单校验
export const RepleinshRequestMainRules = reactive({ export const RepleinshRequestMainRules = reactive({
fromWarehouseCode: [ fromWarehouseCode: [{ required: true, message: '请输入从仓库代码', trigger: 'blur' }],
{ required: true, message: '请输入从仓库代码', trigger: 'blur' } fromAreaTypes: [{ required: true, message: '请选择从库区类型范围', trigger: 'change' }],
], toWarehouseCode: [{ required: true, message: '请输入到仓库代码', trigger: 'blur' }],
fromAreaTypes: [ toAreaTypes: [{ required: true, message: '请选择到库区类型范围', trigger: 'change' }],
{ required: true, message: '请选择从库区类型范围', trigger: 'change' } departmentCode: [{ required: true, message: '请输入部门', trigger: 'blur' }],
], autoCommit: [{ required: true, message: '请选择是否自动提交', trigger: 'change' }],
toWarehouseCode: [ autoAgree: [{ required: true, message: '请选择是否自动通过', trigger: 'change' }],
{ required: true, message: '请输入到仓库代码', trigger: 'blur' } autoExecute: [{ required: true, message: '请选择是否自动执行', trigger: 'change' }],
], toLocationCode: [{ required: true, message: '请输入到库位代码', trigger: ['change', 'blur'] }],
toAreaTypes: [
{ required: true, message: '请选择到库区类型范围', trigger: 'change' }
],
departmentCode: [
{ required: true, message: '请输入部门', trigger: 'blur' }
],
autoCommit: [
{ required: true, message: '请选择是否自动提交', trigger: 'change' }
],
autoAgree: [
{ required: true, message: '请选择是否自动通过', trigger: 'change' }
],
autoExecute: [
{ required: true, message: '请选择是否自动执行', trigger: 'change' }
],
toLocationCode: [
{ required: true, message: '请输入到库位代码', trigger: ['change', 'blur']}
],
directCreateRecord: [ directCreateRecord: [
{ required: true, message: '请选择是否跳过任务直接生成记录', trigger: 'change' } { required: true, message: '请选择是否跳过任务直接生成记录', trigger: 'change' }
], ],
businessType: [ businessType: [{ required: true, message: '请输入业务类型', trigger: 'blur' }],
{ required: true, message: '请输入业务类型', trigger: 'blur' } remark: [{ max: 50, message: '不得超过50个字符', trigger: 'blur' }]
],
remark: [
{ max: 50, message: '不得超过50个字符', trigger: 'blur' }
],
}) })
/** /**
* @returns {Array} 补料申请子表 * @returns {Array} 补料申请子表
*/ */
export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([ export const RepleinshRequestDetail = useCrudSchemas(
reactive<CrudSchema[]>([
{ {
label: '品番', label: '品番',
field: 'itemCode', field: 'itemCode',
@ -626,9 +614,9 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isSearch:true, isSearch: true,
sortSearchDefault:2, sortSearchDefault: 2,
sortTableDefault:3, sortTableDefault: 3,
form: { form: {
// labelMessage: '信息提示说明！！！', // labelMessage: '信息提示说明！！！',
componentProps: { componentProps: {
@ -638,49 +626,56 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
searchTitle: '物料基础信息', // 查询弹窗标题 searchTitle: '物料基础信息', // 查询弹窗标题
searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类 searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
searchPage: ItembasicApi.getItembasicPage, // 查询弹窗所需分页方法 searchPage: ItembasicApi.getItembasicPage, // 查询弹窗所需分页方法
searchCondition:[{ searchCondition: [
{
key: 'available', key: 'available',
value: 'TRUE', value: 'TRUE',
isMainValue: false isMainValue: false
}] }
]
} }
}, },
tableForm:{ tableForm: {
multiple:true, multiple: true,
disabled:true, disabled: true,
// isInpuFocusShow: true, // isInpuFocusShow: true,
searchListPlaceholder: '请选择品番', // 输入框占位文本 searchListPlaceholder: '请选择品番', // 输入框占位文本
searchField: 'code', // 查询弹窗赋值字段 searchField: 'code', // 查询弹窗赋值字段
searchTitle: '物料基础信息', // 查询弹窗标题 searchTitle: '物料基础信息', // 查询弹窗标题
searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类 searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
searchPage: ItembasicApi.getItembasicPage, // 查询弹窗所需分页方法 searchPage: ItembasicApi.getItembasicPage, // 查询弹窗所需分页方法
searchCondition:[{ searchCondition: [
{
key: 'available', key: 'available',
value: 'TRUE', value: 'TRUE',
isMainValue: false isMainValue: false
},{ },
key : 'businessTypeCode', {
key: 'businessTypeCode',
value: queryParams.businessTypeCode value: queryParams.businessTypeCode
}], }
],
verificationPage: ItembasicApi.getItemListByCodes, // 校验数去焦点输入是否正确的方法 verificationPage: ItembasicApi.getItemListByCodes, // 校验数去焦点输入是否正确的方法
isShowTableFormSearch: true, isShowTableFormSearch: true,
verificationParams: [{ verificationParams: [
{
key: 'code', key: 'code',
action: '==', action: '==',
value: '', value: '',
isMainValue: false, isMainValue: false,
isSearch: true, isSearch: true,
isFormModel: true, isFormModel: true
}], // 失去焦点校验参数 }
}, ] // 失去焦点校验参数
}
}, },
{ {
label: '品名', label: '品名',
field: 'itemName', field: 'itemName',
sort: 'custom', sort: 'custom',
sortTableDefault:4, sortTableDefault: 4,
isTableForm: false, isTableForm: false,
isForm: false, isForm: false
}, },
{ {
label: '背番', label: '背番',
@ -700,17 +695,17 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
hiddenInMain:true, hiddenInMain: true,
isTableForm: false, isTableForm: false,
isForm: false, isForm: false
}, },
{ {
label: '数量', label: '数量',
field: 'unexecutedQty', field: 'unexecutedQty',
sort: 'custom', sort: 'custom',
sortTableDefault:4, sortTableDefault: 4,
isTableForm: false, isTableForm: false,
isForm: false, isForm: false
}, },
{ {
label: '计量单位', label: '计量单位',
@ -722,7 +717,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
sortTableDefault:9, sortTableDefault: 9,
tableForm: { tableForm: {
type: 'Select', type: 'Select',
disabled: true disabled: true
@ -740,14 +735,14 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
hiddenInMain:true, hiddenInMain: true,
sortSearchDefault:1000, sortSearchDefault: 1000,
// isSearch: true, // isSearch: true,
sortTableDefault:1100, sortTableDefault: 1100,
isTableForm: false, isTableForm: false,
form: { form: {
componentProps: { componentProps: {
disabled:true, disabled: true
} }
} }
}, },
@ -781,17 +776,19 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
dictType: DICT_TYPE.INVENTORY_STATUS, dictType: DICT_TYPE.INVENTORY_STATUS,
dictClass: 'string', dictClass: 'string',
isTableForm: false, isTableForm: false,
isTable:false, isTable: false,
sort: 'custom', sort: 'custom',
form: { form: {
value: 'OK', value: 'OK',
componentProps: { componentProps: {
disabled: true, disabled: true,
searchCondition:[{ searchCondition: [
{
key: 'available', key: 'available',
value: 'TRUE', value: 'TRUE',
isMainValue: false isMainValue: false
}] }
]
} }
}, },
table: { table: {
@ -811,9 +808,9 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 180 width: 180
}, },
hiddenInMain:true, hiddenInMain: true,
isTableForm: false, isTableForm: false,
isTable:false, isTable: false,
form: { form: {
componentProps: { componentProps: {
disabled: true disabled: true
@ -825,12 +822,12 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
label: '备注', label: '备注',
field: 'remark', field: 'remark',
sort: 'custom', sort: 'custom',
isTableForm:false, isTableForm: false,
table: { table: {
width: 150 width: 150
}, },
isTable:false, isTable: false,
hiddenInMain:true, hiddenInMain: true
}, },
{ {
label: '创建时间', label: '创建时间',
@ -843,14 +840,14 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 180 width: 180
}, },
hiddenInMain:true, hiddenInMain: true,
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
style: { width:'100%'}, style: { width: '100%' },
type: 'datetime', type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss', dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x', valueFormat: 'x'
} }
}, },
isTableForm: false, isTableForm: false,
@ -863,7 +860,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
hiddenInMain:true, hiddenInMain: true,
isTableForm: false, isTableForm: false,
isForm: false isForm: false
}, },
@ -875,10 +872,10 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
hiddenInMain:true, hiddenInMain: true,
isTableForm: false, isTableForm: false,
isTable:false, isTable: false,
isForm: false, isForm: false
}, },
{ {
@ -888,10 +885,10 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
hiddenInMain:true, hiddenInMain: true,
isTableForm: false, isTableForm: false,
sortTableDefault:1, sortTableDefault: 1,
isTable:false, isTable: false
}, },
{ {
label: '订单行', label: '订单行',
@ -900,10 +897,10 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
hiddenInMain:true, hiddenInMain: true,
isTableForm: false, isTableForm: false,
sortTableDefault:2, sortTableDefault: 2,
isTable:false, isTable: false
}, },
{ {
@ -915,8 +912,8 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
}, },
isTableForm: false, isTableForm: false,
isForm: false, isForm: false,
hiddenInMain:true, hiddenInMain: true,
isTable:false, isTable: false
}, },
{ {
label: '到货主代码', label: '到货主代码',
@ -927,8 +924,8 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
}, },
isTableForm: false, isTableForm: false,
isForm: false, isForm: false,
hiddenInMain:true, hiddenInMain: true,
isTable:false, isTable: false
}, },
{ {
label: '最后更新时间', label: '最后更新时间',
@ -941,17 +938,17 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 180 width: 180
}, },
isTable:false, isTable: false,
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
style: { width:'100%'}, style: { width: '100%' },
type: 'datetime', type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss', dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x', valueFormat: 'x'
} }
}, },
hiddenInMain:true, hiddenInMain: true,
isTableForm: false, isTableForm: false,
isForm: false isForm: false
}, },
@ -963,10 +960,10 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
width: 150 width: 150
}, },
isTableForm: false, isTableForm: false,
hiddenInMain:true, hiddenInMain: true,
isTable:false, isTable: false,
isForm: false isForm: false
}, }
// { // {
// label: '未执行任务数量', // label: '未执行任务数量',
// field: 'unexecutedQty', // field: 'unexecutedQty',
@ -992,7 +989,8 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
// }, // },
// isTableForm:false, // isTableForm:false,
// } // }
])) ])
)
//表单校验 //表单校验
export const RepleinshRequestDetailRules = reactive({ export const RepleinshRequestDetailRules = reactive({
@ -1002,10 +1000,6 @@ export const RepleinshRequestDetailRules = reactive({
// toLocationCode: [ // toLocationCode: [
// { required: true, message: '请输入到库位代码', trigger: 'blur' } // { required: true, message: '请输入到库位代码', trigger: 'blur' }
// ], // ],
itemCode: [ itemCode: [{ required: true, message: '请输入品番', trigger: 'blur' }],
{ required: true, message: '请输入品番', trigger: 'blur' } remark: [{ max: 50, message: '不得超过50个字符', trigger: 'blur' }]
],
remark: [
{ max: 50, message: '不得超过50个字符', trigger: 'blur' }
],
}) })

2
src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue
View File

@ -212,7 +212,7 @@ const { getList, setSearchParams } = tableMethods
// 列表头部按钮 // 列表头部按钮
const HeadButttondata = [ const HeadButttondata = [
defaultButtons.defaultExportBtn({hasPermi:'wms:supplierinvoice-record-main:export'}), // 导出 defaultButtons.defaultExportBtn({hasPermi:'wms:supplierinvoice-record-main:export'}), // 导出
defaultButtons.mainLisSelectiontPointBtn(null), // 批量打印 // defaultButtons.mainLisSelectiontPointBtn(null), // 批量打印
defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFreshBtn(null), // 刷新
defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultFilterBtn(null), // 筛选
defaultButtons.defaultSetBtn(null), // 设置 defaultButtons.defaultSetBtn(null), // 设置

Write Preview
Loading…
Cancel
Save