diff --git a/src/api/base/coreWorkOrder.js b/src/api/base/coreWorkOrder.js
index bb50ab9b..0ee2495b 100644
--- a/src/api/base/coreWorkOrder.js
+++ b/src/api/base/coreWorkOrder.js
@@ -1,8 +1,8 @@
 /*
  * @Author: Do not edit
  * @Date: 2023-10-21 11:50:46
- * @LastEditTime: 2023-11-15 17:19:19
- * @LastEditors: DY
+ * @LastEditTime: 2024-12-27 15:20:14
+ * @LastEditors: zwq
  * @Description:
  */
 import request from '@/utils/request'
@@ -169,4 +169,12 @@ export function updateBatch(data) {
     method: 'put',
     data: data
   })
-}
\ No newline at end of file
+}
+// 更新订单表与工单关联表 多对多
+export function updateConCoreWOr(data) {
+  return request({
+    url: '/base/core-order-con-work-order/update',
+    method: 'put',
+    data: data
+  })
+}
diff --git a/src/api/equipment/base/maintain/items.js b/src/api/equipment/base/maintain/items.js
index e4cd33b8..d9a92739 100644
--- a/src/api/equipment/base/maintain/items.js
+++ b/src/api/equipment/base/maintain/items.js
@@ -23,6 +23,13 @@ export function getItemPageData(data) {
   })
 }
 
+export function getByEquId(id) {
+  return request({
+    url: '/base/equipment-maintain-program/getByEquId?id=' + id,
+    method: 'get',
+  })
+}
+
 export function getItemData(id) {
   return request({
     url: 'base/equipment-maintain-program/get?id=' + id,
diff --git a/src/views/equipment/base/maintain/PlanConfig/attr-add.vue b/src/views/equipment/base/maintain/PlanConfig/attr-add.vue
index ee02cd1b..adb926b1 100644
--- a/src/views/equipment/base/maintain/PlanConfig/attr-add.vue
+++ b/src/views/equipment/base/maintain/PlanConfig/attr-add.vue
@@ -37,7 +37,7 @@
 <script>
 import { createPlanDet, updatePlanDet, getPlanDet } from '@/api/equipment/base/maintain/planconfig';
 import { getEquipmentPage } from '@/api/base/equipment'
-import { getItemPageData } from '@/api/equipment/base/maintain/items';
+import { getByEquId } from '@/api/equipment/base/maintain/items';
 
 export default {
 	props: {
@@ -94,20 +94,14 @@ export default {
 			});
     },
     async handleChange(val) {
-      console.log(val);
-      let equipmentTypeId = undefined
-      this.eqList.forEach((ele) => {
-        if (ele.id == val) {
-          equipmentTypeId = ele.equipmentTypeId
-        }
-      })
-      const { code, data } = await getItemPageData({
-        pageNo: 1,
-        pageSize: 99,
-        equipmentTypeId: equipmentTypeId,
-      })
-      this.programList = data.list
-      console.log(data);
+      // let equipmentTypeId = undefined
+      // this.eqList.forEach((ele) => {
+      //   if (ele.id == val) {
+      //     equipmentTypeId = ele.equipmentTypeId
+      //   }
+      // })
+      const { code, data } = await getByEquId(val)
+      this.programList = data
     },
     handleDecChange(val) {
       let maintenanceDes = undefined
diff --git a/src/views/equipment/base/maintain/items/components/add-or-updata.vue b/src/views/equipment/base/maintain/items/components/add-or-updata.vue
index 2c3698d2..97d2d38d 100644
--- a/src/views/equipment/base/maintain/items/components/add-or-updata.vue
+++ b/src/views/equipment/base/maintain/items/components/add-or-updata.vue
@@ -70,6 +70,12 @@ import { getList,} from "@/api/base/qualityScrapType";
 
 export default {
 	mixins: [basicAdd],
+
+  props: {
+    mainId: {
+      type: String,
+    },
+  },
 	data() {
 		return {
 			urlOptions: {
@@ -96,7 +102,7 @@ export default {
         id: undefined,
         program: undefined,
         resultType: undefined,
-        equipmentTypeId: undefined,
+        mainId:this.mainId,
         minValue: undefined,
         maxValue: undefined,
         maintainResult:undefined,
@@ -117,7 +123,6 @@ export default {
 	},
 	mounted() {
 		this.getDict()
-		console.log('我看看', this.dataForm)
 	},
   methods: {
     handleClear() {
diff --git a/src/views/equipment/base/maintain/items/components/basic-add.js b/src/views/equipment/base/maintain/items/components/basic-add.js
index c8f7e43e..7e74dfb5 100644
--- a/src/views/equipment/base/maintain/items/components/basic-add.js
+++ b/src/views/equipment/base/maintain/items/components/basic-add.js
@@ -1,8 +1,8 @@
 /*
  * @Author: zwq
  * @Date: 2022-08-24 11:19:43
- * @LastEditors: zhp
- * @LastEditTime: 2024-07-19 14:47:02
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-12-13 15:50:49
  * @Description:
  */
 export default {
@@ -28,10 +28,8 @@ export default {
   activated() {
   },
   methods: {
-    init(obj) {
-      console.log(obj);
-      this.dataForm.id = obj.id || "";
-      this.dataForm.equipmentTypeId = obj.equipmentTypeId || "";
+    init(id) {
+      this.dataForm.id = id || "";
       this.visible = true;
       if (this.urlOptions.getOption) {
         this.getArr()
diff --git a/src/views/equipment/base/maintain/items/components/basic-page.js b/src/views/equipment/base/maintain/items/components/basic-page.js
index d4aab025..a6056a59 100644
--- a/src/views/equipment/base/maintain/items/components/basic-page.js
+++ b/src/views/equipment/base/maintain/items/components/basic-page.js
@@ -1,8 +1,8 @@
 /*
  * @Author: zhp
  * @Date: 2024-07-19 09:49:22
- * @LastEditTime: 2024-07-22 09:17:31
- * @LastEditors: zhp
+ * @LastEditTime: 2024-12-13 15:52:24
+ * @LastEditors: zwq
  * @Description:
  */
 export default {
@@ -88,12 +88,8 @@ export default {
       if (val.type === "edit") {
         this.addOrUpdateVisible = true;
         this.addOrEditTitle = "编辑"
-        let obj = {
-          id: val.data.id,
-          equipmentTypeId:val.data.equipmentTypeId
-        }
         this.$nextTick(() => {
-          this.$refs.addOrUpdate.init(obj);
+          this.$refs.addOrUpdate.init(val.data.id);
         });
       } else if (val.type === "delete") {
         this.deleteHandle(val.data.id, val.data.program, val.data._pageIndex)
diff --git a/src/views/equipment/base/maintain/items/index.vue b/src/views/equipment/base/maintain/items/index.vue
index e1af2a5a..d8acead8 100644
--- a/src/views/equipment/base/maintain/items/index.vue
+++ b/src/views/equipment/base/maintain/items/index.vue
@@ -186,7 +186,7 @@ export default {
     handleDetail(row) {
       this.showDetailVisible = true
       this.$nextTick(() => {
-        this.$refs.showDetail.init(row.equipmentTypeId)
+        this.$refs.showDetail.init(row.id)
       })
 				// alert('跳转到 保养记录')
 				// console.log(row)
diff --git a/src/views/equipment/base/maintain/items/showDetail.vue b/src/views/equipment/base/maintain/items/showDetail.vue
index f14b95e0..4cdd945b 100644
--- a/src/views/equipment/base/maintain/items/showDetail.vue
+++ b/src/views/equipment/base/maintain/items/showDetail.vue
@@ -1,8 +1,8 @@
 <!--
  * @Author: zhp
  * @Date: 2024-07-12 13:28:21
- * @LastEditTime: 2024-07-23 14:00:38
- * @LastEditors: zhp
+ * @LastEditTime: 2024-12-13 16:03:29
+ * @LastEditors: zwq
  * @Description:
 -->
 <template>
@@ -22,7 +22,7 @@
     </el-drawer>
     <base-dialog :dialogTitle="addOrEditTitle" :dialogVisible="addOrUpdateVisible" @cancel="handleCancel"
       @confirm="handleConfirm" :before-close="handleCancel" width="30%">
-      <add-or-update ref="addOrUpdate" @refreshDataList="successSubmit"></add-or-update>
+      <add-or-update ref="addOrUpdate" @refreshDataList="successSubmit" :main-id="queryParams.mainId"></add-or-update>
     </base-dialog>
   </div>
 
@@ -74,7 +74,7 @@ export default {
         queryParams: {
           pageNo:1,
           pageSize:10,
-          equipmentTypeId:null,
+          mainId:null,
         },
         tableProps,
         basePath: 'base/equipment-maintain-program',
@@ -105,21 +105,18 @@ export default {
     },
     getDataList(id) {
       this.dataListLoading = true;
-      this.queryParams.equipmentTypeId = id
-      this.urlOptions.getDataListURL(this.listQuery).then(response => {
+      this.queryParams.mainId = id
+      this.urlOptions.getDataListURL(this.queryParams).then(response => {
         this.tableData = response.data.list;
-        this.listQuery.total = response.data.total;
+        this.queryParams.total = response.data.total;
         this.dataListLoading = false
       });
     },
     handleAdd() {
       this.addOrUpdateVisible = true
       this.addOrEditTitle = '新增'
-      let obj = {
-        equipmentTypeId: this.queryParams.equipmentTypeId
-      }
       this.$nextTick(() => {
-        this.$refs.addOrUpdate.init(obj)
+        this.$refs.addOrUpdate.init()
       });
     },
     init(id) {
diff --git a/src/views/material/material/add-or-updata.vue b/src/views/material/material/add-or-updata.vue
index d99f2ea0..fd0f1893 100644
--- a/src/views/material/material/add-or-updata.vue
+++ b/src/views/material/material/add-or-updata.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: zwq
- * @LastEditTime: 2024-08-14 15:24:11
+ * @LastEditTime: 2024-12-12 09:54:25
  * @Description:
 -->
 <template>
@@ -83,7 +83,7 @@
 				</el-form-item>
 			</el-col>
 			<el-col :span="8" v-if="showTime">
-				<el-form-item label="生产单位用时" prop="processTime">
+				<el-form-item label="生产单位用时(s)" prop="processTime">
 					<el-input
 						v-model.number="dataForm.processTime"
 						type="number"
diff --git a/src/views/material/material/index.vue b/src/views/material/material/index.vue
index 277dd2df..82f383b5 100644
--- a/src/views/material/material/index.vue
+++ b/src/views/material/material/index.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2024-07-01 14:54:06
  * @LastEditors: zwq
- * @LastEditTime: 2024-08-21 11:19:51
+ * @LastEditTime: 2024-12-16 10:03:30
  * @Description:
 -->
 <template>
@@ -346,6 +346,7 @@ export default {
 			this.listQuery.typeId = data.id || undefined;
 			this.listQuery.product = data.product;
 			this.$refs.searchBarForm.formInline.type = data.name || undefined;
+      this.getDataList()
 		},
 		// 新增节点
 		append(data) {
diff --git a/src/views/material/materialUseLog/add-or-updata.vue b/src/views/material/materialUseLog/add-or-updata.vue
index 9480362a..6d40925d 100644
--- a/src/views/material/materialUseLog/add-or-updata.vue
+++ b/src/views/material/materialUseLog/add-or-updata.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: zwq
- * @LastEditTime: 2024-10-14 09:26:53
+ * @LastEditTime: 2024-12-12 16:13:11
  * @Description:
 -->
 <template>
@@ -41,18 +41,19 @@
 				</el-form-item>
 			</el-col>
 			<el-col :span="8">
-				<el-form-item label="物料批次" prop="materialDateId">
+				<el-form-item label="物料批次" prop="materialDate">
 					<el-select
-						v-model="dataForm.materialDateId"
+						v-model="dataForm.materialDate"
 						clearable
 						filterable
+						allow-create
 						placeholder="请选择物料批次"
 						style="width: 100%">
 						<el-option
 							v-for="dict in materialDateList"
 							:key="dict.id"
 							:label="dict.code"
-							:value="dict.id" />
+							:value="dict.code" />
 					</el-select>
 				</el-form-item>
 			</el-col>
@@ -147,7 +148,7 @@ import {
 	getMaterialLog,
 	getEqListAll,
 } from '@/api/base/materialUseLog';
-import { getMaterialTree,getMaterialList } from '@/api/base/material';
+import { getMaterialTree, getMaterialList } from '@/api/base/material';
 import { getMaterDateList } from '@/api/base/materialDate';
 import { listSimpleUsers } from '@/api/system/user';
 
@@ -164,7 +165,7 @@ export default {
 				id: undefined,
 				materialId: undefined,
 				materialCode: undefined,
-				materialDateId: undefined,
+				materialDate: undefined,
 				equipmentId: undefined,
 				userName: undefined,
 				userNames: [],
@@ -208,15 +209,17 @@ export default {
 	methods: {
 		async getDictData() {
 			const materRes = await getMaterialTree(); //
-      let typeId = materRes.data.find(item=>item.product === 0).id
-      const listQuery= {
-        typeId:typeId
-      }
+			let typeId = materRes.data.find((item) => item.product === 0).id;
+			const listQuery = {
+				typeId: typeId,
+			};
 			const materData = await getMaterialList(listQuery);
 			this.materialList = [];
 			this.materialList = materData.data;
-			const dateRes = await getMaterDateList();
-			this.materialDateList = dateRes.data;
+			if (!this.dataForm.id) {
+				const dateRes = await getMaterDateList();
+				this.materialDateList = dateRes.data;
+			}
 			const eqRes = await getEqListAll();
 			this.eqList = eqRes.data;
 			const workerRes = await listSimpleUsers();
@@ -257,7 +260,7 @@ export default {
 						this.dataForm.id = response.data.id;
 						this.dataForm.materialCode = response.data.materialCode;
 						this.dataForm.materialId = response.data.materialId;
-						this.dataForm.materialDateId = response.data.materialDateId;
+						this.dataForm.materialDate = response.data.materialDateName;
 						this.dataForm.equipmentId = response.data.equipmentId;
 						this.dataForm.useTime = response.data.useTime;
 						// this.dataForm.userName = response.data.userName
@@ -265,6 +268,11 @@ export default {
 						this.dataForm.source = response.data.source;
 						this.dataForm.remark = response.data.remark;
 						this.dataForm.userNames = response.data.userName.split(',');
+						getMaterDateList({ materialId: this.dataForm.materialId }).then(
+							(res) => {
+								this.materialDateList = res.data;
+							}
+						);
 					});
 				} else {
 				}
diff --git a/src/views/produce/workOrder/detail.vue b/src/views/produce/workOrder/detail.vue
index 6bf9ada0..c4423ea7 100644
--- a/src/views/produce/workOrder/detail.vue
+++ b/src/views/produce/workOrder/detail.vue
@@ -2,21 +2,26 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: zwq
- * @LastEditTime: 2024-11-19 16:49:09
+ * @LastEditTime: 2024-12-27 15:34:28
  * @Description:
 -->
 <template>
-  <div class="status-timegraph-container" style="background: #f2f4f9; flex: 1; display: flex; flex-direction: column">
-    <el-row v-show="workOrderButton.length !== 0" class="" style="
-				margin-bottom: 4px;
-				border-radius: 8px;
-			">
-        <workOrderNav :id-list="workOrderButton" @getWorkOrderId="getId">
-        </workOrderNav>
-    </el-row>
-    <el-row class="" style="
+	<div
+		class="status-timegraph-container"
+		style="background: #f2f4f9; flex: 1; display: flex; flex-direction: column">
+		<el-row
+			v-show="workOrderButton.length !== 0"
+			class=""
+			style="margin-bottom: 4px; border-radius: 8px">
+			<workOrderNav
+				:id-list="workOrderButton"
+				@getWorkOrderId="getId"></workOrderNav>
+		</el-row>
+		<el-row
+			class=""
+			style="
 				height: 1px;
-				flex: .3;
+				flex: 0.3;
 				margin-bottom: 12px;
 				background: #fff;
 				padding: 16px;
@@ -24,132 +29,280 @@
 				display: flex;
 				flex-direction: column;
 			">
-      <div class="content">
-        <div>
-          <h1 class='orderTitle'>工单编码：{{ dataForm.code }}</h1>
-          <el-button type="primary" plain style='position: absolute;right: 16px;top:5px' v-show="workOrderButton.length === 0" @click='goWorkOrderList()'><svg-icon icon-class="return" />返回</el-button>
-        </div>
-        <small-title style="margin: 16px 0" size="sm" :no-padding="true">
-          基本信息
-        </small-title>
-        <div class="formContent">
-          <el-row :gutter="20">
-            <el-col :span="4"><p class='title'>工单名称</p><p class='text'>{{ dataForm.name }}</p></el-col>
-            <el-col :span="4"><p class='title'>工单来源</p><p class='text'>{{ dataForm.triggerOrigin === 1 ? 'MES-手动' : (dataForm.triggerOrigin === 2 ? 'MES-订单下发' : (dataForm.triggerOrigin === 3 ? 'ERP' : ''))}}</p>
-            </el-col>
-            <el-col :span="4"><p class='title'>所属订单</p>
-              <p class='text' style='overflow: hidden;white-space: nowrap;text-overflow: ellipsis;' :title="orderList.map(item => item.orderName).join(', ')">{{ orderList.map(item => item.orderName).join(', ') }}</p>
-            </el-col>
-            <el-col :span="4"><p class='title'>产品名称</p><p class='text'>{{ dataForm.productName }}</p></el-col>
-            <el-col :span="4"><p class='title'>规 格</p><p class='text'>{{ dataForm.specifications }}</p></el-col>
-            <el-col :span="4"><p class='title'>计划生产数量</p><p class='text'>{{ dataForm.planQuantity }}</p></el-col>
-            <el-col :span="4"><p class='title'>预计用时(小时)</p><p class='text'>{{ dataForm.remainingTime }}</p></el-col>
-            <el-col :span="4"><p class='title'>计划投入数量</p><p class='text'>{{ dataForm.planAssignQuantity }}</p></el-col>
-            <el-col :span="4"><p class='title'>优先级</p><p class='text'> {{ fitlerP(dataForm.priority) }}</p></el-col>
-            <el-col :span="4"><p class='title'>负责人</p><p class='text'>{{ dataForm.workers }}</p></el-col>
-            <el-col :span="4"><p class='title'>关联产线</p>
-              <p class='text'><span v-for="(item, index) in dataForm.productLineIds" :key="index" style="margin-right: 10px">{{ item.lineName
-                }}</span></p>
-            </el-col>
-            <el-col :span="4"><p class='title'>物料计算方式</p><p class='text'>{{ dataForm.materialMethod === 1 ? '产品基础' : dataForm.materialMethod === 2 ? '工艺扩展'
-              :
-              '' }}</p></el-col>
+			<div class="content">
+				<div>
+					<h1 class="orderTitle">工单编码：{{ dataForm.code }}</h1>
+					<el-button
+						type="primary"
+						plain
+						style="position: absolute; right: 16px; top: 5px"
+						v-show="workOrderButton.length === 0"
+						@click="goWorkOrderList()">
+						<svg-icon icon-class="return" />
+						返回
+					</el-button>
+				</div>
+				<small-title style="margin: 16px 0" size="sm" :no-padding="true">
+					基本信息
+				</small-title>
+				<div class="formContent">
+					<el-row :gutter="20">
+						<el-col :span="4">
+							<p class="title">工单名称</p>
+							<p class="text">{{ dataForm.name }}</p>
+						</el-col>
+						<el-col :span="4">
+							<p class="title">工单来源</p>
+							<p class="text">
+								{{
+									dataForm.triggerOrigin === 1
+										? 'MES-手动'
+										: dataForm.triggerOrigin === 2
+										? 'MES-订单下发'
+										: dataForm.triggerOrigin === 3
+										? 'ERP'
+										: ''
+								}}
+							</p>
+						</el-col>
+						<el-col :span="4">
+							<p class="title">所属订单</p>
+							<p
+								class="text"
+								style="
+									overflow: hidden;
+									white-space: nowrap;
+									text-overflow: ellipsis;
+								"
+								:title="orderList.map((item) => item.orderName).join(', ')">
+								{{ orderList.map((item) => item.orderName).join(', ') }}
+							</p>
+						</el-col>
+						<el-col :span="4">
+							<p class="title">产品名称</p>
+							<p class="text">{{ dataForm.productName }}</p>
+						</el-col>
+						<el-col :span="4">
+							<p class="title">规 格</p>
+							<p class="text">{{ dataForm.specifications }}</p>
+						</el-col>
+						<el-col :span="4">
+							<p class="title">计划生产数量</p>
+							<p class="text">{{ dataForm.planQuantity }}</p>
+						</el-col>
+						<el-col :span="4">
+							<p class="title">预计用时(小时)</p>
+							<p class="text">{{ dataForm.remainingTime }}</p>
+						</el-col>
+						<el-col :span="4">
+							<p class="title">计划投入数量</p>
+							<p class="text">{{ dataForm.planAssignQuantity }}</p>
+						</el-col>
+						<el-col :span="4">
+							<p class="title">优先级</p>
+							<p class="text">{{ fitlerP(dataForm.priority) }}</p>
+						</el-col>
+						<el-col :span="4">
+							<p class="title">负责人</p>
+							<p class="text">{{ dataForm.workers }}</p>
+						</el-col>
+						<el-col :span="4">
+							<p class="title">关联产线</p>
+							<p class="text">
+								<span
+									v-for="(item, index) in dataForm.productLineIds"
+									:key="index"
+									style="margin-right: 10px">
+									{{ item.lineName }}
+								</span>
+							</p>
+						</el-col>
+						<el-col :span="4">
+							<p class="title">物料计算方式</p>
+							<p class="text">
+								{{
+									dataForm.materialMethod === 1
+										? '产品基础'
+										: dataForm.materialMethod === 2
+										? '工艺扩展'
+										: ''
+								}}
+							</p>
+						</el-col>
 
-            <el-col :span="4"><p class='title'>关联工艺</p><p class='text'>{{ dataForm.processFlowName }}</p></el-col>
-          </el-row>
-        </div>
-      </div>
-    </el-row>
-    <el-row class="" style="
+						<el-col :span="4">
+							<p class="title">关联工艺</p>
+							<p class="text">
+								<span
+									v-for="(item, index) in dataForm.productLineIds"
+									:key="index"
+									style="margin-right: 10px">
+									{{ item.processFlowName }}
+								</span>
+							</p>
+						</el-col>
+					</el-row>
+				</div>
+			</div>
+		</el-row>
+		<el-row
+			class=""
+			style="
 				height: 1px;
 				flex: 1;
 				margin-bottom: 12px;
-        padding: 16px;
+				padding: 16px;
 				background: #fff;
 				border-radius: 8px;
 				display: flex;
 				flex-direction: column;
 			">
-      <el-tabs v-model="activeName" @tab-click="switchTab">
-        <el-tab-pane label="生产信息" name="produce">
-          <div class="formContent">
-            <el-row :gutter="20">
-              <el-col :span="4"><p class='title'>工单创建时间</p><p class='text'>{{ parseTime(dataForm.createTime) }}</p></el-col>
-              <el-col :span="4"><p class='title'>计划开始时间</p><p class='text'>{{ parseTime(dataForm.planStartTime) }}</p></el-col>
-              <el-col :span="4"><p class='title'>计划完成时间</p><p class='text'>{{ parseTime(dataForm.planFinishTime) }}</p></el-col>
-              <el-col :span="4"><p class='title'>预计结束时间</p><p class='text'>{{ parseTime(dataForm.expectedFinishTime) }}</p></el-col>
-              <el-col :span="4"><p class='title'>实际开始时间</p><p class='text'>{{ parseTime(dataForm.startProduceTime) }}</p></el-col>
-              <el-col :span="4"><p class='title'>实际完成时间</p><p class='text'>{{ parseTime(dataForm.finishProduceTime) }}</p></el-col>
-              <el-col :span="4"><p class='title'>工单状态</p><p class='text'>{{ fitlerS(dataForm.status) }}</p></el-col>
-              <el-col :span="4"><p class='title'>实际投入数量</p><p class='text'>{{ dataForm.assignQuantity }}</p></el-col>
-              <el-col :span="4"><p class='title'>实际生产数量</p><p class='text'>{{ dataForm.actualQuantity }}</p></el-col>
-              <el-col :span="4"><p class='title'>废片数量</p><p class='text'>{{ dataForm.nokQuantity }}</p></el-col>
-              <el-col :span="4"><p class='title'>检测瑕疵数</p><p class='text'>{{ dataForm.unpassCheckNum }}</p></el-col>
-            </el-row>
-          </div>
-        </el-tab-pane>
-        <el-tab-pane label="订单信息" name="order">
-          <base-table :max-height="tableH" :table-props="tableProps" :page="listQuery.pageNo"
-            :limit="listQuery.pageSize" :table-data="orderList">
-            <method-btn v-if="!isdetail" slot="handleBtn" :width="120" label="操作" :method-list="tableBtn"
-              @clickBtn="handleClick" />
-          </base-table>
-        </el-tab-pane>
-        <el-tab-pane label="预计用料" name="material">
-          <base-table :max-height="tableH" :table-props="tableProps1" :page="listQuery1.pageNo"
-            :limit="listQuery1.pageSize" :table-data="materialList" />
-        </el-tab-pane>
-        <el-tab-pane label="质量信息" name="quality">
-          <base-table :max-height="tableH" :table-props="tablePropsQuality" :table-data="qualityList" :page="1"
-            :limit="10" />
-        </el-tab-pane>
-        <el-tab-pane label="能源信息" name="energy">
-          <div class="toggleTabBox">
-            <div :class="{ active: activeModule === 'dataList' }" @click="toggleTab('dataList')">数据列表</div>
-            <div :class="{ active: activeModule === 'barChart' }" @click="toggleTab('barChart')">柱状图</div>
-          </div>
-          <div>
-            <div v-show="activeModule === 'dataList'">
-              <!-- 表格 -->
-              <base-table :max-height="tableH" :table-props="tablePropsEnergy" :page="listQueryEnergy.pageNo"
-                :limit="listQueryEnergy.pageSize" :table-data="energyList" />
-            </div>
-            <!-- 图形 -->
-            <div v-show="activeModule === 'barChart'">
-              <bar-chart ref="orderEnergyChart" :chartData="chartData" />
-            </div>
-          </div>
-        </el-tab-pane>
-      </el-tabs>
+			<el-tabs v-model="activeName" @tab-click="switchTab">
+				<el-tab-pane label="生产信息" name="produce">
+					<div class="formContent">
+						<el-row :gutter="20">
+							<el-col :span="4">
+								<p class="title">工单创建时间</p>
+								<p class="text">{{ parseTime(dataForm.createTime) }}</p>
+							</el-col>
+							<el-col :span="4">
+								<p class="title">计划开始时间</p>
+								<p class="text">{{ parseTime(dataForm.planStartTime) }}</p>
+							</el-col>
+							<el-col :span="4">
+								<p class="title">计划完成时间</p>
+								<p class="text">{{ parseTime(dataForm.planFinishTime) }}</p>
+							</el-col>
+							<el-col :span="4">
+								<p class="title">预计结束时间</p>
+								<p class="text">{{ parseTime(dataForm.expectedFinishTime) }}</p>
+							</el-col>
+							<el-col :span="4">
+								<p class="title">实际开始时间</p>
+								<p class="text">{{ parseTime(dataForm.startProduceTime) }}</p>
+							</el-col>
+							<el-col :span="4">
+								<p class="title">实际完成时间</p>
+								<p class="text">{{ parseTime(dataForm.finishProduceTime) }}</p>
+							</el-col>
+							<el-col :span="4">
+								<p class="title">工单状态</p>
+								<p class="text">{{ fitlerS(dataForm.status) }}</p>
+							</el-col>
+							<el-col :span="4">
+								<p class="title">实际投入数量</p>
+								<p class="text">{{ dataForm.assignQuantity }}</p>
+							</el-col>
+							<el-col :span="4">
+								<p class="title">实际生产数量</p>
+								<p class="text">{{ dataForm.actualQuantity }}</p>
+							</el-col>
+							<el-col :span="4">
+								<p class="title">废片数量</p>
+								<p class="text">{{ dataForm.nokQuantity }}</p>
+							</el-col>
+							<el-col :span="4">
+								<p class="title">检测瑕疵数</p>
+								<p class="text">{{ dataForm.unpassCheckNum }}</p>
+							</el-col>
+						</el-row>
+					</div>
+				</el-tab-pane>
+				<el-tab-pane label="订单信息" name="order">
+					<base-table
+						:max-height="tableH"
+						:table-props="tableProps"
+						:page="listQuery.pageNo"
+						:limit="listQuery.pageSize"
+						:table-data="orderList">
+						<method-btn
+							v-if="!isdetail"
+							slot="handleBtn"
+							:width="120"
+							label="操作"
+							:method-list="tableBtn"
+							@clickBtn="handleClick" />
+					</base-table>
+				</el-tab-pane>
+				<el-tab-pane label="预计用料" name="material">
+					<base-table
+						:max-height="tableH"
+						:table-props="tableProps1"
+						:page="listQuery1.pageNo"
+						:limit="listQuery1.pageSize"
+						:table-data="materialList" />
+				</el-tab-pane>
+				<el-tab-pane label="质量信息" name="quality">
+          <span style="font-size: 14px;">该工单未通过检测数合计:{{ allSumScrap }}</span>
+					<base-table
+						:max-height="tableH"
+						:table-props="tablePropsQuality"
+						:table-data="qualityList"
+						:page="1"
+						:limit="10" />
+				</el-tab-pane>
+				<el-tab-pane label="能源信息" name="energy">
+					<div class="toggleTabBox">
+						<div
+							:class="{ active: activeModule === 'dataList' }"
+							@click="toggleTab('dataList')">
+							数据列表
+						</div>
+						<div
+							:class="{ active: activeModule === 'barChart' }"
+							@click="toggleTab('barChart')">
+							柱状图
+						</div>
+					</div>
+					<div>
+						<div v-show="activeModule === 'dataList'">
+							<!-- 表格 -->
+							<base-table
+								:max-height="tableH"
+								:table-props="tablePropsEnergy"
+								:page="listQueryEnergy.pageNo"
+								:limit="listQueryEnergy.pageSize"
+								:table-data="energyList" />
+						</div>
+						<!-- 图形 -->
+						<div v-show="activeModule === 'barChart'">
+							<bar-chart ref="orderEnergyChart" :chartData="chartData" />
+						</div>
+					</div>
+				</el-tab-pane>
+			</el-tabs>
+		</el-row>
 
-    </el-row>
-
-    <!-- 对话框(添加 / 修改) -->
-    <!-- <base-dialog dialogTitle="添加设备" :dialogVisible="open" width="500px" @close="open = false" @cancel="open = false"
+		<!-- 对话框(添加 / 修改) -->
+		<!-- <base-dialog dialogTitle="添加设备" :dialogVisible="open" width="500px" @close="open = false" @cancel="open = false"
       @confirm="submitForm">
       <el-select v-if="open" style="width: 100%" filterable clearable v-model="queryParams.equipmentId"
         placeholder="请选择一个设备">
         <el-option v-for="eq in eqList" :key="eq.id" :value="eq.id" :label="eq.name"></el-option>
       </el-select>
     </base-dialog> -->
-  </div>
+	</div>
 </template>
 
 <script>
 // import basicAdd from '../../core/mixins/basic-add';
-import { getCoreWO, getMaterialBomPage, getConOrderList, getCoreWOListById,getMaterialCostWorkOrder } from "@/api/base/coreWorkOrder";
-import tableHeightMixin from '@/mixins/tableHeightMixin';
-import { getOrderEnergyData } from "@/api/monitoring/orderEnergy";
-// import { orderList } from "@/api/base/orderManage";
 import {
-  getStatisticalDataPage,
-} from '@/api/monitoring/statisticalData';
-import { getProcessFlowList } from '@/api/base/orderManage'
+	getCoreWO,
+	getMaterialBomPage,
+	getConOrderList,
+	getCoreWOListById,
+	getMaterialCostWorkOrder,
+} from '@/api/base/coreWorkOrder';
+import tableHeightMixin from '@/mixins/tableHeightMixin';
+import { getOrderEnergyData } from '@/api/monitoring/orderEnergy';
+// import { orderList } from "@/api/base/orderManage";
+import { getStatisticalDataPage } from '@/api/monitoring/statisticalData';
+import { getProcessFlowList } from '@/api/base/orderManage';
 import SmallTitle from './SmallTitle';
-import { publicFormatter } from "@/utils/dict";
-import { parseTime } from '@/utils/ruoyi'
-import workOrderNav  from './workOrderNav.vue'
-import BarChart from "./barChart"
+import { publicFormatter } from '@/utils/dict';
+import { parseTime } from '@/utils/ruoyi';
+import workOrderNav from './workOrderNav.vue';
+import BarChart from './barChart';
 const tableBtn = [
 	{
 		type: 'edit',
@@ -176,134 +329,135 @@ const tableProps = [
 	{
 		prop: 'actualAssignmentQuantity',
 		label: '实际分配数量',
-	}
+	},
 ];
 
 const tableProps1 = [
 	{
 		prop: 'materialName',
-		label: '物料名称'
+		label: '物料名称',
 	},
 	{
 		prop: 'unit',
 		label: '单位',
-		filter: publicFormatter('unit_dict')
+		filter: publicFormatter('unit_dict'),
 	},
 	{
 		prop: 'remainingNum',
-		label: '剩余生产预计消耗'
+		label: '剩余生产预计消耗',
 	},
 ];
 const tablePropsEnergy = [
-  {
-    prop: 'objName',
-    label: '对象名称'
-  },
-  {
-    prop: 'objCode',
-    label: '对象编码',
-    // filter: publicFormatter('unit_dict')
-  },
-  {
-    prop: 'energyType',
-    label: '能源类型',
-    // filter: publicFormatter('unit_dict')
-  },
-  {
-    prop: 'startNum',
-    label: '工单开始值',
-    // filter: publicFormatter('unit_dict')
-  },
-  {
-    prop: 'endNum',
-    label: '工单结束值/当前值'
-  },
-  {
-    prop: 'useNum',
-    label: '使用量'
-  },
+	{
+		prop: 'objName',
+		label: '对象名称',
+	},
+	{
+		prop: 'objCode',
+		label: '对象编码',
+		// filter: publicFormatter('unit_dict')
+	},
+	{
+		prop: 'energyType',
+		label: '能源类型',
+		// filter: publicFormatter('unit_dict')
+	},
+	{
+		prop: 'startNum',
+		label: '工单开始值',
+		// filter: publicFormatter('unit_dict')
+	},
+	{
+		prop: 'endNum',
+		label: '工单结束值/当前值',
+	},
+	{
+		prop: 'useNum',
+		label: '使用量',
+	},
 ];
 export default {
-  mixins: [tableHeightMixin],
-  components: { SmallTitle, workOrderNav, BarChart },
-  computed: {
-    tablePropsQuality() {
-      return [
-        {
-          // width: 128,
-          prop: 'workOrderName',
-          label: '工单名称',
-        },
-        {
-          // width: 128,
-          prop: 'productionName',
-          label: '产品',
-        },
-        {
-          // width: 160,
-          prop: 'inspectionContent',
-          label: '检测内容',
-        },
-        ...this.dynamicProps,
-        {
-          // width: 128,
-          prop: 'sumScrap',
-          label: '未检测总数',
-        },
-        {
-          // width: 128,
-          prop: 'scrapRatio',
-          label: '比例(%)',
-          // subcomponent: {
-          // 	name: 'TextOnly',
-          // 	props: {
-          // 		injectData: {
-          // 			type: Object,
-          // 			default: () => ({}),
-          // 		},
-          // 	},
-          // 	data() {
-          // 		return {
-          // 			text: '比例',
-          // 		};
-          // 	},
-          // 	methods: {
-          // 		handleEmit(payload) {
-          // 			console.log('handleEmit', payload);
-          // 		},
-          // 	},
-          // 	render(h) {
-          // 		return h('el-button', { props: { type: 'text' } }, this.text);
-          // 	},
-          // },
-        },
-      ];
-    },
-  },
+	mixins: [tableHeightMixin],
+	components: { SmallTitle, workOrderNav, BarChart },
+	computed: {
+		tablePropsQuality() {
+			return [
+				// {
+				// 	// width: 128,
+				// 	prop: 'workOrderName',
+				// 	label: '工单名称',
+				// },
+				// {
+				// 	// width: 128,
+				// 	prop: 'productionName',
+				// 	label: '产品',
+				// },
+				{
+					// width: 160,
+					prop: 'inspectionContent',
+					label: '检测内容',
+				},
+				...this.dynamicProps,
+				{
+					// width: 128,
+					prop: 'sumScrap',
+          label: '未通过检测总数',
+				},
+				{
+					// width: 128,
+					prop: 'scrapRatio',
+					label: '比例(%)',
+					// subcomponent: {
+					// 	name: 'TextOnly',
+					// 	props: {
+					// 		injectData: {
+					// 			type: Object,
+					// 			default: () => ({}),
+					// 		},
+					// 	},
+					// 	data() {
+					// 		return {
+					// 			text: '比例',
+					// 		};
+					// 	},
+					// 	methods: {
+					// 		handleEmit(payload) {
+					// 			console.log('handleEmit', payload);
+					// 		},
+					// 	},
+					// 	render(h) {
+					// 		return h('el-button', { props: { type: 'text' } }, this.text);
+					// 	},
+					// },
+				},
+			];
+		},
+	},
 	data() {
 		return {
 			tableBtn,
-      tableProps,
-      heightNum: 236,
-      tablePropsEnergy,
-      tableProps1,
-      activeModule:'dataList',
-      workOrderId:undefined,
+			tableProps,
+			heightNum: 236,
+			tablePropsEnergy,
+			tableProps1,
+			activeModule: 'dataList',
+			workOrderId: undefined,
 			addOrUpdateVisible: false,
 			urlOptions: {
-				infoURL: getCoreWO
+				infoURL: getCoreWO,
 			},
+      allSumScrap: 0,
 			listQuery: {
 				pageSize: 10,
 				pageNo: 1,
 				total: 0,
-      },
-      listQueryEnergy: {
-        pageSize: 10,
-        pageNo: 1,
-        total: 0,
-      },
-      activeName:'produce',
+			},
+			listQueryEnergy: {
+				pageSize: 10,
+				pageNo: 1,
+				total: 0,
+			},
+			activeName: 'produce',
 			listQuery1: {
 				pageSize: 10,
 				pageNo: 1,
@@ -311,146 +465,152 @@ export default {
 			},
 			dataForm: {},
 			orderList: [],
-      materialList: [],
-      energyList: [],
-      qualityList: [],
-      chartData:[],
-      dynamicProps:[],
+			materialList: [],
+			energyList: [],
+			qualityList: [],
+			chartData: [],
+			dynamicProps: [],
 			// orderArray: [],
 			visible: false,
 			isdetail: false,
 			workOrderButton: [],
-			processFlowList: []
+			processFlowList: [],
 		};
-  },
-  watch: {
-    workOrderId(newValue, oldValue) {
-      this.activeName = 'produce'
-      this.init(newValue)
-      this.dataForm.id = newValue
-    }
-  },
+	},
+	watch: {
+		workOrderId(newValue, oldValue) {
+			this.activeName = 'produce';
+			this.init(newValue);
+			this.dataForm.id = newValue;
+		},
+	},
 	created() {
-		this.getDict()
+		this.getDict();
 	},
 	mounted() {
-		if (this.$route.query.woIdString && this.$route.query.woIdString !== 'undefined') {
-      const idList = this.$route.query.woIdString.split(',')
-      console.log(idList);
+		if (
+			this.$route.query.woIdString &&
+			this.$route.query.woIdString !== 'undefined'
+		) {
+			const idList = this.$route.query.woIdString.split(',');
+			console.log(idList);
 
-			getCoreWOListById(idList).then(res => {
-				this.workOrderButton = res.data.map(work => {
+			getCoreWOListById(idList).then((res) => {
+				this.workOrderButton = res.data.map((work) => {
 					return {
 						id: work.id,
-						name: work.name
-					}
-        })
-        console.log('this.workOrderButton======',this.workOrderButton);
-				this.init(this.workOrderButton[0].id, true)
-			})
-		}  else {
-			this.init(this.$route.query.id, true)
+						name: work.name,
+					};
+				});
+				console.log('this.workOrderButton======', this.workOrderButton);
+				this.init(this.workOrderButton[0].id, true);
+			});
+		} else {
+			this.init(this.$route.query.id, true);
 		}
 	},
-  methods: {
-    goWorkOrderList() {
-      this.$router.go(-1);
-    },
-    getId(val) {
-      this.workOrderId = val
-    },
-   async switchTab(val) {
-      if (this.activeName === 'order') {
-        getConOrderList({
-          workOrderId: this.dataForm.id,
-        }).then((response) => {
-          this.orderList = response.data;
-          // this.listQuery.total = response.data.total;
-        });
-      }else if (this.activeName === 'material') {
-        getMaterialCostWorkOrder({
-          id: this.dataForm.id,
-        }).then((response) => {
-          this.materialList = response.data;
-          // this.listQuery.total = response.data.total;
-        });
-      } else if (this.activeName === 'energy') {
-        getOrderEnergyData({
-          workOrderId: this.dataForm.id,
-        }).then((response) => {
-          this.energyList = response.data
-          this.chartData = response.data
-          // this.listQuery.total = response.data.total;
-        });
-      } else if (this.activeName === 'quality') {
-        const {
-          data: { data, otherList, otherMap, nameData },
-        } = await getStatisticalDataPage({
-          workOrderIdList:[this.dataForm,id]
-        })
-        // console.log(this.queryParams);
-        this.dynamicProps = this.filterNameData(nameData)
-        this.qualityList = this.filterData(data);
-      }
-    },
+	methods: {
+		goWorkOrderList() {
+			this.$router.go(-1);
+		},
+		getId(val) {
+			this.workOrderId = val;
+		},
+		async switchTab(val) {
+			if (this.activeName === 'order') {
+				getConOrderList({
+					workOrderId: this.dataForm.id,
+				}).then((response) => {
+					this.orderList = response.data;
+					// this.listQuery.total = response.data.total;
+				});
+			} else if (this.activeName === 'material') {
+				getMaterialCostWorkOrder({
+					id: this.dataForm.id,
+				}).then((response) => {
+					this.materialList = response.data;
+					// this.listQuery.total = response.data.total;
+				});
+			} else if (this.activeName === 'energy') {
+				getOrderEnergyData({
+					workOrderId: this.dataForm.id,
+				}).then((response) => {
+					this.energyList = response.data;
+					this.chartData = response.data;
+					// this.listQuery.total = response.data.total;
+				});
+			} else if (this.activeName === 'quality') {
+        this.allSumScrap = 0
+				const {
+					data: { data, otherList, otherMap, nameData },
+				} = await getStatisticalDataPage({
+          workOrderId:this.dataForm.id
+				});
+				// console.log(this.queryParams);
+				this.dynamicProps = this.filterNameData(nameData);
+				this.qualityList = this.filterData(data);
+			}
+		},
 		getDict() {
 			// 工艺
-      getProcessFlowList().then(res => {
-        this.processFlowList = res.data || []
-      })
-    },
-    filterNameData(nameData) {
-      const ndSet = new Set();
-      nameData.forEach((nd) => {
-        ndSet.add(nd.name);
-      });
-      return Array.from(ndSet.values())
-        .sort()
-        .map((name) => ({
-          prop: name,
-          label: name,
-        }));
-    },
-    filterData(data) {
-      return data.map((item) => {
-        const { data: innerData } = item;
-        const keyValuePairs = {};
-        innerData.map((d) => {
-          keyValuePairs[d.dynamicName] = d.dynamicValue;
-        });
-        return {
-          inspectionContent: item.inspectionContent,
-          ...keyValuePairs,
-          sumInput: item.sumInput,
-          productionName: item.productionName,
-          workOrderId: item.workOrderId,
-          scrapRatio: item.scrapRatio,
-        };
-      });
-    },
+			getProcessFlowList().then((res) => {
+				this.processFlowList = res.data || [];
+			});
+		},
+		filterNameData(nameData) {
+			const ndSet = new Set();
+			nameData.forEach((nd) => {
+				ndSet.add(nd.name);
+			});
+			return Array.from(ndSet.values())
+				.sort()
+				.map((name) => ({
+					prop: name,
+					label: name,
+				}));
+		},
+		filterData(data) {
+			return data.map((item) => {
+				const { data: innerData } = item;
+				const keyValuePairs = {};
+				innerData.map((d) => {
+					keyValuePairs[d.dynamicName] = d.dynamicValue;
+				});
+        this.allSumScrap +=item.sumScrap
+				return {
+					inspectionContent: item.inspectionContent,
+					...keyValuePairs,
+          sumScrap: item.sumScrap,
+					productionName: item.productionName,
+					workOrderId: item.workOrderId,
+          workOrderName: item.workOrderName,
+					scrapRatio: item.scrapRatio,
+				};
+			});
+		},
 		fitlerP(val) {
 			if (val) {
 				if (val === 1) {
-					return '低'
-				} else if (val ===  2) {
-					return '正常'
+					return '低';
+				} else if (val === 2) {
+					return '正常';
 				} else {
-					return '高'
+					return '高';
 				}
 			}
 		},
 		fitlerS(val) {
 			if (val) {
 				if (val === 1) {
-					return '等待'
-				} else if (val ===  2) {
-					return '激活'
-				} else if (val ===  3) {
-					return '暂停'
-				} else if (val ===  4) {
-					return '完成'
+					return '等待';
+				} else if (val === 2) {
+					return '激活';
+				} else if (val === 3) {
+					return '暂停';
+				} else if (val === 4) {
+					return '完成';
 				} else {
-					return '作废'
+					return '作废';
 				}
 			}
 		},
@@ -489,15 +649,15 @@ export default {
 			} else {
 				this.addNew(raw.data.id);
 			}
-    },
-    toggleTab(val) {
-      this.activeModule = val
-      if (this.activeModule === 'barChart') {
-        this.$nextTick((res) => {
-          this.$refs.orderEnergyChart.getChart()
-        })
-      }
-    },
+		},
+		toggleTab(val) {
+			this.activeModule = val;
+			if (this.activeModule === 'barChart') {
+				this.$nextTick((res) => {
+					this.$refs.orderEnergyChart.getChart();
+				});
+			}
+		},
 		getList() {
 			// 获取订单列表
 			// 获取预使用原料列表
@@ -510,12 +670,12 @@ export default {
 			// 	});
 			// }
 			// 获取订单相关信息
-      getConOrderList({
-          workOrderId: this.dataForm.id,
-        }).then((response) => {
-          this.orderList = response.data;
-          // this.listQuery.total = response.data.total;
-        });
+			getConOrderList({
+				workOrderId: this.dataForm.id,
+			}).then((response) => {
+				this.orderList = response.data;
+				// this.listQuery.total = response.data.total;
+			});
 		},
 		init(id, isdetail) {
 			this.initData();
@@ -524,26 +684,28 @@ export default {
 			this.visible = true;
 
 			this.$nextTick(() => {
-
 				if (this.dataForm.id) {
 					// 获取工单详情
-					this.urlOptions.infoURL(id).then(response => {
-            this.dataForm = response.data
+					this.urlOptions.infoURL(id).then((response) => {
+						this.dataForm = response.data;
 						// 工艺名称
-						if (this.dataForm.processFlowId) {
-							this.processFlowList.filter(item => {
-								if (item.id === this.dataForm.processFlowId) {
-									this.dataForm.processFlowName = item.name
+						if (this.dataForm.productLineIds.length>0) {
+              console.log(this.processFlowList)
+              this.dataForm.productLineIds.forEach(item=>{
+							this.processFlowList.filter(item1 => {
+								if (item1.id === item.processId) {
+									item.processFlowName = item1.name
 								}
-							})
+							});
+            })
 						}
 						// 获取订单列表和用料列表
 						this.getList();
-          });
+					});
 				} else {
 					if (this.urlOptions.isGetCode) {
-            this.getCode()
-          }
+						this.getCode();
+					}
 				}
 			});
 		},
@@ -556,57 +718,56 @@ export default {
 			this.$nextTick(() => {
 				this.$refs.addOrUpdate.init(id);
 			});
-		}
-	}
+		},
+	},
 };
 </script>
 <style lang="scss" scoped>
 .orderTitle {
-  font-size: 16px;
-  font-weight: bold;
+	font-size: 16px;
+	font-weight: bold;
 }
 .formContent {
-  font-size: 14px;
-  .title {
-    font-weight: 600;
-    color:rgba(0, 0, 0, 0.85);
-    margin: 0px;
-  }
-  .text {
-    height: 20px;
-    color:rgba(102, 102, 102, 0.75);
-    margin: 10px 0px;
-  }
-
+	font-size: 14px;
+	.title {
+		font-weight: 600;
+		color: rgba(0, 0, 0, 0.85);
+		margin: 0px;
+	}
+	.text {
+		height: 20px;
+		color: rgba(102, 102, 102, 0.75);
+		margin: 10px 0px;
+	}
 }
 .action_btn {
-  float: right;
-  margin: 5px 15px;
-  font-size: 14px;
+	float: right;
+	margin: 5px 15px;
+	font-size: 14px;
 }
 .add {
 	color: #0b58ff;
 }
-.container{
-  /* background-color: #fff; */
-  border-radius: 8px;
-  padding: 16px 16px 0 16px;
-  margin: 8px 0 8px 0px;
+.container {
+	/* background-color: #fff; */
+	border-radius: 8px;
+	padding: 16px 16px 0 16px;
+	margin: 8px 0 8px 0px;
 }
-     .toggleTabBox {
-       display: inline-block;
+.toggleTabBox {
+	display: inline-block;
 
-       div {
-         display: inline-block;
-         padding: 0 8px 4px;
-         color: rgba(102, 102, 102, 0.5);
-         border-bottom: 2px solid rgba(242, 244, 249, 1);
-         cursor: pointer;
-       }
+	div {
+		display: inline-block;
+		padding: 0 8px 4px;
+		color: rgba(102, 102, 102, 0.5);
+		border-bottom: 2px solid rgba(242, 244, 249, 1);
+		cursor: pointer;
+	}
 
-       .active {
-         color: rgba(0, 0, 0, 0.85);
-         border-bottom-color: #0B58FF;
-       }
-     }
+	.active {
+		color: rgba(0, 0, 0, 0.85);
+		border-bottom-color: #0b58ff;
+	}
+}
 </style>
diff --git a/src/views/warehouse/warehouse-base/warehouse-area-setup/index.vue b/src/views/warehouse/warehouse-base/warehouse-area-setup/index.vue
index e348a111..94e3a7c6 100644
--- a/src/views/warehouse/warehouse-base/warehouse-area-setup/index.vue
+++ b/src/views/warehouse/warehouse-base/warehouse-area-setup/index.vue
@@ -1,15 +1,14 @@
 <template>
 	<div class="app-container">
-
-<!-- 搜索工作栏 -->
+		<!-- 搜索工作栏 -->
 		<search-bar
 			:formConfigs="formConfig"
 			ref="searchBarForm"
 			@headBtnClick="buttonClick" />
 
-    <!-- 列表 -->
+		<!-- 列表 -->
 		<base-table
-      v-loading="dataListLoading"
+			v-loading="dataListLoading"
 			:table-props="tableProps"
 			:page="listQuery.pageNo"
 			:limit="listQuery.pageSize"
@@ -49,13 +48,11 @@ import AddOrUpdate from './add-or-updata';
 import basicPage from '@/mixins/basic-page';
 import codeFilter from '@/mixins/code-filter';
 import {
-  deleteWarehouseArea,
-  getWarehouseAreaPage,
-  getWarehouseAreaListAll
-} from "@/api/warehouse/warehouse-area-setup";
-import {
-  getWarehouseList
-} from "@/api/warehouse/warehouse-setup";
+	deleteWarehouseArea,
+	getWarehouseAreaPage,
+	getWarehouseAreaListAll,
+} from '@/api/warehouse/warehouse-area-setup';
+import { getWarehouseList } from '@/api/warehouse/warehouse-setup';
 import tableHeightMixin from '@/mixins/tableHeightMixin';
 
 const tableProps = [
@@ -79,7 +76,7 @@ const tableProps = [
 ];
 
 export default {
-	mixins: [basicPage,tableHeightMixin],
+	mixins: [basicPage, tableHeightMixin],
 	data() {
 		return {
 			urlOptions: {
@@ -94,13 +91,13 @@ export default {
 							btnName: '编辑',
 					  }
 					: undefined,
-          this.$auth.hasPermi(`warehouse:warehouse-area-setup:delete`)
+				this.$auth.hasPermi(`warehouse:warehouse-area-setup:delete`)
 					? {
 							type: 'delete',
 							btnName: '删除',
 					  }
 					: undefined,
-			].filter((v)=>v),
+			].filter((v) => v),
 			tableData: [],
 			formConfig: [
 				{
@@ -129,7 +126,9 @@ export default {
 					type: 'separate',
 				},
 				{
-					type: this.$auth.hasPermi('warehouse:warehouse-area-setup:create') ? 'button' : '',
+					type: this.$auth.hasPermi('warehouse:warehouse-area-setup:create')
+						? 'button'
+						: '',
 					btnName: '新增',
 					name: 'add',
 					color: 'success',
@@ -148,7 +147,7 @@ export default {
 		getWarehouseAreaListAll().then((response) => {
 			this.formConfig[1].selectOptions = response.data;
 		});
-  },
+	},
 	methods: {
 		buttonClick(val) {
 			switch (val.btnName) {
@@ -180,6 +179,22 @@ export default {
 					console.log(val);
 			}
 		},
+    // 获取数据列表
+    getDataList() {
+      this.dataListLoading = true;
+			getWarehouseAreaListAll().then((response) => { //刷新搜索框库区
+				this.formConfig[1].selectOptions = response.data;
+			});
+      this.urlOptions.getDataListURL(this.listQuery).then(response => {
+        if (response.hasOwnProperty('data')) {
+          this.tableData = response.data.list;
+          this.listQuery.total = response.data.total;
+        } else {
+          this.tableData = []
+        }
+        this.dataListLoading = false;
+      });
+    },
 	},
 };
 </script>
diff --git a/src/views/warehouse/warehouse-base/warehouse-location-setup/add-or-updata.vue b/src/views/warehouse/warehouse-base/warehouse-location-setup/add-or-updata.vue
index 4eb9aaa7..47bf7fcb 100644
--- a/src/views/warehouse/warehouse-base/warehouse-location-setup/add-or-updata.vue
+++ b/src/views/warehouse/warehouse-base/warehouse-location-setup/add-or-updata.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-08-01 13:52:10
  * @LastEditors: zwq
- * @LastEditTime: 2024-08-21 10:26:21
+ * @LastEditTime: 2024-12-16 16:30:12
  * @Description:
 -->
 <template>
@@ -35,7 +35,7 @@
 				<el-form-item label="库区名称" prop="areaId">
 					<el-select
 						v-model="dataForm.areaId"
-            :disabled="!areaArr.length>0"
+						:disabled="!areaArr.length > 0"
 						filterable
 						:style="{ width: '100%' }"
 						@change="setAreaType"
@@ -204,18 +204,22 @@ export default {
 	},
 	created() {
 		getWarehouseList().then((response) => {
-			this.warehouseArr = response.data;
+			this.warehouseArr = response.data.filter((item) =>
+				item.type === 1
+			);
 		});
 	},
 	methods: {
-    getAreaList(){
-		getWarehouseAreaList(this.dataForm.warehouseId).then((response) => {
-			this.areaArr = response.data;
-      if(this.areaArr.length===0){
-        this.$message('该仓库下暂无库区');
-      }
-		});
-    },
+		getAreaList() {
+			getWarehouseAreaList(this.dataForm.warehouseId).then((response) => {
+				this.areaArr = response.data;
+        this.dataForm.areaId = null
+        this.dataForm.areaType = null
+				if (this.areaArr.length === 0) {
+					this.$message('该仓库下暂无库区');
+				}
+			});
+		},
 		setAreaType() {
 			if (this.dataForm.areaId) {
 				this.dataForm.areaType = this.areaArr.find(
diff --git a/src/views/warehouse/warehouse-manage/in&out/add-or-updata.vue b/src/views/warehouse/warehouse-manage/in&out/add-or-updata.vue
index 714e82b2..6bb5afb4 100644
--- a/src/views/warehouse/warehouse-manage/in&out/add-or-updata.vue
+++ b/src/views/warehouse/warehouse-manage/in&out/add-or-updata.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2024-08-02 16:26:58
  * @LastEditors: zwq
- * @LastEditTime: 2024-08-08 16:38:53
+ * @LastEditTime: 2024-12-19 14:15:06
  * @Description:,
 -->
 <template>
@@ -103,7 +103,7 @@ export default {
 	},
 	created() {
 		getUserProfile().then((response) => {
-			this.dataForm.operator = response.data.username;
+			this.dataForm.operator = response.data.nickname;
 		});
 	},
 	methods: {
diff --git a/src/views/warehouse/warehouse-manage/in&out/index.vue b/src/views/warehouse/warehouse-manage/in&out/index.vue
index 8d7e4828..73929ede 100644
--- a/src/views/warehouse/warehouse-manage/in&out/index.vue
+++ b/src/views/warehouse/warehouse-manage/in&out/index.vue
@@ -67,6 +67,14 @@ const tableProps = [
 		prop: 'warehouseName',
 		label: '仓库名称',
 	},
+	{
+		prop: 'areaName',
+		label: '库区名称',
+	},
+	{
+		prop: 'areaType',
+		label: '库区类型',
+	},
 	{
 		prop: 'name',
 		label: '库位名称',
@@ -95,6 +103,10 @@ const tableProps = [
 		filter: parseTime,
 		width: 150,
 	},
+	{
+		prop: 'goodsName',
+		label: '物品名称',
+	},
 	{
 		prop: 'remark',
 		label: '备注',
diff --git a/src/views/warehouse/warehouse-report/relocationHistory/index.vue b/src/views/warehouse/warehouse-report/relocationHistory/index.vue
index fb74a57d..0682953e 100644
--- a/src/views/warehouse/warehouse-report/relocationHistory/index.vue
+++ b/src/views/warehouse/warehouse-report/relocationHistory/index.vue
@@ -18,7 +18,7 @@
 				v-if="tableBtn.length"
 				slot="handleBtn"
 				:width="90"
-				label="库位详情"
+				label="详情"
 				:method-list="tableBtn"
 				@clickBtn="handleClick" />
 		</base-table>
@@ -70,10 +70,12 @@ const tableProps = [
 	{
 		prop: 'oldCode',
 		label: '源库位编码',
+		width: 150,
 	},
 	{
 		prop: 'palletCode',
 		label: '移动托盘编码',
+		width: 150,
 	},
 	{
 		prop: 'goodName',