Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web

src/views/inm/good_mio.vue

@@ -84,6 +84,9 @@
 				<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>

src/views/inm/halfgood_mio.vue

@@ -84,6 +84,9 @@
 				<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>

src/views/inm/helpso_mio.vue

@@ -84,6 +84,9 @@
 				<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>

src/views/inm/mainso_mio.vue

@@ -84,6 +84,9 @@
 				<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>

src/views/inm/mio_form.vue

@@ -112,6 +112,24 @@
 					></el-option>
 				</el-select>
 			</el-form-item>
+			<el-form-item
+				label="工段"
+				v-if="form.type == 'do_in' || form.type == 'do_out'"
+			>
+				<el-select
+					v-model="form.mgroup"
+					clearable
+					style="width: 100%"
+					placeholder="为空时代表领料/入库到车间"
+				>
+					<el-option
+						v-for="item in mgroupOptions"
+						:key="item.id"
+						:label="item.name"
+						:value="item.id"
+					></el-option>
+				</el-select>
+			</el-form-item>
 			<el-form-item
 				label="车间执行人"
 				v-if="form.type == 'do_in' || form.type == 'do_out'"
@@ -187,6 +205,7 @@ export default {
 			options: [],
 			setFiltersVisible: false,
 			deptOptions: [],
+			mgroupOptions: [],
 			userOptions: [],
 			userOption: [],
 			orderOptions: [],
@@ -208,12 +227,18 @@ export default {
 			} else if (type == "do_in" || type == "do_out") {
 				this.getDeptOptions();
 				this.getDeptUser();
+				this.getmgroupOptions();
 			} else if (type == "other_in") {
 				this.getSupplierOptions();
 			} else if (type == "other_out") {
 				this.getCustomerOptions();
 			}
 		},
+		getmgroupOptions() {
+			this.$API.mtm.mgroup.list.req({page: 0}).then(res=>{
+				this.mgroupOptions = res;
+			})
+		},
 		getSupplierOptions() {
 			this.$API.pum.supplier.list.req({ page: 0 }).then((res) => {
 				this.supplierOptions = res;

src/views/inm/mioitem.vue

@@ -21,7 +21,7 @@
 						}}</el-descriptions-item>
 						<el-descriptions-item label="部门/车间">{{
 							mioObj.belong_dept_name
-						}}</el-descriptions-item>
+						}}-{{ mioObj.mgroup_name }}</el-descriptions-item>
 						<el-descriptions-item label="执行人">{{
 							mioObj.do_user_name
 						}}</el-descriptions-item>

src/views/mtm/route_form.vue

@@ -149,7 +149,7 @@
 							</el-form-item>
 						</el-col>
 						<el-col :md="12" :sm="24">
-							<el-form-item label="绑定工序">
+							<el-form-item label="绑定批次">
 								<el-switch v-model="form.batch_bind" />
 							</el-form-item>
 						</el-col>

src/views/mtm/route_show.vue

@@ -37,6 +37,8 @@
 						</el-table-column>
 						<el-table-column label="工时" prop="hour_work">
 						</el-table-column>
+						<el-table-column label="批次绑定" prop="batch_bind">
+						</el-table-column>
 					</scTable>
 				</el-card>
 			</el-main>
@@ -79,7 +81,7 @@ export default {
 		//文件列表加载
 		getRoute(id) {
 			this.$API.mtm.route.list
-				.req({ page: 0, material: id })
+				.req({ page: 0, routepack: this.form.id })
 				.then((res) => {
 					this.tableData = res;
 				});

src/views/mtm/routepack_form.vue

@@ -109,7 +109,7 @@
 					</el-table-column>
 					<el-table-column label="工时" prop="hour_work">
 					</el-table-column>
-					<el-table-column label="排序" prop="sort">
+					<el-table-column label="批次绑定" prop="batch_bind">
 					</el-table-column>
 					<el-table-column
 						label="操作"

src/views/pm/utask_form.vue

@@ -181,7 +181,7 @@ export default {
 		},
 		getRoutePackes() {
 			let that = this;
-			that.$API.mtm.routepack.list.req({ page: 0 }).then((res) => {
+			that.$API.mtm.routepack.list.req({ page: 0, state: 30 }).then((res) => {
 				for (var i = 0; i < res.length; i++) {
 					res[i].label = res[i].name;
 					if (res[i].id == that.form.routepack) {

src/views/wpm_gx/mlog_form.vue

@@ -217,6 +217,15 @@ export default {
 			type: String,
 			default: "",
 		},
+		dept: {
+			type: String,
+			default: "",
+		},
+	},
+	computed: {
+		title() {
+			return this.titleMap[this.mode];
+		}
 	},
 	emits: ["success", "closed"],
 	data() {
@@ -283,7 +292,7 @@ export default {
 	methods: {
 		//获取
 		getUser() {
-			this.$API.system.user.list.req().then((res) => {
+			this.$API.system.user.list.req({depts: this.dept}).then((res) => {
 				this.userOptions = res.results;
 			});
 		},

src/views/wpm_gx/mlogs.vue

@@ -124,6 +124,7 @@
 			ref="saveDialog"
 			:process="processId"
 			:mgroup="mgroupId"
+			:dept="deptId"
 			@success="handleSaveSuccess"
 			@closed="dialog.save = false"
 		>
@@ -167,6 +168,7 @@ export default {
 			selection: [],
 			mtask: "",
 			mlogId: "",
+			deptId: null,
 			processId: "",
 			processCate: "",
 		};
@@ -177,6 +179,7 @@ export default {
 			.req({ page: 0, search: that.mgroupName })
 			.then((res) => {
 				that.mgroupId = res[0].id;
+				that.deptId = res[0].belong_dept;
 				that.processId = res[0].process;
 				that.processCate = res[0].process_cate;
 				that.params.mgroup = res[0].id;