Browse Source

要货计划到达时间

master_hella_20240701
yufei0306 6 months ago
parent
commit
730ee47de5
  1. 3
      src/locales/en-US.ts
  2. 3
      src/locales/zh-CN.ts
  3. 2
      src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/productputawayAssembleJobMain.data.ts
  4. 2
      src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRecordMain/productputawayAssembleRecordMain.data.ts
  5. 2
      src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/productputawayAssembleRequestMain.data.ts
  6. 2
      src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
  7. 13
      src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue

3
src/locales/en-US.ts

@ -1009,7 +1009,8 @@ export default {
:'Please first select the data you want to print',
:'Failed to create label',
:'The production date cannot be longer than the expiration date',
'计划到货时间大于要货计划送达日期是否继续?':'The planned arrival time is greater than the planned delivery date. Do you want to continue?',
'计划到货时间大于':'The planned arrival time is greater than ',
'是否继续?':'. Do you want to continue?',
'子表明细不能为空!':'Subindicates that the detail cannot be empty!',
:'The purchase request was successfully generated',
'确认生成采购申请吗?':'Confirm to generate purchase application?',

3
src/locales/zh-CN.ts

@ -1009,7 +1009,8 @@ export default {
:'请先选择要打印的数据',
:'创建标签失败',
:'生产日期不可以大于过期日期',
'计划到货时间大于要货计划送达日期是否继续?':'计划到货时间大于要货计划送达日期是否继续?',
'计划到货时间大于':'计划到货时间大于',
'是否继续?':'是否继续?',
'子表明细不能为空!':'子表明细不能为空!',
:'采购申请生成成功',
'确认生成采购申请吗?':'确认生成采购申请吗?',

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

@ -611,7 +611,7 @@ export const ProductputawayJobMainRules = reactive({
*/
export const ProductputawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
{
label: '采购订单号',
label: '订单号',
field: 'poNumber',
sort: 'custom',
table: {

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

@ -390,7 +390,7 @@ export const ProductputawayRecordMainRules = reactive({
*/
export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
{
label: '采购订单号',
label: '订单号',
field: 'poNumber',
sort: 'custom',
table: {

2
src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/productputawayAssembleRequestMain.data.ts

@ -420,7 +420,7 @@ export const ProductputawayRequestMainRules = reactive({
*/
export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
{
label: '采购订单号',
label: '订单号',
field: 'poNumber',
sort: 'custom',
table: {

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

@ -899,7 +899,7 @@ const submitForm = async (formType, data) => {
let planArriveStr = formatDate(data.planArriveTime);
if(planArriveStr > planArriveTimeStr.value){
let confirmFlag = false;
await message.confirm(t('ts.计划到货时间大于要货计划送达日期是否继续?')).then(() => {
await message.confirm(`${t('ts.计划到货时间大于')}${planArriveTimeStr.value}${t('ts.是否继续?')}`).then(() => {
console.log("选择了OK")
//OK
}).catch(() => {

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

@ -205,10 +205,13 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
getSearchTableData(val[0]['number'],formField,searchField)
//
let beginTime = val[0]['endTime']
let deliveryDate = formatDate(val[0]['deliveryDate'],'YYYY-MM-DD')
planArriveTimeStr.value = deliveryDate + ' '+ beginTime+":00"
setV['planArriveTime']= new Date(planArriveTimeStr.value).valueOf();
if(val[0]['deliveryDate']){
let beginTime = val[0]['endTime'] || '00:00'
let deliveryDate = formatDate(val[0]['deliveryDate'],'YYYY-MM-DD')
planArriveTimeStr.value = deliveryDate + ' '+ beginTime+":00"
setV['planArriveTime']= new Date(planArriveTimeStr.value).valueOf();
}
//
tableData.value = []
}
@ -280,7 +283,7 @@ const submitForm = async (formType, data) => {
let planArriveStr = formatDate(data.planArriveTime);
if(planArriveStr > planArriveTimeStr.value){
let confirmFlag = false;
await message.confirm(t('ts.计划到货时间大于要货计划送达日期是否继续?')).then(() => {
await message.confirm(`${t('ts.计划到货时间大于')}${planArriveTimeStr.value}${t('ts.是否继续?')}`).then(() => {
console.log("选择了OK")
//OK
}).catch(() => {

Loading…
Cancel
Save