From ffbc69ebab0929afea3da28fb81c5b95cd282fc8 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Thu, 15 Aug 2024 16:43:10 +0800
Subject: [PATCH 1/4] =?UTF-8?q?fix:=E8=AE=BE=E5=A4=87=E5=B7=A1=E6=A3=80?=
 =?UTF-8?q?=E5=92=8C=E6=A3=80=E5=AE=9A=E8=AE=B0=E5=BD=95=E7=9A=84=E4=BF=AE?=
 =?UTF-8?q?=E8=AE=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/em/equipment.vue    | 34 +++++++++++++++++++++++-----------
 src/views/em/equipmentjl.vue  | 32 +++++++++++++++++---------------
 src/views/wf/ticketdetail.vue |  2 +-
 3 files changed, 41 insertions(+), 27 deletions(-)

diff --git a/src/views/em/equipment.vue b/src/views/em/equipment.vue
index 01c27bfe..f5760a78 100644
--- a/src/views/em/equipment.vue
+++ b/src/views/em/equipment.vue
@@ -75,7 +75,7 @@
         </el-table-column>
         <el-table-column label="操作" fixed="right" align="left" width="180">
           <template #default="scope">
-            <el-button link type="primary" @click="table_record(scope.row)" v-auth="'echeckrecord.create'">
+            <el-button link type="primary" @click="table_record(scope.row)" v-auth="'einspect.create'">
               巡检
             </el-button>
             <el-button link type="warning" @click="table_edit(scope.row)" v-auth="'equipment.update'">
@@ -97,7 +97,7 @@
     @closed="dialog.save = false"></check-dialog>
   <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'"
+      <el-button type="primary" icon="el-icon-plus" @click="record_create" v-auth="'einspect.create'"
         style="position: absolute;z-index: 10;left: 110px;top: 16px;">新增</el-button>
       <el-button type="primary" icon="el-icon-download" @click="exportExcel"
         style="position: absolute;z-index: 10;left:200px;top: 16px;">导出</el-button>
@@ -117,7 +117,7 @@
           </el-table-column>
           <el-table-column label="操作" fixed="right" align="center" width="160px">
             <template #default="scope">
-              <el-link type="danger" @click="record_del(scope.row)" v-auth="'equipment.delete'">
+              <el-link type="danger" @click="record_del(scope.row)" v-auth="'einspect.delete'">
                 删除
               </el-link>
             </template>
@@ -310,6 +310,17 @@ export default {
         this.$refs.saveDialog.open("show", 10).setData(row);
       });
     },
+    //删除检验
+    record_del(row) {
+      let that = this;
+      that.$API.em.einspect.delete.req(row.id).then((res) => {
+        that.$message.success("删除成功");
+        that.$refs.drawer_table.refresh();
+        that.$refs.table.refresh();
+      }).catch((err) => {
+        return err;
+      });
+    },
     table_record(row) {
       this.item = row;
       this.form.equipment = row.id;
@@ -325,16 +336,17 @@ export default {
     },
     //提交巡检记录
     submit() {
-      this.$refs.dialogForm.validate(async (valid) => {
+      let that = this;
+      that.$refs.dialogForm.validate(async (valid) => {
         if (valid) {
-          this.isSaveing = true;
-          this.$API.em.einspect.create.req(this.form).then(res => {
-            this.visible = false;
-            this.isSaveing = false;
-            this.$message.success("操作成功");
-            this.$refs.drawer_table.refresh();
+          that.isSaveing = true;
+          that.$API.em.einspect.create.req(that.form).then(res => {
+            that.visible = false;
+            that.isSaveing = false;
+            that.$message.success("操作成功");
+            that.$refs.drawer_table.refresh();
           }).catch(() => {
-            this.isSaveing = false;
+            that.isSaveing = false;
           })
         }
       });
diff --git a/src/views/em/equipmentjl.vue b/src/views/em/equipmentjl.vue
index eee230f0..f93fe51d 100644
--- a/src/views/em/equipmentjl.vue
+++ b/src/views/em/equipmentjl.vue
@@ -60,7 +60,7 @@
         <el-table-column label="操作" fixed="right" align="center" width="170px">
           <template #default="scope">
             <el-button link type="primary" v-if="scope.row.cycle !== null" @click="table_record(scope.row)"
-              v-auth="'einspect.create'">
+              v-auth="'echeckrecord.create'">
               检定记录
             </el-button>
             <el-button link type="primary" @click="table_edit(scope.row)" v-auth="'equipment.update'">
@@ -109,7 +109,7 @@
       </el-dialog>
       <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'"
+          <el-button type="primary" icon="el-icon-plus" @click="record_create" v-auth="'echeckrecord.create'"
             style="position: absolute;z-index: 10;left: 110px;top: 16px;"></el-button>
           <el-main style="padding: 0 20px 20px 20px">
             <scTable ref="drawer_table" :apiObj="apiObj2" row-key="id" stripe :params="query2">
@@ -127,7 +127,7 @@
               </el-table-column>
               <el-table-column label="操作" fixed="right" align="center" width="160px">
                 <template #default="scope">
-                  <el-link type="danger" @click="record_del(scope.row)" v-auth="'equipment.delete'">
+                  <el-link type="danger" @click="record_del(scope.row)" v-auth="'echeckrecord.delete'">
                     删除
                   </el-link>
                 </template>
@@ -236,27 +236,29 @@ export default {
     },
     //提交检验
     submit() {
-      this.$refs.dialogForm.validate(async (valid) => {
+      let that = this;
+      that.$refs.dialogForm.validate(async (valid) => {
         if (valid) {
-          this.isSaveing = true;
-          this.$API.em.echeckrecord.create.req(this.form).then(res => {
-            this.visible = false;
-            this.isSaveing = false;
-            this.$message.success("操作成功");
-            this.$refs.drawer_table.refresh();
-            this.$refs.table.refresh();
+          that.isSaveing = true;
+          that.$API.em.echeckrecord.create.req(that.form).then(res => {
+            that.visible = false;
+            that.isSaveing = false;
+            that.$message.success("操作成功");
+            that.$refs.drawer_table.refresh();
+            that.$refs.table.refresh();
           }).catch(() => {
-            this.isSaveing = false;
+            that.isSaveing = false;
           })
         }
       });
     },
     //删除检验
     record_del(row) {
+      let that = this;
       this.$API.em.echeckrecord.delete.req(row.id).then((res) => {
-        this.$message.success("删除成功");
-        this.$refs.drawer_table.refresh();
-        this.$refs.table.refresh();
+        that.$message.success("删除成功");
+        that.$refs.drawer_table.refresh();
+        that.$refs.table.refresh();
       }).catch((err) => {
         return err;
       });
diff --git a/src/views/wf/ticketdetail.vue b/src/views/wf/ticketdetail.vue
index 4f61558f..ded02abf 100644
--- a/src/views/wf/ticketdetail.vue
+++ b/src/views/wf/ticketdetail.vue
@@ -732,7 +732,7 @@ export default {
 			this.$API.mtm.routepack.item.req(this.projectId).then((res) => {
 				console.log("routepackitem", res);
 				this.$API.mtm.route.list
-					.req({ page: 0, material: res.material })
+					.req({ page: 0, material: res.material,routepack:res.id})
 					.then((res) => {
 						that.routepackes = res;
 					});

From b353166dda2f46832d72f722a0a33c05d4e0ed11 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Thu, 15 Aug 2024 17:08:03 +0800
Subject: [PATCH 2/4] =?UTF-8?q?fix:=E6=97=A5=E5=BF=97=E4=B8=AD=E7=94=9F?=
 =?UTF-8?q?=E4=BA=A7=E8=AE=BE=E5=A4=87=E4=BC=A0dept?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm_gx/mlog_form.vue | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/views/wpm_gx/mlog_form.vue b/src/views/wpm_gx/mlog_form.vue
index f5a29d2c..8490c42b 100644
--- a/src/views/wpm_gx/mlog_form.vue
+++ b/src/views/wpm_gx/mlog_form.vue
@@ -65,6 +65,7 @@
 									v-model="form.route"
 									placeholder="工艺路线"
 									clearable
+									filterable
 									style="width: 100%"
 									:disabled="mode == 'edit'"
 								>
@@ -89,6 +90,7 @@
 									v-model="form.equipment"
 									placeholder="生产设备"
 									clearable
+									filterable
 									:disabled="mode == 'edit'"
 									style="width: 100%"
 								>
@@ -97,7 +99,10 @@
 										:key="item.id"
 										:label="item.name"
 										:value="item.id"
-									></el-option>
+									>
+									<span style="float:left">{{item.name}}</span>
+									<span style="float:right">{{item.number}}</span>
+									</el-option>
 								</el-select>
 							</el-form-item>
 						</el-col>
@@ -309,7 +314,7 @@ export default {
 		},
 		getEquipment() {
 			this.$API.em.equipment.list
-				.req({ page: 0, type: 10 })
+				.req({ page: 0, type: 10,belong_dept:this.dept })
 				.then((res) => {
 					this.options = res;
 				});

From 93ae6ac3dadf4abb18d45fd3cb7d6157744653de Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Thu, 15 Aug 2024 17:23:44 +0800
Subject: [PATCH 3/4] =?UTF-8?q?fix:=E6=97=A5=E5=BF=97=E6=A3=80=E9=AA=8C?=
 =?UTF-8?q?=E4=B8=AD=E6=B7=BB=E5=8A=A0=E7=A0=B4=E6=8D=9F=E5=92=8C=E5=85=B6?=
 =?UTF-8?q?=E4=BB=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm_gx/mlogb_check.vue | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/src/views/wpm_gx/mlogb_check.vue b/src/views/wpm_gx/mlogb_check.vue
index 2f2e1d50..619e8164 100644
--- a/src/views/wpm_gx/mlogb_check.vue
+++ b/src/views/wpm_gx/mlogb_check.vue
@@ -133,6 +133,28 @@
 								/>
 							</el-form-item>
 						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="破损">
+								<el-input-number
+									v-model="form.count_n_ps"
+									:min="0"
+									class="width-100"
+									controls-position="right"
+									@change="countChange"
+								/>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="其他">
+								<el-input-number
+									v-model="form.count_n_qt"
+									:min="0"
+									class="width-100"
+									controls-position="right"
+									@change="countChange"
+								/>
+							</el-form-item>
+						</el-col>
 					</el-row>
 				</el-form>
 			</el-main>
@@ -197,6 +219,8 @@ export default {
 				this.form.count_n_bb +
 				this.form.count_n_md +
 				this.form.count_n_xh +
+				this.form.count_n_ps +
+				this.form.count_n_qt +
 				this.form.count_n_wm;
 			this.form.count_ok = this.form.count_real - this.form.count_notok;
 		},
@@ -214,6 +238,8 @@ export default {
 						this.form.count_n_bb +
 						this.form.count_n_md +
 						this.form.count_n_xh +
+						this.form.count_n_ps +
+						this.form.count_n_qt +
 						this.form.count_n_wm;
 					let sum = this.form.count_ok + this.form.count_notok;
 					if (sum - this.form.count_real == 0) {

From c08dc1b2d3b6639c8bcc0139020148d0072ae758 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Thu, 15 Aug 2024 17:49:21 +0800
Subject: [PATCH 4/4] =?UTF-8?q?fix:=E6=97=A5=E5=BF=97=E4=B8=8D=E5=90=88?=
 =?UTF-8?q?=E6=A0=BC=E9=A1=B9=E5=90=88=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm_gx/mlogb_check.vue | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/views/wpm_gx/mlogb_check.vue b/src/views/wpm_gx/mlogb_check.vue
index 619e8164..2fca83e7 100644
--- a/src/views/wpm_gx/mlogb_check.vue
+++ b/src/views/wpm_gx/mlogb_check.vue
@@ -175,7 +175,21 @@ export default {
 		return {
 			loading: false,
 			//表单数据
-			form: {},
+			form: {
+				batch: null,
+				count_real: 0,
+				count_ok: 0,
+				count_notok: 0,
+				count_n_hs: 0,
+				count_n_qp: 0,
+				count_n_swen: 0,
+				count_n_bb: 0,
+				count_n_md: 0,
+				count_n_xh: 0,
+				count_n_ps: 0,
+				count_n_qt: 0,
+				count_n_wm: 0,
+			},
 			//验证规则
 			rules: {
 				batch: [