From faefc48a59f9d6027143d99ea55edf9d1a6491d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BE=99=E8=BF=90=E6=A8=A1?= <1724894114@qq.com>
Date: Mon, 2 Sep 2024 20:05:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=A9=E6=96=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/order/orderList/index.vue           |  2 +-
 .../advanced/components/addMaterial.vue       | 73 +++++++------------
 src/views/setting/advanced/setup/material.vue | 46 +++++++++---
 3 files changed, 63 insertions(+), 58 deletions(-)

diff --git a/src/views/order/orderList/index.vue b/src/views/order/orderList/index.vue
index 4ecede7..4472d7f 100644
--- a/src/views/order/orderList/index.vue
+++ b/src/views/order/orderList/index.vue
@@ -35,7 +35,7 @@
 					<el-button :size="size" type="info" icon="el-icon-RefreshRight" @click="reset">重置</el-button>
 				</div>
 			</div>
-			<scTable ref="table" :apiObj="list.apiObj" :column="list.column" row-key="id" stripe :size="size" @selection-change="selectionChange">
+			<scTable ref="table" :apiObj="list.apiObj" :column="list.column" row-key="id" stripe :size="size" highlightCurrentRow @selection-change="selectionChange">
 				<el-table-column type="selection" align="center" width="40"></el-table-column>
 				<sc-table-column label="序号" align="center" type="index"></sc-table-column>
 				<template #business_status="scope">
diff --git a/src/views/setting/advanced/components/addMaterial.vue b/src/views/setting/advanced/components/addMaterial.vue
index c0bc4b2..c0bc64c 100644
--- a/src/views/setting/advanced/components/addMaterial.vue
+++ b/src/views/setting/advanced/components/addMaterial.vue
@@ -1,17 +1,17 @@
 <template>
 	<el-dialog :title="titleMap[mode]" v-model="visible" :width="500" destroy-on-close @closed="$emit('closed')">
 		<el-form :model="form" :rules="rules" :disabled="mode=='show'" ref="dialogForm" label-width="100px">
-			<el-form-item label="上级部门" prop="parent_id">
-				<el-cascader v-model="form.parent_id" :options="depts" :props="deptsProps" :show-all-levels="false" clearable style="width: 100%;"></el-cascader>
+			<el-form-item label="物料MPN" prop="m_mpn">
+				<el-input v-model="form.m_mpn" placeholder="请输入物料MPN" clearable></el-input>
 			</el-form-item>
-			<el-form-item label="部门名称" prop="name">
-				<el-input v-model="form.name" placeholder="请输入部门名称" clearable></el-input>
+			<el-form-item label="物料名称" prop="m_name">
+				<el-input v-model="form.m_name" placeholder="请输入物料名称" clearable></el-input>
 			</el-form-item>
-			<el-form-item label="状态" prop="active_status">
-				<el-switch v-model="form.active_status" :active-value="true" :inactive-value="false"></el-switch>
+			<el-form-item label="物料成本价" prop="m_price">
+				<el-input v-model="form.m_price" placeholder="请输入物料成本价" clearable></el-input>
 			</el-form-item>
-			<el-form-item label="备注" prop="remark">
-				<el-input v-model="form.remark" clearable type="textarea"></el-input>
+			<el-form-item label="ERP实体ID" prop="f_id">
+				<el-input v-model="form.f_id" placeholder="请输入ERP实体ID" clearable></el-input>
 			</el-form-item>
 		</el-form>
 		<template #footer>
@@ -29,39 +29,35 @@ export default {
 			mode: "add",
 			titleMap: {
 				add: '新增',
-				edit: '编辑',
-				show: '查看'
 			},
 			visible: false,
 			isSave: false,
 			//表单数据
 			form: {
-				parent_id: "",
-				id:"",
-				name: "",
-				active_status: true,
-				remark: ""
+				m_mpn: "",
+				m_name:"",
+				m_price: "",
+				f_id: ""
 			},
 			//验证规则
 			rules: {
-				name: [
-					{required: true, message: '请输入部门名称'}
+				m_mpn: [
+					{required: true, message: '请输入物料MPN'}
 				],
-				active_status: [
-					{required: true,}
+				m_name: [
+					{required: true, message: '请输入物料名称'}
+				],
+				m_price: [
+					{required: true, message: '请输入物料成本价'}
+				],
+				f_id: [
+					{required: true, message: '请输入ERP实体ID'}
 				],
 			},
-			//所需数据选项
-			depts: [],
-			deptsProps: {
-				value: "id",
-				emitPath: false,
-				checkStrictly: true
-			}
 		}
 	},
 	mounted() {
-		this.getGroup()
+
 	},
 	methods: {
 		//显示
@@ -70,19 +66,13 @@ export default {
 			this.visible = true;
 			return this
 		},
-		//加载树数据
-		async getGroup(){
-			const res = await this.$API.system.dept.active.post();
-			if(res.code == 200){
-				this.depts = res.data;
-			}
-		},
+
 		//表单提交方法
 		submit(){
 			this.$refs.dialogForm.validate(async (valid) => {
 				if (valid) {
 					this.isSave = true;
-					const res = await this.$API.system.dept.add.post(this.form);
+					const res = await this.$API.setup.material.add.post(this.form);
 					this.isSave = false;
 					if(res.code == 200){
 						this.$emit('success', this.form, this.mode)
@@ -92,19 +82,10 @@ export default {
 				}
 			})
 		},
-		//表单注入数据
-		async setData(data) {
-			let params = {
-				id: data.id
-			}
-			const res = await this.$API.system.dept.info.post(params);
-			if (res.code == 200) {
-				this.form = res.data;
-			}
-		}
 	}
 }
 </script>
 
-<style>
+<style lang="scss" scoped>
+
 </style>
diff --git a/src/views/setting/advanced/setup/material.vue b/src/views/setting/advanced/setup/material.vue
index 9385f92..54eb4d4 100644
--- a/src/views/setting/advanced/setup/material.vue
+++ b/src/views/setting/advanced/setup/material.vue
@@ -27,11 +27,24 @@
 			</div>
 			<scTable ref="table" :apiObj="list.apiObj" :column="list.column" stripe :size="size" highlightCurrentRow>
 				<sc-table-column label="序号" align="center" type="index"></sc-table-column>
+				<el-table-column label="操作" fixed="right" align="center" width="160">
+					<template #default="scope">
+						<el-dropdown>
+							<el-button class="noBorderBtn" icon="el-icon-more" :size="size"></el-button>
+							<template #dropdown>
+								<el-dropdown-menu>
+									<el-dropdown-item @click="table_see(scope.row, 'see')" icon="sc-icon-See">查看</el-dropdown-item>
+									<el-dropdown-item @click="table_del(scope.row, 'delete')" icon="sc-icon-Delete">删除配置</el-dropdown-item>
+								</el-dropdown-menu>
+							</template>
+						</el-dropdown>
+					</template>
+				</el-table-column>
 			</scTable>
 		</el-main>
 	</el-container>
 
-	<add-material></add-material>
+	<add-material v-if="dialog.save" ref="saveDialog" @success="handleSuccess" @closed="dialog.save=false"></add-material>
 </template>
 
 <script>
@@ -44,6 +57,9 @@ export default {
 	data(){
 		return{
 			size:'small',
+			dialog:{
+				show:false,
+			},
 			list:{
 				apiObj: this.$API.setup.material.list,
 				column:[]
@@ -64,16 +80,6 @@ export default {
 			let {params} = item;
 			this.params = params;
 		},
-		async save() {
-			const res = await this.$API.setup.room.add.post(this.params);
-			if(res.code == 200){
-				this.$refs.table.refresh();
-			}
-		},
-
-		add(){
-
-		},
 
 		// 批量导入
 		importFile(){
@@ -104,6 +110,24 @@ export default {
 			this.$refs.table.refresh()
 		},
 
+		add(){
+			this.dialog.save = true
+			this.$nextTick(() => {
+				this.$refs.saveDialog.open()
+			})
+		},
+		// 新增成功
+		handleSuccess(){
+			this.$refs.table.refresh();
+		},
+
+		table_see(){
+
+		},
+		table_del(){
+
+		},
+
 		upSearch(){
 			this.$refs.table.upData(this.params);
 		},