Merge remote-tracking branch 'origin/master'

王震

2023-12-13 67da82f0b0c24df5f19bbfcfec63801d9ae902d8

 src/views/warehouse/FinishedDelivery/index.vue

@@ -4,6 +4,7 @@
        <ttable
        :table="table"
        :isShowHide="true"
        :ajaxFun="ajaxFun"
        :prelang="prelang"
        :options="options" 
        ref="processconfiguration"
@@ -16,9 +17,12 @@

<script>
import ttable from '@/views/common/ztt-table.vue'
import { fetchList, } from '@/api/quality/finishedDelivery'

export default {
    data(){
        return {
            ajaxFun: fetchList,
            prelang: 'operation',
            dataListLoading: false,
            options: {
@@ -44,22 +48,30 @@
                column: [
                  {
                    minWidth: '140',
                    prop: 'oo',
                    label: '订单编号',
                    prop: 'packageNo',
                    label: '包装编号',
                    isTrue: true,
                    isSearch: true,
                    searchInfoType: 'text',
                  },{
                    minWidth: '140',
                    prop: 'materhhooial',
                    label: '质量追溯号',
                    prop: 'outBatchNo',
                    label: '批次号',
                    isTrue: true,
                    isSearch: true,
                    searchInfoType: 'text',
                  },
                  {
                    minWidth: '140',
                    prop: 'mateuurial',
                    prop: 'partNo',
                    label: '产品编号',
                    isTrue: true,
                    isSearch: true,
                    searchInfoType: 'text',
                  },
                  {
                    minWidth: '140',
                    prop: 'partName',
                    label: '产品名称',
                    isTrue: true,
                    isSearch: true,
@@ -67,7 +79,7 @@
                  },
                  {
                    minWidth: '140',
                    prop: 'materoiial',
                    prop: 'specs',
                    label: '规格型号',
                    isTrue: true,
                    isSearch: true,
@@ -75,7 +87,7 @@
                  },
                  {
                    minWidth: '140',
                    prop: 'matperoial',
                    prop: 'unit',
                    label: '单位',
                    isTrue: true,
                    isSearch: true,
@@ -83,7 +95,7 @@
                  },
                  {
                    minWidth: '140',
                    prop: 'materpial',
                    prop: 'number',
                    label: '数量',
                    isTrue: true,
                    isSearch: true,
@@ -91,34 +103,40 @@
                  },
                  {
                    minWidth: '130',
                    width: '150',
                    prop: 'dealTime',
                    prop: 'createTime',
                    label: '入库时间',
                    sort: true,
                    isTrue: true,
                    isSearch: true,
                    searchInfoType: 'datetimerange',
                    // formatter: this.formatDateTime,
                },
                ],
                toolbar: [
                    formatter: this.formatDateTime,
                  },
                  {
                    text: 'xxx',
                    type: 'primary',
                    // fun: this.addOrUpdateHandle
                    minWidth: '130',
                    prop: 'createUser',
                    label: '创建人',
                    sort: true,
                    isTrue: true,
                    isSearch: true,
                    searchInfoType: 'text',
                  },
                ],
                toolbar: [],
                // operator: [],
                // operatorConfig: {}
            },
       }
    },
    medthods: {},
//     computed: {
//     ...mapGetters(['permissions'])
//   },
    // computed: {
    //   ...mapGetters(['permissions'])
    // },
    components: {
    ttable
      ttable
    },
    medthods: {
      formatDateTime(row, column, cellValue) {
          return cellValue ? fecha.format(new Date(cellValue), 'yyyy-MM-dd') : ''
      },
    },
}
</script>