liuhairui преди 1 година
родител
ревизия
2139153170
променени са 2 файла, в които са добавени 28 реда и са изтрити 25 реда
  1. 24 23
      src/view/yunyin/renliziyuan/renyuanjibenziliao.vue
  2. 4 2
      src/view/yunyin/shengchanguanli/gongdanshengchan.vue

+ 24 - 23
src/view/yunyin/renliziyuan/renyuanjibenziliao.vue

@@ -186,7 +186,7 @@
                 <el-button type="primary"  @click="enterDialog">确定</el-button>
               </div>
           </el-dialog>
-		  
+
 		  <el-dialog v-model="AttendanceVisible" title="考勤建立" destroy-on-close width="800px" >
 		    <el-row :gutter="24">
 		      <el-col :span="7">
@@ -194,50 +194,50 @@
 		        	<el-input v-model="Attendancevalue['month']"  style="margin-top=0px; margin-bottom: 1px;" id="年月份" @keydown="handleKeyDown($event, '法定天数', 'C类', '法定天数')" placeholder="" />
 		        </el-form-item>
 		      </el-col>
-		
+
 		    	<el-col :span="7" style="margin-top=0px; margin-bottom: 1px;">
 		    	<el-form-item label="法定天数" prop="id" style="margin-top=0px; margin-bottom: 1px;">
 		    		<el-input v-model="Attendancevalue['day']"  style="margin-top=0px; margin-bottom: 1px;" @blur="getdays()" id="法定天数" @keydown="handleKeyDown($event, '法定天数', '年月份', 'A类')" placeholder="" />
 		    	</el-form-item>
 		    	</el-col>
 		    </el-row>
-			
-			
-			
-			
+
+
+
+
 			<el-row :gutter="24">
-			  
-					
+
+
 				<el-col :span="7" style="margin-top=0px; margin-bottom: 1px;">
 				<el-form-item label="A类(双休版)" prop="id" style="margin-top=0px; margin-bottom: 1px;">
 					<el-input v-model="Attendancevalue['typeA']" id="A类" @keydown="handleKeyDown($event, 'A类', '法定天数', 'B类')" style="margin-top=0px; margin-bottom: 1px;"  placeholder="" />
 				</el-form-item>
 				</el-col>
 			</el-row>
-			
-			
+
+
 			<el-row :gutter="24">
-			  
-					
+
+
 				<el-col :span="7" style="margin-top=0px; margin-bottom: 1px;">
 				<el-form-item label="B类(7.5小时班)" prop="id" style="margin-top=0px; margin-bottom: 1px;">
 					<el-input v-model="Attendancevalue['typeB']" id="B类" @keydown="handleKeyDown($event, 'B类', 'A类', 'C类')" style="margin-top=0px; margin-bottom: 1px;"  placeholder="" />
 				</el-form-item>
 				</el-col>
 			</el-row>
-			
-			
+
+
 			<el-row :gutter="24">
-			  
-					
+
+
 				<el-col :span="7" style="margin-top=0px; margin-bottom: 1px;">
 				<el-form-item label="C类(11小时班)" prop="id" style="margin-top=0px; margin-bottom: 1px;">
 					<el-input v-model="Attendancevalue['typeC']" id="C类" @keydown="handleKeyDown($event, 'C类', 'B类', '年月份')" style="margin-top=0px; margin-bottom: 1px;"  placeholder="" />
 				</el-form-item>
 				</el-col>
 			</el-row>
-			
-			
+
+
 			<template #footer>
 			  <div class="dialog-footer">
 			    <el-button @click="closeDialog">取 消</el-button>
@@ -245,8 +245,8 @@
 			  </div>
 			</template>
 		  </el-dialog>
-		  
-		  
+
+
         </el-main>
       </layout-content>
       </layout>
@@ -347,6 +347,7 @@ const _department_code = ref(null)
 const getDepartmentdata = async () => {
   try {
     const data  = await getDepartment();
+    console.log(data)
     treeData.value = data.data;
   } catch (error) {
     console.error(error)
@@ -431,7 +432,7 @@ const onAttendance = () => {
 	const formattedMonth = month < 10 ? '0' + month : month;
 	console.log(year)
 	console.log(month)
-	
+
 	Attendancevalue.value['month']=year.toString() + formattedMonth.toString();
 	Attendancevalue.value['day']=22
   AttendanceVisible.value=true
@@ -480,13 +481,13 @@ const Attendancevalue = ref({})
 	sys_id:'[1010/郑梅芳]'
    };
    console.log(formattedData)
-   const response = await clockUpdate(formattedData); 
+   const response = await clockUpdate(formattedData);
    if (response.code === 0) {
     	  ElMessage({
     	    type: 'success',
     	    message: '成功'
     	  })
-		 AttendanceVisible.value=false 
+		 AttendanceVisible.value=false
     }else{
    	   ElMessage({
    	     type: 'error',

+ 4 - 2
src/view/yunyin/shengchanguanli/gongdanshengchan.vue

@@ -709,8 +709,10 @@ const handleNodeClick = async (node) => {
     console.log(_machine.value)
 
     const zhubiao = await MachineWorkOrderList({ machine:_machine.value})
+    console.log("表格列表中【排程↑】【制程↓】")
+    console.log(zhubiao)
+
     chejianData.value = zhubiao.data['排程'];
-    console.log("获取出来的数据【排程↑】【制程↓】↓↓↓↓↓↓↓↓↓↓↓↓↓")
     chejianfuData.value = zhubiao.data['制程'];
   }
 };
@@ -734,7 +736,7 @@ const schandleNodeClick = async (node) => {
   bottomData.value = []
   yjtableData.value = []
   gytableData.value = []
-  console.log('点击了-------' + node.number)
+  console.log(node.number)
   switch (node.number) {
     case "计划中":
       const jhz_Projectdata = await Project({status:currentNode.value,search:'',page:1,limit:30});