From d71436544198b7b051115662fc9cf4b12ce0cda3 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期二, 19 七月 2022 18:32:40 +0800
Subject: [PATCH] 1.修改bug
---
src/views/scgl/scdd.vue | 81 ++++++++++++++++++++++++----------------
1 files changed, 49 insertions(+), 32 deletions(-)
diff --git a/src/views/scgl/scdd.vue b/src/views/scgl/scdd.vue
index a7bbee7..f68e8db 100644
--- a/src/views/scgl/scdd.vue
+++ b/src/views/scgl/scdd.vue
@@ -29,7 +29,6 @@
<el-form-item label="璁㈠崟缂栧彿" style=" display: flex;">
<el-input v-model="form.erpordercode" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
-
<el-form-item label="浜у搧缂栫爜" style=" display: flex;">
<el-input v-model="form.partcode" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
@@ -39,9 +38,13 @@
<el-form-item label="浜у搧瑙勬牸" style=" display: flex;">
<el-input v-model="form.partspec" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
- <el-form-item label="浜や粯鏃堕棿" style=" display: flex;">
+
+ <el-form-item label="鍒涘缓浜哄憳" style=" display: flex;">
+ <el-input v-model="form.creatuser" style="width: 200px" placeholder="璇疯緭鍏�" />
+ </el-form-item>
+ <el-form-item label="棰勮寮�宸ユ椂闂�" label-width="100px" style=" display: flex;">
<el-date-picker
- v-model="form.paydate"
+ v-model="form.paystartdate"
type="daterange"
range-separator="~"
size="mini"
@@ -53,12 +56,9 @@
<!-- :picker-options="expireTimeOption"-->
</el-form-item>
- <el-form-item label="鍒涘缓浜哄憳" style=" display: flex;">
- <el-input v-model="form.creatuser" style="width: 200px" placeholder="璇疯緭鍏�" />
- </el-form-item>
- <el-form-item label="鍒涘缓鏃堕棿" style=" display: flex;">
+ <el-form-item label="棰勮瀹屽伐鏃堕棿" label-width="100px" style=" display: flex;">
<el-date-picker
- v-model="form.createdate"
+ v-model="form.payenddate"
type="daterange"
:clearable="false"
range-separator="~"
@@ -174,8 +174,8 @@
>
<template slot-scope="{row}">
<div v-if="row.status==='NEW'">鏂拌鍗�</div>
- <div v-if="row.status==='CREATING'">鍒涘缓涓�</div>
- <div v-if="row.status==='CREATED'">宸插垱寤�</div>
+ <div v-if="row.status==='CREATING'">閮ㄥ垎涓嬭揪</div>
+ <div v-if="row.status==='CREATED'">鍏ㄩ儴涓嬭揪</div>
<div v-if="row.status==='CLOSED'">宸插叧闂�</div>
</template>
</el-table-column>
@@ -222,8 +222,14 @@
width="150"
/>
<el-table-column
- prop="paydate"
- label="瑕佹眰浜や粯鏃堕棿"
+ prop="planstartdate"
+ label="棰勮寮�宸ユ椂闂�"
+ sortable="custom"
+ width="160"
+ />
+ <el-table-column
+ prop="planenddate"
+ label="棰勮瀹屽伐鏃堕棿"
sortable="custom"
width="160"
/>
@@ -360,6 +366,7 @@
import Pagination from '@/components/Pagination'
import { ClosedErpOrder, ErpOrderSearch, MarkSaveErpOrder } from '@/api/scgl'
import { handleDatatime, handleDatetime } from '@/utils/global'
+import { SeaveSearchErpOrder } from '@/api/ErpSyncMes'
const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
@@ -389,8 +396,10 @@
partcode: '', // 浜у搧缂栫爜
partname: '', // 浜у搧鍚嶇О
partspec: '', // 浜у搧瑙勬牸
- paydate: '', // 浜や粯鏃堕棿
creatuser: '', // 鍒涘缓浜哄憳
+ // paystartdate: '', // 浜や粯鏃堕棿
+ paystartdate: '', // 棰勮寮�宸ユ椂闂�
+ payenddate: '', // 棰勮瀹屽伐鏃堕棿
createdate: '', // 鍒涘缓鏃堕棿
prop: 'createdate', // 鎺掑簭瀛楁
order: 'desc', // 鎺掑簭瀛楁
@@ -399,8 +408,8 @@
},
erporderstusArr: [
{ code: 'NEW', name: '鏂拌鍗�' },
- { code: 'CREATING', name: '鍒涘缓涓�' },
- { code: 'CREATED', name: '宸插垱寤�' },
+ { code: 'CREATING', name: '閮ㄥ垎涓嬭揪' },
+ { code: 'CREATED', name: '鍏ㄩ儴涓嬭揪' },
{ code: 'CLOSED', name: '宸插叧闂�' }
],
total: 10,
@@ -410,7 +419,7 @@
dialogForm: {
partname: '', // 浜у搧鍚嶇О
partspec: '', // 浜у搧瑙勬牸
- paydate: '', // 浜や粯鏃堕棿
+ // paystartdate: '', // 棰勮寮�宸ユ椂闂�
wkshopname: '', // 杞﹂棿鍚嶇О
warehousename: '', // 浠撳簱鍚嶇О
@@ -460,12 +469,12 @@
methods: {
async getErpOrderSearch() {
console.log(this.form, 1)
- let tempDate2 = this.form.paydate
+ let tempDate2 = this.form.paystartdate
if (tempDate2.length > 0) {
tempDate2 = handleDatetime(tempDate2[0]) + '~' + handleDatetime(tempDate2[1])
}
- let tempDate = this.form.createdate
+ let tempDate = this.form.payenddate
if (tempDate.length > 0) {
tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
}
@@ -476,10 +485,11 @@
partcode: this.form.partcode, // 浜у搧缂栫爜
partname: this.form.partname, // 浜у搧鍚嶇О
partspec: this.form.partspec, // 浜у搧瑙勬牸
- paydate: tempDate2, // 浜や粯鏃堕棿
+ paystartdate: tempDate2, // 浜や粯鏃堕棿
+ payenddate: tempDate, // 浜や粯鏃堕棿
creatuser: this.form.creatuser, // 鍒涘缓浜哄憳
// createdate: this.form.createdate.toString().length > 0 ? handleDatetime(this.form.createdate) : '', // 鍒涘缓鏃堕棿
- createdate: tempDate,
+
prop: this.form.prop, // 鎺掑簭瀛楁
order: this.form.order, // 鎺掑簭瀛楁
page: this.form.page, // 绗嚑椤�
@@ -505,7 +515,7 @@
this.getErpOrderSearch()
},
// 鍚屾ERP
- async syncERP() {
+ syncERP() {
const loading = this.$loading({
lock: true,
text: '姝ｅ湪鍚屾ERP锛岃绋嶇瓑...',
@@ -513,17 +523,23 @@
customClass: 'osloading',
background: 'rgba(0, 0, 0, 0.7)'
})
- setTimeout(() => {
- loading.close()
- }, 2000)
- // const res = await xxx()
- // if (res.code==='200'){
- setTimeout(() => {
- loading.close()
- this.getErpOrderSearch()
- }, 2000)
- // }
+ SeaveSearchErpOrder().then(res => {
+ console.log(res, 11)
+ if (res.code === '200') {
+ setTimeout(() => {
+ this.getErpOrderSearch()
+ loading.close()
+ this.$message.success('鍚屾鎴愬姛锛�')
+ }, 2000)
+ }
+ // else if (res.code === '300') {
+ // setTimeout(() => {
+ // loading.close()
+ // this.$message.error('鍚屾澶辫触锛�')
+ // }, 10000)
+ // }
+ })
},
// 鏌ヨ
search() {
@@ -536,7 +552,8 @@
this.form.partcode = ''
this.form.partname = ''
this.form.partspec = ''
- this.form.paydate = ''
+ this.form.paystartdate = ''
+ this.form.payenddate = ''
this.form.creatuser = ''
this.form.createdate = ''
this.getErpOrderSearch()
--
Gitblit v1.9.3