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

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

@@ -996,7 +996,7 @@ const SelectClickBz = (row, column, event) => {
 	
 	// 处理选择框回车操作
 	const handleEnter = (index, row) => {
-		detailData.table[index].sczl_dedh = '030002001'
+		detailData.table[index].sczl_dedh = '030002002'
 		if (row.sczl_gdbh === '') {
 			detailData.table[index].sczl_yjGx = ''
 			detailData.table[index].sczl_gxmc = ''
@@ -1075,7 +1075,7 @@ const SelectClickBz = (row, column, event) => {
 	const _index = ref(null)
 	// 定额代号回车事件
 	const getDedhsubmit = async (index, row) => {
-		if(detailData.table[index].sczl_dedh == '030002001'){
+		if(detailData.table[index].sczl_dedh == '030002002'){
 			return
 		}
 		_index.value = index

src/view/performance/chejianbaogong.vue

@@ -3955,7 +3955,6 @@ const SubmitDailyProduction = async () => {
     bom: formData3.value.formattedArray,
 	ma_start: formData3.value.码开始行,
 	ma_end: formData3.value.码结束行,
-	
   }
   console.log(restoredData)
   //4.2日产量上报 添加
@@ -4883,6 +4882,8 @@ const formData3= ref({
 	打样总工时:'',
 	通电工时:'',
 	定额代号:'',
+	码开始行:'',
+	码结束行:'',
 	码包:'',
 	主电表:'',
 	辅电表:'',
@@ -5046,8 +5047,28 @@ const addBz = async() => {
   updateTotal()
   const jt = selectedOption.value.split('|')[0]//获取车间数据
 	//判断车间分配比例【SY、PM、WY】	
-	const shouldCheckLessThanOne = !jt.includes('SY') && !jt.includes('PM') && !jt.includes('WY');
-	console.log(fpsum.value)
+	const shouldCheckLessThanOne = !jt.includes('SY') && !jt.includes('PM');
+	const relevantKeys = ['percentage1', 'percentage2', 'percentage3', 'percentage4', 'percentage5', 'percentage6', 'percentage7', 'percentage8'];
+  	const values = relevantKeys.reduce((acc, key) => {
+    const value = parseFloat(formDatas.value[key], 10);
+    if (!isNaN(value)) {
+      acc.push(value); // 只有当 value 不是 NaN 时才添加到数组中
+    }
+    return acc;
+  }, []); // 初始化为空数组
+ 
+  console.log("数值", values);
+ 
+  const hasInvalidValue = values.some(value => value <= 0 || value > 1);
+  console.log(hasInvalidValue);
+ 
+  if (hasInvalidValue) {
+    ElMessage({
+      type: "error",
+      message: "某人分配系数有误",
+    });
+    return;
+  }
 	if (fpsum.value > 1) {
 		ElMessage({
 		type: "error",
@@ -5186,8 +5207,28 @@ const selectBz = async() => {
 	updateTotal()
 	const jt = selectedOption.value.split('|')[0]//获取车间数据
 	//判断车间分配比例【SY、PM、WY】	
-	const shouldCheckLessThanOne = !jt.includes('SY') && !jt.includes('PM') && !jt.includes('WY');
-
+	const shouldCheckLessThanOne = !jt.includes('SY') && !jt.includes('PM');
+	const relevantKeys = ['percentage1', 'percentage2', 'percentage3', 'percentage4', 'percentage5', 'percentage6', 'percentage7', 'percentage8'];
+  	const values = relevantKeys.reduce((acc, key) => {
+    const value = parseFloat(formDatas.value[key], 10);
+    if (!isNaN(value)) {
+      acc.push(value); // 只有当 value 不是 NaN 时才添加到数组中
+    }
+    return acc;
+  }, []); // 初始化为空数组
+ 
+  console.log("数值", values);
+ 
+  const hasInvalidValue = values.some(value => value <= 0 || value > 1);
+  console.log(hasInvalidValue);
+ 
+  if (hasInvalidValue) {
+    ElMessage({
+      type: "error",
+      message: "某人分配系数有误",
+    });
+    return;
+  }
 	if (fpsum.value > 1) {
 		ElMessage({
 		type: "error",
@@ -5299,9 +5340,18 @@ const delBz = async() => {
 		}).then(() => {
       console.log(UniqId)
       const response = teamDel({UniqId:UniqId})
-          response.then(result => {
-            if(result.code===0){
-              ElMessage({type: 'success',message: '成功'})
+	  response.then(result => {
+		console.log(result)
+	    if(result.code===0){
+		let messageType = 'success';
+		// 检查 result.msg 是否包含特定的错误提示
+		if (result.msg.includes('无法删除正在生产的班组资料，请先切换班组')) {
+			messageType = 'error';
+		}
+	      ElMessage({
+	        type: messageType,
+	        message: result.msg
+	      })
                 console.log(response)
                 FacilityProduction()
             }

src/view/yunyin/shengchanguanli/shebeiyunxing.vue

@@ -283,7 +283,7 @@
                     <el-col :span="3"><el-input v-model="formDatas.name8"/></el-col>
           			  </el-row>
           			  <el-row :gutter="10" style="margin-top: 1px;">
-                    <el-col :span="3"><el-input @input="updateTotal" v-model="formDatas.percentage1"/></el-col>
+                    <el-col :span="3"><el-input @input="updateTotal" :readonly="!formDatas.name1" v-model="formDatas.percentage1"/></el-col>
                     <el-col :span="3"><el-input @input="updateTotal" v-model="formDatas.percentage2"/></el-col>
                     <el-col :span="3"><el-input @input="updateTotal" v-model="formDatas.percentage3"/></el-col>
                     <el-col :span="3"><el-input @input="updateTotal" v-model="formDatas.percentage4"/></el-col>
@@ -4763,7 +4763,7 @@ const addBz = async() => {
 	const shouldCheckLessThanOne = !jt.includes('SY') && !jt.includes('PM');
 	console.log(fpsum.value)
 	const relevantKeys = ['percentage1', 'percentage2', 'percentage3', 'percentage4', 'percentage5', 'percentage6', 'percentage7', 'percentage8'];
-  const values = relevantKeys.reduce((acc, key) => {
+  	const values = relevantKeys.reduce((acc, key) => {
     const value = parseFloat(formDatas.value[key], 10);
     if (!isNaN(value)) {
       acc.push(value); // 只有当 value 不是 NaN 时才添加到数组中
@@ -4841,8 +4841,28 @@ const selectBz = async() => {
 	updateTotal()
 	const jt = selectedOption.value.split('|')[0]//获取车间数据
 	//判断车间分配比例【SY、PM、WY】	
-	const shouldCheckLessThanOne = !jt.includes('SY') && !jt.includes('PM') && !jt.includes('WY');
-
+	const shouldCheckLessThanOne = !jt.includes('SY') && !jt.includes('PM');
+	const relevantKeys = ['percentage1', 'percentage2', 'percentage3', 'percentage4', 'percentage5', 'percentage6', 'percentage7', 'percentage8'];
+  	const values = relevantKeys.reduce((acc, key) => {
+    const value = parseFloat(formDatas.value[key], 10);
+    if (!isNaN(value)) {
+      acc.push(value); // 只有当 value 不是 NaN 时才添加到数组中
+    }
+    return acc;
+  }, []); // 初始化为空数组
+ 
+  console.log("数值", values);
+ 
+  const hasInvalidValue = values.some(value => value <= 0 || value > 1);
+  console.log(hasInvalidValue);
+ 
+  if (hasInvalidValue) {
+    ElMessage({
+      type: "error",
+      message: "某人分配系数有误",
+    });
+    return;
+  }
 	if (fpsum.value > 1) {
 		ElMessage({
 		type: "error",
@@ -5603,7 +5623,28 @@ const tablebllickHandlerlist = async (row, column, event) => {
 	updateTotal()
   const jt = formdata3.value.sczl_jtbh
  // 定义一个变量来决定是否应该检查 fpsum2.value < 1
-const shouldCheckLessThanOne = !jt.includes('SY') && !jt.includes('PM') && !jt.includes('WY');
+const shouldCheckLessThanOne = !jt.includes('SY') && !jt.includes('PM');
+const relevantKeys2 = ['组员1', '组员2','组员3','组员4','组员5','组员6','组员7','组员8','组员9',];
+  	const values = relevantKeys2.reduce((acc, key) => {
+    const value = parseFloat(formDatas.value[key], 10);
+    if (!isNaN(value)) {
+      acc.push(value); // 只有当 value 不是 NaN 时才添加到数组中
+    }
+    return acc;
+  }, []); // 初始化为空数组
+ 
+  console.log("数值", values);
+ 
+  const hasInvalidValue = values.some(value => value <= 0 || value > 1);
+  console.log(hasInvalidValue);
+ 
+  if (hasInvalidValue) {
+    ElMessage({
+      type: "error",
+      message: "某人分配系数有误",
+    });
+    return;
+  }
  
  if (fpsum2.value > 1) {
 	 ElMessage({