cuijian
2023-11-02 e972ae643ec3de5b63f035c557b6ea88f93d5838
操作证管理、设备点检工单自动生成
已修改3个文件
80 ■■■■ 文件已修改
src/views/eam/OperationCertificateApplyList.vue 58 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/eam/modules/operationCertificateApply/OperationCertificateApplyForm.vue 19 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/eam/modules/operationCertificateApply/OperationCertificateApplyModal.vue 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/eam/OperationCertificateApplyList.vue
@@ -43,7 +43,7 @@
      <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 @click="handleAchievement" type="primary" icon="plus" v-if="selectedRowKeys.length == 1">成绩录入</a-button>
      <a-button @click="handleAchievement" type="primary" icon="plus" v-if="selectedRowKeys.length == 1 && selectionRows[0].auditStatus == 'audited'">成绩录入</a-button>
      <!-- 高级查询区域 -->
<!--      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>-->
      <a-dropdown v-if="selectedRowKeys.length > 0">
@@ -96,9 +96,36 @@
        </template>
        <span slot="action" slot-scope="text, record">
          <a @click="handleEdit(record)">编辑</a>
          <a-divider type="vertical" />
          <a-popconfirm
            v-if="record.auditStatus == 'created'"
            title="确认提交吗?"
            @confirm="() =>handleCommit(record, 'commit')"
          >
            <a>提交</a>
          </a-popconfirm>
          <a-popconfirm
            v-if="record.auditStatus == 'submitted'"
            title="确认撤回吗?"
            @confirm="() =>handleCommit(record, 'back')"
          >
            <a>撤回</a>
          </a-popconfirm>
          <a-popconfirm
            v-if="record.auditStatus == 'submitted' || record.auditStatus == 'approved'"
            title="确认驳回吗?"
            @confirm="() =>handleCommit(record, 'back')"
          >
            <a>驳回</a>
          </a-popconfirm>
          <a-divider
            v-if="record.auditStatus == 'created' || record.auditStatus == 'submitted'"
            type="vertical"
          />
          <a @click="handleEdit(record)" v-if="record.auditStatus == 'created'">编辑</a>
          <a @click="handleCommit(record,'approved')" v-if="record.auditStatus == 'submitted'">审批</a>
          <a @click="handleCommit(record,'audited')" v-if="record.auditStatus == 'approved'">审核</a>
          <a-divider type="vertical" v-if="record.auditStatus == 'created' || record.auditStatus == 'submitted' || record.auditStatus == 'approved'"/>
          <a-dropdown>
            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
            <a-menu slot="overlay">
@@ -106,7 +133,7 @@
                <a @click="handleDetail(record)">详情</a>
              </a-menu-item>
              <a-menu-item>
                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)" v-if="record.auditStatus == 'created'">
                  <a>删除</a>
                </a-popconfirm>
              </a-menu-item>
@@ -136,6 +163,7 @@
  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
  import OperationCertificateApplyModal from './modules/operationCertificateApply/OperationCertificateApplyModal'
  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
  import { getAction, postAction } from '@/api/manage'
  import OperationCertificateApplyDetailList from './modules/operationCertificateApply/OperationCertificateApplyDetailList'
  import '@/assets/less/TableExpand.less'
@@ -218,7 +246,7 @@
          deleteBatch: "/eam/operationCertificateApply/deleteBatch",
          exportXlsUrl: "/eam/operationCertificateApply/exportXls",
          importExcelUrl: "eam/operationCertificateApply/importExcel",
          approve:"/eam/operationCertificateApply/approve"
        },
        dictOptions:{},
        superFieldList:[],
@@ -246,6 +274,26 @@
        fieldList.push({type:'string',value:'remark',text:'备注',dictCode:''})
        this.superFieldList = fieldList
      },
      handleCommit(record, type) {
        if(type == 'commit'){
          record.auditStatus = 'submitted'
        }else if(type == 'back'){
          record.auditStatus = 'created'
        }else if(type == 'approved'){
          record.auditStatus = 'approved'
        }else if(type == 'audited'){
          record.auditStatus = 'audited'
        }
      postAction(this.url.approve, record).then(res => {
        if (res.success) {
          this.$message.success("操作成功!");
          this.loadData(1);
        } else {
          this.$message.warning(res.message);
        }
      })
    },
      handleEdit: function (record) {
      this.$refs.modalForm.edit(record);
      this.$refs.modalForm.title = "编辑";
src/views/eam/modules/operationCertificateApply/OperationCertificateApplyForm.vue
@@ -123,7 +123,8 @@
          {
            title: '用户',
            key: 'userId',
            type: JVXETypes.userSelect,
            type: JVXETypes.selectSearch,
            dictCode: 'sys_user,realname,id ',
            width: '200px',
            placeholder: '请输入${title}',
            defaultValue: '',
@@ -142,7 +143,7 @@
          {
            title: '设备统一编码',
            key: 'equipmentIds',
            type: JVXETypes.selectSearch,
            type: JVXETypes.selectMultiple,
            dictCode: 'mom_eam_equipment,num,id ',
            width: '200px',
            placeholder: '请输入${title}',
@@ -181,7 +182,7 @@
            width: '200px',
            placeholder: '请输入${title}',
            defaultValue: '',
            disabled:false
            disabled:'achievementDisabled'
          },
          {
            title: '实操成绩',
@@ -190,7 +191,7 @@
            width: '200px',
            placeholder: '请输入${title}',
            defaultValue: '',
            disabled:false
            disabled:'achievementDisabled'
          },
          {
            title: '考试结论',
@@ -200,7 +201,7 @@
            width: '200px',
            placeholder: '请输入${title}',
            defaultValue: '',
            disabled:false
            disabled:'achievementDisabled'
          },
          // {
          //   title: '状态',
@@ -231,10 +232,18 @@
      default: false,
      required: false
    },
    isAchievement: {
      type: Boolean,
      default: false,
      required: false
    },
  },
  computed: {
    formDisabled() {
      return this.disabled
    },
    achievementDisabled() {
      return this.isAchievement
    }
  },
  created() {
src/views/eam/modules/operationCertificateApply/OperationCertificateApplyModal.vue
@@ -8,7 +8,7 @@
    @ok="handleOk"
    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
    @cancel="handleCancel">
    <operation-certificate-apply-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"/>
    <operation-certificate-apply-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" isAchievement="isAchievement"/>
  </j-modal>
</template>
@@ -41,7 +41,6 @@
        this.visible=true
        this.$nextTick(()=>{
          this.$refs.realForm.edit(record);
          this.$refs.realForm.isAchievement = true;
        })
      },
      close () {