From 3f386968d4b5cbb002ad93483f86a5443159e18a Mon Sep 17 00:00:00 2001
From: 小小儁爺 <1694218219@qq.com>
Date: 星期六, 08 二月 2025 09:54:32 +0800
Subject: [PATCH] 1.递交
---
src/views/workOrder/produceOrderList.vue | 151 +++++++++++++++++++++++++++++++++-----------------
1 files changed, 99 insertions(+), 52 deletions(-)
diff --git a/src/views/workOrder/produceOrderList.vue b/src/views/workOrder/produceOrderList.vue
index e8e656e..e6ca71b 100644
--- a/src/views/workOrder/produceOrderList.vue
+++ b/src/views/workOrder/produceOrderList.vue
@@ -172,6 +172,8 @@
highlight-current-row
:header-cell-style="this.$headerCellStyle"
:cell-style="this.$cellStyle"
+ :summary-method="getSummaries"
+ show-summary
@sort-change="sortChange"
@selection-change="handleSelectionChange"
>
@@ -438,8 +440,8 @@
v-el-drag-dialog
:title="operation==='add'?'鏂板':'涓嬭揪'"
:visible.sync="dialogVisible"
- width="860px"
- top="15vh"
+ width="900px"
+ top="12vh"
:close-on-click-modal="false"
@closed="handleClose"
@close="handleClose"
@@ -497,6 +499,8 @@
style="width: 200px"
/>
</el-form-item>
+ <!-- :picker-options="pickerOptions"-->
+
<el-form-item label="棰勮浜や粯鏃ユ湡" prop="saleOrderDeliveryDate">
<el-date-picker
v-model="dialogForm.saleOrderDeliveryDate"
@@ -504,12 +508,44 @@
size="mini"
:clearable="false"
class="dateMini"
- :picker-options="pickerOptions"
format="yyyy-MM-dd"
+ style="width: 200px"
placeholder="閫夋嫨鏃ユ湡"
:disabled="dialogForm.saleOrderDeliveryDateIsDisabled"
/>
</el-form-item>
+
+ <div style="display: flex">
+ <el-form-item label="棰勮寮�宸ユ棩鏈�" prop="" style="display: flex">
+ <el-date-picker
+ v-model="dialogForm.paystartdate"
+ type="date"
+ size="mini"
+ style="width: 200px"
+ :clearable="false"
+ class="dateMini"
+ format="yyyy-MM-dd"
+ value-format="yyyy-MM-dd"
+ placeholder="閫夋嫨鏃ユ湡"
+ />
+ </el-form-item>
+
+ <el-form-item label="棰勮瀹屽伐鏃ユ湡" prop="" style="display: flex">
+ <el-date-picker
+ v-model="dialogForm.payenddate"
+ type="date"
+ size="mini"
+ style="width: 200px"
+ :clearable="false"
+ class="dateMini"
+ format="yyyy-MM-dd"
+ value-format="yyyy-MM-dd"
+ placeholder="閫夋嫨鏃ユ湡"
+ />
+ </el-form-item>
+
+ </div>
+
</el-form>
<span slot="footer" class="dialog-footer">
<div class="footerButton">
@@ -541,7 +577,6 @@
} 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]+$/
@@ -565,7 +600,7 @@
}
return {
mouseHoverType: 'mouseout',
- isExpandForm: true,
+ isExpandForm: false,
mainHeight: 0,
tableHeight: 0,
form: {
@@ -625,7 +660,10 @@
clerkuser: '', // 閿�鍞笟鍔″憳
- saleOrderDeliveryDate: '' // 棰勮浜や粯鏃ユ湡
+ saleOrderDeliveryDate: '', // 棰勮浜や粯鏃ユ湡
+
+ paystartdate: '', // 棰勮寮�宸ユ棩鏈�
+ payenddate: ''// 棰勮瀹屽伐鏃ユ湡
},
operation: '',
dialogFormRules: {
@@ -647,49 +685,9 @@
},
pickerOptions: {
- 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])
- }
- }]
+ disabledDate(time) {
+ return time.getTime() < Date.now() - 8.64e7
+ }
},
multipleSelection: []
@@ -714,7 +712,6 @@
methods: {
DateTypeChange(value) {
- console.log('asd', value)
this.form.datatype = value
},
cycleTimeChange(val) {
@@ -828,7 +825,7 @@
this.form.paystartdate = ''
this.form.payenddate = ''
this.form.creatuser = ''
- this.form.erpordercode = ''
+ this.form.saleordercode = ''
this.form.createdate = ''
this.form.timeValue = []
@@ -922,7 +919,10 @@
'relse_qty': i.qty,
'saleordercode': i.saleOrderCode,
// 'saleOrderDeliveryDate': i.saleOrderDeliveryDate
- 'saleOrderDeliveryDate': handleDatetime(new Date()) + ' 00:00:00'
+ 'saleOrderDeliveryDate': handleDatetime(new Date()) + ' 00:00:00',
+
+ 'paystartdate': i.planstartdate,
+ 'payenddate': i.planenddate
})
})
// console.log(JSON.parse(JSON.stringify(data)))
@@ -982,6 +982,9 @@
this.dialogForm.ordernum = 1
this.dialogForm.relse_qty = row.relse_qty
this.dialogForm.clerkuser = row.clerkuser
+
+ this.dialogForm.paystartdate = row.planstartdate
+ this.dialogForm.payenddate = row.planenddate
})
},
// 瀵硅瘽妗嗗叧闂簨浠�
@@ -1006,6 +1009,9 @@
markqty: '', // 涓嬪崟鏁伴噺
ordernum: '', // 涓嬪崟鍗曟暟
relse_qty: '', // 宸蹭笅鍗曟暟閲�
+
+ payenddate: '', // 棰勮瀹屽伐鏃ユ湡
+ paystartdate: '', // 棰勮寮�宸ユ棩鏈�
saleOrderDeliveryDate: '' // 棰勮浜や粯鏃ユ湡
}
@@ -1044,6 +1050,8 @@
'erpqty': this.dialogForm.erpqty,
'markqty': this.dialogForm.markqty,
'ordernum': this.dialogForm.ordernum,
+ 'payenddate': this.dialogForm.payenddate,
+ 'paystartdate': this.dialogForm.paystartdate,
'relse_qty': this.dialogForm.relse_qty,
'saleOrderDeliveryDate': handleDatetime(this.dialogForm.saleOrderDeliveryDate) + ' 00:00:00'
}
@@ -1072,6 +1080,45 @@
},
tableRowClassName({ row, rowIndex }) {
return 'custom-row'
+ },
+ getSummaries(param) {
+ const { columns, data } = param
+ const sums = []
+ const i = 7
+ columns.forEach((column, index) => {
+ if (index === i) {
+ sums[index] = '鎬绘暟'
+ return
+ }
+ const values = data.map(item => Number(item[column.property]))
+ if (column.property === 'qty') {
+ sums[index] = values.reduce((prev, curr) => {
+ const value = Number(curr)
+ if (!isNaN(value)) {
+ return prev + curr
+ // return Math.round(prev * 100) / 100 + Math.round(curr * 100) / 100
+ }
+ }, 0)
+
+ sums[index] += ' 鍗�'
+ }
+ if (column.property === 'relse_qty') {
+ sums[index] = values.reduce((prev, curr) => {
+ const value = Number(curr)
+ if (!isNaN(value)) {
+ return prev + curr
+ // return Math.round(prev * 100) / 100 + Math.round(curr * 100) / 100
+ }
+ }, 0)
+
+ sums[index] += ' 鍗�'
+ }
+ })
+
+ this.$nextTick(() => {
+ this.$refs.tableDataRef.doLayout()
+ })
+ return sums
}
}
}
--
Gitblit v1.9.3