Merge remote-tracking branch 'origin/master'

zss

2024-01-18 c205e0765ae18536a5b15b5ecbd5d3d0558b57fc

 src/views/equipment/mouldrecord/index.vue

@@ -1,7 +1,7 @@
<template>
    <div class="mod-config">
        <basic-container>
        <!-- <ttable
      <ttable
        :table="table"
        :isShowHide="true"
        :ajaxFun="ajaxFun"
@@ -9,9 +9,10 @@
        :options="options" 
        ref="processconfiguration"
        >
        <template #toolbar></template>
        </ttable> -->
        <div>开发中。。。</div>
      <template #toolbar>

      </template>
      </ttable>
        </basic-container>
    </div>
</template>
@@ -50,14 +51,14 @@
                  {
                    minWidth: '140',
                    prop: 'packageNo',
                    label: '包装编号',
                  label: '设备',
                    isTrue: true,
                    isSearch: true,
                    searchInfoType: 'text',
                  },{
                    minWidth: '140',
                    prop: 'outBatchNo',
                    label: '批次号',
                  label: '模具编号',
                    isTrue: true,
                    isSearch: true,
                    searchInfoType: 'text',
@@ -65,7 +66,7 @@
                  {
                    minWidth: '140',
                    prop: 'partNo',
                    label: '产品编号',
                  label: '模具名称',
                    isTrue: true,
                    isSearch: true,
                    searchInfoType: 'text',
@@ -73,7 +74,7 @@
                  {
                    minWidth: '140',
                    prop: 'partName',
                    label: '产品名称',
                  label: '工序',
                    isTrue: true,
                    isSearch: true,
                    searchInfoType: 'text',
@@ -81,7 +82,7 @@
                  {
                    minWidth: '140',
                    prop: 'specs',
                    label: '规格型号',
                  label: '工步',
                    isTrue: true,
                    isSearch: true,
                    searchInfoType: 'text',
@@ -89,7 +90,7 @@
                  {
                    minWidth: '140',
                    prop: 'unit',
                    label: '单位',
                  label: '批号',
                    isTrue: true,
                    isSearch: true,
                    searchInfoType: 'text',
@@ -97,25 +98,39 @@
                  {
                    minWidth: '140',
                    prop: 'number',
                    label: '数量',
                  label: '产量',
                  isTrue: true,
                  isSearch: true,
                  searchInfoType: 'text',
                },
                {
                  minWidth: '140',
                  prop: 'number',
                  label: '寿命转换系数',
                  isTrue: true,
                  isSearch: true,
                  searchInfoType: 'text',
                },
                {
                  minWidth: '140',
                  prop: 'number',
                  label: '使用量',
                  isTrue: true,
                  isSearch: true,
                  searchInfoType: 'text',
                },
                {
                  minWidth: '140',
                  prop: 'number',
                  label: '报工单号',
                    isTrue: true,
                    isSearch: true,
                    searchInfoType: 'text',
                  },
                  {
                    minWidth: '130',
                    prop: 'createTime',
                    label: '入库时间',
                    sort: true,
                    isTrue: true,
                    isSearch: true,
                    searchInfoType: 'datetimerange',
                    formatter: this.formatDateTime,
                  },
                  {
                    minWidth: '130',
                    prop: 'createUser',
                    label: '创建人',
                  label: '状态',
                    sort: true,
                    isTrue: true,
                    isSearch: true,
@@ -128,7 +143,9 @@
            },
       }
    },

  // computed: {
  //   ...mapGetters(['permissions'])
  // },
    components: {
      ttable
    },