要货计划到达时间

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?',

src/locales/zh-CN.ts

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

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: {

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: {

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: {

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(() => {

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')
+        if(val[0]['deliveryDate']){
-        planArriveTimeStr.value = deliveryDate + ' '+ beginTime+":00"
+          let beginTime =  val[0]['endTime'] || '00:00'
-        setV['planArriveTime']= new Date(planArriveTimeStr.value).valueOf();
+          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(() => {