Merge remote-tracking branch 'origin/master'

zss

2024-01-17 7dc3cff679f70fe8abd10d9289fde16a2d1d0203

Merge remote-tracking branch 'origin/master'

 src/page/ScheduleData/index.vue

@@ -13,7 +13,7 @@
            @click="getCurrent(i)"
            ref="listItem"
          >
            è®¢å•å·ï¼š{{ x.customerOrderNo }}/{{ x.otcLineNo }}
            è®¢å•å·ï¼š{{ x.contractNo }}
          </div>
        </div>
        <!-- <el-pagination
@@ -176,6 +176,7 @@
        },
        1
      ).then((res) => {
        console.log(res,"1");
        const d = res.data.data
        this.pagination.total = d.total
        d.records.forEach((e) => (e.active = false))
@@ -212,6 +213,7 @@
                color: '#14a9d7'
              })
            )
            console.log(this.tasks,"----===");
            let endDate = e.actualFinishDate
            if (!e.actualFinishDate) {
              const s = Date.parse(e.actualStartDate)

 src/views/equipment/mould/index.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,140 @@
<template>
    <div class="mod-config">
        <basic-container>
        <!-- <ttable
        :table="table"
        :isShowHide="true"
        :ajaxFun="ajaxFun"
        :prelang="prelang"
        :options="options" 
        ref="processconfiguration"
        > -->
        <!-- <template #toolbar></template>
        </ttable> -->
        <div>开发中。。。</div>
        </basic-container>
    </div>
</template>

<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: {
                height: 300, // é»˜è®¤é«˜åº¦-为了表头固定
                stripe: true, // æ˜¯å¦ä¸ºæ–‘马纹 table
                highlightCurrentRow: false, // æ˜¯å¦è¦é«˜äº®å½“前行
                border: true, // æ˜¯å¦æœ‰çºµå‘边框
                lazy: false, // æ˜¯å¦éœ€è¦æ‡’加载
                fit: true, // åˆ—的宽度是否自撑开
                multiSelect: true, //
                seqNo: true,
                isShowHide: true, // æ˜¯å¦æ˜¾ç¤ºæ˜¾å½±æŒ‰é’®
                isRefresh: true, // æ˜¯å¦æ˜¾ç¤ºåˆ·æ–°æŒ‰é’®
                isSearch: true, // é«˜çº§æŸ¥è¯¢æŒ‰é’®
                defaultOrderBy: { column: 'createTime', direction: 'desc' }
            },
            table: {
                total: 0,
                currentPage: 1,
                pageSize: 20,
                data: [],
                // æ ‡é¢˜
                column: [
                  {
                    minWidth: '140',
                    prop: 'packageNo',
                    label: '包装编号',
                    isTrue: true,
                    isSearch: true,
                    searchInfoType: 'text',
                  },{
                    minWidth: '140',
                    prop: 'outBatchNo',
                    label: '批次号',
                    isTrue: true,
                    isSearch: true,
                    searchInfoType: 'text',
                  },
                  {
                    minWidth: '140',
                    prop: 'partNo',
                    label: '产品编号',
                    isTrue: true,
                    isSearch: true,
                    searchInfoType: 'text',
                  },
                  {
                    minWidth: '140',
                    prop: 'partName',
                    label: '产品名称',
                    isTrue: true,
                    isSearch: true,
                    searchInfoType: 'text',
                  },
                  {
                    minWidth: '140',
                    prop: 'specs',
                    label: '规格型号',
                    isTrue: true,
                    isSearch: true,
                    searchInfoType: 'text',
                  },
                  {
                    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,
                    isTrue: true,
                    isSearch: true,
                    searchInfoType: 'text',
                  },
                ],
                toolbar: [],
                // operator: [],
                // operatorConfig: {}
            },
       }
    },
    components: {
      ttable
    },
    medthods: {
      formatDateTime(row, column, cellValue) {
          return cellValue ? fecha.format(new Date(cellValue), 'yyyy-MM-dd') : ''
      },
    },
}
</script>

 src/views/equipment/mouldrecord/index.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,141 @@
<template>
    <div class="mod-config">
        <basic-container>
        <!-- <ttable
        :table="table"
        :isShowHide="true"
        :ajaxFun="ajaxFun"
        :prelang="prelang"
        :options="options" 
        ref="processconfiguration"
        >
        <template #toolbar></template>
        </ttable> -->
        <div>开发中。。。</div>
        </basic-container>
    </div>
</template>

<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: {
                height: 300, // é»˜è®¤é«˜åº¦-为了表头固定
                stripe: true, // æ˜¯å¦ä¸ºæ–‘马纹 table
                highlightCurrentRow: false, // æ˜¯å¦è¦é«˜äº®å½“前行
                border: true, // æ˜¯å¦æœ‰çºµå‘边框
                lazy: false, // æ˜¯å¦éœ€è¦æ‡’加载
                fit: true, // åˆ—的宽度是否自撑开
                multiSelect: true, //
                seqNo: true,
                isShowHide: true, // æ˜¯å¦æ˜¾ç¤ºæ˜¾å½±æŒ‰é’®
                isRefresh: true, // æ˜¯å¦æ˜¾ç¤ºåˆ·æ–°æŒ‰é’®
                isSearch: true, // é«˜çº§æŸ¥è¯¢æŒ‰é’®
                defaultOrderBy: { column: 'createTime', direction: 'desc' }
            },
            table: {
                total: 0,
                currentPage: 1,
                pageSize: 20,
                data: [],
                // æ ‡é¢˜
                column: [
                  {
                    minWidth: '140',
                    prop: 'packageNo',
                    label: '包装编号',
                    isTrue: true,
                    isSearch: true,
                    searchInfoType: 'text',
                  },{
                    minWidth: '140',
                    prop: 'outBatchNo',
                    label: '批次号',
                    isTrue: true,
                    isSearch: true,
                    searchInfoType: 'text',
                  },
                  {
                    minWidth: '140',
                    prop: 'partNo',
                    label: '产品编号',
                    isTrue: true,
                    isSearch: true,
                    searchInfoType: 'text',
                  },
                  {
                    minWidth: '140',
                    prop: 'partName',
                    label: '产品名称',
                    isTrue: true,
                    isSearch: true,
                    searchInfoType: 'text',
                  },
                  {
                    minWidth: '140',
                    prop: 'specs',
                    label: '规格型号',
                    isTrue: true,
                    isSearch: true,
                    searchInfoType: 'text',
                  },
                  {
                    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,
                    isTrue: true,
                    isSearch: true,
                    searchInfoType: 'text',
                  },
                ],
                toolbar: [],
                // operator: [],
                // operatorConfig: {}
            },
       }
    },

    components: {
      ttable
    },
    medthods: {
      formatDateTime(row, column, cellValue) {
          return cellValue ? fecha.format(new Date(cellValue), 'yyyy-MM-dd') : ''
      },
    },
}
</script>