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 | 431 ++++++++++++++---------------------------------------
1 files changed, 116 insertions(+), 315 deletions(-)
diff --git a/src/views/workOrder/produceOrderList.vue b/src/views/workOrder/produceOrderList.vue
index f6009d5..e6ca71b 100644
--- a/src/views/workOrder/produceOrderList.vue
+++ b/src/views/workOrder/produceOrderList.vue
@@ -81,148 +81,13 @@
<el-input v-model="form.partspec" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
- <div v-show="isExpandForm" style="display:flex;justify-content: center;align-items: center;position: relative">
-
- <el-popover
- v-model="cycleTimePopoverIsShow"
- placement="bottom"
- width="500"
- trigger="hover"
- @show="cycleTimePopoverIsShow=true"
- >
- <div class="popoverList">
- <div class="popoverListItem">
- <div style="width: 40px">鍛�</div>
- <el-button
- :class="cycleTime===1?'selectButton':''"
- @click="cycleTimeClick(1)"
- >鏈� 鍛�</el-button>
- <el-button
- :class="cycleTime===2?'selectButton':''"
- @click="cycleTimeClick(2)"
- >涓� 鍛�</el-button>
- </div>
- <div class="popoverListItem">
- <div style="width: 40px">鏈�</div>
- <el-button
- :class="cycleTime===3?'selectButton':''"
- @click="cycleTimeClick(3)"
- >鏈� 鏈�</el-button>
- <el-button
- :class="cycleTime===4?'selectButton':''"
- @click="cycleTimeClick(4)"
- >涓� 鏈�</el-button>
- </div>
- <div class="popoverListItem">
- <div style="width: 40px">瀛�</div>
- <el-button
- :class="cycleTime===5?'selectButton':''"
- @click="cycleTimeClick(5)"
- >鏈� 瀛�</el-button>
- <el-button
- :class="cycleTime===6?'selectButton':''"
- @click="cycleTimeClick(6)"
- >涓� 瀛�</el-button>
- </div>
- <div class="popoverListItem">
- <div style="width: 40px">骞�</div>
- <el-button
- :class="cycleTime===7?'selectButton':''"
- @click="cycleTimeClick(7)"
- >鏈� 骞�</el-button>
- <el-button
- :class="cycleTime===8?'selectButton':''"
- @click="cycleTimeClick(8)"
- >涓� 骞�</el-button>
- </div>
- <div class="popoverListItem">
- <div style="width: 40px">鍏朵粬</div>
- <el-button
- :class="cycleTime===9?'selectButton':''"
- @click="cycleTimeClick(9)"
- >杩�3澶�</el-button>
- <el-button
- :class="cycleTime===10?'selectButton':''"
- @click="cycleTimeClick(10)"
- >杩�7澶�</el-button>
- <el-button
- :class="cycleTime===11?'selectButton':''"
- @click="cycleTimeClick(11)"
- >杩�14澶�</el-button>
- <el-button
- :class="cycleTime===12?'selectButton':''"
- @click="cycleTimeClick(12)"
- >浠� 澶�</el-button>
- <el-button
- :class="cycleTime===13?'selectButton':''"
- @click="cycleTimeClick(13)"
- >鏄� 澶�</el-button>
- </div>
-
- </div>
-
- <div
- slot="reference"
- style="width:15px;height:15px;background:transparent;
- cursor: pointer;position:absolute;z-index: 100;left: 110px;top:13px"
- />
-
- </el-popover>
-
- <el-popover
- placement="bottom"
- width="100"
- trigger="hover"
- :value="datatypePopoverIsShow"
- @show="datatypePopoverIsShow=true"
- >
- <div class="popoverList">
- <div class="popoverListItem2">
- <el-button
- :class="form.datatype==='PS'?'selectButton':''"
- @click="form.datatype='PS';datatypePopoverIsShow=false"
- >棰勮寮�宸ユ棩鏈�</el-button>
- </div>
- <div class="popoverListItem2">
- <el-button
- :class="form.datatype==='PE'?'selectButton':''"
- @click="form.datatype='PE';datatypePopoverIsShow=false"
- >棰勮瀹屽伐鏃ユ湡</el-button>
- </div>
- <div class="popoverListItem2">
- <el-button
- :class="form.datatype==='ED'?'selectButton':''"
- @click="form.datatype='ED';datatypePopoverIsShow=false"
- >棰勮浜や粯鏃ユ湡</el-button>
- </div>
- </div>
-
- <div
- slot="reference"
- style="color: #a7a7a7;
- font-weight: 600;
- font-family:'Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif';
- font-size:14px;width: 100px;text-align: center"
- > {{ form.datatype==='PS'? '棰勮寮�宸ユ棩鏈�':form.datatype==='PE'?'棰勮瀹屽伐鏃ユ湡':'棰勮浜や粯鏃ユ湡' }}
- </div>
-
- </el-popover>
-
- <el-date-picker
- v-model="form.timeValue"
- type="daterange"
- range-separator="~"
- class="timeMini"
- size="mini"
- style="width: 200px;display: flex;line-height: 34px;height: 34px;margin-right: 10px"
- :clearable="false"
- start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡"
- value-format="yyyy-MM-dd"
- @change="pickerChange"
- />
- <!-- :picker-options="pickerOptions"-->
- </div>
+ <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"-->
@@ -307,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"
>
@@ -573,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"
@@ -632,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"
@@ -639,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">
@@ -676,13 +577,13 @@
} 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() {
@@ -724,9 +625,7 @@
page: 1, // 绗嚑椤�
rows: 20 // 姣忛〉澶氬皯鏉�
},
- datatypePopoverIsShow: false,
- cycleTime: null, // 鏃堕棿鍛ㄦ湡
- cycleTimePopoverIsShow: false,
+
erporderstusArr: [
{ code: 'NEW', name: '鏂拌鍗�' },
{ code: 'CREATING', name: '閮ㄥ垎涓嬭揪' },
@@ -761,7 +660,10 @@
clerkuser: '', // 閿�鍞笟鍔″憳
- saleOrderDeliveryDate: '' // 棰勮浜や粯鏃ユ湡
+ saleOrderDeliveryDate: '', // 棰勮浜や粯鏃ユ湡
+
+ paystartdate: '', // 棰勮寮�宸ユ棩鏈�
+ payenddate: ''// 棰勮瀹屽伐鏃ユ湡
},
operation: '',
dialogFormRules: {
@@ -783,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: []
@@ -849,102 +711,11 @@
},
methods: {
- cycleTimeClick(value) {
- this.cycleTimePopoverIsShow = false
-
- const date = new Date()
- const cWeek = moment(date).format('E')
- let newDate = []
- switch (value) {
- case 1:// 鏈懆
- newDate = [
- moment(date).subtract(Number(cWeek) - 1, 'days').format('YYYY-MM-DD'),
- moment(moment().week(moment().week()).endOf('week').valueOf()).format('YYYY-MM-DD')
- ]
- break
- case 2:// 涓婂懆
- newDate = [
- moment(moment().add(-13, 'days').startOf('day').valueOf()).format('YYYY-MM-DD'),
- moment(moment().add(-6, 'days').startOf('day').valueOf()).format('YYYY-MM-DD')
- ]
- break
-
- case 3:// 鏈湀
- newDate = [
- moment(moment().month(moment().month()).startOf('month').valueOf()).format('YYYY-MM-DD'),
- moment(moment().month(moment().month()).endOf('month').valueOf()).format('YYYY-MM-DD')
- ]
- break
-
- case 4:// 涓婃湀
- newDate = [
- moment(moment().month(moment().month() - 1).startOf('month').valueOf()).format('YYYY-MM-DD'),
- moment(moment().month(moment().month()).startOf('month').valueOf()).add(-1, 'days').format('YYYY-MM-DD')
- ]
- break
-
- case 5:// 鏈搴�
- newDate = [
- moment(moment().quarter(moment().quarter()).startOf('quarter').valueOf()).format('YYYY-MM-DD'),
- moment(moment().quarter(moment().quarter()).endOf('quarter').valueOf()).format('YYYY-MM-DD')
- ]
- break
-
- case 6:// 涓婂搴�
- newDate = [
- moment(moment().quarter(moment().quarter() - 1).startOf('quarter').valueOf()).format('YYYY-MM-DD'),
- moment(moment().quarter(moment().quarter() - 1).endOf('quarter').valueOf()).format('YYYY-MM-DD')
- ]
- break
-
- case 7:// 鏈勾
- newDate = [
- moment(moment().year(moment().year()).startOf('year').valueOf()).format('YYYY-MM-DD'),
- moment(moment().year(moment().year()).endOf('year').valueOf()).format('YYYY-MM-DD')
- ]
- break
-
- case 8:// 鍘诲勾
- newDate = [
- moment(moment().year(moment().year() - 1).startOf('year').valueOf()).format('YYYY-MM-DD'),
- moment(moment().year(moment().year() - 1).endOf('year').valueOf()).format('YYYY-MM-DD')
- ]
- break
-
- case 9:// 杩�3澶�
- newDate = [
- moment(moment().add(-2, 'days').startOf('day').valueOf()).format('YYYY-MM-DD'),
- moment(moment().startOf('day').valueOf()).format('YYYY-MM-DD')
- ]
- break
- case 10:// 杩�7澶�
- newDate = [
- moment(moment().add(-6, 'days').startOf('day').valueOf()).format('YYYY-MM-DD'),
- moment(moment().startOf('day').valueOf()).format('YYYY-MM-DD')
- ]
- break
- case 11:// 杩�14澶�
- newDate = [
- moment(moment().add(-13, 'days').startOf('day').valueOf()).format('YYYY-MM-DD'),
- moment(moment().startOf('day').valueOf()).format('YYYY-MM-DD')
- ]
- break
- case 12:// 浠婂ぉ
- newDate = [
- moment(moment().startOf('day').valueOf()).format('YYYY-MM-DD'),
- moment(moment().startOf('day').valueOf()).format('YYYY-MM-DD')
- ]
- break
- case 13:// 鏄ㄥぉ
- newDate = [
- moment(moment().add(-1, 'days').startOf('day').valueOf()).format('YYYY-MM-DD'),
- moment(moment().startOf('day').valueOf()).format('YYYY-MM-DD')
- ]
- break
- }
-
- this.form.timeValue = newDate
- this.cycleTime = value
+ DateTypeChange(value) {
+ this.form.datatype = value
+ },
+ cycleTimeChange(val) {
+ this.form.timeValue = val
},
pickerChange(value) {
@@ -1054,11 +825,14 @@
this.form.paystartdate = ''
this.form.payenddate = ''
this.form.creatuser = ''
- this.form.erpordercode = ''
+ this.form.saleordercode = ''
this.form.createdate = ''
this.form.timeValue = []
this.cycleTime = null
+
+ this.$refs.DateTypeRef.clearValue()
+
this.getErpOrderSearch()
},
// 鍗曢�夋閫変腑鑾峰彇褰撳墠琛屼俊鎭�
@@ -1145,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)))
@@ -1205,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
})
},
// 瀵硅瘽妗嗗叧闂簨浠�
@@ -1229,6 +1009,9 @@
markqty: '', // 涓嬪崟鏁伴噺
ordernum: '', // 涓嬪崟鍗曟暟
relse_qty: '', // 宸蹭笅鍗曟暟閲�
+
+ payenddate: '', // 棰勮瀹屽伐鏃ユ湡
+ paystartdate: '', // 棰勮寮�宸ユ棩鏈�
saleOrderDeliveryDate: '' // 棰勮浜や粯鏃ユ湡
}
@@ -1267,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'
}
@@ -1295,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
}
}
}
@@ -1303,29 +1127,6 @@
<!--鍏叡椤甸潰鏍峰紡-->
<style lang="scss" scoped>
$main_color: #42b983;
-
-.popoverList {
- display: flex;
- flex-direction: column;
-}
-
-.popoverListItem {
- height: 50px;
- display: flex;
- align-items: center;
- justify-content: flex-start;
-}
-
-.popoverListItem2 {
- height: 40px;
- display: flex;
- align-items: center;
- justify-content: flex-start;
-}
-
-.selectButton {
- color: #42B983;
-}
::v-deep .el-range__icon {
line-height: 28px !important;
--
Gitblit v1.9.3