1、二保和技术鉴定工单审批 2、调整我的待办列表样式

zhaowei

6 天以前 7f1e90c6e0a90d7036fba754c14009c01f5694e4

1、二保和技术鉴定工单审批
2、调整我的待办列表样式

 src/views/eam/maintenance/EamInspectionOrderList.vue

@@ -85,13 +85,12 @@
            <a class="ant-dropdown-link">更多 <a-icon type="down"/></a>
            <a-menu slot="overlay">
              <a-menu-item>
                <a @click="handleDetail(record)">详情</a>
              </a-menu-item>

              <a-menu-item>
                <a-popconfirm title="确定作废吗?" @confirm="() => handleAbolish(record.id)">
                  <a>作废</a>
                </a-popconfirm>
              </a-menu-item>
               <a-menu-item>
                <a @click="handleDetail(record)">详情</a>
              </a-menu-item>
            </a-menu>
          </a-dropdown>
@@ -217,9 +216,9 @@
            dataIndex: 'confirmTime'
          },
          {
            title: '确认意见',
            title: 'HF编码',
            align: 'center',
            dataIndex: 'confirmComment'
            dataIndex: 'hfCode'
          }
        ],
        url: {
@@ -244,8 +243,6 @@
        title: '操作',
        dataIndex: 'action',
        align: 'center',
        fixed: 'right',
        width: 200,
        scopedSlots: { customRender: 'action' }
      }
      this.columns = [...this.columns, operationColumn]

 src/views/flowable/workflow/FlowTodo.vue

@@ -11,36 +11,26 @@
        <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>
              <j-dict-select-tag v-model='queryParam.category' dictCode='flow_type' placeholder='请选择流程分类'/>
            </a-form-item>
          </a-col>
          <a-col :lg='6' :md='8' :sm='24' :xl='4'>
            <a-form-item label='当前节点'>
              <a-input
                v-model='queryParam.name'
                placeholder='请输入当前节点精确查询'
              ></a-input>
              <a-input v-model='queryParam.name' placeholder='请输入当前节点精确查询'/>
            </a-form-item>
          </a-col>
          <a-col :lg='6' :md='8' :sm='24' :xl='4'>
            <a-form-item label='简要描述'>
              <a-input
                v-model='queryParam.title'
                placeholder='请输入简要描述'
              ></a-input>
              <a-input v-model='queryParam.title' placeholder='请输入简要描述'/>
            </a-form-item>
          </a-col>
          <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>
                      date-format='YYYY-MM-DD HH:mm:ss' placeholder='请选择开始时间'/>
              <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>
                      date-format='YYYY-MM-DD HH:mm:ss' placeholder='请选择结束时间'/>
            </a-form-item>
          </a-col>

@@ -80,7 +70,7 @@

      <a-table ref='table' :columns='columns' :dataSource='dataSource' :loading='loading' :pagination='ipagination'
               :rowSelection='{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}'
               :scroll="{x:'max-content',y:465}" bordered rowKey='id' size='middle'
               :scroll="{x:'max-content'}" bordered rowKey='id' size='middle'
               @change='handleTableChange'>
        <span slot='action' slot-scope='text, record'>
          <a @click='handelDetail(record,text)'>执行/审批</a>
@@ -116,7 +106,7 @@
  import ThirdMaintenanceApprovalModal from './thirdMaintenance/ThirdMaintenanceApprovalModal'

  export default {
    name: 'NcDeviceCharactersList',
    name: 'FlowTodo',
    mixins: [JeecgListMixin],
    components: {
      ThirdMaintenanceApprovalModal,
@@ -144,7 +134,7 @@
            title: '流程分类',
            align: 'center',
            dataIndex: 'category_dictText',
            width: 150
            width: 200
          },
          {
            title: '流程名称',
@@ -155,8 +145,7 @@
          {
            title: '流程业务简要描述',
            align: 'center',
            dataIndex: 'description',
            ellipsis: true
            dataIndex: 'description'
          },
          {
            title: '上一步处理人',
@@ -180,26 +169,21 @@
            title: '当前节点开始时间',
            align: 'center',
            dataIndex: 'createTime',
            width: 150
            width: 200
          },
          {
            title: '操作',
            dataIndex: 'action',
            fixed: 'right',
            scopedSlots: { customRender: 'action' },
            align: 'center',
            width: 150,
            fixed: 'right'
            width: 100
          }
        ],
        url: {
          list: '/assign/flow/toTaskBySelf'
        },
        selectedRowData: {},
        selectInspectionOrderData: {},
        selectWeekMaintenanceData: {},
        selectSecondMaintenanceData: {},
        selectThirdMaintenanceData: {},
        selectRepairOrderData: {}
        selectedRowData: {}
      }
    },
    computed: {
@@ -259,6 +243,7 @@
       */
      handleTechnicalStatusEvaluation(record) {
        this.selectedRowData = Object.assign({}, record)
        this.$refs.technicalStatusApprovalModal.visible = true
        this.$refs.technicalStatusApprovalModal.title = record.name
        this.$refs.technicalStatusApprovalModal.handleDetail(record)
      },
@@ -279,7 +264,6 @@
       * @param record
       */
      handInspectionOrder(record) {
        console.log('record----->', record)
        this.selectedRowData = Object.assign({}, record)
        this.$refs.inspectionOrderHandle.visible = true
        this.$refs.inspectionOrderHandle.title = record.name
@@ -347,4 +331,4 @@
      }
    }
  }
</script>
</script>

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

@@ -529,7 +529,6 @@
       */
      async handleDetail(record) {
        this.model = {}
        this.visible = true
        this.detail.safetyEquipmentCheckList = this.detail.precisionCheckList = this.detail.otherCheckList = []
        this.handleTabToFirstTable()
        this.getBasicInformationByApi(record)
@@ -541,7 +540,6 @@
       * @param record 主页面列表行记录
       */
      recordDetail(record) {
        this.visible = true
        this.detail.safetyEquipmentCheckList = this.detail.precisionCheckList = this.detail.otherCheckList = []
        this.model = Object.assign({}, record)
        this.handleTabToFirstTable()
@@ -695,7 +693,6 @@
        this.$nextTick(() => {
          for (let index = 1; index <= 3; index++) {
            if (this.$refs['editableDetailTable' + index]) {
              console.log('index----------', index)
              this.activeTabKey = index
              break
            }

 src/views/flowable/workflow/secondMaintenance/SecondMaintenanceApprovalModal.vue

@@ -342,6 +342,7 @@
       * @param record 主页面列表行记录
       */
      async handleDetail(record) {
        this.spinning = true
        this.model = {}
        this.detail.operatorMaintenanceList = this.detail.repairerMaintenanceList = []
        this.handleTabToFirstTable()
@@ -355,6 +356,7 @@
       * @param record 主页面列表行记录
       */
      recordDetail(record) {
        this.spinning = true
        this.activeTabKey = 1
        this.detail.operatorMaintenanceList = this.detail.repairerMaintenanceList = []
        this.model = Object.assign({}, record)
@@ -366,7 +368,6 @@
       * @param record 主页面列表行记录
       */
      getBasicInformationByApi(record) {
        this.spinning = true
        const that = this
        getAction(this.url.queryById, { id: record.dataId })
          .then(res => {
@@ -505,7 +506,6 @@

      //规范选择变化
      loadDetail(orderId) {
        this.spinning = true
        getAction(this.url.detail, { orderId })
          .then(res => {
            if (res.success) {