技术状态变更及流程

zhaowei

15 小时以前 6c86748e1a987865cbf5bafa9b122c76bd24a695

技术状态变更及流程

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

@@ -47,6 +47,11 @@
      type:Boolean,
      default:()=>true,
      required:false
    },
    factoryOrgCode:{
      type:String,
      default:'',
      required:false
    }
  },
  data() {
@@ -80,7 +85,7 @@
    initSelectValue() {
      if(!this.selectedAsyncValue || !this.selectedAsyncValue.key || this.selectedAsyncValue.key!=this.value){
        console.log("这才请求后台")
        getAction(`/eam/equipment/asyncLoadEquipment`, { id: this.value }).then(res=>{
        getAction(`/eam/equipment/asyncLoadEquipment`, { id: this.value,factoryOrgCode:this.factoryOrgCode }).then(res=>{
          if(res.success){
            if(res.result && res.result.length > 0){
              let obj = {
@@ -101,7 +106,7 @@
      this.options = []
      this.loading = true
      // å­—å…¸code格式：table,text,code
      getAction(`/eam/equipment/asyncLoadEquipment`, { keyword: value, pageSize: this.pageSize }).then(res => {
      getAction(`/eam/equipment/asyncLoadEquipment`, { keyword: value, pageSize: this.pageSize,factoryOrgCode:this.factoryOrgCode }).then(res => {
        this.loading = false
        if (res.success) {
          if (currentLoad != this.lastLoad) {
@@ -119,7 +124,7 @@
    initDictData() {
      //异步一开始也加载一点数据
      this.loading = true
      getAction(`/eam/equipment/asyncLoadEquipment`, { pageSize: this.pageSize, keyword: '' }).then(res => {
      getAction(`/eam/equipment/asyncLoadEquipment`, { pageSize: this.pageSize, keyword: '' ,factoryOrgCode:this.factoryOrgCode}).then(res => {
        this.loading = false
        if (res.success) {
          this.options = [...res.result]
@@ -137,12 +142,14 @@
        this.selectedAsyncValue = selectedObj
        //update-begin---author:wangshuai ---date:20221115  for：[issues/4213]JSearchSelectTag改造支持多选------------
        this.selectedValue = selectedObj.key
        this.$emit('autocompleteForm', this.options.find(item => item.equipmentId === selectedObj.value))
        //update-end---author:wangshuai ---date:20221115  for：[issues/4213]JSearchSelectTag改造支持多选------------
      } else {
        this.selectedAsyncValue = undefined
        this.selectedValue = undefined
        this.options = []
        this.loadData('')
        this.$emit('autocompleteForm', {})
      }
      this.callback()
      //update-end-author:scott date:20201222 for:【搜索】搜索查询组件，删除条件，默认下拉还是上次的缓存数据，不好 JT-191

 src/views/eam/maintenance/EamSecondMaintenanceOrderList.vue

@@ -51,7 +51,7 @@
            é¢†å–
          </a-menu-item>
          <a-menu-item key="3" @click="handlerBatchRestore">
            <a-icon type="form"/>
            <a-icon type="reload"/>
            è¿˜åŽŸ
          </a-menu-item>
        </a-menu>

 src/views/eam/technical/EamTechnicalStatusChangeList.vue

@@ -1,49 +1,41 @@
<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-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.changeOrderNum"></a-input>
            </a-form-item>
          </a-col>
        <template v-if="toggleSearchStatus">
          <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.changeStatus"></a-input>
              <j-dict-select-tag dict-code="technical_status_change_order_status" placeholder="请选择变更单状态"
                                 v-model="queryParam.changeStatus"/>
            </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.designer"></a-input>
          <a-col :xl="5" :lg="6" :md="8" :sm="12">
            <a-form-item label="申请单位">
              <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.designerTime"></a-input>
              <a-range-picker v-model="queryParam.dates" 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="4" :lg="6" :md="8" :sm="12">
            <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,75 +43,59 @@
    <!-- æ“ä½œæŒ‰é’®åŒºåŸŸ -->
    <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'}">
        <span slot="action" slot-scope="text, record">
          <template v-if="record.changeStatus=='WAIT_SUBMIT'">
          <a @click="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>
        </span>
          <a-divider type="vertical"/>

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

          <a-divider type="vertical"/>

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

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

    <!-- table区域-end -->

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

    <!--状态变更审批弹窗-->
    <technical-status-change-approval-modal ref="technicalStatusChangeApprovalModal"
                                            :selectShenpiData="selectedRowData"/>
  </a-card>
</template>

<script>
  import '@/assets/less/TableExpand.less'
  import EamTechnicalStatusChangeModal from './modules/EamTechnicalStatusChangeModal'
  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
  import { getAction } from '@/api/manage'
  import TechnicalStatusChangeApprovalModal
    from '../../flowable/workflow/TechnicalStatus/TechnicalStatusChangeApprovalModal'

  export default {
    name: "EamTechnicalStatusChangeList",
    mixins:[JeecgListMixin],
    name: 'EamTechnicalStatusChangeList',
    mixins: [JeecgListMixin],
    components: {
      TechnicalStatusChangeApprovalModal,
      EamTechnicalStatusChangeModal
    },
    data () {
    data() {
      return {
        description: '技术状态变更申请管理页面',
        // è¡¨å¤´
@@ -127,99 +103,166 @@
          {
            title: '#',
            dataIndex: '',
            key:'rowIndex',
            width:60,
            align:"center",
            customRender:function (t,r,index) {
              return parseInt(index)+1;
            key: 'rowIndex',
            width: 60,
            align: 'center',
            customRender: function(t, r, index) {
              return parseInt(index) + 1
            }
           },
           {
            title: '删除标记',
            align:"center",
            dataIndex: 'delFlag'
           },
           {
          },
          {
            title: '变更单号',
            align:"center",
            align: 'center',
            dataIndex: 'changeOrderNum'
           },
           {
          },
          {
            title: '变更单状态',
            align:"center",
            dataIndex: 'changeStatus'
           },
           {
            align: 'center',
            dataIndex: 'changeStatus_dictText'
          },
          {
            title: '编制人',
            align:"center",
            dataIndex: 'designer'
           },
           {
            align: 'center',
            dataIndex: 'designer_dictText'
          },
          {
            title: '编制时间',
            align:"center",
            align: 'center',
            dataIndex: 'designerTime'
           },
           {
            title: '使用单位室主管签字',
            align:"center",
          },
          {
            title: '使用单位室级主管签字',
            align: 'center',
            dataIndex: 'departHeaderSignature'
           },
           {
            title: '使用单位室主管签字时间',
            align:"center",
          },
          {
            title: '使用单位室级主管签字时间',
            align: 'center',
            dataIndex: 'departHeaderSignatureTime'
           },
           {
            title: '使用单位室主管意见',
            align:"center",
            dataIndex: 'departHeaderSignatureComment'
           },
           {
            title: '使用单位部主管签字',
            align:"center",
          },
          {
            title: '使用单位部级主管签字',
            align: 'center',
            dataIndex: 'departLeaderSignature'
           },
           {
            title: '使用单位部主管签字时间',
            align:"center",
          },
          {
            title: '使用单位部级主管签字时间',
            align: 'center',
            dataIndex: 'departLeaderSignatureTime'
           },
           {
            title: '使用单位部主管签字',
            align:"center",
            dataIndex: 'departLeaderSignatureComment'
           },
           {
          },
          {
            title: 'HF编码',
            align:"center",
            align: 'center',
            dataIndex: 'hfCode'
           },
          },
          {
            title: '操作',
            dataIndex: 'action',
            align:"center",
            scopedSlots: { customRender: 'action' },
            align: 'center',
            width: 200,
            fixed: 'right',
            scopedSlots: { customRender: 'action' }
          }
        ],
        url: {
          list: "/eam/eamTechnicalStatusChange/list",
          delete: "/eam/eamTechnicalStatusChange/delete",
          deleteBatch: "/eam/eamTechnicalStatusChange/deleteBatch",
          exportXlsUrl: "eam/eamTechnicalStatusChange/exportXls",
          importExcelUrl: "eam/eamTechnicalStatusChange/importExcel",
       },
    }
  },
  computed: {
    importExcelUrl: function(){
      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
    }
  },
        productionTreeData: [],
        selectedRowData: {},
        url: {
          list: '/eam/eamTechnicalStatusChange/list',
          submit: '/eam/eamTechnicalStatusChange/submit',
          abolish: '/eam/eamTechnicalStatusChange/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.technicalStatusChangeApprovalModal.title = '详情'
        this.$refs.technicalStatusChangeApprovalModal.disableSubmit = true
        this.$refs.technicalStatusChangeApprovalModal.visible = true
        this.$refs.technicalStatusChangeApprovalModal.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/EamTechnicalStatusChangeModal.vue

@@ -1,138 +1,276 @@
<template>
  <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-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="changeOrderNum" label="变更单号">
          <a-input placeholder="请输入变更单号" v-model="model.changeOrderNum" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="changeStatus" label="变更单状态">
          <a-input placeholder="请输入变更单状态" v-model="model.changeStatus" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="designer" label="编制人">
          <a-input placeholder="请输入编制人" v-model="model.designer" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="designerTime" label="编制时间">
          <a-input placeholder="请输入编制时间" v-model="model.designerTime" />
        </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="departHeaderSignatureComment" label="使用单位室主管意见">
          <a-input placeholder="请输入使用单位室主管意见" v-model="model.departHeaderSignatureComment" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="departLeaderSignature" label="使用单位部主管签字">
          <a-input placeholder="请输入使用单位部主管签字" v-model="model.departLeaderSignature" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="departLeaderSignatureTime" label="使用单位部主管签字时间">
          <a-input placeholder="请输入使用单位部主管签字时间" v-model="model.departLeaderSignatureTime" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="departLeaderSignatureComment" label="使用单位部主管签字">
          <a-input placeholder="请输入使用单位部主管签字" v-model="model.departLeaderSignatureComment" />
        </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>
  <j-modal :title="title" :width="1200" :visible="visible" :confirmLoading="confirmLoading" switchFullscreen
           @ok="handleOk" @cancel="handleCancel" cancelText="关闭">
    <a-spin :spinning="spinning">
      <div class="table-page-search-wrapper">
        <a-form-model ref="form" :model="model" :rules="validatorRules" :labelCol="labelCol" :wrapperCol="wrapperCol">
          <a-row>
            <a-col :span="8">
              <a-form-model-item label="变更单号">
                <a-input placeholder="系统自动生成" v-model="model.changeOrderNum" disabled/>
              </a-form-model-item>
            </a-col>
            <a-col :span="8">
              <a-form-model-item label="申请单位" prop="factoryOrgCode">
                <a-tree-select v-model="model.factoryOrgCode" :tree-data="productionTreeData"
                               @change="detail.dataSource=[]"
                               show-search :replaceFields="{key:'orgCode',value:'orgCode'}"
                               treeNodeFilterProp="title" searchPlaceholder="请输入关键字搜索"
                               :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }" placeholder="请选择申请单位"
                               allow-clear tree-default-expand-all :allow-clear="false"/>
              </a-form-model-item>
            </a-col>
          </a-row>

          <a-row>
            <a-col :span="24">
              <a-form-model-item label="备注" :labelCol="{span:2}" :wrapperCol="{span:20}">
                <a-textarea placeholder="请输入备注" v-model="model.remark"/>
              </a-form-model-item>
            </a-col>
          </a-row>
        </a-form-model>
      </div>

      <j-vxe-table ref="editableDetailTable" rowNumber rowSelection bordered alwaysEdit toolbar
                   v-if="model.factoryOrgCode"
                   :toolbarConfig="detail.toolbarConfig" keep-source :height="300"
                   :dataSource="detail.dataSource" :columns="detail.columns">
        <!--统一编码-->
        <template v-slot:equipmentId="props">
          <lx-search-equipment-select v-model="props.row.equipmentId" placeholder="请输入统一编码或名称搜索"
                                      :factoryOrgCode="model.factoryOrgCode"
                                      @autocompleteForm="autocompleteForm($event,props.row)" :allowClear="false"/>
        </template>

        <!-- ä¿å…»æ—¥æœŸ-->
        <template v-slot:changeDate="props">
          <a-date-picker v-model="props.row.changeDate" value-format="YYYY-MM-DD" :allow-clear="false"/>
        </template>

        <!-- æ“ä½œ-->
        <template v-slot:action="props">
          <a :disabled="!props.row.equipmentId" @click="handlePreviewDetail(props.row.standardId)">预览明细</a>
        </template>
      </j-vxe-table>
    </a-spin>
  </j-modal>
</template>

<script>
  import { httpAction } from '@/api/manage'
  import moment from "moment"
  import { httpAction, getAction } from '@/api/manage'
  import { JVXETypes } from '@comp/jeecg/JVxeTable'
  import LxSearchEquipmentSelect from '../../equipment/modules/LxSearchEquipmentSelect'

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

        confirmLoading: false,
        validatorRules:{
        spinning: false,
        validatorRules: {
          factoryOrgCode: [{ required: true, message: '请选择申请单位', trigger: 'change' }]
        },
        detail: {
          dataSource: [],
          columns: [
            {
              title: 'ID',
              key: 'id',
              type: JVXETypes.hidden
            },
            {
              title: '统一编码',
              key: 'equipmentId',
              align: 'center',
              type: JVXETypes.slot,
              slotName: 'equipmentId',
              width: 250,
              validateRules: [
                { required: true, message: '请输入${title}或名称搜索' },
                { unique: true, message: '${title}不能重复' }
              ]
            },
            {
              title: '设备名称',
              key: 'equipmentName',
              align: 'center',
              type: JVXETypes.normal,
              width: 200
            },
            {
              title: '设备型号',
              key: 'equipmentModel',
              align: 'center',
              type: JVXETypes.normal,
              width: 200
            },
            {
              title: '使用单位',
              key: 'factoryName',
              align: 'center',
              type: JVXETypes.normal,
              width: 200
            },
            {
              title: '变更原因',
              key: 'changeCategory',
              align: 'center',
              dictCode: 'technical_status_change_reason',
              type: JVXETypes.select,
              width: 200,
              placeholder: '请选择${title}',
              validateRules: [{ required: true, message: '请选择${title}' }]
            },
            {
              title: '变更日期',
              key: 'changeDate',
              align: 'center',
              type: JVXETypes.slot,
              width: 200,
              slotName: 'changeDate',
              validateRules: [{ required: true, message: '请选择${title}' }]
            },
            {
              title: '变更后技术状态',
              key: 'changeTechnicalStatus',
              align: 'center',
              dictCode: 'equipment_technology_status',
              type: JVXETypes.select,
              width: 220,
              placeholder: '请选择${title}',
              validateRules: [{ required: true, message: '请选择${title}' }]
            }
          ],
          toolbarConfig: {
            // prefix å‰ç¼€ï¼›suffix åŽç¼€
            slot: ['prefix', 'suffix'],
            // add æ–°å¢žæŒ‰é’®ï¼›remove åˆ é™¤æŒ‰é’®ï¼›clearSelection æ¸…空选择按钮
            btn: ['add', 'remove', 'clearSelection']
          }
        },
        url: {
          add: "/eam/eamTechnicalStatusChange/add",
          edit: "/eam/eamTechnicalStatusChange/edit",
        },
          add: '/eam/eamTechnicalStatusChange/add',
          edit: '/eam/eamTechnicalStatusChange/edit',
          detail: '/eam/eamTechnicalStatusChangeDetail/queryList'
        }
      }
    },
    created () {
    },
    methods: {
      add () {
      add() {
        //初始化默认值
        this.edit({});
        this.edit({})
      },
      edit (record) {
        this.model = Object.assign({}, record);
        this.visible = true;

      edit(record) {
        this.model = Object.assign({}, record)
        this.visible = true
        if (record.id) this.loadDetail(record.id)
      },
      close () {
        this.$emit('close');
        this.visible = false;
        this.$refs.form.clearValidate();

      /**
       * èŽ·å–设备明细
       * @param orderId
       */
      loadDetail(orderId) {
        this.spinning = true
        this.detail.dataSource = []
        getAction(this.url.detail, { orderId })
          .then(res => {
            console.log('res', res)
            if (res.success) this.detail.dataSource = res.result
          })
          .finally(() => {
            this.spinning = false
          })
      },
      handleOk () {
        const that = this;

      autocompleteForm(selectObj, record) {
        record.factoryName = selectObj.factoryOrgCode_dictText
        record.equipmentName = selectObj.equipmentName
        record.equipmentModel = selectObj.equipmentModel
        record.changeTechnicalStatus = 'PROHIBITED'
      },

      async handleOk() {
        const tableData = this.$refs.editableDetailTable.getTableData()
        if (tableData.length == 0) {
          this.$notification.warning({
            message: '消息',
            description: '请至少新增一条记录'
          })
          return
        }

        const errMap = await this.$refs.editableDetailTable.validateTable()
        if (errMap) return

        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 = that.spinning = 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;
            that.model.tableDetailList = this.$refs.editableDetailTable.getTableData()
            httpAction(httpUrl, this.model, method)
              .then((res) => {
                if (res.success) {
                  that.$notification.success({
                    message: '消息',
                    description: res.message
                  })
                  that.$emit('ok')
                  that.close()
                } else {
                  that.$notification.warning({
                    message: '消息',
                    description: res.message
                  })
                }
              })
              .finally(() => {
                that.confirmLoading = that.spinning = false
              })
          } else {
            return false
          }
        })
      },
      handleCancel () {

      handleCancel() {
        this.close()
      },

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


    }
@@ -140,5 +278,7 @@
</script>

<style lang="less" scoped>

  /deep/ .ant-select-dropdown-menu {
    text-align: left;
  }
</style>

 src/views/flowable/workflow/FlowTodo.vue

@@ -106,6 +106,10 @@
    <!--维修工单-->
    <repair-order-approval-modal ref="repairOrderApprovalModal" :selectShenpiData="selectedRowData"
                                 @modalFormOk="modalFormOk"/>

    <!--技术状态变更-->
    <technical-status-change-approval-modal ref="technicalStatusChangeApprovalModal" :selectShenpiData="selectedRowData"
                                            @modalFormOk="modalFormOk"/>
  </a-card>
</template>

@@ -121,11 +125,13 @@
  import TechnicalStatusEvaluationOrderChangeApprovalModal
    from './TechnicalStatusEvaluation/TechnicalStatusEvaluationOrderChangeApprovalModal'
  import RepairOrderApprovalModal from './repairOrder/RepairOrderApprovalModal'
  import TechnicalStatusChangeApprovalModal from './TechnicalStatus/TechnicalStatusChangeApprovalModal'

  export default {
    name: 'FlowTodo',
    mixins: [JeecgListMixin],
    components: {
      TechnicalStatusChangeApprovalModal,
      RepairOrderApprovalModal,
      TechnicalStatusEvaluationOrderChangeApprovalModal,
      ThirdMaintenanceApprovalModal,
@@ -236,6 +242,9 @@
          case 'eam_repair_order':
            this.handleRepairOrder(record)
            break
          case 'TECHNICAL_STATUS_CHANGE_PROCESS':
            this.handleTechnicalStatusChange(record)
            break
          default:
            alert('没找到该流程')
        }
@@ -315,6 +324,17 @@
        this.$refs.repairOrderApprovalModal.handleDetail(record)
      },

      /**
       * ç‚¹å‡»æŠ€æœ¯çŠ¶æ€å˜æ›´åˆ†ç±»æµç¨‹å®¡æ‰¹æ—¶è§¦å‘
       * @param record
       */
      handleTechnicalStatusChange(record) {
        this.selectedRowData = Object.assign({}, record)
        this.$refs.technicalStatusChangeApprovalModal.visible = true
        this.$refs.technicalStatusChangeApprovalModal.title = record.name
        this.$refs.technicalStatusChangeApprovalModal.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/TechnicalStatus/TechnicalStatusChangeApprovalModal.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,394 @@
<template>
  <j-modal :title="title" 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="8" 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.changeOrderNum" readOnly/>
                    </a-form-model-item>
                  </a-col>
                  <a-col :span="12">
                    <a-form-model-item label="申请单位">
                      <a-input v-model="model.factoryOrgCode_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.designer_dictText" readOnly/>
                    </a-form-model-item>
                  </a-col>
                  <a-col :span="12">
                    <a-form-model-item label="编制时间">
                      <a-input v-model="model.designerTime" readOnly/>
                    </a-form-model-item>
                  </a-col>
                </a-row>

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

          <!-- ä¸­é—´æ˜Žç»†é¡¹åˆ—-->
          <a-col :span="10" class="scroll-col">
            <a-tabs>
              <a-tab-pane key="1" tab="设备明细">
                <j-vxe-table ref="editableDetailTable" rowNumber bordered keep-source :dataSource="detail.dataSource"
                             :columns="detail.columns"/>
              </a-tab-pane>
              <a-tab-pane key='2' tab='流程图' v-if="selectShenpiData.procInstId">
                <img :src="imageSrc" alt="Fetched Image" style="width: 100%" v-if="imageSrc"/>
              </a-tab-pane>
            </a-tabs>
          </a-col>

          <!--右侧审批列-->
          <a-col :span="6" 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.changeStatus&&model.changeStatus!='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.changeStatus&&model.changeStatus!='DEPART_HEADER_SIGNING')"/>
                    </a-form-model-item>
                  </a-col>
                </a-row>
              </a-tab-pane>
            </a-tabs>

            <a-tabs v-if="displayDepartLeaderFlag">
              <a-tab-pane tab="使用单位部级领导确认">
                <a-row>
                  <a-col :span="24">
                    <a-form-model-item prop="departLeaderSignatureResult" label="确认类型" :labelCol="rightColLabelCol"
                                       :wrapperCol="rightColWrapperCol">
                      <j-dict-select-tag type='radio' v-model='model.departLeaderSignatureResult'
                                         dictCode='approve_reject'
                                         :disabled="disableSubmit||(model.changeStatus&&model.changeStatus!='DEPART_LEADER_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.departLeaderComment"
                                  :disabled="disableSubmit||(model.changeStatus&&model.changeStatus!='DEPART_LEADER_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'
  import { JVXETypes } from '@comp/jeecg/JVxeTable'

  export default {
    name: 'TechnicalStatusChangeApprovalModal',
    components: {
      TechnicalStatusEquipmentSelect
    },
    props: {
      selectShenpiData: {
        type: Object
      }
    },
    data() {
      return {
        title: '操作',
        visible: false,
        model: {},
        labelCol: {
          xs: { span: 24 },
          sm: { span: 8 }
        },
        wrapperCol: {
          xs: { span: 24 },
          sm: { span: 16 }
        },
        labelColLong: {
          xs: { span: 24 },
          sm: { span: 4 }
        },
        wrapperColLong: {
          xs: { span: 24 },
          sm: { span: 20 }
        },
        rightColLabelCol: {
          xs: { span: 24 },
          sm: { span: 6 }
        },
        rightColWrapperCol: {
          xs: { span: 24 },
          sm: { span: 16 }
        },
        confirmLoading: false,
        spinning: false,
        imageSrc: null,
        validatorRules: {
          departHeaderSignatureResult: [{ required: true, message: '请选择确认类型' }],
          departLeaderSignatureResult: [{ required: true, message: '请选择确认类型' }]
        },
        url: {
          queryById: '/eam/eamTechnicalStatusChange/queryById',
          approval: '/eam/eamTechnicalStatusChange/approval',
          detail: '/eam/eamTechnicalStatusChangeDetail/queryList',
          diagramView: '/assign/flow/diagramView'
        },
        disableSubmit: false,
        selectedRowKeys: [],
        detail: {
          dataSource: [],
          columns: [
            {
              title: 'ID',
              key: 'id',
              type: JVXETypes.hidden
            },
            {
              title: '统一编码',
              key: 'equipmentCode',
              align: 'center',
              type: JVXETypes.normal,
              width: 200
            },
            {
              title: '设备名称',
              key: 'equipmentName',
              align: 'center',
              type: JVXETypes.normal,
              width: 200
            },
            {
              title: '设备型号',
              key: 'equipmentModel',
              align: 'center',
              type: JVXETypes.normal,
              width: 200
            },
            {
              title: '使用单位',
              key: 'factoryName',
              align: 'center',
              type: JVXETypes.normal,
              width: 200
            },
            {
              title: '变更原因',
              key: 'changeCategory_dictText',
              align: 'center',
              type: JVXETypes.normal,
              width: 200
            },
            {
              title: '变更日期',
              key: 'changeDate',
              align: 'center',
              type: JVXETypes.normal,
              width: 200
            },
            {
              title: '变更后技术状态',
              key: 'changeTechnicalStatus_dictText',
              align: 'center',
              type: JVXETypes.normal,
              width: 200
            }
          ]
        }
      }
    },
    computed: {
      displayDepartHeaderFlag() {
        return this.model.changeStatus && ['DEPART_HEADER_SIGNING', 'DEPART_LEADER_SIGNING', 'COMPLETED'].includes(this.model.changeStatus)
      },
      displayDepartLeaderFlag() {
        return this.model.changeStatus && ['DEPART_LEADER_SIGNING', 'COMPLETED'].includes(this.model.changeStatus)
      }
    },
    methods: {
      /**
       * ä¸»é¡µé¢ç‚¹å‡»æ‰§è¡Œå®¡æ‰¹æ—¶è§¦å‘
       * @param record ä¸»é¡µé¢åˆ—表行记录
       */
      handleApprove(record) {
        this.model = {}
        this.getBasicInformationByApi(record)
        this.getFlowChartImageByApi(record)
      },

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

      /**
       * èŽ·å–基础信息
       * @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
              })
            }
          })
          .finally(() => {
            this.loadDetail(record.dataId)
          })
      },

      /**
       * èŽ·å–流程图
       * @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
            })
          })
      },

      /**
       * èŽ·å–设备明细
       * @param orderId
       */
      loadDetail(orderId) {
        this.detail.dataSource = []
        getAction(this.url.detail, { orderId })
          .then(res => {
            console.log('res', res)
            if (res.success) this.detail.dataSource = res.result
          })
          .finally(() => {
            this.spinning = false
          })
      },

      async handleOk() {
        const that = this

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

            postAction(that.url.approval, that.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
          }
        })
      },

      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>