From e0ba3ca6fb14e59cc1064f1d29c875fb26c9da6a Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Thu, 21 Dec 2023 15:10:48 +0800
Subject: [PATCH 1/8] =?UTF-8?q?fix:=207=E8=BD=A6=E9=97=B4=2010=E8=BD=A6?=
 =?UTF-8?q?=E9=97=B4=E6=89=B9=E6=AC=A1=E5=8F=B7=E6=89=8B=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm/worktask_form.vue | 32 ++++++--------------------------
 1 file changed, 6 insertions(+), 26 deletions(-)

diff --git a/src/views/wpm/worktask_form.vue b/src/views/wpm/worktask_form.vue
index ce1b30d3..aec425d8 100644
--- a/src/views/wpm/worktask_form.vue
+++ b/src/views/wpm/worktask_form.vue
@@ -468,21 +468,11 @@
         </el-col>
         <el-col :md="12" :sm="24">
           <el-form-item label="批次号">
-            <el-select
+            <el-input
               v-model="form.batch"
+              tyle="width:100%"
               placeholder="批次号"
-              clearable
-              filterable
-              allow-create
-              style="width: 100%"
-            >
-              <el-option
-                v-for="item in wMaterialOptions"
-                :key="item.batch"
-                :label="item.batch"
-                :value="item.batch"
-              ></el-option>
-            </el-select>
+            ></el-input>
           </el-form-item>
         </el-col>
         <!-- <el-col :md="12" :sm="24">
@@ -874,21 +864,11 @@
         </el-col>
         <el-col :md="12" :sm="24">
           <el-form-item label="批次号">
-            <el-select
+            <el-input
               v-model="form.batch"
+              tyle="width:100%"
               placeholder="批次号"
-              clearable
-              filterable
-              allow-create
-              style="width: 100%"
-            >
-              <el-option
-                v-for="item in wMaterialOptions"
-                :key="item.batch"
-                :label="item.batch"
-                :value="item.batch"
-              ></el-option>
-            </el-select>
+            ></el-input>
           </el-form-item>
         </el-col>
       </el-row>

From 8fdd0268ee0fe7e23fac718bf5ec82c1d84a916a Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Thu, 21 Dec 2023 15:21:22 +0800
Subject: [PATCH 2/8] =?UTF-8?q?feat:=20mioitem=20=E7=89=A9=E6=96=99?=
 =?UTF-8?q?=E7=9C=8Bfull=5Fname?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inm/mioitem_form.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/views/inm/mioitem_form.vue b/src/views/inm/mioitem_form.vue
index ffe0ad3d..120027dd 100644
--- a/src/views/inm/mioitem_form.vue
+++ b/src/views/inm/mioitem_form.vue
@@ -5,8 +5,7 @@
                 <el-select v-model="selectMaterial" value-key="id" clearable style="width: 100%;"
                     @change="selectMaterialChange">
                     <el-option v-for="item in materialOptions" :key="item.id" :label="item.number" :value="item">
-                        <span style="float: left">{{ item.number }}</span>
-                        <span style=" float: right; color: var(--el-text-color-secondary);font-size: 13px;">{{ item.name }}</span>
+                        <span style="float: left">{{ item.full_name }}</span>
                     </el-option>
                 </el-select>
             </el-form-item>

From c691474254276ed13ecc70c8b8f787bacc02a875 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Thu, 21 Dec 2023 21:24:50 +0800
Subject: [PATCH 3/8] =?UTF-8?q?fix:=20employee=E5=85=89=E5=AD=90=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=20update=E6=8E=A7=E6=9D=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/hrm/employee_photon.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/hrm/employee_photon.vue b/src/views/hrm/employee_photon.vue
index 996aba0e..ba227274 100644
--- a/src/views/hrm/employee_photon.vue
+++ b/src/views/hrm/employee_photon.vue
@@ -95,6 +95,7 @@
               link
               type="warning"
               size="small"
+              v-auth="'employee.update'"
               @click="table_edit(scope.row)"
               >编辑
             </el-button>

From 9ee05321e8ce1d2fdce3dfa6329a4d7061c3f81a Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Thu, 21 Dec 2023 21:25:10 +0800
Subject: [PATCH 4/8] =?UTF-8?q?fix:=20=E9=95=BF=E7=99=BD=E7=8F=AD=E5=92=8C?=
 =?UTF-8?q?=E4=B8=A4=E5=80=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm/worktask_form.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/wpm/worktask_form.vue b/src/views/wpm/worktask_form.vue
index aec425d8..db3e2228 100644
--- a/src/views/wpm/worktask_form.vue
+++ b/src/views/wpm/worktask_form.vue
@@ -1170,7 +1170,7 @@ export default {
         this.shiftOptions = [];
         if(this.activeType == "10车间"){
           res.forEach(item=>{
-            if(item.rule=='三倒'){
+            if(item.rule=='两倒'){
               this.shiftOptions.push(item);
             }
           })

From ddfc2cb5b525bdcdb423bb8e4d95d93227040fdf Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Fri, 22 Dec 2023 09:39:50 +0800
Subject: [PATCH 5/8] =?UTF-8?q?feat:=20=E8=AE=BE=E5=A4=87=E6=89=80?=
 =?UTF-8?q?=E5=B1=9E=E8=BD=A6=E9=97=B4=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/em/equipment.vue | 32 +++++++++++++++-----------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/src/views/em/equipment.vue b/src/views/em/equipment.vue
index 9b3e4a7e..7314a082 100644
--- a/src/views/em/equipment.vue
+++ b/src/views/em/equipment.vue
@@ -3,11 +3,13 @@
     <el-header>
       <div class="left-panel">
         <el-button type="primary" icon="el-icon-plus" @click="add" v-auth="'equipment.create'">新增</el-button>
-        <el-select v-model="query.belong_dept" placeholder="所在车间" clearable style="margin-left: 2px;">
+        <el-select v-model="query.belong_dept" placeholder="所在车间" clearable style="margin-left: 2px;"
+        @change="handleQuery">
           <el-option v-for="item in deptOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
         </el-select>
         <el-select v-model="query.state" placeholder="设备状态" clearable style="margin-left: 2px;">
-          <el-option v-for="item in stateOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
+          <el-option v-for="item in stateOptions" :key="item.value" :label="item.label" :value="item.value"
+          @change="handleQuery"></el-option>
         </el-select>
       </div>
       <div class="right-panel">
@@ -16,7 +18,7 @@
       </div>
     </el-header>
     <el-main class="nopadding">
-      <scTable ref="table" :apiObj="apiObj" row-key="id" stripe :params="query">
+      <scTable ref="table" :apiObj="apiObj" row-key="id" stripe :params="paramsEquipment">
         <el-table-column type="index" width="50" />
         <el-table-column label="设备名称" prop="name" show-overflow-tooltip>
         </el-table-column>
@@ -81,7 +83,7 @@
   </el-container>
   <save-dialog v-if="dialog.save" ref="saveDialog" @success="handleSaveSuccess"
     @closed="dialog.save = false"></save-dialog>
-  <el-drawer title="检定记录" v-model="visibleRecord" :size="1000" destroy-on-close @closed="visibleRecord = false">
+  <el-drawer title="巡检记录" v-model="visibleRecord" :size="1000" destroy-on-close @closed="visibleRecord = false">
     <el-container v-loading="loading">
       <el-button type="primary" icon="el-icon-plus" @click="record_create" v-auth="'equipment'"
         style="position: absolute;z-index: 10;left: 110px;top: 16px;">新增</el-button>
@@ -182,6 +184,7 @@
 </template>
 <script>
 import saveDialog from "./equipment_form.vue";
+import { genTree } from "@/utils/verificate";
 export default {
   name: "rparty",
   components: {
@@ -189,15 +192,13 @@ export default {
   },
   data() {
     return {
+      deptOptions: [],
       dialog: {
         save: false,
       },
       apiObj: this.$API.em.equipment.list,
-      query: {
-        page: 1,
-        page_size: 20,
-        type: 10
-      },
+      paramsEquipment:{type: 10},
+      query: {},
       apiObj2: this.$API.em.einspect.list,
       query2: {
         equipment: ''
@@ -235,15 +236,12 @@ export default {
     };
   },
   mounted() {
-    this.getUserList();
+    this.getDept()
   },
   methods: {
-    //获取员工
-    getUserList() {
-      let that = this;
-      this.$API.system.user.list.req({ page_size: 20, page: 1 }).then(res => {
-        that.userList = res.results;
-      });
+    async getDept() {
+      let res = await this.$API.system.dept.list.req({ page: 0, type: "dept" });
+      this.deptOptions = genTree(res);
     },
     getReceptionist(data) {
       this.form.inspect_user = data.id;
@@ -283,7 +281,7 @@ export default {
     record_create() {
       this.visible = true;
     },
-    //提交检验
+    //提交巡检记录
     submit() {
       this.$refs.dialogForm.validate(async (valid) => {
         if (valid) {

From a8cd681e333211ff672394c1efb7ff7308c0d503 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Fri, 22 Dec 2023 09:40:18 +0800
Subject: [PATCH 6/8] =?UTF-8?q?fix:=20=E7=8F=AD=E7=BB=84=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=90=8E=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/hrm/team_photon.vue | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/views/hrm/team_photon.vue b/src/views/hrm/team_photon.vue
index 60066829..859a70e4 100644
--- a/src/views/hrm/team_photon.vue
+++ b/src/views/hrm/team_photon.vue
@@ -153,16 +153,17 @@ import memberDialog from "./team_form.vue";
 						this.isSaveing = true;
 						let res;
 						if(this.type==='add'){
-							res = this.$API.mtm.team.create.req(that.form);
+							this.$API.mtm.team.create.req(that.form).then(res=>{
+								this.isSaveing = false;
+								this.limitedVisible = false;
+								this.$refs.table.refresh();
+							}).catch(e=>{this.isSaveing = false;})
 						}else{
-							res = this.$API.mtm.team.update.req(that.form.id,that.form);
-						}
-						if(res.err_msg){
-							this.$message.error(res.err_msg);
-						}else{
-							this.isSaveing = false;
-							this.limitedVisible = false;
-							this.$refs.table.refresh();
+							this.$API.mtm.team.update.req(that.form.id,that.form).then(res=>{
+								this.isSaveing = false;
+								this.limitedVisible = false;
+								this.$refs.table.refresh();
+							}).catch(e=>{this.isSaveing = false;})
 						}
 					}
 				})

From b207edccf5cb9a714229488608e4aa967879c369 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Fri, 22 Dec 2023 09:40:58 +0800
Subject: [PATCH 7/8] =?UTF-8?q?fix:=20=E4=BB=BB=E5=8A=A1=E5=88=86=E8=A7=A3?=
 =?UTF-8?q?=E6=8C=89=E9=92=AEcode=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/pm/utask_dept6.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/pm/utask_dept6.vue b/src/views/pm/utask_dept6.vue
index f7fec28d..0a1ec290 100644
--- a/src/views/pm/utask_dept6.vue
+++ b/src/views/pm/utask_dept6.vue
@@ -7,7 +7,7 @@
                         <el-button type="primary" icon="el-icon-plus" @click="utaskCreate"
                             v-auth="'utask.create'">新增任务</el-button>
                         <el-button type="primary" @click="utaskDepuse" v-loading="isLoading"
-                            v-auth="'utask.schedue'">任务分解</el-button>
+                            v-auth="'utask.schedule'">任务分解</el-button>
                         <el-button type="primary" @click="utaskAssgin" v-loading="isLoading"
                             v-auth="'utask.assgin'">任务下达</el-button>
                     </div>

From a1b74f4639fb7783bae4fdc8498bedf7226b0c54 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Fri, 22 Dec 2023 10:38:09 +0800
Subject: [PATCH 8/8] =?UTF-8?q?fix:=20=E7=8F=AD=E6=AC=A1=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=EF=BC=8C=E5=85=88=E8=BF=99=E6=A0=B7=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm/mlog6_form.vue    |  2 +-
 src/views/wpm/mlog_dept7.vue    | 12 +++++++++---
 src/views/wpm/mlog_hun.vue      |  1 +
 src/views/wpm/mlog_tui.vue      |  1 +
 src/views/wpm/worktask_form.vue | 26 +++++++++++---------------
 5 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/src/views/wpm/mlog6_form.vue b/src/views/wpm/mlog6_form.vue
index f08685ed..e2f9ab14 100644
--- a/src/views/wpm/mlog6_form.vue
+++ b/src/views/wpm/mlog6_form.vue
@@ -58,7 +58,7 @@
               <el-option
                 v-for="item in equipmentOptions"
                 :key="item.id"
-                :label="item.name"
+                :label="item.full_name"
                 :value="item.id"
               />
             </el-select>
diff --git a/src/views/wpm/mlog_dept7.vue b/src/views/wpm/mlog_dept7.vue
index 27a41cf7..1f4d95d1 100644
--- a/src/views/wpm/mlog_dept7.vue
+++ b/src/views/wpm/mlog_dept7.vue
@@ -255,9 +255,15 @@
                 </el-main>
             </el-container>
         </el-main>
-        <save-dialog v-if="dialogSave" ref="saveDialog" :mtask="currentMtask.id" :mgroup="mgroup"
-            :material_out="material_out" :material_in="material_in" :activeType="activeName" @success="handleSaveSuccess"
-            @closed="dialogSave = false"></save-dialog>
+        <save-dialog v-if="dialogSave" ref="saveDialog" 
+            :mtask="currentMtask.id" 
+            :mgroup="mgroup" 
+            :material_out="material_out" 
+            :material_in="material_in" 
+            :activeType="activeName" 
+            @success="handleSaveSuccess"
+            @closed="dialogSave = false">
+        </save-dialog>
         <showDrawer ref="showDrawer" v-if="visibleDrawer" :mlogId="mlogId" @closed="visibleDrawer = false">
         </showDrawer>
     </el-container>
diff --git a/src/views/wpm/mlog_hun.vue b/src/views/wpm/mlog_hun.vue
index 85e6d606..d5d4d6fa 100644
--- a/src/views/wpm/mlog_hun.vue
+++ b/src/views/wpm/mlog_hun.vue
@@ -155,6 +155,7 @@
     <save-dialog v-if="dialogSave" 
         ref="saveDialog"
         :mgroup="currentMgroup.id"
+        :mgroupShiftRule = "currentMgroup.shift_rule"
         :activeType="activeName"
         @success="handleSaveSuccess" 
         @closed="dialogSave = false">
diff --git a/src/views/wpm/mlog_tui.vue b/src/views/wpm/mlog_tui.vue
index d9743429..aafb7840 100644
--- a/src/views/wpm/mlog_tui.vue
+++ b/src/views/wpm/mlog_tui.vue
@@ -202,6 +202,7 @@
     <save-dialog v-if="dialogSave" 
         ref="saveDialog"
         :mgroup="currentMgroup.id"
+        :mgroupShiftRule = "currentMgroup.shift_rule"
         :activeType="activeName"
         @success="handleSaveSuccess" 
         @closed="dialogSave = false">
diff --git a/src/views/wpm/worktask_form.vue b/src/views/wpm/worktask_form.vue
index db3e2228..31f1d13c 100644
--- a/src/views/wpm/worktask_form.vue
+++ b/src/views/wpm/worktask_form.vue
@@ -503,7 +503,7 @@
               <el-option
                 v-for="item in equipmentOptions"
                 :key="item.id"
-                :label="item.name"
+                :label="item.full_name"
                 :value="item.id"
               ></el-option>
             </el-select>
@@ -579,7 +579,7 @@
               <el-option
                 v-for="item in equipmentOptions"
                 :key="item.id"
-                :label="item.name"
+                :label="item.full_name"
                 :value="item.id"
               ></el-option>
             </el-select>
@@ -1048,6 +1048,7 @@
 export default {
   emits: ["success", "closed"],
   props: {
+    mgroupShiftRule:{ type: String, default: "" },
     mgroup:{ type: String, default: "" },
     mtask: { type: String, default: "" },
     mgroupId: { type: String, default: "" },
@@ -1166,20 +1167,15 @@ export default {
       })
     },
     getShiftOptions() {
-      this.$API.mtm.shift.list.req({ page: 0}).then((res) => {
-        this.shiftOptions = [];
-        if(this.activeType == "10车间"){
-          res.forEach(item=>{
-            if(item.rule=='两倒'){
-              this.shiftOptions.push(item);
-            }
-          })
+      let req_dict = {page: 0}
+      if(this.mgroupShiftRule != null && this.mgroupShiftRule != undefined){
+        req_dict.rule = this.mgroupShiftRule
+      }
+      this.$API.mtm.shift.list.req(req_dict).then((res) => {
+        if(res.length==1){
+          this.form.shift = res[0].id
         }else{
-          res.forEach(item=>{
-            if(item.rule=='长白班'){
-              this.form.shift = item.id;
-            }
-          })
+          this.shiftOptions = res
         }
       });
     },