From f043a6a0a2232adf0d643bc37ac19010b8177f6b Mon Sep 17 00:00:00 2001
From: juzi <819872918@qq.com>
Date: Thu, 18 Jul 2024 11:17:04 +0800
Subject: [PATCH] 7.18

---
 .../monitoring/deviceParameters/index.vue     | 1229 +++++++++--------
 .../equipmentTraceability/index.vue           |   87 +-
 .../monitoring/materielDateFrom/index.vue     |  470 ++++---
 .../monitoring/processTraceability/index.vue  |  529 +++----
 .../rawMaterialTraceability/index.vue         |  446 +++---
 .../qualityInspectionRecord/dialogForm.vue    |  249 ++--
 .../quality/qualityInspectionRecord/index.vue |  189 +--
 .../quality/qualityScrapLog/add-or-updata.vue |  136 +-
 .../qualityScrapLog/detail-or-updata.vue      |  284 ----
 src/views/quality/qualityScrapLog/index.vue   |   31 +-
 10 files changed, 1727 insertions(+), 1923 deletions(-)
 delete mode 100644 src/views/quality/qualityScrapLog/detail-or-updata.vue

diff --git a/src/views/quality/monitoring/deviceParameters/index.vue b/src/views/quality/monitoring/deviceParameters/index.vue
index 1146b523..e728b035 100644
--- a/src/views/quality/monitoring/deviceParameters/index.vue
+++ b/src/views/quality/monitoring/deviceParameters/index.vue
@@ -6,663 +6,701 @@
 -->
 
 <template>
-  <div style="flex: 1; display: flex; background: #f2f4f9">
-    <div class="app-container" style="
+	<div style="flex: 1; display: flex; background: #f2f4f9">
+		<div
+			class="app-container"
+			style="
 				margin-right: 12px;
 				border-radius: 8px;
 				background: #fff;
 				padding: 0;
 			">
-      <div class="factory-list__selector" style="margin: 12px" title="点击切换工厂" @mouseenter="factoryListOpen = true"
-        @mouseleave="factoryListOpen = false">
-        {{ currentFactory?.label || '点我选择设备' }}
-        <div class="factory-list__wrapper" :class="{ open: factoryListOpen }">
-          <ul class="factory-list" v-if="sidebarContent.length" @click.prevent="factoryChangeHandler">
-            <li v-for="fc in sidebarContent" :key="fc.id" :data-value="fc.id" class="factory-list__item"
-              :class="{ 'is-current': fc.id == currentFactory?.id }">
-              <span>
-                {{ fc.label }}
-              </span>
-              <svg-icon v-if="fc.id == currentFactory?.id" icon-class="Confirm" style="height: 14px; width: 14px" />
-            </li>
-          </ul>
-          <div v-else style="color: #0008; width: 128px; text-align: center">
-            - 无 -
-          </div>
-        </div>
-      </div>
-      <!-- side bar  -->
-      <div class="side-bar__left" style="width: 240px; height: 100%">
-        <el-tree class="custom-tree-class" :data="currentFactory?.children" :props="treeProps" :empty-text="''"
-          icon-class="custom-icon-class" @node-click="handleSidebarItemClick">
-          <!-- <div class="custom-tree-node" slot-scope="{ node, data }">
+			<div
+				class="factory-list__selector"
+				style="margin: 12px"
+				title="点击切换工厂"
+				@mouseenter="factoryListOpen = true"
+				@mouseleave="factoryListOpen = false">
+				{{ currentFactory?.label || '点我选择设备' }}
+				<div class="factory-list__wrapper" :class="{ open: factoryListOpen }">
+					<ul
+						class="factory-list"
+						v-if="sidebarContent.length"
+						@click.prevent="factoryChangeHandler">
+						<li
+							v-for="fc in sidebarContent"
+							:key="fc.id"
+							:data-value="fc.id"
+							class="factory-list__item"
+							:class="{ 'is-current': fc.id == currentFactory?.id }">
+							<span>
+								{{ fc.label }}
+							</span>
+							<svg-icon
+								v-if="fc.id == currentFactory?.id"
+								icon-class="Confirm"
+								style="height: 14px; width: 14px" />
+						</li>
+					</ul>
+					<div v-else style="color: #0008; width: 128px; text-align: center">
+						- 无 -
+					</div>
+				</div>
+			</div>
+			<!-- side bar  -->
+			<div class="side-bar__left" style="width: 240px; height: 100%">
+				<el-tree
+					class="custom-tree-class"
+					:data="currentFactory?.children"
+					:props="treeProps"
+					:empty-text="''"
+					icon-class="custom-icon-class"
+					@node-click="handleSidebarItemClick">
+					<!-- <div class="custom-tree-node" slot-scope="{ node, data }">
 						<span class="icon"></span>
 						<span>{{ node.label }}</span>
 					</div> -->
-        </el-tree>
-      </div>
-    </div>
-    <div class="app-container equipment-process-amount" style="flex: 1; border-radius: 8px; background: #fff">
-      <!-- main area  -->
-      <div class="main-content" style="display: flex; flex-direction: column">
-        <SearchBar :formConfigs="searchBarFormConfig" ref="search-bar" @headBtnClick="handleSearchBarBtnClick"
-          @select-changed="handleSearchBarChanged" />
+				</el-tree>
+			</div>
+		</div>
+		<div
+			class="app-container equipment-process-amount"
+			style="flex: 1; border-radius: 8px; background: #fff">
+			<!-- main area  -->
+			<div class="main-content" style="display: flex; flex-direction: column">
+				<SearchBar
+					:formConfigs="searchBarFormConfig"
+					ref="search-bar"
+					@headBtnClick="handleSearchBarBtnClick"
+					@select-changed="handleSearchBarChanged" />
 
-        <el-row>
-          <el-col class="custom-tabs">
-            <div v-if="tableList.length" class="tables">
-              <div class="custom-table" v-for="table in tableList" :key="table.key">
-                <!-- {{ JSON.stringify(spanMethod) }} -->
-                <base-table :key="table.key + '__basetable'" :table-props="table.tableProps"
-                  :table-data="table.dataManager?.dataList ?? []" :span-method="spanMethod"
-                  @emitFun="(val) => handleEmitFun(table, val)"></base-table>
-                <pagination :key="table.key + '__pagination'" v-show="table.total > 0" :total="table.total"
-                  :page.sync="table.pageNo" :limit.sync="table.pageSize" :page-size="table.pageSize"
-                  :page-sizes="[1, 3, 5, 10, 20]" @pagination="
-						({ page, limit, current }) =>
-							getListFor(table, { page, limit, current })
-					" />
-              </div>
-            </div>
-            <div v-else class="no-data-bg">
-            </div>
-          </el-col>
-        </el-row>
+				<el-row>
+					<el-col class="custom-tabs">
+						<div v-if="tableList.length" class="tables">
+							<div
+								class="custom-table"
+								v-for="table in tableList"
+								:key="table.key">
+								<!-- {{ JSON.stringify(spanMethod) }} -->
+								<base-table
+									:key="table.key + '__basetable'"
+									:table-props="table.tableProps"
+									:table-data="table.dataManager?.dataList ?? []"
+									:span-method="spanMethod"
+									@emitFun="(val) => handleEmitFun(table, val)"></base-table>
+								<pagination
+									:key="table.key + '__pagination'"
+									v-show="table.total > 0"
+									:total="table.total"
+									:page.sync="table.pageNo"
+									:limit.sync="table.pageSize"
+									:page-size="table.pageSize"
+									:page-sizes="[1, 3, 5, 10, 20]"
+									@pagination="
+										({ page, limit, current }) =>
+											getListFor(table, { page, limit, current })
+									" />
+							</div>
+						</div>
+						<div v-else class="no-data-bg"></div>
+					</el-col>
+				</el-row>
 
-        <!-- <transition appear name="vvv" mode="out-in"></transition> -->
-      </div>
-    </div>
-  </div>
+				<!-- <transition appear name="vvv" mode="out-in"></transition> -->
+			</div>
+		</div>
+	</div>
 </template>
 
 <script>
 // import Graph from './graph.vue';
-import {
-  getWorkOrderList,
-  getTreeData
-} from '@/api/quality/deviceParameters';
+import { getWorkOrderList, getTreeData } from '@/api/quality/deviceParameters';
 export default {
-  name: 'EquipmentProcessAmount',
-  // components: { Graph },
-  props: {},
-  data() {
-    const now = new Date();
-    const [y, m, d] = [now.getFullYear(), now.getMonth(), now.getDate()];
-    const today = new Date(y, m, d, 0, 0, 0, 0).getTime();
-    const aWeekAgo = today - 3600 * 1000 * 24 * 7;
-    return {
-      renderKey: Math.random(),
-      factoryListOpen: false,
-      currentFactory: null,
-      factoryList: [
-        { name: '1', value: 1 },
-        { name: '2', value: 2 },
-        { name: '3', value: 3 },
-        { name: '4', value: 4 },
-        { name: '5', value: 5 },
-        { name: '6', value: 6 },
-      ],
-      sidebarContent: [
-        // {
-        // 	id: 'fc1',
-        // 	name: '工厂',
-        // 	lines: [
-        // 		{
-        // 			name: '产线1',
-        // 			id: 'pl1',
-        // 			sections: [
-        // 				{
-        // 					name: '工段1',
-        // 					id: 'pl1ws1',
-        // 					equipments: [
-        // 						{
-        // 							name: '设备1',
-        // 							id: 'pl1ws1--eq1',
-        // 						},
-        // 						{
-        // 							name: '设备2',
-        // 							id: 'pl1ws1--eq2',
-        // 						},
-        // 						{
-        // 							name: '设备3',
-        // 							id: 'pl1ws1--eq3',
-        // 						},
-        // 					],
-        // 				},
-        // 				{
-        // 					name: '工段2',
-        // 					id: 'pl1ws2',
-        // 					equipments: [
-        // 						{
-        // 							name: '设备1',
-        // 							id: 'pl2ws1--eq1',
-        // 						},
-        // 						{
-        // 							name: '设备2',
-        // 							id: 'pl2ws1--eq2',
-        // 						},
-        // 						{
-        // 							name: '设备3',
-        // 							id: 'pl2ws1--eq3',
-        // 						},
-        // 					],
-        // 				},
-        // 				{
-        // 					name: '工段3',
-        // 					id: 'pl1ws3',
-        // 					equipments: [
-        // 						{
-        // 							name: '设备1',
-        // 							id: 'pl3ws1--eq1',
-        // 						},
-        // 						{
-        // 							name: '设备2',
-        // 							id: 'pl3ws1--eq2',
-        // 						},
-        // 						{
-        // 							name: '设备3',
-        // 							id: 'pl3ws1--eq3',
-        // 						},
-        // 					],
-        // 				},
-        // 			],
-        // 		},
-        // 		{
-        // 			name: '产线2',
-        // 			id: 'pl2',
-        // 			sections: [
-        // 				{
-        // 					name: '工段1',
-        // 					id: 'pl2ws1',
-        // 				},
-        // 				{
-        // 					name: '工段2',
-        // 					id: 'pl2ws2',
-        // 				},
-        // 				{
-        // 					name: '工段3',
-        // 					id: 'pl2ws3',
-        // 				},
-        // 			],
-        // 		},
-        // 	],
-        // },
-      ],
-      tableList: [],
-      queryParams: {
-        id: null,
-        time: [new Date(aWeekAgo), new Date(today)],
-      },
-      activeName: 'table',
-      searchBarFormConfig: [
-        {
-          type: 'select',
-          label: '工单',
-          selectOptions: [],
-          labelField: 'name',
-          valueField: 'id',
-          param: 'workOrderId',
-          onchange: true,
-        },
-        {
-          type: 'datePicker',
-          label: '时间段',
-          dateType: 'daterange', // datetimerange
-          format: 'yyyy-MM-dd',
-          valueFormat: 'yyyy-MM-dd HH:mm:ss',
-          rangeSeparator: '-',
-          startPlaceholder: '开始日期',
-          endPlaceholder: '结束日期',
-          defaultTime: ['00:00:00', '23:59:59'],
-          param: 'timeVal',
-          width: 350,
-        },
-        {
-          type: 'button',
-          btnName: '查询',
-          name: 'search',
-          color: 'primary',
-        },
-        // {
-        // 	type: 'separate',
-        // },
-        // {
-        // 	type: 'button',
-        // 	btnName: '表格',
-        // 	name: 'table',
-        // 	plain: true,
-        // 	color: 'success',
-        // },
-        // {
-        // 	type: 'button',
-        // 	btnName: '图表',
-        // 	name: 'graph',
-        // 	plain: true,
-        // 	color: 'warning',
-        // },
-        // {
-        // 	type: this.$auth.hasPermi('base:equipment-group:export') ? 'button' : '',
-        // 	btnName: '导出',
-        // 	name: 'export',
-        // 	color: 'warning',
-        // },
-      ],
-      tableProps: [
-        { prop: 'lineName', label: '产线' },
-        { prop: 'sectionName', label: '工段' },
-        // { prop: 'externalCode', label: '设备编码' },
-        { prop: 'equipmentId', label: '设备编码' },
-        { prop: 'equipmentName', label: '设备名称' },
-        { prop: 'totalQuantity', label: '加工数量' },
-      ],
-      mode: 'table', // table | graph
-      queryParams: {
-        // pageNo: 1,
-        // pageSize: 999,
-        recordTime: [],
-        equipmentId: null,
-        lineId: null,
-        sectionId: null,
-        productId: null,
-      },
-      list: [],
-      treeProps: {
-        children: 'children',
-        label: 'label',
-      },
-    };
-  },
-  // mounted() {
-  // },
-  computed: {
-    // id() {
-    //   return this.$route.params.equipmentId;
-    // },
-    // code() {
-    //   return this.$route.params.equipmentCode;
-    // },
-    // name() {
-    //   return this.$route.params.equipmentName;
-    // },
-  },
-  mounted() {
-    this.getDict()
-    // if (this.id) this.$set(this.queryParams, 'id', this.id);
-    // if (this.code)
-    //   this.$set(this.searchBarFormConfig[0], 'defaultSelect', this.code);
-    // if (this.name)
-    //   this.$set(this.searchBarFormConfig[1], 'defaultSelect', this.name);
+	name: 'EquipmentProcessAmount',
+	// components: { Graph },
+	props: {},
+	data() {
+		const now = new Date();
+		const [y, m, d] = [now.getFullYear(), now.getMonth(), now.getDate()];
+		const today = new Date(y, m, d, 0, 0, 0, 0).getTime();
+		const aWeekAgo = today - 3600 * 1000 * 24 * 7;
+		return {
+			renderKey: Math.random(),
+			factoryListOpen: false,
+			currentFactory: null,
+			factoryList: [
+				{ name: '1', value: 1 },
+				{ name: '2', value: 2 },
+				{ name: '3', value: 3 },
+				{ name: '4', value: 4 },
+				{ name: '5', value: 5 },
+				{ name: '6', value: 6 },
+			],
+			sidebarContent: [
+				// {
+				// 	id: 'fc1',
+				// 	name: '工厂',
+				// 	lines: [
+				// 		{
+				// 			name: '产线1',
+				// 			id: 'pl1',
+				// 			sections: [
+				// 				{
+				// 					name: '工段1',
+				// 					id: 'pl1ws1',
+				// 					equipments: [
+				// 						{
+				// 							name: '设备1',
+				// 							id: 'pl1ws1--eq1',
+				// 						},
+				// 						{
+				// 							name: '设备2',
+				// 							id: 'pl1ws1--eq2',
+				// 						},
+				// 						{
+				// 							name: '设备3',
+				// 							id: 'pl1ws1--eq3',
+				// 						},
+				// 					],
+				// 				},
+				// 				{
+				// 					name: '工段2',
+				// 					id: 'pl1ws2',
+				// 					equipments: [
+				// 						{
+				// 							name: '设备1',
+				// 							id: 'pl2ws1--eq1',
+				// 						},
+				// 						{
+				// 							name: '设备2',
+				// 							id: 'pl2ws1--eq2',
+				// 						},
+				// 						{
+				// 							name: '设备3',
+				// 							id: 'pl2ws1--eq3',
+				// 						},
+				// 					],
+				// 				},
+				// 				{
+				// 					name: '工段3',
+				// 					id: 'pl1ws3',
+				// 					equipments: [
+				// 						{
+				// 							name: '设备1',
+				// 							id: 'pl3ws1--eq1',
+				// 						},
+				// 						{
+				// 							name: '设备2',
+				// 							id: 'pl3ws1--eq2',
+				// 						},
+				// 						{
+				// 							name: '设备3',
+				// 							id: 'pl3ws1--eq3',
+				// 						},
+				// 					],
+				// 				},
+				// 			],
+				// 		},
+				// 		{
+				// 			name: '产线2',
+				// 			id: 'pl2',
+				// 			sections: [
+				// 				{
+				// 					name: '工段1',
+				// 					id: 'pl2ws1',
+				// 				},
+				// 				{
+				// 					name: '工段2',
+				// 					id: 'pl2ws2',
+				// 				},
+				// 				{
+				// 					name: '工段3',
+				// 					id: 'pl2ws3',
+				// 				},
+				// 			],
+				// 		},
+				// 	],
+				// },
+			],
+			tableList: [],
+			queryParams: {
+				id: null,
+				time: [new Date(aWeekAgo), new Date(today)],
+			},
+			activeName: 'table',
+			searchBarFormConfig: [
+				{
+					type: 'select',
+					label: '工单',
+					selectOptions: [],
+					labelField: 'name',
+					valueField: 'id',
+					param: 'workOrderId',
+					onchange: true,
+					filterable: true,
+				},
+				{
+					type: 'datePicker',
+					label: '时间段',
+					dateType: 'daterange', // datetimerange
+					format: 'yyyy-MM-dd',
+					valueFormat: 'yyyy-MM-dd HH:mm:ss',
+					rangeSeparator: '-',
+					startPlaceholder: '开始日期',
+					endPlaceholder: '结束日期',
+					defaultTime: ['00:00:00', '23:59:59'],
+					param: 'timeVal',
+					width: 350,
+				},
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+				{
+					type: 'separate',
+				},
+				// {
+				// 	type: 'button',
+				// 	btnName: '表格',
+				// 	name: 'table',
+				// 	plain: true,
+				// 	color: 'success',
+				// },
+				// {
+				// 	type: 'button',
+				// 	btnName: '图表',
+				// 	name: 'graph',
+				// 	plain: true,
+				// 	color: 'warning',
+				// },
+				{
+					type: this.$auth.hasPermi('base:equipment-group:export')
+						? 'button'
+						: '',
+					btnName: '导出',
+					name: 'export',
+					plain: true,
+					color: 'success',
+				},
+			],
+			tableProps: [
+				{ prop: 'lineName', label: '产线' },
+				{ prop: 'sectionName', label: '工段' },
+				// { prop: 'externalCode', label: '设备编码' },
+				{ prop: 'equipmentId', label: '设备编码' },
+				{ prop: 'equipmentName', label: '设备名称' },
+				{ prop: 'totalQuantity', label: '加工数量' },
+			],
+			mode: 'table', // table | graph
+			queryParams: {
+				// pageNo: 1,
+				// pageSize: 999,
+				recordTime: [],
+				equipmentId: null,
+				lineId: null,
+				sectionId: null,
+				productId: null,
+			},
+			list: [],
+			treeProps: {
+				children: 'children',
+				label: 'label',
+			},
+		};
+	},
+	// mounted() {
+	// },
+	computed: {
+		// id() {
+		//   return this.$route.params.equipmentId;
+		// },
+		// code() {
+		//   return this.$route.params.equipmentCode;
+		// },
+		// name() {
+		//   return this.$route.params.equipmentName;
+		// },
+	},
+	mounted() {
+		this.getDict();
+		// if (this.id) this.$set(this.queryParams, 'id', this.id);
+		// if (this.code)
+		//   this.$set(this.searchBarFormConfig[0], 'defaultSelect', this.code);
+		// if (this.name)
+		//   this.$set(this.searchBarFormConfig[1], 'defaultSelect', this.name);
 
-    // this.handleResponse();
-  },
-  methods: {
-    handleSearchBarChanged({ param, value }) {
-      if (!value) {
-        this.formConfig[0].selectOptions = [];
-        return;
-      }
-      switch (param) {
-        case 'workOrderId':
-          this.getTree(value)
-          break;
-      }
-    },
-    getDict() {
-      // 获取产品的属性列表
-      // getCustomerList().then((response) => {
-      //   console.log(response);
-      //   this.customerList = response.data
-      //   // this.listQuery.total = response.data.total;
-      // })
-      // getModelList().then((response) => {
-      //   console.log(response);
-      //   this.modelList = response.data
-      //   // this.listQuery.total = response.data.total;
-      // })
-      getWorkOrderList().then((res) => {
-        console.log(res);
-        // console.log(response);
-        this.searchBarFormConfig[0].selectOptions = res.data.map((item) => {
-          return {
-            name: item.name,
-            id: item.id
-          }
-        })
-        // console.log(this.formConfig[0].selectOptions);
-        // this.listQuery.total = response.data.total;
-      })
-    },
-    buildProps(table) {
-      console.log('building props', table);
-      // 通过 otherList 来构建 props
-      const { otherList } = table;
-      const props = [
-        {
-          // type: 'index',
-          width: 48,
-          prop: 'index',
-          label: '序号',
-        },
-        {
-          width: 160,
-          prop: 'time',
-          label: '时间',
-        },
-        {
-          width: 200,
-          prop: 'plcCode',
-          label: 'PLC编码',
-        },
-      ];
-      const firstLineData = {
-        index: '参考值： [最小]-[最大][/标准]',
-        time: null, // 此处必须是空白
-        plcCode: null, // 此处必须是空白
-      };
-      otherList.forEach((item) => {
-        props.push({
-          label: item.name,
-          prop: item.name,
-          width: 128,
-        });
-        firstLineData[item.name] = `${item.minValue ?? ''}-${item.maxValue ?? ''
-          }${item.defaultValue != null ? '/' + item.defaultValue : ''}`;
-      });
-      return { props, firstLineData };
-    },
+		// this.handleResponse();
+	},
+	methods: {
+		handleSearchBarChanged({ param, value }) {
+			if (!value) {
+				this.formConfig[0].selectOptions = [];
+				return;
+			}
+			switch (param) {
+				case 'workOrderId':
+					this.getTree(value);
+					break;
+			}
+		},
+		getDict() {
+			// 获取产品的属性列表
+			// getCustomerList().then((response) => {
+			//   console.log(response);
+			//   this.customerList = response.data
+			//   // this.listQuery.total = response.data.total;
+			// })
+			// getModelList().then((response) => {
+			//   console.log(response);
+			//   this.modelList = response.data
+			//   // this.listQuery.total = response.data.total;
+			// })
+			getWorkOrderList().then((res) => {
+				console.log(res);
+				// console.log(response);
+				this.searchBarFormConfig[0].selectOptions = res.data.map((item) => {
+					return {
+						name: item.name,
+						id: item.id,
+					};
+				});
+				// console.log(this.formConfig[0].selectOptions);
+				// this.listQuery.total = response.data.total;
+			});
+		},
+		buildProps(table) {
+			console.log('building props', table);
+			// 通过 otherList 来构建 props
+			const { otherList } = table;
+			const props = [
+				{
+					// type: 'index',
+					width: 48,
+					prop: 'index',
+					label: '序号',
+				},
+				{
+					width: 160,
+					prop: 'time',
+					label: '时间',
+				},
+				{
+					width: 200,
+					prop: 'plcCode',
+					label: 'PLC编码',
+				},
+			];
+			const firstLineData = {
+				index: '参考值： [最小]-[最大][/标准]',
+				time: null, // 此处必须是空白
+				plcCode: null, // 此处必须是空白
+			};
+			otherList.forEach((item) => {
+				props.push({
+					label: item.name,
+					prop: item.name,
+					width: 128,
+				});
+				firstLineData[item.name] = `${item.minValue ?? ''}-${
+					item.maxValue ?? ''
+				}${item.defaultValue != null ? '/' + item.defaultValue : ''}`;
+			});
+			return { props, firstLineData };
+		},
 
-    handleResponse(response) {
-      const { code, data } = response;
-      if (code == 0) {
-        // 处理一个表格
-        data.forEach((table, index) => {
-          console.log('handle index:', index, table);
-          const { props: tableProps, firstLineData } = this.buildProps(table);
-          this.$set(this.tableList, index, {
-            key: 'base-table__key__' + index,
-            tableProps,
-            list: [firstLineData],
-            dataManager: null,
-            pageNo: 1,
-            pageSize: 5,
-            total: 0,
-          });
+		handleResponse(response) {
+			const { code, data } = response;
+			if (code == 0) {
+				// 处理一个表格
+				data.forEach((table, index) => {
+					console.log('handle index:', index, table);
+					const { props: tableProps, firstLineData } = this.buildProps(table);
+					this.$set(this.tableList, index, {
+						key: 'base-table__key__' + index,
+						tableProps,
+						list: [firstLineData],
+						dataManager: null,
+						pageNo: 1,
+						pageSize: 5,
+						total: 0,
+					});
 
-          // 处理某一表格的各个行
-          const { data } = table;
-          if (data) {
-            data.forEach((row, idx) => {
-              const listItem = {
-                index: idx + 1,
-                time: moment(+row.time).format('YYYY-MM-DD HH:mm:ss'),
-                plcCode: row.plcCode,
-              };
-              row.data.forEach((column) => {
-                listItem[column.dynamicName] = column.dynamicValue;
-              });
-              this.tableList[index].list.push(listItem);
-              this.tableList[index].total++;
-            });
+					// 处理某一表格的各个行
+					const { data } = table;
+					if (data) {
+						data.forEach((row, idx) => {
+							const listItem = {
+								index: idx + 1,
+								time: moment(+row.time).format('YYYY-MM-DD HH:mm:ss'),
+								plcCode: row.plcCode,
+							};
+							row.data.forEach((column) => {
+								listItem[column.dynamicName] = column.dynamicValue;
+							});
+							this.tableList[index].list.push(listItem);
+							this.tableList[index].total++;
+						});
 
-            // 处理分页
-            const { pageNo, pageSize, list } = this.tableList[index];
-            this.tableList[index].dataManager = new LocalDataManager(
-              list,
-              pageNo,
-              pageSize
-            );
-          }
-        });
-      }
-    },
+						// 处理分页
+						const { pageNo, pageSize, list } = this.tableList[index];
+						this.tableList[index].dataManager = new LocalDataManager(
+							list,
+							pageNo,
+							pageSize
+						);
+					}
+				});
+			}
+		},
 
-    spanMethod({ row, column, rowIndex, columnIndex }) {
-      if (rowIndex == 0 && columnIndex == 0) {
-        return [1, 3];
-      } else if (rowIndex == 0 && (columnIndex == 1 || columnIndex == 2)) {
-        return [0, 0];
-      }
-      return [1, 1];
-    },
+		spanMethod({ row, column, rowIndex, columnIndex }) {
+			if (rowIndex == 0 && columnIndex == 0) {
+				return [1, 3];
+			} else if (rowIndex == 0 && (columnIndex == 1 || columnIndex == 2)) {
+				return [0, 0];
+			}
+			return [1, 1];
+		},
 
-    /** 查询 */
-    async handleQuery() {
-      this.handleResponse(
-        await this.$axios({
-          url: '/monitoring/equipment-monitor/runLog',
-          method: 'get',
-          params: this.queryParams,
-        })
-      );
-    },
+		/** 查询 */
+		async handleQuery() {
+			this.handleResponse(
+				await this.$axios({
+					url: '/monitoring/equipment-monitor/runLog',
+					method: 'get',
+					params: this.queryParams,
+				})
+			);
+		},
 
-    async handleSearchBarBtnClick({ btnName, timeVal }) {
-      if (timeVal && timeVal.length > 0) {
-        this.queryParams.time = timeVal;
-      } else {
-        this.queryParams.time = [];
-      }
-      await this.handleQuery();
-    },
+		async handleSearchBarBtnClick({ btnName, timeVal }) {
+			if (timeVal && timeVal.length > 0) {
+				this.queryParams.time = timeVal;
+			} else {
+				this.queryParams.time = [];
+			}
+			await this.handleQuery();
+		},
 
-    handleEmitFun(table, val) {
-      console.log('table val', table, val);
-    },
+		handleEmitFun(table, val) {
+			console.log('table val', table, val);
+		},
 
-    /** 为某个 table 获取 list 数据 */
-    getListFor(table, { page, limit, current }) {
-      console.log('get list for', table, { page, limit, current });
-      table.dataManager.pageNo = page ?? current;
-      table.dataManager.pageSize = limit;
-    },
-    /** build side bar tree */
-    buildTree(data) {
-      data.forEach((factory) => {
-        this.$set(factory, 'label', factory.name);
-        this.$set(factory, 'type', '工厂');
-        delete factory.name;
-        // factory.children = factory.lines;
-        // delete factory.lines;
-        factory.children?.forEach((line) => {
-          this.$set(line, 'label', line.name);
-          this.$set(line, 'type', '产线');
-          delete line.name;
-          // line.children = line.sections;
-          // delete line.sections;
-          line.children?.forEach((ws) => {
-            this.$set(ws, 'label', ws.name);
-            this.$set(ws, 'type', '工段');
-            delete ws.name;
-            // ws.children = ws.equipments;
-            // delete ws.equipments;
-            ws.children?.forEach((eq) => {
-              this.$set(eq, 'label', eq.name);
-              this.$set(eq, 'type', '设备');
-              delete eq.name;
-            });
-          });
-        });
-      });
-    },
+		/** 为某个 table 获取 list 数据 */
+		getListFor(table, { page, limit, current }) {
+			console.log('get list for', table, { page, limit, current });
+			table.dataManager.pageNo = page ?? current;
+			table.dataManager.pageSize = limit;
+		},
+		/** build side bar tree */
+		buildTree(data) {
+			data.forEach((factory) => {
+				this.$set(factory, 'label', factory.name);
+				this.$set(factory, 'type', '工厂');
+				delete factory.name;
+				// factory.children = factory.lines;
+				// delete factory.lines;
+				factory.children?.forEach((line) => {
+					this.$set(line, 'label', line.name);
+					this.$set(line, 'type', '产线');
+					delete line.name;
+					// line.children = line.sections;
+					// delete line.sections;
+					line.children?.forEach((ws) => {
+						this.$set(ws, 'label', ws.name);
+						this.$set(ws, 'type', '工段');
+						delete ws.name;
+						// ws.children = ws.equipments;
+						// delete ws.equipments;
+						ws.children?.forEach((eq) => {
+							this.$set(eq, 'label', eq.name);
+							this.$set(eq, 'type', '设备');
+							delete eq.name;
+						});
+					});
+				});
+			});
+		},
 
-    async getTree(id) {
-      getTreeData({id:id}).then((res) => {
-        console.log(res.data);
-        this.sidebarContent = res.data;
-        this.buildTree(res.data);
-        console.log('tree', this.sidebarContent);
-        // console.log(this.formConfig[0].selectOptions);
-        // this.listQuery.total = response.data.total;
-      })
-      // const { data } = await this.$axios('/base/core-factory/getTreeByWorkOrder');
-      // console.log(data)
+		async getTree(id) {
+			getTreeData({ id: id }).then((res) => {
+				console.log(res.data);
+				this.sidebarContent = res.data;
+				this.buildTree(res.data);
+				console.log('tree', this.sidebarContent);
+				// console.log(this.formConfig[0].selectOptions);
+				// this.listQuery.total = response.data.total;
+			});
+			// const { data } = await this.$axios('/base/core-factory/getTreeByWorkOrder');
+			// console.log(data)
+		},
 
-    },
+		handleTabClick(tab, event) {
+			if (tab.name == 'graph') this.renderKey = Math.random();
+		},
 
-    handleTabClick(tab, event) {
-      if (tab.name == 'graph') this.renderKey = Math.random();
-    },
+		factoryChangeHandler(event) {
+			this.factoryListOpen = false;
+			const fcId = event.target.dataset.value;
+			this.handleSidebarItemClick({ id: fcId, type: '工厂' });
+			this.currentFactory = this.sidebarContent.find((item) => item.id == fcId);
+		},
 
-    factoryChangeHandler(event) {
-      this.factoryListOpen = false;
-      const fcId = event.target.dataset.value;
-      this.handleSidebarItemClick({ id: fcId, type: '工厂' });
-      this.currentFactory = this.sidebarContent.find((item) => item.id == fcId);
-    },
+		handleSidebarItemClick({ label, id, type }) {
+			this.equipmentId = id;
+			console.log('label clicked!', label, id, type);
+			switch (type) {
+				case '设备':
+					this.queryParams.equipmentId = id;
+					break;
+				case '工段':
+					this.queryParams.equipmentId = null;
+					this.queryParams.sectionId = id;
+					break;
+				case '产线':
+					this.queryParams.equipmentId = null;
+					this.queryParams.sectionId = null;
+					this.queryParams.lineId = id;
+					break;
+				case '工厂':
+					this.queryParams.equipmentId = null;
+					this.queryParams.sectionId = null;
+					this.queryParams.lineId = null;
+					break;
+			}
+		},
 
-    handleSidebarItemClick({ label, id, type }) {
-      this.equipmentId = id
-      console.log('label clicked!', label, id, type);
-      switch (type) {
-        case '设备':
-          this.queryParams.equipmentId = id;
-          break;
-        case '工段':
-          this.queryParams.equipmentId = null;
-          this.queryParams.sectionId = id;
-          break;
-        case '产线':
-          this.queryParams.equipmentId = null;
-          this.queryParams.sectionId = null;
-          this.queryParams.lineId = id;
-          break;
-        case '工厂':
-          this.queryParams.equipmentId = null;
-          this.queryParams.sectionId = null;
-          this.queryParams.lineId = null;
-          break;
-      }
-    },
-
-    handleEmitFun() { },
-  },
+		handleEmitFun() {},
+	},
 };
 </script>
 
 <style scoped>
-.side-bar__left>>>.is-current {
-  padding: 0;
-  color: #111;
-  /* background: #f2f4f7; */
-  background: #e3efff !important;
+.side-bar__left >>> .is-current {
+	padding: 0;
+	color: #111;
+	/* background: #f2f4f7; */
+	background: #e3efff !important;
 }
 
 .vvv-enter,
 .vvv-leave-to {
-  /* transform: translateY(24px) scaleY(0); */
-  transform: translateY(24px);
-  opacity: 0;
+	/* transform: translateY(24px) scaleY(0); */
+	transform: translateY(24px);
+	opacity: 0;
 }
 
 .vvv-enter-active,
 .vvv-leave-active {
-  transition: all 0.3s ease-out;
+	transition: all 0.3s ease-out;
 }
 
 .vvv-enter-to,
 .vvv-leave {
-  /* transform: translateY(0) scaleY(1); */
-  transform: translateY(0);
+	/* transform: translateY(0) scaleY(1); */
+	transform: translateY(0);
 }
 
-.custom-tabs>>>.el-tabs__header {
-  margin-bottom: 8px;
-  display: inline-block;
-  transform: translateY(-12px);
+.custom-tabs >>> .el-tabs__header {
+	margin-bottom: 8px;
+	display: inline-block;
+	transform: translateY(-12px);
 }
 
-.custom-tabs>>>.el-tabs__item {
-  padding-left: 0px !important;
-  padding-right: 0px !important;
-  line-height: 36px !important;
-  height: 36px;
+.custom-tabs >>> .el-tabs__item {
+	padding-left: 0px !important;
+	padding-right: 0px !important;
+	line-height: 36px !important;
+	height: 36px;
 }
 
 .factory-list__selector {
-  position: relative;
-  height: 36px;
-  font-size: 16px;
-  line-height: 36px;
-  padding-left: 28px;
-  background: url(../../../../assets/images/factory-icon.png) 0 / 10% no-repeat;
+	position: relative;
+	height: 36px;
+	font-size: 16px;
+	line-height: 36px;
+	padding-left: 28px;
+	background: url(../../../../assets/images/factory-icon.png) 0 / 10% no-repeat;
 }
 
 .factory-list__selector:hover {
-  cursor: pointer;
-  color: #0008;
+	cursor: pointer;
+	color: #0008;
 }
 
 .factory-list__selector::after {
-  /* content: ''; */
-  position: absolute;
-  top: 16px;
-  right: 12px;
-  display: inline-block;
-  width: 8px;
-  height: 8px;
-  /* background: #5c5c5c; */
-  border-color: #000;
-  border-width: 4px;
-  border-style: solid;
-  border-top-color: transparent;
-  border-right-color: transparent;
-  border-bottom-color: transparent;
+	/* content: ''; */
+	position: absolute;
+	top: 16px;
+	right: 12px;
+	display: inline-block;
+	width: 8px;
+	height: 8px;
+	/* background: #5c5c5c; */
+	border-color: #000;
+	border-width: 4px;
+	border-style: solid;
+	border-top-color: transparent;
+	border-right-color: transparent;
+	border-bottom-color: transparent;
 }
 
 .factory-list__selector:hover::after {
-  /* cursor: pointer; */
-  border-left-color: #0008;
+	/* cursor: pointer; */
+	border-left-color: #0008;
 }
 
 .factory-list__wrapper {
-  visibility: hidden;
-  position: absolute;
-  background: #fff;
-  box-shadow: 0 0 32px 10px #0002;
-  border-radius: 8px;
-  top: 36px;
-  left: 90px;
-  /* max-width: 128px; */
-  height: auto;
-  width: auto;
-  white-space: nowrap;
-  overflow: hidden;
-  /* transition: all 0.3s ease-out; */
-  z-index: 1000;
+	visibility: hidden;
+	position: absolute;
+	background: #fff;
+	box-shadow: 0 0 32px 10px #0002;
+	border-radius: 8px;
+	top: 36px;
+	left: 90px;
+	/* max-width: 128px; */
+	height: auto;
+	width: auto;
+	white-space: nowrap;
+	overflow: hidden;
+	/* transition: all 0.3s ease-out; */
+	z-index: 1000;
 }
 
 .factory-list__wrapper.open {
-  visibility: visible;
+	visibility: visible;
 }
 
 ul,
 li {
-  margin: 0;
-  padding: 0;
-  list-style: none;
+	margin: 0;
+	padding: 0;
+	list-style: none;
 }
 
 .factory-list {
-  color: #0008;
-  max-height: 240px;
-  overflow-y: auto;
+	color: #0008;
+	max-height: 240px;
+	overflow-y: auto;
 }
 
 .factory-list__item {
-  font-size: 16px;
-  line-height: 1;
-  padding: 8px 16px 8px 16px;
-  min-width: 128px;
-  position: relative;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
+	font-size: 16px;
+	line-height: 1;
+	padding: 8px 16px 8px 16px;
+	min-width: 128px;
+	position: relative;
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
 }
 
 .factory-list__item:hover,
 .factory-list__item.is-current {
-  background: #e3efff;
-  color: #0b58ff;
+	background: #e3efff;
+	color: #0b58ff;
 }
 
 /* .factory-list__item.is-current::after {
@@ -673,42 +711,47 @@ li {
 	font-weight: bold;
 } */
 
-.custom-tree-class>>>.el-tree-node__content {
-  width: 100%;
-  height: auto !important;
-  padding: 8px 12px !important;
+.custom-tree-class >>> .el-tree-node__content {
+	width: 100%;
+	height: auto !important;
+	padding: 8px 12px !important;
 }
 
-.custom-tree-class>>>.el-tree-node__content:hover {
-  background: #e3efff;
+.custom-tree-class >>> .el-tree-node__content:hover {
+	background: #e3efff;
 }
 
-.custom-tree-class>>>.el-tree-node__children .el-tree-node__content {
-  padding: 8px 18px !important;
+.custom-tree-class >>> .el-tree-node__children .el-tree-node__content {
+	padding: 8px 18px !important;
 }
 
-.custom-tree-class>>>.el-tree-node__children .el-tree-node__children .el-tree-node__content {
-  padding: 8px 24px !important;
+.custom-tree-class
+	>>> .el-tree-node__children
+	.el-tree-node__children
+	.el-tree-node__content {
+	padding: 8px 24px !important;
 }
 </style>
 
 <style>
 .custom-icon-class {
-  margin-right: 8px;
-  width: 20px;
-  height: 20px;
-  background: url('../../../../assets/images/Qian.png') center center / contain no-repeat;
+	margin-right: 8px;
+	width: 20px;
+	height: 20px;
+	background: url('../../../../assets/images/Qian.png') center center / contain
+		no-repeat;
 }
 
 .custom-icon-class.el-tree-node__expand-icon.expanded {
-  transform: unset;
+	transform: unset;
 }
 
 .el-tree-node__children .custom-icon-class {
-  background: url('../../../../assets/images/tree-icon-2.png') 100% / contain no-repeat;
+	background: url('../../../../assets/images/tree-icon-2.png') 100% / contain
+		no-repeat;
 }
 
 .el-tree-node__children .el-tree-node__children .custom-icon-class {
-  background: unset;
+	background: unset;
 }
 </style>
diff --git a/src/views/quality/monitoring/equipmentTraceability/index.vue b/src/views/quality/monitoring/equipmentTraceability/index.vue
index c88a7f60..77e101eb 100644
--- a/src/views/quality/monitoring/equipmentTraceability/index.vue
+++ b/src/views/quality/monitoring/equipmentTraceability/index.vue
@@ -186,16 +186,16 @@ export default {
 						},
 					],
 				},
-				{
-					prop: 'oee',
-					label: 'OEE',
-					filter: (val) => (val != null ? +val.toFixed(3) : '-'),
-				},
-				{
-					prop: 'teep',
-					label: 'TEEP',
-					filter: (val) => (val != null ? +val.toFixed(3) : '-'),
-				},
+				// {
+				// 	prop: 'oee',
+				// 	label: 'OEE',
+				// 	filter: (val) => (val != null ? +val.toFixed(3) : '-'),
+				// },
+				// {
+				// 	prop: 'teep',
+				// 	label: 'TEEP',
+				// 	filter: (val) => (val != null ? +val.toFixed(3) : '-'),
+				// },
 				// {
 				// 	_action: 'view-trend',
 				// 	label: '趋势',
@@ -230,8 +230,9 @@ export default {
 					type: 'select',
 					label: '工单',
 					placeholder: '请选择工单',
-          param: 'workOrderId',
+					param: 'workOrderId',
 					selectOptions: [],
+					filterable: true,
 				},
 				// {
 				// 	type: 'select',
@@ -252,20 +253,20 @@ export default {
 				// 	],
 				// 	index: 2,
 				// 	extraOptions: [
-						{
-							// parent: 'dateFilterType',
-							// 时间段选择
-							type: 'datePicker',
-							// label: '时间段',
-							dateType: 'daterange',
-							format: 'yyyy-MM-dd',
-							valueFormat: 'yyyy-MM-dd HH:mm:ss',
-							defaultTime: ['00:00:00', '00:00:00'],
-							rangeSeparator: '-',
-							startPlaceholder: '开始时间',
-							endPlaceholder: '结束时间',
-							param: 'timerange',
-						},
+				{
+					// parent: 'dateFilterType',
+					// 时间段选择
+					type: 'datePicker',
+					label: '时间段',
+					dateType: 'daterange',
+					format: 'yyyy-MM-dd',
+					valueFormat: 'yyyy-MM-dd HH:mm:ss',
+					defaultTime: ['00:00:00', '00:00:00'],
+					rangeSeparator: '-',
+					startPlaceholder: '开始时间',
+					endPlaceholder: '结束时间',
+					param: 'timerange',
+				},
 				// 		{
 				// 			parent: 'dateFilterType',
 				// 			// 日期选择
@@ -285,16 +286,16 @@ export default {
 					name: 'search',
 					color: 'primary',
 				},
-				// {
-				// 	type: 'separate',
-				// },
-				// {
-				// 	type: 'button',
-				// 	btnName: '设备可视化',
-				// 	name: 'visualization',
-				// 	plain: true,
-				// 	color: 'success',
-				// },
+				{
+					type: 'separate',
+				},
+				{
+					type: 'button',
+					btnName: '导出',
+					name: 'export',
+					plain: true,
+					color: 'success',
+				},
 				// {
 				// 	type: 'button',
 				// 	btnName: 'OEE',
@@ -315,7 +316,7 @@ export default {
 			// 查询参数
 			queryParams: {
 				// lineId: null,
-        workOrderId: null,
+				workOrderId: null,
 				recordTime: [],
 			},
 			// 表单参数
@@ -324,20 +325,20 @@ export default {
 		};
 	},
 	created() {
-		this.getWorkOrder()
+		this.getWorkOrder();
 		// this.getLine();
 		this.getList();
 	},
 	methods: {
 		/** 准备工厂数据 */
-    async getWorkOrder() {
-      console.log(1111);
+		async getWorkOrder() {
+			console.log(1111);
 			const { code, data } = await this.$axios({
-        url: '/base/core-work-order/listbyfilter',
+				url: '/base/core-work-order/listbyfilter',
 				method: 'get',
 			});
-      if (code == 0) {
-        console.log('1111', data);
+			if (code == 0) {
+				console.log('1111', data);
 				this.searchBarFormConfig[0].selectOptions = data.map((item) => {
 					return {
 						name: item.name,
@@ -394,7 +395,7 @@ export default {
 				this.open = true;
 			}
 			if (btnName == 'search') {
-        this.queryParams.workOrderId = payload.workOrderId || null;
+				this.queryParams.workOrderId = payload.workOrderId || null;
 				// this.queryParams.lineId = payload.lineId || null;
 				if (0 == payload.dateFilterType) {
 					this.queryParams.recordTime = payload.timerange;
diff --git a/src/views/quality/monitoring/materielDateFrom/index.vue b/src/views/quality/monitoring/materielDateFrom/index.vue
index 07efb7d2..e7bd7a88 100644
--- a/src/views/quality/monitoring/materielDateFrom/index.vue
+++ b/src/views/quality/monitoring/materielDateFrom/index.vue
@@ -6,16 +6,26 @@
  * @Description:
 -->
 <template>
-  <div class="app-container">
-    <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
-    <base-table :table-props="tableProps" :page="listQuery.pageNo" :limit="listQuery.pageSize" :table-data="list">
-      <!-- <method-btn v-if="tableBtn.length" slot="handleBtn" :width="120" label="操作" :method-list="tableBtn"
+	<div class="app-container">
+		<search-bar
+			:formConfigs="formConfig"
+			ref="searchBarForm"
+			@headBtnClick="buttonClick" />
+		<base-table
+			:table-props="tableProps"
+			:page="listQuery.pageNo"
+			:limit="listQuery.pageSize"
+			:table-data="list">
+			<!-- <method-btn v-if="tableBtn.length" slot="handleBtn" :width="120" label="操作" :method-list="tableBtn"
         @clickBtn="handleClick" /> -->
-    </base-table>
-    <pagination :limit.sync="listQuery.pageSize" :page.sync="listQuery.pageNo" :total="listQuery.total"
-      @pagination="getList" />
-    <!-- <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList" /> -->
-  </div>
+		</base-table>
+		<pagination
+			:limit.sync="listQuery.pageSize"
+			:page.sync="listQuery.pageNo"
+			:total="listQuery.total"
+			@pagination="getList" />
+		<!-- <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList" /> -->
+	</div>
 </template>
 
 <script>
@@ -24,228 +34,236 @@
 // import basicPage from '../mixins/basic-page';
 import { parseTime } from '../mixins/code-filter';
 import {
-  getMaterialUseLogPage,
-  getWorkOrderList,
-  exportEnergyPlcExcel
+	getMaterialUseLogPage,
+	getWorkOrderList,
+	exportEnergyPlcExcel,
 } from '@/api/quality/materialTraceability';
 
 const tableProps = [
-  {
-    prop: 'materialName',
-    label: '物料名称'
-  },
-  {
-    prop: 'materialCode',
-    label: '物料编码'
-  },
-  {
-    prop: 'dateName',
-    label: '物料批次'
-  },
-  {
-    prop: 'equipName',
-    label: '使用设备'
-  },
-  {
-    prop: 'num',
-    label: '使用数量'
-  },
-  {
-    prop: 'useTime',
-    label: '使用时间',
-    filter: parseTime
-  },
-  {
-    prop: 'userName',
-    label: '操作人'
-  },
-  {
-    prop: 'source',
-    label: '数据来源',
-    filter: (val) => val == 1 ? '内部' : '外部'
-  },
-  {
-    prop: 'remark',
-    label: '备注'
-  }
+	{
+		prop: 'materialName',
+		label: '物料名称',
+	},
+	{
+		prop: 'materialCode',
+		label: '物料编码',
+	},
+	{
+		prop: 'dateName',
+		label: '物料批次',
+	},
+	{
+		prop: 'equipName',
+		label: '使用设备',
+	},
+	{
+		prop: 'num',
+		label: '使用数量',
+	},
+	{
+		prop: 'useTime',
+		label: '使用时间',
+		filter: parseTime,
+	},
+	{
+		prop: 'userName',
+		label: '操作人',
+	},
+	{
+		prop: 'source',
+		label: '数据来源',
+		filter: (val) => (val == 1 ? '内部' : '外部'),
+	},
+	{
+		prop: 'remark',
+		label: '备注',
+	},
 ];
 
 export default {
-  // mixins: [basicPage],
-  data() {
-    return {
-      // urlOptions: {
-      //   getDataListURL: getMaterialUseLogPage,
-      //   // deleteURL: deletePackingType,
-      //   // exportURL: exportPackingExcel,
-      // },
-      tableProps,
-      tableBtn: [
-        this.$auth.hasPermi(`base:packaging-print-log:update`)
-          ? {
-            type: 'edit',
-            btnName: '编辑',
-          }
-          : undefined,
-        this.$auth.hasPermi(`base:packaging-print-log:delete`)
-          ? {
-            type: 'delete',
-            btnName: '删除',
-          }
-          : undefined,
-
-      ].filter((v) => v),
-      list: [],
-      listQuery: {
-        pageSize: 10,
-        pageNo: 1,
-        total: 0,
-        workOrderId: undefined,
-        startTime: undefined,
-        endTime:undefined,
-      },
-      formConfig: [
-        {
-          type: 'select',
-          label: '工单',
-          selectOptions: [],
-          labelField: 'name',
-          valueField: 'id',
-          param: 'workOrderId'
-        },
-        {
-          type: 'datePicker',
-          label: '时间段',
-          dateType: 'daterange',
-          format: 'yyyy-MM-dd',
-          valueFormat: "yyyy-MM-dd",
-          rangeSeparator: '-',
-          startPlaceholder: '开始时间',
-          endPlaceholder: '结束时间',
-          param: 'timeVal',
-          defaultSelect: [],
-          width: 250
-        },
-        {
-          type: 'button',
-          btnName: '搜索',
-          name: 'search',
-          color: 'primary',
-        },
-        {
-          type: 'separate',
-        },
-        // {
-        // 	type: 'separate',
-        // },
-        // {
-        // 	type: 'button',
-        // 	btnName: '重置',
-        // 	name: 'reset',
-        // },
-        // {
-        //   type: 'separate',
-        // },
-        // {
-        //   type: this.$auth.hasPermi('base:packaging-print-log:create') ? 'button' : '',
-        //   btnName: '新增',
-        //   name: 'add',
-        //   color: 'success',
-        //   plain: true,
-        // },
-        // {
-        // 	type: 'separate',
-        // 	type: this.$auth.hasPermi('base:product:create') ? 'separate' : '',
-        // },
-        {
-          type: this.$auth.hasPermi('monitoring:materiel-date-from:export') ? 'button' : '',
-        	btnName: '导出',
-        	name: 'export',
-        	color: 'warning',
-        },
-      ],
-    };
-  },
-  components: {
-    // AddOrUpdate,
-  },
-  created() {
-    this.getList()
-    this.getDict()
-  },
-  methods: {
-    getList() {
-      getMaterialUseLogPage({ ...this.listQuery }).then(res => {
-        this.list = res.data || []
-        this.listQuery.total = res.data.total || 0
-      })
-    },
-    getDict() {
-      // 获取产品的属性列表
-      // getCustomerList().then((response) => {
-      //   console.log(response);
-      //   this.customerList = response.data
-      //   // this.listQuery.total = response.data.total;
-      // })
-      // getModelList().then((response) => {
-      //   console.log(response);
-      //   this.modelList = response.data
-      //   // this.listQuery.total = response.data.total;
-      // })
-      getWorkOrderList().then((response) => {
-        // console.log(response);
-        this.formConfig[0].selectOptions = response.data.map((item) => {
-          return {
-            name: item.name,
-            id: item.id
-          }
-        })
-        console.log(this.formConfig[0].selectOptions);
-        // this.listQuery.total = response.data.total;
-      })
-    },
-    handleExport() {
-      // 处理查询参数
-      let params = { ...this.listQuery };
-      params.pageNo = undefined;
-      params.pageSize = undefined;
-      this.$modal.confirm('是否确认导出所有数据项?').then(() => {
-        this.exportLoading = true;
-        return exportEnergyPlcExcel(params);
-      }).then(response => {
-        this.$download.excel(response, '物料信息追溯  ');
-        this.exportLoading = false;
-      }).catch(() => { });
-    },
-    buttonClick(val) {
-      console.log(val)
-      if (val.btnName === 'search') {
-        this.listQuery.workOrderId = val.workOrderId ? val.workOrderId :undefined
-        // this.queryParams.status = val.status
-        if (val.timeVal && val.timeVal.length != 0 ) {
-        this.listQuery.startTime =  val.timeVal[0] + ' 00:00:00'
-        this.listQuery.endTime = val.timeVal[1] + ' 23:59:59'
-        } else {
-          this.listQuery.startTime = undefined
-          this.listQuery.endTime = undefined
-        }
-        this.getList()
-      } else {
-        this.handleExport()
-        // this.addOrEditTitle = '新增'
-        // this.centervisible = true
-        // this.$nextTick(() => {
-        //   this.$refs.orderAdd.init()
-        // })
-      }
-    },
-    otherMethods(val) {
-      this.addOrUpdateVisible = true;
-      this.addOrEditTitle = '详情';
-      this.$nextTick(() => {
-        this.$refs.addOrUpdate.init(val.data.id, true);
-      });
-    },
-  },
+	// mixins: [basicPage],
+	data() {
+		return {
+			// urlOptions: {
+			//   getDataListURL: getMaterialUseLogPage,
+			//   // deleteURL: deletePackingType,
+			//   // exportURL: exportPackingExcel,
+			// },
+			tableProps,
+			tableBtn: [
+				this.$auth.hasPermi(`base:packaging-print-log:update`)
+					? {
+							type: 'edit',
+							btnName: '编辑',
+					  }
+					: undefined,
+				this.$auth.hasPermi(`base:packaging-print-log:delete`)
+					? {
+							type: 'delete',
+							btnName: '删除',
+					  }
+					: undefined,
+			].filter((v) => v),
+			list: [],
+			listQuery: {
+				pageSize: 10,
+				pageNo: 1,
+				total: 0,
+				workOrderId: undefined,
+				startTime: undefined,
+				endTime: undefined,
+			},
+			formConfig: [
+				{
+					type: 'select',
+					label: '工单',
+					selectOptions: [],
+					labelField: 'name',
+					valueField: 'id',
+					param: 'workOrderId',
+				},
+				{
+					type: 'datePicker',
+					label: '时间段',
+					dateType: 'daterange',
+					format: 'yyyy-MM-dd',
+					valueFormat: 'yyyy-MM-dd',
+					rangeSeparator: '-',
+					startPlaceholder: '开始时间',
+					endPlaceholder: '结束时间',
+					param: 'timeVal',
+					defaultSelect: [],
+					width: 250,
+				},
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+				{
+					type: 'separate',
+				},
+				// {
+				// 	type: 'separate',
+				// },
+				// {
+				// 	type: 'button',
+				// 	btnName: '重置',
+				// 	name: 'reset',
+				// },
+				// {
+				//   type: 'separate',
+				// },
+				// {
+				//   type: this.$auth.hasPermi('base:packaging-print-log:create') ? 'button' : '',
+				//   btnName: '新增',
+				//   name: 'add',
+				//   color: 'success',
+				//   plain: true,
+				// },
+				// {
+				// 	type: 'separate',
+				// 	type: this.$auth.hasPermi('base:product:create') ? 'separate' : '',
+				// },
+				{
+					type: this.$auth.hasPermi('monitoring:materiel-date-from:export')
+						? 'button'
+						: '',
+					btnName: '导出',
+					name: 'export',
+					plain: true,
+					color: 'success',
+				},
+			],
+		};
+	},
+	components: {
+		// AddOrUpdate,
+	},
+	created() {
+		this.getList();
+		this.getDict();
+	},
+	methods: {
+		getList() {
+			getMaterialUseLogPage({ ...this.listQuery }).then((res) => {
+				this.list = res.data || [];
+				this.listQuery.total = res.data.total || 0;
+			});
+		},
+		getDict() {
+			// 获取产品的属性列表
+			// getCustomerList().then((response) => {
+			//   console.log(response);
+			//   this.customerList = response.data
+			//   // this.listQuery.total = response.data.total;
+			// })
+			// getModelList().then((response) => {
+			//   console.log(response);
+			//   this.modelList = response.data
+			//   // this.listQuery.total = response.data.total;
+			// })
+			getWorkOrderList().then((response) => {
+				// console.log(response);
+				this.formConfig[0].selectOptions = response.data.map((item) => {
+					return {
+						name: item.name,
+						id: item.id,
+					};
+				});
+				console.log(this.formConfig[0].selectOptions);
+				// this.listQuery.total = response.data.total;
+			});
+		},
+		handleExport() {
+			// 处理查询参数
+			let params = { ...this.listQuery };
+			params.pageNo = undefined;
+			params.pageSize = undefined;
+			this.$modal
+				.confirm('是否确认导出所有数据项?')
+				.then(() => {
+					this.exportLoading = true;
+					return exportEnergyPlcExcel(params);
+				})
+				.then((response) => {
+					this.$download.excel(response, '物料信息追溯  ');
+					this.exportLoading = false;
+				})
+				.catch(() => {});
+		},
+		buttonClick(val) {
+			console.log(val);
+			if (val.btnName === 'search') {
+				this.listQuery.workOrderId = val.workOrderId
+					? val.workOrderId
+					: undefined;
+				// this.queryParams.status = val.status
+				if (val.timeVal && val.timeVal.length != 0) {
+					this.listQuery.startTime = val.timeVal[0] + ' 00:00:00';
+					this.listQuery.endTime = val.timeVal[1] + ' 23:59:59';
+				} else {
+					this.listQuery.startTime = undefined;
+					this.listQuery.endTime = undefined;
+				}
+				this.getList();
+			} else {
+				this.handleExport();
+				// this.addOrEditTitle = '新增'
+				// this.centervisible = true
+				// this.$nextTick(() => {
+				//   this.$refs.orderAdd.init()
+				// })
+			}
+		},
+		otherMethods(val) {
+			this.addOrUpdateVisible = true;
+			this.addOrEditTitle = '详情';
+			this.$nextTick(() => {
+				this.$refs.addOrUpdate.init(val.data.id, true);
+			});
+		},
+	},
 };
 </script>
diff --git a/src/views/quality/monitoring/processTraceability/index.vue b/src/views/quality/monitoring/processTraceability/index.vue
index 413e6889..53406cd7 100644
--- a/src/views/quality/monitoring/processTraceability/index.vue
+++ b/src/views/quality/monitoring/processTraceability/index.vue
@@ -6,16 +6,31 @@
  * @Description:
 -->
 <template>
-  <div class="app-container">
-    <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
-    <base-table :table-props="tableProps" :page="listQuery.pageNo" :limit="listQuery.pageSize" :table-data="list">
-      <method-btn v-if="tableBtn.length" slot="handleBtn" :width="120" label="操作" :method-list="tableBtn"
-        @clickBtn="handleClick" />
-    </base-table>
-    <pagination :limit.sync="listQuery.pageSize" :page.sync="listQuery.pageNo" :total="listQuery.total"
-      @pagination="getList" />
-    <!-- <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList" /> -->
-  </div>
+	<div class="app-container">
+		<search-bar
+			:formConfigs="formConfig"
+			ref="searchBarForm"
+			@headBtnClick="buttonClick" />
+		<base-table
+			:table-props="tableProps"
+			:page="listQuery.pageNo"
+			:limit="listQuery.pageSize"
+			:table-data="list">
+			<method-btn
+				v-if="tableBtn.length"
+				slot="handleBtn"
+				:width="120"
+				label="操作"
+				:method-list="tableBtn"
+				@clickBtn="handleClick" />
+		</base-table>
+		<pagination
+			:limit.sync="listQuery.pageSize"
+			:page.sync="listQuery.pageNo"
+			:total="listQuery.total"
+			@pagination="getList" />
+		<!-- <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList" /> -->
+	</div>
 </template>
 
 <script>
@@ -24,256 +39,264 @@
 // import basicPage from '../mixins/basic-page';
 import { parseTime } from '../mixins/code-filter';
 import {
-  getProcessTraceabilityPage,
-  getWorkOrderList,
-  getCoreProduct
-  // exportEnergyPlcExcel
+	getProcessTraceabilityPage,
+	getWorkOrderList,
+	getCoreProduct,
+	// exportEnergyPlcExcel
 } from '@/api/quality/processTraceability';
 import { publicFormatter } from '@/utils/dict';
 const tableProps = [
-  {
-    prop: 'name',
-    label: '工单名称'
-  },
-  {
-    prop: 'code',
-    label: '工单编码'
-  },
-  {
-    prop: 'planProductName',
-    label: '产品名'
-  },
-  {
-    prop: 'status',
-    label: '状态',
-    filter: (val) => val == 1 ? '等待' : val == 2 ? '激活' : val == 3 ? '暂停' : val == 4 ? '完成' : '作废',
-  },
-  {
-    prop: 'startProduceTime',
-    label: '开始生产时间',
-    filter: parseTime
-  },
-  {
-    prop: 'finishProduceTime',
-    label: '结束生产时间',
-    filter: parseTime
-  },
-  {
-    prop: 'actualQuantity',
-    label: '生产数量'
-  },
-  {
-    prop: 'planProductUnit',
-    label: '单位',
-    filter: publicFormatter('unit_dict')
-  },
-  {
-    prop: 'processFlowName',
-    label: '工艺名称'
-  },
-  {
-    prop: 'yield',
-    label: '合格率'
-  }
+	{
+		prop: 'name',
+		label: '工单名称',
+	},
+	{
+		prop: 'code',
+		label: '工单编码',
+	},
+	{
+		prop: 'planProductName',
+		label: '产品名',
+	},
+	{
+		prop: 'status',
+		label: '状态',
+		filter: (val) =>
+			val == 1
+				? '等待'
+				: val == 2
+				? '激活'
+				: val == 3
+				? '暂停'
+				: val == 4
+				? '完成'
+				: '作废',
+	},
+	{
+		prop: 'startProduceTime',
+		label: '开始生产时间',
+		filter: parseTime,
+	},
+	{
+		prop: 'finishProduceTime',
+		label: '结束生产时间',
+		filter: parseTime,
+	},
+	{
+		prop: 'actualQuantity',
+		label: '生产数量',
+	},
+	{
+		prop: 'planProductUnit',
+		label: '单位',
+		filter: publicFormatter('unit_dict'),
+	},
+	{
+		prop: 'processFlowName',
+		label: '工艺名称',
+	},
+	{
+		prop: 'yield',
+		label: '合格率',
+	},
 ];
 
 export default {
-  // mixins: [basicPage],
-  data() {
-    return {
-      // urlOptions: {
-      //   getDataListURL: getMaterialUseLogPage,
-      //   // deleteURL: deletePackingType,
-      //   // exportURL: exportPackingExcel,
-      // },
-      tableProps,
-      tableBtn: [
-        // this.$auth.hasPermi(`base:packaging-print-log:update`)
-        //   ? {
-        //     type: 'edit',
-        //     btnName: '编辑',
-        //   }
-        //   : undefined,
-          {
-            type: 'processDetail',
-            btnName: '查看工艺详情',
-          },
+	// mixins: [basicPage],
+	data() {
+		return {
+			// urlOptions: {
+			//   getDataListURL: getMaterialUseLogPage,
+			//   // deleteURL: deletePackingType,
+			//   // exportURL: exportPackingExcel,
+			// },
+			tableProps,
+			tableBtn: [
+				// this.$auth.hasPermi(`base:packaging-print-log:update`)
+				//   ? {
+				//     type: 'edit',
+				//     btnName: '编辑',
+				//   }
+				//   : undefined,
+				{
+					type: 'processDetail',
+					btnName: '查看工艺详情',
+				},
+			].filter((v) => v),
+			list: [],
+			listQuery: {
+				pageSize: 10,
+				pageNo: 1,
+				// total: 0,
+				// orderName: '工单',
+				// startTime: undefined,
+				// endTime:undefined,
+			},
+			formConfig: [
+				{
+					type: 'select',
+					label: '工单名称',
+					selectOptions: [],
+					labelField: 'name',
+					valueField: 'id',
+					param: 'orderName',
+					filterable: true,
+				},
+				{
+					type: 'datePicker',
+					label: '工单开始时间',
+					dateType: 'daterange',
+					format: 'yyyy-MM-dd',
+					valueFormat: 'yyyy-MM-dd',
+					rangeSeparator: '-',
+					startPlaceholder: '开始时间',
+					endPlaceholder: '结束时间',
+					param: 'timeVal',
+					defaultSelect: [],
+					width: 250,
+				},
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+				// {
+				// 	type: 'separate',
+				// },
+				// {
+				// 	type: 'button',
+				// 	btnName: '重置',
+				// 	name: 'reset',
+				// },
+				// {
+				//   type: 'separate',
+				// },
+				// {
+				//   type: this.$auth.hasPermi('base:packaging-print-log:create') ? 'button' : '',
+				//   btnName: '新增',
+				//   name: 'add',
+				//   color: 'success',
+				//   plain: true,
+				// },
+				// {
+				// 	type: 'separate',
+				// 	type: this.$auth.hasPermi('base:product:create') ? 'separate' : '',
+				// },
+				// {
+				//   type: this.$auth.hasPermi('monitoring:materiel-date-from:export') ? 'button' : '',
+				// 	btnName: '导出',
+				// 	name: 'export',
+				// 	color: 'warning',
+				// },
+			],
+		};
+	},
+	components: {
+		// AddOrUpdate,
+	},
+	created() {
+		this.getList();
+		this.getDict();
+	},
+	methods: {
+		getList() {
+			getProcessTraceabilityPage(this.listQuery).then((res) => {
+				this.list = res.data.list || [];
+				this.listQuery.total = res.data.total || 0;
+			});
+		},
+		handleClick(val) {
+			if (val.type === 'processDetail') {
+				console.log(val);
+				let specificationsData = '';
+				getCoreProduct(val.data.planProductId).then((res) => {
+					console.log(res);
 
-      ].filter((v) => v),
-      list: [],
-      listQuery: {
-        pageSize: 10,
-        pageNo: 1,
-        // total: 0,
-        // orderName: '工单',
-        // startTime: undefined,
-        // endTime:undefined,
-      },
-      formConfig: [
-        {
-          type: 'select',
-          label: '工单',
-          selectOptions: [],
-          labelField: 'name',
-          valueField: 'id',
-          param: 'orderName',
-          filterable: true,
-        },
-        {
-          type: 'datePicker',
-          label: '工单开始时间',
-          dateType: 'daterange',
-          format: 'yyyy-MM-dd',
-          valueFormat: "yyyy-MM-dd",
-          rangeSeparator: '-',
-          startPlaceholder: '开始时间',
-          endPlaceholder: '结束时间',
-          param: 'timeVal',
-          defaultSelect: [],
-          width: 250
-        },
-        {
-          type: 'button',
-          btnName: '搜索',
-          name: 'search',
-          color: 'primary',
-        },
-        // {
-        // 	type: 'separate',
-        // },
-        // {
-        // 	type: 'button',
-        // 	btnName: '重置',
-        // 	name: 'reset',
-        // },
-        // {
-        //   type: 'separate',
-        // },
-        // {
-        //   type: this.$auth.hasPermi('base:packaging-print-log:create') ? 'button' : '',
-        //   btnName: '新增',
-        //   name: 'add',
-        //   color: 'success',
-        //   plain: true,
-        // },
-        // {
-        // 	type: 'separate',
-        // 	type: this.$auth.hasPermi('base:product:create') ? 'separate' : '',
-        // },
-        // {
-        //   type: this.$auth.hasPermi('monitoring:materiel-date-from:export') ? 'button' : '',
-        // 	btnName: '导出',
-        // 	name: 'export',
-        // 	color: 'warning',
-        // },
-      ],
-    };
-  },
-  components: {
-    // AddOrUpdate,
-  },
-  created() {
-    this.getList()
-    this.getDict()
-  },
-  methods: {
-    getList() {
-      getProcessTraceabilityPage(this.listQuery).then(res => {
-        this.list = res.data.list || []
-        this.listQuery.total = res.data.total || 0
-      })
-    },
-    handleClick(val) {
-      if (val.type === "processDetail") {
-        console.log(val);
-        let specificationsData =''
-        getCoreProduct(val.data.planProductId).then((res) => {
-          console.log(res)
+					this.$router.push({
+						path: 'process-traceability-detail',
+						query: {
+							id: val.data.processFlowId,
+							orderId: val.data.id,
+							name: val.data.name,
+							specifications: res.data.specifications,
+							productName: val.data.planProductName,
+							processFlowName: val.data.processFlowName,
+							// planProductId: val.data.planProductId
+							// equipmentName,
+						},
+					});
+				});
 
-          this.$router.push({
-            path: 'process-traceability-detail',
-            query: {
-              id: val.data.processFlowId,
-              orderId: val.data.id,
-              name: val.data.name,
-              specifications: res.data.specifications,
-              productName: val.data.planProductName,
-              processFlowName: val.data.processFlowName,
-              // planProductId: val.data.planProductId
-              // equipmentName,
-            },
-          });
-        })
-
-        // this.deleteHandle(val.data.id, val.data.name, val.data._pageIndex)
-      }
-    },
-    getDict() {
-      // 获取产品的属性列表
-      // getCustomerList().then((response) => {
-      //   console.log(response);
-      //   this.customerList = response.data
-      //   // this.listQuery.total = response.data.total;
-      // })
-      // getModelList().then((response) => {
-      //   console.log(response);
-      //   this.modelList = response.data
-      //   // this.listQuery.total = response.data.total;
-      // })
-      getWorkOrderList().then((response) => {
-        // console.log(response);
-        this.formConfig[0].selectOptions = response.data.map((item) => {
-          return {
-            name: item.name,
-            id: item.name
-          }
-        })
-        console.log(this.formConfig[0].selectOptions);
-        // this.listQuery.total = response.data.total;
-      })
-    },
-    // handleExport() {
-    //   // 处理查询参数
-    //   let params = { ...this.listQuery };
-    //   params.pageNo = undefined;
-    //   params.pageSize = undefined;
-    //   this.$modal.confirm('是否确认导出所有数据项?').then(() => {
-    //     this.exportLoading = true;
-    //     return exportEnergyPlcExcel(params);
-    //   }).then(response => {
-    //     this.$download.excel(response, '物料信息追溯  ');
-    //     this.exportLoading = false;
-    //   }).catch(() => { });
-    // },
-    buttonClick(val) {
-      console.log(val)
-      if (val.btnName === 'search') {
-        this.listQuery.orderName = val.orderName ? val.orderName :undefined
-        // this.queryParams.status = val.status
-        if (val.timeVal && val.timeVal.length != 0 ) {
-        this.listQuery.startTime =  val.timeVal[0] + ' 00:00:00'
-        this.listQuery.endTime = val.timeVal[1] + ' 23:59:59'
-        } else {
-          this.listQuery.startTime = undefined
-          this.listQuery.endTime = undefined
-        }
-        this.getList()
-      } else {
-        // this.handleExport()
-        // this.addOrEditTitle = '新增'
-        // this.centervisible = true
-        // this.$nextTick(() => {
-        //   this.$refs.orderAdd.init()
-        // })
-      }
-    },
-    otherMethods(val) {
-      this.addOrUpdateVisible = true;
-      this.addOrEditTitle = '详情';
-      this.$nextTick(() => {
-        this.$refs.addOrUpdate.init(val.data.id, true);
-      });
-    },
-  },
+				// this.deleteHandle(val.data.id, val.data.name, val.data._pageIndex)
+			}
+		},
+		getDict() {
+			// 获取产品的属性列表
+			// getCustomerList().then((response) => {
+			//   console.log(response);
+			//   this.customerList = response.data
+			//   // this.listQuery.total = response.data.total;
+			// })
+			// getModelList().then((response) => {
+			//   console.log(response);
+			//   this.modelList = response.data
+			//   // this.listQuery.total = response.data.total;
+			// })
+			getWorkOrderList().then((response) => {
+				// console.log(response);
+				this.formConfig[0].selectOptions = response.data.map((item) => {
+					return {
+						name: item.name,
+						id: item.name,
+					};
+				});
+				console.log(this.formConfig[0].selectOptions);
+				// this.listQuery.total = response.data.total;
+			});
+		},
+		// handleExport() {
+		//   // 处理查询参数
+		//   let params = { ...this.listQuery };
+		//   params.pageNo = undefined;
+		//   params.pageSize = undefined;
+		//   this.$modal.confirm('是否确认导出所有数据项?').then(() => {
+		//     this.exportLoading = true;
+		//     return exportEnergyPlcExcel(params);
+		//   }).then(response => {
+		//     this.$download.excel(response, '物料信息追溯  ');
+		//     this.exportLoading = false;
+		//   }).catch(() => { });
+		// },
+		buttonClick(val) {
+			console.log(val);
+			if (val.btnName === 'search') {
+				this.listQuery.orderName = val.orderName ? val.orderName : undefined;
+				// this.queryParams.status = val.status
+				if (val.timeVal && val.timeVal.length != 0) {
+					this.listQuery.startTime = val.timeVal[0] + ' 00:00:00';
+					this.listQuery.endTime = val.timeVal[1] + ' 23:59:59';
+				} else {
+					this.listQuery.startTime = undefined;
+					this.listQuery.endTime = undefined;
+				}
+				this.getList();
+			} else {
+				// this.handleExport()
+				// this.addOrEditTitle = '新增'
+				// this.centervisible = true
+				// this.$nextTick(() => {
+				//   this.$refs.orderAdd.init()
+				// })
+			}
+		},
+		otherMethods(val) {
+			this.addOrUpdateVisible = true;
+			this.addOrEditTitle = '详情';
+			this.$nextTick(() => {
+				this.$refs.addOrUpdate.init(val.data.id, true);
+			});
+		},
+	},
 };
 </script>
diff --git a/src/views/quality/monitoring/rawMaterialTraceability/index.vue b/src/views/quality/monitoring/rawMaterialTraceability/index.vue
index af0ab14e..dadc1c02 100644
--- a/src/views/quality/monitoring/rawMaterialTraceability/index.vue
+++ b/src/views/quality/monitoring/rawMaterialTraceability/index.vue
@@ -6,16 +6,26 @@
  * @Description:
 -->
 <template>
-  <div class="app-container">
-    <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
-    <base-table :table-props="tableProps" :page="listQuery.pageNo" :limit="listQuery.pageSize" :table-data="list">
-      <!-- <method-btn v-if="tableBtn.length" slot="handleBtn" :width="120" label="操作" :method-list="tableBtn"
+	<div class="app-container">
+		<search-bar
+			:formConfigs="formConfig"
+			ref="searchBarForm"
+			@headBtnClick="buttonClick" />
+		<base-table
+			:table-props="tableProps"
+			:page="listQuery.pageNo"
+			:limit="listQuery.pageSize"
+			:table-data="list">
+			<!-- <method-btn v-if="tableBtn.length" slot="handleBtn" :width="120" label="操作" :method-list="tableBtn"
         @clickBtn="handleClick" /> -->
-    </base-table>
-    <pagination :limit.sync="listQuery.pageSize" :page.sync="listQuery.pageNo" :total="listQuery.total"
-      @pagination="getList" />
-    <!-- <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList" /> -->
-  </div>
+		</base-table>
+		<pagination
+			:limit.sync="listQuery.pageSize"
+			:page.sync="listQuery.pageNo"
+			:total="listQuery.total"
+			@pagination="getList" />
+		<!-- <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList" /> -->
+	</div>
 </template>
 
 <script>
@@ -25,219 +35,221 @@
 import { publicFormatter } from '@/utils/dict';
 import { parseTime } from '../mixins/code-filter';
 import {
-  getRawMaterialPage,
-  getWorkOrderList,
-  // exportEnergyPlcExcel
+	getRawMaterialPage,
+	getWorkOrderList,
+	// exportEnergyPlcExcel
 } from '@/api/quality/rawMaterialTraceability';
 
 const tableProps = [
-  {
-    prop: 'createTime',
-    label: '添加时间',
-    filter: parseTime
-  },
-  {
-    prop: 'material',
-    label: '原料名称',
-    filter: publicFormatter('material')
-  },
-  {
-    prop: 'origin',
-    label: '来源',
-    filter: (val)=>val == 1 ? '内部' : '外部'
-  },
-  {
-    prop: 'supplierId',
-    label: '供应商'
-  },
-  {
-    prop: 'batch',
-    label: '批次'
-  },
-  {
-    prop: 'num',
-    label: '数量'
-  },
-  {
-    prop: 'unit',
-    label: '单位',
-    filter: publicFormatter('unit_dict')
-  }
+	{
+		prop: 'createTime',
+		label: '添加时间',
+		filter: parseTime,
+		width: 150,
+	},
+	{
+		prop: 'material',
+		label: '原料名称',
+		filter: publicFormatter('material'),
+	},
+	{
+		prop: 'origin',
+		label: '来源',
+		filter: (val) => (val == 1 ? '内部' : '外部'),
+	},
+	{
+		prop: 'supplierId',
+		label: '供应商',
+	},
+	{
+		prop: 'batch',
+		label: '批次',
+	},
+	{
+		prop: 'num',
+		label: '数量',
+	},
+	{
+		prop: 'unit',
+		label: '单位',
+		filter: publicFormatter('unit_dict'),
+	},
 ];
 
 export default {
-  // mixins: [basicPage],
-  data() {
-    return {
-      // urlOptions: {
-      //   getDataListURL: getMaterialUseLogPage,
-      //   // deleteURL: deletePackingType,
-      //   // exportURL: exportPackingExcel,
-      // },
-      tableProps,
-      tableBtn: [
-        this.$auth.hasPermi(`base:packaging-print-log:update`)
-          ? {
-            type: 'edit',
-            btnName: '编辑',
-          }
-          : undefined,
-        this.$auth.hasPermi(`base:packaging-print-log:delete`)
-          ? {
-            type: 'delete',
-            btnName: '删除',
-          }
-          : undefined,
-
-      ].filter((v) => v),
-      list: [],
-      listQuery: {
-        pageSize: 10,
-        pageNo: 1,
-        total: 0,
-        workOrderId: undefined,
-        startTime: undefined,
-        endTime:undefined,
-      },
-      formConfig: [
-        {
-          type: 'select',
-          label: '工单',
-          selectOptions: [],
-          labelField: 'name',
-          valueField: 'id',
-          param: 'workOrderId'
-        },
-        // {
-        //   type: 'datePicker',
-        //   label: '时间段',
-        //   dateType: 'daterange',
-        //   format: 'yyyy-MM-dd',
-        //   valueFormat: "yyyy-MM-dd",
-        //   rangeSeparator: '-',
-        //   startPlaceholder: '开始时间',
-        //   endPlaceholder: '结束时间',
-        //   param: 'timeVal',
-        //   defaultSelect: [],
-        //   width: 250
-        // },
-        {
-          type: 'button',
-          btnName: '搜索',
-          name: 'search',
-          color: 'primary',
-        },
-        // {
-        // 	type: 'separate',
-        // },
-        // {
-        // 	type: 'button',
-        // 	btnName: '重置',
-        // 	name: 'reset',
-        // },
-        // {
-        //   type: 'separate',
-        // },
-        // {
-        //   type: this.$auth.hasPermi('base:packaging-print-log:create') ? 'button' : '',
-        //   btnName: '新增',
-        //   name: 'add',
-        //   color: 'success',
-        //   plain: true,
-        // },
-        // {
-        // 	type: 'separate',
-        // 	type: this.$auth.hasPermi('base:product:create') ? 'separate' : '',
-        // },
-        // {
-        //   type: this.$auth.hasPermi('monitoring:materiel-date-from:export') ? 'button' : '',
-        // 	btnName: '导出',
-        // 	name: 'export',
-        // 	color: 'warning',
-        // },
-      ],
-    };
-  },
-  components: {
-    // AddOrUpdate,
-  },
-  created() {
-    this.getList()
-    this.getDict()
-  },
-  methods: {
-    getList() {
-      getRawMaterialPage({ ...this.listQuery }).then(res => {
-        this.list = res.data.list || []
-        this.listQuery.total = res.data.total || 0
-      })
-    },
-    getDict() {
-      // 获取产品的属性列表
-      // getCustomerList().then((response) => {
-      //   console.log(response);
-      //   this.customerList = response.data
-      //   // this.listQuery.total = response.data.total;
-      // })
-      // getModelList().then((response) => {
-      //   console.log(response);
-      //   this.modelList = response.data
-      //   // this.listQuery.total = response.data.total;
-      // })
-      getWorkOrderList().then((response) => {
-        // console.log(response);
-        this.formConfig[0].selectOptions = response.data.map((item) => {
-          return {
-            name: item.name,
-            id: item.id
-          }
-        })
-        console.log(this.formConfig[0].selectOptions);
-        // this.listQuery.total = response.data.total;
-      })
-    },
-    // handleExport() {
-    //   // 处理查询参数
-    //   let params = { ...this.listQuery };
-    //   params.pageNo = undefined;
-    //   params.pageSize = undefined;
-    //   this.$modal.confirm('是否确认导出所有数据项?').then(() => {
-    //     this.exportLoading = true;
-    //     return exportEnergyPlcExcel(params);
-    //   }).then(response => {
-    //     this.$download.excel(response, '物料信息追溯  ');
-    //     this.exportLoading = false;
-    //   }).catch(() => { });
-    // },
-    buttonClick(val) {
-      console.log(val)
-      if (val.btnName === 'search') {
-        this.listQuery.workOrderId = val.workOrderId ? val.workOrderId :undefined
-        // this.queryParams.status = val.status
-        // if (val.timeVal && val.timeVal.length != 0 ) {
-        // this.listQuery.startTime =  val.timeVal[0] + ' 00:00:00'
-        // this.listQuery.endTime = val.timeVal[1] + ' 23:59:59'
-        // } else {
-        //   this.listQuery.startTime = undefined
-        //   this.listQuery.endTime = undefined
-        // }
-        this.getList()
-      } else {
-        // this.handleExport()
-        // this.addOrEditTitle = '新增'
-        // this.centervisible = true
-        // this.$nextTick(() => {
-        //   this.$refs.orderAdd.init()
-        // })
-      }
-    },
-    otherMethods(val) {
-      this.addOrUpdateVisible = true;
-      this.addOrEditTitle = '详情';
-      this.$nextTick(() => {
-        this.$refs.addOrUpdate.init(val.data.id, true);
-      });
-    },
-  },
+	// mixins: [basicPage],
+	data() {
+		return {
+			// urlOptions: {
+			//   getDataListURL: getMaterialUseLogPage,
+			//   // deleteURL: deletePackingType,
+			//   // exportURL: exportPackingExcel,
+			// },
+			tableProps,
+			tableBtn: [
+				this.$auth.hasPermi(`base:packaging-print-log:update`)
+					? {
+							type: 'edit',
+							btnName: '编辑',
+					  }
+					: undefined,
+				this.$auth.hasPermi(`base:packaging-print-log:delete`)
+					? {
+							type: 'delete',
+							btnName: '删除',
+					  }
+					: undefined,
+			].filter((v) => v),
+			list: [],
+			listQuery: {
+				pageSize: 10,
+				pageNo: 1,
+				total: 0,
+				workOrderId: undefined,
+				startTime: undefined,
+				endTime: undefined,
+			},
+			formConfig: [
+				{
+					type: 'select',
+					label: '工单',
+					selectOptions: [],
+					labelField: 'name',
+					valueField: 'id',
+					param: 'workOrderId',
+				},
+				// {
+				//   type: 'datePicker',
+				//   label: '时间段',
+				//   dateType: 'daterange',
+				//   format: 'yyyy-MM-dd',
+				//   valueFormat: "yyyy-MM-dd",
+				//   rangeSeparator: '-',
+				//   startPlaceholder: '开始时间',
+				//   endPlaceholder: '结束时间',
+				//   param: 'timeVal',
+				//   defaultSelect: [],
+				//   width: 250
+				// },
+				{
+					type: 'button',
+					btnName: '搜索',
+					name: 'search',
+					color: 'primary',
+				},
+				// {
+				// 	type: 'separate',
+				// },
+				// {
+				// 	type: 'button',
+				// 	btnName: '重置',
+				// 	name: 'reset',
+				// },
+				// {
+				//   type: 'separate',
+				// },
+				// {
+				//   type: this.$auth.hasPermi('base:packaging-print-log:create') ? 'button' : '',
+				//   btnName: '新增',
+				//   name: 'add',
+				//   color: 'success',
+				//   plain: true,
+				// },
+				// {
+				// 	type: 'separate',
+				// 	type: this.$auth.hasPermi('base:product:create') ? 'separate' : '',
+				// },
+				// {
+				//   type: this.$auth.hasPermi('monitoring:materiel-date-from:export') ? 'button' : '',
+				// 	btnName: '导出',
+				// 	name: 'export',
+				// 	color: 'warning',
+				// },
+			],
+		};
+	},
+	components: {
+		// AddOrUpdate,
+	},
+	created() {
+		this.getList();
+		this.getDict();
+	},
+	methods: {
+		getList() {
+			getRawMaterialPage({ ...this.listQuery }).then((res) => {
+				this.list = res.data.records || [];
+				this.listQuery.total = res.data.total || 0;
+			});
+		},
+		getDict() {
+			// 获取产品的属性列表
+			// getCustomerList().then((response) => {
+			//   console.log(response);
+			//   this.customerList = response.data
+			//   // this.listQuery.total = response.data.total;
+			// })
+			// getModelList().then((response) => {
+			//   console.log(response);
+			//   this.modelList = response.data
+			//   // this.listQuery.total = response.data.total;
+			// })
+			getWorkOrderList().then((response) => {
+				// console.log(response);
+				this.formConfig[0].selectOptions = response.data.map((item) => {
+					return {
+						name: item.name,
+						id: item.id,
+					};
+				});
+				console.log(this.formConfig[0].selectOptions);
+				// this.listQuery.total = response.data.total;
+			});
+		},
+		// handleExport() {
+		//   // 处理查询参数
+		//   let params = { ...this.listQuery };
+		//   params.pageNo = undefined;
+		//   params.pageSize = undefined;
+		//   this.$modal.confirm('是否确认导出所有数据项?').then(() => {
+		//     this.exportLoading = true;
+		//     return exportEnergyPlcExcel(params);
+		//   }).then(response => {
+		//     this.$download.excel(response, '物料信息追溯  ');
+		//     this.exportLoading = false;
+		//   }).catch(() => { });
+		// },
+		buttonClick(val) {
+			console.log(val);
+			if (val.btnName === 'search') {
+				this.listQuery.workOrderId = val.workOrderId
+					? val.workOrderId
+					: undefined;
+				// this.queryParams.status = val.status
+				// if (val.timeVal && val.timeVal.length != 0 ) {
+				// this.listQuery.startTime =  val.timeVal[0] + ' 00:00:00'
+				// this.listQuery.endTime = val.timeVal[1] + ' 23:59:59'
+				// } else {
+				//   this.listQuery.startTime = undefined
+				//   this.listQuery.endTime = undefined
+				// }
+				this.getList();
+			} else {
+				// this.handleExport()
+				// this.addOrEditTitle = '新增'
+				// this.centervisible = true
+				// this.$nextTick(() => {
+				//   this.$refs.orderAdd.init()
+				// })
+			}
+		},
+		otherMethods(val) {
+			this.addOrUpdateVisible = true;
+			this.addOrEditTitle = '详情';
+			this.$nextTick(() => {
+				this.$refs.addOrUpdate.init(val.data.id, true);
+			});
+		},
+	},
 };
 </script>
diff --git a/src/views/quality/qualityInspectionRecord/dialogForm.vue b/src/views/quality/qualityInspectionRecord/dialogForm.vue
index 9199e2fc..93836e3b 100644
--- a/src/views/quality/qualityInspectionRecord/dialogForm.vue
+++ b/src/views/quality/qualityInspectionRecord/dialogForm.vue
@@ -6,81 +6,150 @@
 -->
 
 <template>
-  <el-form ref="form" :model="innerDataForm" label-width="100px" v-loading="formLoading">
-    <el-row :gutter="20">
-      <el-col :span="12">
-        <el-form-item label="工单名称" prop="workOrderId" :rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
-          <el-select v-model="innerDataForm.workOrderId" placeholder="请选择工单名称" filterable clearable>
-            <el-option v-for="opt in workOrderList" :key="opt.value" :label="opt.label" :value="opt.value" />
-          </el-select>
-        </el-form-item>
-      </el-col>
-      <el-col :span="12">
-        <el-form-item label="检测内容" prop="inspectionDetId"
-          :rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
-          <el-select v-model="innerDataForm.inspectionDetId" placeholder="请选择检测内容" filterable clearable
-            @change="handleInspectionDetChange">
-            <el-option v-for="opt in inspectionDetList" :key="opt.value" :label="opt.label" :value="opt.value" />
-          </el-select>
-        </el-form-item>
-      </el-col>
-    </el-row>
-    <el-row :gutter="20">
-      <el-col :span="12">
-        <el-form-item label="产线" prop="productionLineId"
-          :rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
-          <el-select v-model="innerDataForm.productionLineId" placeholder="请选择产线" filterable clearable
-            @change="handleProductlineChange">
-            <el-option v-for="opt in productionLineList" :key="opt.value" :label="opt.label" :value="opt.value" />
-          </el-select>
-        </el-form-item>
-      </el-col>
-      <el-col :span="12">
-        <el-form-item label="工段" prop="sectionId" :rules="[{ required: false, message: '不能为空', trigger: 'blur' }]">
-          <el-select v-model="innerDataForm.sectionId" placeholder="请选择工段" clearable filterable
-            @change="$emit('update', innerDataForm)">
-            <el-option v-for="opt in sectionList" :key="opt.value" :label="opt.label" :value="opt.value" />
-          </el-select>
-        </el-form-item>
-      </el-col>
-    </el-row>
-    <el-row :gutter="20">
-      <el-col :span="12">
-        <el-form-item label="检测人员" prop="checkPerson">
-          <el-input v-model="innerDataForm.checkPerson" clearable @change="$emit('update', innerDataForm)"
-            placeholder="请输入检测人员" />
-        </el-form-item>
-      </el-col>
+	<el-form
+		ref="form"
+		:model="innerDataForm"
+		label-width="100px"
+		v-loading="formLoading">
+		<el-row :gutter="20">
+			<el-col :span="12">
+				<el-form-item
+					label="工单名称"
+					prop="workOrderId"
+					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
+					<el-select
+						v-model="innerDataForm.workOrderId"
+						placeholder="请选择工单名称"
+						filterable
+						clearable>
+						<el-option
+							v-for="opt in workOrderList"
+							:key="opt.value"
+							:label="opt.label"
+							:value="opt.value" />
+					</el-select>
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item
+					label="检测内容"
+					prop="inspectionDetId"
+					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
+					<el-select
+						v-model="innerDataForm.inspectionDetId"
+						placeholder="请选择检测内容"
+						filterable
+						clearable
+						@change="handleInspectionDetChange">
+						<el-option
+							v-for="opt in inspectionDetList"
+							:key="opt.value"
+							:label="opt.label"
+							:value="opt.value" />
+					</el-select>
+				</el-form-item>
+			</el-col>
+		</el-row>
+		<el-row :gutter="20">
+			<el-col :span="12">
+				<el-form-item
+					label="产线"
+					prop="productionLineId"
+					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
+					<el-select
+						v-model="innerDataForm.productionLineId"
+						placeholder="请选择产线"
+						filterable
+						clearable
+						@change="handleProductlineChange">
+						<el-option
+							v-for="opt in productionLineList"
+							:key="opt.value"
+							:label="opt.label"
+							:value="opt.value" />
+					</el-select>
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item
+					label="工段"
+					prop="sectionId"
+					:rules="[{ required: false, message: '不能为空', trigger: 'blur' }]">
+					<el-select
+						v-model="innerDataForm.sectionId"
+						placeholder="请选择工段"
+						clearable
+						filterable
+						@change="$emit('update', innerDataForm)">
+						<el-option
+							v-for="opt in sectionList"
+							:key="opt.value"
+							:label="opt.label"
+							:value="opt.value" />
+					</el-select>
+				</el-form-item>
+			</el-col>
+		</el-row>
+		<el-row :gutter="20">
+			<el-col :span="12">
+				<el-form-item label="检测人" prop="checkPerson">
+					<el-input
+						v-model="innerDataForm.checkPerson"
+						clearable
+						@change="$emit('update', innerDataForm)"
+						placeholder="请输入检测人" />
+				</el-form-item>
+			</el-col>
 
-      <el-col :span="12">
-        <el-form-item label="检测时间" prop="checkTime" :rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
-          <el-date-picker v-model="innerDataForm.checkTime" type="datetime" placeholder="请选择检测时间"
-            value-format="timestamp" @change="$emit('update', innerDataForm)"></el-date-picker>
-        </el-form-item>
-      </el-col>
-    </el-row>
-    <el-row :gutter="20">
-      <el-col :span="12">
-        <el-form-item label="来源" prop="source" :rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
-          <el-select v-model="innerDataForm.source" placeholder="请选择来源" filterable clearable
-            @change="$emit('update', innerDataForm)">
-            <el-option v-for="opt in [
-            	{ label: '手动', value: 1 },
-            	{ label: '自动', value: 2 },
-            ]" :key="opt.value" :label="opt.label" :value="opt.value" />
-          </el-select>
-        </el-form-item>
-      </el-col>
-    </el-row>
-    <el-row :gutter="20">
-      <el-col>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="innerDataForm.remark" @change="$emit('update', innerDataForm)" placeholder="请输入备注">
-          </el-input>
-        </el-form-item>
-      </el-col>
-    </el-row>
-  </el-form>
+			<el-col :span="12">
+				<el-form-item
+					label="检测时间"
+					prop="checkTime"
+					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
+					<el-date-picker
+						v-model="innerDataForm.checkTime"
+						type="datetime"
+						placeholder="请选择检测时间"
+						value-format="timestamp"
+						@change="$emit('update', innerDataForm)"></el-date-picker>
+				</el-form-item>
+			</el-col>
+		</el-row>
+		<el-row :gutter="20">
+			<el-col :span="12">
+				<el-form-item
+					label="来源"
+					prop="source"
+					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
+					<el-select
+						v-model="innerDataForm.source"
+						placeholder="请选择来源"
+						filterable
+						clearable
+						@change="$emit('update', innerDataForm)">
+						<el-option
+							v-for="opt in [
+								{ label: '手动', value: 1 },
+								{ label: '自动', value: 2 },
+							]"
+							:key="opt.value"
+							:label="opt.label"
+							:value="opt.value" />
+					</el-select>
+				</el-form-item>
+			</el-col>
+		</el-row>
+		<el-row :gutter="20">
+			<el-col>
+				<el-form-item label="备注" prop="remark">
+					<el-input
+						v-model="innerDataForm.remark"
+						@change="$emit('update', innerDataForm)"
+						placeholder="请输入备注"></el-input>
+				</el-form-item>
+			</el-col>
+		</el-row>
+	</el-form>
 </template>
 
 <script>
@@ -103,18 +172,20 @@ export default {
 			formLoading: true,
 			inspectionDetList: [],
 			productionLineList: [],
-      sectionList: [],
-      workOrderList:[],
+			sectionList: [],
+			workOrderList: [],
 			innerDataForm: {},
 			cacheInspectionDetList: null,
 		};
 	},
 	mounted() {
-    Promise.all([this.getProductLineList(), this.getInspectionDetList(), this.getWorkOrderList()]).then(
-			() => {
-				this.formLoading = false;
-			}
-		);
+		Promise.all([
+			this.getProductLineList(),
+			this.getInspectionDetList(),
+			this.getWorkOrderList(),
+		]).then(() => {
+			this.formLoading = false;
+		});
 	},
 	watch: {
 		// 'innerDataForm.productionLineId': {
@@ -165,20 +236,20 @@ export default {
 
 		// 获取产线列表
 		async getProductLineList() {
-      const response = await this.$axios('/base/core-production-line/listAll');
+			const response = await this.$axios('/base/core-production-line/listAll');
 			this.productionLineList = response.data.map((item) => ({
 				label: item.name,
 				value: item.id,
 			}));
 		},
 
-    async getWorkOrderList() {
-      const response = await this.$axios('base/core-work-order/listbyfilter');
-      this.workOrderList = response.data.map((item) => ({
-        label: item.name,
-        value: item.id,
-      }));
-    },
+		async getWorkOrderList() {
+			const response = await this.$axios('base/core-work-order/listbyfilter');
+			this.workOrderList = response.data.map((item) => ({
+				label: item.name,
+				value: item.id,
+			}));
+		},
 
 		// 获取检测内容列表
 		async getInspectionDetList() {
diff --git a/src/views/quality/qualityInspectionRecord/index.vue b/src/views/quality/qualityInspectionRecord/index.vue
index baac3742..80587137 100644
--- a/src/views/quality/qualityInspectionRecord/index.vue
+++ b/src/views/quality/qualityInspectionRecord/index.vue
@@ -17,7 +17,7 @@
 				v-if="tableBtn.length"
 				slot="handleBtn"
 				label="操作"
-				:width="120"
+				:width="80"
 				fixed="right"
 				:method-list="tableBtn"
 				@clickBtn="handleTableBtnClick" />
@@ -66,94 +66,22 @@ export default {
 	mixins: [basicPageMixin],
 	data() {
 		return {
-			rows: [
-				[
-					{
-						select: true,
-						label: '检测内容',
-						url: '/base/quality-inspection-det/listAll',
-						prop: 'inspectionDetId',
-						labelKey: 'content',
-						rules: [{ required: true, message: '检测内容不能为空', trigger: 'blur' }],
-						bind: {
-							filterable: true,
-						},
-					},
-					{
-						select: true,
-						label: '来源',
-						prop: 'source',
-						value: 1, // 默认手动
-						options: [
-							{ label: '手动', value: 1 },
-							{ label: '自动', value: 2 },
-						],
-						bind: {
-							filterable: true,
-						},
-					},
-				],
-				[
-					{
-						select: true,
-						label: '产线',
-						url: '/base/production-line/listAll',
-						prop: 'productionLineId',
-						bind: {
-							filterable: true,
-						},
-						rules: [{ required: true, message: '产线不能为空', trigger: 'blur' }],
-					},
-					{
-						select: true,
-						label: '工段',
-						url: '/base/workshop-section/listAll', // 这个 url 其实可加可不加，因为下面会更新 options
-						options: [], // 这个options也可加可不加, 因为下面会更新 options
-						prop: 'sectionId',
-						bind: {
-							filterable: true,
-						},
-						rules: [{ required: false, message: '不能为空', trigger: 'blur' }],
-					},
-				],
-				[
-					{
-						input: true,
-						label: '检测人员',
-						prop: 'checkPerson',
-					},
-					{
-						datetime: true,
-						label: '检测时间',
-						prop: 'checkTime',
-						rules: [{ required: true, message: '检测时间不能为空', trigger: 'blur' }],
-						bind: {
-							format: 'yyyy-MM-dd HH:mm:ss',
-							'value-format': 'timestamp',
-							// 'value-format': 'yyyy-MM-dd HH:mm:ss',
-							clearable: true,
-						},
-					},
-				],
-				[{ textarea: true, label: '描述', prop: 'explainText' }],
-				[{ input: true, label: '备注', prop: 'remark' }],
-			],
 			searchBarFormConfig: [
 				{
 					type: 'select',
-          label: '工单名称',
-          placeholder: '请选择工单名称',
+					label: '工单名称',
+					placeholder: '请选择工单名称',
 					param: 'workOrderId',
-          selectOptions: [],
-          filterable:true
+					selectOptions: [],
+					filterable: true,
 				},
 				{
-          type: 'select',
+					type: 'select',
 					label: '检测内容',
-          placeholder: '请输入检测内容',
-          selectOptions: [],
-          param: 'inspectionDetContent',
-          filterable: true
+					placeholder: '请输入检测内容',
+					selectOptions: [],
+					param: 'inspectionDetContent',
+					filterable: true,
 				},
 				{
 					type: 'datePicker',
@@ -179,9 +107,7 @@ export default {
 					type: 'separate',
 				},
 				{
-					type: this.$auth.hasPermi(
-						'base:quality-inspection-record:create'
-					)
+					type: this.$auth.hasPermi('base:quality-inspection-record:create')
 						? 'button'
 						: '',
 					btnName: '新增',
@@ -197,7 +123,7 @@ export default {
 							btnName: '修改',
 					  }
 					: undefined,
-        this.$auth.hasPermi('base:quality-inspection-record:delete')
+				this.$auth.hasPermi('base:quality-inspection-record:delete')
 					? {
 							type: 'delete',
 							btnName: '删除',
@@ -211,12 +137,12 @@ export default {
 					fixed: true,
 					width: 180,
 					filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
-        },
-        {
-          // width: 128,
-          prop: 'workOrderName',
-          label: '工单名称',
-        },
+				},
+				{
+					// width: 128,
+					prop: 'workOrderName',
+					label: '工单名称',
+				},
 				{
 					// width: 128,
 					prop: 'inspectionDetContent',
@@ -224,7 +150,7 @@ export default {
 				},
 				{
 					// width: 128,
-					prop: 'lineName',
+					prop: 'productionLineName',
 					label: '产线',
 				},
 				{
@@ -247,25 +173,25 @@ export default {
 				},
 			],
 			// 搜索框需要的 keys, 与上面 queryParams 的除 pageNo, pageSize 之外的 key 一一对应
-			searchBarKeys: ['inspectionDetContent', 'checkTime', 'productionLineId'],
+			searchBarKeys: ['workOrderId', 'inspectionDetContent', 'checkTime'],
 			form: {
 				id: undefined,
 				inspectionDetId: undefined,
 				inspectionDetContent: undefined,
 				productionLineId: undefined,
 				sectionId: undefined,
-        checkPerson: undefined,
-        workOrderId:undefined,
+				checkPerson: undefined,
+				workOrderId: undefined,
 				checkTime: undefined,
 				source: undefined,
-				explainText: undefined,
+				workOrderId: undefined,
 				remark: undefined,
 			},
 			// 查询参数
 			queryParams: {
 				pageNo: 1,
-        pageSize: 10,
-        workOrderId:null,
+				pageSize: 10,
+				workOrderId: null,
 				inspectionDetContent: null,
 				checkTime: [],
 				// productionLineId: null,
@@ -274,43 +200,20 @@ export default {
 	},
 	created() {
 		this.getList();
-		this.getProductLineList()
+		this.getProductLineList();
 	},
 	watch: {
 		form: {
 			handler: function (val) {
 				console.log('form change:', val);
 			},
-			deep: true
-		}
-		// 注册弹窗里产线改变时的监听事件
-		// 'form.productionLineId': {
-		// 	handler: function (val) {
-		// 		if (val == null) return;
-		// 		this.$axios('/base/workshop-section/listByParentId', {
-		// 			params: {
-		// 				id: val,
-		// 			},
-		// 		}).then((response) => {
-		// 			this.$set(
-		// 				this.rows[1][1], // 这里索引是硬编码，所以当 this.rows 里数据顺序改变时，此处也要改
-		// 				'options',
-		// 				response.data.map((item) => {
-		// 					return {
-		// 						label: item.name,
-		// 						value: item.id,
-		// 					};
-		// 				})
-		// 			);
-		// 		});
-		// 	},
-		// 	immediate: true,
-		// },
+			deep: true,
+		},
 	},
 	methods: {
 		/** 获取搜索栏的产线列表 */
 		getProductLineList() {
-      this.$axios('/base/core-work-order/listbyfilter').then((response) => {
+			this.$axios('/base/core-work-order/listbyfilter').then((response) => {
 				this.searchBarFormConfig[0].selectOptions = response.data.map(
 					(item) => {
 						return {
@@ -319,17 +222,17 @@ export default {
 						};
 					}
 				);
-      })
-      this.$axios('/base/quality-inspection-det/listAll').then((response) => {
-        this.searchBarFormConfig[1].selectOptions = response.data.map(
-          (item) => {
-            return {
-              name: item.content,
-              id: item.content,
-            };
-          }
-        );
-      });
+			});
+			this.$axios('/base/quality-inspection-det/listAll').then((response) => {
+				this.searchBarFormConfig[1].selectOptions = response.data.map(
+					(item) => {
+						return {
+							name: item.content,
+							id: item.content,
+						};
+					}
+				);
+			});
 		},
 		/** 查询列表 */
 		getList() {
@@ -356,7 +259,7 @@ export default {
 				checkPerson: undefined,
 				checkTime: undefined,
 				source: undefined,
-				explainText: undefined,
+				workOrderId: undefined,
 				remark: undefined,
 				productionLineId: undefined,
 			};
@@ -376,7 +279,7 @@ export default {
 		handleAdd() {
 			this.reset();
 			this.open = true;
-			this.title = '添加质量检查信息记录表';
+			this.title = '新增';
 		},
 		/** 修改按钮操作 */
 		handleUpdate(row) {
@@ -384,13 +287,13 @@ export default {
 			const id = row.id;
 			getQualityInspectionRecord(id).then((response) => {
 				/** 因为后端返回的时间是时间戳格式，需转换 */
-				const info = {}
-				Object.keys(this.form).forEach(key => {
-					info[key] = response.data[key]
+				const info = {};
+				Object.keys(this.form).forEach((key) => {
+					info[key] = response.data[key];
 				});
 				this.form = info;
 				this.open = true;
-				this.title = '修改质量检查信息记录表';
+				this.title = '编辑';
 			});
 		},
 		/** 提交按钮 */
diff --git a/src/views/quality/qualityScrapLog/add-or-updata.vue b/src/views/quality/qualityScrapLog/add-or-updata.vue
index 01cdb1e8..b40e9df9 100644
--- a/src/views/quality/qualityScrapLog/add-or-updata.vue
+++ b/src/views/quality/qualityScrapLog/add-or-updata.vue
@@ -1,10 +1,3 @@
-<!--
- * @Author: zhp
- * @Date: 2023-11-06 15:15:30
- * @LastEditTime: 2023-11-21 14:11:18
- * @LastEditors: zhp
- * @Description:
--->
 <template>
 	<el-form
 		:model="dataForm"
@@ -18,7 +11,8 @@
 					<el-select
 						v-model="dataForm.workOrderId"
 						placeholder="请选择工单号"
-						style="width: 100%">
+						style="width: 100%"
+						:disabled="showDetail">
 						<el-option
 							v-for="dict in workOrderList"
 							:key="dict.id"
@@ -28,11 +22,12 @@
 				</el-form-item>
 			</el-col>
 			<el-col :span="12">
-				<el-form-item label="班组" prop="teamId">
+				<el-form-item label="班组" prop="teamId" :disabled="showDetail">
 					<el-select
 						v-model="dataForm.teamId"
 						placeholder="请选择班组"
-						style="width: 100%">
+						style="width: 100%"
+						:disabled="showDetail">
 						<el-option
 							v-for="dict in teamList"
 							:key="dict.id"
@@ -43,7 +38,10 @@
 			</el-col>
 			<el-col :span="12">
 				<el-form-item label="数量" prop="num" style="width: 100%">
-					<el-input v-model="dataForm.num" placeholder="请输入数量" />
+					<el-input
+						v-model="dataForm.num"
+						placeholder="请输入数量"
+						:disabled="showDetail" />
 				</el-form-item>
 			</el-col>
 			<el-col :span="12">
@@ -51,7 +49,8 @@
 					<el-select
 						v-model="dataForm.lineId"
 						placeholder="请选择产线"
-						style="width: 100%">
+						style="width: 100%"
+						:disabled="showDetail">
 						<el-option
 							v-for="dict in lineList"
 							:key="dict.id"
@@ -65,7 +64,8 @@
 					<el-select
 						v-model="dataForm.detId"
 						placeholder="请选择报废原因"
-						style="width: 100%">
+						style="width: 100%"
+						:disabled="showDetail">
 						<el-option
 							v-for="dict in detList"
 							:key="dict.id"
@@ -79,9 +79,11 @@
 					<el-date-picker
 						v-model="dataForm.logTime"
 						type="datetime"
+						label-format="yyyy-MM-dd HH:mm:ss"
 						value-format="yyyy-MM-dd HH:mm:ss"
 						style="width: 100%"
-						placeholder="选择日期"></el-date-picker>
+						placeholder="选择日期"
+						:disabled="showDetail"></el-date-picker>
 				</el-form-item>
 			</el-col>
 			<el-col :span="12">
@@ -89,7 +91,8 @@
 					<el-select
 						v-model="dataForm.source"
 						placeholder="请选择来源"
-						style="width: 100%">
+						style="width: 100%"
+						:disabled="showDetail">
 						<el-option
 							v-for="dict in sourceList"
 							:key="dict.id"
@@ -100,13 +103,20 @@
 			</el-col>
 			<el-col :span="24">
 				<el-form-item label="描述" prop="description">
-					<el-input v-model="dataForm.description" placeholder="请输入描述" />
+					<el-input
+						v-model="dataForm.description"
+						placeholder="请输入描述"
+						type="textarea"
+						:autosize="{ minRows: 2, maxRows: 4 }"
+						:disabled="showDetail" />
 				</el-form-item>
 			</el-col>
-
 			<el-col :span="24">
 				<el-form-item label="备注" prop="remark">
-					<el-input v-model="dataForm.remark" placeholder="备注" />
+					<el-input
+						v-model="dataForm.remark"
+						placeholder="备注"
+						:disabled="showDetail" />
 				</el-form-item>
 			</el-col>
 		</el-row>
@@ -114,7 +124,6 @@
 </template>
 
 <script>
-import basicAdd from '../../core/mixins/basic-add';
 import {
 	createQualityScrapLog,
 	updateQualityScrapLog,
@@ -124,22 +133,12 @@ import {
 	getDetList,
 	getLineList,
 } from '@/api/base/qualityScrapLog';
-import { getList } from '@/api/base/qualityScrapType';
-// import { getMaterialList } from "@/api/base/material";
+// import { getList } from '@/api/base/qualityScrapType';
 import moment from 'moment';
 export default {
-	mixins: [basicAdd],
 	data() {
 		return {
-			urlOptions: {
-				isGetCode: false,
-				// codeURL: getCode,
-				createURL: createQualityScrapLog,
-				updateURL: updateQualityScrapLog,
-				infoURL: getQualityScrapLog,
-			},
 			lineList: [],
-			typeList: [],
 			workOrderList: [],
 			detList: [],
 			teamList: [],
@@ -160,15 +159,12 @@ export default {
 				detId: undefined,
 				workOrderId: null,
 				teamId: undefined,
-				num: undefined,
+				num: null,
 				lineId: undefined,
 				description: undefined,
-				// description: undefined,
 				remark: undefined,
 			},
-			// materialList: [],
 			dataRule: {
-				// materialId: [{ required: true, message: "", trigger: "blur" }],
 				workOrderId: [
 					{ required: true, message: '工单号不能为空', trigger: 'change' },
 				],
@@ -181,79 +177,93 @@ export default {
 					{ required: true, message: '报废时间不能为空', trigger: 'change' },
 				],
 			},
+			showDetail: false,
 		};
 	},
 	mounted() {
-		this.getDict();
-		console.log('我看看', this.dataForm);
-		this.getCurrentTime();
+		this.getList();
 	},
 	methods: {
-		getCurrentTime() {
-			// new Date().Format("yyyy-MM-dd HH:mm:ss")
-			this.dataForm.logTime = new Date();
-			// this.dataForm.logTime = year + "-" + month + "-" + day;
-			console.log(this.dataForm.logTime);
+		init(id, show) {
+			this.showDetail = show ? true : false;
+			this.dataForm.id = id || undefined;
+			if (id) {
+				// 编辑
+				getQualityScrapLog(id).then((res) => {
+					console.log(res);
+					this.dataForm = res.data;
+					this.dataForm.logTime = res.data.logTime || null;
+					console.log('==================');
+				});
+			} else {
+				this.dataForm.logTime = moment().format('yyyy-MM-DD hh:mm:ss');
+			}
 		},
-		async getDict() {
+		// 表单提交
+		dataFormSubmit() {
+			this.$refs['dataForm'].validate((valid) => {
+				if (!valid) {
+					return false;
+				}
+				// 修改的提交
+				if (this.dataForm.id) {
+					updateQualityScrapLog(this.dataForm).then((response) => {
+						this.$modal.msgSuccess('修改成功');
+						this.visible = false;
+						this.$emit('refreshDataList');
+					});
+					return;
+				}
+				// 添加的提交
+				createQualityScrapLog(this.dataForm).then((response) => {
+					this.$modal.msgSuccess('新增成功');
+					this.visible = false;
+					this.$emit('refreshDataList');
+				});
+			});
+		},
+		getList() {
 			// 物料列表
-			const res = await getList();
-			this.typeList = res.data;
 			getWorkOrderList().then((res) => {
 				console.log(res);
-				// console.log(response);
 				this.workOrderList = res.data.map((item) => {
 					return {
 						name: item.name,
 						id: item.id,
 					};
 				});
-				// console.log(this.formConfig[0].selectOptions);
-				// this.listQuery.total = response.data.total;
 			});
 			getLineList().then((res) => {
 				console.log(res);
-				// console.log(response);
 				this.lineList = res.data.map((item) => {
 					return {
 						name: item.name,
 						id: item.id,
 					};
 				});
-				// console.log(this.formConfig[0].selectOptions);
-				// this.listQuery.total = response.data.total;
 			});
 			getDetList().then((res) => {
 				console.log(res);
-				// console.log(response);
 				this.detList = res.data.map((item) => {
 					return {
 						name: item.content,
 						id: item.id,
 					};
 				});
-				// console.log(this.formConfig[0].selectOptions);
-				// this.listQuery.total = response.data.total;
 			});
 			getTeamList().then((res) => {
 				console.log(res);
-				// console.log(response);
 				this.teamList = res.data.map((item) => {
 					return {
 						name: item.name,
 						id: item.id,
 					};
 				});
-				// console.log(this.formConfig[0].selectOptions);
-				// this.listQuery.total = response.data.total;
 			});
 		},
-		// setMaterialCode() {
-		// 	const chooseM = this.materialList.filter(item => {
-		// 		return item.id === this.dataForm.materialId
-		// 	})
-		// 	this.dataForm.materialCode = chooseM[0].code
-		// }
+		formClear() {
+			this.$refs.dataForm.resetFields();
+		},
 	},
 };
 </script>
diff --git a/src/views/quality/qualityScrapLog/detail-or-updata.vue b/src/views/quality/qualityScrapLog/detail-or-updata.vue
deleted file mode 100644
index 2d78de45..00000000
--- a/src/views/quality/qualityScrapLog/detail-or-updata.vue
+++ /dev/null
@@ -1,284 +0,0 @@
-<!--
- * @Author: zhp
- * @Date: 2023-11-06 15:15:30
- * @LastEditTime: 2023-11-07 19:38:13
- * @LastEditors: zhp
- * @Description:
--->
-<template>
-	<el-dialog
-		:visible.sync="dialogVisible"
-		width="50%"
-		:before-close="handleClose">
-		<small-title slot="title" :no-padding="true">
-			{{ '详情' }}
-		</small-title>
-		<el-form
-			:model="dataForm"
-			:rules="dataRule"
-			ref="dataForm"
-			@keyup.enter.native="dataFormSubmit()"
-			label-width="auto">
-			<el-row :gutter="24">
-				<el-col :span="8">
-					<el-form-item label="工单号" prop="workOrderId">
-						<el-select
-							v-model="dataForm.workOrderId"
-							placeholder="请选择工单号"
-							disabled>
-							<el-option
-								v-for="dict in workOrderList"
-								:key="dict.id"
-								:label="dict.name"
-								:value="dict.id" />
-						</el-select>
-					</el-form-item>
-				</el-col>
-				<el-col :span="8">
-					<el-form-item label="班组" prop="teamId">
-						<el-select
-							v-model="dataForm.teamId"
-							placeholder="请选择班组"
-							disabled>
-							<el-option
-								v-for="dict in teamList"
-								:key="dict.id"
-								:label="dict.name"
-								:value="dict.id" />
-						</el-select>
-					</el-form-item>
-				</el-col>
-				<el-col :span="8">
-					<el-form-item label="数量" prop="sum">
-						<el-input
-							v-model="dataForm.sum"
-							placeholder="请输入数量"
-							disabled />
-					</el-form-item>
-				</el-col>
-			</el-row>
-			<el-row :gutter="20">
-				<el-col :span="8">
-					<el-form-item label="产线" prop="lineId">
-						<el-select
-							v-model="dataForm.lineId"
-							placeholder="请选择产线"
-							disabled>
-							<el-option
-								v-for="dict in lineList"
-								:key="dict.id"
-								:label="dict.name"
-								:value="dict.id" />
-						</el-select>
-					</el-form-item>
-				</el-col>
-				<el-col :span="8">
-					<el-form-item label="报废原因" prop="detId">
-						<el-select
-							v-model="dataForm.detId"
-							placeholder="请选择报废原因"
-							disabled>
-							<el-option
-								v-for="dict in detList"
-								:key="dict.id"
-								:label="dict.name"
-								:value="dict.id" />
-						</el-select>
-					</el-form-item>
-				</el-col>
-
-				<el-col :span="8">
-					<el-form-item label="报废时间" prop="logTime">
-						<el-date-picker
-							v-model="dataForm.logTime"
-							type="datetime"
-							value-format="yyyy-MM-dd HH:mm:ss"
-							disabled
-							placeholder="选择日期"></el-date-picker>
-					</el-form-item>
-				</el-col>
-			</el-row>
-			<el-row :gutter="20">
-				<el-col :span="8">
-					<el-form-item label="来源" prop="source">
-						<el-select
-							v-model="dataForm.source"
-							placeholder="请选择来源"
-							disabled>
-							<el-option
-								v-for="dict in sourceList"
-								:key="dict.id"
-								:label="dict.name"
-								:value="dict.id" />
-						</el-select>
-					</el-form-item>
-				</el-col>
-				<el-col :span="8">
-					<el-form-item label="描述" prop="description">
-						<el-input
-							v-model="dataForm.description"
-							placeholder="请输入描述"
-							disabled />
-					</el-form-item>
-				</el-col>
-
-				<el-col :span="8">
-					<el-form-item label="备注" prop="remark">
-						<el-input v-model="dataForm.remark" placeholder="备注" disabled />
-					</el-form-item>
-				</el-col>
-			</el-row>
-		</el-form>
-	</el-dialog>
-</template>
-
-<script>
-import basicAdd from '../../core/mixins/basic-add';
-import {
-	createQualityScrapLog,
-	updateQualityScrapLog,
-	getQualityScrapLog,
-	getWorkOrderList,
-	getTeamList,
-	getDetList,
-	getLineList,
-} from '@/api/base/qualityScrapLog';
-import { getList } from '@/api/base/qualityScrapType';
-import SmallTitle from './SmallTitle';
-export default {
-	components: {
-		SmallTitle,
-	},
-	mixins: [basicAdd],
-	data() {
-		return {
-			urlOptions: {
-				isGetCode: false,
-				// codeURL: getCode,
-				createURL: createQualityScrapLog,
-				updateURL: updateQualityScrapLog,
-				infoURL: getQualityScrapLog,
-			},
-			lineList: [],
-			typeList: [],
-			workOrderList: [],
-			detList: [],
-			teamList: [],
-			sourceList: [
-				{
-					id: 1,
-					name: '手动',
-				},
-				{
-					id: 2,
-					name: '自动',
-				},
-			],
-			dialogVisible: false,
-			dataForm: {
-				id: undefined,
-				logTime: undefined,
-				source: 1,
-				detId: undefined,
-				workOrderId: null,
-				teamId: undefined,
-				num: undefined,
-				lineId: undefined,
-				description: undefined,
-				// description: undefined,
-				remark: undefined,
-			},
-			// materialList: [],
-			dataRule: {
-				// materialId: [{ required: true, message: "", trigger: "blur" }],
-				workOrderId: [
-					{ required: true, message: '工单号不能为空', trigger: 'change' },
-				],
-				num: [{ required: true, message: '数量不能为空', trigger: 'blur' }],
-				detId: [
-					{ required: true, message: '报废原因不能为空', trigger: 'change' },
-				],
-
-				logTime: [
-					{ required: true, message: '报废时间不能为空', trigger: 'change' },
-				],
-			},
-		};
-	},
-	mounted() {
-		// this.getDict()
-		console.log('我看看', this.dataForm);
-		this.getCurrentTime();
-	},
-	methods: {
-		init() {
-			this.dialogVisible = true;
-		},
-		getCurrentTime() {
-			// new Date().Format("yyyy-MM-dd HH:mm:ss")
-			this.dataForm.logTime = new Date();
-			// this.dataForm.logTime = year + "-" + month + "-" + day;
-			console.log(this.dataForm.logTime);
-		},
-		// async getDict() {
-		// 	// 物料列表
-		//   const res = await getList()
-		//   this.typeList = res.data
-		//   getWorkOrderList().then((res) => {
-		//     console.log(res);
-		//     // console.log(response);
-		//     this.workOrderList = res.data.map((item) => {
-		//       return {
-		//         name: item.name,
-		//         id: item.id
-		//       }
-		//     })
-		//     // console.log(this.formConfig[0].selectOptions);
-		//     // this.listQuery.total = response.data.total;
-		//   })
-		//   getLineList().then((res) => {
-		//     console.log(res);
-		//     // console.log(response);
-		//     this.lineList = res.data.map((item) => {
-		//       return {
-		//         name: item.name,
-		//         id: item.id
-		//       }
-		//     })
-		//     // console.log(this.formConfig[0].selectOptions);
-		//     // this.listQuery.total = response.data.total;
-		//   })
-		//   getDetList().then((res) => {
-		//     console.log(res);
-		//     // console.log(response);
-		//     this.workOrderList = res.data.map((item) => {
-		//       return {
-		//         name: item.name,
-		//         id: item.id
-		//       }
-		//     })
-		//     // console.log(this.formConfig[0].selectOptions);
-		//     // this.listQuery.total = response.data.total;
-		//   })
-		//   getTeamList().then((res) => {
-		//     console.log(res);
-		//     // console.log(response);
-		//     this.teamList = res.data.map((item) => {
-		//       return {
-		//         name: item.name,
-		//         id: item.id
-		//       }
-		//     })
-		//     // console.log(this.formConfig[0].selectOptions);
-		//     // this.listQuery.total = response.data.total;
-		//   })
-		// },
-		// setMaterialCode() {
-		// 	const chooseM = this.materialList.filter(item => {
-		// 		return item.id === this.dataForm.materialId
-		// 	})
-		// 	this.dataForm.materialCode = chooseM[0].code
-		// }
-	},
-};
-</script>
diff --git a/src/views/quality/qualityScrapLog/index.vue b/src/views/quality/qualityScrapLog/index.vue
index 95af4cfa..8cd6c82b 100644
--- a/src/views/quality/qualityScrapLog/index.vue
+++ b/src/views/quality/qualityScrapLog/index.vue
@@ -26,24 +26,32 @@
 		<base-dialog
 			:dialogTitle="addOrEditTitle"
 			:dialogVisible="addOrUpdateVisible"
-			@cancel="handleCancel"
-			@confirm="handleConfirm"
 			:before-close="handleCancel"
 			width="50%">
 			<add-or-update
 				ref="addOrUpdate"
 				@refreshDataList="successSubmit"></add-or-update>
+			<el-row slot="footer" type="flex" justify="end">
+				<el-col :span="12">
+					<el-button size="small" class="btnTextStyle" @click="handleCancel">
+						{{ this.addOrEditTitle === '详情' ? '关闭' : '取消' }}
+					</el-button>
+					<el-button
+						v-show="this.addOrEditTitle !== '详情'"
+						type="primary"
+						size="small"
+						class="btnTextStyle"
+						@click="handleConfirm">
+						确定
+					</el-button>
+				</el-col>
+			</el-row>
 		</base-dialog>
-		<detail-or-update
-			v-if="detailOrUpdateVisible"
-			ref="detailOrUpdate"
-			@refreshDataList="successSubmit" />
 	</div>
 </template>
 
 <script>
 import AddOrUpdate from './add-or-updata';
-import DetailOrUpdate from './detail-or-updata';
 
 import basicPage from '../../core/mixins/basic-page';
 import { parseTime } from '../../core/mixins/code-filter';
@@ -114,7 +122,6 @@ export default {
 					: undefined,
 			].filter((v) => v),
 			tableData: [],
-			detailOrUpdateVisible: false,
 			formConfig: [
 				{
 					type: 'select',
@@ -152,11 +159,11 @@ export default {
 					plain: true,
 				},
 			],
+			showDetail: false,
 		};
 	},
 	components: {
 		AddOrUpdate,
-		DetailOrUpdate,
 	},
 	created() {
 		this.getDict();
@@ -164,10 +171,10 @@ export default {
 	methods: {
 		otherMethods(val) {
 			if (val.type === 'detail') {
-				this.detailOrUpdateVisible = true;
-				// this.addOrEditTitle = "详情";
+				this.addOrEditTitle = '详情';
+				this.addOrUpdateVisible = true;
 				this.$nextTick(() => {
-					this.$refs.detailOrUpdate.init(val.data.id, true);
+					this.$refs.addOrUpdate.init(val.data.id, true);
 				});
 			}
 		},