页面样式

src/view/job/rewards/rewards.vue

@@ -102,7 +102,7 @@
                 align="left"
                 label="工单编号"
                 prop="sczl_gdbh"
-                width="90" sortable
+                width="120" sortable
               />
               <el-table-column
                 align="left"
@@ -120,67 +120,67 @@
                 align="left"
                 label="流程单备注"
                 prop="sczl_numDesc"
-                width="100" sortable
+                width="120" sortable
               />
               <el-table-column
                 align="left"
                 label="联数"
                 prop="sczl_ls"
-                width="70" sortable
+                width="120" sortable
               />
               <el-table-column
                 align="left"
                 label="责任部门"
                 prop="责任部门"
-                width="90" sortable
+                width="120" sortable
               />
               <el-table-column
                 align="left"
                 label="大废品数"
                 prop="sczl_cl"
-                width="90" sortable
+                width="120" sortable
               />
               <el-table-column
                 align="left"
                 label="废品类型"
                 prop="sczl_fplxA"
-                width="100" sortable
+                width="120" sortable
               />
               <el-table-column
                 align="left"
                 label="废品来源"
                 prop="sczl_fplxB"
-                width="90" sortable
+                width="120" sortable
               />
               <el-table-column
                 align="left"
                 label="奖励班组"
                 prop="Jl_bzdh"
-                width="90" sortable
+                width="120" sortable
               />
               <el-table-column
                 align="left"
                 label="检验员工"
                 prop="JL_bh1"
-                width="90" sortable
+                width="120" sortable
               />
               <el-table-column
                 align="left"
                 label="责任班组"
                 prop="sczl_bzdh"
-                width="90" sortable
+                width="120" sortable
               />
               <el-table-column
                 align="left"
                 label="责任员工1"
                 prop="sczl_bh1"
-                width="90" sortable
+                width="120" sortable
               />
               <el-table-column
                 align="left"
                 label="责任员工2"
                 prop="sczl_bh2"
-                width="90" sortable
+                width="120" sortable
               />
               <el-table-column
                 align="left"
@@ -198,7 +198,7 @@
                 align="left"
                 label="UNIQID"
                 prop="UniqId"
-                width="80" sortable
+                width="120" sortable
               />
             </el-table>
             <div class="gva-pagination">

src/view/job/sampling/sampling.vue

@@ -57,11 +57,13 @@
                 <el-button
                   type="primary"
                   icon="search"
+				  class="bt"
                   @click="handlerSearch"
                 >查询</el-button>
 				<el-button
 				   type="primary"
-				   :icon="Search"
+				   
+				   class="bt" icon="plus"
 				   @click="handleShowAdd"
 				 >新增
 				 </el-button>
@@ -115,21 +117,21 @@
                 align="left"
                 label="员工编号"
                 prop="Sczl_bh"
-                width="90"
+                width="120"
 				sortable
               />
               <el-table-column
                 align="left"
                 label="员工姓名"
                 prop="name"
-                width="90"
+                width="120"
 				sortable
               />
               <el-table-column
                 align="left"
                 label="工单编号"
                 prop="Sczl_gdbh"
-                width="90"
+                width="120"
 				sortable
               />
               <el-table-column
@@ -143,54 +145,54 @@
                 align="left"
                 label="工序名称"
                 prop="Sczl_gxmc"
-                width="95"
+                width="120"
 				sortable
               />
               <el-table-column
                 align="left"
                 label="印件号"
                 prop="sczl_yjno"
-                width="70"
+                width="120"
 				sortable
               />
               <el-table-column
                 align="left"
                 label="工序号"
                 prop="sczl_gxh"
-                width="70"
+                width="120"
 				sortable
               />
               <el-table-column
                 align="left"
                 label="流程单号"
                 prop="Sczl_num"
-                width="85"
+                width="120"
 				sortable
               />
               <el-table-column
                 align="left"
                 label="抽检数"
                 prop="Sczl_抽检数"
-                width="70"
+                width="120"
 				sortable
               />
               <el-table-column
                 align="left"
                 label="A类废"
                 prop="sczl_A类废"
-                width="70" sortable
+                width="120" sortable
               />
               <el-table-column
                 align="left"
                 label="B类废"
                 prop="sczl_B类废"
-                width="70"  sortable
+                width="120"  sortable
               />
               <el-table-column
                 align="left"
                 label="C类废"
                 prop="sczl_C类废"
-                width="70" sortable
+                width="120" sortable
               />
               <el-table-column
                 align="left"
@@ -220,7 +222,7 @@
                 align="left"
                 label="UNIQID"
                 prop="UniqId"
-                width="75" sortable
+                width="120" sortable
               />
             </el-table>
             <div class="gva-pagination">
@@ -974,7 +976,11 @@ const ent1 = (event) => {
 :deep(.el-table__body tr.current-row) > td {
   background: #ff80ff !important;
 }
-
+.bt{
+  margin-left: 2px !important;
+  padding: 3px !important;
+  font-size: 12px;
+}
 :deep(.el-table td .cell) {
   line-height: 30px !important;
 }

src/view/performance/06-packingDocuments/index.vue

@@ -334,8 +334,7 @@
             >
               <el-table-column
                 type="selection"
-                width="55"
-				
+                width="55"			
               />
               <!-- 循环渲染列 -->
               <el-table-column
@@ -343,7 +342,7 @@
                 :key="column.prop"
                 :prop="column.prop"
                 :label="column.label"
-                :width="column.width"
+                width="110"
 				sortable
               />
             </el-table>
@@ -600,10 +599,8 @@ const getTableInfo = async(id) => {
     const response = await getInfo({ UniqId: id })
     if (response.code === 0) {
       const { sczl_rq, sczl_bh, name, sczl_bzdh, sczl_jsss, sczl_冲定额, sczl_desc, ...rest } = response.data
-      // 直接赋值基础属性
       Object.assign(detailData, { sczl_rq, sczl_bh, name, sczl_bzdh, sczl_jsss, sczl_冲定额, sczl_desc })
-      // 生成表格数据
-      detailData.table = Array.from({ length: 6 }, (_, i) => i + 1) // 创建一个长度为6的数组 [1, 2, 3, 4, 5, 6]
+      detailData.table = Array.from({ length: 6 }, (_, i) => i + 1)
         .map(num => {
           return {
             sczl_gdbh: rest[`sczl_gdbh${num}`],
@@ -618,21 +615,42 @@ const getTableInfo = async(id) => {
             sczl_dedh: rest[`sczl_dedh${num}`],
           }
         })
-        // .filter(item => item.sczl_gdbh !== '') // 过滤掉空的工单编号
-      detailData.UniqId = id
-      dialogFormVisible.value = true
 
-      // 在 setTimeout 中获取元素，确保在 DOM 渲染完毕后执行
-      setTimeout(() => {
-        formElements = document.getElementById('detail-form').elements
-        formElements[0].focus()
-      }, 0)
+      if (type.value === '新增') {
+		  console.log(detailData)
+		  detailData.name=''
+		  detailData.sczl_bh=''
+		  detailData.sczl_bzdh=''
+		  detailData.sczl_desc=''
+		  detailData.sczl_jsss=''
+		  detailData.sczl_rq=''
+        detailData.table.forEach(row => {
+          for (const key in row) {
+            row[key] = '' // 清空每行的内容
+          }
+        })
+      }else{
+		  detailData.UniqId = id
+		  dialogFormVisible.value = true
+	  }
+
+      if (type.value === '新增' || type.value === '编辑') {
+        detailData.UniqId = id
+        dialogFormVisible.value = true
+
+        // 在 setTimeout 中获取元素，确保在 DOM 渲染完毕后执行
+        setTimeout(() => {
+          formElements = document.getElementById('detail-form').elements
+          formElements[0].focus()
+        }, 0)
+      }
     }
   } catch (e) {
     console.log(e)
   }
 }
 
+
 // 获取工序名称
 const getTableGxMc = async(index, row) => {
   try {
@@ -693,6 +711,7 @@ const updateDetailData = async() => {
 // 新增数据
 const handleShowAdd = async() => {
   type.value = '新增'
+  
   await getTableInfo(currentRow.value?.UniqId)
   // 默认日期为前一天的日期
   const date = dayjs().subtract(1, 'day').format('YYYY-MM-DD')

src/view/performance/07-otherDocuments/index.vue

@@ -388,17 +388,17 @@ const elFormRef = ref()
 
 // ============== 表格页面 ==============
 const tableColumns = [
-  { prop: 'sczl_Type', label: '计件类型', width: '100' },
+  { prop: 'sczl_Type', label: '计件类型', width: '120' },
   { prop: 'Sczl_rq', label: '日期', width: '100' },
-  { prop: 'Sczl_bh1', label: '员工编号', width: '100' },
-  { prop: 'name', label: '员工姓名', width: '100' },
-  { prop: 'sczl_gdbh', label: '工单编号', width: '100' },
+  { prop: 'Sczl_bh1', label: '员工编号', width: '120' },
+  { prop: 'name', label: '员工姓名', width: '120' },
+  { prop: 'sczl_gdbh', label: '工单编号', width: '120' },
   { prop: 'Gd_cpmc', label: '产品名称', width: '300' },
   { prop: 'Sczl_cl', label: '产量', width: '100' },
-  { prop: '', label: '千件工价', width: '100' }, // prop 属性值需要补充
+  { prop: '', label: '千件工价', width: '120' }, // prop 属性值需要补充
   { prop: 'sys_mc', label: '工价备注', width: '200' }, // prop 属性值需要补充
   { prop: 'Sczl_desc', label: '备注', width: '100' },
-  { prop: 'Sczl_gxmc', label: '工序名称', width: '100' },
+  { prop: 'Sczl_gxmc', label: '工序名称', width: '120' },
   { prop: 'sczl_yjno', label: '印件号', width: '100' },
   { prop: 'sczl_gxh', label: '工序号', width: '100' },
   { prop: 'sys_id', label: '创建用户', width: '150' },

src/view/performance/08-timesheet/index.vue

@@ -484,28 +484,28 @@ const elFormRef = ref()
 // ============== 表格页面 ==============
 const tableColumns = [
   { prop: 'wgjs_rq', label: '日期', width: 100 },
-  { prop: 'wgjs_bh1', label: '员工编号1', width: 100 },
+  { prop: 'wgjs_bh1', label: '员工编号1', width: 120 },
   { prop: 'name1', label: '姓名1', width: 100 },
-  { prop: 'department', label: '所在部门', width: 100 },
+  { prop: 'department', label: '所在部门', width: 120 },
   { prop: 'wgjs_js1', label: '计时1', width: 100 },
   { prop: 'wgjs_yy1', label: '原因1', width: 100 },
-  { prop: 'wgjs_bh2', label: '员工编号2', width: 100 },
+  { prop: 'wgjs_bh2', label: '员工编号2', width: 120 },
   { prop: 'name2', label: '姓名2', width: 100 },
   { prop: 'wgjs_js2', label: '计时2', width: 100 },
   { prop: 'wgjs_yy2', label: '原因2', width: 100 },
-  { prop: 'wgjs_bh3', label: '员工编号3', width: 100 },
+  { prop: 'wgjs_bh3', label: '员工编号3', width: 120 },
   { prop: 'name3', label: '姓名3', width: 100 },
   { prop: 'wgjs_js3', label: '计时3', width: 100 },
   { prop: 'wgjs_yy3', label: '原因3', width: 100 },
-  { prop: 'wgjs_bh4', label: '员工编号4', width: 100 },
+  { prop: 'wgjs_bh4', label: '员工编号4', width: 120 },
   { prop: 'name4', label: '姓名4', width: 100 },
   { prop: 'wgjs_js4', label: '计时4', width: 100 },
   { prop: 'wgjs_yy4', label: '原因4', width: 100 },
-  { prop: 'wgjs_bh5', label: '员工编号5', width: 100 },
-  { prop: 'name5', label: '姓名5', width: 100 },
+  { prop: 'wgjs_bh5', label: '员工编号5', width: 120},
+  { prop: 'name5', label: '姓名5', width: 120 },
   { prop: 'wgjs_js5', label: '计时5', width: 100 },
   { prop: 'wgjs_yy5', label: '原因5', width: 100 },
-  { prop: 'wgjs_bh6', label: '员工编号6', width: 100 },
+  { prop: 'wgjs_bh6', label: '员工编号6', width: 120 },
   { prop: 'name6', label: '姓名6', width: 100 },
   { prop: 'wgjs_js6', label: '计时6', width: 100 },
   { prop: 'wgjs_yy6', label: '原因6', width: 100 },
@@ -615,17 +615,17 @@ const handleShowDetail = async() => {
 
 // 新增数据
 const handleShowAdd = async() => {
-  const { wgjs_rq, wgjs_bh1 } = currentRow.value
-  const res = await getDetail({ wgjs_rq, wgjs_bh1 })
-  if (res.code === 0) {
-    type.value = 'add'
-    Object.assign(detailData, res.data)
+  // const { wgjs_rq, wgjs_bh1 } = currentRow.value
+  // const res = await getDetail({ wgjs_rq, wgjs_bh1 })
+  // if (res.code === 0) {
+  //   type.value = 'add'
+  //   Object.assign(detailData, res.data)
 
-    detailData['wgjs_rq'] = dayjs().format('YYYY-MM-DD')
+  //   detailData['wgjs_rq'] = dayjs().format('YYYY-MM-DD')
 
-    // dialogFormVisible.value = true
-    showDialog()
-  }
+  //   // dialogFormVisible.value = true   
+  // }
+  showDialog()
 }
 
 // 更新数据

src/view/performance/09-workOrderVerification/index.vue

@@ -47,24 +47,28 @@
               <el-button
                 type="primary"
                 :icon="Search"
+				class="bt"
                 @click="handleSearch"
               >搜索
               </el-button>
               <el-button
                 type="primary"
-                :icon="Search"
+                icon="copy-document"
+				class="bt"
                 @click="dialogMrhjtj = true"
               >每日核检统计
               </el-button>
               <el-button
                 type="primary"
-                :icon="Search"
+                icon="copy-document"
+				class="bt"
                 @click="showGdzjfptj"
               >工单质检废品统计
               </el-button>
               <el-button
                 type="primary"
-                :icon="Search"
+                
+				class="bt" icon="plus"
                 @click="handleShowAdd"
               >新增
               </el-button>
@@ -72,6 +76,7 @@
                 <el-button
                   type="primary"
                   :icon="Download"
+				  class="bt"
                   @click="exportExcel"
                 >导出到Excel</el-button>
               </div>
@@ -537,12 +542,12 @@ const elSearchFormRef = ref()
 
 // =========== 表格控制部分 ===========
 const tableColumns = [
-  { label: '工单编号', prop: 'qczl_gdbh', width: '100' },
+  { label: '工单编号', prop: 'qczl_gdbh', width: '120' },
   { label: '印件号', prop: 'qczl_yjno', width: '100' },
   { label: '印件名称', prop: 'Gd_cpmc', width: '400' },
   { label: '日期', prop: 'qczl_rq', width: '100' },
-  { label: '流程单号', prop: 'qczl_num', width: '100' },
-  { label: '流程单备注', prop: 'qczl_NumDesc', width: '100' },
+  { label: '流程单号', prop: 'qczl_num', width: '120' },
+  { label: '流程单备注', prop: 'qczl_NumDesc', width: '120' },
   { label: '总废品', prop: 'qczl_fp', width: '100' },
   { label: '废品1', prop: 'sl_lb1', width: '250' },
   { label: '废品2', prop: 'sl_lb2', width: '250' },
@@ -661,7 +666,7 @@ const handleCurrentChange = () => {
 
 // ============== 详情页面 ==============
 const detailData = reactive({})
-const selectData = reactive([])
+// const selectData = reactive([])
 const selectColumns = [
   { label: '', prop: 'sczl_gxmc', width: '500' },
   { label: '', prop: 'sczl_jtbh', width: '100' },
@@ -795,8 +800,9 @@ const handleFplbClick = (node, check) => {
   }
 }
 
-// 废品数量回车
-const handleFpslEnter = async(index, row) => {
+let selectData = [] // 将const改为let
+
+const handleFpslEnter = async (index, row) => {
   if (row.fp_sl === '0') {
     detailData.table[index].fp_gxmc = ''
     detailData.table[index].fp_bz = ''
@@ -819,12 +825,30 @@ const handleFpslEnter = async(index, row) => {
     console.log(e)
     return
   }
-  selectIndex = index
-  Object.assign(selectData, res.data)
+
+  // 解译乱码并填充到selectData
+  const decodedData = res.data.map(item => {
+    return {
+      sczl_gxmc: decodeEntities(item.sczl_gxmc), // 解译乱码函数
+      sczl_bzdh: item.sczl_bzdh,
+      sczl_jtbbh: item.sczl_jtbh,
+      sczl_bh1: item.sczl_bh1,
+      name: item.name.trim() // 去除姓名两端的空格
+    }
+  })
+
+  selectData = decodedData // 对selectData进行赋值
+
   setCurrent(selectData[0])
   dialogSelectVisible2.value = true
 }
 
+// 解译HTML实体编码的函数
+function decodeEntities(encodedString) {
+  const textArea = document.createElement('textarea')
+  textArea.innerHTML = encodedString
+  return textArea.value
+}
 // 双击表格操作
 function doubleClick(row, column, event) {
   type.value = '查改'
@@ -1036,7 +1060,7 @@ const closeDialog = () => {
 // 导出excel
 function exportExcel() {
   console.log('导出到excel')
-  dialogSbyxgl.value = true
+  // dialogSbyxgl.value = true
 }
 
 const dialogMrhjtj = ref(false)
@@ -1141,7 +1165,11 @@ const moveFocus = (event) => {
 .JKWTree-content {
   flex: 1;
 }
-
+.bt{
+  margin-left: 2px !important;
+  padding: 3px !important;
+  font-size: 12px;
+}
 /* 选中某行时的背景色 */
 :deep(.el-table__body tr.current-row) > td {
   background: #ff80ff !important;

src/view/performance/Packagingoutput.vue

@@ -774,9 +774,9 @@ const ADD=ref('0')
 function onAdd() {
 	ADD.value='新增'
 	type.value = 'create'
-	if(typeof(lastCellValue)=='number'){
-		getpickInfo(lastCellValue)
-	}
+	// if(typeof(lastCellValue)=='number'){
+	// 	getpickInfo(lastCellValue)
+	// }
 	initFormData()
 	dialogFormVisible.value = true
 	// Productionadd()

src/view/performance/chejianbaogong.vue

@@ -3475,11 +3475,11 @@ const FieldInspectionRecord = async () => {
 //获取机台编号
 const GetMachineMac = async (addr) => {
   console.log(addr);
-  const response = await getMachineMac({ addr: addr });
+  // const response = await getMachineMac({ addr: addr });
   // const response = await getMachineMac({ addr: '68-ED-A4-26-5D-5E' });
   // const response = await getMachineMac({ addr: '68-ED-A4-26-5D-90' });
   // const response = await getMachineMac({ addr: '68-ED-A4-26-5E-50' });
-  // const response = await getMachineMac({ addr: '68-ED-A4-26-60-CC' });
+  const response = await getMachineMac({ addr: '68-ED-A4-26-60-CC' });
   // const response = await getMachineMac({ addr: '68-ED-A4-26-5F-8E' });
   // const response = await getMachineMac({ addr: '68-ED-A4-26-60-C8' });
   // const response = await getMachineMac({ addr: '40-62-31-21-4E-15' });

src/view/yunyin/renliziyuan/renyuanjibenziliao.vue

@@ -206,9 +206,7 @@
 			
 			
 			<el-row :gutter="24">
-			  <el-col :span="6">
-			    
-			  </el-col>
+			  
 					
 				<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;">
@@ -219,9 +217,7 @@
 			
 			
 			<el-row :gutter="24">
-			  <el-col :span="6">
-			    
-			  </el-col>
+			  
 					
 				<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;">
@@ -232,9 +228,7 @@
 			
 			
 			<el-row :gutter="24">
-			  <el-col :span="6">
-			    
-			  </el-col>
+			  
 					
 				<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;">
@@ -429,13 +423,16 @@ const _getStaffList = async ()=>{
 //点击【考勤建立】按钮
 const onAttendance = () => {
 	Attendancevalue.value['day']=22
-	let year = new Date().getFullYear();
-	let month = new Date().getMonth() +1;
-	let time = year + month
+	const currentDate = new Date();
+	// 获取当前年份和月份
+	const year = currentDate.getFullYear();
+	const month = currentDate.getMonth() + 1;
+	// 如果月份小于 10，补零
+	const formattedMonth = month < 10 ? '0' + month : month;
 	console.log(year)
 	console.log(month)
-	console.log(time)
-	Attendancevalue.value['month']=time
+	
+	Attendancevalue.value['month']=year.toString() + formattedMonth.toString();
 	Attendancevalue.value['day']=22
   AttendanceVisible.value=true
 };

src/view/yunyin/shengchanguanli/chengpinrucang.vue

@@ -39,7 +39,7 @@
               <el-table-column align="left" sortable  label="工单编号" prop="jjcp_gdbh" width="160"/>
               <el-table-column align="left" sortable  label="印件号" prop="jjcp_yjno" width="160"/>
               <el-table-column align="left" sortable  label="入仓数量" prop="jjcp_sl" width="120"/>
-			  <el-table-column align="left" sortable  label="累计入仓数量" prop="jjcp_sls" width="120"/>
+			  <el-table-column align="left" sortable  label="累计入仓数量" prop="jjcp_sls" width="140"/>
 			  <el-table-column align="left" sortable label="订单数量" prop="订单数量" width="120"/>
 			  <el-table-column align="left" sortable label="完成率" prop="完成率" width="120"/>
 			  <el-table-column align="left" sortable label="单位" prop="jjcp_dw" width="120"/>
@@ -53,7 +53,7 @@
 			  <el-table-column align="left" sortable label="备注" prop="jjcp_desc" width="160"/>
 			  <el-table-column align="left" sortable label="客户编号" prop="客户编号" width="160"/>
 			  <el-table-column align="left" sortable label="客户名称" prop="Gd_客户名称" width="120"/>
-			  <el-table-column align="left" sortable label="最近入仓日期" prop="最近入仓日期" width="120"/>
+			  <el-table-column align="left" sortable label="最近入仓日期" prop="最近入仓日期" width="140"/>
 			  <el-table-column align="left" sortable label="机型备注" prop="机型备注" width="120"/>
 			  <el-table-column align="left" sortable label="创建用户" prop="Sys_id" width="120"/>
 			  <el-table-column align="left" sortable label="创建时间" prop="sys_rq" width="160"/>