问题项修改

qushaowei

2023-11-18 eb48d3bada053e26def2a94d46dbe115a5a7bb2f

 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;