From 55fb2b925cd201d3b5899dc4c7c83dc8bc4a5e8c Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Wed, 24 Jul 2024 13:42:52 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E4=B8=AD=E6=B7=BB=E5=8A=A0=E4=BA=A7=E5=93=81=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/sam/orderitem.vue      |   9 +-
 src/views/sam/orderitem_form.vue | 230 +++++++++++++++++--------------
 2 files changed, 135 insertions(+), 104 deletions(-)

diff --git a/src/views/sam/orderitem.vue b/src/views/sam/orderitem.vue
index 56a3b793..5a8ac221 100644
--- a/src/views/sam/orderitem.vue
+++ b/src/views/sam/orderitem.vue
@@ -52,7 +52,7 @@
 						>
 							<template #default="scope">
 								<span v-if="scope.row.material_">
-									{{ scope.row.material_.name }}</span
+									{{ scope.row.material_.full_name }}</span
 								>
 							</template>
 						</el-table-column>
@@ -81,14 +81,14 @@
 							width="100px"
 						>
 							<template #default="scope">
-								<el-link
+								<!-- <el-link
 									type="primary"
 									@click="table_edit(scope.row)"
 									v-auth="'order.update'"
 								>
 									编辑
-								</el-link>
-								<el-divider direction="vertical"></el-divider>
+								</el-link> -->
+								<!-- <el-divider direction="vertical"></el-divider> -->
 								<el-link
 									type="danger"
 									@click="table_del(scope.row)"
@@ -186,6 +186,7 @@ export default {
 						.req(row.id)
 						.then((res) => {
 							this.$message.success("删除成功");
+							this.$refs.table.refresh();
 							return res;
 						})
 						.catch((err) => {
diff --git a/src/views/sam/orderitem_form.vue b/src/views/sam/orderitem_form.vue
index b03fd19b..ed96b680 100644
--- a/src/views/sam/orderitem_form.vue
+++ b/src/views/sam/orderitem_form.vue
@@ -1,107 +1,137 @@
 <template>
-  <el-dialog :title="titleMap[mode]" v-model="visible" :size="1000" destroy-on-close @closed="$emit('closed')">
-    <el-container v-loading="loading">
-      <el-main style="padding: 0 20px 20px 20px">
-        <el-form ref="dialogForm" :model="form" :rules="rules" label-width="110px">
-          <el-row>
-            <el-col :md="12" :sm="24">
-              <el-form-item label="所需产品" prop="material">
-                <el-select v-model="form.material" placeholder="所需产品" clearable style="width:100%">
-                  <el-option v-for="item in options" :key="item.id" :label="item.name" :value="item.id"></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :md="12" :sm="24">
-              <el-form-item label="所需数量">
-                <el-input-number v-model="form.count" :precision="0" :min="1" controls-position="right" placeholder="所需数量"
-                  style="width:100%" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-      </el-main>
-      <el-footer>
-        <el-button type="primary" :loading="isSaveing" @click="submit">保存</el-button>
-        <el-button @click="visible = false">取消</el-button>
-      </el-footer>
-    </el-container>
-  </el-dialog>
+	<el-dialog
+		:title="titleMap[mode]"
+		v-model="visible"
+		:size="1000"
+		destroy-on-close
+		@closed="$emit('closed')"
+	>
+		<el-container v-loading="loading">
+			<el-main style="padding: 0 20px 20px 20px">
+				<el-form
+					ref="dialogForm"
+					:model="form"
+					:rules="rules"
+					label-width="110px"
+				>
+					<el-row>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="所需产品" prop="material">
+								<el-select
+									v-model="form.material"
+									placeholder="所需产品"
+									clearable
+									filterable
+									style="width: 100%"
+								>
+									<el-option
+										v-for="item in options"
+										:key="item.id"
+										:label="item.full_name"
+										:value="item.id"
+									></el-option>
+								</el-select>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="所需数量">
+								<el-input-number
+									v-model="form.count"
+									:precision="0"
+									:min="1"
+									controls-position="right"
+									placeholder="所需数量"
+									style="width: 100%"
+								/>
+							</el-form-item>
+						</el-col>
+					</el-row>
+				</el-form>
+			</el-main>
+			<el-footer>
+				<el-button type="primary" :loading="isSaveing" @click="submit"
+					>保存</el-button
+				>
+				<el-button @click="visible = false">取消</el-button>
+			</el-footer>
+		</el-container>
+	</el-dialog>
 </template>
 <script>
 export default {
-  emits: ["success", "closed"],
-  props: {
-    orderId: { type: String, default: '' },
-  },
-  data() {
-    return {
-      loading: false,
-      mode: "add",
-      titleMap: {
-        add: "新增订单详情",
-        edit: "编辑订单详情",
-        show: "查看订单详情",
-      },
-      form: {},
-      rules: {
-        material: [{ required: true, message: "请选择所需产品", trigger: "blur" }],
-      },
-      visible: false,
-      isSaveing: false,
-      options: [],
-      setFiltersVisible: false,
-    };
-  },
-  mounted() {
-    this.getList();
-  },
-  methods: {
-    //显示
-    open(mode = "add") {
-      this.mode = mode;
-      this.visible = true;
-      return this;
-    },
-    getList() {
-      this.$API.mtm.material.list.req({ page: 0, type: 10 }).then(res => {
-        this.options = res;
-      })
-    },
-    //提交
-    submit() {
-      this.$refs.dialogForm.validate(async (valid) => {
-        if (valid) {
-          this.isSaveing = true;
-          this.form.order = this.orderId;
-          try {
-            var res;
-            if (this.mode == "add") {
-              res = await this.$API.sam.orderitem.create.req(this.form);
-            } else if (this.mode == "edit") {
-              res = await this.$API.sam.orderitem.update.req(this.form.id, this.form);
-            }
-            this.isSaveing = false;
-            this.$emit("success", this.form, this.mode);
-            this.visible = false;
-            this.$message.success("操作成功");
-          } catch (err) {
-            //可以处理校验错误
-            this.isSaveing = false;
-            return err;
-          }
-        }
-      });
-    },
-    //表单注入数据
-    setData(data) {
-      Object.assign(this.form, data);
-    },
-    //设置过滤项
-    setFilters(filters) {
-      this.selectionFilters = filters;
-      this.setFiltersVisible = true;
-    },
-  },
+	emits: ["success", "closed"],
+	props: {
+		orderId: { type: String, default: "" },
+	},
+	data() {
+		return {
+			loading: false,
+			mode: "add",
+			titleMap: {
+				add: "新增订单详情",
+				edit: "编辑订单详情",
+				show: "查看订单详情",
+			},
+			form: {},
+			rules: {
+				material: [
+					{
+						required: true,
+						message: "请选择所需产品",
+						trigger: "blur",
+					},
+				],
+			},
+			visible: false,
+			isSaveing: false,
+			options: [],
+			setFiltersVisible: false,
+		};
+	},
+	mounted() {
+		this.getList();
+	},
+	methods: {
+		//显示
+		open(mode = "add") {
+			this.mode = mode;
+			this.visible = true;
+			return this;
+		},
+		getList() {
+			this.$API.mtm.material.list
+				.req({ page: 0, type: 10 })
+				.then((res) => {
+					this.options = res;
+				});
+		},
+		//提交
+		submit() {
+			this.$refs.dialogForm.validate(async (valid) => {
+				if (valid) {
+					this.isSaveing = true;
+					this.form.order = this.orderId;
+					this.$API.sam.orderitem.create
+						.req(this.form)
+						.then((res) => {
+							this.isSaveing = false;
+							this.$emit("success", this.form, this.mode);
+							this.visible = false;
+							this.$message.success("操作成功");
+						});
+				}
+			});
+		},
+		//表单注入数据
+		setData(data) {
+			Object.assign(this.form, data);
+		},
+		//设置过滤项
+		setFilters(filters) {
+			this.selectionFilters = filters;
+			this.setFiltersVisible = true;
+		},
+	},
 };
 </script>
 <style></style>