Merge remote-tracking branch 'origin/master'

zss

2024-01-18 c205e0765ae18536a5b15b5ecbd5d3d0558b57fc

 src/views/equipment/mould/index.vue

@@ -1,17 +1,31 @@
<template>
    <div class="mod-config">
        <basic-container>
        <!-- <ttable
      <ttable
        :table="table"
        :isShowHide="true"
        :ajaxFun="ajaxFun"
        :prelang="prelang"
        :options="options" 
        ref="processconfiguration"
        > -->
        <!-- <template #toolbar></template>
        </ttable> -->
        <div>开发中。。。</div>
      >
      <template #toolbar>
        <el-button  type="primary"
                @click="">新增</el-button>
                <!-- <el-dropdown style="margin-left: 20px;" @command="handleCommand">
                    <el-button >
                      状态变更<i class="el-icon-arrow-down el-icon--right"></i>
                    </el-button>
                    <el-dropdown-menu slot="dropdown">
                      <el-dropdown-item :key="index" 
                        :command="item.label"
                        v-for="(item,index) in taskTypeArr" 
                        >{{ item.label }}</el-dropdown-item
                      >
                    </el-dropdown-menu>
                </el-dropdown> -->
      </template>
      </ttable>
        </basic-container>
    </div>
</template>
@@ -50,14 +64,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 +79,7 @@
                  {
                    minWidth: '140',
                    prop: 'partNo',
                    label: '产品编号',
                  label: '模具名称',
                    isTrue: true,
                    isSearch: true,
                    searchInfoType: 'text',
@@ -73,7 +87,7 @@
                  {
                    minWidth: '140',
                    prop: 'partName',
                    label: '产品名称',
                  label: '工序',
                    isTrue: true,
                    isSearch: true,
                    searchInfoType: 'text',
@@ -81,7 +95,7 @@
                  {
                    minWidth: '140',
                    prop: 'specs',
                    label: '规格型号',
                  label: '工步',
                    isTrue: true,
                    isSearch: true,
                    searchInfoType: 'text',
@@ -89,45 +103,31 @@
                  {
                    minWidth: '140',
                    prop: 'unit',
                    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: '创建人',
                    sort: true,
                  label: '寿命转换系数',
                    isTrue: true,
                    isSearch: true,
                    searchInfoType: 'text',
                  },
                ],
                toolbar: [],
                // operator: [],
                // operatorConfig: {}
              operator: [{
                text: '删除',
                type: 'text',
                size: 'small',
                fun: this.deleteHandle
              }],
              operatorConfig: {
                fixed: 'right',
                label: '操作',
                width: 100,
                minWidth: 100
                },
            },
       }
    },
  // computed: {
  //   ...mapGetters(['permissions'])
  // },
    components: {
      ttable
    },