From 37b9050ec94b02b4c197fd2bb508bb9857cc56a1 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期六, 26 十一月 2022 11:24:39 +0800
Subject: [PATCH] 1.自动排程代码优化
---
src/views/scgl/scdd.vue | 80 ++++++++++++++++++++++++++++++++++++----
1 files changed, 72 insertions(+), 8 deletions(-)
diff --git a/src/views/scgl/scdd.vue b/src/views/scgl/scdd.vue
index c6c1ced..4c05eee 100644
--- a/src/views/scgl/scdd.vue
+++ b/src/views/scgl/scdd.vue
@@ -55,7 +55,7 @@
<el-form-item v-show="isExpandForm" label="鍒涘缓浜哄憳" style=" display: flex;">
<el-input v-model="form.creatuser" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
- <el-form-item v-show="isExpandForm" label="棰勮寮�宸ユ椂闂�" label-width="100px" style=" line-height: 40px;;display: flex;font-size: 14px;">
+ <el-form-item v-show="isExpandForm" label="棰勮寮�宸ユ椂闂�" label-width="100px" style="display: flex;font-size: 14px;align-items: center">
<el-date-picker
v-model="form.paystartdate"
type="daterange"
@@ -71,7 +71,7 @@
<!-- :picker-options="expireTimeOption"-->
</el-form-item>
- <el-form-item v-show="isExpandForm" label="棰勮瀹屽伐鏃堕棿" label-width="100px" style=" display: flex;font-size: 14px;">
+ <el-form-item v-show="isExpandForm" label="棰勮瀹屽伐鏃堕棿" label-width="100px" style=" display: flex;font-size: 14px;align-items: center">
<el-date-picker
v-model="form.payenddate"
type="daterange"
@@ -135,6 +135,7 @@
:header-cell-style="this.$headerCellStyle"
:cell-style="this.$cellStyle"
@sort-change="sortChange"
+ @row-click="rowClick"
>
<!-- <el-table-column-->
<!-- type="selection"-->
@@ -149,8 +150,8 @@
v-model="radioSelectedId"
:label="row.id"
style="color: transparent;padding-left: 10px;"
- @change.native="getCurrentRow(row.id)"
/>
+ <!-- @change.native="getCurrentRow(row.id)"-->
</template>
</el-table-column>
<el-table-column
@@ -189,11 +190,13 @@
label="浜у搧鍚嶇О"
sortable="custom"
min-width="150"
+ show-tooltip-when-overflow
/>
<el-table-column
prop="partspec"
label="浜у搧瑙勬牸"
sortable="custom"
+ show-tooltip-when-overflow
min-width="110"
>
<template slot-scope="{row}">
@@ -243,6 +246,17 @@
>
<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="saleOrderDeliveryDate"
+ label="棰勮浜や粯鏃堕棿"
+ sortable="custom"
+ width="130"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.saleOrderDeliveryDate">{{ row.saleOrderDeliveryDate.substring(0,11) }}</div>
<div v-else>/</div>
</template>
</el-table-column>
@@ -299,13 +313,13 @@
<el-dialog
:title="operation==='add'?'鏂板':'涓嬭揪'"
:visible.sync="dialogVisible"
- width="800px"
+ width="860px"
top="15vh"
:close-on-click-modal="false"
@closed="handleClose"
@close="handleClose"
>
- <el-form ref="dialogForm" inline :rules="dialogFormRules" :model="dialogForm" label-width="80px">
+ <el-form ref="dialogForm" inline :rules="dialogFormRules" :model="dialogForm" label-width="106px">
<!-- <el-form-item label="璁㈠崟鐘舵��" prop="erporderstus">-->
<!-- <el-select-->
<!-- v-model="dialogForm.erporderstus"-->
@@ -366,6 +380,19 @@
style="width: 200px"
/>
</el-form-item>
+ <el-form-item label="棰勮浜や粯鏃ユ湡" prop="saleOrderDeliveryDate">
+ <el-date-picker
+ v-model="dialogForm.saleOrderDeliveryDate"
+ type="date"
+ size="mini"
+ :clearable="false"
+ class="dateMini"
+ :picker-options="pickerOptions"
+ format="yyyy-MM-dd"
+ placeholder="閫夋嫨鏃ユ湡"
+ />
+ </el-form-item>
+
</el-form>
<span slot="footer" class="dialog-footer">
<div class="footerButton">
@@ -422,7 +449,7 @@
paystartdate: '', // 棰勮寮�宸ユ椂闂�
payenddate: '', // 棰勮瀹屽伐鏃堕棿
createdate: '', // 鍒涘缓鏃堕棿
- prop: 'createdate', // 鎺掑簭瀛楁
+ prop: 'wo', // 鎺掑簭瀛楁
order: 'desc', // 鎺掑簭瀛楁
page: 1, // 绗嚑椤�
rows: 20 // 姣忛〉澶氬皯鏉�
@@ -454,7 +481,8 @@
erpqty: '', // 璁㈠崟鏁伴噺
markqty: '', // 涓嬪崟鏁伴噺
ordernum: '', // 涓嬪崟鍗曟暟
- relse_qty: '' // 宸蹭笅鍗曟暟閲�
+ relse_qty: '', // 宸蹭笅鍗曟暟閲�
+ saleOrderDeliveryDate: ''// 棰勮浜や粯鏃ユ湡
},
operation: '',
dialogFormRules: {
@@ -469,8 +497,16 @@
],
ordernum: [
{ required: true, message: '璇疯緭鍏ヤ笅鍗曞崟鏁�', trigger: ['blur', 'change'] }
+ ],
+ saleOrderDeliveryDate: [
+ { required: true, message: '璇烽�夋嫨棰勮浜や粯鏃ユ湡', trigger: ['blur', 'change'] }
]
+ },
+ pickerOptions: {
+ disabledDate(time) {
+ return time.getTime() < Date.now() - 8.64e7
+ }
}
// expireTimeOption: {
@@ -585,6 +621,9 @@
getCurrentRow(id) {
this.radioSelectedId = id
},
+ rowClick(row) {
+ this.radioSelectedId = row.id
+ },
// 璁㈠崟鍏抽棴
async orderClose() {
if (this.radioSelectedId.length < 1) {
@@ -620,6 +659,10 @@
},
// 淇敼鎸夐挳
edit(operation, row) {
+ if (parseFloat(row.qty) === parseFloat(row.relse_qty)) {
+ return this.$message.info('姝ゅ伐鍗曞凡鍏ㄩ儴涓嬭揪锛�')
+ }
+
this.operation = operation
this.dialogVisible = true
@@ -634,6 +677,8 @@
this.dialogForm.wkshopname = row.wkshp_name
this.dialogForm.warehousecode = row.stck_code
this.dialogForm.warehousename = row.stck_name
+
+ this.dialogForm.saleOrderDeliveryDate = row.saleOrderDeliveryDate
this.dialogForm.erpqty = row.qty
this.dialogForm.markqty = parseFloat(row.qty) - parseFloat(row.relse_qty)
@@ -652,6 +697,8 @@
this.dialogForm.wkshopname = ''
this.dialogForm.warehousecode = ''
this.dialogForm.warehousename = ''
+
+ this.dialogForm.saleOrderDeliveryDate = ''
this.dialogForm.erpqty = ''
this.dialogForm.markqty = ''
@@ -691,8 +738,10 @@
'erpqty': this.dialogForm.erpqty,
'markqty': this.dialogForm.markqty,
'ordernum': this.dialogForm.ordernum,
- 'relse_qty': this.dialogForm.relse_qty
+ 'relse_qty': this.dialogForm.relse_qty,
+ 'saleOrderDeliveryDate': handleDatetime(this.dialogForm.saleOrderDeliveryDate) + ' 00:00:00'
}
+
MarkSaveErpOrder(data).then(res => {
if (res.code === '200') {
this.dialogVisible = false
@@ -844,6 +893,21 @@
}
}
+.dateMini {
+ ::v-deep .el-input__inner {
+ line-height: 34px;
+ height: 34px;
+ width: 200px;
+ display: flex;
+ font-size: 14px !important;
+ align-items: center !important;
+ }
+
+ ::v-deep .el-input__prefix {
+ margin-top: -3px;
+ }
+}
+
</style>
<style>
.el-table .custom-row {
--
Gitblit v1.9.3