.gitignore

@@ -7,8 +7,6 @@ node_modules
 /public/glb/
 /dist
 .VSCodeCounter/
-.claude/
-.codex/
 
 # local env files
 .env.local
@@ -16,7 +14,6 @@ node_modules
 .env.production
 .env.development
 
-
 # Log files
 npm-debug.log*
 yarn-debug.log*
@@ -31,7 +28,5 @@ pnpm-debug.log*
 *.njsproj
 *.sln
 *.sw?
-*.bat
 
 /package-lock.json
-/vue.config.js

src/views/statistics/bxerp/fenjian.vue

@@ -126,13 +126,7 @@
 						<span v-if="scope.row.data.喷码_磨床开台_操作人">{{scope.row.data.喷码_磨床开台_操作人}}</span>
 					</template>
 				</el-table-column>
-				<el-table-column label="开台设备" align="center" class-name="colorheader2">
+				<el-table-column label="备注" align="center" class-name="colorheader2">
-					<template #default="scope">
-						<span v-if="scope.row.data.喷码_一体刀_使用设备">{{scope.row.data.喷码_一体刀_使用设备}}</span>
-						<span v-if="scope.row.data.喷码_磨床开台_使用设备">{{scope.row.data.喷码_磨床开台_使用设备}}</span>
-					</template>
-				</el-table-column>
-				<el-table-column label="备注" align="center" class-name="colorheader3">
 					<template #default="scope">
 						<span>{{ scope.row.data.分检_缺陷项_备注 }}</span>
 					</template>

src/views/wpm_bx/handover_form.vue

@@ -540,7 +540,7 @@ export default {
 			let that = this;
 			var req = {
 				page: 0,
-				state__in:'10,34',
+				state:10,
 				tag:that.tag,
 				mgroupx:that.mgroupId
 			};

src/views/wpm_bx/mlog_detail.vue

@@ -677,18 +677,11 @@ export default {
 				}
 				that.materialIn = res.material_in!==null?res.material_in:res.mlogb_full[0]?res.mlogb_full[0].material_in:null;
 				that.deptId = res.belong_dept;
+				that.checkTableShow = true;
 				that.apiObjWm = that.$API.wpm.wmaterial.list;
-				if(res.qct!==null){
+				that.$API.wpm.mlogb.list.req(that.paramsOut).then((res) => {
-					that.checkTableShow = true;
+					that.tableData2 = res;
-				}else{
-					that.$API.wpm.mlogb.list.req(that.paramsOut).then((res_out) => {
-						that.tableData2 = res_out;
-						if(res.is_fix&&res_out[0].qct!==null){
-							that.mlogItem.qct = res_out[0].qct;
-						}
-						that.checkTableShow = true;
 				})
-				}
 				if(!res.is_fix){
 					that.getcutCount(res.material_in);
 					that.$API.mtm.routepack.list.req({page:0,search:res.routepack_name}).then((res) => {

src/views/wpm_bx/mlogbw_check_table.vue

@@ -536,8 +536,6 @@ export default {
 				}).catch(()=>{
 					that.getList();
 				})
-			}else{
-				that.getList();
 			}
 		}
 		that.visible = true;