From f2afea91edd14d42c5c54f4b3e51c0390386e117 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Thu, 21 Dec 2023 10:39:43 +0800
Subject: [PATCH 1/4] =?UTF-8?q?feat:=20material=E6=B7=BB=E5=8A=A0=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E9=9A=90=E8=97=8F=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mtm/route.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/views/mtm/route.vue b/src/views/mtm/route.vue
index 10b20ec8..8877a428 100644
--- a/src/views/mtm/route.vue
+++ b/src/views/mtm/route.vue
@@ -31,6 +31,7 @@
                             <div class="left-panel">
                                 <el-button type="primary" icon="el-icon-plus" @click="table_add"
                                     v-auth="'route.create'">新增</el-button>
+                                <div style="font-size: 16px">当前选择:  {{ selectedProduct.name }}</div>
                             </div>
                         </el-header>
                         <el-main class="nopadding">
@@ -102,7 +103,7 @@
                 <el-switch v-model="form.is_autotask" />
             </el-form-item>
             <el-form-item label="主要输入" prop="material_in">
-                <el-select v-model="form.material_in" placeholder="物料" clearable style="width: 100%;">
+                <el-select v-model="form.material_in" placeholder="物料" clearable filterable style="width: 100%;">
                     <el-option v-for="item in materialOptions" :key="item.id" :label="item.full_name" :value="item.id">
                         <span style="float: left">{{ item.full_name }}</span>
                         <span style="float: right;color: '#E6A23C';font-size: 13px;" v-if="item.is_hidden">{{
@@ -111,7 +112,7 @@
                 </el-select>
             </el-form-item>
             <el-form-item label="主要输出" prop="material_out">
-                <el-select v-model="form.material_out" placeholder="物料" clearable style="width: 100%;">
+                <el-select v-model="form.material_out" placeholder="物料" clearable filterable style="width: 100%;">
                     <el-option v-for="item in materialOptions" :key="item.id" :label="item.full_name" :value="item.id">
                         <span style="float: left">{{ item.full_name }}</span>
                         <span style="float: right;color: '#E6A23C';font-size: 13px;" v-if="item.is_hidden">{{

From cffbecf3305d8119de94a9660fd549583145f276 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Thu, 21 Dec 2023 10:40:21 +0800
Subject: [PATCH 2/4] =?UTF-8?q?feat:=20route=E5=A2=9E=E5=8A=A0=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mtm/materials_form.vue | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/views/mtm/materials_form.vue b/src/views/mtm/materials_form.vue
index 23cdad45..eef14cee 100644
--- a/src/views/mtm/materials_form.vue
+++ b/src/views/mtm/materials_form.vue
@@ -55,6 +55,11 @@
                 <el-switch v-model="form.need_route" />
               </el-form-item>
             </el-col>
+            <el-col :md="12" :sm="24">
+              <el-form-item label="是否隐藏" prop="is_hidden">
+                <el-switch v-model="form.is_hidden" />
+              </el-form-item>
+            </el-col>
             <el-col :md="12" :sm="24">
               <el-form-item label="安全库存" prop="count_safe">
                 <el-input-number v-model="form.count_safe" :min="0" />

From cbcde10f80ce2d3e0545148973d3cdb2c2ce33d9 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Thu, 21 Dec 2023 12:58:29 +0800
Subject: [PATCH 3/4] =?UTF-8?q?fix:=20role=20create=20update=20=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/sys/role.vue | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/views/sys/role.vue b/src/views/sys/role.vue
index d13a5071..54a2b234 100644
--- a/src/views/sys/role.vue
+++ b/src/views/sys/role.vue
@@ -169,18 +169,17 @@
 						this.isSaveing = true;
 						let res;
 						if(this.type==='add'){
-							res = this.$API.system.role.create.req(that.addForm);
+							this.$API.system.role.create.req(that.addForm).then(res=>{
+								this.isSaveing = false;
+								this.limitedVisible = false;
+								this.$refs.table.refresh();
+							}).catch(e=>{this.isSaveing = false;})
 						}else{
-							res = this.$API.system.role.update.req(that.addForm.id,that.addForm);
-						}
-						console.log(res);
-						debugger;
-						if(res.err_msg){
-							this.$message.error(res.err_msg);
-						}else{
-							this.isSaveing = false;
-							this.limitedVisible = false;
-							this.$refs.table.refresh();
+							this.$API.system.role.update.req(that.addForm.id,that.addForm).then(res=>{
+								this.isSaveing = false;
+								this.limitedVisible = false;
+								this.$refs.table.refresh();
+							}).catch(e=>{this.isSaveing = false;})
 						}
 					}
 				})

From 21c6b5177b07409e8d0afd5e1ee4064f9569723e Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Thu, 21 Dec 2023 13:05:56 +0800
Subject: [PATCH 4/4] =?UTF-8?q?fix:=20=E4=BA=BA=E5=91=98=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/hrm/employee_photon.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/hrm/employee_photon.vue b/src/views/hrm/employee_photon.vue
index 02d7a514..996aba0e 100644
--- a/src/views/hrm/employee_photon.vue
+++ b/src/views/hrm/employee_photon.vue
@@ -88,14 +88,14 @@
               link
               type="success"
               size="small"
-              @click="table_show('show', scope.row)"
+              @click="table_show(scope.row)"
               >查看
             </el-button>
             <el-button
               link
               type="warning"
               size="small"
-              @click="table_edit('edit', scope.row)"
+              @click="table_edit(scope.row)"
               >编辑
             </el-button>
           </template>