1、DNC首页三维工艺生成产品结构树列表增加字符数超出省略功能 2、设备调拨列表详情改为查看流程详情

zhaowei

2 天以前 6ab830320b2508ee5f6a7be6cb18653e5d651f0d

1、DNC首页三维工艺生成产品结构树列表增加字符数超出省略功能
2、设备调拨列表详情改为查看流程详情

 src/views/dashboard/modules/DncManagerSignage.vue

@@ -12,31 +12,16 @@

    <!-- 右侧两个小卡片 -->
    <div class="right-container">
      <a-card title="三位工艺生成产品结构树" class="right-top-container">
      <a-card title="三维工艺生成产品结构树" class="right-top-container">
        <a slot="extra" href="#" @click="$router.push('/dnc/base/SyncProcessSpecificationInfoList')">更多</a>

        <syncProcessList
          ref="syncProcessList"/>
      </a-card>

      <!--<div class="card top-card">-->
      <!--<h2 class="card-title">三维工艺生成产品结构树</h2>-->
      <!--<h2 class="more-btns" @click="gotoSyncProcessList">更多</h2>-->
      <!--<div class="card-content">-->
      <!--<syncProcessList-->
      <!--ref="syncProcessList"/>-->
      <!--</div>-->
      <!--</div>-->

      <a-card title="派工任务领取">

      </a-card>

      <!--<div class="card bottom-card">-->
      <!--<h2 class="card-title">派工任务领取</h2>-->
      <!--<div class="card-content">-->
      <!--</div>-->
      <!--</div>-->
    </div>
  </div>
</template>

 src/views/dashboard/modules/SyncProcessList.vue

@@ -10,6 +10,12 @@
        :scroll="{ y: 400 }"
      >

        <!--需要超出省略的字段-->
        <template slot="ellipsisText" slot-scope="text">
          <template v-if="(text&&text.length<=10)||!text">{{text}}</template>
          <j-ellipsis v-else :value="text" :length="10"/>
        </template>

        <span slot="action" slot-scope="text, record">
          <a-popconfirm title="确定领取吗?" @confirm="() => handleInspection(record.id)">
            <a>领取</a>
@@ -71,6 +77,7 @@
          title: '工艺规程编号',
          align: "center",
          dataIndex: 'planNumber',
          scopedSlots: { customRender: 'ellipsisText' },
        },
        {
          title: '工艺规程版本',
@@ -80,11 +87,13 @@
        {
          title: '发布时间',
          align: "center",
          dataIndex: 'createTime'
          dataIndex: 'createTime',
          scopedSlots: { customRender: 'ellipsisText' },
        },
        {
          title: '操作',
          align: "center",
          width:100,
          scopedSlots: { customRender: 'action' },
        }
      ]

 src/views/eam/dispose/EamEquipmentTransferList.vue

@@ -20,7 +20,8 @@
          </a-col>
          <a-col :xl="4" :lg="7" :md="8" :sm="24">
            <a-form-item label="变动状态">
              <j-dict-select-tag placeholder="请选择变动状态" dictCode="equipment_transfer_status" v-model="queryParam.transferStatus"
              <j-dict-select-tag placeholder="请选择变动状态" dictCode="equipment_transfer_status"
                                 v-model="queryParam.transferStatus"
                                 allow-clear/>
            </a-form-item>
          </a-col>
@@ -39,10 +40,10 @@
            <span class='table-page-search-submitButtons' style='float: left;overflow: hidden;'>
              <a-button icon='search' type='primary' @click='searchQuery'>查询</a-button>
              <a-button icon='reload' style='margin-left: 8px' type='primary' @click='searchReset'>重置</a-button>
<!--              <a style='margin-left: 8px' @click='handleToggleSearch'>-->
<!--                {{ toggleSearchStatus ? '收起' : '展开' }}-->
<!--                <a-icon :type="toggleSearchStatus ? 'up' : 'down'" />-->
<!--              </a>-->
              <!--              <a style='margin-left: 8px' @click='handleToggleSearch'>-->
              <!--                {{ toggleSearchStatus ? '收起' : '展开' }}-->
              <!--                <a-icon :type="toggleSearchStatus ? 'up' : 'down'" />-->
              <!--              </a>-->
            </span>
          </a-col>

@@ -56,12 +57,12 @@
      <a-dropdown v-if='selectedRowKeys.length > 0'>
        <a-menu slot='overlay'>
          <a-menu-item key='1' @click='batchDel'>
            <a-icon type='delete' />
            <a-icon type='delete'/>
            删除
          </a-menu-item>
        </a-menu>
        <a-button style='margin-left: 8px'> 批量操作
          <a-icon type='down' />
          <a-icon type='down'/>
        </a-button>
      </a-dropdown>
    </div>
@@ -93,10 +94,10 @@
              <a-popconfirm title='确定提交吗?' @confirm='() => handleSubmit(record.id)'>
              <a>提交</a>
            </a-popconfirm>
              <a-divider type='vertical' />
              <a-divider type='vertical'/>

          <a-dropdown>
            <a class='ant-dropdown-link'>更多 <a-icon type='down' /></a>
            <a class='ant-dropdown-link'>更多 <a-icon type='down'/></a>
            <a-menu slot='overlay'>
               <a-menu-item>
                 <a @click='handleEdit(record)'>编辑</a>
@@ -120,225 +121,239 @@

    <!-- 表单区域 -->
    <eamEquipmentTransfer-modal ref='modalForm' @ok='modalFormOk'></eamEquipmentTransfer-modal>

    <!--审批窗口-->
    <equipment-transfer-approval-modal ref="equipmentTransferApprovalModal"
                                       :selectShenpiData="selectRowData"/>
  </a-card>
</template>

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


export default {
  name: 'EamEquipmentTransferList',
  mixins: [JeecgListMixin],
  components: {
    EamEquipmentTransferModal,
    LxSearchEquipmentSelect
  },
  data() {
    return {
      description: '设备归属变动管理页面',
      // 表头
      columns: [
        {
          title: '#',
          dataIndex: '',
          key: 'rowIndex',
          width: 60,
          fixed: 'left',
          align: 'center',
          customRender: function(t, r, index) {
            return parseInt(index) + 1
  export default {
    name: 'EamEquipmentTransferList',
    mixins: [JeecgListMixin],
    components: {
      EquipmentTransferApprovalModal,
      EamEquipmentTransferModal,
      LxSearchEquipmentSelect
    },
    data() {
      return {
        description: '设备归属变动管理页面',
        selectRowData: {},
        // 表头
        columns: [
          {
            title: '#',
            dataIndex: '',
            key: 'rowIndex',
            width: 60,
            fixed: 'left',
            align: 'center',
            customRender: function(t, r, index) {
              return parseInt(index) + 1
            }
          },
          {
            title: '单据号',
            align: 'center',
            fixed: 'left',
            width: 100,
            dataIndex: 'code'
          },
          {
            title: '设备编号',
            align: 'center',
            fixed: 'left',
            width: 100,
            dataIndex: 'equipmentCode'
          },
          {
            title: '设备名称',
            align: 'center',
            fixed: 'left',
            width: 100,
            dataIndex: 'equipmentName'
          },
          {
            title: '调出部门',
            align: 'center',
            dataIndex: 'oldDepartId_dictText'
          },
          {
            title: '调入部门',
            align: 'center',
            dataIndex: 'newDepartId_dictText'
          },
          {
            title: '申请人',
            align: 'center',
            dataIndex: 'reportUser_dictText'
          },
          {
            title: '变动原因',
            align: 'center',
            dataIndex: 'transferReason'
          },
          {
            title: '变动状态',
            align: 'center',
            dataIndex: 'transferStatus_dictText'
          },
          {
            title: '变动日期',
            align: 'center',
            dataIndex: 'transferTime'
          },
          {
            title: '使用单位领导',
            align: 'center',
            dataIndex: 'useLeader_dictText'
          },
          {
            title: '使用单位领导审核类型',
            align: 'center',
            dataIndex: 'useLeaderApprovalDealType_dictText'
          },
          {
            title: '使用单位领导审核意见',
            align: 'center',
            dataIndex: 'useLeaderApprovalComment'
          },
          {
            title: '使用单位领导审核时间',
            align: 'center',
            dataIndex: 'useLeaderApprovalTime'
          },
          {
            title: '调入单位领导',
            align: 'center',
            dataIndex: 'transferLeader_dictText'
          },
          {
            title: '调入单位领导审核类型',
            align: 'center',
            dataIndex: 'transferLeaderApprovalDealType_dictText'
          },
          {
            title: '调入单位领导审核意见',
            align: 'center',
            dataIndex: 'transferLeaderApprovalComment'
          },
          {
            title: '调入单位领导审核时间',
            align: 'center',
            dataIndex: 'transferLeaderApprovalTime'
          },
          {
            title: '机动办确认人',
            align: 'center',
            dataIndex: 'externalConfirm_dictText'
          },
          {
            title: '机动办确认时间',
            align: 'center',
            dataIndex: 'externalConfirmTime'
          },
          {
            title: '是否需要公司领导审批',
            align: 'center',
            dataIndex: 'companyLeaderCheck_dictText'
          },
          {
            title: '公司领导',
            align: 'center',
            dataIndex: 'companyLeader_dictText'
          },
          {
            title: '公司领导审核类型',
            align: 'center',
            dataIndex: 'companyLeaderApprovalDealType_dictText'
          },
          {
            title: '公司领导审核意见',
            align: 'center',
            dataIndex: 'companyLeaderApprovalComment'
          },
          {
            title: '公司领导审核时间',
            align: 'center',
            dataIndex: 'companyLeaderApprovalTime'
          },
          {
            title: '备注',
            align: 'center',
            dataIndex: 'remark'
          },
          {
            title: '操作',
            dataIndex: 'action',
            align: 'center',
            fixed: 'right',
            width: 150,
            scopedSlots: { customRender: 'action' }
          }
        },
        {
          title: '单据号',
          align: 'center',
          fixed: 'left',
          width: 100,
          dataIndex: 'code'
        },
        {
          title: '设备编号',
          align: 'center',
          fixed: 'left',
          width: 100,
          dataIndex: 'equipmentCode'
        },
        {
          title: '设备名称',
          align: 'center',
          fixed: 'left',
          width: 100,
          dataIndex: 'equipmentName'
        },
        {
          title: '调出部门',
          align: 'center',
          dataIndex: 'oldDepartId_dictText'
        },
        {
          title: '调入部门',
          align: 'center',
          dataIndex: 'newDepartId_dictText'
        },
        {
          title: '申请人',
          align: 'center',
          dataIndex: 'reportUser_dictText'
        },
        {
          title: '变动原因',
          align: 'center',
          dataIndex: 'transferReason'
        },
        {
          title: '变动状态',
          align: 'center',
          dataIndex: 'transferStatus_dictText'
        },
        {
          title: '变动日期',
          align: 'center',
          dataIndex: 'transferTime'
        },
        {
          title: '使用单位领导',
          align: 'center',
          dataIndex: 'useLeader_dictText'
        },
        {
          title: '使用单位领导审核类型',
          align: 'center',
          dataIndex: 'useLeaderApprovalDealType_dictText'
        },
        {
          title: '使用单位领导审核意见',
          align: 'center',
          dataIndex: 'useLeaderApprovalComment'
        },
        {
          title: '使用单位领导审核时间',
          align: 'center',
          dataIndex: 'useLeaderApprovalTime'
        },
        {
          title: '调入单位领导',
          align: 'center',
          dataIndex: 'transferLeader_dictText'
        },
        {
          title: '调入单位领导审核类型',
          align: 'center',
          dataIndex: 'transferLeaderApprovalDealType_dictText'
        },
        {
          title: '调入单位领导审核意见',
          align: 'center',
          dataIndex: 'transferLeaderApprovalComment'
        },
        {
          title: '调入单位领导审核时间',
          align: 'center',
          dataIndex: 'transferLeaderApprovalTime'
        },
        {
          title: '机动办确认人',
          align: 'center',
          dataIndex: 'externalConfirm_dictText'
        },
        {
          title: '机动办确认时间',
          align: 'center',
          dataIndex: 'externalConfirmTime'
        },
        {
          title: '是否需要公司领导审批',
          align: 'center',
          dataIndex: 'companyLeaderCheck_dictText'
        },
        {
          title: '公司领导',
          align: 'center',
          dataIndex: 'companyLeader_dictText'
        },
        {
          title: '公司领导审核类型',
          align: 'center',
          dataIndex: 'companyLeaderApprovalDealType_dictText'
        },
        {
          title: '公司领导审核意见',
          align: 'center',
          dataIndex: 'companyLeaderApprovalComment'
        },
        {
          title: '公司领导审核时间',
          align: 'center',
          dataIndex: 'companyLeaderApprovalTime'
        },
        {
          title: '备注',
          align: 'center',
          dataIndex: 'remark'
        },
        {
          title: '操作',
          dataIndex: 'action',
          align: 'center',
          fixed: 'right',
          width: 150,
          scopedSlots: { customRender: 'action' }
        ],
        url: {
          list: '/eam/eamEquipmentTransfer/list',
          delete: '/eam/eamEquipmentTransfer/delete',
          deleteBatch: '/eam/eamEquipmentTransfer/deleteBatch',
          submit: '/eam/eamEquipmentTransfer/submit'
        }
      ],
      url: {
        list: '/eam/eamEquipmentTransfer/list',
        delete: '/eam/eamEquipmentTransfer/delete',
        deleteBatch: '/eam/eamEquipmentTransfer/deleteBatch',
        submit: '/eam/eamEquipmentTransfer/submit'
      }
    }
  },
  computed: {
    importExcelUrl: function() {
      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
    }
  },
  methods: {
    handleSubmit(id) {
      if (!this.url.submit) {
        this.$message.error('请设置url.submit属性!')
        return
    },
    computed: {
      importExcelUrl: function() {
        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
      }
      let that = this
      this.loading = true
      getAction(that.url.submit, { id: id }).then((res) => {
        if (res.success) {
          //重新计算分页问题
          that.reCalculatePage(1)
          // that.$message.success(res.message);
          that.$notification.success({
            message: '消息',
            description: res.message
          })
          that.loadData()
        } else {
          // that.$message.warning(res.message);
          that.$notification.warning({
            message: '消息',
            description: res.message
          })
    },
    methods: {
      handleSubmit(id) {
        if (!this.url.submit) {
          this.$message.error('请设置url.submit属性!')
          return
        }
      }).finally(()=>{
        this.loading = false
      })
        let that = this
        this.loading = true
        getAction(that.url.submit, { id: id }).then((res) => {
          if (res.success) {
            //重新计算分页问题
            that.reCalculatePage(1)
            // that.$message.success(res.message);
            that.$notification.success({
              message: '消息',
              description: res.message
            })
            that.loadData()
          } else {
            // that.$message.warning(res.message);
            that.$notification.warning({
              message: '消息',
              description: res.message
            })
          }
        }).finally(() => {
          this.loading = false
        })
      },

      handleDetail(record) {
        this.selectRowData = Object.assign({}, record)
        this.$refs.equipmentTransferApprovalModal.recordDetail(record)
        this.$refs.equipmentTransferApprovalModal.title = '详情'
        this.$refs.equipmentTransferApprovalModal.disableSubmit = true
      }
    }
  }
}
</script>
<style scoped>
@import '~@assets/less/common.less';
  @import '~@assets/less/common.less';
</style>

 src/views/flowable/workflow/FlowTodo.vue

@@ -397,13 +397,13 @@
          title: '前驱节点',
          align: 'center',
          dataIndex: 'preNode',
          width: 200
          width: 300
        },
        {
          title: '当前节点',
          align: 'center',
          dataIndex: 'name',
          width: 200
          width: 300
        },
        {
          title: '当前节点开始时间',

 src/views/flowable/workflow/transfer/EquipmentTransferApprovalModal.vue

@@ -293,19 +293,19 @@
      treeData: [],
      labelCol: {
        xs: { span: 24 },
        sm: { span: 5 }
        sm: { span: 6 }
      },
      wrapperCol: {
        xs: { span: 24 },
        sm: { span: 18 }
        sm: { span: 16 }
      },
      labelColLong: {
        xs: { span: 24 },
        sm: { span: 2 }
        sm: { span: 3 }
      },
      wrapperColLong: {
        xs: { span: 24 },
        sm: { span: 21 }
        sm: { span: 20 }
      },
      confirmLoading: false,
      spinning: false,
@@ -380,6 +380,7 @@
      console.log('record', record)
      this.initParams()
      this.model = Object.assign({}, record)
      this.spinning = false
    },

    initParams() {