From a1f69a0c54be44c9c3aec18ff4d9ce6f8dc3737c Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Wed, 30 Aug 2023 13:13:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF-=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/equipment/equipmentBoundMaterials.vue | 427 ------------------
 src/views/wms/equipment/index.vue             |  10 +-
 2 files changed, 1 insertion(+), 436 deletions(-)
 delete mode 100644 src/views/wms/equipment/equipmentBoundMaterials.vue

diff --git a/src/views/wms/equipment/equipmentBoundMaterials.vue b/src/views/wms/equipment/equipmentBoundMaterials.vue
deleted file mode 100644
index 476898a5..00000000
--- a/src/views/wms/equipment/equipmentBoundMaterials.vue
+++ /dev/null
@@ -1,427 +0,0 @@
-<template>
-	<div class="app-container">
-		<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-			<el-form-item label="设备编码" prop="equipmentCode">
-				<el-input
-					v-model="queryParams.equipmentCode"
-					placeholder="请输入设备编码"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="设备名称" prop="equipmentName">
-				<el-input
-					v-model="queryParams.equipmentName"
-					placeholder="请输入设备名称"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="产品编码" prop="productCode">
-				<el-input
-					v-model="queryParams.productCode"
-					placeholder="请输入产品编码"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="产品名称" prop="productDescZh">
-				<el-input
-					v-model="queryParams.productDescZh"
-					placeholder="请输入产品名称"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item>
-				<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-				<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-			</el-form-item>
-		</el-form>
-
-		<el-row :gutter="10" class="mb8">
-			<el-col :span="1.5">
-				<el-button
-					type="primary"
-					plain
-					icon="el-icon-plus"
-					size="mini"
-					@click="handleAdd"
-					v-hasPermi="['wms:product:list']"
-				>新增</el-button>
-			</el-col>
-			<el-col :span="1.5">
-				<!-- <el-button
-					type="success"
-					plain
-					icon="el-icon-edit"
-					size="mini"
-					:disabled="single"
-					@click="handleUpdate"
-					v-hasPermi="['wms:equipmentBoundMaterials:edit']"
-				>修改</el-button> -->
-			</el-col>
-			<el-col :span="1.5">
-				<el-button
-					type="danger"
-					plain
-					icon="el-icon-delete"
-					size="mini"
-					:disabled="multiple"
-					@click="handleDelete"
-					v-hasPermi="['wms:equipmentBoundMaterials:remove']"
-				>删除</el-button>
-			</el-col>
-			<el-col :span="1.5">
-				<el-button
-					type="warning"
-					plain
-					icon="el-icon-download"
-					size="mini"
-					@click="handleExport"
-					v-hasPermi="['wms:equipmentBoundMaterials:export']"
-				>导出</el-button>
-			</el-col>
-			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-		</el-row>
-
-		<el-table v-loading="loading" :data="equipmentBoundMaterialsList" @selection-change="handleSelectionChange">
-			<el-table-column type="selection" width="55" align="center" />
-			      						<!-- 序号 -->
-                        <el-table-column
-                          type="index"
-                          width="90"
-                          align="center"
-                          :index="indexMethod"
-                          label="序号">
-                        </el-table-column>
-			<el-table-column label="物料编码" align="center" prop="productCode" />
-			<el-table-column label="物料名称" align="center" prop="productDescZh" />
-			<el-table-column label="物料型号" align="center" prop="productModel" />
-			<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-				<template slot-scope="scope">
-					<el-button
-						size="mini"
-						type="text"
-						icon="el-icon-edit"
-						@click="handleUpdate(scope.row)"
-						v-hasPermi="['wms:equipmentBoundMaterials:edit']"
-					>修改</el-button>
-					<el-button
-						size="mini"
-						type="text"
-						icon="el-icon-delete"
-						@click="handleDelete(scope.row)"
-						v-hasPermi="['wms:equipmentBoundMaterials:remove']"
-					>删除</el-button>
-				</template>
-			</el-table-column>
-		</el-table>
-
-		<pagination
-			v-show="total>0"
-			:total="total"
-			:page.sync="queryParams.pageNum"
-			:limit.sync="queryParams.pageSize"
-			@pagination="getList"
-		/>
-
-		<!-- 添加或修改设备绑定产品对话框 -->
-		<el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
-			<!-- <el-form ref="form" :model="form" :rules="rules" label-width="110px">
-			<el-table v-loading="loading" :data="productList" @selection-change="handleSelectionProductChange">
-      			<el-table-column type="selection" width="55" align="center" /> -->
-      						<!-- 序号 -->
-                  <!-- <el-table-column
-                    type="index"
-                    width="90"
-                    align="center"
-                    :index="indexMethod"
-                    label="序号"> -->
-                  <!-- </el-table-column>
-      			<el-table-column label="物料编码" align="center" prop="form.productCode" />
-      			<el-table-column label="物料名称" align="center" prop="form.productDescZh" />
-      			<el-table-column label="物料型号" align="center" prop="form.productModel" />
-      		</el-table>
-			<div slot="footer" class="dialog-footer">
-				<el-button type="primary" @click="submitForm">确 定</el-button>
-				<el-button @click="cancel">取 消</el-button>
-				<el-button
-					type="primary"
-					plain
-					size="mini"
-					@click="handleProductQuery"
-					v-hasPermi="['wms:product:list']"
-				></el-button>
-			</div>
-		</el-form> -->
-
-		<el-form :model="form" :rules="rules" ref="form" label-width="110px">
-            <el-table v-loading="loading" :data="productList" @selection-change="handleSelectionProductChange" >
-			  <el-table-column type="selection" width="55" align="center" />
-				<!-- 序号 -->
-                  <el-table-column type="index" width="90" align="center" :index="indexMethod" label="序号"></el-table-column>
-				  <el-table-column label="物料编码" align="center" prop="productCode" />
-      			  <el-table-column label="物料型号" align="center" prop="form.productModel" />
-            </el-table>
-			<el-button type="primary" @click="submitForm">确 定</el-button>
-                  <el-button @click="cancel">取 消</el-button>
-				  <el-button
-					type="primary"
-					plain
-					size="mini"
-					@click="handleProductQuery"
-					v-hasPermi="['wms:product:list']"
-				></el-button>
-        </el-form>
-		</el-dialog>
-
-		<pagination
-			v-show="total>0"
-			:total="total"
-			:page.sync="queryProductParams.pageNum"
-			:limit.sync="queryProductParams.pageSize"
-			@pagination="getProductList"
-		/>
-	</div>
-</template>
-
-<script>
-import { listEquipmentBoundMaterials, getEquipmentBoundMaterials, delEquipmentBoundMaterials, addEquipmentBoundMaterials, updatEquipmentBoundMaterials } from "@/api/wms/equipmentBoundMaterials";
-import { listProduct, getProduct, delProduct, addProduct, updateProduct } from "@/api/wms/product";
-export default {
-	name: "EquipmentBoundMaterials",
-	data() {
-		return {
-			// 遮罩层
-			loading: true,
-			// 遮罩层
-			// productLoading: true,
-			// 选中数组
-			// productIds: [],
-			// 选中数组
-			ids: [],
-			// 非单个禁用
-			single: true,
-			// 非单个禁用
-			// productSingle: true,
-			// 非多个禁用
-			// productMultiple: true,
-			// 非多个禁用
-			multiple: true,
-			// 显示搜索条件
-			showSearch: true,
-			// 总条数
-			total: 0,
-			// 总条数
-			// total: 0,
-			// 物料信息表格数据
-			productList: [],
-			// 设备绑定产品表格数据
-			equipmentBoundMaterialsList: [],
-			// 弹出层标题
-			title: "",
-			// 是否显示弹出层
-			open: false,
-			// 查询参数
-			queryParams: {
-				pageNum: 1,
-				pageSize: 10,
-				equipmentCode: null,
-				equipmentName: null,
-				productCode: null,
-				productDescZh: null,
-				equipmentTypeId: null,
-				equipmentTypeCode: null,
-				equipmentTypeName: null,
-				workshopId: null,
-				workshopCode: null,
-				workshopName: null,
-				status: null,
-				attr1: null,
-				attr2: null,
-				attr3: null,
-				attr4: null,
-			},
-			queryProductParams: {
-				pageNum: 1,
-				pageSize: 10,
-				productId: null,
-				productCode: null,
-				productDescZh: null,
-				productModel:null,
-			},
-			// 表单参数
-			form: {},
-			// 表单校验
-			rules: {
-				equipmentCode: [
-					{ required: true, message: "设备编码不能为空", trigger: "blur" }
-				],
-				productCode: [
-					{ required: true, message: "产品编码不能为空", trigger: "blur" }
-				],
-				productDescZh: [
-					{ required: true, message: "产品名称不能为空", trigger: "blur" }
-				],
-			}
-		};
-	},
-	created() {
-		this.getList();
-		this.getProductList();
-	},
-	methods: {
-	    // 生成表头序号
-        indexMethod(index){
-        return index+1 ;
-      },
-		/** 查询设备绑定产品列表 */
-		getList() {
-			this.loading = true;
-			listEquipmentBoundMaterials(this.queryParams).then(response => {
-				this. equipmentBoundMaterialsList = response.rows;
-				this.total = response.total;
-				this.loading = false;
-			});
-		},
-		/** 查询物料信息列表 */
-		getProductList() {
-			this.loading = true;
-			listProduct(this.queryProductParams).then(response => {
-				this.productList = response.rows;
-				this.total = response.total;
-				this.loading = false;
-			});
-		},
-		// 取消按钮
-		cancel() {
-			this.open = false;
-			this.reset();
-		},
-		// 表单重置
-		reset() {
-			this.form = {
-				productId: null,
-				productCode: null,
-				productDescZh: null,
-				productModel:null,
-				equipmentId: null,
-				equipmentCode: null,
-				equipmentName: null,
-				productCode: null,
-				productDescZh: null,
-				equipmentTypeId: null,
-				equipmentTypeCode: null,
-				equipmentTypeName: null,
-				workshopId: null,
-				workshopCode: null,
-				workshopName: null,
-				status: null,
-				remark: null,
-				attr1: null,
-				attr2: null,
-				attr3: null,
-				attr4: null,
-				createBy: null,
-				createTime: null,
-				updateBy: null,
-				updateTime: null
-			};
-			this.resetForm("form");
-		},
-		/** 搜索按钮操作 */
-		handleQuery() {
-			this.queryParams.pageNum = 1;
-			this.getList();
-		},
-		/** 搜索按钮操作 */
-		handleProductQuery() {
-			this.queryProductParams.pageNum = 1;
-			this.getProductList();
-			console.log(this.form);
-		},
-		/** 重置按钮操作 */
-		resetQuery() {
-			this.resetForm("queryForm");
-			this.handleQuery();
-		},
-		// 多选框选中数据
-		handleSelectionProductChange(selection) {
-		   this.ids = selection.map(item => item.productId)
-		   this.single = selection.length!==1
-		   this.multiple = !selection.length
-		},
-		// 多选框选中数据
-		handleSelectionChange(selection) {
-			this.ids = selection.map(item => item.equipmentId)
-			this.single = selection.length!==1
-			this.multiple = !selection.length
-		},
-		/** 新增按钮操作 */
-		handleAdd() {
-			// this.queryProductParams.pageNum = 1;
-			// this.getProductList();
-			this.reset();
-			this.open = true;
-			this.title = "添加设备绑定产品";
-		},
-		/** 修改按钮操作 */
-		// handleUpdate(row) {
-		// 	this.reset();
-		// 	const equipmentId = row.equipmentId || this.ids
-		// 	getEquipmentBoundMaterials(equipmentId).then(response => {
-		// 		this.form = response.data;
-		// 		this.open = true;
-		// 		this.title = "修改设备绑定产品";
-		// 	});
-		// },
-		/** 提交按钮 */
-		submitForm() {
-			this.$refs["form"].validate(valid => {
-				if (valid) {
-					console.log(this.form.equipmentId);
-					if (this.form.equipmentId != null) {
-					// 	updateEquipmentBoundMaterials(this.form).then(response => {
-					// 		this.$modal.msgSuccess("修改成功");
-					// 		this.open = false;
-					// 		this.getList();
-					// 	});
-					// } else
-					// if(this.form.productId != null){
-						addEquipmentBoundMaterials(this.form).then(response => {
-							this.$modal.msgSuccess("绑定成功");
-							this.open = false;
-							this.getProductList();
-						});
-					}
-					// else {
-					// 	addEquipmentBoundMaterials(this.form).then(response => {
-					// 		this.$modal.msgSuccess("新增成功");
-					// 		this.open = false;
-					// 		this.getList();
-					// 	});
-					// }
-				}
-			});
-		},
-
-		/** 删除按钮操作 */
-		handleDelete(row) {
-			const equipmentIds = row.equipmentId || this.ids;
-			this.$modal.confirm('是否确认删除设备绑定产品编号为"' + equipmentIds + '"的数据项？').then(function() {
-				return delEquipmentBoundMaterials(equipmentIds);
-			}).then(() => {
-				this.getList();
-				this.$modal.msgSuccess("删除成功");
-			}).catch(() => {});
-		},
-		/** 导出按钮操作 */
-		handleExport() {
-			this.download('wms/equipmentBoundMaterials/export', {
-				...this.queryParams
-			}, ` equipmentBoundMaterials_${new Date().getTime()}.xlsx`)
-		}
-	}
-};
-</script>
diff --git a/src/views/wms/equipment/index.vue b/src/views/wms/equipment/index.vue
index 5957b307..17c0a44a 100644
--- a/src/views/wms/equipment/index.vue
+++ b/src/views/wms/equipment/index.vue
@@ -198,11 +198,6 @@
                     </el-col>
                 </el-row>
 			</el-form>
-			<el-tabs type="border-card" v-if="form.equipmentCode != null">
-        <el-tab-pane label="设备绑定物料">
-          <EquipmentBoundMaterials v-if="form.equipmentCode != null" :optType="optType" :equipmentCode="form.equipmentCode"></EquipmentBoundMaterials>
-        </el-tab-pane>
-      </el-tabs>
 			<div slot="footer" class="dialog-footer">
 				<el-button type="primary" @click="submitForm">确 定</el-button>
 				<el-button @click="cancel">取 消</el-button>
@@ -213,10 +208,8 @@
 
 <script>
 import { listEquipment, getEquipment, delEquipment, addEquipment, updateEquipment } from "@/api/wms/equipment";
-import EquipmentBoundMaterials from "./equipmentBoundMaterials";
 export default {
 	name: "Equipment",
-	components: {EquipmentBoundMaterials},
 	dicts: ['sys_normal_disable', 'equ_type'],
 	data() {
 		return {
@@ -381,7 +374,6 @@ export default {
 				this.title = "修改设备管理";
 			});
 		},
-		// 查询明细按钮操作
     // 查询明细按钮操作
     handleView(row){
       this.reset();
@@ -389,7 +381,7 @@ export default {
       getEquipment(equipmentId).then(response => {
         this.form = response.data;
         this.open = true;
-        this.title = "查看设备绑定信息";
+        this.title = "查看设备信息";
         this.optType = "view";
       });
     },