问题项修改

qushaowei

2023-11-18 eb48d3bada053e26def2a94d46dbe115a5a7bb2f

问题项修改

 src/views/eam/Daily3MaintenanceOrderList.vue

@@ -174,7 +174,7 @@
            v-if="record.status == '2'"
            type="vertical"
          />
          <a-popconfirm
          <!-- <a-popconfirm
            title="确定恢复工单吗?"
            @confirm="() => handleOrderRecover(record)"
            v-has="'dailyMaintenanceOrder:recover'"
@@ -184,8 +184,8 @@
          <a-divider
            v-if="record.status == '7'"
            type="vertical"
          />
          <a-popconfirm
          /> -->
          <!-- <a-popconfirm
            title="确定作废工单吗?"
            @confirm="() => handleOrderCancel(record)"
            v-has="'dailyMaintenanceOrder:recover'"
@@ -195,7 +195,7 @@
          <a-divider
            v-if="record.status == '2'"
            type="vertical"
          />
          /> -->
          <a-popconfirm
            title="确定领取工单吗?"
            @confirm="() => handleOrderGet(record)"
@@ -203,7 +203,7 @@
          >
            <a v-if="record.status == '2' && record.assignMode == '1'">领取</a>
          </a-popconfirm>
          <a
          <!-- <a
            v-if="record.status == '2' && record.assignMode == '2'  "
            @click="handleAssignOrder(record)"
            v-has="'dailyMaintenanceOrder:assign'"
@@ -212,17 +212,17 @@
            v-if="record.status == '3'&& record.assignMode == '2'  && record.maintenanceUserName != null  "
            @click="handleAssignOrder(record)"
            v-has="'dailyMaintenanceOrder:assign'"
          >改派</a>
          >改派</a> -->
          <!-- <a
            v-if="record.status == '3'"
            @click="handleAssignOrder(record)"
          >改派</a> -->
          <a-divider
          <!-- <a-divider
            v-if="record.status == '2'"
            type="vertical"
          />
          />-->
          <a-divider
            v-if="record.status === '3'&& record.assignMode == '2'  && record.maintenanceUserName != null  "
            v-if="record.status === '2'"
            type="vertical"
          />
          <a
@@ -423,17 +423,20 @@
        {
          title: '状态',
          align: "center",
          dataIndex: 'statusName'
          dataIndex: 'statusName',
          width: 100,
        },
        {
          title: '保养周期',
          align: "center",
          dataIndex: 'maintenanceCycleName',
          width: 100,
        },
        {
          title: '派工方式',
          align: "center",
          dataIndex: 'assignModeName'
          dataIndex: 'assignModeName',
          width: 100,
        },
        {
          title: '统一编码',
@@ -477,23 +480,23 @@
          align: "center",
          dataIndex: 'teamName'
        },
        {
          title: '工时定额',
          align: "center",
          dataIndex: 'workingHourQuota'
        },
        {
          title: '计划开始时间',
          align: "center",
          dataIndex: 'planStartTime',
          //width: '120px',
        },
        {
          title: '计划结束时间',
          align: "center",
          dataIndex: 'planEndTime',
          //width: '120px',
        },
        // {
        //   title: '工时定额',
        //   align: "center",
        //   dataIndex: 'workingHourQuota'
        // },
        // {
        //   title: '计划开始时间',
        //   align: "center",
        //   dataIndex: 'planStartTime',
        //   //width: '120px',
        // },
        // {
        //   title: '计划结束时间',
        //   align: "center",
        //   dataIndex: 'planEndTime',
        //   //width: '120px',
        // },
        {
          title: '实际开始时间',
          align: "center",
@@ -506,11 +509,11 @@
          dataIndex: 'actualEndTime',
          //width: '120px',
        },
        {
          title: '实际用时',
          align: "center",
          dataIndex: 'actualWorkingHourQuota',
        },
        // {
        //   title: '实际用时',
        //   align: "center",
        //   dataIndex: 'actualWorkingHourQuota',
        // },
        {
          title: '执行人',
          align: "center",

 src/views/eam/DailyInspectionOrderList.vue

@@ -150,7 +150,7 @@
            v-if="record.status == '2'"
            type="vertical"
          />
          <a-popconfirm
          <!-- <a-popconfirm
            title="确定恢复工单吗?"
            @confirm="() => handleOrderRecover(record)"
            v-has="'dailyInspectionOrder:recover'"
@@ -160,8 +160,8 @@
          <a-divider
            v-if="record.status == '7'"
            type="vertical"
          />
          <a-popconfirm
          /> -->
          <!-- <a-popconfirm
            title="确定作废工单吗?"
            @confirm="() => handleOrderCancel(record)"
            v-has="'dailyInspectionOrder:recover'"
@@ -171,7 +171,7 @@
          <a-divider
            v-if="record.status == '2'"
            type="vertical"
          />
          /> -->
          <a-popconfirm
            title="确定领取工单吗?"
            @confirm="() => handleOrderGet(record)"
@@ -179,12 +179,12 @@
          >
            <a v-if="record.status == '2' && record.assignMode == '1'">领取</a>
          </a-popconfirm>
          <a
          <!-- <a
            v-if="record.status == '2' && record.assignMode == '2'  "
            @click="handleAssignOrder(record)"
            v-has="'dailyInspectionOrder:assign'"
          >派工</a>
          <a
          >派工</a> -->
          <!-- <a
            v-if="record.status == '2'&& record.assignMode == '3'  && record.inspectionUserName != null  "
            @click="handleAssignOrder(record)"
            v-has="'dailyInspectionOrder:assign'"
@@ -193,7 +193,7 @@
            v-if="record.status == '3'"
            @click="handleAssignOrder(record)"
            v-has="'dailyInspectionOrder:assign'"
          >改派</a>
          >改派</a>-->
          <a-divider
            v-if="record.status == '2'"
            type="vertical"
@@ -209,6 +209,17 @@
          >执行</a>
          <a-divider
            v-if="record.status === '3' || record.status === '4' "
            type="vertical"
          />
          <a-popconfirm
            title="维修人确认完工吗?"
            @confirm="() => handleOrderRepairConfirm(record)"
            v-has="'dailyInspectionOrder:repairConfirm'"
          >
            <a v-if="record.status == '5'">维修确认</a>
          </a-popconfirm>
          <a-divider
            v-if="record.status == '5'"
            type="vertical"
          />
          <a
@@ -244,7 +255,7 @@
          slot-scope="text, record"
        >
          <a
            v-if="record.status === '3' || record.status === '4' ||record.status === '5'  ||record.status === '7' "
            v-if="record.status === '3' || record.status === '4' ||record.status === '5'  ||record.status === '6' "
            class="lot"
            @click="handleOrderExe(record)"
          >{{record.num}}</a>
@@ -331,19 +342,19 @@
        //     return !text ? "" : (text.length > 10 ? text.substr(0, 10) : text)
        //   }
        // },
        {
          title: '点检时间',
          align: "center",
          dataIndex: 'inspectionTime',
          // customRender: function (text) {
          //   return !text ? "" : (text.length > 10 ? text.substr(11, 20) : text)
          // }
        },
        {
          title: '截止时间',
          align: "center",
          dataIndex: 'inspectionDeadline',
        },
        // {
        //   title: '点检时间',
        //   align: "center",
        //   dataIndex: 'inspectionTime',
        //   // customRender: function (text) {
        //   //   return !text ? "" : (text.length > 10 ? text.substr(11, 20) : text)
        //   // }
        // },
        // {
        //   title: '截止时间',
        //   align: "center",
        //   dataIndex: 'inspectionDeadline',
        // },
        {
          title: '统一编码',
          align: "center",
@@ -381,33 +392,33 @@
        //     }
        //   },
        // },
        {
          title: '点检标准编码',
          align: "center",
          dataIndex: 'inspectionStandardNum'
        },
        // {
        //   title: '点检标准编码',
        //   align: "center",
        //   dataIndex: 'inspectionStandardNum'
        // },
        {
          title: '点检周期',
          align: "center",
          dataIndex: 'inspectionCycleName'
        },
        {
          title: '派工方式',
          align: "center",
          dataIndex: 'assignModeName'
        },
        {
          title: '点检结果',
          align: "center",
          dataIndex: 'result'
        },
        // {
        //   title: '派工方式',
        //   align: "center",
        //   dataIndex: 'assignModeName'
        // },
        // {
        //   title: '点检结果',
        //   align: "center",
        //   dataIndex: 'result'
        // },
        {
          title: '点检人',
          align: "center",
          dataIndex: 'inspectionUserName'
        },
        {
          title: '完成时间',
          title: '点检时间',
          align: "center",
          dataIndex: 'actualEndTime',
          // customRender: function (text) {
@@ -415,10 +426,23 @@
          // }
        },
        {
          title: '创建人',
          title: '维修确认人',
          align: "center",
          dataIndex: 'createBy'
          dataIndex: 'repairConfirmPerson'
        },
        {
          title: '确认时间',
          align: "center",
          dataIndex: 'repairConfirmDate',
          // customRender: function (text) {
          //   return !text ? "" : (text.length > 10 ? text.substr(0, 10) : text)
          // }
        },
        // {
        //   title: '创建人',
        //   align: "center",
        //   dataIndex: 'createBy'
        // },
        {
          title: '创建日期',
          align: "center",
@@ -496,7 +520,7 @@
        this.$refs.DailyInspectionOrderExeDrawer.buttonDistable = true
        this.$refs.DailyInspectionOrderExeDrawer.revocationDistable = false
        this.$refs.DailyInspectionOrderExeDrawer.SWbuttonDistable = true
      } else if (record.status === '7') {
      } else if (record.status === '6') {
        this.$refs.DailyInspectionOrderExeDrawer.buttonDistable = true
        this.$refs.DailyInspectionOrderExeDrawer.revocationDistable = true
        this.$refs.DailyInspectionOrderExeDrawer.SWbuttonDistable = true
@@ -541,15 +565,15 @@
        }
      })
    },
    //作废
    handleOrderCancel(record) {
    //维修确认
    handleOrderRepairConfirm(record) {
      const that = this;
      requestPut(that.url.edit, { id: record.id, status: '7' }).then((res) => {
      requestPut(that.url.edit, { id: record.id, status: '6' }).then((res) => {
        if (res.success) {
          that.$message.success("工单作废成功！")
          that.$message.success("工单完工成功！")
          that.loadData()
        } else {
          that.$message.warning("工单作废失败！")
          that.$message.warning("工单完工失败！")
        }
      })
    },

 src/views/eam/DailyInspectionStandardList.vue

@@ -67,9 +67,19 @@
        type='primary'
        icon='plus'
        v-has="'dailyInspectionStandard:add'"
      >新增</a-button>
      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
        <a-button type="primary" icon="import">导入</a-button>
      >编制</a-button>
      <a-upload
        name="file"
        :showUploadList="false"
        :multiple="false"
        :headers="tokenHeader"
        :action="importExcelUrl"
        @change="handleImportExcel"
      >
        <a-button
          type="primary"
          icon="import"
        >导入</a-button>
      </a-upload>
      <a-button
        type="primary"
@@ -102,7 +112,7 @@
        size='middle'
        bordered
        rowKey='id'
        :scroll="{ x: 'calc(1600px + 50%)', y: 900 }"
        :scroll="{ x: 'calc(2300px + 50%)', y: 900 }"
        :columns='columns'
        :dataSource='dataSource'
        :pagination='ipagination'
@@ -138,32 +148,51 @@
          slot="action"
          slot-scope="text, record"
        >

          <a
            v-if="record.versionStatus == '2'"
            @click="handleRevise(record)"
            v-has="'dailyInspectionStandard:revise'"
          >升版</a>
            v-show="record.versionStatus == '1' && record.approvalStatus == '1' "
            @click="handleAuditApproval(record)"
            v-has="'dailyInspectionStandard:audit'"
          >审核</a>
          <a-divider type="vertical" />
          <a
            v-if="record.versionStatus == '1'"
            @click="handleTakeEffect(record)"
            v-has="'dailyInspectionStandard:takeEffect'"
          >生效</a>
            v-show="record.versionStatus == '1' && record.approvalStatus == '4'"
            @click="handleAuditApproval(record)"
            v-has="'dailyInspectionStandard:againAudit'"
          >重新审核</a>
          <a-divider type="vertical" />
          <a
            v-if="record.versionStatus == '1'"
            v-show="record.versionStatus == '1'&& record.approvalStatus == '3' "
            @click="handleAuditApproval(record)"
            v-has="'dailyInspectionStandard:approval'"
          >审批</a>
          <a-divider type="vertical" />
          <a
            v-show="record.versionStatus == '1' && (record.approvalStatus == '1' || record.approvalStatus == '2')"
            @click="handleEdit(record)"
            v-has="'dailyInspectionStandard:edit'"
          >编辑</a>
          <a-divider type="vertical" />
          <a-popconfirm
            v-if="record.versionStatus == '1'"
            v-show="record.versionStatus == '1' && (record.approvalStatus == '1' || record.approvalStatus == '2')"
            title="确定删除吗?"
            @confirm="() => handleDelete(record.id)"
            v-has="'dailyInspectionStandard:delete'"
          >
            <a>删除</a>
          </a-popconfirm>
          <a-divider type="vertical" />
          <a
            v-show="record.versionStatus != '1'"
            @click="handleRevise(record)"
            v-has="'dailyInspectionStandard:revise'"
          >升版</a>
          <a-divider type="vertical" />
          <a
            v-show="record.versionStatus == '2'"
            @click="handleTakeEffect(record)"
            v-has="'dailyInspectionStandard:loseEfficacy'"
          >失效</a>
        </span>

      </a-table>
@@ -187,6 +216,11 @@
      ref='modalForm'
      @ok='modalFormOk'
    ></dailylnspection-standard-modal>

    <audit-approval-modal
      ref='auditApprovalModal'
      @ok='modalFormOk'
    ></audit-approval-modal>
  </a-card>
</template>

@@ -197,6 +231,7 @@
import { getAction, requestPut } from '@/api/manage'
import DailyInspectionStandardDetail from './modules/dailyInspectionStandard/DailyInspectionStandardDetail'
import DailylnspectionStandardModal from './modules/dailyInspectionStandard/DailylnspectionStandardModal'
import AuditApprovalModal from './modules/dailyInspectionStandard/AuditApprovalModal'
import '@/assets/less/TableExpand.less'

export default {
@@ -204,7 +239,8 @@
  mixins: [JeecgListMixin],
  components: {
    DailyInspectionStandardDetail,
    DailylnspectionStandardModal
    DailylnspectionStandardModal,
    AuditApprovalModal
  },
  data() {
    return {
@@ -226,10 +262,11 @@
          dataIndex: 'num',
        },
        {
          title: '使用部门',
          title: '签审状态',
          align: 'center',
          dataIndex: 'useDepartName',
          dataIndex: 'approvalStatusName',
        },

        {
          title: '统一编码',
          align: 'center',
@@ -246,6 +283,11 @@
          dataIndex: 'equipmentModel',
        },
        {
          title: '使用部门',
          align: 'center',
          dataIndex: 'useDepartName',
        },
        {
          title: '责任班组',
          align: 'center',
          dataIndex: 'teamName',
@@ -255,16 +297,54 @@
          align: 'center',
          dataIndex: 'assignModeName',
        },
        // {
        //   title: '生效时间',
        //   align: 'center',
        //   dataIndex: 'takeEffectTime',
        // },
        // {
        //   title: '失效时间',
        //   align: 'center',
        //   dataIndex: 'loseEfficacyTime',
        // },
        {
          title: '审核意见',
          align: 'center',
          dataIndex: 'auditFeedback',
        },
        {
          title: '审批意见',
          align: 'center',
          dataIndex: 'approvalFeedback',
        },
        {
          title: '编制人',
          align: 'center',
          dataIndex: 'writePerson',
        },
        {
          title: '审核人',
          align: 'center',
          dataIndex: 'auditPerson',
        },
        {
          title: '审批人',
          align: 'center',
          dataIndex: 'approvalPerson',
        },
        {
          title: '失效人',
          align: 'center',
          dataIndex: 'loseEfficacyPerson',
        },
        {
          title: '编制日期',
          align: 'center',
          dataIndex: 'createTime',
          width: 150,
        },
        {
          title: '生效时间',
          align: 'center',
          dataIndex: 'takeEffectTime',
          width: 150,
        },
        {
          title: '失效时间',
          align: 'center',
          dataIndex: 'loseEfficacyTime',
          width: 150,
        },
        {
          title: '版本',
          align: 'center',
@@ -275,16 +355,12 @@
          align: 'center',
          dataIndex: 'versionStatusName',
        },
        {
          title: '创建人',
          align: 'center',
          dataIndex: 'createBy',
        },
        {
          title: '创建日期',
          align: 'center',
          dataIndex: 'createTime',
        },
        // {
        //   title: '创建人',
        //   align: 'center',
        //   dataIndex: 'createBy',
        // },

        // {
        //   title: '更新人',
        //   align: 'center',
@@ -329,10 +405,10 @@
    }
  },
  computed: {
      importExcelUrl: function(){
        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
      }
    },
    importExcelUrl: function () {
      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
    }
  },
  methods: {
    clickThenSelect(record) {
      return {
@@ -371,6 +447,12 @@
      this.$refs.modalForm.isRevise = false;
    },

    //审核审批
    handleAuditApproval: function (record) {
      this.$refs.auditApprovalModal.showModals(record);
      this.$refs.auditApprovalModal.title = "审核";
    },

    //升版
    handleRevise: function (record) {
      this.$refs.modalForm.edit(record);
@@ -378,23 +460,22 @@
      this.$refs.modalForm.disableSubmit = false;
      this.$refs.modalForm.isRevise = true;
    },

    //生效
    //失效
    handleTakeEffect(record) {
      const that = this;
      that.confirmLoading = true;
      this.$confirm({
        title: '日常点检标准版本生效！',
        content: '提示：版本生效后上一版本将自动失效，请谨慎操作！',
        title: '日常点检标准版本失效！',
        content: '提示：版本失效后将禁止使用，请谨慎操作！',
        okText: '确认',
        cancelText: '取消',
        onOk() {
          requestPut(that.url.versionTakeEffect, { id: record.id, num: record.num, versionStatus: '2' }).then((res) => {
          requestPut(that.url.versionTakeEffect, { id: record.id, num: record.num, versionStatus: '3' }).then((res) => {
            if (res.success) {
              that.$message.success("版本生效成功！")
              that.$message.success("版本失效成功！")
              that.loadData(1)
            } else {
              that.$message.warning("版本生效失败！")
              that.$message.warning("版本失效失败！")
            }
          }).finally(() => {
            that.confirmLoading = false;
@@ -436,6 +517,13 @@
      this.queryParam = {}
      this.loadData(1);
    },
    modalFormOk() {
      // 新增/修改 成功时，重载列表
      this.loadData();
      //清空列表选中
      // this.onClearSelected()
    },

  }
}
</script>

 src/views/eam/DailyMaintenanceOrderList.vue

@@ -163,7 +163,7 @@
            v-if="record.status == '2'"
            type="vertical"
          />
          <a-popconfirm
          <!-- <a-popconfirm
            title="确定恢复工单吗?"
            @confirm="() => handleOrderRecover(record)"
            v-has="'dailyMaintenanceOrder:recover'"
@@ -173,14 +173,14 @@
          <a-divider
            v-if="record.status == '7'"
            type="vertical"
          />
          <a-popconfirm
          /> -->
          <!-- <a-popconfirm
            title="确定作废工单吗?"
            @confirm="() => handleOrderCancel(record)"
            v-has="'dailyMaintenanceOrder:recover'"
          >
            <a v-if="record.status == '2'">作废</a>
          </a-popconfirm>
          </a-popconfirm> -->
          <a-divider
            v-if="record.status == '2'"
            type="vertical"
@@ -197,11 +197,11 @@
            @click="handleAssignOrder(record)"
            v-has="'dailyMaintenanceOrder:assign'"
          >派工</a>
          <a
          <!-- <a
            v-if="record.status == '3'&& record.assignMode == '2'  && record.maintenanceUserName != null  "
            @click="handleAssignOrder(record)"
            v-has="'dailyMaintenanceOrder:assign'"
          >改派</a>
          >改派</a> -->
          <!-- <a
            v-if="record.status == '3'"
            @click="handleAssignOrder(record)"
@@ -338,6 +338,7 @@
        {
          title: '状态',
          align: "center",
          width: 100,
          dataIndex: 'statusName'
        },
        // {
@@ -345,15 +346,16 @@
        //   align: "center",
        //   dataIndex: 'maintenanceTypeName',
        // },
        {
          title: '保养周期',
          align: "center",
          dataIndex: 'maintenanceCycleName',
        },
        // {
        //   title: '保养周期',
        //   align: "center",
        //   dataIndex: 'maintenanceCycleName',
        // },
        {
          title: '派工方式',
          align: "center",
          dataIndex: 'assignModeName'
          dataIndex: 'assignModeName',
          width: 100,
        },
        {
          title: '统一编码',
@@ -370,11 +372,11 @@
          align: "center",
          dataIndex: 'equipmentModel',
        },
        {
          title: '保养标准编码',
          align: "center",
          dataIndex: 'maintenanceStandardNum',
        },
        // {
        //   title: '保养标准编码',
        //   align: "center",
        //   dataIndex: 'maintenanceStandardNum',
        // },

        {
          title: '使用部门',
@@ -386,23 +388,23 @@
          align: "center",
          dataIndex: 'teamName'
        },
        {
          title: '工时定额',
          align: "center",
          dataIndex: 'workingHourQuota'
        },
        {
          title: '计划开始时间',
          align: "center",
          dataIndex: 'planStartTime',
          //width: '120px',
        },
        {
          title: '计划结束时间',
          align: "center",
          dataIndex: 'planEndTime',
          //width: '120px',
        },
        // {
        //   title: '工时定额',
        //   align: "center",
        //   dataIndex: 'workingHourQuota'
        // },
        // {
        //   title: '计划开始时间',
        //   align: "center",
        //   dataIndex: 'planStartTime',
        //   //width: '120px',
        // },
        // {
        //   title: '计划结束时间',
        //   align: "center",
        //   dataIndex: 'planEndTime',
        //   //width: '120px',
        // },
        {
          title: '实际开始时间',
          align: "center",
@@ -415,11 +417,11 @@
          dataIndex: 'actualEndTime',
          //width: '120px',
        },
        {
          title: '实际用时',
          align: "center",
          dataIndex: 'actualWorkingHourQuota',
        },
        // {
        //   title: '实际用时',
        //   align: "center",
        //   dataIndex: 'actualWorkingHourQuota',
        // },
        {
          title: '执行人',
          align: "center",

 src/views/eam/DailyMaintenanceStandardList.vue

@@ -90,7 +90,7 @@
        type='primary'
        icon='plus'
        v-has="'dailyMaintenanceStandard:add'"
      >新增</a-button>
      >编制</a-button>
      <a-button
        type='primary'
        @click='searchQuery'
@@ -122,7 +122,7 @@
        size='middle'
        bordered
        rowKey='id'
        :scroll="{ x: 'calc(1600px + 50%)', y: 900 }"
        :scroll="{ x: 'calc(2300px + 50%)', y: 900 }"
        :columns='columns'
        :dataSource='dataSource'
        :pagination='ipagination'
@@ -159,30 +159,49 @@
          slot-scope="text, record"
        >
          <a
            v-if="record.versionStatus == '2'"
            @click="handleRevise(record)"
            v-has="'dailyMaintenanceStandard:revise'"
          >升版</a>
          <a
            v-if="record.versionStatus == '1'"
            @click="handleTakeEffect(record)"
            v-has="'dailyMaintenanceStandard:takeEffect'"
          >生效</a>
            v-show="record.versionStatus == '1' && record.approvalStatus == '1' "
            @click="handleAuditApproval(record)"
            v-has="'dailyMaintenanceStandard:audit'"
          >审核</a>
          <a-divider type="vertical" />
          <a
            v-if="record.versionStatus == '1'"
            v-show="record.versionStatus == '1' && record.approvalStatus == '4'"
            @click="handleAuditApproval(record)"
            v-has="'dailyMaintenanceStandard:againAudit'"
          >重新审核</a>
          <a-divider type="vertical" />
          <a
            v-show="record.versionStatus == '1'&& record.approvalStatus == '3' "
            @click="handleAuditApproval(record)"
            v-has="'dailyMaintenanceStandard:approval'"
          >审批</a>
          <a-divider type="vertical" />
          <a
            v-show="record.versionStatus == '1' && (record.approvalStatus == '1' || record.approvalStatus == '2')"
            @click="handleEdit(record)"
            v-has="'dailyMaintenanceStandard:edit'"
          >编辑</a>
          <a-divider type="vertical" />
          <a-popconfirm
            v-if="record.versionStatus == '1'"
            v-show="record.versionStatus == '1' && (record.approvalStatus == '1' || record.approvalStatus == '2')"
            title="确定删除吗?"
            @confirm="() => handleDelete(record.id)"
            v-has="'dailyMaintenanceStandard:delete'"
          >
            <a>删除</a>
          </a-popconfirm>
          <a-divider type="vertical" />
          <a
            v-show="record.versionStatus != '1'"
            @click="handleRevise(record)"
            v-has="'dailyMaintenanceStandard:revise'"
          >升版</a>
          <a-divider type="vertical" />
          <a
            v-show="record.versionStatus == '2'"
            @click="handleTakeEffect(record)"
            v-has="'dailyMaintenanceStandard:loseEfficacy'"
          >失效</a>
        </span>

      </a-table>
@@ -242,6 +261,11 @@
      ref='modalForm'
      @ok='modalFormOk'
    ></daily-maintenance-standard-modal>

    <audit-approval-modal
      ref='auditApprovalModal'
      @ok='modalFormOk'
    ></audit-approval-modal>
  </a-card>
</template>

@@ -255,6 +279,7 @@
import MaintenanceStandardSafetyRequirement from '@/views/eam/modules/dailyMaintenanceStandard/MaintenanceStandardSafetyRequirement'
import DailyMaintenanceStandardModal from './modules/dailyMaintenanceStandard/DailyMaintenanceStandardModal'
import MaintenanceStandardWorkInstruction from '@/views/eam/modules/dailyMaintenanceStandard/MaintenanceStandardWorkInstruction'
import AuditApprovalModal from './modules/dailyMaintenanceStandard/AuditApprovalModal'
import '@/assets/less/TableExpand.less'

export default {
@@ -265,7 +290,8 @@
    DailyMaintenanceStandardModal,
    MaintenanceStandardPlanningMaterial,
    MaintenanceStandardSafetyRequirement,
    MaintenanceStandardWorkInstruction
    MaintenanceStandardWorkInstruction,
    AuditApprovalModal
  },
  data() {
    return {
@@ -285,7 +311,11 @@
          align: 'center',
          dataIndex: 'num',
        },

        {
          title: '签审状态',
          align: 'center',
          dataIndex: 'approvalStatusName',
        },
        {
          title: '统一编码',
          align: 'center',
@@ -316,21 +346,59 @@
          align: 'center',
          dataIndex: 'teamName',
        },
        // {
        //   title: '特种设备',
        //   align: 'center',
        //   dataIndex: 'specificEquipment',
        // },
        {
          title: '特种设备',
          title: '审核意见',
          align: 'center',
          dataIndex: 'specificEquipment',
          dataIndex: 'auditFeedback',
        },
        // {
        //   title: '生效时间',
        //   align: 'center',
        //   dataIndex: 'takeEffectTime',
        // },
        // {
        //   title: '失效时间',
        //   align: 'center',
        //   dataIndex: 'loseEfficacyTime',
        // },
        {
          title: '审批意见',
          align: 'center',
          dataIndex: 'approvalFeedback',
        },
        {
          title: '编制人',
          align: 'center',
          dataIndex: 'writePerson',
        },
        {
          title: '审核人',
          align: 'center',
          dataIndex: 'auditPerson',
        },
        {
          title: '审批人',
          align: 'center',
          dataIndex: 'approvalPerson',
        },
        {
          title: '失效人',
          align: 'center',
          dataIndex: 'loseEfficacyPerson',
        },
        {
          title: '编制日期',
          align: 'center',
          dataIndex: 'createTime',
          width: 150,
        },
        {
          title: '生效时间',
          align: 'center',
          dataIndex: 'takeEffectTime',
          width: 150,
        },
        {
          title: '失效时间',
          align: 'center',
          dataIndex: 'loseEfficacyTime',
          width: 150,
        },
        {
          title: '版本',
          align: 'center',
@@ -341,16 +409,12 @@
          align: 'center',
          dataIndex: 'versionStatusName',
        },
        {
          title: '创建人',
          align: 'center',
          dataIndex: 'createBy',
        },
        {
          title: '创建日期',
          align: 'center',
          dataIndex: 'createTime',
        },
        // {
        //   title: '创建人',
        //   align: 'center',
        //   dataIndex: 'createBy',
        // },

        // {
        //   title: '更新人',
        //   align: 'center',
@@ -464,6 +528,12 @@
      this.$refs.modalForm.isRevise = false;
    },

    //审核审批
    handleAuditApproval: function (record) {
      this.$refs.auditApprovalModal.showModals(record);
      this.$refs.auditApprovalModal.title = "审核";
    },

    //升版
    handleRevise: function (record) {
      this.$refs.modalForm.edit(record);
@@ -472,22 +542,22 @@
      this.$refs.modalForm.isRevise = true;
    },

    //生效
    //失效
    handleTakeEffect(record) {
      const that = this;
      that.confirmLoading = true;
      this.$confirm({
        title: '日常保养标准版本生效！',
        content: '提示：版本生效后上一版本将自动失效，请谨慎操作！',
        title: '保养标准版本失效！',
        content: '提示：版本失效后将禁止使用，请谨慎操作！',
        okText: '确认',
        cancelText: '取消',
        onOk() {
          requestPut(that.url.versionTakeEffect, { id: record.id, num: record.num, versionStatus: '2' }).then((res) => {
          requestPut(that.url.versionTakeEffect, { id: record.id, num: record.num, versionStatus: '3' }).then((res) => {
            if (res.success) {
              that.$message.success("版本生效成功！")
              that.$message.success("版本失效成功！")
              that.loadData(1)
            } else {
              that.$message.warning("版本生效失败！")
              that.$message.warning("版本失效失败！")
            }
          }).finally(() => {
            that.confirmLoading = false;

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

@@ -196,6 +196,7 @@
                        :value="text"
                        v-if="col.dataIndex == 'maintenanceOrderDetailUda1'"
                        @change="(e)=>handleChange(e, record.key, col, index)"
                        :disabled="record.disabled"
                      />
                    </div>
                  </template>
@@ -395,12 +396,12 @@
          dataIndex: 'location',
        },
        // class: "notshow"
        {
          title: '示意图',
          align: 'center',
          dataIndex: 'photo',
          scopedSlots: { customRender: 'photo' },
        },
        // {
        //   title: '示意图',
        //   align: 'center',
        //   dataIndex: 'photo',
        //   scopedSlots: { customRender: 'photo' },
        // },
        // class: "notshow"
        {
          title: '保养项目',
@@ -544,6 +545,7 @@
        onOk() {
          requestPut(that.url.editStatus, { id: that.model.id, status: '4' }).then((res) => {
            if (res.success) {
              that.loadData1(1)
              that.model.status = '4'
              that.$message.success("工单开工成功！")
              that.buttonDistable = false
@@ -606,6 +608,7 @@
              that.buttonDistable = false
              that.revocationDistable = true
              that.SWbuttonDistable = true
              that.loadData1(1)
            } else {
              that.$message.warning(res.message)
            }

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

@@ -28,6 +28,13 @@
              >报工</a-button>
              <a-button
                :style="{marginRight: '8px'}"
                @click="handleNormalReport"
                :disabled="buttonDistable"
                type="primary"
                v-has="'dailyInspectionOrder:normalReport'"
              >结果正常并报工</a-button>
              <a-button
                :style="{marginRight: '8px'}"
                @click="handleReset"
                :disabled="revocationDistable"
                type="primary"
@@ -129,8 +136,8 @@
                  :pagination="ipagination"
                  :loading="loading"
                  @change="handleTableChange"
                  :scroll="{ x: 'calc(1000px + 50%)', y: 900 }"
                >
                  <!-- :scroll="{ x: 'calc(1000px + 50%)', y: 900 }" -->
                  <template
                    v-for="col in columns"
                    :slot="col.dataIndex"
@@ -150,7 +157,7 @@
                        style="max-width:80px;font-size: 12px;font-style: italic;"
                      />
                      <a-select
                        v-if="col.dataIndex == 'inspectionProjectResult' && record.testValueType == '2'"
                        v-if="col.dataIndex == 'inspectionProjectResult' "
                        :value="text"
                        @change="(e) => handleChange(e, record.key, col, index)"
                        style="width: 100%"
@@ -162,7 +169,7 @@
                        <a-select-option value="3">故障停机</a-select-option>
                        <a-select-option value="4">没开机</a-select-option>
                      </a-select>
                      <a-input-number
                      <!-- <a-input-number
                        :value="text"
                        v-if="col.dataIndex == 'inspectionProjectResult' && record.testValueType == '1'"
                        :min="0"
@@ -170,7 +177,7 @@
                        @change="(e)=>handleChange(e, record.key, col, index,record)"
                        style="width: 100%"
                        :disabled="record.disabled"
                      />
                      /> -->
                      <a-textarea
                        :value="text"
                        v-if="col.dataIndex == 'abnormalDesc'"
@@ -311,7 +318,7 @@
  },
  data() {
    return {
      title: "日常点检工单执行",
      title: "自主维护点检执行",
      visible: false,
      maskClosable: true,
      confirmLoading: false,
@@ -340,18 +347,18 @@
          },
          width: 50,
        },
        {
          title: '部位',
          align: 'center',
          dataIndex: 'location',
        },
        // class: "notshow"
        {
          title: '示意图',
          align: 'center',
          dataIndex: 'photo',
          scopedSlots: { customRender: 'photo' },
        },
        // {
        //   title: '部位',
        //   align: 'center',
        //   dataIndex: 'location',
        // },
        // // class: "notshow"
        // {
        //   title: '示意图',
        //   align: 'center',
        //   dataIndex: 'photo',
        //   scopedSlots: { customRender: 'photo' },
        // },
        // class: "notshow"
        {
          title: '点检项目',
@@ -383,25 +390,26 @@
          align: 'center',
          dataIndex: 'inspectionProjectResult',
          scopedSlots: { customRender: 'inspectionProjectResult' },
          className: 'red',
        },
        // className: 'red',
        // {
        //   title: '判定',
        //   align: 'center',
        //   dataIndex: 'judgmentResult',
        //   customRender: (text) => {
        //     if (text == 'pass') {
        //       return "正常";
        //     } else if (text == 'fail') {
        //       return "异常";
        //     }
        //   },
        // },
        {
          title: '判定',
          align: 'center',
          dataIndex: 'judgmentResult',
          customRender: (text) => {
            if (text == 'pass') {
              return "正常";
            } else if (text == 'fail') {
              return "异常";
            }
          },
        },
        {
          title: '异常描述',
          title: '*异常描述',
          align: 'center',
          dataIndex: 'abnormalDesc',
          scopedSlots: { customRender: 'abnormalDesc' },
          className: 'red',
        },
        // {
        //   title: '异常拍照',
@@ -414,8 +422,8 @@
          align: 'center',
          dataIndex: 'treatmentMeasure',
          scopedSlots: { customRender: 'treatmentMeasure' },
          className: 'red',
        },
        // className: 'red',
      ],
      url: {
        list: "/eam/inspectionOrderDetail/list",
@@ -426,6 +434,7 @@
        editStatus: "/eam/inspectionOrder/editStatus",
        revocation: "/eam/inspectionOrder/revocation",
        report: "/eam/inspectionOrder/report",
        normalReport: "/eam/inspectionOrder/normalReport",
      },
    }
  },
@@ -561,14 +570,21 @@
      for (let i = 0; i < that.dataSource.length; i++) {
        let o = this.dataSource[i]
        if (o.inspectionProjectResult == null || o.inspectionProjectResult == '') {
          that.$message.warning('请输入点检结果！')
          that.$message.warning("请填写第" + (i + 1) + "点检结果！");
          that.confirmLoading = false;
          return
        }
        if (o.treatmentMeasure == null || o.treatmentMeasure == '') {
          that.$message.warning('请选择异常处置！')
          that.confirmLoading = false;
          return
        if (o.inspectionProjectResult == '2' || o.inspectionProjectResult == '3') {
          if (o.abnormalDesc == null || o.abnormalDesc == '') {
            that.$message.warning("请填写第" + (i + 1) + "异常描述！");
            that.confirmLoading = false;
            return
          }
          if (o.treatmentMeasure == null || o.treatmentMeasure == '') {
            that.$message.warning("请填写第" + (i + 1) + "异常处置！");
            that.confirmLoading = false;
            return
          }
        }
      }
      formData.inspectionOrderDetailList = that.dataSource;
@@ -602,6 +618,43 @@
      })
    },

    //报工
    handleNormalReport() {
      const that = this;
      that.confirmLoading = true;
      let formData = Object.assign(this.model);
      formData.inspectionOrderDetailList = that.dataSource;
      formData.id = that.model.id;
      formData.status = "5";
      formData.equipmentId = that.model.equipmentId;
      this.$confirm({
        title: '点检工单报工',
        content: '提示：点检结果全部正常，报工后点检工单完工，请谨慎操作！',
        okText: '确认',
        cancelText: '取消',
        onOk() {
          requestPut(that.url.normalReport, formData).then((res) => {
            if (res.success) {
              that.model.status = '5'
              that.$message.success(res.message)
              that.buttonDistable = false
              that.revocationDistable = true
              that.SWbuttonDistable = true
              that.$emit('ok');
              that.alterFlag = new Date();
              that.close();
            } else {
              that.$message.warning(res.message)
            }
          }).finally(() => {
            that.confirmLoading = false;
            // 
          })
        },
      })
    },


    //保存
    handleOk() {
      const that = this;
@@ -610,14 +663,21 @@
      for (let i = 0; i < that.dataSource.length; i++) {
        let o = this.dataSource[i]
        if (o.inspectionProjectResult == null || o.inspectionProjectResult == '') {
          that.$message.warning('请输入点检结果！')
          that.$message.warning("请填写第" + (i + 1) + "点检结果！");
          that.confirmLoading = false;
          return
        }
        if (o.treatmentMeasure == null || o.treatmentMeasure == '') {
          that.$message.warning('请选择异常处置！')
          that.confirmLoading = false;
          return
        if (o.inspectionProjectResult == '2' || o.inspectionProjectResult == '3') {
          if (o.abnormalDesc == null || o.abnormalDesc == '') {
            that.$message.warning("请填写第" + (i + 1) + "异常描述！");
            that.confirmLoading = false;
            return
          }
          if (o.treatmentMeasure == null || o.treatmentMeasure == '') {
            that.$message.warning("请填写第" + (i + 1) + "异常处置！");
            that.confirmLoading = false;
            return
          }
        }
      }
      formData.inspectionOrderDetails = that.dataSource
@@ -671,29 +731,29 @@
      if (target) {

        if (column.dataIndex == 'inspectionProjectResult') {
          if (target.testValueType === "1") {
            target[column.dataIndex] = value;
            let maxValue = target.maxValue
            let minValue = target.minValue
            if (value > minValue && value < maxValue) {
              target['judgmentResult'] = "pass";
            } else {
              target['judgmentResult'] = "fail";
            }
            if (value == null || value == "") {
              target['judgmentResult'] = "";
            }
          } else {
            target[column.dataIndex] = value;
            if (value == "1") {
              target['judgmentResult'] = "pass";
            } else {
              target['judgmentResult'] = "fail";
            }
            if (value == null || value == "") {
              target['judgmentResult'] = "";
            }
          }
          // if (target.testValueType === "1") {
          //   target[column.dataIndex] = value;
          //   let maxValue = target.maxValue
          //   let minValue = target.minValue
          //   if (value > minValue && value < maxValue) {
          //     target['judgmentResult'] = "pass";
          //   } else {
          //     target['judgmentResult'] = "fail";
          //   }
          //   if (value == null || value == "") {
          //     target['judgmentResult'] = "";
          //   }
          // } else {
          target[column.dataIndex] = value;
          // if (value == "1") {
          //   target['judgmentResult'] = "pass";
          // } else {
          //   target['judgmentResult'] = "fail";
          // }
          // if (value == null || value == "") {
          //   target['judgmentResult'] = "";
          // }
          // }
        }
        if (column.dataIndex == 'abnormalDesc') {
          target[column.dataIndex] = value.target.value;
@@ -737,43 +797,7 @@
      })
    },

    getSrc(record) {
      if (!record.path) {
        return '';
      }
      //本地：local\Minio：minio\阿里云：alioss
      if (record.uploadType == 'local') {

        let ssoLoginFlag = Vue.ls.get("ssoLoginFlag");
        let deployMode = Vue.ls.get("deployMode");

        if (ssoLoginFlag && deployMode == "container") {
          var baseProject = Vue.ls.get("baseProject");
          console.log("baseProject==>" + baseProject)

          var hostname = window.location.protocol + "//" + window.location.host;
          var url = hostname + '/' + baseProject + '/sys/common/static';
          return getFileAccessHttpUrl(record.path + record.encodeName, url, window._CONFIG['hyperTextTransfer'])
        } else {
          //根据发布状态修改https 或 http
          return getFileAccessHttpUrl(record.path + record.encodeName, this.url.urlDownload, window._CONFIG['hyperTextTransfer'])
        }

      } else if (record.uploadType == 'alioss') {

        const OSS = require('ali-oss')
        const client = new OSS({
          // region以杭州为例（oss-cn-hangzhou），其他region按实际情况填写。
          region: window._CONFIG['region'],
          // 阿里云主账号AccessKey拥有所有API的访问权限，风险很高。强烈建议您创建并使用RAM账号进行API访问或日常运维，请登录RAM控制台创建RAM账号。
          accessKeyId: window._CONFIG['accessKeyId'],
          accessKeySecret: window._CONFIG['accessKeySecret'],
          bucket: window._CONFIG['bucket'],
        })
        // object-key表示从OSS下载文件时需要指定包含文件后缀在内的完整路径，例如abc/efg/123.jpg。
        return client.signatureUrl(record.path)
      }
    },
  },

}
@@ -796,7 +820,7 @@
.hight {
  color: #f5222d;
}
/deep/ .red {
.red {
  color: red;
}
</style>

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

@@ -378,11 +378,11 @@
          },
          width: 50,
        },
        {
          title: '部位',
          align: 'center',
          dataIndex: 'location'
        },
        // {
        //   title: '部位',
        //   align: 'center',
        //   dataIndex: 'location'
        // },
        {
          title: '点检项目',
          align: 'center',
@@ -408,12 +408,12 @@
        //   align: 'center',
        //   dataIndex: 'inspectionTool'
        // },
        {
          title: '示意图',
          align: "center",
          dataIndex: 'photo',
          scopedSlots: { customRender: 'photo' },
        },
        // {
        //   title: '示意图',
        //   align: "center",
        //   dataIndex: 'photo',
        //   scopedSlots: { customRender: 'photo' },
        // },
      ],
      title: "操作",
      visible: false,

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

@@ -475,7 +475,7 @@
    edit(record) {
      let that = this;
      that.getInspectionCycle()
      that.initOptions();
      // that.initOptions();
      that.dataSource = [];
      that.form.resetFields();
      that.model = Object.assign({}, record);
@@ -563,10 +563,12 @@
          let obj;
          if (!this.model.id) {
            formData.versionStatus = '1'
            formData.approvalStatus = '1'
            obj = postAction(this.url.add, formData);
          } else {
            if (this.isRevise) {
              formData.versionStatus = '1'
              formData.approvalStatus = '1'
              obj = postAction(this.url.revise, formData);
            } else {
              obj = requestPut(this.url.edit, formData, { id: this.model.id });

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

@@ -197,12 +197,22 @@
                        v-if="col.dataIndex == 'maintenanceOrderDetailUda1'"
                        @change="(e)=>handleChange(e, record.key, col, index)"
                        placeholder="请输入保养人"
                        :disabled="record.disabled"
                      />
                      <a-input
                      <!-- <a-input
                        :value="text"
                        v-if="col.dataIndex == 'maintenanceOrderDetailUda2'"
                        @change="(e)=>handleChange(e, record.key, col, index)"
                        placeholder="请输入执行情况"
                      /> -->
                      <a-textarea
                        :value="text"
                        v-if="col.dataIndex == 'maintenanceOrderDetailUda2'"
                        :maxLength="500"
                        auto-size
                        placeholder="请输入执行情况"
                        @change="(e)=>handleChange(e, record.key, col, index)"
                        :disabled="record.disabled"
                      />
                    </div>
                  </template>
@@ -401,12 +411,12 @@
          dataIndex: 'location',
        },
        // class: "notshow"
        {
          title: '示意图',
          align: 'center',
          dataIndex: 'photo',
          scopedSlots: { customRender: 'photo' },
        },
        // {
        //   title: '示意图',
        //   align: 'center',
        //   dataIndex: 'photo',
        //   scopedSlots: { customRender: 'photo' },
        // },
        // class: "notshow"
        {
          title: '保养项目',
@@ -562,6 +572,7 @@
              that.buttonDistable = false
              that.revocationDistable = true
              that.SWbuttonDistable = true
              that.loadData1(1)
            } else {
              that.$message.warning("工单开工失败！")
            }
@@ -619,6 +630,7 @@
              that.buttonDistable = false
              that.revocationDistable = true
              that.SWbuttonDistable = true
              that.loadData1(1)
            } else {
              that.$message.warning(res.message)
            }
@@ -657,7 +669,6 @@


    handleChange(value, key, column, index) {
      debugger
      let that = this;
      const temp = [...that.dataSource];
      const target = temp[index];

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

@@ -449,12 +449,12 @@
        //   align: 'center',
        //   dataIndex: 'maintenanceTool'
        // },
        {
          title: '示意图',
          align: 'center',
          dataIndex: 'photo',
          scopedSlots: { customRender: 'photo' }
        },
        // {
        //   title: '示意图',
        //   align: 'center',
        //   dataIndex: 'photo',
        //   scopedSlots: { customRender: 'photo' }
        // },
        // {
        //   title: '维保专业',
        //   align: 'center',

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

@@ -129,17 +129,13 @@
            return parseInt(index) + 1;
          }
        },
        {
          title: '部位',
          align: "center",
          dataIndex: 'location',
        },
        {
          title: '示意图',
          align: "center",
          dataIndex: 'photo',
          scopedSlots: { customRender: 'photo' },
        },

        // {
        //   title: '示意图',
        //   align: "center",
        //   dataIndex: 'photo',
        //   scopedSlots: { customRender: 'photo' },
        // },
        {
          title: '保养项目',
          align: "center",
@@ -152,6 +148,11 @@
          dataIndex: 'standard',

        },
        {
          title: '部位',
          align: "center",
          dataIndex: 'location',
        },
        // {
        //   title: '方法',
        //   align: "center",
@@ -163,16 +164,16 @@
        //   align: "center",
        //   dataIndex: 'maintenanceTool',
        // },
        {
          title: '安全要求',
          align: "center",
          dataIndex: 'maintenanceRequire',
        },
        {
          title: '工时定额',
          align: "center",
          dataIndex: 'workingHourQuota',
        },
        // {
        //   title: '安全要求',
        //   align: "center",
        //   dataIndex: 'maintenanceRequire',
        // },
        // {
        //   title: '工时定额',
        //   align: "center",
        //   dataIndex: 'workingHourQuota',
        // },
        {
          title: '保养周期',
          align: "center",
@@ -219,10 +220,10 @@
      getAction(this.url.list, params).then((res) => {
        if (res.success) {
          this.dataSource = res.result.records || res.result;
          for (let i = 0; i < this.dataSource.length; i++) {
            let r = this.dataSource[i].upload;
            r.src = this.getSrc(this.dataSource[i].upload);
          }
          // for (let i = 0; i < this.dataSource.length; i++) {
          //   let r = this.dataSource[i].upload;
          //   r.src = this.getSrc(this.dataSource[i].upload);
          // }
          if (res.result.total) {
            this.ipagination.total = res.result.total;
          } else {

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

@@ -339,43 +339,6 @@
          <a>删除</a>
        </a-popconfirm>
      </span>

      <!-- <span
        slot="photo"
        slot-scope="text,record"
      >
        <Tooltip
          placement="top"
          title="预览图片"
        >
          <img
            v-if=" record.upload.path && (record.upload.format.toLowerCase()=='jpg'||record.upload.format.toLowerCase()=='bmp'||record.upload.format.toLowerCase()=='png'||record.upload.format.toLowerCase()=='jpeg'||record.upload.format.toLowerCase()=='gif')"
            width="30"
            height="14"
            border="1"
            draggable="false"
            preview="1"
            :preview-text="''"
            :src="record.upload.src"
          />
        </Tooltip>
        <a
          v-if="record.upload.path && record.upload.format.toLowerCase()=='pdf'"
          href="javascript:;"
          @click="view(record.upload)"
        >
          预览
        </a>

        <a-divider
          v-if="record.upload.path && (record.upload.format.toLowerCase()=='jpg'||record.upload.format.toLowerCase()=='bmp'||record.upload.format.toLowerCase()=='png'||record.upload.format.toLowerCase()=='jpeg'||record.upload.format.toLowerCase()=='gif'||record.upload.format.toLowerCase()=='pdf')"
          type="vertical"
        />
        <a
          href="javascript:;"
          @click="handleUpload(record)"
        >上传</a>
      </span> -->
    </a-table>
    <template slot="footer">
      <a-button
@@ -486,31 +449,31 @@
        //   align: 'center',
        //   dataIndex: 'maintenanceSpecialtyName'
        // },
        {
          title: '安全要求',
          align: 'center',
          dataIndex: 'maintenanceRequire',
          scopedSlots: { customRender: 'maintenanceRequire' },
          width: 150,
        },
        {
          title: '工时定额',
          align: 'center',
          dataIndex: 'workingHourQuota'
        },
        {
          title: '示意图',
          align: 'center',
          dataIndex: 'photo',
          scopedSlots: { customRender: 'photo' },
          width: 150,
        },
        // {
        //   title: '安全要求',
        //   align: 'center',
        //   dataIndex: 'maintenanceRequire',
        //   scopedSlots: { customRender: 'maintenanceRequire' },
        //   width: 150,
        // },
        // {
        //   title: '工时定额',
        //   align: 'center',
        //   dataIndex: 'workingHourQuota'
        // },
        // {
        //   title: '示意图',
        //   align: 'center',
        //   dataIndex: 'photo',
        //   scopedSlots: { customRender: 'photo' },
        //   width: 150,
        // },
        {
          title: '保养部位',
          align: 'center',
          dataIndex: 'location',
          scopedSlots: { customRender: 'location' },
          width: 150,
          // scopedSlots: { customRender: 'location' },
          // width: 150,
        },
        {
          title: '周期',
@@ -596,7 +559,7 @@
        list: "/eam/maintenanceStandardDetail/getMaintenanceStandardDetailListByIds",
        add: "/eam/maintenanceStandard/add",
        edit: "/eam/maintenanceStandard/edit",
        addDetail: "/eam/maintenanceStandardDetail/add",
        // addDetail: "/eam/maintenanceStandardDetail/add",
        getMaintenanceCycle: "/eam/maintenanceStandardDetail/getPeriodicMaintenanceCycle",
        realDelete: "/eam/maintenanceStandardDetail/realDelete",
        revise: '/eam/maintenanceStandard/revise',
@@ -676,7 +639,7 @@

    edit(record) {
      let that = this;
      this.initOptions();
      // this.initOptions();
      // this.getMaintenanceCycle()
      this.dataSource = [];
      this.form.resetFields();
@@ -766,7 +729,6 @@
    },

    handleOk() {
      console.log("123")
      const that = this;
      this.form.validateFields((err, values) => {
        if (!err) {
@@ -782,10 +744,12 @@
          let obj;
          if (!this.model.id) {
            formData.versionStatus = '1'
            formData.approvalStatus = '1'
            obj = postAction(this.url.add, formData);
          } else {
            if (this.isRevise) {
              formData.versionStatus = '1'
              formData.approvalStatus = '1'
              obj = postAction(this.url.revise, formData);
            } else {
              obj = requestPut(this.url.edit, formData, { id: this.model.id });
@@ -825,7 +789,6 @@
    },

    getMaintenanceCycle(equipmentId) {
      debugger
      getAction(this.url.getMaintenanceCycle, { equipmentId: equipmentId }).then((res) => {
        if (res.success) {
          this.maintenanceCycles = res.result

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

@@ -122,16 +122,16 @@
          align: 'center',
          dataIndex: 'location'
        },
        {
          title: '安全要求',
          align: 'center',
          dataIndex: 'maintenanceRequire'
        },
        {
          title: '工时定额',
          align: 'center',
          dataIndex: 'workingHourQuota'
        },
        // {
        //   title: '安全要求',
        //   align: 'center',
        //   dataIndex: 'maintenanceRequire'
        // },
        // {
        //   title: '工时定额',
        //   align: 'center',
        //   dataIndex: 'workingHourQuota'
        // },
      ],
      selectedRowKeys: [],
      oldSelectRows: [],

 src/views/eam/modules/inspectionProject/InspectionProjectModel.vue

@@ -62,7 +62,7 @@
        </a-row>
        <a-row :gutter="24">

          <a-col :span="12">
          <!-- <a-col :span="12">
            <a-form-item
              label="检验值类型"
              :labelCol="labelCol"
@@ -78,11 +78,9 @@
                @change="(e)=>handleChange(e)"
              />
            </a-form-item>
          </a-col>
          <a-col
            v-if="testValueType == '2'"
            :span="12"
          >
          </a-col> -->
          <a-col :span="12">
            <!-- v-if="testValueType == '2'" -->
            <a-form-item
              label="检测标准"
              :labelCol="labelCol"
@@ -116,7 +114,7 @@
            </a-form-item>
          </a-col> -->

          <a-col
          <!-- <a-col
            v-if="testValueType == '1'"
            :span="12"
          >
@@ -133,9 +131,9 @@
                v-decorator="['surfaceValue', validatorRules.surfaceValue ]"
              />
            </a-form-item>
          </a-col>
          </a-col> -->
        </a-row>
        <a-row
        <!-- <a-row
          v-if="testValueType == '1'"
          :gutter="24"
        >
@@ -169,8 +167,8 @@
              />
            </a-form-item>
          </a-col>
        </a-row>
        <a-row :gutter="24">
        </a-row> -->
        <!-- <a-row :gutter="24">
          <a-col :span="12">
            <a-form-item
              label="点检方法"
@@ -202,8 +200,8 @@
                v-decorator="['unitId', validatorRules.unitId]"
              />
            </a-form-item>
          </a-col>
          <!-- <a-col :span="12">
          </a-col> -->
        <!-- <a-col :span="12">
            <a-form-item
              label="点检工具"
              :labelCol="labelCol"
@@ -217,7 +215,7 @@
              />
            </a-form-item>
          </a-col> -->
        </a-row>
        <!-- </a-row> -->

        <a-row :gutter="24">
          <a-col :span="24">
@@ -246,13 +244,13 @@
      >
        关闭
      </a-button>
      <a-button
      <!-- <a-button
        v-if="!this.model.id"
        :disabled="disableSubmit || confirmLoading"
        :loading="confirmLoading"
        @click="handleOkAndAdd"
        type="primary"
      >保存并继续新增</a-button>
      >保存并继续新增</a-button> -->
      <a-button
        :disabled="disableSubmit || confirmLoading"
        :loading="confirmLoading"
@@ -361,25 +359,24 @@
      this.model = Object.assign({}, record);
      this.visible = true;
      this.disableSubmit = false;
      this.testValueType = record.testValueType
      // this.testValueType = record.testValueType
      this.$nextTick(() => {
        this.form.setFieldsValue(pick(this.model, 'inspectionProjectCategoryNumName',
          'num', 'name', 'unitId', 'detectionStandard', 'testValueType', 'inspectionMethod', 'inspectionTool', 'remark'))
          'name', 'detectionStandard', 'remark'))
      });
      if (record.testValueType == '1') {
        this.$nextTick(() => {
          this.form.setFieldsValue(pick(this.model, 'surfaceValue', 'upValue', 'downValue'))
        });
      }
      // if (record.testValueType == '1') {
      //   this.$nextTick(() => {
      //     this.form.setFieldsValue(pick(this.model, 'surfaceValue', 'upValue', 'downValue'))
      //   });
      // }
      if (record.id) {
        this.codeDisable = true;
      } else {
        debugger
        this.codeDisable = false;
        this.$nextTick(() => {
          this.form.setFieldsValue({ "testValueType": '2' })
          this.testValueType = '2'
        });
        // this.$nextTick(() => {
        //   this.form.setFieldsValue({ "testValueType": '2' })
        //   this.testValueType = '2'
        // });
      }
    },

@@ -391,32 +388,32 @@


    //保存并新增按钮触发
    handleOkAndAdd() {
      const that = this
      // 触发表单验证
      this.form.validateFields((err, values) => {
        if (!err) {
          that.confirmLoading = true;
          let formData = Object.assign(this.model, values);
          formData.inspectionProjectCategoryId = this.inspectionProjectCategoryId
          postAction(this.url.add, formData).then((res) => {
            if (res.success) {
              that.$message.success(res.message);
              that.$emit('ok');
              that.alterFlag = new Date();
            } else {
              that.$message.warning(res.message);
            }
          }).finally(() => {
            this.confirmLoading = false
            this.form.setFieldsValue(pick(this.model, 'inspectionProjectCategoryNumName'))
            this.form.setFieldsValue({ "inspectionContent": null, "inspectionRequire": null, "inspectionMethod": null, "inspectionTool": null, "num": null, "name": null, "remark": null })
          })
        } else {
          return false
        }
      })
    },
    // handleOkAndAdd() {
    //   const that = this
    //   // 触发表单验证
    //   this.form.validateFields((err, values) => {
    //     if (!err) {
    //       that.confirmLoading = true;
    //       let formData = Object.assign(this.model, values);
    //       formData.inspectionProjectCategoryId = this.inspectionProjectCategoryId
    //       postAction(this.url.add, formData).then((res) => {
    //         if (res.success) {
    //           that.$message.success(res.message);
    //           that.$emit('ok');
    //           that.alterFlag = new Date();
    //         } else {
    //           that.$message.warning(res.message);
    //         }
    //       }).finally(() => {
    //         this.confirmLoading = false
    //         this.form.setFieldsValue(pick(this.model, 'inspectionProjectCategoryNumName'))
    //         this.form.setFieldsValue({ "inspectionContent": null, "inspectionRequire": null, "inspectionMethod": null, "inspectionTool": null, "num": null, "name": null, "remark": null })
    //       })
    //     } else {
    //       return false
    //     }
    //   })
    // },

    handleOk() {
      const that = this;
@@ -452,79 +449,79 @@
      this.close()
    },

    handleChange(val) {
      this.testValueType = val
    },
    // handleChange(val) {
    //   this.testValueType = val
    // },

    validateDownValue(rule, value, callback) {
      let data = this.form.getFieldsValue(['surfaceValue']);
      if (data.surfaceValue == null || data.surfaceValue == "") {
        callback('名义值不能为空！')
      } else {
        if (value > data.surfaceValue) {
          callback('下偏差值不能大于名义值！')
        } else {
          callback()
        }
      }
    },
    // validateDownValue(rule, value, callback) {
    //   let data = this.form.getFieldsValue(['surfaceValue']);
    //   if (data.surfaceValue == null || data.surfaceValue == "") {
    //     callback('名义值不能为空！')
    //   } else {
    //     if (value > data.surfaceValue) {
    //       callback('下偏差值不能大于名义值！')
    //     } else {
    //       callback()
    //     }
    //   }
    // },

    validateSurfaceValue(rule, value, callback) {
      this.form.setFieldsValue({ "upValue": null, "downValue": null })
      // let data = this.form.getFieldsValue(['surfaceValue']);
      // if (value > data.surfaceValue) {
      //   callback('不合格数量应小于检验数量！')
      // } else {
      //   callback()
      // }
    },
    // validateSurfaceValue(rule, value, callback) {
    //   this.form.setFieldsValue({ "upValue": null, "downValue": null })
    //   // let data = this.form.getFieldsValue(['surfaceValue']);
    //   // if (value > data.surfaceValue) {
    //   //   callback('不合格数量应小于检验数量！')
    //   // } else {
    //   //   callback()
    //   // }
    // },

    validateAnalysisMethod(rule, value, callback) {
      let data = this.form.getFieldsValue(['surfaceValue']);
      if (value > data.surfaceValue) {
        callback('不合格数量应小于检验数量！')
      } else {
        callback()
      }
    },
    // validateAnalysisMethod(rule, value, callback) {
    //   let data = this.form.getFieldsValue(['surfaceValue']);
    //   if (value > data.surfaceValue) {
    //     callback('不合格数量应小于检验数量！')
    //   } else {
    //     callback()
    //   }
    // },

    //验证 编号
    validateNum(rule, value, callback) {
      var params = {
        tableName: 'mom_eam_inspection_project',
        fieldName: 'num',
        fieldVal: value,
        dataId: this.model.id,
        //数据库中存在字段del_flag并使用该字段作为未删除策略，真删除：false 假删除：true
        delFlag: '0',
      };
      duplicateCheck(params).then((res) => {
        if (res.success) {
          callback();
        } else {
          callback("编号已存在!");
        }
      })
    },
    // validateNum(rule, value, callback) {
    //   var params = {
    //     tableName: 'mom_eam_inspection_project',
    //     fieldName: 'num',
    //     fieldVal: value,
    //     dataId: this.model.id,
    //     //数据库中存在字段del_flag并使用该字段作为未删除策略，真删除：false 假删除：true
    //     delFlag: '0',
    //   };
    //   duplicateCheck(params).then((res) => {
    //     if (res.success) {
    //       callback();
    //     } else {
    //       callback("编号已存在!");
    //     }
    //   })
    // },

    //验证 名称
    validateName(rule, value, callback) {
      var params = {
        tableName: 'mom_eam_inspection_project',
        fieldName: 'name',
        fieldVal: value,
        dataId: this.model.id,
        //数据库中存在字段del_flag并使用该字段作为未删除策略，真删除：false 假删除：true
        delFlag: '0',
      };
      duplicateCheck(params).then((res) => {
        if (res.success) {
          callback();
        } else {
          callback("名称已存在!");
        }
      })
    },
    // //验证 名称
    // validateName(rule, value, callback) {
    //   var params = {
    //     tableName: 'mom_eam_inspection_project',
    //     fieldName: 'name',
    //     fieldVal: value,
    //     dataId: this.model.id,
    //     //数据库中存在字段del_flag并使用该字段作为未删除策略，真删除：false 假删除：true
    //     delFlag: '0',
    //   };
    //   duplicateCheck(params).then((res) => {
    //     if (res.success) {
    //       callback();
    //     } else {
    //       callback("名称已存在!");
    //     }
    //   })
    // },

  },
  watch: {

 src/views/eam/modules/inspectionProject/InspectionProjectRight.vue

@@ -56,8 +56,18 @@
        icon="plus"
        :hidden="disabled"
      >新增</a-button>
      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
        <a-button type="primary" icon="import" >导入</a-button>
      <a-upload
        name="file"
        :showUploadList="false"
        :multiple="false"
        :headers="tokenHeader"
        :action="importExcelUrl"
        @change="handleImportExcel"
      >
        <a-button
          type="primary"
          icon="import"
        >导入</a-button>
      </a-upload>
      <a-button
        type="primary"
@@ -91,7 +101,7 @@
        :loading="loading"
        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
        @change="handleTableChange"
        :scroll="{ x: 'calc(1400px + 50%)', y: 900 }"
        :scroll="{ x: 'calc(1000px + 50%)', y: 900 }"
      >
        <!--字符串超长截取省略号显示-->
        <span
@@ -274,26 +284,26 @@
          align: "center",
          dataIndex: 'detectionStandard',
        },
        {
          title: '合格范围  ',
          align: "center",
          dataIndex: 'acceptabilityLimit',
        },
        {
          title: '点检方法',
          align: "center",
          dataIndex: 'inspectionMethod_dictText',
        },
        {
          title: '检验值类型',
          align: "center",
          dataIndex: 'testValueType_dictText',
        },
        {
          title: '计量单位',
          align: 'center',
          dataIndex: 'unitId_dictText',
        },
        // {
        //   title: '合格范围  ',
        //   align: "center",
        //   dataIndex: 'acceptabilityLimit',
        // },
        // {
        //   title: '点检方法',
        //   align: "center",
        //   dataIndex: 'inspectionMethod_dictText',
        // },
        // {
        //   title: '检验值类型',
        //   align: "center",
        //   dataIndex: 'testValueType_dictText',
        // },
        // {
        //   title: '计量单位',
        //   align: 'center',
        //   dataIndex: 'unitId_dictText',
        // },
        // {
        //   title: '点检工具',
        //   align: "center",
@@ -317,9 +327,9 @@
          scopedSlots: {
            customRender: 'action'
          },
          width: 150,
          fixed: 'right',
        },
        // width: 150,
      ],
      url: {
        list: '/eam/inspectionProject/list',
@@ -332,10 +342,10 @@
  },

  computed: {
      importExcelUrl: function(){
        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
      }
    },
    importExcelUrl: function () {
      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
    }
  },
  methods: {
    handleAdd: function () {
      this.$refs.modalForm.add({ inspectionProjectCategoryNumName: this.inspectionProjectCategoryNumName });

 src/views/eam/modules/maintenanceProject/MaintenanceProjectModel.vue

@@ -47,15 +47,15 @@
          </a-col> -->
          <a-col :span="12">
            <a-form-item
              label="安全要求"
              label="保养部位"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
            >
              <a-input
                allow-clear
                :disabled="disableSubmit"
                :placeholder="disableSubmit?'':'请输入安全要求'"
                v-decorator="['maintenanceRequire', validatorRules.maintenanceRequire ]"
                :placeholder="disableSubmit?'':'请输入保养部位'"
                v-decorator="['location', validatorRules.location ]"
              />
            </a-form-item>
          </a-col>
@@ -105,7 +105,7 @@
            </a-form-item>
          </a-col>
        </a-row>
        <a-row :gutter="24">
        <!-- <a-row :gutter="24">
          <a-col :span="12">
            <a-form-item
              label="保养方法"
@@ -134,10 +134,9 @@
                :placeholder="disableSubmit?'':'请输入保养工具'"
                v-decorator="['maintenanceTool', validatorRules.maintenanceTool ]"
              />
              <!-- dictCode="mom_eam_inspection_type,name,id,status!='0' and del_flag!='1'" -->
            </a-form-item>
          </a-col>
        </a-row>
        </a-row> -->
        <a-row :gutter="24">

          <!-- <a-col :span="12">
@@ -157,7 +156,7 @@
            </a-form-item>
          </a-col> -->
        </a-row>
        <a-row :gutter="24">
        <!-- <a-row :gutter="24">
          <a-col :span="12">
            <a-form-item
              label="工时定额"
@@ -174,7 +173,7 @@
            </a-form-item>
          </a-col>

        </a-row>
        </a-row> -->
        <a-row :gutter="24">
          <a-col :span="24">
            <a-form-item

 src/views/eam/modules/maintenanceProject/MaintenanceProjectRight.vue

@@ -88,8 +88,8 @@
        :loading="loading"
        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
        @change="handleTableChange"
        :scroll="{ x: 'calc(1400px + 50%)', y: 900 }"
      >
        <!-- :scroll="{ x: 'calc(1400px + 50%)', y: 900 }" -->
        <!--字符串超长截取省略号显示-->
        <span
          slot="num"
@@ -120,28 +120,6 @@
            :length="15"
          />
        </span>
        <!-- <span
          slot="status"
          slot-scope="text,record"
        >
          <a-badge
            v-if="record.status==1"
            status="success"
          />
          <span
            v-if="record.status==1"
            class="success"
          >启用</span>
          <a-badge
            v-if="record.status==0"
            status="error"
          />
          <span
            v-if="record.status==0"
            class="error"
          >禁用</span>
        </span> -->

        <span
          slot="action"
          slot-scope="text, record"
@@ -169,35 +147,12 @@
                  <a>删除</a>
                </a-popconfirm>
              </a-menu-item>
              <!-- <a-menu-item v-else>
              <a-popconfirm title="当前信息已被引用，请先删除关联信息后再执行删除操作">
                <a class="frozenRowClass">删除</a>
              </a-popconfirm>
            </a-menu-item> -->

              <!-- <a-menu-item v-if="record.status==1">
              <a-popconfirm
                title="确定禁用吗?"
                @confirm="() => handleActive(record.id)"
              >
                <a>禁用</a>
              </a-popconfirm>
            </a-menu-item> -->
              <!-- <a-menu-item v-if="record.status==0">
              <a-popconfirm
                title="确定启用吗?"
                @confirm="() => handleActive(record.id)"
              >
                <a>启用</a>
              </a-popconfirm>
            </a-menu-item> -->
            </a-menu>
          </a-dropdown>
        </span>

      </a-table>
    </div>
    <!-- table区域-end -->

    <maintenance-project-model
      ref="modalForm"
@@ -265,14 +220,14 @@
          align: 'center',
          dataIndex: 'standard',
        },
        {
          title: '保养项目分类',
          align: 'center',
          dataIndex: 'maintenanceProjectCategoryNumName',
          scopedSlots: {
            customRender: 'maintenanceProjectCategoryNumName'
          },
        },
        // {
        //   title: '保养项目分类',
        //   align: 'center',
        //   dataIndex: 'maintenanceProjectCategoryNumName',
        //   scopedSlots: {
        //     customRender: 'maintenanceProjectCategoryNumName'
        //   },
        // },
        // {
        //   title: '维保类型',
        //   align: 'center',
@@ -286,21 +241,21 @@
        //   align: "center",
        //   dataIndex: 'maintenanceSpecialtyId_dictText',
        // },
        {
          title: '安全要求',
          align: "center",
          dataIndex: 'maintenanceRequire',
        },
        {
          title: '维保方法',
          align: "center",
          dataIndex: 'maintenanceMethod_dictText',
        },
        {
          title: '维保工具',
          align: "center",
          dataIndex: 'maintenanceTool',
        },
        // {
        //   title: '安全要求',
        //   align: "center",
        //   dataIndex: 'maintenanceRequire',
        // },
        // {
        //   title: '维保方法',
        //   align: "center",
        //   dataIndex: 'maintenanceMethod_dictText',
        // },
        // {
        //   title: '维保工具',
        //   align: "center",
        //   dataIndex: 'maintenanceTool',
        // },
        {
          title: '保养部位',
          align: "center",
@@ -316,16 +271,16 @@
          align: "center",
          dataIndex: 'createTime',
        },
        {
          title: '修改人',
          align: "center",
          dataIndex: 'updateBy',
        },
        {
          title: '修改时间',
          align: "center",
          dataIndex: 'updateTime',
        },
        // {
        //   title: '修改人',
        //   align: "center",
        //   dataIndex: 'updateBy',
        // },
        // {
        //   title: '修改时间',
        //   align: "center",
        //   dataIndex: 'updateTime',
        // },
        {

          title: '操作',