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'
@@ -169,12 +169,4 @@ export function updateBatch(data) {
     method: 'put',
     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>
@@ -148,7 +147,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';
 
@@ -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 = {
+      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();
-				const dateRes = await getMaterDateList();
+			this.materialDateList = dateRes.data;
-				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/warehouse/warehouse-base/warehouse-area-setup/index.vue

@@ -1,14 +1,15 @@
 <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"
@@ -48,11 +49,13 @@ import AddOrUpdate from './add-or-updata';
 import basicPage from '@/mixins/basic-page';
 import codeFilter from '@/mixins/code-filter';
 import {
-	deleteWarehouseArea,
+  deleteWarehouseArea,
-	getWarehouseAreaPage,
+  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 = [
@@ -76,7 +79,7 @@ const tableProps = [
 ];
 
 export default {
-	mixins: [basicPage, tableHeightMixin],
+	mixins: [basicPage,tableHeightMixin],
 	data() {
 		return {
 			urlOptions: {
@@ -91,13 +94,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: [
 				{
@@ -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',
@@ -147,7 +148,7 @@ export default {
 		getWarehouseAreaListAll().then((response) => {
 			this.formConfig[1].selectOptions = response.data;
 		});
-	},
+  },
 	methods: {
 		buttonClick(val) {
 			switch (val.btnName) {
@@ -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>
@@ -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,22 +204,18 @@ export default {
 	},
 	created() {
 		getWarehouseList().then((response) => {
-			this.warehouseArr = response.data.filter((item) =>
+			this.warehouseArr = response.data;
-				item.type === 1
-			);
 		});
 	},
 	methods: {
-		getAreaList() {
+    getAreaList(){
-			getWarehouseAreaList(this.dataForm.warehouseId).then((response) => {
+		getWarehouseAreaList(this.dataForm.warehouseId).then((response) => {
-				this.areaArr = response.data;
+			this.areaArr = response.data;
-        this.dataForm.areaId = null
+      if(this.areaArr.length===0){
-        this.dataForm.areaType = null
+        this.$message('该仓库下暂无库区');
-				if (this.areaArr.length === 0) {
+      }
-					this.$message('该仓库下暂无库区');
+		});
-				}
+    },
-			});
-		},
 		setAreaType() {
 			if (this.dataForm.areaId) {
 				this.dataForm.areaType = this.areaArr.find(

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',