Merge branch 'master' of https://git.7in6.com/Minong/mes-admin-backend-ui

src/view/performance/jjgzzhys.vue

@@ -1,6 +1,6 @@
 <template>
   <div style="border: 1px black solid; width: 30%; height: 33%; position: absolute; top: 50%; left: 50%; transform: translate(-50%, -50%);">
-    <div style="margin-top: 30px">
+    <div style="margin-top: 55px">
       <el-form-item label="考勤年月:" class="mab" prop="keyOrder" label-width="100">
         <el-input v-model="jjgzzhysformData.date" @keyup.enter="jgzzhysProductValue" style="width: 130px;"/>
       </el-form-item>
@@ -30,7 +30,7 @@
       </el-form-item>
 
 
-      <div class="dialog-footer" style="text-align: right; margin-top: auto; margin-right: 30px;">
+      <div class="dialog-footer" style="text-align: right; margin-top: auto; margin-right: 20px;">
         <el-button type="primary" @click="jjgzzhysclick">继 续</el-button>
       </div>
     </div>
@@ -46,12 +46,12 @@ const form = reactive({})
 const visible = ref(true)
 const jjgzzhysformData = reactive({
   date: '',
-  start_date: null,
-  end_date: null,
-  vacation_one_start: null,
-  vacation_one_end: null,
-  vacation_two_start: null,
-  vacation_two_end: null,
+  start_date: '',
+  end_date: '',
+  vacation_one_start: '',
+  vacation_one_end: '',
+  vacation_two_start: '',
+  vacation_two_end: '',
 });
 //=============页面默认加载获取=========
 // 获取当前日期
@@ -87,37 +87,27 @@ const jgzzhysProductValue = () => {
 
 //考勤年月按钮 继续
 const jjgzzhysclick = async () => {
+  // console.log(jjgzzhysformData.start_date)
   function formatDate(dateString) {
-    const date = new Date(dateString);
-    return date.getFullYear() + '-' +
-        (date.getMonth() + 1).toString().padStart(2, '0') + '-' +
-        date.getDate().toString().padStart(2, '0') + ' ';
-  }
-
-  const currentYear = new Date().getFullYear(); // 获取当前年份
-
-  const isCurrentYearOrNull = (dateString) => {
-    if (dateString === null) {
-      return true; // 如果日期为null，也视为空
+    if (dateString === null || dateString === '') {
+      return '';
     }
-    const year = parseInt(dateString.substring(0, 4)); // 提取日期的年份并转换为整数
-    return year === currentYear || year === 1970; // 比较年份是否等于当前年份或者为1970
-  };
 
-  const start_date_formatted = isCurrentYearOrNull(jjgzzhysformData.start_date) ? formatDate(jjgzzhysformData.start_date) : "";
-  const end_date_formatted = isCurrentYearOrNull(jjgzzhysformData.end_date) ? formatDate(jjgzzhysformData.end_date) : "";
-  const vacation_one_start_formatted = isCurrentYearOrNull(jjgzzhysformData.vacation_one_start) ? formatDate(jjgzzhysformData.vacation_one_start) : "";
-  const vacation_one_end_formatted = isCurrentYearOrNull(jjgzzhysformData.vacation_one_end) ? formatDate(jjgzzhysformData.vacation_one_end) : "";
-  const vacation_two_start_formatted = isCurrentYearOrNull(jjgzzhysformData.vacation_two_start) ? formatDate(jjgzzhysformData.vacation_two_start) : "";
-  const vacation_two_end_formatted = isCurrentYearOrNull(jjgzzhysformData.vacation_two_end) ? formatDate(jjgzzhysformData.vacation_two_end) : "";
+    const formattedDate = new Date(dateString);
+    const year = formattedDate.getFullYear();
+    const month = String(formattedDate.getMonth() + 1).padStart(2, '0');
+    const day = String(formattedDate.getDate()).padStart(2, '0');
 
+    return `${year}-${month}-${day}`;
+  }
   const formattedData = {
-    start_date: start_date_formatted,
-    end_date: end_date_formatted,
-    vacation_one_start: vacation_one_start_formatted,
-    vacation_one_end: vacation_one_end_formatted,
-    vacation_two_start: vacation_two_start_formatted,
-    vacation_two_end: vacation_two_end_formatted
+    date: jjgzzhysformData.date,
+    start_date: formatDate(jjgzzhysformData.start_date),
+    end_date: formatDate(jjgzzhysformData.end_date),
+    vacation_one_start: formatDate(jjgzzhysformData.vacation_one_start),
+    vacation_one_end: formatDate(jjgzzhysformData.vacation_one_end),
+    vacation_two_start: formatDate(jjgzzhysformData.vacation_two_start),
+    vacation_two_end: formatDate(jjgzzhysformData.vacation_two_end)
   };
   console.log(formattedData)
   //目前没有接口，先不用调用

src/view/yunyin/shengchanguanli/gongdanziliao.vue

@@ -2767,6 +2767,7 @@ const _WorkOrderDetailCopedata = async ()=>{
   let search = yycpzlformData['gdbh'];
   // 2403725 是带两个方案的
   const WorkOrderDetailCopes = await ProductCopeDetail({workorder:search});
+  console.log(WorkOrderDetailCopes)
   fanganRef.value.focus()
   if(WorkOrderDetailCopes.msg === '未找到工单信息'){
     yycpzlformData['khdh'] = '';
@@ -2776,8 +2777,6 @@ const _WorkOrderDetailCopedata = async ()=>{
     ElMessage({type: 'warning',message: '未找到工单信息'})
     return false;
   }else{
-    console.log( WorkOrderDetailCopes.data)
-    console.log( WorkOrderDetailCopes.data['产品代号'])
     yycpzlformData['gdbh'] = WorkOrderDetailCopes.data['工单编号'];
     yycpzlformData['khdh'] = WorkOrderDetailCopes.data['客户编号'];
     yycpzlformData['khmc'] = WorkOrderDetailCopes.data['客户名称'];