From 6613785ce4eb0823cd5442ed0bb0987b0eae2069 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期六, 11 五月 2024 13:08:28 +0800
Subject: [PATCH] 1.时间组件DateType封装完成
---
src/views/workOrder/produceOrderList.vue | 160 ++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 139 insertions(+), 21 deletions(-)
diff --git a/src/views/workOrder/produceOrderList.vue b/src/views/workOrder/produceOrderList.vue
index 65c40f0..e8e656e 100644
--- a/src/views/workOrder/produceOrderList.vue
+++ b/src/views/workOrder/produceOrderList.vue
@@ -81,6 +81,14 @@
<el-input v-model="form.partspec" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
+ <DateType
+ ref="DateTypeRef"
+ :is-expand-form="isExpandForm"
+ style="display:flex;justify-content: center;align-items: center;position: relative"
+ @DateTypeChange="DateTypeChange"
+ @cycleTimeChange="cycleTimeChange"
+ />
+
<!-- <el-form-item-->
<!-- v-show="isExpandForm"-->
<!-- label="棰勮寮�宸ユ椂闂�"-->
@@ -89,7 +97,7 @@
<!-- >-->
<!-- <el-date-picker-->
<!-- v-model="form.paystartdate"-->
- <!-- type="daterange"-->
+ <!-- type="datetimerange"-->
<!-- range-separator="~"-->
<!-- class="timeMini"-->
<!-- size="mini"-->
@@ -97,8 +105,12 @@
<!-- :clearable="false"-->
<!-- start-placeholder="寮�濮嬫棩鏈�"-->
<!-- end-placeholder="缁撴潫鏃ユ湡"-->
+ <!-- :picker-options="pickerOptions"-->
+ <!-- value-format="yyyy-MM-dd"-->
+ <!-- @change="pickerChange"-->
<!-- />-->
<!-- </el-form-item>-->
+
<!-- <el-form-item-->
<!-- v-show="isExpandForm"-->
<!-- label="棰勮瀹屽伐鏃堕棿"-->
@@ -310,6 +322,32 @@
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column
+ prop="planenddate"
+ label="棰勮寮�宸ユ棩鏈�"
+ sortable="custom"
+ show-tooltip-when-overflow
+ width="130"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.planenddate">{{ row.planenddate.substring(0, 11) }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
+
+ <el-table-column
+ prop="planstartdate"
+ label="棰勮瀹屽伐鏃ユ湡"
+ sortable="custom"
+ show-tooltip-when-overflow
+ width="130"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.planstartdate">{{ row.planstartdate.substring(0, 11) }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
+
+ <el-table-column
prop="saleOrderDeliveryDate"
label="棰勮浜や粯鏃ユ湡"
sortable="custom"
@@ -321,6 +359,7 @@
<div v-else>/</div>
</template>
</el-table-column>
+
<el-table-column
show-tooltip-when-overflow
prop="createuser"
@@ -502,12 +541,14 @@
} from '@/api/WorkOrder'
import { SeaveSearchErpOrder } from '@/api/ErpSyncMes'
import { PrentOrganizationNoCompany } from '@/api/GeneralBasicData'
+import moment from 'moment'
+import DateType from '@/components/DateType'
const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
name: 'SCDD',
components: {
- Pagination
+ Pagination, DateType
},
directives: { elDragDialog, waves },
data() {
@@ -524,7 +565,7 @@
}
return {
mouseHoverType: 'mouseout',
- isExpandForm: false,
+ isExpandForm: true,
mainHeight: 0,
tableHeight: 0,
form: {
@@ -540,11 +581,16 @@
paystartdate: '', // 棰勮寮�宸ユ椂闂�
payenddate: '', // 棰勮瀹屽伐鏃堕棿
createdate: '', // 鍒涘缓鏃堕棿
+
+ datatype: 'ED', // 鏃堕棿绫诲瀷
+ timeValue: [], // 鏃堕棿鍊�
+
prop: 'wo', // 鎺掑簭瀛楁
order: 'desc', // 鎺掑簭瀛楁
page: 1, // 绗嚑椤�
rows: 20 // 姣忛〉澶氬皯鏉�
},
+
erporderstusArr: [
{ code: 'NEW', name: '鏂拌鍗�' },
{ code: 'CREATING', name: '閮ㄥ垎涓嬭揪' },
@@ -601,9 +647,49 @@
},
pickerOptions: {
- disabledDate(time) {
- return time.getTime() < Date.now() - 8.64e7
- }
+ shortcuts: [
+ {
+ text: '褰撳ぉ',
+ onClick(picker) {
+ const end = new Date()
+ const start = new Date()
+ start.setTime(start.getTime())
+ picker.$emit('pick', [start, end])
+ }
+ }, {
+ text: '杩戜笁澶�',
+ onClick(picker) {
+ const end = new Date()
+ const start = new Date()
+ start.setTime(start.getTime() - 3600 * 1000 * 24 * 3)
+ console.log([start, end], '[start, end]')
+ picker.$emit('pick', [start, end])
+ }
+ }, {
+ text: '杩戜竴鍛�',
+ onClick(picker) {
+ const end = new Date()
+ const start = new Date()
+ start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+ picker.$emit('pick', [start, end])
+ }
+ }, {
+ text: '杩戜竴涓湀',
+ onClick(picker) {
+ const end = new Date()
+ const start = new Date()
+ start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+ picker.$emit('pick', [start, end])
+ }
+ }, {
+ text: '杩戜笁涓湀',
+ onClick(picker) {
+ const end = new Date()
+ const start = new Date()
+ start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+ picker.$emit('pick', [start, end])
+ }
+ }]
},
multipleSelection: []
@@ -626,34 +712,53 @@
this.getHeight()
},
methods: {
+
+ DateTypeChange(value) {
+ console.log('asd', value)
+ this.form.datatype = value
+ },
+ cycleTimeChange(val) {
+ this.form.timeValue = val
+ },
+
+ pickerChange(value) {
+ console.log(value, 123)
+ this.cycleTime = null
+ },
+
async getPrentOrganizationNoCompany() {
const { data: res } = await PrentOrganizationNoCompany()
this.wkshopcodeArr = res
},
async getErpOrderSearch() {
console.log(this.form, 1)
- let tempDate2 = this.form.paystartdate
- if (tempDate2.length > 0) {
- tempDate2 = handleDatetime(tempDate2[0]) + '~' + handleDatetime(tempDate2[1])
- }
-
- let tempDate = this.form.payenddate
- if (tempDate.length > 0) {
- tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
- }
+ // let tempDate2 = this.form.paystartdate
+ // if (tempDate2.length > 0) {
+ // tempDate2 = handleDatetime(tempDate2[0]) + '~' + handleDatetime(tempDate2[1])
+ // }
+ //
+ // let tempDate = this.form.payenddate
+ // if (tempDate.length > 0) {
+ // tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
+ // }
const data = {
- wkshopcode: this.form.wkshopcode,
+
erporderstus: this.form.erporderstus, // 璁㈠崟鐘舵�佺爜
+ wkshopcode: this.form.wkshopcode, // 杞﹂棿缂栫爜
erpordercode: this.form.erpordercode, // 璁㈠崟缂栧彿
+ saleordercode: this.form.saleordercode, // 閿�鍞崟鍙�
+
partcode: this.form.partcode, // 浜у搧缂栫爜
partname: this.form.partname, // 浜у搧鍚嶇О
partspec: this.form.partspec, // 浜у搧瑙勬牸
- paystartdate: tempDate2, // 浜や粯鏃堕棿
- payenddate: tempDate, // 浜や粯鏃堕棿
- saleordercode: this.form.saleordercode,
+
+ datatype: this.form.datatype, // 鏃ユ湡绫诲瀷(璁″垝寮�宸�(PS)銆佽鍒掑畬宸�(PE)銆侀璁′氦浠�(ED))
+ searchdate: this.form.timeValue.join('~'), // 鏃堕棿娈�
+ // paystartdate: tempDate2, // 浜や粯鏃堕棿
+ // payenddate: tempDate, // 浜や粯鏃堕棿
+
creatuser: this.form.creatuser, // 鍒涘缓浜哄憳
- // createdate: this.form.createdate.toString().length > 0 ? handleDatetime(this.form.createdate) : '', // 鍒涘缓鏃堕棿
prop: this.form.prop, // 鎺掑簭瀛楁
order: this.form.order, // 鎺掑簭瀛楁
@@ -725,6 +830,12 @@
this.form.creatuser = ''
this.form.erpordercode = ''
this.form.createdate = ''
+
+ this.form.timeValue = []
+ this.cycleTime = null
+
+ this.$refs.DateTypeRef.clearValue()
+
this.getErpOrderSearch()
},
// 鍗曢�夋閫変腑鑾峰彇褰撳墠琛屼俊鎭�
@@ -1106,7 +1217,8 @@
margin-top: -3px;
}
}
-::v-deep .el-icon-delete {
+
+::v-deep .el-icon-delete {
cursor: pointer;
margin-right: 0px !important;
}
@@ -1123,5 +1235,11 @@
.el-loading-text {
font-size: 26px !important;
}
+
+.el-picker-panel__footer {
+ display: flex !important;
+ justify-content: flex-end !important;
+}
+
</style>
--
Gitblit v1.9.3