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>
@@ -120,6 +121,10 @@

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

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

@@ -129,18 +134,21 @@
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: {
      EquipmentTransferApprovalModal,
    EamEquipmentTransferModal,
    LxSearchEquipmentSelect
  },
  data() {
    return {
      description: '设备归属变动管理页面',
        selectRowData: {},
      // 表头
      columns: [
        {
@@ -335,6 +343,13 @@
      }).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
    }
  }
}

 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() {