From a2320580c17614e116ad123940528dce30ac2832 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Thu, 26 Dec 2024 13:30:40 +0800
Subject: [PATCH] =?UTF-8?q?fix:coding373=E3=80=81376?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/pm/utask_form.vue     | 19 +++++++++++++++++++
 src/views/sam/customer_form.vue |  4 ++--
 src/views/sys/post.vue          | 11 ++++++++---
 3 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/src/views/pm/utask_form.vue b/src/views/pm/utask_form.vue
index 2fa944c8..c734fff9 100644
--- a/src/views/pm/utask_form.vue
+++ b/src/views/pm/utask_form.vue
@@ -14,6 +14,16 @@
 					:rules="rules"
 					label-width="120px"
 				>
+				<el-form-item label="关联订单">
+					<el-select placeholder="关联订单" v-model="form.order" :disabled="mode == 'edit'" filterable style="width:100%">
+						<el-option v-for="item in orderList" 
+						:key="item.id" 
+						:label="item.number" 
+						:value="item.id"
+						>
+						</el-option>
+					</el-select>
+				</el-form-item>
 					<el-form-item label="任务编号" prop="number">
 						<el-input
 							v-model="form.number"
@@ -150,6 +160,7 @@ export default {
 			setFiltersVisible: false,
 			belong_dept_options: [],
 			group: [],
+			orderList:[],
 			routeText: "工艺路线",
 		};
 	},
@@ -157,6 +168,7 @@ export default {
 		if (this.type == "routepack") {
 			this.routeText = "工艺路线";
 			this.getRoutePackes();
+			this.getOrders();
 		} else {
 			this.routeText = "工艺路线";
 			this.getRouteOptions();
@@ -191,6 +203,13 @@ export default {
 				that.routeOptions = res;
 			});
 		},
+		//关联订单
+		getOrders(){
+			let that = this;
+			that.$API.sam.order.list.req({ page: 0}).then((res) => {
+				that.orderList = res;
+			});
+		},
 		routeChange(item) {
 			console.log(item);
 			if (this.type == "routepack") {
diff --git a/src/views/sam/customer_form.vue b/src/views/sam/customer_form.vue
index 4a212de7..7ef41590 100644
--- a/src/views/sam/customer_form.vue
+++ b/src/views/sam/customer_form.vue
@@ -36,8 +36,8 @@
               </el-form-item>
             </el-col>
             <el-col :md="12" :sm="24">
-              <el-form-item label="备注">
-                <el-input v-model="form.note" placeholder="备注"/>
+              <el-form-item label="描述">
+                <el-input v-model="form.description" placeholder="备注"/>
               </el-form-item>
             </el-col>
           </el-row>
diff --git a/src/views/sys/post.vue b/src/views/sys/post.vue
index cc08c9b2..ad58f0b0 100644
--- a/src/views/sys/post.vue
+++ b/src/views/sys/post.vue
@@ -196,9 +196,14 @@ export default {
       });
     },
     table_del(row) {
-      this.$API.system.post.delete.req(row.id).then(res=>{
-        this.$refs.table.refresh()
-      })
+      this.$confirm(`确定删除选中的岗位吗？`, "提示", {
+        type: "warning",
+      }).then(() => {
+        this.$API.system.post.delete.req(row.id).then((res) => {
+          this.$refs.table.refresh()
+          this.$message.success("操作成功");
+        }).catch(() => {});
+      });
     },
     //批量删除
     async batch_del() {