From 4337fb7d1f169b4ce0eedf5a12f5d1ed738ca381 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Tue, 24 Sep 2024 16:40:22 +0800
Subject: [PATCH 01/10] =?UTF-8?q?fix:=E5=85=89=E8=8A=AF=E8=BD=A6=E9=97=B4?=
 =?UTF-8?q?=E5=87=BA=E5=85=A5=E5=BA=93=E6=94=B9=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm_gx/inm.vue             |   3 +
 src/views/wpm_gx/inm_record.vue      | 128 ++++++++++-
 src/views/wpm_gx/inm_record_form.vue |  84 +++----
 src/views/wpm_gx/inmrecord.vue       | 322 +++++++++++++++++++++++++++
 4 files changed, 488 insertions(+), 49 deletions(-)
 create mode 100644 src/views/wpm_gx/inmrecord.vue

diff --git a/src/views/wpm_gx/inm.vue b/src/views/wpm_gx/inm.vue
index 4c8ad176..6edb9014 100644
--- a/src/views/wpm_gx/inm.vue
+++ b/src/views/wpm_gx/inm.vue
@@ -157,6 +157,7 @@
 			v-if="dialog.inmRecord"
 			ref="inmRecordDialog"
 			:cate = "cate_type"
+			:process = "process"
 			:mgroupId = "params.mgroupx"
 			:deptId = " params.belong_dept"
 			@success="handleinmSuccess"
@@ -208,6 +209,7 @@ export default {
 				material: "",
 			},
 			cate_type:'',
+			process:'',
 			materialType: "wm",
 			visibleDrawer: false,
 		};
@@ -240,6 +242,7 @@ export default {
 				}
 				that.mgroupId = res[0].id;
 				that.$TOOL.data.set('gx_deptID',res[0].belong_dept)
+				that.process = res[0].process;
 				that.params.mgroupx = res[0].id;
 				that.params.belong_dept = res[0].belong_dept;
 				that.apiObj = that.$API.wpm.wmaterial.list;
diff --git a/src/views/wpm_gx/inm_record.vue b/src/views/wpm_gx/inm_record.vue
index 79389c70..66d90688 100644
--- a/src/views/wpm_gx/inm_record.vue
+++ b/src/views/wpm_gx/inm_record.vue
@@ -2,11 +2,11 @@
 	<el-drawer
 		:title="titleMap[mode]"
 		v-model="visible"
-		:size="'90%'"
+		:size="'80%'"
 		destroy-on-close
 		@closed="$emit('closed')"
 	>
-		<el-container>
+		<el-container v-if="mode != 'show'">
 			<el-header>
 				<el-steps
 					:active="active"
@@ -177,12 +177,101 @@
 				<el-button @click="table_submit" type="warning">提交</el-button>
 			</el-footer>
 		</el-container>
+		<el-card v-else shadow="never" style="height: 100%;">
+			<el-descriptions  title="基本信息" :column="3"  style="width: 100%">
+				<el-descriptions-item label="编号">
+					{{form.number}}
+				</el-descriptions-item>
+				<el-descriptions-item label="出入库类型">
+					{{typeDict[form.type]}}
+				</el-descriptions-item>
+				<el-descriptions-item label="状态">
+					{{stateDict[form.state]}}
+				</el-descriptions-item>
+				<el-descriptions-item label="部门/车间">
+					{{form.belong_dept_name}}-{{ form.mgroup_name }}
+				</el-descriptions-item>
+				<el-descriptions-item label="执行人">
+					{{form.do_user_name}}
+				</el-descriptions-item>
+				<el-descriptions-item label="创建时间">
+					{{form.create_time}}
+				</el-descriptions-item>
+			</el-descriptions>
+			<div style="height: 8px"></div>
+			<scTable
+					ref="table"
+					:data="tableData"
+					row-key="id"
+					stripe
+					hidePagination
+					hideDo
+				>
+					<el-table-column type="index" width="50" />
+					<el-table-column
+						label="物料"
+						prop="material"
+						show-overflow-tooltip
+					>
+						<template #default="scope"
+							>{{ scope.row.material_name }}
+						</template>
+					</el-table-column>
+					<el-table-column label="批次号" prop="batch">
+					</el-table-column>
+					<el-table-column label="仓库" prop="warehouse_name">
+					</el-table-column>
+					<el-table-column label="数量" prop="count">
+					</el-table-column>
+					<el-table-column
+						label="组合件信息"
+						v-if="cate == 'good'"
+						width="300"
+					>
+						<template #default="scope">
+							<div v-if="scope.row.assemb.length > 0">
+								<div
+									v-for="item in scope.row.assemb"
+									:key="item.id"
+								>
+									<div>
+										{{ item.material_name }}
+										<span
+											style="
+												color: gray;
+												font-size: 12px;
+											"
+											>批:</span
+										>{{ item.batch }}
+										<span
+											style="
+												color: gray;
+												font-size: 12px;
+											"
+											>比:</span
+										>{{ item.rate }}
+									</div>
+								</div>
+							</div>
+						</template>
+					</el-table-column>
+					<el-table-column label="不合格数量" prop="count_notok">
+					</el-table-column>
+					<el-table-column
+						label="创建时间"
+						prop="create_time"
+						show-overflow-tooltip
+					>
+					</el-table-column>
+				</scTable>
+		</el-card>
 		<save-dialog
 			v-if="dialog.save"
 			ref="saveDialog"
 			:cate = "cate"
 			:mgroupId = 'mgroupId'
 			:mioId = 'mioId'
+			:process="process"
 			@success="handleSaveSuccess"
 			@closed="dialog.save = false"
 		></save-dialog>
@@ -191,19 +280,20 @@
 <script>
 import saveDialog from "./inm_record_form.vue";
 export default {
-	name: "routepack_form",
+	name: "inm_record",
 	components: { saveDialog },
 	props: {
 		cate: { type: String, default: "" },
 		deptId: { type: String, default: "" },
 		mgroupId: { type: String, default: "" },
+		process: { type: String, default: "" },
 	},
 	data() {
 		return {
 			active: 0,
 			stepSuc: [0],
 			stepes: ["基本信息", "详情"],
-			titleMap: { add: "新增出入库", edit: "编辑出入库" },
+			titleMap: { add: "新增出入库", edit: "编辑出入库",show:"出入库详情" },
 			mode: "add",
 			isSaveing: false, //控制基本信息提交
 			search: {
@@ -222,6 +312,8 @@ export default {
 				do_user: "",
 				mio_user: "",
 			},
+			stateDict: {10: "创建中",20: "已提交",},
+			typeDict:{'do_in':'生产入库','do_out':'生产领料'},
 			apiworkerObj: null,
 			materials: [],
 			apiObj: null,
@@ -233,6 +325,7 @@ export default {
 			},
 			mioId:null,
 			routepack: "",
+			tableData:[],
 			userOption: [],//仓库执行人
 			userOptions: [],//部门执行人
 			deptOptions: [],
@@ -244,10 +337,13 @@ export default {
 		this.form.mgroup = this.mgroupId;
 		this.form.type = this.cate;
 		this.form.belong_dept = this.deptId;
-		this.getDeptOptions();
-		this.getmgroupOptions();
-		this.getDeptUsers();//获取该部门下的员工
-		this.getDeptUser();//获取仓库人员
+		this.$nextTick(() => {
+		    this.getDeptOptions();
+			this.getmgroupOptions();
+			this.getDeptUsers();//获取该部门下的员工
+			this.getDeptUser();//获取仓库人员
+		})
+		
 	},
 	methods: {
 		open(mode) {
@@ -255,9 +351,23 @@ export default {
 			this.visible = true;
 			return this;
 		},
-		setData(data) {
+		setData(data,type) {
+			console.log('data',data)
+			this.mioId = data.id;
+			if(type){
+				this.getTableData();
+			}
 			Object.assign(this.form, data);
 		},
+		getTableData() {
+			let that = this;
+			let obj = {};
+			obj.mio = that.mioId;
+			obj.page = 0;
+			that.$API.inm.mioitem.list.req(obj).then((res) => {
+				that.tableData = res;
+			});
+		},
 		//工段列表
 		getmgroupOptions() {
 			this.$API.mtm.mgroup.list.req({page: 0}).then(res=>{
diff --git a/src/views/wpm_gx/inm_record_form.vue b/src/views/wpm_gx/inm_record_form.vue
index c264140e..d8f3fc01 100644
--- a/src/views/wpm_gx/inm_record_form.vue
+++ b/src/views/wpm_gx/inm_record_form.vue
@@ -12,7 +12,7 @@
 			:rules="rules"
 			label-width="120px"
 		>
-			<el-form-item label="物料">
+			<el-form-item label="物料" v-if="cate == 'do_out'">
 				<el-select
 					v-model="form.material"
 					value-key="id"
@@ -40,6 +40,30 @@
 					</el-option>
 				</el-select>
 			</el-form-item>
+			<el-form-item label="物料批次" v-else>
+				<el-select
+					v-model="form.batch"
+					filterable
+					style="width: 100%"
+					@change="selectwmChange"
+				>
+					<el-option
+						v-for="item in wbatchOptions"
+						:key="item.id"
+						:value="item.batch"
+					>
+						<span style="display:inline-block;float: left;">{{item.material_.name}}|{{ item.batch }}</span>
+						<span
+							style="
+								float: right;
+								color: var(--el-text-color-secondary);
+								font-size: 13px;
+							"
+							>{{ item.count }}</span
+						>
+					</el-option>
+				</el-select>
+			</el-form-item>
 			<el-form-item label="批次" v-if="cate == 'do_out'">
 				<el-select
 					v-model="selectBatch"
@@ -67,32 +91,6 @@
 					</el-option>
 				</el-select>
 			</el-form-item>
-			<el-form-item label="批次号" v-else>
-				<el-select
-					v-model="form.batch"
-					filterable
-					allow-create
-					clearable
-					style="width: 100%"
-				>
-					<el-option
-						v-for="item in wbatchOptions"
-						:key="item.id"
-						:value="item.batch"
-					>
-						<span style="float: left">{{ item.batch }}</span>
-						<span
-							style="
-								float: right;
-								color: var(--el-text-color-secondary);
-								font-size: 13px;
-							"
-							>{{ item.count }}</span
-						>
-					</el-option>
-				</el-select>
-			</el-form-item>
-			
 			<el-form-item label="仓库">
 				<el-select
 					v-model="form.warehouse"
@@ -111,7 +109,7 @@
 				<el-input-number
 					v-model="form.count"
 					:min="0"
-					:precision="3"
+					:precision="0"
 					style="width: 100%"
 				/>
 			</el-form-item>
@@ -131,6 +129,7 @@ export default {
 		cate: { type: String, default: "" },
 		mioId: { type: String, default: "" },
 		mgroupId: { type: String, default: "" },
+		process: { type: String, default: "" },
 	},
 	data() {
 		return {
@@ -161,12 +160,12 @@ export default {
 	mounted() {
 		this.form.type = this.cate ;
 		this.form.mio = this.mioId ;
-		this.getMaterialOptions();
 		if(this.cate == 'do_out'){//领料---仓库
 			this.inputBatchDisable = true;
+			this.getMaterialOptions();
 			this.getBatchOptions();
 		}else{//入库----工段
-			this.getWBatchs();
+			this.getMgroupWmaterial();
 		}
 		this.getWarehouseOptions();
 	},
@@ -196,12 +195,14 @@ export default {
 			});
 		},
 		//获取车间物料批次号
-		getWBatchs() {
+		getMgroupWmaterial() {
 			let that = this;
 			let obj = {};
-			obj.mgroupx= that.mgroupId;
-			obj.material= that.form.material;
+			obj.state = 10;
 			obj.page= 0;
+			obj.mgroupx= that.mgroupId;
+			obj.material__process= that.process;
+			
 			if (that.mgroupId != null &&that.mgroupId != undefined &&that.mgroupId != "") {
 				that.$API.wpm.wmaterial.list.req(obj).then((res) => {
 					that.wbatchOptions = res;
@@ -211,7 +212,6 @@ export default {
 		//库存物料批次
 		getBatchOptions() {
 			let that = this;
-			that.getWBatchs();
 			let obj = {};
 			obj.page = 0;
 			obj.material = that.form.material;
@@ -220,12 +220,7 @@ export default {
 				});
 		},
 		selectMaterialChange() {
-			let that = this;
-			if(that.cate=='do_in'){
-				that.getWBatchs();
-			}else{
-				that.getBatchOptions();
-			}
+			this.getBatchOptions();
 		},
 		getItem(options, id) {
 			for (var i = 0; i < options.length; i++) {
@@ -238,6 +233,15 @@ export default {
 			this.form.batch = item.batch;
 			this.form.warehouse = item.warehouse;
 		},
+		//选择车间库存物料后的处理
+		selectwmChange(val){
+			let that = this;
+			that.wbatchOptions.forEach((item) => {
+				if (item.batch == val) {
+					that.form.material = item.material;
+				}
+			})
+		},
 		selectBatchClear() {
 			this.form.batch = "";
 			this.form.warehouse = "";
diff --git a/src/views/wpm_gx/inmrecord.vue b/src/views/wpm_gx/inmrecord.vue
new file mode 100644
index 00000000..1c4b19d5
--- /dev/null
+++ b/src/views/wpm_gx/inmrecord.vue
@@ -0,0 +1,322 @@
+<template>
+	<el-container>
+		<el-header>
+			<div class="left-panel">
+				<el-button type="primary" @click="tomio('do_out')" v-auth="'mio.do'"
+				 v-if="mgroupName!=='size'&&mgroupName!=='facade'"
+					>领料</el-button
+				>
+				<el-button type="primary" @click="tomio('do_in')" v-auth="'mio.do'"
+					>入库</el-button
+				>
+				<!-- <el-button
+					type="primary"
+					@click="add('do_out')"
+					v-auth="'mio.do'"
+					>生产领料</el-button
+				>
+				<el-button
+					type="primary"
+					@click="add('do_in')"
+					v-auth="'mio.do'"
+					>生产入库</el-button
+				> -->
+				<el-select
+					v-model="query.type"
+					clearable
+					style="width: 120px; margin-left: 2px"
+					placeholder="出入库类型"
+					@change="handleQuery"
+				>
+					<el-option
+						v-for="item in cateOptions"
+						:key="item.id"
+						:label="item.name"
+						:value="item.id"
+					></el-option>
+				</el-select>
+				<el-select
+					v-model="query.state"
+					clearable
+					style="width: 120px; margin-left: 2px"
+					placeholder="状态"
+					@change="handleQuery"
+				>
+					<el-option
+						v-for="item in stateOptions"
+						:key="item.id"
+						:label="item.name"
+						:value="item.id"
+					></el-option>
+				</el-select>
+			</div>
+			<div class="right-panel">
+				<el-input
+					v-model="query.search"
+					placeholder="编号"
+					clearable
+					style="margin-right: 5px"
+				></el-input>
+				<el-button
+					type="primary"
+					icon="el-icon-search"
+					@click="handleQuery"
+				></el-button>
+			</div>
+		</el-header>
+		<el-main class="nopadding">
+			<scTable
+				ref="table"
+				:apiObj="apiObj"
+				:params="params"
+				:query="query"
+				row-key="id"
+				stripe
+			>
+				<el-table-column type="index" width="50" />
+				<el-table-column
+					label="记录编号"
+					prop="number"
+				></el-table-column>
+				<el-table-column label="出/入库类型">
+					<template #default="scope">
+						{{ typeDict[scope.row.type] }}
+					</template>
+				</el-table-column>
+				<el-table-column label="记录状态">
+					<template #default="scope">
+						{{ stateDict[scope.row.state] }}
+					</template>
+				</el-table-column>
+				<el-table-column label="出/入库日期" prop="inout_date">
+				</el-table-column>
+				<el-table-column label="执行部门" prop="belong_dept_name">
+					<template #default="scope">
+						{{ scope.row.belong_dept_name }} - {{ scope.row.mgroup_name }}
+					</template>
+				</el-table-column>
+				<el-table-column label="创建人" prop="create_by_name">
+				</el-table-column>
+				<el-table-column label="创建时间" prop="create_time">
+				</el-table-column>
+				<el-table-column
+					label="操作"
+					fixed="right"
+					align="center"
+					width="120px"
+				>
+				<template #default="scope">
+						<el-button
+							link
+							type="primary"
+							@click="table_detail(scope.row)"
+						>
+							查看
+						</el-button>
+						<el-button
+							link
+							type="primary"
+							@click="table_edit(scope.row)"
+							v-if="scope.row.state == 10"
+						>
+							编辑
+						</el-button>
+						<el-button
+							link
+							type="primary"
+							@click="table_submit(scope.row)"
+							v-auth="'mio.submit'"
+							v-if="scope.row.state == 10"
+						>
+							提交
+						</el-button>
+						<el-button
+							link
+							type="danger"
+							@click="table_del(scope.row)"
+							v-auth="'mio.delete'"
+							v-if="scope.row.state == 10"
+						>
+							删除
+						</el-button>
+						<el-button
+							link
+							type="warning"
+							@click="revert(scope.row)"
+							v-auth="'mio.submit'"
+							v-if="scope.row.state == 20"
+						>
+							撤销
+						</el-button>
+					</template>
+				</el-table-column>
+			</scTable>
+		</el-main>
+	</el-container>
+	<save-dialog
+		v-if="dialog.inmRecord"
+		ref="inmRecordDialog"
+		:cate = "cate_type"
+		:process = "process"
+		:mgroupId = "params.mgroup"
+		:deptId = " deptId"
+		@success="handleinmSuccess"
+	>
+	</save-dialog>
+</template>
+<script>
+import saveDialog from "./inm_record.vue";
+
+export default {
+	name: "mio",
+	components: {
+		saveDialog
+	},
+	props: {
+		mgroupName: {
+			type: String,
+			default: "",
+		},
+	},
+	data() {
+		return {
+			stateDict: {
+				10: "创建中",
+				20: "已提交",
+			},
+			stateOptions: [
+				{ id: 10, name: "创建中" },
+				{ id: 20, name: "已提交" },
+			],
+			typeDict: {
+				do_out: "生产领料",
+				do_in: "生产入库",
+			},
+			cateOptions: [
+				{ id: "do_out", name: "生产领料" },
+				{ id: "do_in", name: "生产入库" },
+			],
+			dialog: {
+				save: false,
+				inmRecord: false,
+			},
+			query: {},
+			params: {
+				type__in: "do_out,do_in",
+				mgroup:""
+			},
+			form: {},
+			apiObj: null,
+			selection: [],
+			type: "",
+			deptId:"",
+			process: "",
+			cate: "good",
+			mioId: "",
+			visibleDrawer: false,
+			inmRecordDialog:false,
+		};
+	},
+	mounted() {
+		let that = this;
+		that.$nextTick(() => {
+		    that.$API.mtm.mgroup.list.req({ page: 0, search: that.mgroupName }).then((res) => {
+				if (res.length < 1) {
+					that.$message.error("获取工段错误");
+					return;
+				}
+				that.params.mgroup = res[0].id;
+				that.deptId = res[0].belong_dept;
+				that.process = res[0].process;
+				that.apiObj = that.$API.inm.mio.list;
+			});
+		})
+	},
+	methods: {
+		tomio(type) {
+			let that = this;
+			that.cate_type=type;
+			that.dialog.inmRecord = true;
+			that.$nextTick(() => {
+				that.$refs.inmRecordDialog.open("add");
+			});
+		},
+		//添加
+		add(type) {
+			this.dialog.save = true;
+			this.$nextTick(() => {
+				this.$refs.saveDialog.open("add", type);
+			});
+		},
+		//编辑
+		table_edit(row) {
+			let that = this;
+			that.cate_type=row.type;
+			that.dialog.inmRecord = true;
+			that.$nextTick(() => {
+				that.$refs.inmRecordDialog.open("add").setData(row);
+			});
+		},
+		//查看
+		table_detail(row) {
+			let that = this;
+			that.cate_type=row.type;
+			that.dialog.inmRecord = true;
+			that.$nextTick(() => {
+				that.$refs.inmRecordDialog.open("show").setData(row,row.type);
+			});
+		},
+		//撤销
+		revert(row) {
+			this.$confirm(`确定撤销该操作吗？`, "提示", {
+				type: "warning",
+			}).then(() => {
+				this.$API.inm.mio.revert.req(row.id).then((res) => {
+					this.$message.success("撤销成功");
+					this.$refs.table.refresh();
+					return res;
+				})
+				.catch((err) => {
+					return err;
+				});
+			}).catch(() => {});
+		},
+		
+		//删除
+		table_del(row) {
+			this.$confirm(`确定删除吗？`, "提示", {
+				type: "warning",
+			})
+				.then(() => {
+					this.$API.inm.mio.delete
+						.req(row.id)
+						.then((res) => {
+							this.$message.success("删除成功");
+							this.$refs.table.refresh();
+							return res;
+						})
+						.catch((err) => {
+							return err;
+						});
+				})
+				.catch(() => {});
+		},
+		table_submit(row) {
+			this.$API.inm.mio.submit.req(row.id).then((res) => {
+				this.$message.success("提交成功");
+				this.$refs.table.refresh();
+			});
+		},
+		handleQuery() {
+			this.$refs.table.queryData(this.query);
+		},
+		resetQuery() {
+			this.query = {};
+		},
+		handleinmSuccess(){},
+		handleSaveSuccess() {
+			this.$refs.table.refresh();
+		},
+	},
+};
+</script>

From 8118bec402caf2b87e18311a7d2cac036deb8911 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Tue, 24 Sep 2024 16:46:14 +0800
Subject: [PATCH 02/10] =?UTF-8?q?fix:=E5=B7=A5=E6=AE=B5=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=87=BA=E5=85=A5=E5=BA=93=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm_gx/baipianpao.vue  | 8 +++++---
 src/views/wpm_gx/chaoxi.vue      | 8 +++++---
 src/views/wpm_gx/chaoxi2.vue     | 9 ++++++---
 src/views/wpm_gx/chaoxi3.vue     | 8 +++++---
 src/views/wpm_gx/chengpinpao.vue | 9 ++++++---
 src/views/wpm_gx/daojiao.vue     | 8 +++++---
 src/views/wpm_gx/heihua.vue      | 9 ++++++---
 src/views/wpm_gx/jianbo.vue      | 8 +++++---
 src/views/wpm_gx/jianbob.vue     | 9 ++++++---
 src/views/wpm_gx/jingdiao.vue    | 8 +++++---
 src/views/wpm_gx/pingmo.vue      | 8 +++++---
 src/views/wpm_gx/qiepian.vue     | 8 +++++---
 src/views/wpm_gx/saobian.vue     | 8 +++++---
 src/views/wpm_gx/saobianb.vue    | 8 +++++---
 src/views/wpm_gx/tuihuo.vue      | 8 +++++---
 src/views/wpm_gx/yicipao.vue     | 8 +++++---
 16 files changed, 84 insertions(+), 48 deletions(-)

diff --git a/src/views/wpm_gx/baipianpao.vue b/src/views/wpm_gx/baipianpao.vue
index 310eb320..8a7955ba 100644
--- a/src/views/wpm_gx/baipianpao.vue
+++ b/src/views/wpm_gx/baipianpao.vue
@@ -25,7 +25,8 @@
 				:mgroupName="mgroupName"
 			></handover>
 			<!-- 库存 -->
-			<inm v-else :mgroupName="mgroupName"></inm>
+			<inm v-else-if="values == '库存'" :mgroupName="mgroupName"></inm>
+			<record v-else :mgroupName="mgroupName"></record>
 		</el-main>
 	</el-container>
 </template>
@@ -35,12 +36,13 @@ import inm from "./inm.vue";
 import mlogs from "./mlogs.vue";
 import mtask from "./mtask.vue";
 import handover from "./handover.vue";
+import record from "./inmrecord.vue";
 export default {
-	components: { inm, mlogs, mtask, handover },
+	components: { inm, mlogs, mtask, handover,record },
 	data() {
 		return {
 			tableHieght: 200,
-			options: ["日志", "交接记录", "库存"],
+			options: ["日志", "交接记录", "库存","入库记录"],
 			values: "日志",
 			mgroupName: "白片抛",
 			mgroupId: "",
diff --git a/src/views/wpm_gx/chaoxi.vue b/src/views/wpm_gx/chaoxi.vue
index fa8248dc..261cffb8 100644
--- a/src/views/wpm_gx/chaoxi.vue
+++ b/src/views/wpm_gx/chaoxi.vue
@@ -25,7 +25,8 @@
 				:mgroupName="mgroupName"
 			></handover>
 			<!-- 库存 -->
-			<inm v-else :mgroupName="mgroupName"></inm>
+			<inm v-else-if="values == '库存'" :mgroupName="mgroupName"></inm>
+			<record v-else :mgroupName="mgroupName"></record>
 		</el-main>
 	</el-container>
 </template>
@@ -35,12 +36,13 @@ import inm from "./inm.vue";
 import mlogs from "./fmlogs.vue";
 import mtask from "./mtask.vue";
 import handover from "./handover.vue";
+import record from "./inmrecord.vue";
 export default {
-	components: { inm, mlogs, mtask, handover },
+	components: { inm, mlogs, mtask, handover,record },
 	data() {
 		return {
 			tableHieght: 200,
-			options: ["日志", "交接记录", "库存"],
+			options: ["日志", "交接记录", "库存","入库记录"],
 			values: "日志",
 			mgroupName: "一次超洗",
 			mgroupId: "",
diff --git a/src/views/wpm_gx/chaoxi2.vue b/src/views/wpm_gx/chaoxi2.vue
index 34a26727..298fa95b 100644
--- a/src/views/wpm_gx/chaoxi2.vue
+++ b/src/views/wpm_gx/chaoxi2.vue
@@ -25,7 +25,9 @@
 				:mgroupName="mgroupName"
 			></handover>
 			<!-- 库存 -->
-			<inm v-else :mgroupName="mgroupName"></inm>
+			
+			<inm v-else-if="values == '库存'" :mgroupName="mgroupName"></inm>
+			<record v-else :mgroupName="mgroupName"></record>
 		</el-main>
 	</el-container>
 </template>
@@ -35,12 +37,13 @@ import inm from "./inm.vue";
 import mlogs from "./fmlogs.vue";
 import mtask from "./mtask.vue";
 import handover from "./handover.vue";
+import record from "./inmrecord.vue";
 export default {
-	components: { inm, mlogs, mtask, handover },
+	components: { inm, mlogs, mtask, handover,record  },
 	data() {
 		return {
 			tableHieght: 200,
-			options: ["日志", "交接记录", "库存"],
+			options: ["日志", "交接记录", "库存","入库记录"],
 			values: "日志",
 			mgroupName: "二次超洗",
 			mgroupId: "",
diff --git a/src/views/wpm_gx/chaoxi3.vue b/src/views/wpm_gx/chaoxi3.vue
index 8e8e53b9..89831588 100644
--- a/src/views/wpm_gx/chaoxi3.vue
+++ b/src/views/wpm_gx/chaoxi3.vue
@@ -25,7 +25,8 @@
 				:mgroupName="mgroupName"
 			></handover>
 			<!-- 库存 -->
-			<inm v-else :mgroupName="mgroupName"></inm>
+			<inm v-else-if="values == '库存'" :mgroupName="mgroupName"></inm>
+			<record v-else :mgroupName="mgroupName"></record>
 		</el-main>
 	</el-container>
 </template>
@@ -35,12 +36,13 @@ import inm from "./inm.vue";
 import mlogs from "./fmlogs.vue";
 import mtask from "./mtask.vue";
 import handover from "./handover.vue";
+import record from "./inmrecord.vue";
 export default {
-	components: { inm, mlogs, mtask, handover },
+	components: { inm, mlogs, mtask, handover,record },
 	data() {
 		return {
 			tableHieght: 200,
-			options: ["日志", "交接记录", "库存"],
+			options: ["日志", "交接记录", "库存","入库记录"],
 			values: "日志",
 			mgroupName: "三次超洗",
 			mgroupId: "",
diff --git a/src/views/wpm_gx/chengpinpao.vue b/src/views/wpm_gx/chengpinpao.vue
index 5eefabab..c456d1b0 100644
--- a/src/views/wpm_gx/chengpinpao.vue
+++ b/src/views/wpm_gx/chengpinpao.vue
@@ -25,7 +25,9 @@
 				:mgroupName="mgroupName"
 			></handover>
 			<!-- 库存 -->
-			<inm v-else :mgroupName="mgroupName"></inm>
+			
+			<inm v-else-if="values == '库存'" :mgroupName="mgroupName"></inm>
+			<record v-else :mgroupName="mgroupName"></record>
 		</el-main>
 	</el-container>
 </template>
@@ -35,12 +37,13 @@ import inm from "./inm.vue";
 import mlogs from "./fmlogs.vue";
 import mtask from "./mtask.vue";
 import handover from "./handover.vue";
+import record from "./inmrecord.vue";
 export default {
-	components: { inm, mlogs, mtask, handover },
+	components: { inm, mlogs, mtask, handover,record },
 	data() {
 		return {
 			tableHieght: 200,
-			options: ["日志", "交接记录", "库存"],
+			options: ["日志", "交接记录", "库存","入库记录"],
 			values: "日志",
 			mgroupName: "成品抛",
 			mgroupId: "",
diff --git a/src/views/wpm_gx/daojiao.vue b/src/views/wpm_gx/daojiao.vue
index 04c6b039..57e99b77 100644
--- a/src/views/wpm_gx/daojiao.vue
+++ b/src/views/wpm_gx/daojiao.vue
@@ -25,7 +25,8 @@
 				:mgroupName="mgroupName"
 			></handover>
 			<!-- 库存 -->
-			<inm v-else :mgroupName="mgroupName"></inm>
+			<inm v-else-if="values == '库存'" :mgroupName="mgroupName"></inm>
+			<record v-else :mgroupName="mgroupName"></record>
 		</el-main>
 	</el-container>
 </template>
@@ -35,12 +36,13 @@ import inm from "./inm.vue";
 import mlogs from "./fmlogs.vue";
 import mtask from "./mtask.vue";
 import handover from "./handover.vue";
+import record from "./inmrecord.vue";
 export default {
-	components: { inm, mlogs, mtask, handover },
+	components: { inm, mlogs, mtask, handover,record },
 	data() {
 		return {
 			tableHieght: 200,
-			options: ["日志", "交接记录", "库存"],
+			options: ["日志", "交接记录", "库存","入库记录"],
 			values: "日志",
 			mgroupName: "倒角",
 			mgroupId: "",
diff --git a/src/views/wpm_gx/heihua.vue b/src/views/wpm_gx/heihua.vue
index 1a708034..c925c624 100644
--- a/src/views/wpm_gx/heihua.vue
+++ b/src/views/wpm_gx/heihua.vue
@@ -25,7 +25,9 @@
 				:mgroupName="mgroupName"
 			></handover>
 			<!-- 库存 -->
-			<inm v-else :mgroupName="mgroupName"></inm>
+			
+			<inm v-else-if="values == '库存'" :mgroupName="mgroupName"></inm>
+			<record v-else :mgroupName="mgroupName"></record>
 		</el-main>
 	</el-container>
 </template>
@@ -35,12 +37,13 @@ import inm from "./inm.vue";
 import mlogs from "./mlogs.vue";
 import mtask from "./mtask.vue";
 import handover from "./handover.vue";
+import record from "./inmrecord.vue";
 export default {
-	components: { inm, mlogs, mtask, handover },
+	components: { inm, mlogs, mtask, handover,record },
 	data() {
 		return {
 			tableHieght: 200,
-			options: ["日志", "交接记录", "库存"],
+			options: ["日志", "交接记录", "库存","入库记录"],
 			values: "日志",
 			mgroupName: "黑化",
 			mgroupId: "",
diff --git a/src/views/wpm_gx/jianbo.vue b/src/views/wpm_gx/jianbo.vue
index c2b85a8a..ad15dbd0 100644
--- a/src/views/wpm_gx/jianbo.vue
+++ b/src/views/wpm_gx/jianbo.vue
@@ -25,7 +25,8 @@
 				:mgroupName="mgroupName"
 			></handover>
 			<!-- 库存 -->
-			<inm v-else :mgroupName="mgroupName"></inm>
+			<inm v-else-if="values == '库存'" :mgroupName="mgroupName"></inm>
+			<record v-else :mgroupName="mgroupName"></record>
 		</el-main>
 	</el-container>
 </template>
@@ -35,12 +36,13 @@ import inm from "./inm.vue";
 import mlogs from "./fmlogs.vue";
 import mtask from "./mtask.vue";
 import handover from "./handover.vue";
+import record from "./inmrecord.vue";
 export default {
-	components: { inm, mlogs, mtask, handover },
+	components: { inm, mlogs, mtask, handover,record },
 	data() {
 		return {
 			tableHieght: 200,
-			options: ["日志", "交接记录", "库存"],
+			options: ["日志", "交接记录", "库存","入库记录"],
 			values: "日志",
 			mgroupName: "减薄A",
 			mgroupId: "",
diff --git a/src/views/wpm_gx/jianbob.vue b/src/views/wpm_gx/jianbob.vue
index b7624b56..568cc088 100644
--- a/src/views/wpm_gx/jianbob.vue
+++ b/src/views/wpm_gx/jianbob.vue
@@ -25,7 +25,9 @@
 				:mgroupName="mgroupName"
 			></handover>
 			<!-- 库存 -->
-			<inm v-else :mgroupName="mgroupName"></inm>
+			
+			<inm v-else-if="values == '库存'" :mgroupName="mgroupName"></inm>
+			<record v-else :mgroupName="mgroupName"></record>
 		</el-main>
 	</el-container>
 </template>
@@ -35,12 +37,13 @@ import inm from "./inm.vue";
 import mlogs from "./fmlogs.vue";
 import mtask from "./mtask.vue";
 import handover from "./handover.vue";
+import record from "./inmrecord.vue";
 export default {
-	components: { inm, mlogs, mtask, handover },
+	components: { inm, mlogs, mtask, handover,record },
 	data() {
 		return {
 			tableHieght: 200,
-			options: ["日志", "交接记录", "库存"],
+			options: ["日志", "交接记录", "库存","入库记录"],
 			values: "日志",
 			mgroupName: "减薄B",
 			mgroupId: "",
diff --git a/src/views/wpm_gx/jingdiao.vue b/src/views/wpm_gx/jingdiao.vue
index cacf4ada..5fe66764 100644
--- a/src/views/wpm_gx/jingdiao.vue
+++ b/src/views/wpm_gx/jingdiao.vue
@@ -25,7 +25,8 @@
 				:mgroupName="mgroupName"
 			></handover>
 			<!-- 库存 -->
-			<inm v-else :mgroupName="mgroupName"></inm>
+			<inm v-else-if="values == '库存'" :mgroupName="mgroupName"></inm>
+			<record v-else :mgroupName="mgroupName"></record>
 		</el-main>
 	</el-container>
 </template>
@@ -35,12 +36,13 @@ import inm from "./inm.vue";
 import mlogs from "./fmlogs.vue";
 import mtask from "./mtask.vue";
 import handover from "./handover.vue";
+import record from "./inmrecord.vue";
 export default {
-	components: { inm, mlogs, mtask, handover },
+	components: { inm, mlogs, mtask, handover ,record},
 	data() {
 		return {
 			tableHieght: 200,
-			options: ["日志", "交接记录", "库存"],
+			options: ["日志", "交接记录", "库存","入库记录"],
 			values: "日志",
 			mgroupName: "精雕",
 			mgroupId: "",
diff --git a/src/views/wpm_gx/pingmo.vue b/src/views/wpm_gx/pingmo.vue
index 1ef49570..a0d75931 100644
--- a/src/views/wpm_gx/pingmo.vue
+++ b/src/views/wpm_gx/pingmo.vue
@@ -25,7 +25,8 @@
 				:mgroupName="mgroupName"
 			></handover>
 			<!-- 库存 -->
-			<inm v-else :mgroupName="mgroupName"></inm>
+			<inm v-else-if="values == '库存'" :mgroupName="mgroupName"></inm>
+			<record v-else :mgroupName="mgroupName"></record>
 		</el-main>
 	</el-container>
 </template>
@@ -35,12 +36,13 @@ import inm from "./inm.vue";
 import mlogs from "./fmlogs.vue";
 import mtask from "./mtask.vue";
 import handover from "./handover.vue";
+import record from "./inmrecord.vue";
 export default {
-	components: { inm, mlogs, mtask, handover },
+	components: { inm, mlogs, mtask, handover,record },
 	data() {
 		return {
 			tableHieght: 200,
-			options: ["日志", "交接记录", "库存"],
+			options: ["日志", "交接记录", "库存","入库记录"],
 			values: "日志",
 			mgroupName: "平磨",
 			mgroupId: "",
diff --git a/src/views/wpm_gx/qiepian.vue b/src/views/wpm_gx/qiepian.vue
index 1c1d319a..7050f11d 100644
--- a/src/views/wpm_gx/qiepian.vue
+++ b/src/views/wpm_gx/qiepian.vue
@@ -25,7 +25,8 @@
 				:mgroupName="mgroupName"
 			></handover>
 			<!-- 库存 -->
-			<inm v-else :mgroupName="mgroupName"></inm>
+			<inm v-else-if="values == '库存'" :mgroupName="mgroupName"></inm>
+			<record v-else :mgroupName="mgroupName"></record>
 		</el-main>
 	</el-container>
 </template>
@@ -35,12 +36,13 @@ import inm from "./inm.vue";
 import mlogs from "./mlogs.vue";
 import mtask from "./mtask.vue";
 import handover from "./handover.vue";
+import record from "./inmrecord.vue";
 export default {
-	components: { inm, mlogs, mtask, handover },
+	components: { inm, mlogs, mtask, handover,record },
 	data() {
 		return {
 			tableHieght: 200,
-			options: ["日志", "交接记录", "库存"],
+			options: ["日志", "交接记录", "库存","入库记录"],
 			values: "日志",
 			mgroupName: "切片",
 			mgroupId: "",
diff --git a/src/views/wpm_gx/saobian.vue b/src/views/wpm_gx/saobian.vue
index b6304bf0..488d9a6b 100644
--- a/src/views/wpm_gx/saobian.vue
+++ b/src/views/wpm_gx/saobian.vue
@@ -25,7 +25,8 @@
 				:mgroupName="mgroupName"
 			></handover>
 			<!-- 库存 -->
-			<inm v-else :mgroupName="mgroupName"></inm>
+			<inm v-else-if="values == '库存'" :mgroupName="mgroupName"></inm>
+			<record v-else :mgroupName="mgroupName"></record>
 		</el-main>
 	</el-container>
 </template>
@@ -35,12 +36,13 @@ import inm from "./inm.vue";
 import mlogs from "./fmlogs.vue";
 import mtask from "./mtask.vue";
 import handover from "./handover.vue";
+import record from "./inmrecord.vue";
 export default {
-	components: { inm, mlogs, mtask, handover },
+	components: { inm, mlogs, mtask, handover,record },
 	data() {
 		return {
 			tableHieght: 200,
-			options: ["日志", "交接记录", "库存"],
+			options: ["日志", "交接记录", "库存","入库记录"],
 			values: "日志",
 			mgroupName: "扫边A",
 			mgroupId: "",
diff --git a/src/views/wpm_gx/saobianb.vue b/src/views/wpm_gx/saobianb.vue
index dfd613b9..aac80990 100644
--- a/src/views/wpm_gx/saobianb.vue
+++ b/src/views/wpm_gx/saobianb.vue
@@ -25,7 +25,8 @@
 				:mgroupName="mgroupName"
 			></handover>
 			<!-- 库存 -->
-			<inm v-else :mgroupName="mgroupName"></inm>
+			<inm v-else-if="values == '库存'" :mgroupName="mgroupName"></inm>
+			<record v-else :mgroupName="mgroupName"></record>
 		</el-main>
 	</el-container>
 </template>
@@ -35,12 +36,13 @@ import inm from "./inm.vue";
 import mlogs from "./fmlogs.vue";
 import mtask from "./mtask.vue";
 import handover from "./handover.vue";
+import record from "./inmrecord.vue";
 export default {
-	components: { inm, mlogs, mtask, handover },
+	components: { inm, mlogs, mtask, handover,record },
 	data() {
 		return {
 			tableHieght: 200,
-			options: ["日志", "交接记录", "库存"],
+			options: ["日志", "交接记录", "库存","入库记录"],
 			values: "日志",
 			mgroupName: "扫边B",
 			mgroupId: "",
diff --git a/src/views/wpm_gx/tuihuo.vue b/src/views/wpm_gx/tuihuo.vue
index cf62c481..b8fdf617 100644
--- a/src/views/wpm_gx/tuihuo.vue
+++ b/src/views/wpm_gx/tuihuo.vue
@@ -25,7 +25,8 @@
 				:mgroupName="mgroupName"
 			></handover>
 			<!-- 库存 -->
-			<inm v-else :mgroupName="mgroupName"></inm>
+			<inm v-else-if="values == '库存'" :mgroupName="mgroupName"></inm>
+			<record v-else :mgroupName="mgroupName"></record>
 		</el-main>
 	</el-container>
 </template>
@@ -35,12 +36,13 @@ import inm from "./inm.vue";
 import mlogs from "./mlogs.vue";
 import mtask from "./mtask.vue";
 import handover from "./handover.vue";
+import record from "./inmrecord.vue";
 export default {
-	components: { inm, mlogs, mtask, handover },
+	components: { inm, mlogs, mtask, handover,record },
 	data() {
 		return {
 			tableHieght: 200,
-			options: ["日志", "交接记录", "库存"],
+			options: ["日志", "交接记录", "库存","入库记录"],
 			values: "日志",
 			mgroupName: "退火",
 			mgroupId: "",
diff --git a/src/views/wpm_gx/yicipao.vue b/src/views/wpm_gx/yicipao.vue
index 5ec87317..f829510d 100644
--- a/src/views/wpm_gx/yicipao.vue
+++ b/src/views/wpm_gx/yicipao.vue
@@ -25,7 +25,8 @@
 				:mgroupName="mgroupName"
 			></handover>
 			<!-- 库存 -->
-			<inm v-else :mgroupName="mgroupName"></inm>
+			<inm v-else-if="values == '库存'" :mgroupName="mgroupName"></inm>
+			<record v-else :mgroupName="mgroupName"></record>
 		</el-main>
 	</el-container>
 </template>
@@ -35,12 +36,13 @@ import inm from "./inm.vue";
 import mlogs from "./mlogs.vue";
 import mtask from "./mtask.vue";
 import handover from "./handover.vue";
+import record from "./inmrecord.vue";
 export default {
-	components: { inm, mlogs, mtask, handover },
+	components: { inm, mlogs, mtask, handover,record },
 	data() {
 		return {
 			tableHieght: 200,
-			options: ["日志", "交接记录", "库存"],
+			options: ["日志", "交接记录", "库存","入库记录"],
 			values: "日志",
 			mgroupName: "一次抛",
 			mgroupId: "",

From 25ef072e048df9b7d9461a55c48201dac80a8c4d Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Wed, 25 Sep 2024 14:09:34 +0800
Subject: [PATCH 03/10] =?UTF-8?q?feat:utask=E5=A4=A7=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E6=89=8B=E5=8A=A8=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/model/pm.js    |  8 ++++++++
 src/views/pm/utask.vue | 20 ++++++++++++++++----
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/src/api/model/pm.js b/src/api/model/pm.js
index f7fd7f5a..698b0421 100644
--- a/src/api/model/pm.js
+++ b/src/api/model/pm.js
@@ -245,5 +245,13 @@ export default {
 				);
 			}
 		},
+		submit:{
+			name: "提交",
+			req: async function(id){
+				return await http.post(
+					`${config.API_URL}/pm/utask/${id}/submit/`,
+				);
+			}
+		},
 	}
 }
\ No newline at end of file
diff --git a/src/views/pm/utask.vue b/src/views/pm/utask.vue
index 55ef5709..bb1e9b41 100644
--- a/src/views/pm/utask.vue
+++ b/src/views/pm/utask.vue
@@ -153,6 +153,15 @@
 								>
 									编辑
 								</el-button>
+								<el-button
+									link
+									type="primary"
+									@click.stop="table_submit(scope.row)"
+									v-if="scope.row.state == 30"
+									v-auth="'utask.submit'"
+								>
+								提交
+								</el-button>
 								<el-popconfirm
 									title="确定删除吗？"
 									@confirm.stop="table_del(scope.row)"
@@ -172,10 +181,7 @@
 								<el-popconfirm
 									title="确定停止/恢复该任务吗？"
 									@confirm.stop="table_toggle(scope.row)"
-									v-if="
-										scope.row.state == 30 ||
-										scope.row.state == 34
-									"
+									v-if="scope.row.state == 30 ||scope.row.state == 34"
 									v-auth="'utask.toggle'"
 								>
 									<template #reference>
@@ -385,6 +391,12 @@ export default {
 					return err;
 				});
 		},
+		table_submit(row){
+			this.$API.pm.utask.submit.req(row.id).then(res=>{
+				this.$message.success("提交成功");
+				this.$refs.table.refresh();
+			}).catch(err=>{})
+		},
 		table_toggle(row) {
 			this.$API.pm.utask.toggle
 				.req(row.id)

From 84581bc32c184cf4bc2fa8f11b312b0b5c31dbfa Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Wed, 25 Sep 2024 14:10:32 +0800
Subject: [PATCH 04/10] =?UTF-8?q?fix:=E5=A4=96=E8=A7=82=E6=A3=80=E9=AA=8C?=
 =?UTF-8?q?=E9=A1=B9=E5=B4=A9=E8=BE=B9=E6=B2=A1=E6=9C=89=E5=AE=9E=E6=97=B6?=
 =?UTF-8?q?=E8=AE=A1=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/qm/products_form.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/views/qm/products_form.vue b/src/views/qm/products_form.vue
index 1fd599ac..60be64fe 100644
--- a/src/views/qm/products_form.vue
+++ b/src/views/qm/products_form.vue
@@ -63,6 +63,7 @@
 									v-model="form.count"
 									style="width: 100%"
 									precision="0"
+									:max="formCount"
 									:disabled="mode=='sizeShow'||mode=='facadeShow'"
 									@change="handleCheckChange"
 								></el-input-number>
@@ -525,6 +526,7 @@ export default {
 				this.count_notok_json.count_n_qp=
 				this.count_notok_json.count_n_swen=
 				this.count_notok_json.count_n_zb=
+				this.count_notok_json.count_n_bb=
 				this.count_notok_json.count_n_zq=
 				this.count_notok_json.count_n_hs=
 				this.count_notok_json.count_n_md=
@@ -548,6 +550,7 @@ export default {
 				this.count_notok_json.count_n_z+
 				this.count_notok_json.count_n_swen+
 				this.count_notok_json.count_n_zb+
+				this.count_notok_json.count_n_bb+
 				this.count_notok_json.count_n_zq+
 				this.count_notok_json.count_n_hs+
 				this.count_notok_json.count_n_md+

From 14a079ae0bbf194e4609d020e1cfc8c0bc775c20 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Wed, 25 Sep 2024 14:11:44 +0800
Subject: [PATCH 05/10] =?UTF-8?q?fix:=E6=97=A5=E5=BF=97=E4=B8=AD=E5=AE=9E?=
 =?UTF-8?q?=E9=99=85=E7=94=9F=E4=BA=A7=E6=95=B0=E5=92=8C=E9=A2=86=E6=96=99?=
 =?UTF-8?q?=E6=95=B0=E4=BB=A5=E5=8F=8A=E5=8A=A0=E5=B7=A5=E5=89=8D=E4=B8=8D?=
 =?UTF-8?q?=E8=89=AF=E7=9A=84=E8=AE=A1=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm_gx/f_mlogs_form.vue | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/src/views/wpm_gx/f_mlogs_form.vue b/src/views/wpm_gx/f_mlogs_form.vue
index 00fad594..75319b36 100644
--- a/src/views/wpm_gx/f_mlogs_form.vue
+++ b/src/views/wpm_gx/f_mlogs_form.vue
@@ -106,6 +106,7 @@
 									placeholder="交接物料"
 									clearable
 									class="width100"
+									@change="changeMaterial"
 								>
 									<el-option
 										v-for="item in materialOptions"
@@ -131,8 +132,10 @@
 								<el-input-number
 									v-model="form.count_use"
 									:min="1"
+									:max="materialCount"
 									controls-position="right"
 									class="width100"
+									@change = "countUseChange"
 								/>
 							</el-form-item>
 						</el-col>
@@ -143,6 +146,7 @@
 									:min="0"
 									class="width100"
 									controls-position="right"
+									@change = "countUseChange"
 								/>
 							</el-form-item>
 						</el-col>
@@ -153,8 +157,9 @@
 									:min="0"
 									class="width100"
 									controls-position="right"
-									@change="countChanges"
+									disabled
 								/>
+								<!-- countChanges -->
 							</el-form-item>
 						</el-col>
 						<el-col :md="12" :sm="24">
@@ -392,6 +397,7 @@ export default {
 				work_end_time:[{required: true,message: "请选择生产开始时间",trigger: "blur",},],
 				route: [{required: true,message: "请选择工艺路线",trigger: "blur",},]
 			},
+			materialCount:1,
 			material_in:'',
 			material_out:'',
 			shiftOtions:[],
@@ -465,6 +471,16 @@ export default {
 				that.materialOptions = res;
 			});
 		},
+		changeMaterial(val){
+			let that = this;
+			that.materialOptions.forEach(item=>{
+				if(item.id == val){
+					that.materialCount = item.count;
+					that.form.count_use = item.count;
+					that.form.count_real = item.count-that.form.count_pn_jgqbl;
+				}
+			})
+		},
 		//显示
 		open(mode = "add") {
 			this.mode = mode;
@@ -476,6 +492,11 @@ export default {
 			console.log("data", data);
 			Object.assign(this.form, data);
 		},
+		countUseChange(){
+			let that = this;
+			that.form.count_real = that.form.count_use - that.form.count_pn_jgqbl;
+			that.form.count_ok = that.form.count_real - that.form.count_notok;
+		},
 		countChange() {
 			this.form.count_notok =
 			this.form.count_n_hs +

From ba0bfc0ff330e42c65cf2fd72bf74f30eb9e6c96 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Wed, 25 Sep 2024 14:22:20 +0800
Subject: [PATCH 06/10] =?UTF-8?q?fix:=E5=85=89=E8=8A=AF=E5=90=88=E6=A0=BC?=
 =?UTF-8?q?=E6=95=B0=E7=BB=9F=E8=AE=A1=E6=9F=A5=E8=AF=A2=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E8=A7=84=E8=8C=83=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/statistics/pass_num_gx.vue | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/views/statistics/pass_num_gx.vue b/src/views/statistics/pass_num_gx.vue
index 42636239..3ee842bb 100644
--- a/src/views/statistics/pass_num_gx.vue
+++ b/src/views/statistics/pass_num_gx.vue
@@ -1087,13 +1087,12 @@ export default {
 				dateArr.push(item);
 			}
 			that.weekDateList = dateArr;
-			console.log('dateArr',dateArr);
-			that.query.start_date =first.getFullYear() +"-" +(first.getMonth() + 1) +"-" +first.getDate();
-			that.query.end_date =last.getFullYear() +"-" +(last.getMonth() + 1) +"-" +last.getDate();
+			// console.log('dateArr',dateArr);
+			that.query.start_date =first.toISOString().split('T')[0];
+			that.query.end_date =last.toISOString().split('T')[0];
 			that.options.forEach((item,index)=>{
 				that.getData(item,index);
 			})
-			
 		},
 		setChart(name, option = null) {
 			// 根据name 渲染数据, option需填写，否则option为模拟数据

From fd8e646c10e94cad6dc1a1a8e1c623077f224e4c Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Wed, 25 Sep 2024 16:04:13 +0800
Subject: [PATCH 07/10] =?UTF-8?q?fix:=E6=97=A5=E6=9C=9F=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/statistics/pass_num_gx.vue | 39 +++++++++++++---------------
 1 file changed, 18 insertions(+), 21 deletions(-)

diff --git a/src/views/statistics/pass_num_gx.vue b/src/views/statistics/pass_num_gx.vue
index 3ee842bb..9b8c2b79 100644
--- a/src/views/statistics/pass_num_gx.vue
+++ b/src/views/statistics/pass_num_gx.vue
@@ -54,10 +54,7 @@
 								</el-table-column>
 								<el-table-column label="设备名称" prop="设备名称" min-width="100">
 								</el-table-column>
-								<el-table-column label="日期">
-									<template #default="scope">
-										{{ scope.row.年 }}-{{ scope.row.月 }}-{{ scope.row.日 }}
-									</template>
+								<el-table-column label="日期" prop="日期">
 								</el-table-column>
 								<el-table-column label="任务数" prop="任务数">
 								</el-table-column>
@@ -116,7 +113,7 @@
 								</el-table-column>
 								<el-table-column label="日期">
 									<template #default="scope">
-										{{ scope.row.年 }}-{{ scope.row.月 }}-{{ scope.row.日 }}
+										{{ scope.row.日期 }}
 									</template>
 								</el-table-column>
 								<el-table-column label="任务数" prop="任务数">
@@ -176,7 +173,7 @@
 								</el-table-column>
 								<el-table-column label="日期">
 									<template #default="scope">
-										{{ scope.row.年 }}-{{ scope.row.月 }}-{{ scope.row.日 }}
+										{{ scope.row.日期 }}
 									</template>
 								</el-table-column>
 								<el-table-column label="任务数" prop="任务数">
@@ -236,7 +233,7 @@
 								</el-table-column>
 								<el-table-column label="日期">
 									<template #default="scope">
-										{{ scope.row.年 }}-{{ scope.row.月 }}-{{ scope.row.日 }}
+										{{ scope.row.日期 }}
 									</template>
 								</el-table-column>
 								<el-table-column label="任务数" prop="任务数">
@@ -296,7 +293,7 @@
 								</el-table-column>
 								<el-table-column label="日期">
 									<template #default="scope">
-										{{ scope.row.年 }}-{{ scope.row.月 }}-{{ scope.row.日 }}
+										{{ scope.row.日期 }}
 									</template>
 								</el-table-column>
 								<el-table-column label="任务数" prop="任务数">
@@ -356,7 +353,7 @@
 								</el-table-column>
 								<el-table-column label="日期">
 									<template #default="scope">
-										{{ scope.row.年 }}-{{ scope.row.月 }}-{{ scope.row.日 }}
+										{{ scope.row.日期 }}
 									</template>
 								</el-table-column>
 								<el-table-column label="任务数" prop="任务数">
@@ -416,7 +413,7 @@
 								</el-table-column>
 								<el-table-column label="日期">
 									<template #default="scope">
-										{{ scope.row.年 }}-{{ scope.row.月 }}-{{ scope.row.日 }}
+										{{ scope.row.日期 }}
 									</template>
 								</el-table-column>
 								<el-table-column label="任务数" prop="任务数">
@@ -476,7 +473,7 @@
 								</el-table-column>
 								<el-table-column label="日期">
 									<template #default="scope">
-										{{ scope.row.年 }}-{{ scope.row.月 }}-{{ scope.row.日 }}
+										{{ scope.row.日期 }}
 									</template>
 								</el-table-column>
 								<el-table-column label="任务数" prop="任务数">
@@ -536,7 +533,7 @@
 								</el-table-column>
 								<el-table-column label="日期">
 									<template #default="scope">
-										{{ scope.row.年 }}-{{ scope.row.月 }}-{{ scope.row.日 }}
+										{{ scope.row.日期 }}
 									</template>
 								</el-table-column>
 								<el-table-column label="任务数" prop="任务数">
@@ -596,7 +593,7 @@
 								</el-table-column>
 								<el-table-column label="日期">
 									<template #default="scope">
-										{{ scope.row.年 }}-{{ scope.row.月 }}-{{ scope.row.日 }}
+										{{ scope.row.日期 }}
 									</template>
 								</el-table-column>
 								<el-table-column label="任务数" prop="任务数">
@@ -656,7 +653,7 @@
 								</el-table-column>
 								<el-table-column label="日期">
 									<template #default="scope">
-										{{ scope.row.年 }}-{{ scope.row.月 }}-{{ scope.row.日 }}
+										{{ scope.row.日期 }}
 									</template>
 								</el-table-column>
 								<el-table-column label="任务数" prop="任务数">
@@ -716,7 +713,7 @@
 								</el-table-column>
 								<el-table-column label="日期">
 									<template #default="scope">
-										{{ scope.row.年 }}-{{ scope.row.月 }}-{{ scope.row.日 }}
+										{{ scope.row.日期 }}
 									</template>
 								</el-table-column>
 								<el-table-column label="任务数" prop="任务数">
@@ -776,7 +773,7 @@
 								</el-table-column>
 								<el-table-column label="日期">
 									<template #default="scope">
-										{{ scope.row.年 }}-{{ scope.row.月 }}-{{ scope.row.日 }}
+										{{ scope.row.日期 }}
 									</template>
 								</el-table-column>
 								<el-table-column label="任务数" prop="任务数">
@@ -836,7 +833,7 @@
 								</el-table-column>
 								<el-table-column label="日期">
 									<template #default="scope">
-										{{ scope.row.年 }}-{{ scope.row.月 }}-{{ scope.row.日 }}
+										{{ scope.row.日期 }}
 									</template>
 								</el-table-column>
 								<el-table-column label="任务数" prop="任务数">
@@ -896,7 +893,7 @@
 								</el-table-column>
 								<el-table-column label="日期">
 									<template #default="scope">
-										{{ scope.row.年 }}-{{ scope.row.月 }}-{{ scope.row.日 }}
+										{{ scope.row.日期 }}
 									</template>
 								</el-table-column>
 								<el-table-column label="任务数" prop="任务数">
@@ -956,7 +953,7 @@
 								</el-table-column>
 								<el-table-column label="日期">
 									<template #default="scope">
-										{{ scope.row.年 }}-{{ scope.row.月 }}-{{ scope.row.日 }}
+										{{ scope.row.日期 }}
 									</template>
 								</el-table-column>
 								<el-table-column label="任务数" prop="任务数">
@@ -1083,7 +1080,7 @@ export default {
 			let dateArr = [];
 			for (let i = 0; i < 7; i++) {
 				let itemDate = new Date(first.getTime() + i * ondDayTime);
-				let item = itemDate.getDate();
+				let item = itemDate.toISOString().split('T')[0];
 				dateArr.push(item);
 			}
 			that.weekDateList = dateArr;
@@ -1160,7 +1157,7 @@ export default {
 					});
 					for(let i = 0;i<dataList.length;i++){
 						for(let j = 0;j<dataList[i].length;j++){
-							let index = that.weekDateList.indexOf(dataList[i][j].日);
+							let index = that.weekDateList.indexOf(dataList[i][j].日期);
 							datas[i][index] = dataList[i][j].合格数; //将当前日期对应的合格数添加到datas中
 						}
 					}

From 4b7664296f4527416b3e1578eacef345e4903079 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Wed, 25 Sep 2024 16:51:08 +0800
Subject: [PATCH 08/10] fix:coding#495

---
 src/views/wpm_gx/handover_form.vue | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/views/wpm_gx/handover_form.vue b/src/views/wpm_gx/handover_form.vue
index 73fc51e5..05b62e1c 100644
--- a/src/views/wpm_gx/handover_form.vue
+++ b/src/views/wpm_gx/handover_form.vue
@@ -83,6 +83,7 @@
 							placeholder="接收工段"
 							clearable
 							style="width: 100%"
+							:disabled="type==40"
 							@change="getUserList2"
 						>
 							<el-option
@@ -313,10 +314,17 @@ export default {
 		},
 		//获取工段列表
 		getMgroupOptions() {
-			this.$API.mtm.mgroup.list
-				.req({ page: 0})
-				.then((res) => {
-					this.mgroupOptions = res;
+			let that = this;
+			that.$API.mtm.mgroup.list.req({ page: 0}).then((res) => {
+				that.mgroupOptions = res;
+					if(that.type==40){
+						res.forEach(item=>{
+							if(item.name=="废品库"){
+								that.form.recive_mgroup = item.id;
+							}
+						})
+						that.getCkUserList();//废品库接收人
+					}
 				});
 		},
 		//获取车间物料
@@ -401,6 +409,14 @@ export default {
 				that.userList = res;
 			});
 		},
+		//获取仓库人员
+		getCkUserList() {
+			let that = this;
+			this.$API.system.user.list.req({ page: 0, posts__name: "inm&check" })
+				.then((res) => {
+					that.userList = res;
+				});
+		},
 		//获取接收工段人员
 		getUserList2() {
 			let that = this;

From 753063ba473755442eb15f3f399a9042b7c42a3c Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Wed, 25 Sep 2024 16:52:03 +0800
Subject: [PATCH 09/10] fix:coding#492

---
 src/views/wpm_gx/inm.vue | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/views/wpm_gx/inm.vue b/src/views/wpm_gx/inm.vue
index 6edb9014..14368946 100644
--- a/src/views/wpm_gx/inm.vue
+++ b/src/views/wpm_gx/inm.vue
@@ -74,15 +74,11 @@
 					prop="count"
 					min-width="80"
 				></el-table-column>
-				<!-- <el-table-column
-				v-if="mgroupName=='size'||mgroupName=='facade'"
-					label="检验状态"
-				>
-					<template #default="scope">
-						<el-tag type="success" v-if="scope.row.count_xtest == null">已检验</el-tag>
-						<el-tag type="primary" v-else>未检验 </el-tag>
-					</template>
-				</el-table-column> -->
+				<el-table-column
+					label="生产中"
+					prop="count_working"
+					min-width="80"
+				></el-table-column>
 				<el-table-column
 					label="不合格标记"
 					prop="notok_sign_name"

From e5b163dc59cf80bcb1db76a4efcc9e05fa34260c Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Thu, 26 Sep 2024 15:59:49 +0800
Subject: [PATCH 10/10] =?UTF-8?q?fix:=E5=90=88=E6=A0=BC=E6=95=B0=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E6=9F=B1=E7=8A=B6=E5=9B=BE=E4=BF=AE=E6=AD=A3=EF=BC=8C?=
 =?UTF-8?q?=E5=85=89=E8=8A=AFmtask=E6=8F=90=E4=BA=A4=E5=90=8E=E5=88=B7?=
 =?UTF-8?q?=E6=96=B0=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/statistics/pass_num_gx.vue | 2 +-
 src/views/wpm_gx/handover_form.vue   | 4 ++--
 src/views/wpm_gx/mtask.vue           | 9 ++++-----
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/views/statistics/pass_num_gx.vue b/src/views/statistics/pass_num_gx.vue
index 9b8c2b79..cf15610e 100644
--- a/src/views/statistics/pass_num_gx.vue
+++ b/src/views/statistics/pass_num_gx.vue
@@ -1158,7 +1158,7 @@ export default {
 					for(let i = 0;i<dataList.length;i++){
 						for(let j = 0;j<dataList[i].length;j++){
 							let index = that.weekDateList.indexOf(dataList[i][j].日期);
-							datas[i][index] = dataList[i][j].合格数; //将当前日期对应的合格数添加到datas中
+							datas[i][index] += dataList[i][j].合格数; //将当前日期对应的合格数添加到datas中
 						}
 					}
 					for(let n=0;n<nameList.length;n++){
diff --git a/src/views/wpm_gx/handover_form.vue b/src/views/wpm_gx/handover_form.vue
index 05b62e1c..b49d7965 100644
--- a/src/views/wpm_gx/handover_form.vue
+++ b/src/views/wpm_gx/handover_form.vue
@@ -412,9 +412,9 @@ export default {
 		//获取仓库人员
 		getCkUserList() {
 			let that = this;
-			this.$API.system.user.list.req({ page: 0, posts__name: "inm&check" })
+			this.$API.system.user.list.req({ page: 0, posts__code: "inm&check" })
 				.then((res) => {
-					that.userList = res;
+					that.userList2 = res;
 				});
 		},
 		//获取接收工段人员
diff --git a/src/views/wpm_gx/mtask.vue b/src/views/wpm_gx/mtask.vue
index 1988896a..dfaef602 100644
--- a/src/views/wpm_gx/mtask.vue
+++ b/src/views/wpm_gx/mtask.vue
@@ -131,11 +131,10 @@ export default {
 				type: "warning",
 			}).then(() => {
 				this.$API.pm.mtask.submit.req(row.id).then((res) => {
-						this.$message.success("操作成功");
-						this.$refs.table_mtask.refresh();
-						this.mtaskClick(this.currentMtask);
-					})
-					.catch((err) => {});
+					this.$message.success("操作成功");
+					this.$refs.table.refresh();
+					this.mtaskClick(this.currentMtask);
+				}).catch((err) => {});
 			});
 		},
 		mtask_deliver(row){