印版库 班组优化

src/view/managements/hardversionlibrary.vue

@@ -200,12 +200,14 @@
                 <el-row :gutter="20">
                   <el-col :span="10">
                     <el-form-item label="初始印数">
-                    <el-input v-model="Plate.初始印数" id = '初始印数' @keydown="entskip($event, '报废日期', '初始印数', '考核印数')" type="number" placeholder="请输入初始印数" />
+                    <el-input v-model="Plate.初始印数" id = '初始印数' @keydown="entskip($event, '报废日期', '初始印数', '考核印数')" @input="validateNumberInput('初始印数')"
+                    type="text"  placeholder="请输入初始印数" />
                     </el-form-item>
                 </el-col>
                 <el-col :span="10">
                     <el-form-item label="考核印数">
-                    <el-input v-model="Plate.考核印数" id = '考核印数' @keydown="entskip($event, '初始印数', '考核印数', '供方批号')" type="number" placeholder="请输入考核印数" />
+                    <el-input v-model="Plate.考核印数" id = '考核印数' @keydown="entskip($event, '初始印数', '考核印数', '供方批号')" @input="validateNumberInput('考核印数')"
+                    type="text"  placeholder="请输入考核印数" />
                     </el-form-item>
                 </el-col>
                 </el-row>
@@ -694,8 +696,8 @@ const dhlenterDialog = async () => {
     desc: Plate.印版备注,
     Manufactur_date: Plate.制造日期 ? dayjs(Plate.制造日期).format('YYYY-MM-DD') : '',
     Scrappe_date: Plate.报废日期 ? dayjs(Plate.报废日期).format('YYYY-MM-DD') : '',
-    start_num: Plate.初始印数,
-    Assessment_num: Plate.考核印数,
+    start_num: Plate.初始印数||'0',
+    Assessment_num: Plate.考核印数||'0',
     batch: Plate.供方批号,
     sys_id: sys_id,
   }
@@ -895,6 +897,15 @@ const onsync = async() => {
   }
 }
 
+
+const validateNumberInput = (field) => {
+  Plate[field] = Plate[field].replace(/[^\d.]/g, '')
+    .replace(/^\./g, '')
+    .replace(/\.{2,}/g, '.')
+    .replace(/(\..*)\./g, '$1');
+};
+
+
   //键盘input框跳转
   const entskip = async (event,id1,id2,id3,idx) => {
 	if(event.keyCode === 40){

src/view/performance/chejianbaogong.vue

@@ -5619,8 +5619,7 @@ onMounted(() => {
     let hasValidMember = false; // 标志变量，用于检查是否有有效的组员
     let hasEmptyBefore = false; // 标记是否已经出现过空项
     
-    // 定义字段顺序 [1,2,3,4,5,6,7,10,9,8]
-    const fieldOrder = [1,2,3,4,5,6,7,8,9,10];
+    const fieldOrder = [1,2,3,4,5,6,7,];
     
     for (let i = 0; i < fieldOrder.length; i++) {
         const index = fieldOrder[i];

src/view/yunyin/shengchanguanli/PrintingPlateRequisition.vue

@@ -476,7 +476,17 @@ const rawenterDialog = async () => {
   }
 }
 
-const rawcloseDialog = () => {
+const rawcloseDialog = async () => {
+
+  const res = await getPPList({code:nodecode.value,page:page.value,limit:pageSize.value})
+      if (res.code === 0){
+        total.value = res.data.total
+        wltableData.value = res.data.data
+      }else{
+        total.value = 0
+        wltableData.value = []
+        wlmxtableData.value = []
+      }
   Plate.印数 = ''
   dialogwithdrawVisible.value = false
 }

src/view/yunyin/shengchanguanli/shebeiyunxing.vue

@@ -2451,6 +2451,22 @@
 		  </template>
             </el-dialog>
 		  
+<!-- 班组选择弹窗 -->
+<el-dialog v-model="dialogSelectVisible_Bz" title="班组选择" @keydown="select_bzmc($event)"
+    destroy-on-close width="400px" style="margin-top: 10%;">
+  <el-table 
+    tooltip-effect="dark" 
+    :data="selectData_Bz" 
+    ref="table_BZMC"
+    row-key="code" 
+    highlight-current-row 
+    border 
+    style="width:100%"
+    @row-dblclick="handleSelectClick_Bz">
+    <el-table-column prop="name" label="班组名称" width="380" />
+  </el-table>
+</el-dialog>
+
 		<Shebeizhuangtai
 		  v-if="dialogSbyxgl"
 		  v-model="dialogSbyxgl"
@@ -3923,6 +3939,10 @@ const JPentedit = async (event,key,val) => {
 				getDedhsubmitedit();
 			}
 		}
+		if (event.target.id === 'bzdh') {
+			console.log('检品修改选择班组')
+			openBanzuDialog()
+		}
 	}
 	
 	
@@ -4470,6 +4490,10 @@ const JPent = async (event,key,val) => {
 				getDedhsubmit();
 			}
 		}
+		if (event.target.id === 'bzdh') {
+			console.log('检品新增选择班组')
+			openBanzuDialog()
+		}
 	}
 	
    const inputs = document.getElementsByTagName('input');
@@ -6220,7 +6244,7 @@ const addBz = async() => {
     let hasEmptyBefore = false; // 标记是否已经出现过空项
     
     // 按1-10的顺序验证
-    for (let i = 1; i <= 10; i++) {
+    for (let i = 1; i <= 7; i++) {
         const codeKey = `code${i}`;
         const percentageKey = `percentage${i}`;
         
@@ -8018,6 +8042,65 @@ if(selected.value==='难度调整系数'){
  	 hesuanVisible.value = false
  }
  
+// 班组选择相关变量
+const dialogSelectVisible_Bz = ref(false)
+const selectData_Bz = reactive([
+  { code: 'A 班', name: 'A 班' },
+  { code: 'B 班', name: 'B 班' }
+])
+const currentBzIndex = ref(0)
+const table_BZMC = ref()
+
+// 打开班组选择弹窗
+const openBanzuDialog = () => {
+  dialogSelectVisible_Bz.value = true
+  nextTick(() => {
+    currentBzIndex.value = 0
+    setCurrent_BZMC(selectData_Bz[0])
+  })
+}
+
+// 处理班组选择
+const handleSelectClick_Bz = (row) => {
+  formdata3.value.bzdh = row.code
+  JPformdata['bzdh'] = row.code
+  JPformdataedit['bzdh'] = row.code  
+//   formdata3.value.bzmc = row.name
+  dialogSelectVisible_Bz.value = false
+}
+
+// 班组键盘选择
+const select_bzmc = (event) => {
+  if (event.keyCode === 40) { // 向下箭头
+    if (currentBzIndex.value < selectData_Bz.length - 1) {
+      currentBzIndex.value++
+      setCurrent_BZMC(selectData_Bz[currentBzIndex.value])
+    } else {
+      currentBzIndex.value = 0
+      setCurrent_BZMC(selectData_Bz[currentBzIndex.value])
+    }
+  } else if (event.keyCode === 38) { // 向上箭头
+    if (currentBzIndex.value > 0) {
+      currentBzIndex.value--
+      setCurrent_BZMC(selectData_Bz[currentBzIndex.value])
+    } else {
+      currentBzIndex.value = selectData_Bz.length - 1
+      setCurrent_BZMC(selectData_Bz[currentBzIndex.value])
+    }
+  } else if (event.keyCode === 13) { // 回车键
+    if (selectData_Bz[currentBzIndex.value]) {
+      handleSelectClick_Bz(selectData_Bz[currentBzIndex.value])
+    }
+    dialogSelectVisible_Bz.value = false
+  }
+}
+
+// 设置当前选中班组
+const setCurrent_BZMC = (row) => {
+  setTimeout(() => {
+    table_BZMC.value?.setCurrentRow(row)
+  })
+}
  
  const ent1 = async (event) => {
    const inputs = document.getElementsByTagName('input');
@@ -8040,6 +8123,9 @@ if(selected.value==='难度调整系数'){
 			}else{
 				FJPgetDedhsubmit();
 			}
+		}else if (event.target.id === 'bzdh') {
+			console.log('选择班组')
+			openBanzuDialog()
 		}
        let nextIndex = currentIndex + 1;
        while (nextIndex < inputs.length) {