From 7dc3cff679f70fe8abd10d9289fde16a2d1d0203 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 17 一月 2024 16:40:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/page/ScheduleData/index.vue | 4
src/views/equipment/mouldrecord/index.vue | 141 ++++++++++++++++++++++++++++
src/views/equipment/mould/index.vue | 140 ++++++++++++++++++++++++++++
3 files changed, 284 insertions(+), 1 deletions(-)
diff --git a/src/page/ScheduleData/index.vue b/src/page/ScheduleData/index.vue
index cdb20fd..612e2c3 100644
--- a/src/page/ScheduleData/index.vue
+++ b/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)
diff --git a/src/views/equipment/mould/index.vue b/src/views/equipment/mould/index.vue
new file mode 100644
index 0000000..9ed8bab
--- /dev/null
+++ b/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>
\ No newline at end of file
diff --git a/src/views/equipment/mouldrecord/index.vue b/src/views/equipment/mouldrecord/index.vue
new file mode 100644
index 0000000..0884c56
--- /dev/null
+++ b/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>
--
Gitblit v1.9.3