Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web

src/config/index.js

@@ -6,7 +6,7 @@ const DEFAULT_CONFIG = {
 	DASHBOARD_URL: "/dashboard",
 
 	//版本号
-	APP_VER: "2.7.2025082515",
+	APP_VER: "2.7.2025092816",
 
 	//内核版本号
 	CORE_VER: "1.6.9",

src/utils/enum.js

@@ -239,5 +239,5 @@ export const interveneTypeEnum = new EnumFactory({
 })
 
 export const mCateEnum = new EnumFactory({
-  'list': ['主要辅材','办公辅料','设备维护辅料','包装辅材','标识辅材','防护辅材','其他辅材','常规辅材','医护辅材','检测辅材','倒角辅材','减薄辅材','磨抛辅材','多线切辅材','精雕辅材','扫边辅材','黑化辅材']
+  'list': ['主要辅材','办公辅材','设备维护辅材','包装辅材','标识辅材','防护辅材','其他辅材','常规辅材','医护辅材','检测辅材','倒角辅材','减薄辅材','磨抛辅材','多线切辅材','精雕辅材','扫边辅材','黑化辅材']
 })

src/views/inm/good_mio.vue

@@ -113,7 +113,8 @@
 							v-auth="'mio.submit'"
 							v-if="scope.row.state == 10"
 						>
-							提交
+							<span v-if="scope.row.type =='do_in'">接收</span>
+							<span v-else>提交</span>
 						</el-button>
 						<el-button
 							link

src/views/wpm_bx/mlogbw_check_table.vue

@@ -98,7 +98,7 @@
 						</el-select>
 					</template>
 				</el-table-column>
-				<el-table-column prop="note" :label="item.defect_name" v-for="item in qct_defects" :key="item.id" width="120px">
+				<el-table-column prop="note" :label="item.defect_name" v-for="item in qct_defects" :key="item.id" :width="widthFun(item)">
 					<template #default="scope">
 						<el-switch 
 							:disabled="!scope.row.isEdit||!item.canEdit"
@@ -609,6 +609,13 @@ export default {
 				}
 			})
 		},
+		widthFun(item){
+			if(item.defect_name.indexOf('黑网')!=-1|| item.defect_name.indexOf('白网')!=-1||item.defect_name.indexOf('小网')!=-1){
+				return '54px';
+			}else{
+				return '';
+			}
+		},
         //添加
 		formTableSave(row) {
 			let that = this;

src/views/wpm_gx/inm_record.vue

@@ -179,7 +179,8 @@
 			</el-main>
 			<el-footer v-if="active === 1" style="text-align: center">
 				<el-button @click="handleLastStep" style="margin-right: 4px">上一步</el-button>
-				<el-button @click="table_submit" type="warning">提交</el-button>
+				<el-button  v-if="cate=='do_in'" @click="table_submit_in" type="warning">确定</el-button>
+				<el-button  v-else @click="table_submit" type="warning">提交</el-button>
 			</el-footer>
 		</el-container>
 		<el-card v-else shadow="never" style="height: 100%;">
@@ -522,6 +523,12 @@ export default {
 				// that.$emit("closed");
 			});
 		},
+		table_submit_in(){
+			let that = this;
+			that.$emit('closed')
+			that.$message.success("保存成功");
+			that.visible = false;
+		},
 		submitOut() {},
 		//打印
 		handlePrint(){

src/views/wpm_gx/inmrecord.vue

@@ -121,7 +121,7 @@
 							type="primary"
 							@click="table_submit(scope.row)"
 							v-auth="'mio.submit'"
-							v-if="scope.row.state == 10"
+							v-if="scope.row.state == 10&&scope.row.type!=='do_in'"
 						>
 							提交
 						</el-button>