From cdf674f190998851ae050cf58d3a5dc2401c237d Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Tue, 21 May 2024 17:25:14 +0800
Subject: [PATCH] =?UTF-8?q?feat:=200521=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dev/deptDeviceCheck.vue       |  2 +-
 src/views/dev/deviceCheck.vue           |  2 +-
 src/views/dev/devicePlan.vue            |  1 +
 src/views/dev/deviceRepair.vue          |  2 +-
 src/views/dev/deviceRepairApply.vue     | 10 ++---
 src/views/dev/deviceRepairApplyHall.vue | 10 ++---
 src/views/dev/deviceRepairApplyMy.vue   | 10 ++---
 src/views/dev/deviceUpkeep.vue          |  2 +-
 src/views/dev/deviceUpkeepPlan.vue      |  1 +
 src/views/dev/js/deviceInfoFull.js      | 49 ++++++++++++-------------
 10 files changed, 45 insertions(+), 44 deletions(-)

diff --git a/src/views/dev/deptDeviceCheck.vue b/src/views/dev/deptDeviceCheck.vue
index d54d505c..c3fe908b 100644
--- a/src/views/dev/deptDeviceCheck.vue
+++ b/src/views/dev/deptDeviceCheck.vue
@@ -29,7 +29,7 @@
 
       <el-table :data="list" @row-click="rowClick" v-loading="loading" click-row-light>
         <el-table-column label="序号" width="50" type="index"/>
-        <!--        <el-table-column label="任务id" width="150" prop="taskId"/>-->
+        <el-table-column label="任务单号" width="150" prop="taskBillNo"/>
         <el-table-column label="任务名称" width="150" prop="name"/>
         <el-table-column label="计划名称" width="150" prop="planName"/>
         <el-table-column label="系统生成" width="80" prop="sysFlag">
diff --git a/src/views/dev/deviceCheck.vue b/src/views/dev/deviceCheck.vue
index f2362aef..31fecdb3 100644
--- a/src/views/dev/deviceCheck.vue
+++ b/src/views/dev/deviceCheck.vue
@@ -29,7 +29,7 @@
 
       <el-table :data="list" @row-click="rowClick" v-loading="loading" click-row-light>
         <el-table-column label="序号" width="50" type="index"/>
-        <el-table-column label="任务id" width="150" prop="taskId"/>
+        <el-table-column label="任务单号" width="150" prop="taskBillNo"/>
         <el-table-column label="任务名称" width="150" prop="name"/>
         <el-table-column label="计划名称" width="150" prop="planName"/>
         <el-table-column label="系统生成" width="80" prop="sysFlag">
diff --git a/src/views/dev/devicePlan.vue b/src/views/dev/devicePlan.vue
index 87efaa12..fd79e1f5 100644
--- a/src/views/dev/devicePlan.vue
+++ b/src/views/dev/devicePlan.vue
@@ -37,6 +37,7 @@
       <el-table :data="list" @row-click="rowClick" v-loading="loading" click-row-light
                 highlight-current-row>
         <el-table-column label="序号" width="50" type="index"/>
+        <el-table-column label="计划单号" width="150" prop="planBillNo"/>
         <el-table-column label="计划名称" width="150" prop="name"/>
         <el-table-column label="负责部门" width="120" prop="chargeDeptName"/>
         <el-table-column label="设备数量" width="120" prop="deviceCount"/>
diff --git a/src/views/dev/deviceRepair.vue b/src/views/dev/deviceRepair.vue
index 6afb28cb..57255c9f 100644
--- a/src/views/dev/deviceRepair.vue
+++ b/src/views/dev/deviceRepair.vue
@@ -42,7 +42,7 @@
                 v-loading="loading" highlight-current-row
                 click-row-light>
         <el-table-column label="序号" width="50" type="index"/>
-        <el-table-column label="维修号" width="150" prop="id"/>
+        <el-table-column label="维修单号" width="150" prop="repairBillNo"/>
         <el-table-column label="状态" width="150" prop="statusName">
           <template slot-scope="scope">
             <el-tag :type="scope.row.finishFlag?'success':'warning'">{{
diff --git a/src/views/dev/deviceRepairApply.vue b/src/views/dev/deviceRepairApply.vue
index 5a7a735b..ae6fbc37 100644
--- a/src/views/dev/deviceRepairApply.vue
+++ b/src/views/dev/deviceRepairApply.vue
@@ -46,7 +46,7 @@
                 v-loading="loading" @row-click="rowClick" highlight-current-row
                 click-row-light>
         <el-table-column label="序号" width="50" type="index"/>
-        <el-table-column label="报修号" width="150" prop="id"/>
+        <el-table-column label="报修单号" width="150" prop="repairApplyBillNo"/>
         <el-table-column label="状态" width="150" prop="statusName">
           <template slot-scope="scope">
             <el-tag :type="deviceRepairApplyStatus[scope.row.status].tagType">{{ scope.row.statusName }}</el-tag>
@@ -56,10 +56,10 @@
         <el-table-column label="报修人" width="120" prop="applyUserName"/>
         <el-table-column label="报修人电话" width="120" prop="applyUserPhone"/>
         <el-table-column label="报修时间" width="140" prop="applyTime"/>
-        <el-table-column label="受理部门" width="140" prop="confirmDeptName"/>
-        <el-table-column label="受理人" width="140" prop="confirmUserName"/>
-        <el-table-column label="受理人电话" width="140" prop="confirmPhone"/>
-        <el-table-column label="受理时间" width="140" prop="confirmTime"/>
+<!--        <el-table-column label="受理部门" width="140" prop="confirmDeptName"/>-->
+<!--        <el-table-column label="受理人" width="140" prop="confirmUserName"/>-->
+<!--        <el-table-column label="受理人电话" width="140" prop="confirmPhone"/>-->
+<!--        <el-table-column label="受理时间" width="140" prop="confirmTime"/>-->
         <el-table-column label="设备数量" width="100" prop="deviceCount"/>
         <el-table-column label="已完成数量" width="100" prop="finishCount"/>
         <!--        <el-table-column label="操作" fixed="right" width="80">-->
diff --git a/src/views/dev/deviceRepairApplyHall.vue b/src/views/dev/deviceRepairApplyHall.vue
index 352c67c1..cc53b2b2 100644
--- a/src/views/dev/deviceRepairApplyHall.vue
+++ b/src/views/dev/deviceRepairApplyHall.vue
@@ -57,7 +57,7 @@
                     v-loading="loading" @row-click="rowClick" highlight-current-row
                     click-row-light>
             <el-table-column label="序号" width="50" type="index"/>
-            <el-table-column label="报修号" width="150" prop="id"/>
+            <el-table-column label="报修单号" width="150" prop="repairApplyBillNo"/>
             <el-table-column label="状态" width="150" prop="statusName">
               <template slot-scope="scope">
                 <el-tag :type="deviceRepairApplyStatus[scope.row.status].tagType">{{ scope.row.statusName }}</el-tag>
@@ -67,10 +67,10 @@
             <el-table-column label="报修人" width="120" prop="applyUserName"/>
             <el-table-column label="报修人电话" width="120" prop="applyUserPhone"/>
             <el-table-column label="报修时间" width="140" prop="applyTime"/>
-            <el-table-column label="受理部门" width="140" prop="confirmDeptName"/>
-            <el-table-column label="受理人" width="140" prop="confirmUserName"/>
-            <el-table-column label="受理人电话" width="140" prop="confirmPhone"/>
-            <el-table-column label="受理时间" width="140" prop="confirmTime"/>
+<!--            <el-table-column label="受理部门" width="140" prop="confirmDeptName"/>-->
+<!--            <el-table-column label="受理人" width="140" prop="confirmUserName"/>-->
+<!--            <el-table-column label="受理人电话" width="140" prop="confirmPhone"/>-->
+<!--            <el-table-column label="受理时间" width="140" prop="confirmTime"/>-->
             <el-table-column label="设备数量" width="100" prop="deviceCount"/>
             <el-table-column label="已完成数量" width="100" prop="finishCount"/>
 <!--            <el-table-column v-if="tabActive==1" label="操作" fixed="right" width="80">-->
diff --git a/src/views/dev/deviceRepairApplyMy.vue b/src/views/dev/deviceRepairApplyMy.vue
index 0cc7aea4..409b12b3 100644
--- a/src/views/dev/deviceRepairApplyMy.vue
+++ b/src/views/dev/deviceRepairApplyMy.vue
@@ -49,7 +49,7 @@
                     v-loading="loading" @row-click="rowClick" highlight-current-row
                     click-row-light>
             <el-table-column label="序号" width="50" type="index"/>
-            <el-table-column label="报修号" width="150" prop="id"/>
+            <el-table-column label="报修单号" width="150" prop="repairApplyBillNo"/>
             <el-table-column label="状态" width="150" prop="statusName">
               <template slot-scope="scope">
                 <el-tag :type="deviceRepairApplyStatus[scope.row.status].tagType">{{ scope.row.statusName }}</el-tag>
@@ -59,10 +59,10 @@
             <el-table-column label="报修人" width="120" prop="applyUserName"/>
             <el-table-column label="报修人电话" width="120" prop="applyUserPhone"/>
             <el-table-column label="报修时间" width="140" prop="applyTime"/>
-            <el-table-column label="受理部门" width="140" prop="confirmDeptName"/>
-            <el-table-column label="受理人" width="140" prop="confirmUserName"/>
-            <el-table-column label="受理人电话" width="140" prop="confirmPhone"/>
-            <el-table-column label="受理时间" width="140" prop="confirmTime"/>
+<!--            <el-table-column label="受理部门" width="140" prop="confirmDeptName"/>-->
+<!--            <el-table-column label="受理人" width="140" prop="confirmUserName"/>-->
+<!--            <el-table-column label="受理人电话" width="140" prop="confirmPhone"/>-->
+<!--            <el-table-column label="受理时间" width="140" prop="confirmTime"/>-->
             <el-table-column label="设备数量" width="100" prop="deviceCount"/>
             <el-table-column label="已完成数量" width="100" prop="finishCount"/>
             v-if="tabActive==1"
diff --git a/src/views/dev/deviceUpkeep.vue b/src/views/dev/deviceUpkeep.vue
index 51220785..d7ac0ddb 100644
--- a/src/views/dev/deviceUpkeep.vue
+++ b/src/views/dev/deviceUpkeep.vue
@@ -29,7 +29,7 @@
 
       <el-table :data="list" @row-click="rowClick" v-loading="loading" click-row-light width="100%">
         <el-table-column label="序号" width="50" type="index"/>
-        <el-table-column label="保养任务id" width="150" prop="taskId"/>
+        <el-table-column label="任务单号" width="150" prop="taskBillNo"/>
         <el-table-column label="任务名称" width="150" prop="name"/>
         <el-table-column label="计划名称" width="150" prop="planName"/>
         <el-table-column label="系统生成" width="80" prop="sysFlag">
diff --git a/src/views/dev/deviceUpkeepPlan.vue b/src/views/dev/deviceUpkeepPlan.vue
index 1924a3e3..54b13a19 100644
--- a/src/views/dev/deviceUpkeepPlan.vue
+++ b/src/views/dev/deviceUpkeepPlan.vue
@@ -38,6 +38,7 @@
     <el-table :data="list" @row-click="rowClick" v-loading="loading" click-row-light
               highlight-current-row>
       <el-table-column label="序号" width="50" type="index"/>
+      <el-table-column label="计划单号" width="150" prop="planBillNo"/>
       <el-table-column label="计划名称" width="150" prop="name"/>
       <el-table-column label="负责部门" width="120" prop="chargeDeptName"/>
       <el-table-column label="设备数量" width="120" prop="deviceCount"/>
diff --git a/src/views/dev/js/deviceInfoFull.js b/src/views/dev/js/deviceInfoFull.js
index 53be678c..f1bb4326 100644
--- a/src/views/dev/js/deviceInfoFull.js
+++ b/src/views/dev/js/deviceInfoFull.js
@@ -177,15 +177,15 @@ export default {
             if (this.orderSelection == null || this.orderSelection.length <= 0) {
               return this.$message.error("请选择打印的明细！");
             }
-            let query = {id: 6};
-            verifyTemplateFile(query).then((res) => {
-              if (res.code === 20000) {
+            // let query = {id: 5};
+            // verifyTemplateFile(query).then((res) => {
+            //   if (res.code === 20000) {
                 let printParams = {
                   deptCode :this.query.deptCode,
                   deviceCode: this.query.deviceCode,
                   productName: this.query.productName,
                   status: this.query.status,
-                  templateId: res.data,
+                  templateId: 4,
                   list: this.orderSelection
                 };
                 printDev(printParams).then((response) => {
@@ -199,16 +199,15 @@ export default {
                   this.loading = false;
                   window.open(url);//打开新标签页，预览pdf。
                 })
-              } else {
-                return this.$message.error(res.message);
-              }
-            }).catch((error) => {
+              // } else {
+              //   return this.$message.error(res.message);
+              }).catch((error) => {
               this.loading = false;
               this.$message.error(error.message);
             })
-          })
-          .catch(() => {
-          });
+          // })
+          // .catch(() => {
+          // });
 
 
       },
@@ -220,11 +219,11 @@ export default {
         })
           .then(() => {
 
-            let query = {id: 6};
-            verifyTemplateFile(query).then((res) => {
-              if (res.code === 20000) {
+            // let query = {id: 5};
+            // verifyTemplateFile(query).then((res) => {
+            //   if (res.code === 20000) {
                 let printParams = {
-                  templateId: res.data,
+                  templateId: 4,
                   deptCode :this.query.deptCode,
                   deviceCode: this.query.deviceCode,
                   productName: this.query.productName,
@@ -242,18 +241,18 @@ export default {
                   this.loading = false;
                   window.open(url);//打开新标签页，预览pdf。
                 })
-              } else {
-                this.$message.error(res.message);
-                return
-              }
-            }).catch((error) => {
-              this.loading = false;
-              this.$message.error(error.message);
+              // } else {
+              //   this.$message.error(res.message);
+              //   return
+              // }
+            // }).catch((error) => {
+            //   this.loading = false;
+            //   this.$message.error(error.message);
             })
 
-          })
-          .catch(() => {
-          });
+          // })
+          // .catch(() => {
+          // });
         return;
 
       },