设备管理问题项修改

qushaowei

2024-03-13 24404f195670ab3eb96fa2656113ed403238c5b0

设备管理问题项修改

 src/views/eam/Daily3MaintenanceOrderList.vue

@@ -14,10 +14,10 @@
            :md="6"
            :sm="8"
          >
            <a-form-item label="三级工单编码">
            <a-form-item label="统一编号">
              <a-input
                placeholder="请输入三级工单编码"
                v-model="queryParam.num"
                placeholder="请输入统一编号"
                v-model="queryParam.equipmentNum"
              ></a-input>
            </a-form-item>
          </a-col>
@@ -25,22 +25,51 @@
            :md="6"
            :sm="8"
          >
            <span
              style="float: left;overflow: hidden;"
              class="table-page-search-submitButtons"
            >
              <a-button
                type="primary"
                @click="searchQuery"
                icon="search"
              >查询</a-button>
              <a-button
                type="primary"
                @click="searchReset"
                icon="reload"
                style="margin-left: 8px"
              >重置</a-button>
            </span>
            <a-form-item label="保养工单编码">
              <a-input
                placeholder="请输入保养工单编码"
                v-model="queryParam.num"
              ></a-input>
            </a-form-item>
          </a-col>
          <a-col :span="6">
            <a-form-item label="使用部门">
              <j-dict-select-tag
                dictCode="sys_depart,depart_name,id"
                placeholder="请输入使用部门"
                v-model="queryParam.useDepartId"
              />
            </a-form-item>
          </a-col>
          <a-col :span="6">
            <a-form-item label="状态">
              <j-dict-select-tag
                dictCode="daily_maintenance_order_status"
                placeholder="请选择状态"
                v-model="queryParam.status"
              />
            </a-form-item>
          </a-col>
        </a-row>
        <a-row :gutter="24">
          <a-col :span="6">
            <a-form-item label="责任班组">
              <j-dict-select-tag
                dictCode="mom_base_team,name,id,status='1' and del_flag='0'"
                placeholder="请选择责任班组"
                v-model="queryParam.teamId"
              />
            </a-form-item>
          </a-col>
          <a-col :span="7">
            <a-form-item label="完工时间">
              <a-range-picker
                style="width: 100%;"
                format="YYYY-MM-DD HH:mm:ss"
                v-model="finishTime"
                @change="timeChange"
              />
            </a-form-item>
          </a-col>
        </a-row>
      </a-form>
@@ -55,6 +84,18 @@
        icon="plus"
        v-has="'daily3MaintenanceOrder:add'"
      >新增</a-button>
      <a-button
        type="primary"
        @click="searchQuery"
        icon="search"
        style="margin-left: 8px"
      >查询</a-button>
      <a-button
        type="primary"
        @click="searchReset"
        icon="reload"
        style="margin-left: 8px"
      >重置</a-button>
      <a-button
        v-show="selectedRowKeys.length == 1 && selectionRows[0].status == '8'"
        @click="handlePrintPrecision(selectionRows[0])"
@@ -111,19 +152,7 @@
      </a-dropdown> -->
    </div>

    <!-- table区域-begin -->
    <div>
      <!-- <div
        class="ant-alert ant-alert-info"
        style="margin-bottom: 16px;"
      >
        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
        <a
          style="margin-left: 24px"
          @click="onClearSelected"
        >清空</a>
      </div> -->

      <a-table
        ref="table"
        size="middle"
@@ -442,6 +471,7 @@
import Maintenance3ReceiptModal from './modules/daily3MaintenanceOrder/Maintenance3ReceiptModal.vue'
import { getAction, postAction, requestPut } from '@/api/manage'
import JEllipsis from "@/components/jeecg/JEllipsis";
import moment from 'moment'

export default {
  name: 'DailyMaintenanceOrderList',
@@ -464,6 +494,7 @@
    return {
      description: '三级保养工单',
      queryParam: { maintenanceType: '3' },
      finishTime: [],
      // 表头
      columns: [
        {
@@ -483,6 +514,11 @@
          scopedSlots: { customRender: 'num' }
        },
        {
          title: '统一编码',
          align: "center",
          dataIndex: 'equipmentNum',
        },
        {
          title: '状态',
          align: "center",
          dataIndex: 'statusName',
@@ -500,11 +536,7 @@
        //   dataIndex: 'assignModeName',
        //   width: 100,
        // },
        {
          title: '统一编码',
          align: "center",
          dataIndex: 'equipmentNum',
        },

        {
          title: '设备名称',
          align: "center",
@@ -547,12 +579,12 @@
        //   align: "center",
        //   dataIndex: 'workingHourQuota'
        // },
        {
          title: '计划开始时间',
          align: "center",
          dataIndex: 'planStartTime',
          //width: '120px',
        },
        // {
        //   title: '计划开始时间',
        //   align: "center",
        //   dataIndex: 'planStartTime',
        //   //width: '120px',
        // },
        // {
        //   title: '计划结束时间',
        //   align: "center",
@@ -560,13 +592,13 @@
        //   //width: '120px',
        // },
        {
          title: '实际开始时间',
          title: '执行时间',
          align: "center",
          dataIndex: 'actualStartTime',
          //width: '120px',
        },
        {
          title: '实际结束时间',
          title: '完工时间',
          align: "center",
          dataIndex: 'actualEndTime',
          //width: '120px',
@@ -576,11 +608,11 @@
        //   align: "center",
        //   dataIndex: 'actualWorkingHourQuota',
        // },
        {
          title: '报工人',
          align: "center",
          dataIndex: 'maintenanceUserId'
        },
        // {
        //   title: '报工人',
        //   align: "center",
        //   dataIndex: 'maintenanceUserId'
        // },
        {
          title: '问题及相应处理措施描述',
          align: "center",
@@ -809,6 +841,7 @@
    searchReset() {
      this.queryParam = { maintenanceType: '3' }
      this.loadData(1);
      this.finishTime = []
    },
    // modalFormOk() {
    //   alert(0)
@@ -817,6 +850,10 @@
    //   //清空列表选中
    //   this.onClearSelected()
    // },
    timeChange() {
      this.queryParam.finishStartTime = moment(this.finishTime[0]).format("YYYY-MM-DD HH:mm:ss")
      this.queryParam.finishEndTime = moment(this.finishTime[1]).format("YYYY-MM-DD HH:mm:ss")
    },

    //预警颜色
    tableRowClass(record, index) {

 src/views/eam/DailyInspectionOrderList.vue

@@ -14,44 +14,74 @@
            :md="6"
            :sm="8"
          >
            <a-form-item label="点检工单编码">
            <a-form-item label="统一编号">
              <a-input
                placeholder="请输入点检工单编码"
                v-model="queryParam.num"
                placeholder="请输入统一编号"
                v-model="queryParam.equipmentNum"
              ></a-input>
            </a-form-item>
          </a-col>
          <!-- <a-col
            :md="6"
            :sm="8"
          >
            <a-form-item label="点检方法名称">
              <j-input
                placeholder="请输入点检方法名称"
                v-model="queryParam.name"
              ></j-input>
            </a-form-item>
          </a-col> -->
          <a-col
            :md="6"
            :sm="8"
          >
            <span
              style="float: left;overflow: hidden;"
              class="table-page-search-submitButtons"
            <a-form-item label="保养工单编码">
              <a-input
                placeholder="请输入保养工单编码"
                v-model="queryParam.num"
              ></a-input>
            </a-form-item>
          </a-col>
          <a-col :span="6">
            <a-form-item
              label="使用部门"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
            >
              <a-button
                type="primary"
                @click="searchQuery"
                icon="search"
              >查询</a-button>
              <a-button
                type="primary"
                @click="searchReset"
                icon="reload"
                style="margin-left: 8px"
              >重置</a-button>
            </span>
              <j-dict-select-tag
                dictCode="sys_depart,depart_name,id"
                placeholder="请输入使用部门"
                v-model="queryParam.useDepartId"
              />
            </a-form-item>
          </a-col>
          <a-col :span="6">
            <a-form-item
              label="状态"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
            >
              <j-dict-select-tag
                dictCode="daily_inspection_standard_status"
                placeholder="请选择状态"
                v-model="queryParam.status"
              />
            </a-form-item>
          </a-col>
        </a-row>
        <a-row :gutter="24">
          <a-col :span="6">
            <a-form-item
              label="责任班组"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
            >
              <j-dict-select-tag
                dictCode="mom_base_team,name,id,status='1' and del_flag='0'"
                placeholder="请选择责任班组"
                v-model="queryParam.teamId"
              />
            </a-form-item>
          </a-col>
          <a-col :span="7">
            <a-form-item label="点检时间">
              <a-range-picker
                style="width: 100%;"
                format="YYYY-MM-DD HH:mm:ss"
                v-model="finishTime"
                @change="timeChange"
              />
            </a-form-item>
          </a-col>
        </a-row>
      </a-form>
@@ -66,6 +96,18 @@
        icon="plus"
        v-has="'dailyInspectionOrder:add'"
      >新增</a-button>
      <a-button
        type="primary"
        @click="searchQuery"
        icon="search"
        style="margin-left: 8px"
      >查询</a-button>
      <a-button
        type="primary"
        @click="searchReset"
        icon="reload"
        style="margin-left: 8px"
      >重置</a-button>
      <!-- <a-button
        type="primary"
        icon="download"
@@ -298,6 +340,7 @@
import InspectionOrderExeModal from './modules/dailyInspectionOrder/InspectionOrderExeModal'
import DailyInspectionOrderExeDrawer from './modules/dailyInspectionOrder/DailyInspectionOrderExeDrawer'
import { getAction, postAction, requestPut } from '@/api/manage'
import moment from 'moment'

export default {
  name: 'DailyInspectionOrderList',
@@ -310,7 +353,8 @@
  },
  data() {
    return {
      description: '日常点检工单',
      description: '自主维护点检工单',
      finishTime: [],
      // 表头
      columns: [
        {
@@ -329,6 +373,11 @@
          align: "center",
          dataIndex: 'num',
          scopedSlots: { customRender: 'num' }
        },
        {
          title: '统一编码',
          align: "center",
          dataIndex: 'equipmentNum'
        },
        {
          title: '状态',
@@ -363,11 +412,7 @@
        //   align: "center",
        //   dataIndex: 'inspectionDeadline',
        // },
        {
          title: '统一编码',
          align: "center",
          dataIndex: 'equipmentNum'
        },

        {
          title: '设备名称',
          align: "center",
@@ -447,11 +492,11 @@
        //   align: "center",
        //   dataIndex: 'createBy'
        // },
        {
          title: '创建日期',
          align: "center",
          dataIndex: 'createTime',
        },
        // {
        //   title: '创建日期',
        //   align: "center",
        //   dataIndex: 'createTime',
        // },

        {
          title: '操作',
@@ -595,6 +640,18 @@
      })
    },

    searchReset() {
      this.queryParam = {}
      this.finishTime = []
      this.loadData(1);
    },

    timeChange() {
      this.queryParam.inspectionStartTime = moment(this.finishTime[0]).format("YYYY-MM-DD HH:mm:ss")
      this.queryParam.inspectionEndTime = moment(this.finishTime[1]).format("YYYY-MM-DD HH:mm:ss")
    },


    //预警颜色
    tableRowClass(record, index) {
      if (("1" == record.status || "2" == record.status) && "1日" == record.inspectionCycleName) {

 src/views/eam/DailyMaintenanceOrderList.vue

@@ -14,6 +14,17 @@
            :md="6"
            :sm="8"
          >
            <a-form-item label="统一编号">
              <a-input
                placeholder="请输入统一编号"
                v-model="queryParam.equipmentNum"
              ></a-input>
            </a-form-item>
          </a-col>
          <a-col
            :md="6"
            :sm="8"
          >
            <a-form-item label="保养工单编码">
              <a-input
                placeholder="请输入保养工单编码"
@@ -21,37 +32,53 @@
              ></a-input>
            </a-form-item>
          </a-col>
          <!-- <a-col
            :md="6"
            :sm="8"
          >
            <a-form-item label="点检方法名称">
              <j-input
                placeholder="请输入点检方法名称"
                v-model="queryParam.name"
              ></j-input>
          <a-col :span="6">
            <a-form-item label="使用部门">
              <j-dict-select-tag
                dictCode="sys_depart,depart_name,id"
                placeholder="请输入使用部门"
                v-model="queryParam.useDepartId"
              />
            </a-form-item>
          </a-col> -->
          <a-col
            :md="6"
            :sm="8"
          >
            <span
              style="float: left;overflow: hidden;"
              class="table-page-search-submitButtons"
            >
              <a-button
                type="primary"
                @click="searchQuery"
                icon="search"
              >查询</a-button>
              <a-button
                type="primary"
                @click="searchReset"
                icon="reload"
                style="margin-left: 8px"
              >重置</a-button>
            </span>
          </a-col>
          <a-col :span="6">
            <a-form-item label="状态">
              <j-dict-select-tag
                dictCode="daily_maintenance_order_status"
                placeholder="请选择状态"
                v-model="queryParam.status"
              />
            </a-form-item>
          </a-col>
        </a-row>
        <a-row :gutter="24">
          <a-col :span="6">
            <a-form-item label="责任班组">
              <j-dict-select-tag
                dictCode="mom_base_team,name,id,status='1' and del_flag='0'"
                placeholder="请选择责任班组"
                v-model="queryParam.teamId"
              />
            </a-form-item>
          </a-col>
          <a-col :span="6">
            <a-form-item label="移交单状态">
              <j-dict-select-tag
                dictCode="two_maintenance_devolution_status"
                placeholder="请选择移交单状态"
                v-model="queryParam.confirmStatus"
              />
            </a-form-item>
          </a-col>
          <a-col :span="7">
            <a-form-item label="完工时间">
              <a-range-picker
                style="width: 100%;"
                format="YYYY-MM-DD HH:mm:ss"
                v-model="finishTime"
                @change="timeChange"
              />
            </a-form-item>
          </a-col>
        </a-row>
      </a-form>
@@ -66,6 +93,18 @@
        icon="plus"
        v-has="'dailyMaintenanceOrder:add'"
      >新增</a-button>
      <a-button
        type="primary"
        @click="searchQuery"
        icon="search"
        style="margin-left: 8px"
      >查询</a-button>
      <a-button
        type="primary"
        @click="searchReset"
        icon="reload"
        style="margin-left: 8px"
      >重置</a-button>
      <a-button
        v-show="selectedRowKeys.length == 1 && selectionRows[0].status == '8'"
        @click="handlePrintInfo(selectionRows[0])"
@@ -297,6 +336,7 @@
import MaintenanceOrderAssignModal from './modules/dailyMaintenanceOrder/MaintenanceOrderAssignModal'
import DailyMaintenanceOrderExeDrawer from './modules/dailyMaintenanceOrder/DailyMaintenanceOrderExeDrawer'
import { getAction, postAction, requestPut } from '@/api/manage'
import moment from 'moment'

export default {
  name: 'DailyMaintenanceOrderList',
@@ -311,6 +351,7 @@
    return {
      description: '二级保养工单',
      queryParam: { maintenanceType: '2' },
      finishTime: [],
      // 表头
      columns: [
        {
@@ -328,6 +369,11 @@
          align: "center",
          dataIndex: 'num',
          scopedSlots: { customRender: 'num' }
        },
        {
          title: '统一编码',
          align: "center",
          dataIndex: 'equipmentNum',
        },
        {
          title: '状态',
@@ -356,11 +402,7 @@
          align: "center",
          dataIndex: 'confirmStatusName'
        },
        {
          title: '统一编码',
          align: "center",
          dataIndex: 'equipmentNum',
        },

        {
          title: '设备名称',
          align: "center",
@@ -405,13 +447,13 @@
        //   //width: '120px',
        // },
        {
          title: '实际开始时间',
          title: '执行时间',
          align: "center",
          dataIndex: 'actualStartTime',
          //width: '120px',
        },
        {
          title: '实际结束时间',
          title: '完工时间',
          align: "center",
          dataIndex: 'actualEndTime',
          //width: '120px',
@@ -421,11 +463,11 @@
        //   align: "center",
        //   dataIndex: 'actualWorkingHourQuota',
        // },
        {
          title: '报工人',
          align: "center",
          dataIndex: 'maintenanceUserId'
        },
        // {
        //   title: '报工人',
        //   align: "center",
        //   dataIndex: 'maintenanceUserId'
        // },
        {
          title: '问题及相应处理措施描述',
          align: "center",
@@ -601,6 +643,7 @@
    searchReset() {
      this.queryParam = { maintenanceType: '2' }
      this.loadData(1);
      this.finishTime = []
    },
    // modalFormOk() {
    //   alert(0)
@@ -610,6 +653,11 @@
    //   this.onClearSelected()
    // },

    timeChange() {
      this.queryParam.finishStartTime = moment(this.finishTime[0]).format("YYYY-MM-DD HH:mm:ss")
      this.queryParam.finishEndTime = moment(this.finishTime[1]).format("YYYY-MM-DD HH:mm:ss")
    },

    //预警颜色
    tableRowClass(record, index) {
      if ("1" == record.status || "2" == record.status) {

 src/views/eam/modules/daily3MaintenanceOrder/DailyMaintenanceOrderExeDrawer.vue

@@ -117,14 +117,14 @@
                  <a-textarea
                    allowClear
                    :disabled="this.model.status!='4'"
                    :placeholder="'请输入问题及处理措施描述'"
                    :placeholder="'请维修人员签字填写！'"
                    v-model="model.description"
                  />
                </a-form-item>
              </a-col>
              <a-col :span="7">
                <a-form-item
                  label="报工人"
                  label="保养人"
                  :labelCol="{span:4}"
                  :wrapperCol="{span:17}"
                  class="hightColor"
@@ -132,7 +132,7 @@
                  <a-input
                    :disabled="this.model.status!='4'"
                    allow-clear
                    placeholder="请输入报工人"
                    placeholder="请输入保养人"
                    v-model="model.maintenanceUserId"
                  />
                </a-form-item>
@@ -170,7 +170,7 @@
                    slot-scope='text, record, index'
                  >
                    <div :key="col.dataIndex">
                      <span
                      <!-- <span
                        v-show=" col.dataIndex == 'photo' && !text"
                        style="font-size: 12px;font-style: italic;"
                      >无图片</span>
@@ -181,7 +181,7 @@
                        height="25px"
                        alt=""
                        style="max-width:80px;font-size: 12px;font-style: italic;"
                      />
                      /> -->
                      <!-- 示意图 开始 -->
                      <!-- <Tooltip
                        placement="top"
@@ -211,8 +211,9 @@
                        :value="text"
                        v-show="col.dataIndex == 'maintenanceOrderDetailUda1'"
                        @change="(e)=>handleChange(e, record.key, col, index)"
                        :disabled="record.disabled"
                        :disabled="true"
                      />
                      <!-- :disabled="record.disabled" -->
                    </div>
                  </template>
                </a-table>
@@ -347,7 +348,6 @@
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { requestPut, getAction, downFile, postAction } from '@/api/manage'
import Tooltip from 'ant-design-vue/es/tooltip'

import { preview } from 'vue-photo-preview'
import { ACCESS_TOKEN } from '@/store/mutation-types'
import Vue from 'vue'
@@ -474,11 +474,11 @@
        //   align: 'center',
        //   dataIndex: 'workingHourQuota',
        // },
        {
          title: '保养周期',
          align: 'center',
          dataIndex: 'maintenanceCycleName',
        },
        // {
        //   title: '保养周期',
        //   align: 'center',
        //   dataIndex: 'maintenanceCycleName',
        // },
        // {
        //   title: '维保专业',
        //   align: 'center',
@@ -493,7 +493,7 @@
        },
      ],
      url: {
        list: "/eam/dailyMaintenanceOrderDetail/getDailyMaintenanceOrderDetailList",
        list: "/eam/dailyMaintenanceOrderDetail/get3MaintenanceOrderDetailList",
        urlDownload: window._CONFIG['staticDomainURL'],
        download: '/sys/upload/downloadFile',
        editStatus: "/eam/dailyMaintenanceOrder/editStatus",
@@ -564,7 +564,6 @@
      return "background-color:rgba(127, 127, 127,0.08)";
    },
    handleCancel() {
      debugger
      this.maintenanceOrderId = '-1'
      this.$emit('ok');
      this.alterFlag = new Date();
@@ -609,16 +608,16 @@
    handleReport() {
      const that = this;
      that.confirmLoading = true;
      for (let i = 0; i < that.dataSource.length; i++) {
        let o = this.dataSource[i]
        if (o.maintenanceOrderDetailUda1 == null || o.maintenanceOrderDetailUda1 == '') {
          that.$message.warning("请填写第" + (i + 1) + "保养人！");
          that.confirmLoading = false;
          return
        }
      }
      // for (let i = 0; i < that.dataSource.length; i++) {
      //   let o = this.dataSource[i]
      //   if (o.maintenanceOrderDetailUda1 == null || o.maintenanceOrderDetailUda1 == '') {
      //     that.$message.warning("请填写第" + (i + 1) + "保养人！");
      //     that.confirmLoading = false;
      //     return
      //   }
      // }
      if (that.model.maintenanceUserId == null || that.model.maintenanceUserId == "") {
        that.$message.warning("请填写报工人！");
        that.$message.warning("请填写保养人！");
        that.confirmLoading = false;
        return
      }

 src/views/eam/modules/daily3MaintenanceOrder/Maintenance3ReceiptModal.vue

@@ -83,6 +83,7 @@
                auto-size
                placeholder="请输入保养内容"
                @change="(e)=>handleChange(e, record.key, col, index)"
                :disabled="true"
              />
              <a-textarea
                :value="text"
@@ -91,7 +92,7 @@
                auto-size
                placeholder="请输入保养标准"
                @change="(e)=>handleChange(e, record.key, col, index)"
                :disabled="false"
                :disabled="true"
              />
              <a-select
                v-if="col.dataIndex == 'firstInspect'"
@@ -102,6 +103,12 @@
                <a-select-option value="1">通过</a-select-option>
                <a-select-option value="2">未通过</a-select-option>
              </a-select>
              <a-input
                v-if="col.dataIndex == 'firstInspect'"
                @change="(e)=>handleChange(e, record.key, col, index)"
                :disabled="false"
                placeholder="请填写验收未通过原因"
              />
              <a-select
                v-if="col.dataIndex == 'secondInspect'"
                :value="text"
@@ -241,6 +248,23 @@
          dataIndex: 'standard',
          scopedSlots: { customRender: 'standard' }
        },
        // {
        //   title: '验收次数',
        //   children: [
        //     {
        //       title: '第一次检',
        //       dataIndex: 'firstInspect',
        //       align: 'center',
        //       scopedSlots: { customRender: 'firstInspect' }
        //     },
        //     {
        //       title: '第二次检',
        //       dataIndex: 'secondInspect',
        //       align: 'center',
        //       scopedSlots: { customRender: 'secondInspect' }
        //     },
        //   ],
        // },
        {
          title: '第一次检',
          align: 'center',

 src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderExeDrawer.vue

@@ -145,7 +145,7 @@
                    slot-scope='text, record, index'
                  >
                    <div :key="col.dataIndex">
                      <span
                      <!-- <span
                        v-if=" col.dataIndex == 'photo' && !text"
                        style="font-size: 12px;font-style: italic;"
                      >无图片</span>
@@ -156,7 +156,7 @@
                        height="25px"
                        alt=""
                        style="max-width:80px;font-size: 12px;font-style: italic;"
                      />
                      /> -->
                      <!-- <j-dict-select-tag
                        v-if="col.dataIndex == 'inspectionProjectResult' "
                        allow-clear
@@ -206,7 +206,7 @@
                        :disabled="record.disabled"
                      />

                      <j-image-upload
                      <!-- <j-image-upload
                        :value="text"
                        v-if="col.dataIndex == 'abnormalPhoto'"
                        :isMultiple="false"
@@ -215,7 +215,7 @@
                        @change="(e)=>handleChange(e, record.key, col, index)"
                        :disabled="record.disabled"
                      >
                      </j-image-upload>
                      </j-image-upload> -->

                      <!-- <Tooltip
                        placement="top"

 src/views/eam/modules/dailyInspectionStandard/AuditApprovalModal.vue

@@ -178,7 +178,7 @@
          }
          requestPut(this.url.auditApproval, formData, { id: this.model.id }).then((res) => {
            if (res.success) {
              that.$message.success(res.message);
              that.$message.success("驳回成功！");
              that.$emit('ok');
            } else {
              that.$message.warning(res.message);

 src/views/eam/modules/dailyMaintenanceOrder/DailyMaintenanceOrderExeDrawer.vue

@@ -117,14 +117,14 @@
                  <a-textarea
                    allowClear
                    :disabled="this.model.status!='4'"
                    :placeholder="'请输入问题及处理措施描述'"
                    :placeholder="'请维修人员签字填写！'"
                    v-model="model.description"
                  />
                </a-form-item>
              </a-col>
              <a-col :span="7">
                <a-form-item
                  label="报工人"
                  label="保养人"
                  :labelCol="{span:4}"
                  :wrapperCol="{span:17}"
                  class="hightColor"
@@ -132,7 +132,7 @@
                  <a-input
                    :disabled="this.model.status!='4'"
                    allow-clear
                    placeholder="请输入报工人"
                    placeholder="请输入保养人"
                    v-model="model.maintenanceUserId"
                  />
                </a-form-item>
@@ -170,7 +170,7 @@
                    slot-scope='text, record, index'
                  >
                    <div :key="col.dataIndex">
                      <span
                      <!-- <span
                        v-if=" col.dataIndex == 'photo' && !text"
                        style="font-size: 12px;font-style: italic;"
                      >无图片</span>
@@ -181,7 +181,7 @@
                        height="25px"
                        alt=""
                        style="max-width:80px;font-size: 12px;font-style: italic;"
                      />
                      /> -->
                      <!-- 示意图 开始 -->
                      <!-- <Tooltip
                        placement="top"
@@ -212,8 +212,9 @@
                        v-if="col.dataIndex == 'maintenanceOrderDetailUda1'"
                        @change="(e)=>handleChange(e, record.key, col, index)"
                        placeholder="请输入保养人"
                        :disabled="record.disabled"
                        :disabled="true"
                      />
                      <!-- :disabled="record.disabled" -->
                      <!-- <a-input
                        :value="text"
                        v-if="col.dataIndex == 'maintenanceOrderDetailUda2'"
@@ -446,6 +447,11 @@
        // },
        // class: "notshow"
        {
          title: '保养角色',
          align: 'center',
          dataIndex: 'maintenanceRole',
        },
        {
          title: '保养内容',
          align: 'center',
          dataIndex: 'maintenanceProjectNum',
@@ -475,11 +481,11 @@
        //   align: 'center',
        //   dataIndex: 'workingHourQuota',
        // },
        {
          title: '保养周期',
          align: 'center',
          dataIndex: 'maintenanceCycleName',
        },
        // {
        //   title: '保养周期',
        //   align: 'center',
        //   dataIndex: 'maintenanceCycleName',
        // },
        // {
        //   title: '维保专业',
        //   align: 'center',
@@ -621,14 +627,14 @@
          that.confirmLoading = false;
          return
        }
        if (o.maintenanceOrderDetailUda1 == null || o.maintenanceOrderDetailUda1 == '') {
          that.$message.warning("请填写第" + (i + 1) + "保养人！");
          that.confirmLoading = false;
          return
        }
        // if (o.maintenanceOrderDetailUda1 == null || o.maintenanceOrderDetailUda1 == '') {
        //   that.$message.warning("请填写第" + (i + 1) + "保养人！");
        //   that.confirmLoading = false;
        //   return
        // }
      }
      if (that.model.maintenanceUserId == null || that.model.maintenanceUserId == "") {
        that.$message.warning("请填写报工人！");
        that.$message.warning("请填写保养人！");
        that.confirmLoading = false;
        return
      }
@@ -697,11 +703,11 @@
          that.loading = false;
          return
        }
        if (o.maintenanceOrderDetailUda1 == null || o.maintenanceOrderDetailUda1 == '') {
          that.$message.warning("请填写第" + (i + 1) + "保养人！");
          that.loading = false;
          return
        }
        // if (o.maintenanceOrderDetailUda1 == null || o.maintenanceOrderDetailUda1 == '') {
        //   that.$message.warning("请填写第" + (i + 1) + "保养人！");
        //   that.loading = false;
        //   return
        // }
      }
      this.form.validateFields((err, values) => {
        if (!err) {
@@ -711,7 +717,7 @@
          let obj = obj = postAction(this.url.edit, formData)
          obj.then((res) => {
            if (res.success) {
              that.$message.success(res.message)
              that.$message.success("保存成功！")
              that.$emit('ok')
            } else {
              that.$message.warning(res.message)
@@ -732,9 +738,9 @@
      const target = temp[index];
      if (target) {
        target[column.dataIndex] = value;
        if ('maintenanceOrderDetailUda1' == column.dataIndex) {
          target['maintenanceOrderDetailUda1'] = value.target.value;
        }
        // if ('maintenanceOrderDetailUda1' == column.dataIndex) {
        //   target['maintenanceOrderDetailUda1'] = value.target.value;
        // }
        if ('maintenanceOrderDetailUda2' == column.dataIndex) {
          target['maintenanceOrderDetailUda2'] = value.target.value;
        }

 src/views/eam/modules/dailyMaintenanceOrder/FinishDevolutionModal.vue

@@ -64,13 +64,25 @@
            </a-form-item>
          </a-col>
          <a-col :span="8">
            <a-form-item
            <!-- <a-form-item
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
              label="保养日期"
            >
              <span v-if="this.model != null">{{ this.model.actualEndTime }}</span>
              <span v-else>-</span>
            </a-form-item> -->
            <a-form-item
              label="保养日期"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
            >
              <j-date
                v-model="model.maintenanceDate"
                placeholder="请选择保养日期"
                :showTime="true"
                dateFormat="YYYY-MM-DD"
              />
            </a-form-item>
          </a-col>
        </a-row>
@@ -84,9 +96,17 @@
      :columns="columns"
      :dataSource="dataSource"
      :pagination="false"
    >
    />
    <a-table
      ref="table"
      bordered
      size="middle"
      rowKey='id'
      :columns="columns"
      :dataSource="dataSourceOperation"
      :pagination="false"
    />

    </a-table>
    <div :style="{width: '100%',border: '1px solid #e9e9e9',padding: '10px 16px',background: '#fff',}">
      <div class="ant-descriptions-title">问题及相应处理措施描述：</div>
      <a-textarea
@@ -210,8 +230,15 @@
  data() {
    return {
      columns: [

        {
          title: '#',
          title: '类型',
          align: 'center',
          width: 260,
          dataIndex: 'maintenanceRole'
        },
        {
          title: '序号',
          dataIndex: '',
          key: 'rowIndex',
          align: 'center',
@@ -220,11 +247,6 @@
          },
          width: 50,
        },
        {
          title: '类型',
          align: 'center',
          dataIndex: 'maintenanceRole'
        },

        // {
        //   title: '部位',
@@ -232,7 +254,7 @@
        //   dataIndex: 'location'
        // },
        {
          title: '保养项目',
          title: '保养内容',
          align: 'center',
          dataIndex: 'maintenanceProjectName'
        },
@@ -244,12 +266,14 @@
        {
          title: '执行情况',
          align: 'center',
          dataIndex: 'maintenanceOrderDetailUda2'
          dataIndex: 'maintenanceOrderDetailUda2',
          width: 150,
        },
        {
          title: '执行人',
          align: 'center',
          dataIndex: 'maintenanceOrderDetailUda1',
          width: 150,
        },

      ],
@@ -258,6 +282,7 @@
      disableSubmit: false,
      codeDisable: true,
      dataSource: [],
      dataSourceOperation: [],
      model: {},
      // departs: [],
      labelCol: {
@@ -297,18 +322,26 @@
      this.form.resetFields();
      this.model = Object.assign({}, record);
      this.visible = true;
      if (record.dailyMaintenanceDetails != undefined) {
        const temp = [...record.dailyMaintenanceDetails];
      // if (record.dailyMaintenanceDetails != undefined) {
      //   const temp = [...record.dailyMaintenanceDetails];
      //   that.dataSource = temp;
      // }
      if (record.operationUserDetails != undefined) {
        const temp = [...record.operationUserDetails];
        that.dataSourceOperation = temp;
      }
      if (record.repairUserDetails != undefined) {
        const temp = [...record.repairUserDetails];
        that.dataSource = temp;
      }
      that.$nextTick(() => {
        that.form.setFieldsValue(pick(that.model, 'num', 'teamId', 'remark'));
      });
      if (record.id) {
        this.codeDisable = true;
      } else {
        this.codeDisable = false;
      }
      // that.$nextTick(() => {
      //   that.form.setFieldsValue(pick(that.model, 'num', 'teamId', 'remark'));
      // });
      // if (record.id) {
      //   this.codeDisable = true;
      // } else {
      //   this.codeDisable = false;
      // }
    },


@@ -339,7 +372,7 @@
          } else if (this.model.confirmStatus == '4') {
            formData.confirmStatus = '2'
          }
          requestPut(this.url.edit, formData, { id: this.model.id }).then((res) => {
          requestPut(this.url.edit, formData, { id: this.model.id, maintenanceDate: this.model.maintenanceDate }).then((res) => {
            if (res.success) {
              that.$message.success(res.message);
              that.$emit('ok');
@@ -376,7 +409,7 @@
          } else if (this.model.confirmStatus == '5') {
            formData.confirmStatus = '7'
          }
          requestPut(this.url.edit, formData, { id: this.model.id }).then((res) => {
          requestPut(this.url.edit, formData, { id: this.model.id, maintenanceDate: this.model.maintenanceDate }).then((res) => {
            if (res.success) {
              that.$message.success(res.message);
              that.$emit('ok');

 src/views/eam/modules/dailyMaintenanceStandard/DailyMaintenanceStandardDetail.vue

@@ -179,11 +179,11 @@
        //   align: "center",
        //   dataIndex: 'workingHourQuota',
        // },
        {
          title: '保养周期',
          align: "center",
          dataIndex: 'maintenanceCycleName',
        },
        // {
        //   title: '保养周期',
        //   align: "center",
        //   dataIndex: 'maintenanceCycleName',
        // },
        // {
        //   title: '维保专业',
        //   align: "center",

 src/views/eam/modules/equipmentCalibrationOrder/EquipmentList.vue

@@ -22,10 +22,10 @@
                :sm="8"
              >
                <a-form-item label="设备编号">
                  <j-input
                  <a-input
                    placeholder="请输入标准编号检索"
                    v-model="queryParam.num"
                  ></j-input>
                  ></a-input>
                </a-form-item>
              </a-col>

@@ -34,10 +34,10 @@
                :sm="8"
              >
                <a-form-item label="设备名称">
                  <j-input
                  <a-input
                    placeholder="请输入设备名称检索"
                    v-model="queryParam.name"
                  ></j-input>
                  ></a-input>
                </a-form-item>
              </a-col>
              <a-col