src/api/base/coreWorkOrder.js

@@ -1,8 +1,8 @@
 /*
  * @Author: Do not edit
  * @Date: 2023-10-21 11:50:46
- * @LastEditTime: 2024-12-27 15:20:14
+ * @LastEditTime: 2023-11-15 17:19:19
- * @LastEditors: zwq
+ * @LastEditors: DY
  * @Description:
  */
 import request from '@/utils/request'
@@ -170,11 +170,3 @@ export function updateBatch(data) {
     data: data
   })
 }
-// 更新订单表与工单关联表 多对多
-export function updateConCoreWOr(data) {
-  return request({
-    url: '/base/core-order-con-work-order/update',
-    method: 'put',
-    data: data
-  })
-}

src/api/equipment/base/maintain/items.js

@@ -23,13 +23,6 @@ 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,

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 { getByEquId } from '@/api/equipment/base/maintain/items';
+import { getItemPageData } from '@/api/equipment/base/maintain/items';
 
 export default {
 	props: {
@@ -94,14 +94,20 @@ export default {
 			});
     },
     async handleChange(val) {
-      // let equipmentTypeId = undefined
+      console.log(val);
-      // this.eqList.forEach((ele) => {
+      let equipmentTypeId = undefined
-      //   if (ele.id == val) {
+      this.eqList.forEach((ele) => {
-      //     equipmentTypeId = ele.equipmentTypeId
+        if (ele.id == val) {
-      //   }
+          equipmentTypeId = ele.equipmentTypeId
-      // })
+        }
-      const { code, data } = await getByEquId(val)
+      })
-      this.programList = data
+      const { code, data } = await getItemPageData({
+        pageNo: 1,
+        pageSize: 99,
+        equipmentTypeId: equipmentTypeId,
+      })
+      this.programList = data.list
+      console.log(data);
     },
     handleDecChange(val) {
       let maintenanceDes = undefined

src/views/equipment/base/maintain/items/components/add-or-updata.vue

@@ -70,12 +70,6 @@ import { getList,} from "@/api/base/qualityScrapType";
 
 export default {
 	mixins: [basicAdd],
-
-  props: {
-    mainId: {
-      type: String,
-    },
-  },
 	data() {
 		return {
 			urlOptions: {
@@ -102,7 +96,7 @@ export default {
         id: undefined,
         program: undefined,
         resultType: undefined,
-        mainId:this.mainId,
+        equipmentTypeId: undefined,
         minValue: undefined,
         maxValue: undefined,
         maintainResult:undefined,
@@ -123,6 +117,7 @@ export default {
 	},
 	mounted() {
 		this.getDict()
+		console.log('我看看', this.dataForm)
 	},
   methods: {
     handleClear() {

src/views/equipment/base/maintain/items/components/basic-add.js

@@ -1,8 +1,8 @@
 /*
  * @Author: zwq
  * @Date: 2022-08-24 11:19:43
- * @LastEditors: zwq
+ * @LastEditors: zhp
- * @LastEditTime: 2024-12-13 15:50:49
+ * @LastEditTime: 2024-07-19 14:47:02
  * @Description:
  */
 export default {
@@ -28,8 +28,10 @@ export default {
   activated() {
   },
   methods: {
-    init(id) {
+    init(obj) {
-      this.dataForm.id = id || "";
+      console.log(obj);
+      this.dataForm.id = obj.id || "";
+      this.dataForm.equipmentTypeId = obj.equipmentTypeId || "";
       this.visible = true;
       if (this.urlOptions.getOption) {
         this.getArr()

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-12-13 15:52:24
+ * @LastEditTime: 2024-07-22 09:17:31
- * @LastEditors: zwq
+ * @LastEditors: zhp
  * @Description:
  */
 export default {
@@ -88,8 +88,12 @@ 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(val.data.id);
+          this.$refs.addOrUpdate.init(obj);
         });
       } else if (val.type === "delete") {
         this.deleteHandle(val.data.id, val.data.program, val.data._pageIndex)

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.id)
+        this.$refs.showDetail.init(row.equipmentTypeId)
       })
 				// alert('跳转到 保养记录')
 				// console.log(row)

src/views/equipment/base/maintain/items/showDetail.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: zhp
  * @Date: 2024-07-12 13:28:21
- * @LastEditTime: 2024-12-13 16:03:29
+ * @LastEditTime: 2024-07-23 14:00:38
- * @LastEditors: zwq
+ * @LastEditors: zhp
  * @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" :main-id="queryParams.mainId"></add-or-update>
+      <add-or-update ref="addOrUpdate" @refreshDataList="successSubmit"></add-or-update>
     </base-dialog>
   </div>
 
@@ -74,7 +74,7 @@ export default {
         queryParams: {
           pageNo:1,
           pageSize:10,
-          mainId:null,
+          equipmentTypeId:null,
         },
         tableProps,
         basePath: 'base/equipment-maintain-program',
@@ -105,18 +105,21 @@ export default {
     },
     getDataList(id) {
       this.dataListLoading = true;
-      this.queryParams.mainId = id
+      this.queryParams.equipmentTypeId = id
-      this.urlOptions.getDataListURL(this.queryParams).then(response => {
+      this.urlOptions.getDataListURL(this.listQuery).then(response => {
         this.tableData = response.data.list;
-        this.queryParams.total = response.data.total;
+        this.listQuery.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()
+        this.$refs.addOrUpdate.init(obj)
       });
     },
     init(id) {

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-12-12 09:54:25
+ * @LastEditTime: 2024-08-14 15:24:11
  * @Description:
 -->
 <template>
@@ -83,7 +83,7 @@
 				</el-form-item>
 			</el-col>
 			<el-col :span="8" v-if="showTime">
-				<el-form-item label="生产单位用时(s)" prop="processTime">
+				<el-form-item label="生产单位用时" prop="processTime">
 					<el-input
 						v-model.number="dataForm.processTime"
 						type="number"

src/views/material/material/index.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2024-07-01 14:54:06
  * @LastEditors: zwq
- * @LastEditTime: 2024-12-16 10:03:30
+ * @LastEditTime: 2024-08-21 11:19:51
  * @Description:
 -->
 <template>
@@ -346,7 +346,6 @@ 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) {

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-12-12 16:13:11
+ * @LastEditTime: 2024-10-14 09:26:53
  * @Description:
 -->
 <template>
@@ -41,19 +41,18 @@
 				</el-form-item>
 			</el-col>
 			<el-col :span="8">
-				<el-form-item label="物料批次" prop="materialDate">
+				<el-form-item label="物料批次" prop="materialDateId">
 					<el-select
-						v-model="dataForm.materialDate"
+						v-model="dataForm.materialDateId"
 						clearable
 						filterable
-						allow-create
 						placeholder="请选择物料批次"
 						style="width: 100%">
 						<el-option
 							v-for="dict in materialDateList"
 							:key="dict.id"
 							:label="dict.code"
-							:value="dict.code" />
+							:value="dict.id" />
 					</el-select>
 				</el-form-item>
 			</el-col>
@@ -165,7 +164,7 @@ export default {
 				id: undefined,
 				materialId: undefined,
 				materialCode: undefined,
-				materialDate: undefined,
+				materialDateId: undefined,
 				equipmentId: undefined,
 				userName: undefined,
 				userNames: [],
@@ -209,17 +208,15 @@ export default {
 	methods: {
 		async getDictData() {
 			const materRes = await getMaterialTree(); //
-			let typeId = materRes.data.find((item) => item.product === 0).id;
+      let typeId = materRes.data.find(item=>item.product === 0).id
       const listQuery= {
-				typeId: typeId,
+        typeId:typeId
-			};
+      }
 			const materData = await getMaterialList(listQuery);
 			this.materialList = [];
 			this.materialList = materData.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();
@@ -260,7 +257,7 @@ export default {
 						this.dataForm.id = response.data.id;
 						this.dataForm.materialCode = response.data.materialCode;
 						this.dataForm.materialId = response.data.materialId;
-						this.dataForm.materialDate = response.data.materialDateName;
+						this.dataForm.materialDateId = response.data.materialDateId;
 						this.dataForm.equipmentId = response.data.equipmentId;
 						this.dataForm.useTime = response.data.useTime;
 						// this.dataForm.userName = response.data.userName
@@ -268,11 +265,6 @@ 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 {
 				}

src/views/produce/workOrder/detail.vue

@@ -2,26 +2,21 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: zwq
- * @LastEditTime: 2024-12-27 15:34:28
+ * @LastEditTime: 2024-11-19 16:49:09
  * @Description:
 -->
 <template>
-	<div
+  <div class="status-timegraph-container" style="background: #f2f4f9; flex: 1; display: flex; flex-direction: column">
-		class="status-timegraph-container"
+    <el-row v-show="workOrderButton.length !== 0" class="" style="
-		style="background: #f2f4f9; flex: 1; display: flex; flex-direction: column">
+				margin-bottom: 4px;
-		<el-row
+				border-radius: 8px;
-			v-show="workOrderButton.length !== 0"
+			">
-			class=""
+        <workOrderNav :id-list="workOrderButton" @getWorkOrderId="getId">
-			style="margin-bottom: 4px; border-radius: 8px">
+        </workOrderNav>
-			<workOrderNav
-				:id-list="workOrderButton"
-				@getWorkOrderId="getId"></workOrderNav>
     </el-row>
-		<el-row
+    <el-row class="" style="
-			class=""
-			style="
 				height: 1px;
-				flex: 0.3;
+				flex: .3;
 				margin-bottom: 12px;
 				background: #fff;
 				padding: 16px;
@@ -31,123 +26,41 @@
 			">
       <div class="content">
         <div>
-					<h1 class="orderTitle">工单编码：{{ dataForm.code }}</h1>
+          <h1 class='orderTitle'>工单编码：{{ dataForm.code }}</h1>
-					<el-button
+          <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>
-						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">
+            <el-col :span="4"><p class='title'>工单名称</p><p class='text'>{{ dataForm.name }}</p></el-col>
-							<p class="title">工单名称</p>
+            <el-col :span="4"><p class='title'>工单来源</p><p class='text'>{{ dataForm.triggerOrigin === 1 ? 'MES-手动' : (dataForm.triggerOrigin === 2 ? 'MES-订单下发' : (dataForm.triggerOrigin === 3 ? 'ERP' : ''))}}</p>
-							<p class="text">{{ dataForm.name }}</p>
             </el-col>
-						<el-col :span="4">
+            <el-col :span="4"><p class='title'>所属订单</p>
-							<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>
-							<p class="text">
-								{{
-									dataForm.triggerOrigin === 1
-										? 'MES-手动'
-										: dataForm.triggerOrigin === 2
-										? 'MES-订单下发'
-										: dataForm.triggerOrigin === 3
-										? 'ERP'
-										: ''
-								}}
-							</p>
             </el-col>
-						<el-col :span="4">
+            <el-col :span="4"><p class='title'>产品名称</p><p class='text'>{{ dataForm.productName }}</p></el-col>
-							<p class="title">所属订单</p>
+            <el-col :span="4"><p class='title'>规 格</p><p class='text'>{{ dataForm.specifications }}</p></el-col>
-							<p
+            <el-col :span="4"><p class='title'>计划生产数量</p><p class='text'>{{ dataForm.planQuantity }}</p></el-col>
-								class="text"
+            <el-col :span="4"><p class='title'>预计用时(小时)</p><p class='text'>{{ dataForm.remainingTime }}</p></el-col>
-								style="
+            <el-col :span="4"><p class='title'>计划投入数量</p><p class='text'>{{ dataForm.planAssignQuantity }}</p></el-col>
-									overflow: hidden;
+            <el-col :span="4"><p class='title'>优先级</p><p class='text'> {{ fitlerP(dataForm.priority) }}</p></el-col>
-									white-space: nowrap;
+            <el-col :span="4"><p class='title'>负责人</p><p class='text'>{{ dataForm.workers }}</p></el-col>
-									text-overflow: ellipsis;
+            <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
-								:title="orderList.map((item) => item.orderName).join(', ')">
+                }}</span></p>
-								{{ 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.materialMethod === 1 ? '产品基础' : dataForm.materialMethod === 2 ? '工艺扩展'
+              :
+              '' }}</p></el-col>
 
-						<el-col :span="4">
+            <el-col :span="4"><p class='title'>关联工艺</p><p class='text'>{{ dataForm.processFlowName }}</p></el-col>
-							<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
+    <el-row class="" style="
-			class=""
-			style="
 				height: 1px;
 				flex: 1;
 				margin-bottom: 12px;
@@ -161,108 +74,45 @@
         <el-tab-pane label="生产信息" name="produce">
           <div class="formContent">
             <el-row :gutter="20">
-							<el-col :span="4">
+              <el-col :span="4"><p class='title'>工单创建时间</p><p class='text'>{{ parseTime(dataForm.createTime) }}</p></el-col>
-								<p class="title">工单创建时间</p>
+              <el-col :span="4"><p class='title'>计划开始时间</p><p class='text'>{{ parseTime(dataForm.planStartTime) }}</p></el-col>
-								<p class="text">{{ parseTime(dataForm.createTime) }}</p>
+              <el-col :span="4"><p class='title'>计划完成时间</p><p class='text'>{{ parseTime(dataForm.planFinishTime) }}</p></el-col>
-							</el-col>
+              <el-col :span="4"><p class='title'>预计结束时间</p><p class='text'>{{ parseTime(dataForm.expectedFinishTime) }}</p></el-col>
-							<el-col :span="4">
+              <el-col :span="4"><p class='title'>实际开始时间</p><p class='text'>{{ parseTime(dataForm.startProduceTime) }}</p></el-col>
-								<p class="title">计划开始时间</p>
+              <el-col :span="4"><p class='title'>实际完成时间</p><p class='text'>{{ parseTime(dataForm.finishProduceTime) }}</p></el-col>
-								<p class="text">{{ parseTime(dataForm.planStartTime) }}</p>
+              <el-col :span="4"><p class='title'>工单状态</p><p class='text'>{{ fitlerS(dataForm.status) }}</p></el-col>
-							</el-col>
+              <el-col :span="4"><p class='title'>实际投入数量</p><p class='text'>{{ dataForm.assignQuantity }}</p></el-col>
-							<el-col :span="4">
+              <el-col :span="4"><p class='title'>实际生产数量</p><p class='text'>{{ dataForm.actualQuantity }}</p></el-col>
-								<p class="title">计划完成时间</p>
+              <el-col :span="4"><p class='title'>废片数量</p><p class='text'>{{ dataForm.nokQuantity }}</p></el-col>
-								<p class="text">{{ parseTime(dataForm.planFinishTime) }}</p>
+              <el-col :span="4"><p class='title'>检测瑕疵数</p><p class='text'>{{ dataForm.unpassCheckNum }}</p></el-col>
-							</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
+          <base-table :max-height="tableH" :table-props="tableProps" :page="listQuery.pageNo"
-						:max-height="tableH"
+            :limit="listQuery.pageSize" :table-data="orderList">
-						:table-props="tableProps"
+            <method-btn v-if="!isdetail" slot="handleBtn" :width="120" label="操作" :method-list="tableBtn"
-						: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
+          <base-table :max-height="tableH" :table-props="tableProps1" :page="listQuery1.pageNo"
-						:max-height="tableH"
+            :limit="listQuery1.pageSize" :table-data="materialList" />
-						: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"
-					<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
+            <div :class="{ active: activeModule === 'dataList' }" @click="toggleTab('dataList')">数据列表</div>
-							:class="{ active: activeModule === 'dataList' }"
+            <div :class="{ active: activeModule === 'barChart' }" @click="toggleTab('barChart')">柱状图</div>
-							@click="toggleTab('dataList')">
-							数据列表
-						</div>
-						<div
-							:class="{ active: activeModule === 'barChart' }"
-							@click="toggleTab('barChart')">
-							柱状图
-						</div>
           </div>
           <div>
             <div v-show="activeModule === 'dataList'">
               <!-- 表格 -->
-							<base-table
+              <base-table :max-height="tableH" :table-props="tablePropsEnergy" :page="listQueryEnergy.pageNo"
-								:max-height="tableH"
+                :limit="listQueryEnergy.pageSize" :table-data="energyList" />
-								:table-props="tablePropsEnergy"
-								:page="listQueryEnergy.pageNo"
-								:limit="listQueryEnergy.pageSize"
-								:table-data="energyList" />
             </div>
             <!-- 图形 -->
             <div v-show="activeModule === 'barChart'">
@@ -271,6 +121,7 @@
           </div>
         </el-tab-pane>
       </el-tabs>
+
     </el-row>
 
     <!-- 对话框(添加 / 修改) -->
@@ -286,23 +137,19 @@
 
 <script>
 // import basicAdd from '../../core/mixins/basic-add';
-import {
+import { getCoreWO, getMaterialBomPage, getConOrderList, getCoreWOListById,getMaterialCostWorkOrder } from "@/api/base/coreWorkOrder";
-	getCoreWO,
-	getMaterialBomPage,
-	getConOrderList,
-	getCoreWOListById,
-	getMaterialCostWorkOrder,
-} from '@/api/base/coreWorkOrder';
 import tableHeightMixin from '@/mixins/tableHeightMixin';
-import { getOrderEnergyData } from '@/api/monitoring/orderEnergy';
+import { getOrderEnergyData } from "@/api/monitoring/orderEnergy";
 // import { orderList } from "@/api/base/orderManage";
-import { getStatisticalDataPage } from '@/api/monitoring/statisticalData';
+import {
-import { getProcessFlowList } from '@/api/base/orderManage';
+  getStatisticalDataPage,
+} from '@/api/monitoring/statisticalData';
+import { getProcessFlowList } from '@/api/base/orderManage'
 import SmallTitle from './SmallTitle';
-import { publicFormatter } from '@/utils/dict';
+import { publicFormatter } from "@/utils/dict";
-import { parseTime } from '@/utils/ruoyi';
+import { parseTime } from '@/utils/ruoyi'
-import workOrderNav from './workOrderNav.vue';
+import workOrderNav  from './workOrderNav.vue'
-import BarChart from './barChart';
+import BarChart from "./barChart"
 const tableBtn = [
 	{
 		type: 'edit',
@@ -329,28 +176,28 @@ 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: '对象名称',
+    label: '对象名称'
   },
   {
     prop: 'objCode',
@@ -369,11 +216,11 @@ const tablePropsEnergy = [
   },
   {
     prop: 'endNum',
-		label: '工单结束值/当前值',
+    label: '工单结束值/当前值'
   },
   {
     prop: 'useNum',
-		label: '使用量',
+    label: '使用量'
   },
 ];
 export default {
@@ -382,16 +229,16 @@ export default {
   computed: {
     tablePropsQuality() {
       return [
-				// {
+        {
-				// 	// width: 128,
+          // width: 128,
-				// 	prop: 'workOrderName',
+          prop: 'workOrderName',
-				// 	label: '工单名称',
+          label: '工单名称',
-				// },
+        },
-				// {
+        {
-				// 	// width: 128,
+          // width: 128,
-				// 	prop: 'productionName',
+          prop: 'productionName',
-				// 	label: '产品',
+          label: '产品',
-				// },
+        },
         {
           // width: 160,
           prop: 'inspectionContent',
@@ -401,7 +248,7 @@ export default {
         {
           // width: 128,
           prop: 'sumScrap',
-          label: '未通过检测总数',
+          label: '未检测总数',
         },
         {
           // width: 128,
@@ -444,9 +291,8 @@ export default {
       workOrderId:undefined,
 			addOrUpdateVisible: false,
 			urlOptions: {
-				infoURL: getCoreWO,
+				infoURL: getCoreWO
 			},
-      allSumScrap: 0,
 			listQuery: {
 				pageSize: 10,
 				pageNo: 1,
@@ -474,39 +320,36 @@ export default {
 			visible: false,
 			isdetail: false,
 			workOrderButton: [],
-			processFlowList: [],
+			processFlowList: []
 		};
   },
   watch: {
     workOrderId(newValue, oldValue) {
-			this.activeName = 'produce';
+      this.activeName = 'produce'
-			this.init(newValue);
+      this.init(newValue)
-			this.dataForm.id = newValue;
+      this.dataForm.id = newValue
-		},
+    }
   },
 	created() {
-		this.getDict();
+		this.getDict()
 	},
 	mounted() {
-		if (
+		if (this.$route.query.woIdString && this.$route.query.woIdString !== 'undefined') {
-			this.$route.query.woIdString &&
+      const idList = this.$route.query.woIdString.split(',')
-			this.$route.query.woIdString !== 'undefined'
-		) {
-			const idList = this.$route.query.woIdString.split(',');
       console.log(idList);
 
-			getCoreWOListById(idList).then((res) => {
+			getCoreWOListById(idList).then(res => {
-				this.workOrderButton = res.data.map((work) => {
+				this.workOrderButton = res.data.map(work => {
 					return {
 						id: work.id,
-						name: work.name,
+						name: work.name
-					};
+					}
-				});
+        })
         console.log('this.workOrderButton======',this.workOrderButton);
-				this.init(this.workOrderButton[0].id, true);
+				this.init(this.workOrderButton[0].id, true)
-			});
+			})
 		}  else {
-			this.init(this.$route.query.id, true);
+			this.init(this.$route.query.id, true)
 		}
 	},
   methods: {
@@ -514,7 +357,7 @@ export default {
       this.$router.go(-1);
     },
     getId(val) {
-			this.workOrderId = val;
+      this.workOrderId = val
     },
    async switchTab(val) {
       if (this.activeName === 'order') {
@@ -535,27 +378,26 @@ export default {
         getOrderEnergyData({
           workOrderId: this.dataForm.id,
         }).then((response) => {
-					this.energyList = response.data;
+          this.energyList = response.data
-					this.chartData = 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
+          workOrderIdList:[this.dataForm,id]
-				});
+        })
         // console.log(this.queryParams);
-				this.dynamicProps = this.filterNameData(nameData);
+        this.dynamicProps = this.filterNameData(nameData)
         this.qualityList = this.filterData(data);
       }
     },
 		getDict() {
 			// 工艺
-			getProcessFlowList().then((res) => {
+      getProcessFlowList().then(res => {
-				this.processFlowList = res.data || [];
+        this.processFlowList = res.data || []
-			});
+      })
     },
     filterNameData(nameData) {
       const ndSet = new Set();
@@ -576,14 +418,12 @@ export default {
         innerData.map((d) => {
           keyValuePairs[d.dynamicName] = d.dynamicValue;
         });
-        this.allSumScrap +=item.sumScrap
         return {
           inspectionContent: item.inspectionContent,
           ...keyValuePairs,
-          sumScrap: item.sumScrap,
+          sumInput: item.sumInput,
           productionName: item.productionName,
           workOrderId: item.workOrderId,
-          workOrderName: item.workOrderName,
           scrapRatio: item.scrapRatio,
         };
       });
@@ -591,26 +431,26 @@ export default {
 		fitlerP(val) {
 			if (val) {
 				if (val === 1) {
-					return '低';
+					return '低'
 				} else if (val ===  2) {
-					return '正常';
+					return '正常'
 				} else {
-					return '高';
+					return '高'
 				}
 			}
 		},
 		fitlerS(val) {
 			if (val) {
 				if (val === 1) {
-					return '等待';
+					return '等待'
 				} else if (val ===  2) {
-					return '激活';
+					return '激活'
 				} else if (val ===  3) {
-					return '暂停';
+					return '暂停'
 				} else if (val ===  4) {
-					return '完成';
+					return '完成'
 				} else {
-					return '作废';
+					return '作废'
 				}
 			}
 		},
@@ -651,11 +491,11 @@ export default {
 			}
     },
     toggleTab(val) {
-			this.activeModule = val;
+      this.activeModule = val
       if (this.activeModule === 'barChart') {
         this.$nextTick((res) => {
-					this.$refs.orderEnergyChart.getChart();
+          this.$refs.orderEnergyChart.getChart()
-				});
+        })
       }
     },
 		getList() {
@@ -684,19 +524,17 @@ export default {
 			this.visible = true;
 
 			this.$nextTick(() => {
+
 				if (this.dataForm.id) {
 					// 获取工单详情
-					this.urlOptions.infoURL(id).then((response) => {
+					this.urlOptions.infoURL(id).then(response => {
-						this.dataForm = response.data;
+            this.dataForm = response.data
 						// 工艺名称
-						if (this.dataForm.productLineIds.length>0) {
+						if (this.dataForm.processFlowId) {
-              console.log(this.processFlowList)
+							this.processFlowList.filter(item => {
-              this.dataForm.productLineIds.forEach(item=>{
+								if (item.id === this.dataForm.processFlowId) {
-							this.processFlowList.filter(item1 => {
+									this.dataForm.processFlowName = item.name
-								if (item1.id === item.processId) {
-									item.processFlowName = item1.name
 								}
-							});
 							})
 						}
 						// 获取订单列表和用料列表
@@ -704,7 +542,7 @@ export default {
           });
 				} else {
 					if (this.urlOptions.isGetCode) {
-						this.getCode();
+            this.getCode()
           }
 				}
 			});
@@ -718,8 +556,8 @@ export default {
 			this.$nextTick(() => {
 				this.$refs.addOrUpdate.init(id);
 			});
-		},
+		}
-	},
+	}
 };
 </script>
 <style lang="scss" scoped>
@@ -739,6 +577,7 @@ export default {
     color:rgba(102, 102, 102, 0.75);
     margin: 10px 0px;
   }
+
 }
 .action_btn {
   float: right;
@@ -767,7 +606,7 @@ export default {
 
        .active {
          color: rgba(0, 0, 0, 0.85);
-		border-bottom-color: #0b58ff;
+         border-bottom-color: #0B58FF;
        }
      }
 </style>

src/views/warehouse/warehouse-base/warehouse-area-setup/index.vue

@@ -1,5 +1,6 @@
 <template>
 	<div class="app-container">
+
 <!-- 搜索工作栏 -->
 		<search-bar
 			:formConfigs="formConfig"
@@ -50,9 +51,11 @@ import codeFilter from '@/mixins/code-filter';
 import {
   deleteWarehouseArea,
   getWarehouseAreaPage,
-	getWarehouseAreaListAll,
+  getWarehouseAreaListAll
-} from '@/api/warehouse/warehouse-area-setup';
+} from "@/api/warehouse/warehouse-area-setup";
-import { getWarehouseList } from '@/api/warehouse/warehouse-setup';
+import {
+  getWarehouseList
+} from "@/api/warehouse/warehouse-setup";
 import tableHeightMixin from '@/mixins/tableHeightMixin';
 
 const tableProps = [
@@ -126,9 +129,7 @@ export default {
 					type: 'separate',
 				},
 				{
-					type: this.$auth.hasPermi('warehouse:warehouse-area-setup:create')
+					type: this.$auth.hasPermi('warehouse:warehouse-area-setup:create') ? 'button' : '',
-						? 'button'
-						: '',
 					btnName: '新增',
 					name: 'add',
 					color: 'success',
@@ -179,22 +180,6 @@ 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>

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-12-16 16:30:12
+ * @LastEditTime: 2024-08-21 10:26:21
  * @Description:
 -->
 <template>
@@ -204,17 +204,13 @@ export default {
 	},
 	created() {
 		getWarehouseList().then((response) => {
-			this.warehouseArr = response.data.filter((item) =>
+			this.warehouseArr = response.data;
-				item.type === 1
-			);
 		});
 	},
 	methods: {
     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('该仓库下暂无库区');
       }

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-12-19 14:15:06
+ * @LastEditTime: 2024-08-08 16:38:53
  * @Description:,
 -->
 <template>
@@ -103,7 +103,7 @@ export default {
 	},
 	created() {
 		getUserProfile().then((response) => {
-			this.dataForm.operator = response.data.nickname;
+			this.dataForm.operator = response.data.username;
 		});
 	},
 	methods: {

src/views/warehouse/warehouse-manage/in&out/index.vue

@@ -67,14 +67,6 @@ const tableProps = [
 		prop: 'warehouseName',
 		label: '仓库名称',
 	},
-	{
-		prop: 'areaName',
-		label: '库区名称',
-	},
-	{
-		prop: 'areaType',
-		label: '库区类型',
-	},
 	{
 		prop: 'name',
 		label: '库位名称',
@@ -103,10 +95,6 @@ const tableProps = [
 		filter: parseTime,
 		width: 150,
 	},
-	{
-		prop: 'goodsName',
-		label: '物品名称',
-	},
 	{
 		prop: 'remark',
 		label: '备注',

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,12 +70,10 @@ const tableProps = [
 	{
 		prop: 'oldCode',
 		label: '源库位编码',
-		width: 150,
 	},
 	{
 		prop: 'palletCode',
 		label: '移动托盘编码',
-		width: 150,
 	},
 	{
 		prop: 'goodName',