From 864d89523bb8e057e0e86e671f864444000517a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E5=A5=89=E6=BA=90?= <1976974459@qq.com>
Date: Mon, 28 Aug 2023 18:04:25 +0800
Subject: [PATCH] =?UTF-8?q?2023-08-28=20=E8=AE=BE=E5=A4=87=E5=92=8C?=
 =?UTF-8?q?=E8=B4=A8=E9=87=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/eam/eam.js                            |   1 +
 .../modules/eam/eamWorkOrderForCheck.vue      | 117 ++++++--
 .../eam/eamWorkOrderForMaintenance.vue        | 255 +++++++++++++++++-
 src/views/modules/eam/eamWorkPlanForCheck.vue |  67 ++---
 .../modules/eam/eamWorkPlanForMaintenance.vue |  78 ++----
 .../reportMaintenanceOrder.vue                |   6 +-
 6 files changed, 389 insertions(+), 135 deletions(-)

diff --git a/src/api/eam/eam.js b/src/api/eam/eam.js
index fe7ff3e..4033653 100644
--- a/src/api/eam/eam.js
+++ b/src/api/eam/eam.js
@@ -119,6 +119,7 @@ export const cancelOrder= data => createAPI(`/pms/eam/cancelOrder`,'post',data)
 export const eamWorkOrderReportSearch= data => createAPI(`/pms/eam/eamWorkOrderReportSearch`,'post',data)
 
 export const eamWorkOrderSearchForDefect= data => createAPI(`/pms/eam/eamWorkOrderSearchForDefect`,'post',data)
+export const updateWorkOrder= data => createAPI(`/pms/eam/updateWorkOrder`,'post',data)
 
 //---------------故障-------------------
 export const eamDefectSearch = data => createAPI(`/pms/eam/eamDefectSearch`,'post',data)
diff --git a/src/views/modules/eam/eamWorkOrderForCheck.vue b/src/views/modules/eam/eamWorkOrderForCheck.vue
index ba632a9..df9fc99 100644
--- a/src/views/modules/eam/eamWorkOrderForCheck.vue
+++ b/src/views/modules/eam/eamWorkOrderForCheck.vue
@@ -1,9 +1,9 @@
 <template>
   <div class="mod-config">
     <div>
-        <span @click="favoriteFunction()">
-         <icon-svg :name="favorite?'xiangqufill':'xiangqu'" class="sl-svg"></icon-svg>
-        </span>
+      <span @click="favoriteFunction()">
+        <icon-svg :name="favorite?'xiangqufill':'xiangqu'" class="sl-svg"></icon-svg>
+      </span>
     </div>
     <el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList()">
       <el-form-item :label="'计划编码'">
@@ -163,16 +163,25 @@
         <el-form-item :label="'实际执行人员'">
           <el-input v-model="saveData.actualOperatorName" disabled style="width: 120px"></el-input>
         </el-form-item>
-        <el-form-item :label="'维保结论'">
-          <el-input v-model="saveData.checkResult" disabled style="width: 120px"></el-input>
+        <el-form-item :label="'点检结论'">
+          <el-select v-if="saveData.status === '待审核'" v-model="saveData.checkResult" style="width: 120px">
+            <el-option label="合格" value="合格"></el-option>
+            <el-option label="不合格" value="不合格"></el-option>
+          </el-select>
+          <el-select v-if="saveData.status === '已完工'" v-model="saveData.checkResult" disabled style="width: 120px">
+            <el-option label="合格" value="合格"></el-option>
+            <el-option label="不合格" value="不合格"></el-option>
+          </el-select>
         </el-form-item>
       </el-form>
-      <el-form :inline="true" label-position="top" >
-        <el-form-item :label="'工作时间'">
-          <el-input v-model="saveData.workTime" type="number" disabled style="width: 120px"></el-input>
+      <el-form :inline="true" label-position="top">
+        <el-form-item :label="'工作时长(m)'">
+          <el-input v-if="saveData.status === '待审核'" v-model="saveData.workTime" type="number" :min="0" style="width: 120px"></el-input>
+          <el-input v-if="saveData.status === '已完工'" v-model="saveData.workTime" type="number" :min="0" disabled style="width: 120px"></el-input>
         </el-form-item>
         <el-form-item :label="'执行结果备注'">
-          <el-input v-model="saveData.remark" disabled style="width: 523px"></el-input>
+          <el-input v-if="saveData.status === '待审核'" v-model="saveData.remark" style="width: 523px"></el-input>
+          <el-input v-if="saveData.status === '已完工'" v-model="saveData.remark" disabled style="width: 523px"></el-input>
         </el-form-item>
         <el-form-item :label="' '">
           <el-button v-if="saveData.status === '已完工'" type="primary" @click="checkModal()">取消审核</el-button>
@@ -218,8 +227,10 @@
             min-width="80"
             label="实测值">
             <template slot-scope="scope">
-              <el-input v-if="scope.row.valueTypeDb === 'T'" v-model="scope.row.textValue" readonly style="height: 11px;padding: 0px " filterable allow-create>;width:98%"></el-input>
-              <el-input v-if="scope.row.valueTypeDb === 'N'" v-model="scope.row.numberValue" readonly style="height: 11px;padding: 0px " filterable allow-create>;width:98%"></el-input>
+              <el-input v-if="scope.row.valueTypeDb === 'T' && saveData.status === '待审核'" v-model="scope.row.textValue" style="height: 11px;padding: 0px " filterable allow-create>;width:98%"></el-input>
+              <el-input v-if="scope.row.valueTypeDb === 'T' && saveData.status === '已完工'" v-model="scope.row.textValue" readonly style="height: 11px;padding: 0px " filterable allow-create>;width:98%"></el-input>
+              <el-input v-if="scope.row.valueTypeDb === 'N' && saveData.status === '待审核'" v-model="scope.row.numberValue" style="height: 11px;padding: 0px " filterable allow-create>;width:98%"></el-input>
+              <el-input v-if="scope.row.valueTypeDb === 'N' && saveData.status === '已完工'" v-model="scope.row.numberValue" readonly style="height: 11px;padding: 0px " filterable allow-create>;width:98%"></el-input>
             </template>
           </el-table-column>
           <el-table-column
@@ -229,7 +240,11 @@
             min-width="80"
             label="检验结论">
             <template slot-scope="scope">
-              <el-select v-model="scope.row.itemResult" disabled style="height: 11px;padding: 0px">
+              <el-select v-if="saveData.status === '待审核'" v-model="scope.row.itemResult" style="height: 11px;padding: 0px">
+                <el-option label="合格" value="合格"></el-option>
+                <el-option label="不合格" value="不合格"></el-option>
+              </el-select>
+              <el-select v-if="saveData.status === '已完工'" v-model="scope.row.itemResult" disabled style="height: 11px;padding: 0px">
                 <el-option label="合格" value="合格"></el-option>
                 <el-option label="不合格" value="不合格"></el-option>
               </el-select>
@@ -238,6 +253,7 @@
         </el-table>
       </div>
       <el-footer style="height:40px;margin-top: 20px;text-align:center">
+        <el-button v-if="saveData.status === '待审核'" type="primary" @click="updateWorkOrder()">确定</el-button>
         <el-button type="primary" @click="detailModelFlag = false">关闭</el-button>
       </el-footer>
     </el-dialog>
@@ -313,7 +329,7 @@
     cancelOrder,
     changeOrderOperator,
     checkWorkOrder, // 审核
-    selectNameByMes, // 检查系统操作人和审核人员是否一致
+    updateWorkOrder, // 修改工单
     searchFileUrl
   } from "@/api/eam/eam.js"
   import Chooselist from '@/views/modules/common/Chooselist_eam'
@@ -601,7 +617,10 @@
           objectID: '',
           checker: '',
           checkerName: '',
-          status: ''
+          status: '',
+          itemList: [],
+          mesUser: '',
+          functionType: 'A'
         },
         columnDetailList: [
           {
@@ -920,7 +939,6 @@
         this.submitData.checker = this.saveData.checker
         this.submitData.checkerName = this.saveData.checkerName
         this.submitData.status = this.saveData.status
-        console.log(this.submitData)
         let tempData = {
           site: this.$store.state.user.site,
           mesUser: this.$store.state.user.name
@@ -952,11 +970,8 @@
           })
         }else if (this.submitData.status === '待审核'){
           if (!this.submitData.checker.split(';').includes(tempData.mesUser)){
-            this.$alert('审核人员与计划不符！', '错误', {
-              confirmButtonText: '确定',
-              type: 'warning'
-            })
-            return false
+            this.$message.warning('审核人员与计划不符！')
+            return
           }
           this.$confirm(`是否确认审核?`, '提示', {
             confirmButtonText: '确定',
@@ -1026,7 +1041,7 @@
           return false
         }
         checkWorkOrder(this.submitData).then(({data}) => {
-          if (data && data.code ==0) {
+          if (data && data.code === 0) {
             this.getDataList()
             this.submitModelFlag = false
             this.$message({
@@ -1067,7 +1082,10 @@
           objectID: row.objectID,
           checker: row.checker,
           checkerName: row.checkerName,
-          status: row.status
+          status: row.status,
+          itemList: [],
+          mesUser: this.$store.state.user.name,
+          functionType: 'A'
         }
         this.detailModelFlag = true;
       },
@@ -1166,6 +1184,61 @@
           }
         })
       },
+      updateWorkOrder(){
+        let tempFlag = 'N'
+        if (this.saveData.checkResult === '' || this.saveData.checkResult == null) {
+          this.$message.warning('请选择点检结论！')
+          return
+        }
+        if(this.saveData.workTime === 0){
+          this.$message.warning('工作时长不能为0！')
+          return
+        }
+        if(this.saveData.workTime < 0){
+          this.$message.warning('工作时长不能小于0！')
+          return
+        }
+        for (let i = 0; i < this.detailList.length; i++) {
+          if(this.detailList[i].valueTypeDb === 'N' && (this.detailList[i].numberValue === '' || this.detailList[i].numberValue == null)){
+            this.$message.warning(this.detailList[i].itemDesc+'实测值未填写！')
+            return
+          }
+          if(this.detailList[i].valueTypeDb === 'N' && this.detailList[i].numberValue != '' && this.detailList[i].numberValue != null){
+            if((this.detailList[i].minValue != "" && this.detailList[i].minValue != null && this.detailList[i].minValue > this.detailList[i].numberValue) || (this.detailList[i].minValue != ""&& this.detailList[i].minValue != null && this.detailList[i].maxValue < this.detailList[i].numberValue)){
+              this.detailList[i].itemResult = '不合格'
+            }
+          }
+        }
+        if (this.saveData.checkResult == '不合格') {
+          this.detailList.forEach(val => {
+            if (val.itemResult == '不合格') {
+              tempFlag = 'Y'
+            }
+          })
+          if (tempFlag != 'Y') {
+            this.$message.warning('请选择不合格项目！')
+            return
+          }
+        }
+        this.saveData.itemList = JSON.parse(JSON.stringify(this.detailList))
+        updateWorkOrder(this.saveData).then(({data}) => {
+          if (data && data.code === 0) {
+            this.getDataList()
+            this.detailModelFlag = false
+            this.$message({
+              message: '操作成功',
+              type: 'success',
+              duration: 1500,
+              onClose: () => {
+              }
+            })
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定'
+            })
+          }
+        })
+      },
       /**
        *  自适应
        * @param label
diff --git a/src/views/modules/eam/eamWorkOrderForMaintenance.vue b/src/views/modules/eam/eamWorkOrderForMaintenance.vue
index 4e03c0b..f8a7460 100644
--- a/src/views/modules/eam/eamWorkOrderForMaintenance.vue
+++ b/src/views/modules/eam/eamWorkOrderForMaintenance.vue
@@ -144,19 +144,46 @@
         <el-form-item :label="'实际执行人员'">
           <el-input v-model="saveData.actualOperatorName" disabled style="width: 120px"></el-input>
         </el-form-item>
+        <el-form-item>
+          <span v-if="saveData.status === '已完工'" slot="label"><a>协同人员</a></span>
+          <span v-if="saveData.status === '待审核'" slot="label" @click="getOperatorList()"><a>协同人员</a></span>
+          <el-input v-model="saveData.operator" readonly style="width: 120px"></el-input>
+        </el-form-item>
         <el-form-item :label="'维保结论'">
-          <el-input v-model="saveData.checkResult" disabled style="width: 120px"></el-input>
+          <el-select v-if="saveData.status === '待审核'" v-model="saveData.checkResult" style="width: 120px">
+            <el-option label="合格" value="合格"></el-option>
+            <el-option label="异常" value="异常"></el-option>
+          </el-select>
+          <el-select v-if="saveData.status === '已完工'" v-model="saveData.checkResult" disabled style="width: 120px">
+            <el-option label="合格" value="合格"></el-option>
+            <el-option label="异常" value="异常"></el-option>
+          </el-select>
         </el-form-item>
         <el-form-item v-if="this.saveData.checkResult === '异常'" :label="'异常原因'">
-          <el-input v-model="saveData.disposalMeasures" disabled style="width: 120px"></el-input>
+          <el-select v-if="saveData.status === '已完工'" disabled v-model="saveData.disposalMeasures" style="width: 120px">
+            <el-option label="缺少备件" value="缺少备件"></el-option>
+            <el-option label="等待售后" value="等待售后"></el-option>
+            <el-option label="远程协助" value="远程协助"></el-option>
+            <el-option label="换班换人" value="换班换人"></el-option>
+          </el-select>
+          <el-select v-if="saveData.status === '待审核'" v-model="saveData.disposalMeasures" style="width: 120px">
+            <el-option label="缺少备件" value="缺少备件"></el-option>
+            <el-option label="等待售后" value="等待售后"></el-option>
+            <el-option label="远程协助" value="远程协助"></el-option>
+            <el-option label="换班换人" value="换班换人"></el-option>
+          </el-select>
+<!--          <el-input v-if="saveData.status === '已完工'" v-model="saveData.disposalMeasures" disabled style="width: 120px"></el-input>-->
+<!--          <el-input v-if="saveData.status === '待审核'" v-model="saveData.disposalMeasures" style="width: 120px"></el-input>-->
         </el-form-item>
       </el-form>
       <el-form :inline="true" label-position="top" >
         <el-form-item :label="'工作时间'">
-          <el-input v-model="saveData.workTime" type="number" disabled style="width: 120px"></el-input>
+          <el-input v-if="saveData.status === '已完工'" v-model="saveData.workTime" type="number" :min="0" disabled style="width: 120px"></el-input>
+          <el-input v-if="saveData.status === '待审核'" v-model="saveData.workTime" type="number" :min="0" style="width: 120px"></el-input>
         </el-form-item>
         <el-form-item :label="'执行结果备注'">
-          <el-input v-model="saveData.remark" disabled style="width: 523px"></el-input>
+          <el-input v-if="saveData.status === '已完工'" v-model="saveData.remark" disabled style="width: 523px"></el-input>
+          <el-input v-if="saveData.status === '待审核'" v-model="saveData.remark" style="width: 523px"></el-input>
         </el-form-item>
         <el-form-item :label="' '">
           <el-button v-if="saveData.status === '已完工'" type="primary" @click="checkModal()">取消审核</el-button>
@@ -187,11 +214,11 @@
             :header-align="item.headerAlign"
             :show-overflow-tooltip="item.showOverflowTooltip"
             :align="item.align"
-            :fixed="item.fixed==''?false:item.fixed"
+            :fixed="item.fixed === '' ? false : item.fixed"
             :min-width="item.columnWidth"
             :label="item.columnLabel">
             <template slot-scope="scope">
-              <span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
+              <span v-if="!item.columnHidden">{{scope.row[item.columnProp]}}</span>
               <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
             </template>
           </el-table-column>
@@ -212,7 +239,11 @@
             min-width="80"
             label="检验结论">
             <template slot-scope="scope">
-              <el-select v-model="scope.row.itemResult" disabled style="height: 11px;padding: 0px">
+              <el-select v-if="saveData.status === '已完工'" v-model="scope.row.itemResult" disabled style="height: 11px;padding: 0px">
+                <el-option label="合格" value="合格"></el-option>
+                <el-option label="不合格" value="不合格"></el-option>
+              </el-select>
+              <el-select v-if="saveData.status === '待审核'" v-model="scope.row.itemResult" style="height: 11px;padding: 0px">
                 <el-option label="合格" value="合格"></el-option>
                 <el-option label="不合格" value="不合格"></el-option>
               </el-select>
@@ -221,6 +252,7 @@
         </el-table>
       </div>
       <el-footer style="height:40px;margin-top: 20px;text-align:center">
+        <el-button v-if="saveData.status === '待审核'" type="primary" @click="updateWorkOrder()">确定</el-button>
         <el-button type="primary" @click="detailModelFlag = false">关闭</el-button>
       </el-footer>
     </el-dialog>
@@ -265,6 +297,60 @@
       </el-footer>
     </el-dialog>
 
+    <!-- 人员 -->
+    <el-dialog title="人员清单" :close-on-click-modal="false" v-drag :visible.sync="operatorModelFlag" width="520px">
+      <div class="rq">
+        <el-form :inline="true" label-position="top" :model="operatorData">
+          <el-form-item :label="'人员编码'">
+            <el-input v-model="operatorData.adminID" style="width: 120px"></el-input>
+          </el-form-item>
+          <el-form-item :label="'人员名称'">
+            <el-input v-model="operatorData.adminName" style="width: 120px"></el-input>
+          </el-form-item>
+          <el-form-item :label="' '">
+            <el-button type="primary" @click="getOperatorList()">查询</el-button>
+          </el-form-item>
+        </el-form>
+        <el-table
+          :height="300"
+          :data="operatorList"
+          ref="operatorTable"
+          @row-click="operatorClickRow"
+          @selection-change="selectionOperator"
+          :row-key="getRowKeys"
+          border
+          v-loading="dataListLoading"
+          style="width: 100%;">
+          <el-table-column
+            type="selection"
+            header-align="center"
+            align="center"
+            :reserve-selection="true"
+            width="50">
+          </el-table-column>
+          <el-table-column
+            v-for="(item,index) in operatorDetailList" :key="index"
+            :sortable="item.columnSortable"
+            :prop="item.columnProp"
+            :header-align="item.headerAlign"
+            :show-overflow-tooltip="item.showOverflowTooltip"
+            :align="item.align"
+            :fixed="item.fixed==''?false:item.fixed"
+            :min-width="item.columnWidth"
+            :label="item.columnLabel">
+            <template slot-scope="scope">
+              <span v-if="!item.columnHidden">{{scope.row[item.columnProp]}}</span>
+              <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <el-footer style="height:40px;margin-top: 20px;text-align:center">
+        <el-button type="primary" @click="confirmOperator()">确认</el-button>
+        <el-button type="primary" @click="operatorModelFlag = false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
+
     <Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist>
 
   </div>
@@ -276,9 +362,10 @@
     cancelOrder,
     changeOrderOperator,
     eamWorkOrderReportSearch,
-    selectNameByMes,
+    getOperatorList,
     checkWorkOrder,
-    searchFileUrl
+    searchFileUrl,
+    updateWorkOrder
   } from "@/api/eam/eam.js"
   import Chooselist from '@/views/modules/common/Chooselist_eam'
   import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js'
@@ -638,7 +725,12 @@
           objectID: '',
           checker: '',
           checkerName: '',
-          status: ''
+          status: '',
+          operator: '',
+          adminID: '',
+          itemList: [],
+          mesUser: '',
+          functionType: 'B'
         },
         columnDetailList: [
           {
@@ -796,7 +888,41 @@
           status: ''
         },
         descImages: [],
-        imageModalFlag: false
+        imageModalFlag: false,
+        operatorModelFlag: false,
+        operatorData: {
+          site: this.$store.state.user.site,
+          adminID: '',
+          adminName: ''
+        },
+        operatorList:[],
+        operatorListSelections: [],
+        operatorDetailList: [
+          {
+            columnProp: 'adminID',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '人员编码',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+          },
+          {
+            columnProp: 'adminName',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '人员名称',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+          },
+        ],
       }
     },
     mounted () {
@@ -1066,9 +1192,14 @@
           objectID: row.objectID,
           checker: row.checker,
           checkerName: row.checkerName,
-          status: row.status
-        },
-          this.detailModelFlag = true;
+          status: row.status,
+          operator: row.operator,
+          adminID: row.adminID,
+          itemList: [],
+          mesUser: this.$store.state.user.name,
+          functionType: 'B'
+        }
+        this.detailModelFlag = true;
       },
       // 审核按钮
       checkModal(){
@@ -1177,6 +1308,102 @@
         }
       },
 
+      // 获取人员列表
+      getOperatorList(){
+        // 先清空缓存选中
+        this.$nextTick(() => this.$refs.operatorTable.clearSelection())
+        // 拿到选中的人员编号
+        let tempDataList = this.saveData.adminID.split(';')
+        // 查询所有部门
+        getOperatorList(this.operatorData).then(({data}) => {
+          if (data && data.code === 0) {
+            this.operatorList = data.rows
+            this.operatorList.forEach(val => {
+              // 回显选中的部门
+              if (tempDataList.includes(val.adminID)) {
+                this.$nextTick(() => this.$refs.operatorTable.toggleRowSelection(val, true))
+              }
+            })
+            this.operatorModelFlag = true;
+          }else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定'
+            })
+          }
+        })
+      },
+
+      // 部门
+      operatorClickRow(row){
+        this.$refs.operatorTable.toggleRowSelection(row);
+      },
+      // 多选
+      selectionOperator (val) {
+        this.operatorListSelections = val
+      },
+      getRowKeys(row) {
+        //唯一值，一般都为id
+        return row.adminID;
+      },
+
+      // 确认多选部门
+      confirmOperator(){
+        this.saveData.adminID = ''
+        this.saveData.operator = ''
+        for (let i = 0; i < this.operatorListSelections.length; i++) {
+          this.saveData.adminID = this.saveData.adminID + ";" + this.operatorListSelections[i].adminID
+          this.saveData.operator = this.saveData.operator + ";" + this.operatorListSelections[i].adminName
+        }
+        this.saveData.adminID = this.saveData.adminID.substring(1)
+        this.saveData.operator = this.saveData.operator.substring(1)
+        this.operatorModelFlag = false
+      },
+
+      updateWorkOrder (){
+        let tempFlag = 'N'
+        if (this.saveData.checkResult === '' || this.saveData.checkResult == null) {
+          this.$message.warning('请选择维保结论！')
+          return
+        }
+        if(this.saveData.workTime === 0){
+          this.$message.warning('工作时长不能为0！')
+          return
+        }
+        if(this.saveData.workTime < 0){
+          this.$message.warning('工作时长不能小于0！')
+          return
+        }
+        if (this.saveData.checkResult === '不合格') {
+          this.detailList.forEach(val => {
+            if (val.itemResult === '不合格') {
+              tempFlag = 'Y'
+            }
+          })
+          if (tempFlag != 'Y') {
+            this.$message.warning('请选择不合格项目！')
+            return
+          }
+        }
+        this.saveData.itemList = JSON.parse(JSON.stringify(this.detailList))
+        updateWorkOrder(this.saveData).then(({data}) => {
+          if (data && data.code === 0) {
+            this.getDataList()
+            this.detailModelFlag = false
+            this.$message({
+              message: '操作成功',
+              type: 'success',
+              duration: 1500,
+              onClose: () => {
+              }
+            })
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定'
+            })
+          }
+        })
+      },
+
     }
   }
 </script>
diff --git a/src/views/modules/eam/eamWorkPlanForCheck.vue b/src/views/modules/eam/eamWorkPlanForCheck.vue
index 1e4d0bd..a5f7f2b 100644
--- a/src/views/modules/eam/eamWorkPlanForCheck.vue
+++ b/src/views/modules/eam/eamWorkPlanForCheck.vue
@@ -2008,77 +2008,53 @@
       },
       saveData(){
         if (this.modalData.planDesc === '' || this.modalData.planDesc == null) {
-          this.$alert('请输入计划描述 ！', '错误', {
-            confirmButtonText: '确定'
-          })
-          return false
+          this.$message.warning('请输入计划描述！')
+          return
         }
         if (this.modalData.operator === '' || this.modalData.operator == null) {
-          this.$alert('请选择机修人员 ！', '错误', {
-            confirmButtonText: '确定'
-          })
-          return false
+          this.$message.warning('请选择机修人员！')
+          return
         }
         if (this.modalData.checker === '' || this.modalData.checker == null) {
-          this.$alert('请选择审核人员 ！', '错误', {
-            confirmButtonText: '确定'
-          })
-          return false
+          this.$message.warning('请选择审核人员！')
+          return
         }
         if (this.modalData.propertiesCode === '' || this.modalData.propertiesCode == null) {
-          this.$alert('请选择点检模板！', '错误', {
-            confirmButtonText: '确定'
-          })
-          return false
+          this.$message.warning('请选择点检模板！')
+          return
         }
         if (this.modalData.planPeriod === '' || this.modalData.planPeriod == null) {
-          this.$alert('选择点检周期！', '错误', {
-            confirmButtonText: '确定'
-          })
-          return false
+          this.$message.warning('选择点检周期！')
+          return
         }
         if (this.modalData.planStartDate === '' || this.modalData.planStartDate == null) {
-          this.$alert('请选择开始日期！', '错误', {
-            confirmButtonText: '确定'
-          })
-          return false
+          this.$message.warning('请选择开始日期！')
+          return
         }
         if (this.modalData.planStartDate < this.dayjs().format("YYYY-MM-DD")) {
-          this.$alert('计划开始日期不能小于今天！', '错误', {
-            confirmButtonText: '确定'
-          })
+          this.$message.warning('计划开始日期不能小于今天！')
           return
         }
         if (this.modalData.planEndDate === '' || this.modalData.planEndDate == null) {
-          this.$alert('请选择结束日期！', '错误', {
-            confirmButtonText: '确定'
-          })
-          return false
+          this.$message.warning('请选择结束日期！')
+          return
         }
         if (this.modalData.planEndDate < this.dayjs().format("YYYY-MM-DD")) {
-          this.$alert('计划结束日期不能小于今天！', '错误', {
-            confirmButtonText: '确定'
-          })
+          this.$message.warning('计划结束日期不能小于今天！')
           return
         }
         if (this.modalData.planStartDate > this.modalData.planEndDate) {
-          this.$alert('计划开始日期不能小于结束日期！', '错误', {
-            confirmButtonText: '确定'
-          })
+          this.$message.warning('计划开始日期不能小于结束日期！')
           return
         }
         if (this.modalData.taskStartDate === '' || this.modalData.taskStartDate == null) {
-          this.$alert('请选择任务开始时间！', '错误', {
-            confirmButtonText: '确定'
-          })
-          return false
+          this.$message.warning('请选择任务开始时间！')
+          return
         }
         if(this.modalData.flag === '1'){
           if(this.dataListSelections.length === 0){
-            this.$alert('请勾选设备！', '错误', {
-              confirmButtonText: '确定'
-            })
-            return false
+            this.$message.warning('请勾选设备！')
+            return
           }
           this.modalData.objectList = this.dataListSelections
           let obj = document.getElementsByName('addWorkOrderRule');
@@ -2362,7 +2338,6 @@
           })
           return false
         }
-        row.userId = this.$store.state.user.name
         this.$confirm(`是否下达点检工单?`, '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
diff --git a/src/views/modules/eam/eamWorkPlanForMaintenance.vue b/src/views/modules/eam/eamWorkPlanForMaintenance.vue
index d60c9d9..e438eeb 100644
--- a/src/views/modules/eam/eamWorkPlanForMaintenance.vue
+++ b/src/views/modules/eam/eamWorkPlanForMaintenance.vue
@@ -1,9 +1,9 @@
 <template>
   <div class="mod-config">
     <div>
-        <span @click="favoriteFunction()">
-         <icon-svg :name="favorite?'xiangqufill':'xiangqu'" class="sl-svg"></icon-svg>
-        </span>
+      <span @click="favoriteFunction()">
+        <icon-svg :name="favorite?'xiangqufill':'xiangqu'" class="sl-svg"></icon-svg>
+      </span>
     </div>
   <el-form :inline="true" label-position="top" :model="searchData" >
     <el-form-item :label="'计划编码'">
@@ -77,7 +77,7 @@
       :header-align="item.headerAlign"
       :show-overflow-tooltip="item.showOverflowTooltip"
       :align="item.align"
-      :fixed="item.fixed==''?false:item.fixed"
+      :fixed="item.fixed===''?false:item.fixed"
       :min-width="item.columnWidth"
       :label="item.columnLabel">
       <template slot-scope="scope">
@@ -92,10 +92,10 @@
       width="160"
       label="操作">
       <template slot-scope="scope">
-        <a type="text" size="small" v-if="scope.row.status=='已计划'" @click="createOrder(scope.row)">下达</a>
-        <a type="text" size="small" v-if="scope.row.status=='进行中'" @click="planOrder(scope.row)">计划</a>
+        <a type="text" size="small" v-if="scope.row.status==='已计划'" @click="createOrder(scope.row)">下达</a>
+        <a type="text" size="small" v-if="scope.row.status==='进行中'" @click="planOrder(scope.row)">计划</a>
         <a type="text" size="small" v-if="scope.row.status!='已结束'&&scope.row.status!='已取消'" @click="cancelPlan(scope.row)">取消</a>
-        <a type="text" size="small" v-if="scope.row.status=='已计划'" @click="updateModal(scope.row)">编辑</a>
+        <a type="text" size="small" v-if="scope.row.status==='已计划'" @click="updateModal(scope.row)">编辑</a>
         <a type="text" size="small" v-if="scope.row.status!='进行中'" @click="deletePlan(scope.row)">删除</a>
         <a type="text" size="small" @click="itemModal(scope.row)">维保项目</a>
       </template>
@@ -1907,73 +1907,51 @@
       },
       saveData(){
         if (this.modalData.planDesc === '' || this.modalData.planDesc == null) {
-          this.$alert('请输入计划描述 ！', '错误', {
-            confirmButtonText: '确定'
-          })
-          return false
+          this.$message.warning('请输入计划描述！')
+          return
         }
         if (this.modalData.operator === '' || this.modalData.operator == null) {
-          this.$alert('请选择机修人员 ！', '错误', {
-            confirmButtonText: '确定'
-          })
-          return false
+          this.$message.warning('请选择机修人员！')
+          return
         }
         if (this.modalData.checker === '' || this.modalData.checker == null) {
-          this.$alert('请选择审核人员 ！', '错误', {
-            confirmButtonText: '确定'
-          })
-          return false
+          this.$message.warning('请选择审核人员！')
+          return
         }
         if (this.modalData.propertiesCode === '' || this.modalData.propertiesCode == null) {
-          this.$alert('请选择维保模板！', '错误', {
-            confirmButtonText: '确定'
-          })
-          return false
+          this.$message.warning('请选择维保模板！')
+          return
         }
         if (this.modalData.planPeriod === '' || this.modalData.planPeriod == null) {
-          this.$alert('选择维保周期！', '错误', {
-            confirmButtonText: '确定'
-          })
-          return false
+          this.$message.warning('选择维保周期！')
+          return
         }
         if (this.modalData.planStartDate === '' || this.modalData.planStartDate == null) {
-          this.$alert('请选择开始日期！', '错误', {
-            confirmButtonText: '确定'
-          })
-          return false
+          this.$message.warning('请选择开始日期！')
+          return
         }
         if (this.modalData.planStartDate < this.dayjs().format("YYYY-MM-DD")) {
-          this.$alert('计划开始日期不能小于今天！', '错误', {
-            confirmButtonText: '确定'
-          })
+          this.$message.warning('计划开始日期不能小于今天！')
           return
         }
         if (this.modalData.planEndDate === '' || this.modalData.planEndDate == null) {
-          this.$alert('请选择结束日期！', '错误', {
-            confirmButtonText: '确定'
-          })
-          return false
+          this.$message.warning('请选择结束日期！')
+          return
         }
         if (this.modalData.planEndDate < this.dayjs().format("YYYY-MM-DD")) {
-          this.$alert('计划结束日期不能小于今天！', '错误', {
-            confirmButtonText: '确定'
-          })
+          this.$message.warning('计划结束日期不能小于今天！')
           return
         }
         if (this.modalData.planStartDate > this.modalData.planEndDate) {
-          this.$alert('计划开始日期不能小于结束日期！', '错误', {
-            confirmButtonText: '确定'
-          })
+          this.$message.warning('计划开始日期不能小于结束日期！')
           return
         }
         if(this.modalData.flag === '1'){
           if(this.dataListSelections.length === 0){
-            this.$alert('请勾选设备！', '错误', {
-              confirmButtonText: '确定'
-            })
-            return false
+            this.$message.warning('请勾选设备！')
+            return
           }
-          this.modalData.objectList=this.dataListSelections
+          this.modalData.objectList = this.dataListSelections
           let obj = document.getElementsByName('addWorkOrderRule');
           let s = '';
           for (let i = 0; i < obj.length; i++) {
@@ -1986,7 +1964,7 @@
           eamWorkPlanSave(this.modalData).then(({data}) => {
             if (data && data.code === 0) {
               this.getDataList()
-              this.modalFlag=false
+              this.modalFlag = false
               this.$message({
                 message: '操作成功',
                 type: 'success',
diff --git a/src/views/modules/reportWorkOrder/reportMaintenanceOrder.vue b/src/views/modules/reportWorkOrder/reportMaintenanceOrder.vue
index 83fd799..f59159c 100644
--- a/src/views/modules/reportWorkOrder/reportMaintenanceOrder.vue
+++ b/src/views/modules/reportWorkOrder/reportMaintenanceOrder.vue
@@ -136,7 +136,7 @@
           </el-select>
         </el-form-item>
         <el-form-item v-if="this.saveData.checkResult === '异常'" :label="'异常原因'">
-          <el-select filterable v-model="saveData.disposalMeasures" style="width: 120px">
+          <el-select v-model="saveData.disposalMeasures" style="width: 120px">
             <el-option label="缺少备件" value="缺少备件"></el-option>
             <el-option label="等待售后" value="等待售后"></el-option>
             <el-option label="远程协助" value="远程协助"></el-option>
@@ -216,11 +216,11 @@
               :header-align="item.headerAlign"
               :show-overflow-tooltip="item.showOverflowTooltip"
               :align="item.align"
-              :fixed="item.fixed==''?false:item.fixed"
+              :fixed="item.fixed===''?false:item.fixed"
               :min-width="item.columnWidth"
               :label="item.columnLabel">
               <template slot-scope="scope">
-                <span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
+                <span v-if="!item.columnHidden">{{scope.row[item.columnProp]}}</span>
                 <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
               </template>
             </el-table-column>