1、技术状态鉴定申请功能及流程 2、技术鉴定工单审批中检查明细展示限制条件调整

zhaowei

6 小时以前 dbfa630021b25516dee45ae71b4277bcf4aa6aa4

1、技术状态鉴定申请功能及流程
2、技术鉴定工单审批中检查明细展示限制条件调整

 src/views/eam/equipment/modules/LxSearchEquipmentSelect.vue

@@ -79,6 +79,13 @@
          this.initSelectValue()
        }
      }
    },
    factoryOrgCode:{
      handler(val){
        if(val){
          this.loadData()
        }
      }
    }
  },
  methods: {

 src/views/eam/technical/EamTechnicalStatusEvaluationApplicationList.vue

@@ -1,49 +1,46 @@
<template>
  <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="6" :lg="7" :md="8" :sm="24">
            <a-form-item label="删除标记">
              <a-input placeholder="请输入删除标记" v-model="queryParam.delFlag"></a-input>
          <a-col :xl="5" :lg="6" :md="8" :sm="12">
            <a-form-item label="统一编码">
              <lx-search-equipment-select placeholder="请输入统一编码或名称搜索" v-model="queryParam.equipmentId"/>
            </a-form-item>
          </a-col>
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
          <a-col :xl="4" :lg="6" :md="8" :sm="12">
            <a-form-item label="申请单号">
              <a-input placeholder="请输入申请单号" v-model="queryParam.applicationOrderNum"></a-input>
              <a-input placeholder="请输入申请单号" v-model="queryParam.applicationOrderNum"/>
            </a-form-item>
          </a-col>
        <template v-if="toggleSearchStatus">
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
            <a-form-item label="申请人">
              <a-input placeholder="请输入申请人" v-model="queryParam.applicant"></a-input>
            </a-form-item>
          </a-col>
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
          <a-col :xl="5" :lg="6" :md="8" :sm="12">
            <a-form-item label="申请部门">
              <a-input placeholder="请输入申请部门" v-model="queryParam.factoryOrgCode"></a-input>
              <a-tree-select v-model="queryParam.factoryOrgCode" style="width: 100%" :tree-data="productionTreeData"
                             show-search :replaceFields="{key:'orgCode',value:'orgCode'}"
                             treeNodeFilterProp="title" searchPlaceholder="请输入关键字搜索"
                             :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }" placeholder="请选择申请部门"
                             allow-clear tree-default-expand-all>
              </a-tree-select>
            </a-form-item>
          </a-col>
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
          <a-col :xl="5" :lg="6" :md="8" :sm="12">
            <a-form-item label="申请日期">
              <a-input placeholder="请输入申请日期" v-model="queryParam.applyDate"></a-input>
              <a-range-picker v-model="queryParam.applyDate" value-format="YYYY-MM-DD" @change="handleDateRangeChange"/>
            </a-form-item>
          </a-col>
          </template>
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
          <a-col :xl="5" :lg="6" :md="8" :sm="12">
            <a-form-item label="申请单状态">
              <j-dict-select-tag v-model="queryParam.applicationStatus" placeholder="请选择申请单状态"
                                 dict-code="technical_status_evaluation_application_status"/>
            </a-form-item>
          </a-col>
          <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 type="info" @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>
            </span>
          </a-col>

        </a-row>
      </a-form>
    </div>
@@ -51,195 +48,268 @@
    <!-- æ“ä½œæŒ‰é’®åŒºåŸŸ -->
    <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>
        </a-menu>
        <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>

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

        <span slot="action" slot-scope="text, record">
          <a @click="handleEdit(record)">编辑</a>
          <template v-if="record.applicationStatus=='WAIT_SUBMIT'">
          <a @click.stop="handleEdit(record)">编辑</a>

          <a-divider type="vertical" />
          <a-dropdown>
            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
            <a-menu slot="overlay">
              <a-menu-item>
                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
                  <a>删除</a>
                </a-popconfirm>
              </a-menu-item>
            </a-menu>
          </a-dropdown>
          <a-divider type="vertical"/>

          <a-popconfirm title="确定提交吗？" @confirm="handleSubmit(record.id)">
             <a @click="e=>e.stopPropagation()">提交</a>
          </a-popconfirm>

          <a-divider type="vertical"/>

          <a-popconfirm title="确定作废吗？" @confirm="handleAbolish(record.id)">
            <a @click="e=>e.stopPropagation()">作废</a>
          </a-popconfirm>
          </template>

          <a @click.stop="handleDetail(record)"
             v-if="record.applicationStatus!='WAIT_SUBMIT'&&record.applicationStatus!='ABOLISH'">详情</a>
        </span>

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

    <!-- è¡¨å•åŒºåŸŸ -->
    <eamTechnicalStatusEvaluationApplication-modal ref="modalForm" @ok="modalFormOk"></eamTechnicalStatusEvaluationApplication-modal>
    <eamTechnicalStatusEvaluationApplication-modal ref="modalForm" @ok="modalFormOk"
                                                   :productionTreeData="productionTreeData"/>

    <technical-status-evaluation-application-approval-modal ref="technicalStatusEvaluationApplicationApprovalModal"
                                                            :selectShenpiData="selectedRowData"/>
  </a-card>
</template>

<script>
  import '@/assets/less/TableExpand.less'
  import EamTechnicalStatusEvaluationApplicationModal from './modules/EamTechnicalStatusEvaluationApplicationModal'
  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
  import LxSearchEquipmentSelect from '../equipment/modules/LxSearchEquipmentSelect'
  import { getAction } from '@/api/manage'
  import TechnicalStatusEvaluationApplicationApprovalModal
    from '../../flowable/workflow/TechnicalStatusEvaluation/TechnicalStatusEvaluationApplicationApprovalModal'

  export default {
    name: "EamTechnicalStatusEvaluationApplicationList",
    mixins:[JeecgListMixin],
    name: 'EamTechnicalStatusEvaluationApplicationList',
    mixins: [JeecgListMixin],
    components: {
      TechnicalStatusEvaluationApplicationApprovalModal,
      LxSearchEquipmentSelect,
      EamTechnicalStatusEvaluationApplicationModal
    },
    data () {
    data() {
      return {
        description: '加工设备技术鉴定申请管理页面',
        productionTreeData: [],
        selectedRowData: {},
        // è¡¨å¤´
        columns: [
          {
            title: '#',
            dataIndex: '',
            key:'rowIndex',
            width:60,
            align:"center",
            customRender:function (t,r,index) {
              return parseInt(index)+1;
            }
           },
           {
            title: '删除标记',
            align:"center",
            dataIndex: 'delFlag'
           },
           {
            key: 'rowIndex',
            width: 60,
            align: 'center',
            customRender: function(t, r, index) {
              return parseInt(index) + 1
            },
            fixed: 'left'
          },
          {
            title: '统一编码',
            align: 'center',
            dataIndex: 'equipmentCode',
            fixed: 'left'
          },
          {
            title: '设备名称',
            align: 'center',
            dataIndex: 'equipmentName',
            fixed: 'left'
          },
          {
            title: '设备型号',
            align: 'center',
            dataIndex: 'equipmentModel',
            fixed: 'left'
          },
          {
            title: '申请单状态',
            align: 'center',
            dataIndex: 'applicationStatus_dictText',
            fixed: 'left'
          },
          {
            title: '申请单号',
            align:"center",
            align: 'center',
            dataIndex: 'applicationOrderNum'
           },
           {
          },
          {
            title: '申请人',
            align:"center",
            dataIndex: 'applicant'
           },
           {
            align: 'center',
            dataIndex: 'applicant_dictText'
          },
          {
            title: '申请部门',
            align:"center",
            dataIndex: 'factoryOrgCode'
           },
           {
            align: 'center',
            dataIndex: 'factoryOrgCode_dictText'
          },
          {
            title: '申请日期',
            align:"center",
            align: 'center',
            dataIndex: 'applyDate'
           },
           {
            title: '申请单状态;待提交、待单位室级领导审核、生产设备管理主管审核、待保障部领导审核、已作废、已完成',
            align:"center",
            dataIndex: 'applicationStatus'
           },
           {
          },
          {
            title: '技术状态鉴定日期',
            align: 'center',
            dataIndex: 'evaluationDate'
          },
          {
            title: '申请单位室级领导签字',
            align:"center",
            dataIndex: 'departHeaderSignature'
           },
           {
            align: 'center',
            dataIndex: 'departHeaderSignature_dictText'
          },
          {
            title: '申请单位室级领导签字时间',
            align:"center",
            align: 'center',
            dataIndex: 'departHeaderSignatureTime'
           },
           {
            title: '申请单位室级领导意见',
            align:"center",
            dataIndex: 'departHeaderComment'
           },
           {
          },
          {
            title: '生产设备管理主管签字',
            align:"center",
            dataIndex: 'productionHeaderSignature'
           },
           {
            title: '生产设备管理主管签字四件',
            align:"center",
            align: 'center',
            dataIndex: 'productionHeaderSignature_dictText'
          },
          {
            title: '生产设备管理主管签字时间',
            align: 'center',
            dataIndex: 'productionHeaderSignatureTime'
           },
           {
            title: '生产设备管理主管意见',
            align:"center",
            dataIndex: 'productionHeaderComment'
           },
           {
          },
          {
            title: '生产保障部领导签字',
            align:"center",
            dataIndex: 'productionSupportSignature'
           },
           {
            align: 'center',
            dataIndex: 'productionSupportSignature_dictText'
          },
          {
            title: '生产保障部领导签字时间',
            align:"center",
            align: 'center',
            dataIndex: 'productionSupportSignatureTime'
           },
           {
            title: '生产保障部领导意见',
            align:"center",
            dataIndex: 'productionSupportComment'
           },
           {
          },
          {
            title: 'HF编码',
            align:"center",
            align: 'center',
            dataIndex: 'hfCode'
           },
          },
          {
            title: '操作',
            dataIndex: 'action',
            align:"center",
            align: 'center',
            scopedSlots: { customRender: 'action' },
            fixed: 'right',
            width: 200
          }
        ],
        url: {
          list: "/eam/eamTechnicalStatusEvaluationApplication/list",
          delete: "/eam/eamTechnicalStatusEvaluationApplication/delete",
          deleteBatch: "/eam/eamTechnicalStatusEvaluationApplication/deleteBatch",
          exportXlsUrl: "eam/eamTechnicalStatusEvaluationApplication/exportXls",
          importExcelUrl: "eam/eamTechnicalStatusEvaluationApplication/importExcel",
       },
    }
  },
  computed: {
    importExcelUrl: function(){
      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
    }
  },
        url: {
          list: '/eam/eamTechnicalStatusEvaluationApplication/list',
          submit: '/eam/eamTechnicalStatusEvaluationApplication/submit',
          abolish: '/eam/eamTechnicalStatusEvaluationApplication/abolish',
          getProductionTreeList: '/eam/BaseFactory/queryTreeList'
        }
      }
    },
    created() {
      this.getProductionTreeDataByApi()
    },
    methods: {
     
      // èŽ·å–申请部门树
      getProductionTreeDataByApi() {
        getAction(this.url.getProductionTreeList)
          .then(res => {
            if (res.success) {
              this.productionTreeData = res.result
            } else {
              this.$notification.warning({
                message: '消息',
                description: res.message
              })
            }
          })
      },

      /**
       * æäº¤æ—¶è§¦å‘
       * @param id
       */
      handleSubmit(id) {
        const that = this
        that.loading = true
        getAction(this.url.submit, { id })
          .then(res => {
            if (res.success) {
              that.$notification.success({
                message: '消息',
                description: res.message
              })
              that.loadData()
            } else {
              that.$notification.warning({
                message: '消息',
                description: res.message
              })
              that.loading = false
            }
          })
      },

      /**
       * ä½œåºŸæ—¶è§¦å‘
       * @param id
       */
      handleAbolish(id) {
        const that = this
        that.loading = true
        getAction(this.url.abolish, { id })
          .then(res => {
            if (res.success) {
              that.$notification.success({
                message: '消息',
                description: res.message
              })
              that.loadData()
            } else {
              that.$notification.warning({
                message: '消息',
                description: res.message
              })
              that.loading = false
            }
          })
      },

      /**
       * ç‚¹å‡»è¯¦æƒ…时触发时触发
       * @param record
       */
      handleDetail(record) {
        this.selectedRowData = Object.assign({}, record)
        this.$refs.technicalStatusEvaluationApplicationApprovalModal.title = '详情'
        this.$refs.technicalStatusEvaluationApplicationApprovalModal.disableSubmit = true
        this.$refs.technicalStatusEvaluationApplicationApprovalModal.visible = true
        this.$refs.technicalStatusEvaluationApplicationApprovalModal.handleDetail(record)
      },

      /**
       * ç”³è¯·æ—¥æœŸå€¼å‘生改变时触发
       * @param dateStringArray
       */
      handleDateRangeChange(dateStringArray) {
        this.queryParam.dateBegin = dateStringArray[0]
        this.queryParam.dateEnd = dateStringArray[1]
      }
    }
  }
</script>
<style scoped>
  @import '~@assets/less/common.less';
</style>
</script>

 src/views/eam/technical/modules/EamTechnicalStatusEvaluationApplicationModal.vue

@@ -1,66 +1,30 @@
<template>
  <j-modal
    :title="title"
    :width="800"
    :visible="visible"
    :confirmLoading="confirmLoading"
    switchFullscreen
    @ok="handleOk"
    @cancel="handleCancel"
    cancelText="关闭">
    
  <j-modal :title="title" :width="800" :visible="visible" :confirmLoading="confirmLoading" switchFullscreen
           @ok="handleOk" @cancel="handleCancel" cancelText="关闭">
    <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-form-model ref="form" :model="model" :rules="validatorRules" :labelCol="labelCol" :wrapperCol="wrapperCol">
        <a-form-model-item prop="factoryOrgCode" label="申请部门">
          <a-tree-select v-model="model.factoryOrgCode" style="width: 100%" :tree-data="productionTreeData"
                         :disabled="!editable"
                         show-search :replaceFields="{key:'orgCode',value:'orgCode'}"
                         @change="()=>delete model.equipmentId"
                         treeNodeFilterProp="title" searchPlaceholder="请输入关键字搜索"
                         :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }" placeholder="请选择申请部门"
                         :allow-clear="false" tree-default-expand-all/>
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="applicationOrderNum" label="申请单号">
          <a-input placeholder="请输入申请单号" v-model="model.applicationOrderNum" />
        <a-form-model-item prop="equipmentId" label="统一编码">
          <lx-search-equipment-select :disabled="!editable||!model.factoryOrgCode"
                                      :placeholder="!model.factoryOrgCode?'请选择申请部门':'请输入统一编码或名称搜索'"
                                      v-model="model.equipmentId" :allow-clear="false"
                                      :factoryOrgCode="model.factoryOrgCode"/>
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="applicant" label="申请人">
          <a-input placeholder="请输入申请人" v-model="model.applicant" />
        <a-form-model-item prop="evaluationDate" label="技术状态鉴定日期">
          <a-date-picker value-format="YYYY-MM-DD" v-model="model.evaluationDate" :allow-clear="false"
                         style="width: 100%"/>
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="factoryOrgCode" label="申请部门">
          <a-input placeholder="请输入申请部门" v-model="model.factoryOrgCode" />
        <a-form-model-item label="备注">
          <a-textarea placeholder="请输入备注" v-model="model.remark"/>
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="applyDate" label="申请日期">
          <a-input placeholder="请输入申请日期" v-model="model.applyDate" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="applicationStatus" label="申请单状态;待提交、待单位室级领导审核、生产设备管理主管审核、待保障部领导审核、已作废、已完成">
          <a-input placeholder="请输入申请单状态;待提交、待单位室级领导审核、生产设备管理主管审核、待保障部领导审核、已作废、已完成" v-model="model.applicationStatus" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="departHeaderSignature" label="申请单位室级领导签字">
          <a-input placeholder="请输入申请单位室级领导签字" v-model="model.departHeaderSignature" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="departHeaderSignatureTime" label="申请单位室级领导签字时间">
          <a-input placeholder="请输入申请单位室级领导签字时间" v-model="model.departHeaderSignatureTime" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="departHeaderComment" label="申请单位室级领导意见">
          <a-input placeholder="请输入申请单位室级领导意见" v-model="model.departHeaderComment" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="productionHeaderSignature" label="生产设备管理主管签字">
          <a-input placeholder="请输入生产设备管理主管签字" v-model="model.productionHeaderSignature" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="productionHeaderSignatureTime" label="生产设备管理主管签字四件">
          <a-input placeholder="请输入生产设备管理主管签字四件" v-model="model.productionHeaderSignatureTime" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="productionHeaderComment" label="生产设备管理主管意见">
          <a-input placeholder="请输入生产设备管理主管意见" v-model="model.productionHeaderComment" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="productionSupportSignature" label="生产保障部领导签字">
          <a-input placeholder="请输入生产保障部领导签字" v-model="model.productionSupportSignature" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="productionSupportSignatureTime" label="生产保障部领导签字时间">
          <a-input placeholder="请输入生产保障部领导签字时间" v-model="model.productionSupportSignatureTime" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="productionSupportComment" label="生产保障部领导意见">
          <a-input placeholder="请输入生产保障部领导意见" v-model="model.productionSupportComment" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="hfCode" label="HF编码">
          <a-input placeholder="请输入HF编码" v-model="model.hfCode" />
        </a-form-model-item>
		
      </a-form-model>
    </a-spin>
  </j-modal>
@@ -68,89 +32,103 @@

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

  export default {
    name: "EamTechnicalStatusEvaluationApplicationModal",
    data () {
    name: 'EamTechnicalStatusEvaluationApplicationModal',
    components: { LxSearchEquipmentSelect },
    props: {
      productionTreeData: {
        type: Array
      }
    },
    data() {
      return {
        title:"操作",
        title: '操作',
        editable: true,
        visible: false,
        model: {},
        labelCol: {
          xs: { span: 24 },
          sm: { span: 5 },
          sm: { span: 5 }
        },
        wrapperCol: {
          xs: { span: 24 },
          sm: { span: 16 },
          sm: { span: 16 }
        },

        confirmLoading: false,
        validatorRules:{
        validatorRules: {
          factoryOrgCode: [{ required: true, message: '请选择申请部门', trigger: 'change' }],
          equipmentId: [{ required: true, message: '请输入统一编码或名称搜索', trigger: 'change' }],
          evaluationDate: [{ required: true, message: '请选择技术状态鉴定日期', trigger: 'change' }]
        },
        url: {
          add: "/eam/eamTechnicalStatusEvaluationApplication/add",
          edit: "/eam/eamTechnicalStatusEvaluationApplication/edit",
        },
          add: '/eam/eamTechnicalStatusEvaluationApplication/add',
          edit: '/eam/eamTechnicalStatusEvaluationApplication/edit'
        }
      }
    },
    created () {
    },
    methods: {
      add () {
        //初始化默认值
        this.edit({});
      add() {
        this.model = {}
        this.editable = true
        this.visible = true
      },
      edit (record) {
        this.model = Object.assign({}, record);
        this.visible = true;

      edit(record) {
        this.model = Object.assign({}, record)
        this.editable = false
        this.visible = true
      },
      close () {
        this.$emit('close');
        this.visible = false;
        this.$refs.form.clearValidate();
      },
      handleOk () {
        const that = this;

      handleOk() {
        const that = this
        // è§¦å‘表单验证
         this.$refs.form.validate(valid => {
        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';
            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);
            httpAction(httpurl, this.model, method).then((res) => {
              if (res.success) {
                that.$notification.success({
                  message: '消息',
                  description: res.message
                })
                that.close()
                that.$emit('ok')
              } else {
                that.$notification.warning({
                  message: '消息',
                  description: res.message
                })
              }
            }).finally(() => {
              that.confirmLoading = false;
              that.close();
              that.confirmLoading = false
            })
          }else{
             return false;
          } else {
            return false
          }
        })
      },
      handleCancel () {

      handleCancel() {
        this.close()
      },


      close() {
        this.$emit('close')
        this.visible = false
        this.$refs.form.clearValidate()
      }
    }
  }
</script>

<style lang="less" scoped>

</style>
</script>

 src/views/flowable/workflow/FlowTodo.vue

@@ -110,6 +110,11 @@
    <!--技术状态变更-->
    <technical-status-change-approval-modal ref="technicalStatusChangeApprovalModal" :selectShenpiData="selectedRowData"
                                            @modalFormOk="modalFormOk"/>

    <!--技术状态鉴定申请-->
    <technical-status-evaluation-application-approval-modal ref="technicalStatusEvaluationApplicationApprovalModal"
                                                            :selectShenpiData="selectedRowData"
                                                            @modalFormOk="modalFormOk"/>
  </a-card>
</template>

@@ -126,11 +131,14 @@
    from './TechnicalStatusEvaluation/TechnicalStatusEvaluationOrderChangeApprovalModal'
  import RepairOrderApprovalModal from './repairOrder/RepairOrderApprovalModal'
  import TechnicalStatusChangeApprovalModal from './TechnicalStatus/TechnicalStatusChangeApprovalModal'
  import TechnicalStatusEvaluationApplicationApprovalModal
    from './TechnicalStatusEvaluation/TechnicalStatusEvaluationApplicationApprovalModal'

  export default {
    name: 'FlowTodo',
    mixins: [JeecgListMixin],
    components: {
      TechnicalStatusEvaluationApplicationApprovalModal,
      TechnicalStatusChangeApprovalModal,
      RepairOrderApprovalModal,
      TechnicalStatusEvaluationOrderChangeApprovalModal,
@@ -245,6 +253,9 @@
          case 'TECHNICAL_STATUS_CHANGE_PROCESS':
            this.handleTechnicalStatusChange(record)
            break
          case 'TECHNICAL_STATUS_EVALUATION_APPLY_PROCESS':
            this.handleTechnicalStatusEvaluationApply(record)
            break
          default:
            alert('没找到该流程')
        }
@@ -335,6 +346,17 @@
        this.$refs.technicalStatusChangeApprovalModal.handleApprove(record)
      },

      /**
       * ç‚¹å‡»æŠ€æœ¯çŠ¶æ€é‰´å®šç”³è¯·åˆ†ç±»æµç¨‹å®¡æ‰¹æ—¶è§¦å‘
       * @param record
       */
      handleTechnicalStatusEvaluationApply(record) {
        this.selectedRowData = Object.assign({}, record)
        this.$refs.technicalStatusEvaluationApplicationApprovalModal.visible = true
        this.$refs.technicalStatusEvaluationApplicationApprovalModal.title = record.name
        this.$refs.technicalStatusEvaluationApplicationApprovalModal.handleApprove(record)
      },

      batchHandle() {
        const categorySet = new Set(this.selectionRows.map(item => item.category))
        const nameSet = new Set(this.selectionRows.map(item => item.name))

 src/views/flowable/workflow/TechnicalStatusEvaluation/TechnicalStatusEvaluationApplicationApprovalModal.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,353 @@
<template>
  <j-modal :title="title" :width="1300" :fullscreen="fullScreen" :visible="visible" :confirmLoading="confirmLoading"
           :okButtonProps="{ class:{'jee-hidden': disableSubmit} }" @ok="handleOk"
           @cancel="handleCancel" cancelText="关闭">
    <a-spin :spinning="spinning">
      <a-form-model ref="form" :model="model" :rules="validatorRules" :labelCol="labelCol" :wrapperCol="wrapperCol">
        <a-row id="outer-row" :gutter="24">
          <!--左侧基础信息列-->
          <a-col :span="!disableSubmit?8:14" class="scroll-col">
            <a-tabs>
              <a-tab-pane tab="基础信息">
                <a-row>
                  <a-col :span="12">
                    <a-form-model-item label="申请单号">
                      <a-input v-model="model.applicationOrderNum" readOnly/>
                    </a-form-model-item>
                  </a-col>
                  <a-col :span="12">
                    <a-form-model-item label="统一编码">
                      <technical-status-equipment-select v-model="model.equipmentId"
                                                         @autocompleteForm="autocompleteForm" disabled/>
                    </a-form-model-item>
                  </a-col>
                </a-row>

                <a-row>


                </a-row>

                <a-row>
                  <a-col :span="12">
                    <a-form-model-item label="申请部门">
                      <a-input v-model="model.factoryOrgCode_dictText" readOnly/>
                    </a-form-model-item>
                  </a-col>
                  <a-col :span="12">
                    <a-form-model-item label="申请人">
                      <a-input v-model="model.applicant_dictText" readOnly/>
                    </a-form-model-item>
                  </a-col>
                </a-row>

                <a-row>
                  <a-col :span="12">
                    <a-form-model-item label="技术状态鉴定日期">
                      <a-input v-model="model.evaluationDate" readOnly/>
                    </a-form-model-item>
                  </a-col>
                </a-row>

                <a-row>
                  <a-form-model-item :labelCol="labelColLong" :wrapperCol="wrapperColLong" label="备注">
                    <a-textarea v-model="model.remark" readOnly/>
                  </a-form-model-item>
                </a-row>
              </a-tab-pane>
            </a-tabs>
          </a-col>

          <!-- ä¸­é—´æ˜Žç»†é¡¹åˆ—-->
          <a-col v-if="selectShenpiData.procInstId" :span="10" class="scroll-col">
            <a-tabs>
              <a-tab-pane key='1' tab='流程图'>
                <img :src="imageSrc" alt="Fetched Image" style="width: 100%" v-if="imageSrc"/>
              </a-tab-pane>
            </a-tabs>
          </a-col>

          <!--右侧审批列-->
          <a-col :span="!disableSubmit?6:10" class="scroll-col">
            <a-tabs v-if="displayDepartHeaderFlag">
              <a-tab-pane tab="使用单位室级领导确认">
                <a-row>
                  <a-col :span="24">
                    <a-form-model-item prop="departHeaderSignatureResult" label="确认类型" :labelCol="rightColLabelCol"
                                       :wrapperCol="rightColWrapperCol">
                      <j-dict-select-tag type='radio' v-model='model.departHeaderSignatureResult'
                                         dictCode='approve_reject'
                                         :disabled="disableSubmit||(model.applicationStatus&&model.applicationStatus!='DEPART_HEADER_SIGNING')"/>
                    </a-form-model-item>
                  </a-col>
                  <a-col :span="24">
                    <a-form-model-item label="确认意见" :labelCol="rightColLabelCol" :wrapperCol="rightColWrapperCol">
                      <a-textarea placeholder="请输入意见" v-model="model.departHeaderComment"
                                  :disabled="disableSubmit||(model.applicationStatus&&model.applicationStatus!='DEPART_HEADER_SIGNING')"/>
                    </a-form-model-item>
                  </a-col>
                </a-row>
              </a-tab-pane>
            </a-tabs>

            <a-tabs v-if="displayProductionHeaderFlag">
              <a-tab-pane tab="生产设备管理主管确认">
                <a-row>
                  <a-col :span="24">
                    <a-form-model-item prop="productionHeaderSignatureResult" label="确认类型" :labelCol="rightColLabelCol"
                                       :wrapperCol="rightColWrapperCol">
                      <j-dict-select-tag type='radio' v-model='model.productionHeaderSignatureResult'
                                         dictCode='approve_reject'
                                         :disabled="disableSubmit||(model.applicationStatus&&model.applicationStatus!='PRODUCTION_HEADER_SIGNING')"/>
                    </a-form-model-item>
                  </a-col>
                  <a-col :span="24">
                    <a-form-model-item label="确认意见" :labelCol="rightColLabelCol" :wrapperCol="rightColWrapperCol">
                      <a-textarea placeholder="请输入意见" v-model="model.productionHeaderComment"
                                  :disabled="disableSubmit||(model.applicationStatus&&model.applicationStatus!='PRODUCTION_HEADER_SIGNING')"/>
                    </a-form-model-item>
                  </a-col>
                </a-row>
              </a-tab-pane>
            </a-tabs>

            <a-tabs v-if="displayProductionSupportFlag">
              <a-tab-pane tab="生产保障部领导确认">
                <a-row>
                  <a-col :span="24">
                    <a-form-model-item prop="productionSupportSignatureResult" label="确认类型"
                                       :labelCol="rightColLabelCol" :wrapperCol="rightColWrapperCol">
                      <j-dict-select-tag type='radio' v-model='model.productionSupportSignatureResult'
                                         dictCode='approve_reject'
                                         :disabled="disableSubmit||(model.applicationStatus&&model.applicationStatus!='PRODUCTION_SUPPORT_SIGNING')"/>
                    </a-form-model-item>
                  </a-col>
                  <a-col :span="24">
                    <a-form-model-item label="确认意见" :labelCol="rightColLabelCol" :wrapperCol="rightColWrapperCol">
                      <a-textarea placeholder="请输入意见" v-model="model.productionSupportComment"
                                  :disabled="disableSubmit||(model.applicationStatus&&model.applicationStatus!='PRODUCTION_SUPPORT_SIGNING')"/>
                    </a-form-model-item>
                  </a-col>
                </a-row>
              </a-tab-pane>
            </a-tabs>
          </a-col>
        </a-row>
      </a-form-model>
    </a-spin>
  </j-modal>
</template>

<script>
  import { downFile, getAction, postAction } from '@/api/manage'
  import TechnicalStatusEquipmentSelect from '../../../eam/equipment/modules/TechnicalStatusEquipmentSelect'

  export default {
    name: 'TechnicalStatusEvaluationApplicationApprovalModal',
    components: {
      TechnicalStatusEquipmentSelect
    },
    props: {
      selectShenpiData: {
        type: Object
      }
    },
    data() {
      return {
        title: '操作',
        visible: false,
        model: {},
        labelCol: {
          xs: { span: 24 },
          sm: { span: 10 }
        },
        wrapperCol: {
          xs: { span: 24 },
          sm: { span: 14 }
        },
        labelColLong: {
          xs: { span: 24 },
          sm: { span: 5 }
        },
        wrapperColLong: {
          xs: { span: 24 },
          sm: { span: 19 }
        },
        rightColLabelCol: {
          xs: { span: 24 },
          sm: { span: 6 }
        },
        rightColWrapperCol: {
          xs: { span: 24 },
          sm: { span: 16 }
        },
        confirmLoading: false,
        spinning: false,
        imageSrc: null,
        fullScreen: true,
        validatorRules: {
          departHeaderSignatureResult: [{ required: true, message: '请选择确认类型' }],
          productionHeaderSignatureResult: [{ required: true, message: '请选择确认类型' }],
          productionSupportSignatureResult: [{ required: true, message: '请选择确认类型' }]
        },
        url: {
          queryById: '/eam/eamTechnicalStatusEvaluationApplication/queryById',
          approval: '/eam/eamTechnicalStatusEvaluationApplication/approval',
          diagramView: '/assign/flow/diagramView'
        },
        disableSubmit: false,
        selectedRowKeys: []
      }
    },
    computed: {
      displayDepartHeaderFlag() {
        return this.model.applicationStatus && ['DEPART_HEADER_SIGNING', 'PRODUCTION_HEADER_SIGNING', 'PRODUCTION_SUPPORT_SIGNING', 'COMPLETED'].includes(this.model.applicationStatus)
      },
      displayProductionHeaderFlag() {
        return this.model.applicationStatus && ['PRODUCTION_HEADER_SIGNING', 'PRODUCTION_SUPPORT_SIGNING', 'COMPLETED'].includes(this.model.applicationStatus)
      },
      displayProductionSupportFlag() {
        return this.model.applicationStatus && ['PRODUCTION_SUPPORT_SIGNING', 'COMPLETED'].includes(this.model.applicationStatus)
      }
    },
    methods: {
      /**
       * ä¸»é¡µé¢ç‚¹å‡»æ‰§è¡Œå®¡æ‰¹æ—¶è§¦å‘
       * @param record ä¸»é¡µé¢åˆ—表行记录
       */
      handleApprove(record) {
        this.fullScreen = true
        this.model = {}
        this.getBasicInformationByApi(record)
        this.getFlowChartImageByApi(record)
      },

      /**
       * ä¸»é¡µé¢ç‚¹å‡»è¯¦æƒ…时触发
       * @param record ä¸»é¡µé¢åˆ—表行记录
       */
      handleDetail(record) {
        this.fullScreen = false
        this.model = Object.assign({}, record)
      },

      /**
       * èŽ·å–基础信息
       * @param record ä¸»é¡µé¢åˆ—表行记录
       */
      getBasicInformationByApi(record) {
        this.spinning = true
        const that = this
        getAction(this.url.queryById, { id: record.dataId })
          .then(res => {
            if (res.success) {
              that.model = Object.assign({}, res.result)
              that.model.dataId = record.dataId
              that.model.taskId = record.id
              that.model.userId = record.assignee
              that.model.instanceId = record.procInstId
            }
            else {
              that.$notification.warning({
                message: '消息',
                description: res.message
              })
            }
          })
      },

      /**
       * èŽ·å–流程图
       * @param record ä¸»é¡µé¢åˆ—表行记录
       */
      getFlowChartImageByApi(record) {
        const { processDefinitionId, processInstanceId, processDefinitionKey } = record
        this.imageSrc = null
        downFile(this.url.diagramView, {
          processDefinitionId,
          processInstanceId,
          TaskDefinitionKey: processDefinitionKey
        }, 'get')
          .then((res => {
            this.imageSrc = window.URL.createObjectURL(new Blob([res]))
          }))
          .catch(err => {
            this.$notification.error({
              message: '消息',
              description: err.message
            })
          })
      },

      async handleOk() {
        const that = this
        // è§¦å‘表单验证
        this.$refs.form.validate(valid => {
          if (valid) {
            that.confirmLoading = that.spinning = true

            postAction(this.url.approval, this.model)
              .then((res) => {
                if (res.success) {
                  that.$notification.success({
                    message: '消息',
                    description: res.message
                  })
                  that.$emit('modalFormOk')
                  that.close()
                } else {
                  that.$notification.warning({
                    message: '消息',
                    description: res.message
                  })
                }
              })
              .finally(() => {
                that.confirmLoading = that.spinning = false
              })
          } else {
            return false
          }
        })
      },

      autocompleteForm(selectObj) {
        this.$set(this.model, 'equipmentId', selectObj.equipmentId)
        this.spinning = false
      },

      handleCancel() {
        this.close()
      },

      close() {
        this.$emit('close')
        this.visible = false
        this.$refs.form.clearValidate()
      }
    }
  }
</script>

<style scoped lang="less">
  /deep/ .ant-spin-nested-loading {
    height: 100%;

    .ant-spin-container {
      height: 100%;

      .ant-form {
        height: 100%;

        #outer-row {
          height: 100%;

          .scroll-col {
            height: 100%;
            overflow: auto;
          }
        }
      }
    }
  }
</style>

 src/views/flowable/workflow/TechnicalStatusEvaluation/TechnicalStatusEvaluationApprovalModal.vue

@@ -53,9 +53,9 @@

            <a-tabs :active-key="activeTabKey" @change="handleTabChange">
              <a-tab-pane :key="1" tab="安全装置检查" forceRender
                          v-if="disableSubmit||
                          selectShenpiData.taskDefKey&&(selectShenpiData.taskDefKey=='safety_equipment_check'||selectShenpiData.taskDefKey=='safety_equipment_check_confirm')||
                          model.evaluationStatus&&model.evaluationStatus!='UNDER_EVALUATION'&&detail.safetyEquipmentCheckList.length>0">
                          v-if="(disableSubmit&&detail.safetyEquipmentCheckList.length>0)||
                          (selectShenpiData.taskDefKey&&(selectShenpiData.taskDefKey=='safety_equipment_check'||selectShenpiData.taskDefKey=='safety_equipment_check_confirm'))||
                          (model.evaluationStatus&&model.evaluationStatus!='UNDER_EVALUATION'&&model.evaluationStatus!='WAIT_EVALUATION')">
                <j-vxe-table ref="editableDetailTable1" rowNumber bordered alwaysEdit keep-source
                             :dataSource="detail.safetyEquipmentCheckList"
                             :columns="detail.safetyEquipmentCheckColumns">
@@ -93,9 +93,9 @@
              </a-tab-pane>

              <a-tab-pane :key="2" tab="设备精度检查" forceRender
                          v-if="disableSubmit||
                          selectShenpiData.taskDefKey&&(selectShenpiData.taskDefKey=='equipment_precision_check'||selectShenpiData.taskDefKey=='equipment_precision_check_confirm')||
                          model.evaluationStatus&&model.evaluationStatus!='UNDER_EVALUATION'&&detail.precisionCheckList.length>0">
                          v-if="(disableSubmit&&detail.precisionCheckList.length>0)||
                          (selectShenpiData.taskDefKey&&(selectShenpiData.taskDefKey=='equipment_precision_check'||selectShenpiData.taskDefKey=='equipment_precision_check_confirm'))||
                         (model.evaluationStatus&&model.evaluationStatus!='UNDER_EVALUATION'&&model.evaluationStatus!='WAIT_EVALUATION')">
                <j-vxe-table ref="editableDetailTable2" rowNumber bordered
                             alwaysEdit keep-source
                             :dataSource="detail.precisionCheckList" :columns="detail.precisionCheckColumns">
@@ -132,9 +132,9 @@
              </a-tab-pane>

              <a-tab-pane :key="3" tab="其他检查" forceRender
                          v-if="disableSubmit||
                          selectShenpiData.taskDefKey&&(selectShenpiData.taskDefKey=='other_check'||selectShenpiData.taskDefKey=='other_check_confirm')||
                          model.evaluationStatus&&model.evaluationStatus!='UNDER_EVALUATION'&&detail.otherCheckList.length>0">
                          v-if="(disableSubmit&&detail.otherCheckList.length>0)||
                          (selectShenpiData.taskDefKey&&(selectShenpiData.taskDefKey=='other_check'||selectShenpiData.taskDefKey=='other_check_confirm'))||
                          (model.evaluationStatus&&model.evaluationStatus!='UNDER_EVALUATION'&&model.evaluationStatus!='WAIT_EVALUATION')">
                <j-vxe-table ref="editableDetailTable3" rowNumber bordered
                             alwaysEdit keep-source
                             :dataSource="detail.otherCheckList" :columns="detail.otherCheckColumns">
@@ -323,7 +323,7 @@
    name: 'TechnicalStatusEvaluationApprovalModal',
    mixins: [JVxeTableModelMixin],
    components: {
      TechnicalStatusEquipmentSelect,
      TechnicalStatusEquipmentSelect
    },
    props: {
      selectShenpiData: {