设备报废功能增加

cuikaidong

2025-05-27 09cdacb5994bc840723b4292fb863d947f5d58c8

设备报废功能增加

 src/views/eam/dispose/EamEquipmentScrapList.vue

@@ -1,46 +1,47 @@
<template>
  <a-card :bordered="false">
  <a-card :bordered='false'>

    <!-- æŸ¥è¯¢åŒºåŸŸ -->
    <div class="table-page-search-wrapper">
      <a-form layout="inline" @keyup.enter.native="searchQuery">
        <a-row :gutter="24">
    <div class='table-page-search-wrapper'>
      <a-form layout='inline' @keyup.enter.native='searchQuery'>
        <a-row :gutter='24'>

          <a-col :xl="6" :lg="7" :md="8" :sm="24">
            <a-form-item label="删除标记">
              <a-input placeholder="请输入删除标记" v-model="queryParam.delFlag"></a-input>
          <a-col :lg='7' :md='8' :sm='24' :xl='6'>
            <a-form-item label='设备编号'>
              <lx-search-equipment-select v-model='queryParam.equipmentId'
                                          placeholder='请输入设备编号或名称搜索'></lx-search-equipment-select>
            </a-form-item>
          </a-col>
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
            <a-form-item label="单据号">
              <a-input placeholder="请输入单据号" v-model="queryParam.code"></a-input>
          <a-col :lg='7' :md='8' :sm='24' :xl='6'>
            <a-form-item label='单据号'>
              <a-input v-model='queryParam.code' placeholder='请输入单据号'></a-input>
            </a-form-item>
          </a-col>
        <template v-if="toggleSearchStatus">
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
            <a-form-item label="设备ID">
              <a-input placeholder="请输入设备ID" v-model="queryParam.equipmentId"></a-input>
            </a-form-item>
          </a-col>
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
            <a-form-item label="转让/报废">
              <a-input placeholder="请输入转让/报废" v-model="queryParam.scrapType"></a-input>
            </a-form-item>
          </a-col>
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
            <a-form-item label="申请人">
              <a-input placeholder="请输入申请人" v-model="queryParam.reportUser"></a-input>
            </a-form-item>
          </a-col>
          <template v-if='toggleSearchStatus'>
            <a-col :lg='7' :md='8' :sm='24' :xl='6'>
              <a-form-item label='设备ID'>
                <a-input v-model='queryParam.equipmentId' placeholder='请输入设备ID'></a-input>
              </a-form-item>
            </a-col>
            <a-col :lg='7' :md='8' :sm='24' :xl='6'>
              <a-form-item label='转让/报废'>
                <a-input v-model='queryParam.scrapType' placeholder='请输入转让/报废'></a-input>
              </a-form-item>
            </a-col>
            <a-col :lg='7' :md='8' :sm='24' :xl='6'>
              <a-form-item label='申请人'>
                <a-input v-model='queryParam.reportUser' placeholder='请输入申请人'></a-input>
              </a-form-item>
            </a-col>
          </template>
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
              <a @click="handleToggleSearch" style="margin-left: 8px">
                {{ toggleSearchStatus ? '收起' : '展开' }}
                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
              </a>
          <a-col :lg='7' :md='8' :sm='24' :xl='6'>
            <span class='table-page-search-submitButtons' style='float: left;overflow: hidden;'>
              <a-button icon='search' type='primary' @click='searchQuery'>查询</a-button>
              <a-button icon='reload' style='margin-left: 8px' type='primary' @click='searchReset'>重置</a-button>
              <!--              <a @click="handleToggleSearch" style="margin-left: 8px">-->
              <!--                {{ toggleSearchStatus ? '收起' : '展开' }}-->
              <!--                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>-->
              <!--              </a>-->
            </span>
          </a-col>

@@ -49,54 +50,66 @@
    </div>

    <!-- æ“ä½œæŒ‰é’®åŒºåŸŸ -->
    <div class="table-operator">
      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
      <a-button type="primary" icon="download" @click="handleExportXls('设备报废(转让)')">导出</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-dropdown v-if="selectedRowKeys.length > 0">
        <a-menu slot="overlay">
          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
    <div class='table-operator'>
      <a-button icon='plus' type='primary' @click='handleAdd'>新增</a-button>
      <a-dropdown v-if='selectedRowKeys.length > 0'>
        <a-menu slot='overlay'>
          <a-menu-item key='1' @click='batchDel'>
            <a-icon type='delete' />
            åˆ é™¤
          </a-menu-item>
        </a-menu>
        <a-button style="margin-left: 8px"> æ‰¹é‡æ“ä½œ <a-icon type="down" /></a-button>
        <a-button style='margin-left: 8px'> æ‰¹é‡æ“ä½œ
          <a-icon type='down' />
        </a-button>
      </a-dropdown>
    </div>

    <!-- table区域-begin -->
    <div>
      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
        <i class="anticon anticon-info-circle ant-alert-icon"></i> å·²é€‰æ‹© <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
      <div class='ant-alert ant-alert-info' style='margin-bottom: 16px;'>
        <i class='anticon anticon-info-circle ant-alert-icon'></i> å·²é€‰æ‹© <a
        style='font-weight: 600'>{{ selectedRowKeys.length }}</a>项
        <a style='margin-left: 24px' @click='onClearSelected'>清空</a>
      </div>

      <a-table
        ref="table"
        size="middle"
        ref='table'
        :columns='columns'
        :dataSource='dataSource'
        :loading='loading'
        :pagination='ipagination'
        :rowSelection='{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}'
        bordered
        rowKey="id"
        :columns="columns"
        :dataSource="dataSource"
        :pagination="ipagination"
        :loading="loading"
        class="j-table-force-nowrap"
        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
        @change="handleTableChange">
        class='j-table-force-nowrap'
        rowKey='id'
        size='middle'
        @change='handleTableChange'>

        <span slot="action" slot-scope="text, record">
          <a @click="handleEdit(record)">编辑</a>
         <span slot='action' slot-scope='text, record'>
          <template v-if="record.scrapStatus === 'WAIT_SUBMIT'">
              <a-popconfirm title='确定提交吗?' @confirm='() => handleSubmit(record.id)'>
              <a>提交</a>
            </a-popconfirm>
              <a-divider type='vertical' />

          <a-divider type="vertical" />
          <a-dropdown>
            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
            <a-menu slot="overlay">
            <a class='ant-dropdown-link'>更多 <a-icon type='down' /></a>
            <a-menu slot='overlay'>
               <a-menu-item>
                 <a @click='handleEdit(record)'>编辑</a>
              </a-menu-item>
              <a-menu-item>
                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
                <a-popconfirm title='确定删除吗?' @confirm='() => handleDelete(record.id)'>
                  <a>删除</a>
                </a-popconfirm>
              </a-menu-item>
            </a-menu>
          </a-dropdown>
            </template>
          <template v-else>
            <a href='javascript:;' @click='handleDetail(record)'>详情</a>
          </template>
        </span>

      </a-table>
@@ -104,122 +117,156 @@
    <!-- table区域-end -->

    <!-- è¡¨å•åŒºåŸŸ -->
    <eamEquipmentScrap-modal ref="modalForm" @ok="modalFormOk"></eamEquipmentScrap-modal>
    <eamEquipmentScrap-modal ref='modalForm' @ok='modalFormOk'></eamEquipmentScrap-modal>
  </a-card>
</template>

<script>
  import '@/assets/less/TableExpand.less'
  import EamEquipmentScrapModal from './modules/EamEquipmentScrapModal'
  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import '@/assets/less/TableExpand.less'
import EamEquipmentScrapModal from './modules/EamEquipmentScrapModal'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import LxSearchEquipmentSelect from '@views/eam/equipment/modules/LxSearchEquipmentSelect.vue'
import { getAction } from '@api/manage'

  export default {
    name: "EamEquipmentScrapList",
    mixins:[JeecgListMixin],
    components: {
      EamEquipmentScrapModal
    },
    data () {
      return {
        description: '设备报废(转让)管理页面',
        // è¡¨å¤´
        columns: [
          {
            title: '#',
            dataIndex: '',
            key:'rowIndex',
            width:60,
            align:"center",
            customRender:function (t,r,index) {
              return parseInt(index)+1;
            }
           },
           {
            title: '删除标记',
            align:"center",
            dataIndex: 'delFlag'
           },
           {
            title: '单据号',
            align:"center",
            dataIndex: 'code'
           },
           {
            title: '设备ID',
            align:"center",
            dataIndex: 'equipmentId'
           },
           {
            title: '转让/报废',
            align:"center",
            dataIndex: 'scrapType'
           },
           {
            title: '申请人',
            align:"center",
            dataIndex: 'reportUser'
           },
           {
            title: '处置时间',
            align:"center",
            dataIndex: 'scrapTime'
           },
           {
            title: '处置理由',
            align:"center",
            dataIndex: 'scrapReason'
           },
           {
            title: '处置金额',
            align:"center",
            dataIndex: 'scrapAmount'
           },
           {
            title: '审核人',
            align:"center",
            dataIndex: 'approvalUser'
           },
           {
            title: '审核意见',
            align:"center",
            dataIndex: 'approvalComment'
           },
           {
            title: '审核时间',
            align:"center",
            dataIndex: 'approvalTime'
           },
           {
            title: '备注',
            align:"center",
            dataIndex: 'remark'
           },
          {
            title: '操作',
            dataIndex: 'action',
            align:"center",
            scopedSlots: { customRender: 'action' },

export default {
  name: 'EamEquipmentScrapList',
  mixins: [JeecgListMixin],
  components: {
    EamEquipmentScrapModal,
    LxSearchEquipmentSelect
  },
  data() {
    return {
      description: '设备报废(转让)管理页面',
      // è¡¨å¤´
      columns: [
        {
          title: '#',
          dataIndex: '',
          key: 'rowIndex',
          width: 60,
          align: 'center',
          customRender: function(t, r, index) {
            return parseInt(index) + 1
          }
        ],
        url: {
          list: "/eam/eamEquipmentScrap/list",
          delete: "/eam/eamEquipmentScrap/delete",
          deleteBatch: "/eam/eamEquipmentScrap/deleteBatch",
          exportXlsUrl: "eam/eamEquipmentScrap/exportXls",
          importExcelUrl: "eam/eamEquipmentScrap/importExcel",
       },
        },
        {
          title: '单据号',
          align: 'center',
          dataIndex: 'code'
        },
        {
          title: '设备编号',
          align: 'center',
          dataIndex: 'equipmentCode'
        },
        {
          title: '设备名称',
          align: 'center',
          dataIndex: 'equipmentName'
        },
        {
          title: '转让/报废',
          align: 'center',
          dataIndex: 'scrapType_dictText'
        },
        {
          title: '申请人',
          align: 'center',
          dataIndex: 'reportUser_dictText'
        },
        {
          title: '处置时间',
          align: 'center',
          dataIndex: 'scrapTime'
        },
        {
          title: '处置理由',
          align: 'center',
          dataIndex: 'scrapReason'
        },
        {
          title: '处置金额',
          align: 'center',
          dataIndex: 'scrapAmount'
        },
        {
          title: '处置状态',
          align: 'center',
          dataIndex: 'scrapStatus_dictText'
        },
        {
          title: '审核人',
          align: 'center',
          dataIndex: 'approvalUser_dictText'
        },
        {
          title: '审核意见',
          align: 'center',
          dataIndex: 'approvalComment'
        },
        {
          title: '审核时间',
          align: 'center',
          dataIndex: 'approvalTime'
        },
        {
          title: '备注',
          align: 'center',
          dataIndex: 'remark'
        },
        {
          title: '操作',
          dataIndex: 'action',
          align: 'center',
          fixed: 'right',
          width: 150,
          scopedSlots: { customRender: 'action' }
        }
      ],
      url: {
        list: '/eam/eamEquipmentScrap/list',
        delete: '/eam/eamEquipmentScrap/delete',
        deleteBatch: '/eam/eamEquipmentScrap/deleteBatch',
        submit: '/eam/eamEquipmentScrap/submit'
      }
    }
  },
  computed: {
    importExcelUrl: function(){
      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
    importExcelUrl: function() {
      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
    }
  },
    methods: {
     
  methods: {
    handleSubmit(id) {
      if (!this.url.submit) {
        this.$message.error('请设置url.submit属性!')
        return
      }
      let that = this
      getAction(that.url.submit, { id: id }).then((res) => {
        if (res.success) {
          //重新计算分页问题
          that.reCalculatePage(1)
          // that.$message.success(res.message);
          that.$notification.success({
            message: '消息',
            description: res.message
          })
          that.loadData()
        } else {
          // that.$message.warning(res.message);
          that.$notification.warning({
            message: '消息',
            description: res.message
          })
        }
      })
    }
  }
}
</script>
<style scoped>
  @import '~@assets/less/common.less';
@import '~@assets/less/common.less';
</style>

 src/views/eam/dispose/modules/EamEquipmentScrapModal.vue

@@ -1,53 +1,39 @@
<template>
  <j-modal
    :title="title"
    :width="800"
    :visible="visible"
    :confirmLoading='confirmLoading'
    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
    :confirmLoading="confirmLoading"
    :title='title'
    :visible='visible'
    :width='800'
    cancelText='关闭'
    switchFullscreen
    @ok="handleOk"
    @cancel="handleCancel"
    cancelText="关闭">
    @cancel='handleCancel'
    @ok='handleOk'>

    <a-spin :spinning="confirmLoading">
      <a-form-model ref="form" :model="model" :rules="validatorRules">

        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="delFlag" label="删除标记">
          <a-input-number v-model="model.delFlag"/>
    <a-spin :spinning='confirmLoading'>
      <a-form-model ref='form' :model='model' :rules='validatorRules'>
        <a-form-model-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='单据号' prop='code'>
          <a-input v-model='model.code' disabled placeholder='编码系统自动生成' />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="code" label="单据号">
          <a-input placeholder="请输入单据号" v-model="model.code" />
        <a-form-model-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='调出设备' prop='equipmentId'>
          <lx-search-equipment-select v-model='model.equipmentId'
                                      :disabled='disableSubmit'
                                      placeholder='请输入设备编号或名称搜索'></lx-search-equipment-select>
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentId" label="设备ID">
          <a-input placeholder="请输入设备ID" v-model="model.equipmentId" />
        <a-form-model-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='处理类型' prop='scrapType'>
          <j-dict-select-tag v-model='model.scrapType' :disabled='disableSubmit || initialAcceptanceDisable' dictCode='scrap_sell'
                             placeholder='请选择处理类型' type='radio' />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="scrapType" label="转让/报废">
          <a-input placeholder="请输入转让/报废" v-model="model.scrapType" />
        <a-form-model-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='处置理由' prop='scrapReason'>
          <a-input v-model='model.scrapReason' placeholder='请输入处置理由' />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="reportUser" label="申请人">
          <a-input placeholder="请输入申请人" v-model="model.reportUser" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="scrapTime" label="处置时间">
          <a-input placeholder="请输入处置时间" v-model="model.scrapTime" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="scrapReason" label="处置理由">
          <a-input placeholder="请输入处置理由" v-model="model.scrapReason" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="scrapAmount" label="处置金额">
          <a-input placeholder="请输入处置金额" v-model="model.scrapAmount" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="approvalUser" label="审核人">
          <a-input placeholder="请输入审核人" v-model="model.approvalUser" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="approvalComment" label="审核意见">
          <a-input placeholder="请输入审核意见" v-model="model.approvalComment" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="approvalTime" label="审核时间">
          <a-input placeholder="请输入审核时间" v-model="model.approvalTime" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="remark" label="备注">
          <a-input placeholder="请输入备注" v-model="model.remark" />
        <div v-if='model.scrapType == 2'>
          <a-form-model-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='处置金额' prop='scrapAmount'>
            <a-input v-model='model.scrapAmount' placeholder='请输入处置金额' />
          </a-form-model-item>
        </div>
        <a-form-model-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='备注' prop='remark'>
          <a-textarea v-model='model.remark' :disabled='disableSubmit' placeholder='请输入备注' />
        </a-form-model-item>

      </a-form-model>
@@ -56,90 +42,104 @@
</template>

<script>
  import { httpAction } from '@/api/manage'
  import moment from "moment"
import { httpAction } from '@/api/manage'
import LxSearchEquipmentSelect from '@views/eam/equipment/modules/LxSearchEquipmentSelect.vue'

  export default {
    name: "EamEquipmentScrapModal",
    data () {
      return {
        title:"操作",
        visible: false,
        model: {},
        labelCol: {
          xs: { span: 24 },
          sm: { span: 5 },
        },
        wrapperCol: {
          xs: { span: 24 },
          sm: { span: 16 },
        },

        confirmLoading: false,
        validatorRules:{
        },
        url: {
          add: "/eam/eamEquipmentScrap/add",
          edit: "/eam/eamEquipmentScrap/edit",
        },
export default {
  name: 'EamEquipmentScrapModal',
  components: { LxSearchEquipmentSelect },
  data() {
    return {
      title: '操作',
      visible: false,
      model: {},
      labelCol: {
        xs: { span: 24 },
        sm: { span: 5 }
      },
      wrapperCol: {
        xs: { span: 24 },
        sm: { span: 16 }
      },

      confirmLoading: false,
      validatorRules: {
        scrapReason: [
          { required: true, message: '请输入处置原因！' }
        ],
        equipmentId: [
          { required: true, message: '请选择设备！' }
        ],
        transferReason: [
          { required: true, message: '请输入变动原因！' }
        ],
        scrapType: [
          { required: true, message: '请选择类型！' }
        ]
      },
      url: {
        add: '/eam/eamEquipmentScrap/add',
        edit: '/eam/eamEquipmentScrap/edit'
      }
    },
    created () {
    },
    methods: {
      add () {
        //初始化默认值
        this.edit({});
      },
      edit (record) {
        this.model = Object.assign({}, record);
        this.visible = true;
      },
      close () {
        this.$emit('close');
        this.visible = false;
        this.$refs.form.clearValidate();
      },
      handleOk () {
        const that = this;
        // è§¦å‘表单验证
         this.$refs.form.validate(valid => {
          if (valid) {
            that.confirmLoading = true;
            let httpurl = '';
            let method = '';
            if(!this.model.id){
              httpurl+=this.url.add;
              method = 'post';
            }else{
              httpurl+=this.url.edit;
               method = 'put';
            }
            httpAction(httpurl,this.model,method).then((res)=>{
              if(res.success){
                that.$message.success(res.message);
                that.$emit('ok');
              }else{
                that.$message.warning(res.message);
              }
            }).finally(() => {
              that.confirmLoading = false;
              that.close();
            })
          }else{
             return false;
          }
        })
      },
      handleCancel () {
        this.close()
      },


    }
  },
  created() {
  },
  methods: {
    add() {
      //初始化默认值
      this.edit({})
    },
    edit(record) {
      this.model = Object.assign({}, record)
      this.visible = true
    },
    close() {
      this.$emit('close')
      this.visible = false
      this.$refs.form.clearValidate()
    },
    handleOk() {
      const that = this
      // è§¦å‘表单验证
      this.$refs.form.validate(valid => {
        if (valid) {
          that.confirmLoading = true
          let httpurl = ''
          let method = ''
          if (!this.model.id) {
            httpurl += this.url.add
            method = 'post'
          } else {
            httpurl += this.url.edit
            method = 'put'
          }
          httpAction(httpurl, this.model, method).then((res) => {
            if (res.success) {
              that.$message.success(res.message)
              that.$emit('ok')
            } else {
              that.$message.warning(res.message)
            }
          }).finally(() => {
            that.confirmLoading = false
            that.close()
          })
        } else {
          return false
        }
      })
    },
    handleCancel() {
      this.close()
    }


  }
}
</script>

<style lang="less" scoped>
<style lang='less' scoped>

</style>

 src/views/flowable/workflow/FlowTodo.vue

@@ -4,15 +4,15 @@
 Date:   2025-02-27
-->
<template>
  <a-card :bordered="false">
  <a-card :bordered='false'>
    <!-- æŸ¥è¯¢åŒºåŸŸ -->
    <div class="table-page-search-wrapper">
      <a-form layout="inline" @keyup.enter.native="searchQuery">
        <a-row :gutter="24">
          <a-col :xl="4" :lg="6" :md="8" :sm="24">
            <a-form-item label="流程分类">
              <j-dict-select-tag placeholder="请选择流程分类" v-model="queryParam.category"
                                 dictCode="flow_type"></j-dict-select-tag>
    <div class='table-page-search-wrapper'>
      <a-form layout='inline' @keyup.enter.native='searchQuery'>
        <a-row :gutter='24'>
          <a-col :lg='6' :md='8' :sm='24' :xl='4'>
            <a-form-item label='流程分类'>
              <j-dict-select-tag v-model='queryParam.category' dictCode='flow_type'
                                 placeholder='请选择流程分类'></j-dict-select-tag>
            </a-form-item>
          </a-col>
          <!--<a-col :xl="4" :lg="6" :md="8" :sm="24">-->
@@ -20,35 +20,35 @@
          <!--<a-input placeholder="请输入流程名称" v-model="queryParam.flowName"></a-input>-->
          <!--</a-form-item>-->
          <!--</a-col>-->
          <a-col :xl="4" :lg="6" :md="8" :sm="24">
            <a-form-item label="当前节点">
              <a-input placeholder="请输入当前节点精确查询" v-model="queryParam.name"></a-input>
          <a-col :lg='6' :md='8' :sm='24' :xl='4'>
            <a-form-item label='当前节点'>
              <a-input v-model='queryParam.name' placeholder='请输入当前节点精确查询'></a-input>
            </a-form-item>
          </a-col>
          <a-col :xl="4" :lg="6" :md="8" :sm="24">
            <a-form-item label="简要描述">
              <a-input placeholder="请输入简要描述" v-model="queryParam.title"></a-input>
          <a-col :lg='6' :md='8' :sm='24' :xl='4'>
            <a-form-item label='简要描述'>
              <a-input v-model='queryParam.title' placeholder='请输入简要描述'></a-input>
            </a-form-item>
          </a-col>
          <template v-if="toggleSearchStatus">
            <a-col :xl="8" :lg="8" :md="12" :sm="24">
              <a-form-item label="任务时间范围">
                <j-date :show-time="false" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择开始时间"
                        class="query-group-cust"
                        v-model="queryParam.startTime"></j-date>
                <span class="query-group-split-cust"></span>
                <j-date :show-time="false" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择结束时间"
                        class="query-group-cust"
                        v-model="queryParam.endTime"></j-date>
          <template v-if='toggleSearchStatus'>
            <a-col :lg='8' :md='12' :sm='24' :xl='8'>
              <a-form-item label='任务时间范围'>
                <j-date v-model='queryParam.startTime' :show-time='false' class='query-group-cust'
                        date-format='YYYY-MM-DD HH:mm:ss'
                        placeholder='请选择开始时间'></j-date>
                <span class='query-group-split-cust'></span>
                <j-date v-model='queryParam.endTime' :show-time='false' class='query-group-cust'
                        date-format='YYYY-MM-DD HH:mm:ss'
                        placeholder='请选择结束时间'></j-date>
              </a-form-item>
            </a-col>
          </template>

          <a-col :xl="4" :lg="6" :md="8" :sm="24">
            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
              <a-button @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
               <a @click="handleToggleSearch" style="margin-left: 8px">
          <a-col :lg='6' :md='8' :sm='24' :xl='4'>
            <span class='table-page-search-submitButtons' style='float: left;overflow: hidden;'>
              <a-button icon='search' type='primary' @click='searchQuery'>查询</a-button>
              <a-button icon='reload' style='margin-left: 8px' @click='searchReset'>重置</a-button>
               <a style='margin-left: 8px' @click='handleToggleSearch'>
                {{ toggleSearchStatus ? '收起' : '展开' }}
                <a-icon :type="toggleSearchStatus ? 'up' : 'down'" />
              </a>
@@ -60,85 +60,87 @@
    <!-- æŸ¥è¯¢åŒºåŸŸ-END -->

    <!-- æ“ä½œæŒ‰é’®åŒºåŸŸ -->
    <div class="table-operator">
      <a-dropdown v-if="selectedRowKeys.length > 0 ">
        <a-menu slot="overlay">
          <a-menu-item key="1" @click="batchHandle">
            <a-icon type="delete" />
    <div class='table-operator'>
      <a-dropdown v-if='selectedRowKeys.length > 0 '>
        <a-menu slot='overlay'>
          <a-menu-item key='1' @click='batchHandle'>
            <a-icon type='delete' />
            æ‰¹é‡å¤„理
          </a-menu-item>
        </a-menu>
        <a-button style="margin-left: 8px"> æ‰¹é‡æ“ä½œ
          <a-icon type="down" />
        <a-button style='margin-left: 8px'> æ‰¹é‡æ“ä½œ
          <a-icon type='down' />
        </a-button>
      </a-dropdown>
    </div>

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

      <a-table
        ref="table"
        ref='table'
        :columns='columns'
        :dataSource='dataSource'
        :loading='loading'
        :pagination='ipagination'
        :rowSelection='{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}'
        :scroll='{x:getTableColumnsTotalWidth,y:465}'
        bordered
        size="middle"
        rowKey="id"
        :scroll="{x:getTableColumnsTotalWidth,y:465}"
        :columns="columns"
        :dataSource="dataSource"
        :pagination="ipagination"
        :loading="loading"
        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
        @change="handleTableChange">
        rowKey='id'
        size='middle'
        @change='handleTableChange'>

        <span slot="action" slot-scope="text, record">
            <a @click="handelDetail(record,text)">执行/审批</a>
        <span slot='action' slot-scope='text, record'>
            <a @click='handelDetail(record,text)'>执行/审批</a>
        </span>

      </a-table>
    </div>
    <AssignFileStreamHandle ref="modalFormApproval" :selectShenpiData="selectShenpiData"
                            @searchReset="searchReset"></AssignFileStreamHandle>
    <DispatchFileHandle ref="modalFormDispatchFileXq" :selectShenpiData="selectDispatchFileXqData"
                        @searchReset="searchReset"></DispatchFileHandle>
    <DispatchFileBachHandleStyle ref="modalFormDispatchFileBatch" @searchReset="searchReset"
                                 @ok="modalFormOk"></DispatchFileBachHandleStyle>
    <AssignFileStreamHandle ref='modalFormApproval' :selectShenpiData='selectShenpiData'
                            @searchReset='searchReset'></AssignFileStreamHandle>
    <DispatchFileHandle ref='modalFormDispatchFileXq' :selectShenpiData='selectDispatchFileXqData'
                        @searchReset='searchReset'></DispatchFileHandle>
    <DispatchFileBachHandleStyle ref='modalFormDispatchFileBatch' @ok='modalFormOk'
                                 @searchReset='searchReset'></DispatchFileBachHandleStyle>
    <!--单个流程处理-->
    <InspectionOrderHandle ref="modalFormInspectionOrder" :selectShenpiData="selectInspectionOrderData"
                           @searchReset="searchReset"></InspectionOrderHandle>
    <week-maintenance-approval-modal ref="weekMaintenanceApprovalModal" :selectShenpiData="selectWeekMaintenanceData"
                                     @searchReset="searchReset"></week-maintenance-approval-modal>
    <repair-order-approval-modal ref="repairOrderApprovalModal" @searchReset="searchReset"
                                 :selectShenpiData="selectRepairOrderData"></repair-order-approval-modal>
    <out-bound-order-handle ref="outBoundOrderHandle" :selectShenpiData="selectOutBoundOrderData"
                            @searchReset="searchReset"></out-bound-order-handle>
    <stocktaking-bound-handle   ref="stocktakingBoundHandle" :selectShenpiData="selectStocktakingBoundOrderData" @searchReset="searchReset"></stocktaking-bound-handle>
    <InspectionOrderHandle ref='modalFormInspectionOrder' :selectShenpiData='selectInspectionOrderData'
                           @searchReset='searchReset'></InspectionOrderHandle>
    <week-maintenance-approval-modal ref='weekMaintenanceApprovalModal' :selectShenpiData='selectWeekMaintenanceData'
                                     @searchReset='searchReset'></week-maintenance-approval-modal>
    <repair-order-approval-modal ref='repairOrderApprovalModal' :selectShenpiData='selectRepairOrderData'
                                 @searchReset='searchReset'></repair-order-approval-modal>
    <out-bound-order-handle ref='outBoundOrderHandle' :selectShenpiData='selectOutBoundOrderData'
                            @searchReset='searchReset'></out-bound-order-handle>
    <stocktaking-bound-handle ref='stocktakingBoundHandle' :selectShenpiData='selectStocktakingBoundOrderData'
                              @searchReset='searchReset'></stocktaking-bound-handle>


    <loss-bound-handle ref="lossBoundHandle" :selectShenpiData="selectLossBoundOrderData"
                       @searchReset="searchReset"></loss-bound-handle>
    <loss-bound-handle ref='lossBoundHandle' :selectShenpiData='selectLossBoundOrderData'
                       @searchReset='searchReset'></loss-bound-handle>

    <!--批量处理-->
    <inspection-order-batch-handle ref="inspectionOrderBatchHandleRef" @searchReset="searchReset"
                                   :taskList="selectionRows" />
    <inspection-order-batch-handle ref='inspectionOrderBatchHandleRef' :taskList='selectionRows'
                                   @searchReset='searchReset' />

    <week-maintenance-batch-approval-modal ref="weenMaintenanceBatchApprovalModalRef" @searchReset="searchReset"
                                           :taskList="selectionRows" />
    <equipment-lean-out-approval-modal ref="equipmentLeanOutApprovalModelRef" @searchReset="searchReset" />
    <week-maintenance-batch-approval-modal ref='weenMaintenanceBatchApprovalModalRef' :taskList='selectionRows'
                                           @searchReset='searchReset' />
    <equipment-lean-out-approval-modal ref='equipmentLeanOutApprovalModelRef' @searchReset='searchReset' />

    <second-maintenance-approval-modal ref="secondMaintenanceApprovalModal"
                                       :selectShenpiData="selectSecondMaintenanceData"
                                       @searchReset="searchReset"></second-maintenance-approval-modal>
    <third-maintenance-approval-modal ref="thirdMaintenanceApprovalModal" :selectShenpiData="selectThirdMaintenanceData"
                                      @searchReset="searchReset"></third-maintenance-approval-modal>
    <equipment-seal-up-approval-modal ref="equipmentSealUpApprovalModelRef" @searchReset="searchReset" />
    <inbound-order-handle ref="inboundOrderApprovalModal" :selectInboundOrderData="selectInboundOrderData"
                                     @searchReset="searchReset"></inbound-order-handle>
    <equipment-transfer-approval-modal ref="equipmentTransferApprovalModelRef" @searchReset="searchReset" />
    <second-maintenance-approval-modal ref='secondMaintenanceApprovalModal'
                                       :selectShenpiData='selectSecondMaintenanceData'
                                       @searchReset='searchReset'></second-maintenance-approval-modal>
    <third-maintenance-approval-modal ref='thirdMaintenanceApprovalModal' :selectShenpiData='selectThirdMaintenanceData'
                                      @searchReset='searchReset'></third-maintenance-approval-modal>
    <equipment-seal-up-approval-modal ref='equipmentSealUpApprovalModelRef' @searchReset='searchReset' />
    <inbound-order-handle ref='inboundOrderApprovalModal' :selectInboundOrderData='selectInboundOrderData'
                          @searchReset='searchReset'></inbound-order-handle>
    <equipment-transfer-approval-modal ref='equipmentTransferApprovalModelRef' @searchReset='searchReset' />
    <equipment-scrap-approval-modal ref='equipmentScrapApprovalModelRef' @searchReset='searchReset' />
  </a-card>
</template>

@@ -160,10 +162,12 @@
import DispatchFileBachHandleStyle from '@views/flowable/workflow/dispatchFile/DispatchFileBachHandleStyle#Drawer.vue'
import OutBoundOrderHandle from '@views/flowable/workflow/outBoundOrder/OutBoundOrderHandle.vue'
import EquipmentLeanOutApprovalModal from '@views/flowable/workflow/leanOut/EquipmentLeanOutApprovalModal.vue'
import SecondMaintenanceApprovalModal from '@views/flowable/workflow/secondMaintenance/SecondMaintenanceApprovalModal.vue'
import SecondMaintenanceApprovalModal
  from '@views/flowable/workflow/secondMaintenance/SecondMaintenanceApprovalModal.vue'
import ThirdMaintenanceApprovalModal from '@views/flowable/workflow/thirdMaintenance/ThirdMaintenanceApprovalModal.vue'
import EquipmentSealUpApprovalModal from '@views/flowable/workflow/sealUp/EquipmentSealUpApprovalModal.vue'
import EquipmentTransferApprovalModal from '@views/flowable/workflow/transfer/EquipmentTransferApprovalModal.vue'
import EquipmentScrapApprovalModal from '@views/flowable/workflow/scrap/EquipmentScrapApprovalModal.vue'
import stocktakingBoundHandle from '@views/flowable/workflow/stocktakingBound/stocktakingBoundHandle.vue'
import lossBoundHandle from '@views/flowable/workflow/lossBound/lossBoundHandle.vue'
import InboundOrderHandle from '@views/flowable/workflow/inboundOrder/InboundOrderHandle.vue'
@@ -189,7 +193,8 @@
    OutBoundOrderHandle,
    EquipmentSealUpApprovalModal,
    InboundOrderHandle,
    EquipmentTransferApprovalModal
    EquipmentTransferApprovalModal,
    EquipmentScrapApprovalModal
  },
  data() {
    return {
@@ -274,7 +279,7 @@
      selectOutBoundOrderData: {},
      selectLossBoundOrderData: {},
      selectStocktakingBoundOrderData: {},
      selectInboundOrderData:{},
      selectInboundOrderData: {},
      //业务信息ID
      dataId: undefined
    }
@@ -372,6 +377,9 @@
          break
        case 'equipment_transfer':
          this.handleEquipmentTransfer(item)
          break
        case 'equipment_scrap':
          this.handleEquipmentScrap(item)
          break
        default:
          alert('没找到该流程')
@@ -511,10 +519,10 @@
    },
    handleToolInStorage(item) {
      if (item && item.dataId) {
          this.selectInboundOrderData = Object.assign({}, item)
          this.$refs.inboundOrderApprovalModal.auditVisible = true
          this.$refs.inboundOrderApprovalModal.clearTableSource()
          this.$refs.inboundOrderApprovalModal.getAllApproveData(item)
        this.selectInboundOrderData = Object.assign({}, item)
        this.$refs.inboundOrderApprovalModal.auditVisible = true
        this.$refs.inboundOrderApprovalModal.clearTableSource()
        this.$refs.inboundOrderApprovalModal.getAllApproveData(item)
      }
    },
    handleEquipmentTransfer(item) {
@@ -523,6 +531,12 @@
      this.$refs.equipmentTransferApprovalModelRef.handleDetail(item)
      this.$refs.equipmentTransferApprovalModelRef.disableSubmit = false
    },
    handleEquipmentScrap(item) {
      this.$refs.equipmentScrapApprovalModelRef.visible = true
      this.$refs.equipmentScrapApprovalModelRef.title = item.name
      this.$refs.equipmentScrapApprovalModelRef.handleDetail(item)
      this.$refs.equipmentScrapApprovalModelRef.disableSubmit = false
    }
  }
}
</script>

 src/views/flowable/workflow/scrap/EquipmentScrapApprovalModal.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,223 @@
<template>
  <j-modal
    :confirmLoading='confirmLoading'
    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
    :title='title'
    :visible='visible'
    :width='800'
    cancelText='关闭'
    centered
    switchFullscreen
    @cancel='handleCancel'
    @ok='handleOk'>

    <a-spin :spinning='spinning'>
      <a-form-model ref='form' :model='model' :rules='validatorRules'>
        <a-divider orientation='center' style='font-size: large;font-style: italic;color: #66aeed;'> æŠ¥åºŸï¼ˆè½¬è®©ï¼‰ä¿¡æ¯
        </a-divider>
        <a-row :gutter='24'>
          <a-col :span='12'>
            <a-form-model-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='单据号' prop='code'>
              <a-input v-model='model.code' disabled />
            </a-form-model-item>
          </a-col>
          <a-col :span='12'>
            <a-form-model-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='设备编码' prop='equipmentId'>
              <lx-search-equipment-select v-model='model.equipmentId'
                                          disabled placeholder='请输入设备编号或名称搜索'></lx-search-equipment-select>
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row :gutter='24'>
          <a-col :span='12'>
            <a-form-model-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='申请人' prop='reportUser_dictText'>
              <a-input v-model='model.reportUser_dictText' disabled />
            </a-form-model-item>
          </a-col>
          <a-col :span='12'>
            <a-form-model-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='处置原因' prop='scrapReason'>
              <a-input v-model='model.scrapReason' disabled />
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row :gutter='24'>
          <a-col :span='12'>
            <a-form-model-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='备注' prop='remark'>
              <a-textarea v-model='model.remark' disabled />
            </a-form-model-item>
          </a-col>
        </a-row>
        <div v-if='approvalDisable'>
          <a-divider orientation='center' style='font-size: large;font-style: italic;color: #66aeed;'> ç®¡ç†å‘˜æŠ¥åºŸï¼ˆè½¬è®©ï¼‰å®¡æ ¸
          </a-divider>
          <a-row :gutter='24'>
            <a-col :span='12'>
              <a-form-model-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='审批类型' prop='approvalDealType'>
                <j-dict-select-tag v-model='model.approvalDealType' :disabled='disableSubmit || initialAcceptanceDisable' dictCode='approved_rejected'
                                   placeholder='请选择处理类型' type='radio' />
              </a-form-model-item>
            </a-col>
            <a-col :span='12'>
              <a-form-model-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='审批意见' prop='approvalComment'>
                <a-textarea v-model='model.approvalComment' :disabled='disableSubmit || returnDisable'
                            placeholder='请输入意见' />
              </a-form-model-item>
            </a-col>
          </a-row>
        </div>
      </a-form-model>
    </a-spin>
  </j-modal>
</template>

<script>
import { getAction, httpAction } from '@/api/manage'
import LxSearchEquipmentSelect from '@views/eam/equipment/modules/LxSearchEquipmentSelect.vue'

export default {
  name: 'EquipmentScrapApprovalModal',
  components: {
    LxSearchEquipmentSelect
  },
  props: {
    selectShenpiData: {
      type: Object
    }
  },
  data() {
    return {
      title: '操作',
      visible: false,
      editable: false,
      model: {},
      treeData: [],
      labelCol: {
        xs: { span: 24 },
        sm: { span: 5 }
      },
      wrapperCol: {
        xs: { span: 24 },
        sm: { span: 18 }
      },
      labelColLong: {
        xs: { span: 24 },
        sm: { span: 2 }
      },
      wrapperColLong: {
        xs: { span: 24 },
        sm: { span: 21 }
      },
      confirmLoading: false,
      spinning: false,
      imageSrc: null,
      validatorRules: {
        approvalDealType: [
          { required: true, message: '请选择通过或驳回!' }
        ],
        unsealApprovalDealType: [
          { required: true, message: '请选择通过或驳回!' }
        ],
        approvalComment: [
          { required: true, message: '请输入审批意见!' }
        ],
        unsealApprovalComment: [
          { required: true, message: '请输入审批意见!' }
        ],
        returnComment: [
          { required: true, message: '请输入归还备注!' }
        ],
        confirmComment: [
          { required: true, message: '请输入确认意见!' }
        ]
      },
      url: {
        queryById: '/eam/eamEquipmentScrap/queryById',
        approval: '/eam/eamEquipmentScrap/approval',
        loadProductionOptions: '/mdc/mdcProduction/loadProductionTreeOptions'
      },
      disableSubmit: false
    }
  },
  created() {
    this.loadAllProductionTree()
  },
  computed: {
    approvalDisable: function() {
      return ['WAIT_CHECK'].includes(this.model.scrapStatus)
    }
  },
  methods: {
    async handleDetail(item) {
      this.initParams()
      this.model = {}
      let res = await getAction(this.url.queryById, { id: item.dataId })
      this.model = Object.assign({}, res.result)
      this.model.dataId = item.dataId
      this.model.taskId = item.id
      this.model.userId = item.assignee
      this.model.instanceId = item.procInstId
      this.model.values = item.variables
      this.spinning = false
    },

    recordDetail(record) {
      console.log('record', record)
      this.initParams()
      this.model = Object.assign({}, record)
    },

    initParams() {
      this.visible = true
      this.spinning = true
    },

    async handleOk() {
      const that = this
      // è§¦å‘表单验证
      this.$refs.form.validate(valid => {
        if (valid) {
          that.confirmLoading = that.spinning = true
          let httpurl = this.url.approval
          let method = 'put'
          httpAction(httpurl, this.model, method).then((res) => {
            if (res.success) {
              that.$message.success(res.message)
              that.$emit('searchReset')
              that.close()
            } else {
              that.$message.warning(res.message)
            }
          }).finally(() => {
            that.confirmLoading = that.spinning = false
          })
        } else {
          return false
        }
      })
    },
    handleCancel() {
      this.close()
    },

    close() {
      this.$emit('close')
      this.visible = false
      this.$refs.form.clearValidate()
    },
    loadAllProductionTree() {
      //加载车间选择树
      getAction(this.url.loadProductionOptions).then(res => {
        if (res.success) {
          this.treeData = [...res.result]
        } else {
          that.$message.warning(res.message)
        }
      })
    }
  }
}
</script>

<style lang='less' scoped>

</style>