问题项修改

qushaowei

2023-11-18 eb48d3bada053e26def2a94d46dbe115a5a7bb2f

 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>