diff --git a/src/config/route.js b/src/config/route.js
index b7f55fd1..6a4673cd 100644
--- a/src/config/route.js
+++ b/src/config/route.js
@@ -69,28 +69,6 @@ const routes = [
 						},
 						component: "home/enp_home",
 					},
-					// {
-					//   "path": "/bigScreen",
-					//   "name": "bigScreen",
-					//   "meta": {
-					//     "title": "驾驶舱",
-					//     "icon": "el-icon-position",
-					//     "perms": ["bigScreen"],
-					//     "fullpage": true,
-					//   },
-					//   "component": "bigScreen"
-					// },
-					// {
-					//   "path": "/bigScreen2",
-					//   "name": "bigScreen2",
-					//   "meta": {
-					//     "title": "能管大屏",
-					//     "icon": "el-icon-position",
-					//     "perms": ["bigScreen2"],
-					//     "fullpage": true,
-					//   },
-					//   "component": "bigScreen/index_enm"
-					// },
 					{
 						path: "/track",
 						name: "track",
@@ -755,16 +733,6 @@ const routes = [
 						},
 						component: "enm_pack/report",
 					},
-					// {
-					//   "name": "pack_power",
-					//   "path": "/enm_pack/power",
-					//   "meta": {
-					//     "title": "单位产品电耗",
-					//     "icon": "el-icon-grid",
-					//     "perms": ["enm"]
-					//   },
-					//   "component": "enm_pack/power"
-					// },
 					{
 						name: "pack_teamAnalysis",
 						path: "/enm_pack/teamAnalysis",
@@ -1037,16 +1005,6 @@ const routes = [
 						},
 						component: "mtm/routepack",
 					},
-					// {
-					//   "name": "process",
-					//   "path": "/mtm/process",
-					//   "meta": {
-					//     "title": "工序管理",
-					//     "icon": "el-icon-cellphone",
-					//     "perms": ["mtm"]
-					//   },
-					//   "component": "mtm/process"
-					// },
 				],
 			},
 			//生产管理 pm
@@ -1062,14 +1020,13 @@ const routes = [
 				children: [
 					{
 						name: "utask_1b",
-						path: "/pm/utask",
+						path: "/pm/utask_1b",
 						meta: {
 							title: "生产一部",
 							type: "menu",
 							icon: "el-icon-cellphone",
 							perms: ["utask_1b"],
 						},
-						// "component": "pm/mtask"
 						children: [
 							{
 								name: "utask_dept7",
@@ -1095,7 +1052,7 @@ const routes = [
 					},
 					{
 						name: "utask_2b",
-						path: "/pm/utask",
+						path: "/pm/utask_2b",
 						meta: {
 							title: "生产二部",
 							icon: "el-icon-cellphone",
@@ -1114,18 +1071,17 @@ const routes = [
 								component: "pm/utask_dept6",
 							},
 						],
-						// "component": "pm/mtask2"
 					},
-					// {
-					//   "name": "gantt",
-					//   "path": "/pm/gantt",
-					//   "meta": {
-					//     "title": "gantt",
-					//     "icon": "el-icon-cellphone",
-					//     "perms": ["inm"]
-					//   },
-					//   "component": "pm/gantt"
-					// }
+					{
+						name: "utask",
+						path: "/pm/utask",
+						meta: {
+							title: "车间任务",
+							icon: "el-icon-cellphone",
+							perms: ["pm"],
+						},
+						component: "pm/utask",
+					},
 				],
 			},
 			//生产执行 wpm
@@ -1190,7 +1146,6 @@ const routes = [
 								component: "wpm/mlog_dept10",
 							},
 						],
-						// "component": "wpm/worktask"
 					},
 					{
 						name: "worktaskFlog",
@@ -1211,7 +1166,6 @@ const routes = [
 							icon: "el-icon-cellphone",
 							perms: ["wpm"],
 						},
-						// "component": "wpm/worktask2"
 						children: [
 							{
 								name: "mlog_dept6",
diff --git a/src/views/mtm/materials.vue b/src/views/mtm/materials.vue
index 57ad61ec..b09f5a8d 100644
--- a/src/views/mtm/materials.vue
+++ b/src/views/mtm/materials.vue
@@ -127,7 +127,7 @@
 						>
 						</el-table-column>
 						<el-table-column
-							v-if="materialType !== ''"
+							v-if="materialType == ''"
 							label="操作"
 							fixed="right"
 							align="center"
@@ -183,6 +183,7 @@ export default {
 	name: "rparty",
 	props: {
 		materialType: {
+			//当作选择页面时传参
 			type: String,
 			default() {
 				return "";
diff --git a/src/views/mtm/routepack.vue b/src/views/mtm/routepack.vue
index dd2941ab..3afd5664 100644
--- a/src/views/mtm/routepack.vue
+++ b/src/views/mtm/routepack.vue
@@ -67,28 +67,13 @@
 							style="margin-right: 5px"
 							>{{ scope.row.ticket_.state_.name }}</span
 						>
-						<el-tag
+						<!-- <el-tag
 							v-if="
 								scope.row.ticket_ && scope.row.ticket_.act_state
 							"
-							:type="
-								scope.row.ticket_.act_state === 0
-									? ''
-									: scope.row.ticket_.act_state === 1
-									? ''
-									: scope.row.ticket_.act_state === 2
-									? 'danger'
-									: scope.row.ticket_.act_state === 3
-									? 'danger'
-									: scope.row.ticket_.act_state === 5
-									? 'danger'
-									: scope.row.ticket_.act_state === 4
-									? 'success'
-									: ''
-							"
 						>
 							{{ act_states[scope.row.ticket_.act_state] }}
-						</el-tag>
+						</el-tag> -->
 					</template>
 				</el-table-column>
 				<el-table-column
diff --git a/src/views/pm/utask.vue b/src/views/pm/utask.vue
new file mode 100644
index 00000000..2578ba16
--- /dev/null
+++ b/src/views/pm/utask.vue
@@ -0,0 +1,464 @@
+<template>
+	<el-container>
+		<el-header style="height: 50%; padding: 0">
+			<el-container>
+				<el-header>
+					<div class="'left-panel'">
+						<el-button
+							type="primary"
+							icon="el-icon-plus"
+							@click="utaskCreate"
+							v-auth="'utask.create'"
+							>新增任务</el-button
+						>
+						<el-button
+							type="primary"
+							@click="utaskDecompose"
+							v-loading="isLoading"
+							v-auth="'utask.assgin'"
+							>任务分解</el-button
+						>
+						<el-button
+							type="primary"
+							@click="utaskRelease"
+							v-loading="isLoading"
+							v-auth="'utask.assgin'"
+							>任务下达</el-button
+						>
+					</div>
+					<div class="'right-panel'">
+						<el-date-picker
+							v-model="dateValue"
+							type="daterange"
+							range-separator="至"
+							start-placeholder="开始时间"
+							end-placeholder="结束时间"
+							value-format="YYYY-MM-DD"
+							style="vertical-align: middle; margin-right: 6px"
+						/>
+						<el-button
+							type="primary"
+							@click="utaskSearch"
+							v-loading="isLoading"
+							>搜索</el-button
+						>
+					</div>
+				</el-header>
+				<el-main class="nopadding">
+					<scTable
+						ref="table"
+						:apiObj="apiObj"
+						row-key="id"
+						stripe
+						:params="paramsUtask"
+						:query="queryUtask"
+						@selection-change="handleSelectionChange"
+						@dataChange="updateCount"
+					>
+						<el-table-column type="selection" width="40" />
+						<el-table-column type="index" width="40" />
+						<el-table-column
+							label="任务编号"
+							prop="number"
+							min-width="160"
+							show-overflow-tooltip
+						>
+						</el-table-column>
+						<el-table-column
+							label="生产工艺"
+							prop="material_"
+							min-width="150"
+							show-overflow-tooltip
+						>
+							<template #default="scope">
+								{{ scope.row.material_.name }}
+							</template>
+						</el-table-column>
+						<el-table-column
+							label="产品名称"
+							prop="material_"
+							min-width="150"
+							show-overflow-tooltip
+						>
+							<template #default="scope">
+								{{ scope.row.material_.name }}
+							</template>
+						</el-table-column>
+						<el-table-column label="任务状态" prop="state">
+							<template #default="scope">
+								<el-tag
+									v-if="scope.row.state == 40"
+									type="success"
+								>
+									{{ state_[scope.row.state] }}
+								</el-tag>
+								<el-tag
+									v-else-if="scope.row.state == 34"
+									type="danger"
+								>
+									{{ state_[scope.row.state] }}
+								</el-tag>
+								<el-tag v-else>
+									{{ state_[scope.row.state] }}
+								</el-tag>
+							</template>
+						</el-table-column>
+						<el-table-column label="任务数量" prop="count">
+						</el-table-column>
+						<el-table-column
+							label="计划开工时间"
+							prop="start_date"
+							width="120"
+						>
+						</el-table-column>
+						<el-table-column
+							label="计划完工时间"
+							prop="end_date"
+							width="120"
+						>
+						</el-table-column>
+						<el-table-column label="完成率">
+							<template #default="scope">
+								<span
+									v-if="
+										scope.row.count != 0 &&
+										scope.row.count_ok != 0
+									"
+									>{{
+										Math.round(
+											(scope.row.count_ok /
+												scope.row.count) *
+												100
+										)
+									}}%</span
+								>
+								<span v-else>0</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="操作" fixed="right" width="150">
+							<template #default="scope">
+								<el-button
+									link
+									type="primary"
+									@click.stop="table_show(scope.row)"
+								>
+									查看
+								</el-button>
+								<el-button
+									link
+									type="primary"
+									@click.stop="table_edit(scope.row)"
+									v-if="scope.row.state == 10"
+									v-auth="'utask.update'"
+								>
+									编辑
+								</el-button>
+								<el-popconfirm
+									title="确定删除吗？"
+									@confirm.stop="table_del(scope.row)"
+									v-if="
+										scope.row.state == 10 ||
+										scope.row.state == 14 ||
+										scope.row.state == 20
+									"
+									v-auth="'utask.delete'"
+								>
+									<template #reference>
+										<el-button link type="danger"
+											>删除</el-button
+										>
+									</template>
+								</el-popconfirm>
+								<el-popconfirm
+									title="确定停止/恢复该任务吗？"
+									@confirm.stop="table_toggle(scope.row)"
+									v-if="
+										scope.row.state == 30 ||
+										scope.row.state == 34
+									"
+									v-auth="'utask.toggle'"
+								>
+									<template #reference>
+										<el-button link type="danger"
+											>停/复</el-button
+										>
+									</template>
+								</el-popconfirm>
+							</template>
+						</el-table-column>
+					</scTable>
+				</el-main>
+			</el-container>
+		</el-header>
+		<el-main class="nopadding">
+			<GanttComponent
+				class="left-container"
+				:tasks="tasks"
+				:key="timeStamp"
+				v-if="ganntVisit"
+				:start_date="start_date"
+			>
+			</GanttComponent>
+		</el-main>
+	</el-container>
+	<showDrawer
+		ref="showDrawer"
+		v-if="visibleDrawer"
+		:utaskId="utaskId"
+		@closed="visibleDrawer = false"
+	>
+	</showDrawer>
+	<save-dialog
+		v-if="dialog.save"
+		ref="saveDialog"
+		:type="'routepack'"
+		@success="handleSaveSuccess"
+		@closed="dialog.save = false"
+	></save-dialog>
+</template>
+<script>
+import saveDialog from "./utask_form.vue";
+import showDrawer from "./mtask_drawer.vue";
+import GanttComponent from "@/components/GanttComponent.vue";
+export default {
+	name: "utask_dept7",
+	components: {
+		saveDialog,
+		showDrawer,
+		GanttComponent,
+	},
+	data() {
+		return {
+			utaskId: "",
+			visibleDrawer: false,
+			isLoading: false,
+			selectedIds: [],
+			dialog: {
+				save: false,
+			},
+			tasks: {
+				data: [],
+			},
+			timeStamp: "",
+			ganntVisit: true,
+			dateValue: [],
+			apiObj: this.$API.pm.utask.list,
+			visibleRecord: false,
+			currentDept: { id: 0 },
+			paramsUtask: {},
+			queryUtask: {},
+			utaskList: [],
+			state_: {
+				10: "创建中",
+				14: "已分解",
+				20: "已下达",
+				30: "生产中",
+				34: "终止",
+				40: "已提交",
+			},
+			start_date: "",
+			newDate: "",
+		};
+	},
+	mounted() {
+		let date = new Date();
+		this.timeStamp = date.getTime();
+	},
+	methods: {
+		initDept() {
+			let that = this;
+			that.paramsUtask.routepack = "";
+		},
+		updateCount(res, tableData) {
+			let that = this;
+			this.count = res.count;
+			let data = [];
+			that.tasks.data = [];
+			that.ganntVisit = false;
+			let date = new Date();
+			that.timeStamp = date.getTime();
+			if (tableData.length > 0) {
+				tableData.forEach((item) => {
+					let start_date = item.start_date;
+					let end_date = item.end_date;
+					let objItem = {};
+					objItem.id = item.id;
+					objItem.type = "utask";
+					objItem.number = item.number;
+					objItem.count = item.count;
+					objItem.text = item.number;
+					objItem.material_name = item.material_.name;
+					objItem.material_specification =
+						item.material_.specification;
+					objItem.material_model = item.material_.model;
+					objItem.progress = item.count_real / item.count;
+					objItem.count_ok = item.count_ok;
+					objItem.count_real = item.count_real;
+					objItem.count_notok = item.count_notok;
+					objItem.state = item.state;
+					objItem.start_date = start_date;
+					objItem.utaskType = item.type;
+					objItem.mgroup_name = item.mgroup_name;
+					objItem.open = true;
+					let oneDay = 24 * 60 * 60 * 1000; // 一天的毫秒数
+					let firstDate = new Date(start_date);
+					let secondDate = new Date(end_date);
+					let timeDiff = Math.abs(
+						secondDate.getTime() - firstDate.getTime()
+					);
+					let daysDiff = Math.ceil(timeDiff / oneDay);
+					objItem.duration = daysDiff + 1;
+					data.push(objItem);
+					that.start_date = start_date;
+				});
+			}
+			that.tasks.data = data;
+			gantt.parse(that.tasks);
+			that.ganntVisit = true;
+			gantt.refreshData();
+		},
+		utaskDecompose() {
+			let that = this;
+			if (that.selectedIds.length > 0) {
+				let ids = that.selectedIds;
+				that.isLoading = true;
+				that.$API.pm.utask.scheduemtasks
+					.req({ ids: ids, schedule_type: "to_mgroup" })
+					.then((res) => {
+						that.$message.success("任务分解成功");
+						that.isLoading = false;
+						that.$refs.table.refresh();
+					})
+					.catch(() => {
+						that.isLoading = false;
+					});
+			} else {
+				this.$message.error("未选择任何任务");
+			}
+		},
+		utaskRelease() {
+			let that = this;
+			if (that.selectedIds.length > 0) {
+				let ids = that.selectedIds;
+				that.isLoading = true;
+				that.$API.pm.utask.assgin
+					.req({ ids: ids })
+					.then((res) => {
+						that.$message.success("任务下达成功");
+						that.isLoading = false;
+						that.$refs.table.refresh();
+					})
+					.catch(() => {
+						that.isLoading = false;
+					});
+			} else {
+				this.$message.error("未选择任何任务");
+			}
+		},
+		handleSelectionChange(selection) {
+			this.selectedIds = [];
+			selection.forEach((item) => {
+				this.selectedIds.push(item.id);
+			});
+		},
+		utaskCreate() {
+			this.dialog.save = true;
+			this.$nextTick(() => {
+				this.$refs.saveDialog.open("add");
+			});
+		},
+		table_edit(row) {
+			this.dialog.save = true;
+			this.$nextTick(() => {
+				this.$refs.saveDialog.open("edit").setData(row);
+			});
+		},
+		table_del(row) {
+			this.$API.pm.utask.delete
+				.req(row.id)
+				.then((res) => {
+					this.$message.success("删除成功");
+					this.$refs.table.refresh();
+					return res;
+				})
+				.catch((err) => {
+					return err;
+				});
+		},
+		table_toggle(row) {
+			this.$API.pm.utask.toggle
+				.req(row.id)
+				.then((res) => {
+					this.$message.success("操作成功");
+					this.$refs.table.refresh();
+					return res;
+				})
+				.catch((err) => {
+					return err;
+				});
+		},
+		bindClass(item) {
+			let classInfo = {
+				countBlock: true,
+				redColor: false,
+				greenColor: false,
+				orangeColor: false,
+			};
+			if (item.state != 40) {
+				classInfo.orangeColor = true;
+			} else {
+				if (item.count_ok >= item.count) {
+					classInfo.greenColor = true;
+				} else {
+					classInfo.redColor = true;
+				}
+			}
+
+			return classInfo;
+		},
+		table_show(row) {
+			this.utaskId = row.id;
+			this.visibleDrawer = true;
+			this.$nextTick(() => {
+				this.$refs.showDrawer.open();
+			});
+		},
+
+		handleSaveSuccess(data, mode) {
+			this.$refs.table.refresh();
+		},
+		utaskSearch() {
+			console.log("this.dateValue", this.dateValue);
+			this.ganntVisit = false;
+			if (this.dateValue && this.dateValue.length > 0) {
+				let start_date = this.dateValue[0];
+				let end_date = this.dateValue[1];
+				this.paramsUtask.start_date__gte = start_date;
+				this.paramsUtask.end_date__lte = end_date;
+			} else {
+				this.paramsUtask.start_date__gte = "";
+				this.paramsUtask.end_date__lte = "";
+			}
+			this.$refs.table.refresh();
+		},
+	},
+};
+</script>
+<style scoped>
+.countBlock {
+	width: 80px;
+	color: #ffffff;
+	text-align: center;
+}
+.redColor {
+	background-color: brown;
+}
+
+.greenColor {
+	background-color: green;
+}
+
+.orangeColor {
+	background-color: orange;
+}
+</style>
diff --git a/src/views/pm/utask_form.vue b/src/views/pm/utask_form.vue
index 04e11d1d..f373ca23 100644
--- a/src/views/pm/utask_form.vue
+++ b/src/views/pm/utask_form.vue
@@ -1,137 +1,252 @@
 <template>
-  <el-dialog :title="titleMap[mode]" v-model="visible" :size="1000" destroy-on-close @closed="$emit('closed')">
-    <el-container v-loading="loading">
-      <el-main style="padding: 0 20px 20px 20px">
-        <el-form ref="dialogForm" :model="form" :rules="rules" label-width="120px">
-          <el-form-item label="任务编号" prop="number">
-            <el-input v-model="form.number" placeholder="任务编号" :disabled="mode == 'edit'" />
-          </el-form-item>
-          <el-form-item label="生产路线" prop="route" v-if="mode == 'add'">
-            <el-select placeholder="路线" v-model="currentRoute" value-key="id" style="width:100%" filterable @change="routeChange">
-              <el-option v-for="item in routeOptions" :key="item.id" :label="item.label" :value="item">
-              </el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="生产路线" prop="route" v-if="mode == 'edit'">
-            <span>{{ form.material_in_name}}->{{ form.material_out_name }}</span>
-          </el-form-item>
-          <el-form-item label="任务数" prop="count">
-            <el-input-number style="width:100%" v-model="form.count" :min="1" controls-position="right"
-              placeholder="任务数" />
-          </el-form-item>
-          <el-form-item label="开工日期" prop="start_date">
-            <el-date-picker v-model="form.start_date" type="date" placeholder="开工日期" value-format="YYYY-MM-DD"
-              style="width:100%">
-            </el-date-picker>
-          </el-form-item>
-          <el-form-item label="完工日期" prop="end_date">
-            <el-date-picker v-model="form.end_date" type="date" placeholder="完工日期" value-format="YYYY-MM-DD"
-              style="width:100%">
-            </el-date-picker>
-          </el-form-item>
-        </el-form>
-      </el-main>
-      <el-footer>
-        <el-button type="primary" :loading="isSaveing" @click="submit">保存</el-button>
-        <el-button @click="visible = false">取消</el-button>
-      </el-footer>
-    </el-container>
-  </el-dialog>
+	<el-dialog
+		:title="titleMap[mode]"
+		v-model="visible"
+		:size="1000"
+		destroy-on-close
+		@closed="$emit('closed')"
+	>
+		<el-container v-loading="loading">
+			<el-main style="padding: 0 20px 20px 20px">
+				<el-form
+					ref="dialogForm"
+					:model="form"
+					:rules="rules"
+					label-width="120px"
+				>
+					<el-form-item label="任务编号" prop="number">
+						<el-input
+							v-model="form.number"
+							placeholder="任务编号"
+							:disabled="mode == 'edit'"
+						/>
+					</el-form-item>
+					<el-form-item :label="routeText" v-if="mode == 'add'">
+						<el-select
+							:placeholder="routeText"
+							v-model="currentRoute"
+							value-key="id"
+							style="width: 100%"
+							filterable
+							:disabled="mode == 'edit'"
+							@change="routeChange"
+						>
+							<el-option
+								v-for="item in routeOptions"
+								:key="item.id"
+								:label="item.name"
+								:value="item"
+							>
+							</el-option>
+						</el-select>
+					</el-form-item>
+					<el-form-item label="生产路线" prop="route" v-else>
+						<el-input
+							v-if="type == 'routepack'"
+							disabled
+							:value="currentRoute.name"
+						>
+						</el-input>
+						<span v-else>
+							{{ form.material_in_name }}->{{
+								form.material_out_name
+							}}
+						</span>
+					</el-form-item>
+					<el-form-item label="任务数" prop="count">
+						<el-input-number
+							style="width: 100%"
+							v-model="form.count"
+							:min="1"
+							controls-position="right"
+							placeholder="任务数"
+						/>
+					</el-form-item>
+					<el-form-item label="开工日期" prop="start_date">
+						<el-date-picker
+							v-model="form.start_date"
+							type="date"
+							placeholder="开工日期"
+							value-format="YYYY-MM-DD"
+							style="width: 100%"
+						>
+						</el-date-picker>
+					</el-form-item>
+					<el-form-item label="完工日期" prop="end_date">
+						<el-date-picker
+							v-model="form.end_date"
+							type="date"
+							placeholder="完工日期"
+							value-format="YYYY-MM-DD"
+							style="width: 100%"
+						>
+						</el-date-picker>
+					</el-form-item>
+				</el-form>
+			</el-main>
+			<el-footer>
+				<el-button type="primary" :loading="isSaveing" @click="submit"
+					>保存</el-button
+				>
+				<el-button @click="visible = false">取消</el-button>
+			</el-footer>
+		</el-container>
+	</el-dialog>
 </template>
 <script>
 export default {
-  emits: ["success", "closed"],
-  props: {
-    activeDept: { type: String, default: '' },
-  },
-  data() {
-    return {
-      loading: false,
-      mode: "add",
-      titleMap: {
-        add: "新增任务",
-        edit: "编辑任务",
-        show: "查看任务",
-      },
-      routeOptions: [],
-      currentRoute: '',
-      form: {},
-      rules: {
-        count: [{ required: true, message: '请输入任务数', trigger: "blur" }],
-        start_date: [{ required: true, message: "请选择开始时间", trigger: "blur" }],
-        end_date: [{ required: true, message: "请选择结束时间", trigger: "blur" }],
-        number: [{ required: true, message: "请输入任务编号", trigger: "blur" }],
-      },
-      visible: false,
-      isSaveing: false,
-      options: [],
-      materialOptions: [],
-      selectionFilters: [],
-      setFiltersVisible: false,
-      belong_dept_options: [],
-      group: [],
-    };
-  },
-  mounted() {
-    this.getRouteOptions();
-  },
-  methods: {
-    getRouteOptions() {
-      this.$API.mtm.route.list.req({ page: 0, mgroup__belong_dept: this.activeDept }).then(res => {
-        for (var i = 0; i < res.length; i++) {
-          if (res[i].material_in_name == undefined) {
-            res[i].material_in_name = ''
-          }
-          res[i].label = res[i].material_in_name + '->' + res[i].material_out_name
-        }
-        this.routeOptions = res
-      })
-    },
-    routeChange(item) {
-      this.form.material = item.material_out
-      this.form.material_in = item.material_in
-      this.form.mgroup = item.mgroup
-    },
-    //显示
-    open(mode = "add", type) {
-      this.mode = mode;
-      this.visible = true;
-      return this;
-    },
-    //提交
-    submit() {
-      this.$refs.dialogForm.validate(async (valid) => {
-        if (valid) {
-          this.isSaveing = true;
-          try {
-            var res;
-            if (this.mode == "add") {
-              res = await this.$API.pm.utask.create.req(this.form);
-            } else if (this.mode == "edit") {
-              res = await this.$API.pm.utask.update.req(this.form.id, this.form);
-            }
-            this.isSaveing = false;
-            this.$emit("success");
-            this.visible = false;
-            this.$message.success("操作成功");
-          } catch (err) {
-            //可以处理校验错误
-            this.isSaveing = false;
-            return err;
-          }
-        }
-      });
-    },
-    //表单注入数据
-    setData(data) {
-      Object.assign(this.form, data);
-    },
-    //设置过滤项
-    setFilters(filters) {
-      this.selectionFilters = filters;
-      this.setFiltersVisible = true;
-    },
-  },
+	emits: ["success", "closed"],
+	props: {
+		activeDept: { type: String, default: "" },
+		type: { type: String, default: "" },
+	},
+	data() {
+		return {
+			loading: false,
+			mode: "add",
+			titleMap: {
+				add: "新增任务",
+				edit: "编辑任务",
+				show: "查看任务",
+			},
+			routeOptions: [],
+			currentRoute: "",
+			form: {},
+			rules: {
+				count: [
+					{
+						required: true,
+						message: "请输入任务数",
+						trigger: "blur",
+					},
+				],
+				start_date: [
+					{
+						required: true,
+						message: "请选择开始时间",
+						trigger: "blur",
+					},
+				],
+				end_date: [
+					{
+						required: true,
+						message: "请选择结束时间",
+						trigger: "blur",
+					},
+				],
+				number: [
+					{
+						required: true,
+						message: "请输入任务编号",
+						trigger: "blur",
+					},
+				],
+			},
+			visible: false,
+			isSaveing: false,
+			options: [],
+			materialOptions: [],
+			selectionFilters: [],
+			setFiltersVisible: false,
+			belong_dept_options: [],
+			group: [],
+			routeText: "生产工艺",
+		};
+	},
+	mounted() {
+		if (this.type == "routepack") {
+			this.routeText = "生产工艺";
+			this.getRoutePackes();
+		} else {
+			this.routeText = "生产路线";
+			this.getRouteOptions();
+		}
+	},
+	methods: {
+		getRouteOptions() {
+			this.$API.mtm.route.list
+				.req({ page: 0, mgroup__belong_dept: this.activeDept })
+				.then((res) => {
+					for (var i = 0; i < res.length; i++) {
+						if (res[i].material_in_name == undefined) {
+							res[i].material_in_name = "";
+						}
+						res[i].label =
+							res[i].material_in_name +
+							"->" +
+							res[i].material_out_name;
+					}
+					this.routeOptions = res;
+				});
+		},
+		getRoutePackes() {
+			let that = this;
+			that.$API.mtm.routepack.list.req({ page: 0 }).then((res) => {
+				for (var i = 0; i < res.length; i++) {
+					res[i].label = res[i].name;
+					if (res[i].id == that.form.routepack) {
+						that.currentRoute = res[i];
+					}
+				}
+				that.routeOptions = res;
+			});
+		},
+		routeChange(item) {
+			console.log(item);
+			if (this.type == "routepack") {
+				this.form.routepack = item.id;
+				this.form.material = item.material;
+			} else {
+				this.form.material = item.material_out;
+				this.form.material_in = item.material_in;
+				this.form.mgroup = item.mgroup;
+			}
+		},
+		//显示
+		open(mode = "add", type) {
+			this.mode = mode;
+			this.visible = true;
+			return this;
+		},
+		//提交
+		submit() {
+			this.$refs.dialogForm.validate(async (valid) => {
+				if (valid) {
+					this.isSaveing = true;
+					try {
+						var res;
+						if (this.mode == "add") {
+							res = await this.$API.pm.utask.create.req(
+								this.form
+							);
+						} else if (this.mode == "edit") {
+							res = await this.$API.pm.utask.update.req(
+								this.form.id,
+								this.form
+							);
+						}
+						this.isSaveing = false;
+						this.$emit("success");
+						this.visible = false;
+						this.$message.success("操作成功");
+					} catch (err) {
+						//可以处理校验错误
+						this.isSaveing = false;
+						return err;
+					}
+				}
+			});
+		},
+		//表单注入数据
+		setData(data) {
+			Object.assign(this.form, data);
+		},
+		//设置过滤项
+		setFilters(filters) {
+			this.selectionFilters = filters;
+			this.setFiltersVisible = true;
+		},
+	},
 };
 </script>
 <style></style>