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

src/App.vue

@@ -298,8 +298,8 @@ export default {
 	color: #ffffff;
 }
 .elProgress > .el-progress-circle {
-	width: 5vw !important;
+	width: 9vh !important;
-	height: 5vw !important;
+	height: 9vh !important;
 }
 //排放系统
 </style>

src/config/route.js

@@ -2687,7 +2687,7 @@ const routes = [
 		path: "/bigScreenly",
 		name: "bigScreenly",
 		meta: {
-			title: "能管大屏ly",
+			title: "数智大屏",
 			icon: "el-icon-position",
 			perms: ["bigScreenly"],
 			fullpage: true,

src/layout/other/404.vue

@@ -17,8 +17,14 @@
 	export default {
 		methods: {
 			gohome(){
-				location.href="#/"
+				let base_dashboard = this.$TOOL.data.get('BASE_INFO').base.base_dashboard;
-			},
+				if (base_dashboard == null || base_dashboard == undefined) {
+					base_dashboard = '/dashboard'
+				}
+				this.$router.replace({
+					path: base_dashboard,
+				});
+		  },
 			goback(){
 				this.$router.go(-1);
 			},

src/views/mtm/materials.vue

@@ -1,222 +1,344 @@
 <template>
-  <el-container>
+	<el-container>
-    <el-header>
+		<el-header>
-      <div class="left-panel">
+			<div class="left-panel">
-        <el-button type="primary" icon="el-icon-plus" @click="add" v-auth="'material.create'">新增</el-button>
+				<el-button
-        <scFileImport :templateUrl="materialTemplate" accept=".xlsx" :apiObj="$API.common.upload" @success="upSuccess">
+					type="primary"
-        </scFileImport>
+					icon="el-icon-plus"
-      </div>
+					@click="add"
-      <div class="right-panel">
+					v-auth="'material.create'"
-        <el-input v-model="query.search" placeholder="名称" clearable></el-input>
+					>新增</el-button
-        <el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button>
+				>
-      </div>
+				<scFileImport
-    </el-header>
+					:templateUrl="materialTemplate"
-    <el-main class="nopadding">
+					accept=".xlsx"
-      <el-container>
+					:apiObj="$API.common.upload"
-        <el-header>
+					@success="upSuccess"
-          <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick" type="card">
+				>
-            <el-tab-pane v-for="item in tabOptions" v-bind:key="item.name" :label="item.label" :name="item.name">
+				</scFileImport>
-            </el-tab-pane>
+			</div>
-          </el-tabs>
+			<div class="right-panel">
-          <el-checkbox v-model="showHidden" label="显示隐式物料" @change="hiddenChange" />
+				<el-input
-        </el-header>
+					v-model="query.search"
-        <el-main class="nopadding">
+					placeholder="名称"
-          <scTable ref="table" :apiObj="apiObj" row-key="id" stripe>
+					clearable
-            <el-table-column type="index" width="50" />
+				></el-input>
-            <el-table-column label="物料编号" prop="number">
+				<el-button
-            </el-table-column>
+					type="primary"
-            <el-table-column label="物料名称" prop="name">
+					icon="el-icon-search"
-            </el-table-column>
+					@click="handleQuery"
-            <el-table-column label="规格" prop="specification">
+				></el-button>
-            </el-table-column>
+			</div>
-            <el-table-column label="型号" prop="model">
+		</el-header>
-            </el-table-column>
+		<el-main class="nopadding">
-            <el-table-column label="物料特征" prop="type" width="230">
+			<el-container>
-              <template #default="scope">
+				<el-header>
-                <span><el-tag>{{ typeOptions[scope.row.type] }}</el-tag>
+					<el-tabs
-                  <el-tag type="warning" v-if="scope.row.is_assemb" effect="plain">组</el-tag>
+						v-model="activeName"
-                  <el-tag type="warning" v-if="scope.row.process_name" effect="plain">{{ scope.row.process_name
+						class="demo-tabs"
-                    }}</el-tag>
+						@tab-click="handleClick"
-                  <el-tag type="warning" v-if="scope.row.is_hidden" effect="plain">隐</el-tag></span>
+						type="card"
-              </template>
+					>
-            </el-table-column>
+						<el-tab-pane
+							v-for="item in tabOptions"
+							v-bind:key="item.name"
+							:label="item.label"
+							:name="item.name"
+						>
+						</el-tab-pane>
+					</el-tabs>
+					<el-checkbox
+						v-model="showHidden"
+						label="显示隐式物料"
+						@change="hiddenChange"
+					/>
+				</el-header>
+				<el-main class="nopadding">
+					<scTable
+						ref="table"
+						:apiObj="apiObj"
+						row-key="id"
+						stripe
+						@row-click="rowClick"
+					>
+						<el-table-column type="index" width="50" />
+						<el-table-column label="物料编号" prop="number">
+						</el-table-column>
+						<el-table-column label="物料名称" prop="name">
+						</el-table-column>
+						<el-table-column label="规格" prop="specification">
+						</el-table-column>
+						<el-table-column label="型号" prop="model">
+						</el-table-column>
+						<el-table-column
+							label="物料特征"
+							prop="type"
+							width="230"
+						>
+							<template #default="scope">
+								<span
+									><el-tag>{{
+										typeOptions[scope.row.type]
+									}}</el-tag>
+									<el-tag
+										type="warning"
+										v-if="scope.row.is_assemb"
+										effect="plain"
+										>组</el-tag
+									>
+									<el-tag
+										type="warning"
+										v-if="scope.row.process_name"
+										effect="plain"
+										>{{ scope.row.process_name }}</el-tag
+									>
+									<el-tag
+										type="warning"
+										v-if="scope.row.is_hidden"
+										effect="plain"
+										>隐</el-tag
+									></span
+								>
+							</template>
+						</el-table-column>
 
-            <el-table-column label="关联物料" prop="brothers">
+						<el-table-column label="关联物料" prop="brothers">
-
+							<template #default="scope">
-              <template #default="scope">
+								<el-icon
-                <el-icon v-if="scope.row.brothers.length > 0" color="green">
+									v-if="scope.row.brothers.length > 0"
-                  <CircleCheckFilled />
+									color="green"
-                </el-icon>
+								>
-              </template>
+									<CircleCheckFilled />
-            </el-table-column>
+								</el-icon>
-            <el-table-column label="计量单位" prop="unit" width="80">
+							</template>
-            </el-table-column>
+						</el-table-column>
-            <el-table-column label="总库存" prop="count" width="80">
+						<el-table-column
-            </el-table-column>
+							label="计量单位"
-            <el-table-column label="安全库存" prop="count_safe" width="80">
+							prop="unit"
-            </el-table-column>
+							width="80"
-            <el-table-column label="操作" fixed="right" align="center" width="140">
+						>
-
+						</el-table-column>
-              <template #default="scope">
+						<el-table-column label="总库存" prop="count" width="80">
-                <el-button link type="primary" @click="table_edit(scope.row)" v-auth="'material.update'">
+						</el-table-column>
-                  编辑
+						<el-table-column
-                </el-button>
+							label="安全库存"
-                <el-button link type="warning" @click="table_copy(scope.row)" v-auth="'material.create'">
+							prop="count_safe"
-                  复制
+							width="80"
-                </el-button>
+						>
-                <el-button link type="danger" @click="table_del(scope.row)" v-auth="'material.delete'">
+						</el-table-column>
-                  删除
+						<el-table-column
-                </el-button>
+							v-if="materialType !== ''"
-              </template>
+							label="操作"
-            </el-table-column>
+							fixed="right"
-          </scTable>
+							align="center"
-        </el-main>
+							width="140"
-      </el-container>
+						>
-
+							<template #default="scope">
-    </el-main>
+								<el-button
-  </el-container>
+									link
-  <save-dialog v-if="dialog.save" ref="saveDialog" @success="handleSaveSuccess"
+									type="primary"
-    @closed="dialog.save = false"></save-dialog>
+									@click="table_edit(scope.row)"
+									v-auth="'material.update'"
+								>
+									编辑
+								</el-button>
+								<el-button
+									link
+									type="warning"
+									@click="table_copy(scope.row)"
+									v-auth="'material.create'"
+								>
+									复制
+								</el-button>
+								<el-button
+									link
+									type="danger"
+									@click="table_del(scope.row)"
+									v-auth="'material.delete'"
+								>
+									删除
+								</el-button>
+							</template>
+						</el-table-column>
+					</scTable>
+				</el-main>
+			</el-container>
+		</el-main>
+	</el-container>
+	<save-dialog
+		v-if="dialog.save"
+		ref="saveDialog"
+		@success="handleSaveSuccess"
+		@closed="dialog.save = false"
+	></save-dialog>
 </template>
 
 <script>
 import saveDialog from "./materials_form.vue";
-import scFileImport from '@/components/scFileImport'
+import scFileImport from "@/components/scFileImport";
-import scFileExport from '@/components/scFileExport'
+import scFileExport from "@/components/scFileExport";
-import { ElLoading } from 'element-plus'
+import { ElLoading } from "element-plus";
-export default {
-  name: "rparty",
-  components: {
-    saveDialog,
-    scFileImport,
-    scFileExport,
-    ElLoading
-  },
-  data() {
-    return {
-      materialTemplate: '/media/template/material.xlsx',
-      dialog: {
-        save: false,
-      },
-      apiObj: null,
-      query: { type: 10, is_hidden: false },
-      activeName: '主要原料',
-      selection: [],
-      state_: {
-        10: '完好',
-        20: '限用',
-        30: '在修',
-        40: '禁用',
-      },
-      tabOptions: [
-        { label: "成品", name: 10 },
-        { label: "半成品", name: 20 },
-        { label: "主要原料", name: 30 },
-        { label: "辅助材料", name: 40 },
-        // { label: "加工工具", name: 50 },
-        // { label: "辅助工装", name: 60 },
-        { label: "办公用品", name: 70 },
-        // { label: "电/水/气", name: 0 },
-      ],
-      typeOptions: {
-        0: '电/水/气',
-        10: '成品',
-        20: '半成品',
-        30: '主要原料',
-        40: '辅助材料',
-        // 50: '加工工具',
-        // 60: '辅助工装',
-        70: '办公用品',
-      },
-      showHidden: false,
-    };
-  },
-  mounted() {
-    this.apiObj = this.$API.mtm.material.list
-    this.$refs.table.queryData(this.query)
-  },
-  methods: {
-    handleClick(pane, ev) {
-      this.query.type = pane.props.name
-      this.query.page = 1
-      this.$refs.table.queryData(this.query)
-    },
-    //添加
-    add() {
-      this.dialog.save = true;
-      this.$nextTick(() => {
-        this.$refs.saveDialog.open("add");
-      });
-    },
-    table_copy(row) {
-      this.dialog.save = true;
-      this.$nextTick(() => {
-        this.$refs.saveDialog.open("add").setData(row);
-      });
-    },
-    //编辑
-    table_edit(row) {
-      this.dialog.save = true;
-      this.$nextTick(() => {
-        this.$refs.saveDialog.open("edit").setData(row);
-      });
-    },
-    //查看
-    table_show(row) {
-      this.dialog.save = true;
-      this.$nextTick(() => {
-        this.$refs.saveDialog.open("show").setData(row);
-      });
-    },
-    //删除
-    async table_del(row) {
-      this.$confirm(`确定删除吗？`, "提示", {
-        type: "warning",
-      }).then(() => {
-        this.$API.mtm.material.delete.req(row.id).then((res) => {
-          this.$message.success("删除成功");
-          this.$refs.table.refresh();
-          return res;
-        }).catch((err) => {
-          return err;
-        });
-      }).catch(() => { });
-    },
 
-    //本地更新数据
+export default {
-    handleSaveSuccess(data, mode) {
+	name: "rparty",
-      if (mode == "add") {
+	props: {
-        this.$refs.table.refresh();
+		materialType: {
-      } else if (mode == "edit") {
+			type: String,
-        this.$refs.table.refresh();
+			default() {
-      }
+				return "";
-    },
+			},
-    handleQuery() {
+		},
-      this.$refs.table.queryData(this.query)
+	},
-    },
+	components: {
-    resetQuery() {
+		saveDialog,
-      this.query = {};
+		scFileImport,
-    },
+		scFileExport,
-    upSuccess(res, close) {
+		ElLoading,
-      close();
+	},
-      const loading = ElLoading.service({ fullscreen: true, text: "解析中...请稍等" });
+	data() {
-      this.$API.mtm.material.daoru.req({ path: res.path }).then(res => {
+		return {
-        loading.close();
+			materialTemplate: "/media/template/material.xlsx",
-        this.$message.success("导入成功");
+			dialog: {
-        this.$refs.table.queryData(this.query)
+				save: false,
-      }).catch(err => {
+			},
-        loading.close();
+			apiObj: null,
-      })
+			query: { type: 10, is_hidden: false },
-    },
+			activeName: "主要原料",
-    hiddenChange(val) {
+			selection: [],
-      if (val) {
+			state_: {
-        this.query.is_hidden = ''
+				10: "完好",
-      }
+				20: "限用",
-      else {
+				30: "在修",
-        this.query.is_hidden = false
+				40: "禁用",
-      }
+			},
-      this.$refs.table.queryData(this.query)
+			tabOptions: [
-    }
+				{ label: "成品", name: 10 },
-  },
+				{ label: "半成品", name: 20 },
+				{ label: "主要原料", name: 30 },
+				{ label: "辅助材料", name: 40 },
+				// { label: "加工工具", name: 50 },
+				// { label: "辅助工装", name: 60 },
+				{ label: "办公用品", name: 70 },
+				// { label: "电/水/气", name: 0 },
+			],
+			typeOptions: {
+				0: "电/水/气",
+				10: "成品",
+				20: "半成品",
+				30: "主要原料",
+				40: "辅助材料",
+				// 50: '加工工具',
+				// 60: '辅助工装',
+				70: "办公用品",
+			},
+			materialId: "",
+			materialName: "",
+			showHidden: false,
+		};
+	},
+	mounted() {
+		console.log("materialType", this.materialType);
+		this.apiObj = this.$API.mtm.material.list;
+		this.$refs.table.queryData(this.query);
+	},
+	methods: {
+		rowClick(row) {
+			console.log("rowClick", row);
+			this.materialId = row.id;
+			this.materialName = row.full_name;
+			this.$emit("choseChange", row.id);
+		},
+		handleClick(pane, ev) {
+			this.query.type = pane.props.name;
+			this.query.page = 1;
+			this.$refs.table.queryData(this.query);
+		},
+		//添加
+		add() {
+			this.dialog.save = true;
+			this.$nextTick(() => {
+				this.$refs.saveDialog.open("add");
+			});
+		},
+		table_copy(row) {
+			this.dialog.save = true;
+			this.$nextTick(() => {
+				this.$refs.saveDialog.open("add").setData(row);
+			});
+		},
+		//编辑
+		table_edit(row) {
+			this.dialog.save = true;
+			this.$nextTick(() => {
+				this.$refs.saveDialog.open("edit").setData(row);
+			});
+		},
+		//查看
+		table_show(row) {
+			this.dialog.save = true;
+			this.$nextTick(() => {
+				this.$refs.saveDialog.open("show").setData(row);
+			});
+		},
+		//删除
+		async table_del(row) {
+			this.$confirm(`确定删除吗？`, "提示", {
+				type: "warning",
+			})
+				.then(() => {
+					this.$API.mtm.material.delete
+						.req(row.id)
+						.then((res) => {
+							this.$message.success("删除成功");
+							this.$refs.table.refresh();
+							return res;
+						})
+						.catch((err) => {
+							return err;
+						});
+				})
+				.catch(() => {});
+		},
+
+		//本地更新数据
+		handleSaveSuccess(data, mode) {
+			if (mode == "add") {
+				this.$refs.table.refresh();
+			} else if (mode == "edit") {
+				this.$refs.table.refresh();
+			}
+		},
+		handleQuery() {
+			this.$refs.table.queryData(this.query);
+		},
+		resetQuery() {
+			this.query = {};
+		},
+		upSuccess(res, close) {
+			close();
+			const loading = ElLoading.service({
+				fullscreen: true,
+				text: "解析中...请稍等",
+			});
+			this.$API.mtm.material.daoru
+				.req({ path: res.path })
+				.then((res) => {
+					loading.close();
+					this.$message.success("导入成功");
+					this.$refs.table.queryData(this.query);
+				})
+				.catch((err) => {
+					loading.close();
+				});
+		},
+		hiddenChange(val) {
+			if (val) {
+				this.query.is_hidden = "";
+			} else {
+				this.query.is_hidden = false;
+			}
+			this.$refs.table.queryData(this.query);
+		},
+	},
 };
-</script>
+</script>

src/views/qm/process.vue

@@ -3,7 +3,11 @@
 		<el-header>
 			<div class="left-panel"></div>
 			<div class="right-panel">
-				<el-select v-model="query.mgroup" clearable>
+				<el-select
+					v-model="query.mgroup"
+					clearable
+					style="width: 150px"
+				>
 					<el-option
 						v-for="item in mgroupOption"
 						:key="item.id"
@@ -17,7 +21,17 @@
 					type="date"
 					placeholder="选择日期"
 					value-format="YYYY-MM-DD"
+					style="width: 150px"
 				/>
+				<el-input
+					v-model="query.search"
+					placeholder="批次号"
+					clearable
+					style="width: 150px"
+				></el-input>
+				<el-button type="primary" @click="materialsChoses()"
+					>选择物料</el-button
+				>
 				<el-button
 					type="primary"
 					icon="el-icon-search"
@@ -110,17 +124,30 @@
 				</el-table-column>
 			</scTable>
 		</el-main>
+		<el-dialog title="选择物料" v-model="materialsVisible" width="90%">
+			<materials
+				style="height: 500px"
+				ref="materialsChose"
+				@choseChange="choseChange"
+			></materials>
+		</el-dialog>
 	</el-container>
 </template>
 <script>
+import materials from "./../mtm/materials.vue";
 export default {
+	components: {
+		materials,
+	},
 	name: "rparty",
 	data() {
 		return {
 			apiObj: this.$API.wpm.mlog.list,
 			query: {
-				page: 1,
+				search: "",
-				page_size: 20,
+				material: "",
+				mgroup: "",
+				handle_date: "",
 			},
 			selection: [],
 			state_: {
@@ -128,12 +155,21 @@ export default {
 				20: "",
 			},
 			mgroupOption: [],
+			materialsVisible: false,
 		};
 	},
 	mounted() {
 		this.getMgroup();
 	},
 	methods: {
+		materialsChoses() {
+			this.materialsVisible = true;
+		},
+		choseChange(data) {
+			this.query.material = data;
+			this.$refs.table.queryData(this.query);
+			this.materialsVisible = false;
+		},
 		getMgroup() {
 			this.$API.mtm.mgroup.list.req({ page: 0 }).then((res) => {
 				this.mgroupOption = res;

src/views/wpm/mlog_dept10.vue

@@ -426,6 +426,24 @@
 							<div class="left-panel">
 								<span style="font-size: 14px">交接记录</span>
 							</div>
+							<div class="right-panel">
+								<el-input
+									v-model="queryHandover.search"
+									placeholder="批次号"
+									clearable
+									style="margin-right: 5px"
+								></el-input>
+								<el-button
+									type="primary"
+									icon="el-icon-search"
+									@click="queryHandoverChange"
+								></el-button>
+								<el-button
+									type="primary"
+									@click="materialsChoses('handover')"
+									>选择物料</el-button
+								>
+							</div>
 						</el-header>
 						<el-main>
 							<scTable
@@ -507,6 +525,22 @@
 								<span style="font-size: 14px">车间库存</span>
 							</div>
 							<div class="right-panel">
+								<el-input
+									v-model="queryWm.search"
+									placeholder="批次号"
+									clearable
+									style="margin-right: 5px"
+								></el-input>
+								<el-button
+									type="primary"
+									icon="el-icon-search"
+									@click="paramsWmChange"
+								></el-button>
+								<el-button
+									type="primary"
+									@click="materialsChoses('wm')"
+									>选择物料</el-button
+								>
 								<el-button
 									type="primary"
 									@click="tomio"
@@ -610,16 +644,26 @@
 				<el-button @click="addMtaskInfoVisible = false">取消</el-button>
 			</el-footer>
 		</el-dialog>
+		<el-dialog title="选择物料" v-model="materialsVisible" width="90%">
+			<materials
+				style="height: 500px"
+				:materialType="materialType"
+				ref="materialsChose"
+				@choseChange="choseChange"
+			></materials>
+		</el-dialog>
 	</el-container>
 </template>
 
 <script>
 import saveDialog from "./worktask_form.vue";
 import showDrawer from "./mlog_drawer.vue";
+import materials from "./../mtm/materials.vue";
 export default {
 	components: {
 		saveDialog,
 		showDrawer,
+		materials,
 	},
 	data() {
 		return {
@@ -647,19 +691,50 @@ export default {
 			visibleDrawer: false,
 			dialogSave: false,
 			paramsHandover: {},
+			queryHandover: {
+				search: "",
+				material: "",
+			},
 			paramsWm: {},
+			queryWm: {
+				search: "",
+				material: "",
+			},
+			materialType: "wm",
 			mgroup: "",
 			mlogId: "",
 			mtaskDate: "",
 			material_out: "",
 			material_model: "",
 			queryMtaskState: false,
+			materialsVisible: false,
 		};
 	},
 	mounted() {
 		this.initDept();
 	},
 	methods: {
+		materialsChoses(str) {
+			this.materialType = str;
+			this.materialsVisible = true;
+		},
+		choseChange(data) {
+			if (this.materialType == "wm") {
+				this.queryWm.material = data;
+				this.$refs.table_wm.queryData(this.queryWm);
+			} else {
+				this.queryHandover.material = data;
+				this.$refs.table_handover.queryData(this.queryHandover);
+			}
+
+			this.materialsVisible = false;
+		},
+		queryHandoverChange() {
+			this.$refs.table_handover.queryData(this.queryHandover);
+		},
+		paramsWmChange() {
+			this.$refs.table_wm.queryData(this.queryWm);
+		},
 		mlog_revert(row) {
 			this.mlogHandleLoading = true;
 			this.$API.wpm.mlog.revert

src/views/wpm/mlog_dept6.vue

@@ -159,6 +159,24 @@
 							<div class="left-panel">
 								<span style="font-size: 14px">交接记录</span>
 							</div>
+							<div class="right-panel">
+								<el-input
+									v-model="queryHandover.search"
+									placeholder="批次号"
+									clearable
+									style="margin-right: 5px"
+								></el-input>
+								<el-button
+									type="primary"
+									icon="el-icon-search"
+									@click="queryHandoverChange"
+								></el-button>
+								<el-button
+									type="primary"
+									@click="materialsChoses('handover')"
+									>选择物料</el-button
+								>
+							</div>
 						</el-header>
 						<el-main>
 							<scTable
@@ -167,6 +185,7 @@
 								row-key="id"
 								stripe
 								:params="paramsHandover"
+								:query="queryHandover"
 							>
 								<el-table-column
 									label="送料日期"
@@ -235,6 +254,22 @@
 								<span style="font-size: 14px">车间库存</span>
 							</div>
 							<div class="right-panel">
+								<el-input
+									v-model="queryWm.search"
+									placeholder="批次号"
+									clearable
+									style="margin-right: 5px"
+								></el-input>
+								<el-button
+									type="primary"
+									icon="el-icon-search"
+									@click="paramsWmChange"
+								></el-button>
+								<el-button
+									type="primary"
+									@click="materialsChoses('wm')"
+									>选择物料</el-button
+								>
 								<el-button
 									type="primary"
 									@click="tomio"
@@ -255,6 +290,7 @@
 								:apiObj="apiObjWm"
 								row-key="id"
 								:params="paramsWm"
+								:query="queryWm"
 								stripe
 								hidePagination
 							>
@@ -303,13 +339,23 @@
 		@closed="visibleDrawer = false"
 	>
 	</showDrawer>
+	<el-dialog title="选择物料" v-model="materialsVisible" width="90%">
+		<materials
+			style="height: 500px"
+			:materialType="materialType"
+			ref="materialsChose"
+			@choseChange="choseChange"
+		></materials>
+	</el-dialog>
 </template>
 
 <script>
 import showDrawer from "./mlog_dept6_detail.vue";
+import materials from "./../mtm/materials.vue";
 export default {
 	components: {
 		showDrawer,
+		materials,
 	},
 	data() {
 		return {
@@ -326,7 +372,9 @@ export default {
 				34: "已终止",
 				40: "已提交",
 			},
+			wmaterials: [],
 			hideDo: true,
+			materialsVisible: false,
 			queryMtaskState: false,
 			apiObjWm: this.$API.wpm.wmaterial.list,
 			paramsMlog: {
@@ -336,9 +384,18 @@ export default {
 			paramsHandover: {
 				recive_dept__name: "6车间",
 			},
+			queryHandover: {
+				search: "",
+				material: "",
+			},
 			paramsWm: {
 				belong_dept__name: "6车间",
 				count__gte: 1,
+				page: 0,
+			},
+			queryWm: {
+				search: "",
+				material: "",
 			},
 			paramsMtask: {
 				mgroup__belong_dept__name: "6车间",
@@ -349,6 +406,9 @@ export default {
 				state__in: "",
 			},
 			mtaskId: "",
+			dataWm: [],
+			dataWmOrigin: [],
+			materialType: "wm",
 			visibleDrawer: false,
 		};
 	},
@@ -361,6 +421,27 @@ export default {
 		tomio() {
 			this.$router.push({ name: "halfgood_mio" });
 		},
+		materialsChoses(str) {
+			this.materialType = str;
+			this.materialsVisible = true;
+		},
+		choseChange(data) {
+			if (this.materialType == "wm") {
+				this.queryWm.material = data;
+				this.$refs.table_wm.queryData(this.queryWm);
+			} else {
+				this.queryHandover.material = data;
+				this.$refs.table_handover.queryData(this.queryHandover);
+			}
+
+			this.materialsVisible = false;
+		},
+		queryHandoverChange() {
+			this.$refs.table_handover.queryData(this.queryHandover);
+		},
+		paramsWmChange() {
+			this.$refs.table_wm.queryData(this.queryWm);
+		},
 		//点击任务
 		rowClick(row) {
 			let that = this;
@@ -392,6 +473,7 @@ export default {
 			this.$refs.table.queryData(this.queryMtask);
 		},
 		table_submit(row) {
+			let that = this;
 			let lengths = row.mlogs.length,
 				infoText = "";
 			if (lengths > 0) {
@@ -399,26 +481,27 @@ export default {
 			} else {
 				infoText = "该任务没有日志，确定提交吗？";
 			}
-			this.$confirm(infoText, "提示", {
+			that.$confirm(infoText, "提示", {
 				type: "warning",
 			}).then(() => {
-				this.$API.pm.mtask.submit
+				that.$API.pm.mtask.submit
 					.req(row.id)
 					.then((res) => {
-						this.$message.success("操作成功");
+						that.$message.success("操作成功");
-						this.$refs.table_mtask.refresh();
+						that.$refs.table_mtask.refresh();
-						this.mtaskClick(this.currentMtask);
+						that.mtaskClick(that.currentMtask);
 					})
 					.catch((err) => {});
 			});
 		},
 		handover_submit(row) {
-			this.$API.wpm.handover.submit
+			let that = this;
+			that.$API.wpm.handover.submit
 				.req(row.id)
 				.then((res) => {
-					this.$message.success("操作成功");
+					that.$message.success("操作成功");
-					this.$refs.table_handover.refresh();
+					that.$refs.table_handover.refresh();
-					this.$refs.table_wm.refresh();
+					that.$refs.table_wm.refresh();
 				})
 				.catch((err) => {});
 		},

src/views/wpm/mlog_dept7.vue

@@ -396,6 +396,24 @@
 							<div class="left-panel">
 								<span style="font-size: 14px">交接记录</span>
 							</div>
+							<div class="right-panel">
+								<el-input
+									v-model="queryHandover.search"
+									placeholder="批次号"
+									clearable
+									style="margin-right: 5px"
+								></el-input>
+								<el-button
+									type="primary"
+									icon="el-icon-search"
+									@click="queryHandoverChange"
+								></el-button>
+								<el-button
+									type="primary"
+									@click="materialsChoses('handover')"
+									>选择物料</el-button
+								>
+							</div>
 						</el-header>
 						<el-main>
 							<scTable
@@ -477,6 +495,22 @@
 								<span style="font-size: 14px">车间库存</span>
 							</div>
 							<div class="right-panel">
+								<el-input
+									v-model="queryWm.search"
+									placeholder="批次号"
+									clearable
+									style="margin-right: 5px"
+								></el-input>
+								<el-button
+									type="primary"
+									icon="el-icon-search"
+									@click="paramsWmChange"
+								></el-button>
+								<el-button
+									type="primary"
+									@click="materialsChoses('wm')"
+									>选择物料</el-button
+								>
 								<el-button
 									type="primary"
 									@click="tomio"
@@ -557,15 +591,25 @@
 			@closed="visibleDrawer = false"
 		>
 		</showDrawer>
+		<el-dialog title="选择物料" v-model="materialsVisible" width="90%">
+			<materials
+				style="height: 500px"
+				:materialType="materialType"
+				ref="materialsChose"
+				@choseChange="choseChange"
+			></materials>
+		</el-dialog>
 	</el-container>
 </template>
 <script>
 import saveDialog from "./worktask_form.vue";
 import showDrawer from "./mlog_drawer.vue";
+import materials from "./../mtm/materials.vue";
 export default {
 	components: {
 		saveDialog,
 		showDrawer,
+		materials,
 	},
 	data() {
 		return {
@@ -588,19 +632,50 @@ export default {
 			queryMtaskState: false,
 			apiObjHandover: null,
 			paramsHandover: {},
+			queryHandover: {
+				search: "",
+				material: "",
+			},
 			apiObjWm: null,
 			paramsWm: {},
+			queryWm: {
+				search: "",
+				material: "",
+			},
+			materialType: "wm",
 			mlogs: [],
 			mlogId: "",
 			mgroup: "",
 			material_out: "",
 			material_model: "",
+			materialsVisible: false,
 		};
 	},
 	mounted() {
 		this.initDept();
 	},
 	methods: {
+		materialsChoses(str) {
+			this.materialType = str;
+			this.materialsVisible = true;
+		},
+		choseChange(data) {
+			if (this.materialType == "wm") {
+				this.queryWm.material = data;
+				this.$refs.table_wm.queryData(this.queryWm);
+			} else {
+				this.queryHandover.material = data;
+				this.$refs.table_handover.queryData(this.queryHandover);
+			}
+
+			this.materialsVisible = false;
+		},
+		queryHandoverChange() {
+			this.$refs.table_handover.queryData(this.queryHandover);
+		},
+		paramsWmChange() {
+			this.$refs.table_wm.queryData(this.queryWm);
+		},
 		mlog_revert(row) {
 			this.mlogHandleLoading = true;
 			this.$API.wpm.mlog.revert