|
@@ -90,7 +90,7 @@
|
|
|
</div>
|
|
</div>
|
|
|
</div>
|
|
</div>
|
|
|
<div v-else-if="scope.column.columnname === 'deliverydays'">
|
|
<div v-else-if="scope.column.columnname === 'deliverydays'">
|
|
|
- {{scope.column.data.deliverydays}}
|
|
|
|
|
|
|
+ <el-input v-model="scope.column.data.deliverydays" type="number" size="mini" :placeholder="$t(`填写回复交期天数`)" @change="setDeliveryDay(scope.column.data.deliverydays,'单',scope.column.data.sa_orderitemsid)"></el-input>
|
|
|
</div>
|
|
</div>
|
|
|
<div v-else-if="scope.column.columnname === 'deliverydate'">
|
|
<div v-else-if="scope.column.columnname === 'deliverydate'">
|
|
|
<div v-if="siteid == 'HY' || siteid == 'YOSTEST1'">
|
|
<div v-if="siteid == 'HY' || siteid == 'YOSTEST1'">
|
|
@@ -378,7 +378,6 @@ export default {
|
|
|
})
|
|
})
|
|
|
},
|
|
},
|
|
|
async updateOrder (val,fn) {
|
|
async updateOrder (val,fn) {
|
|
|
- console.log(this.typeNew,'shuchu1111***')
|
|
|
|
|
const res = await this.$api.requested({
|
|
const res = await this.$api.requested({
|
|
|
"id": 20221109093602,
|
|
"id": 20221109093602,
|
|
|
"content": val
|
|
"content": val
|
|
@@ -535,7 +534,7 @@ export default {
|
|
|
})
|
|
})
|
|
|
},
|
|
},
|
|
|
/*获取节假日数据*/
|
|
/*获取节假日数据*/
|
|
|
- async holiday(now,date,days){
|
|
|
|
|
|
|
+ async holiday(now,date,days,type,sa_orderitemsid){
|
|
|
let dateNow = new Date(now)
|
|
let dateNow = new Date(now)
|
|
|
let dateNow1 = new Date(date)
|
|
let dateNow1 = new Date(date)
|
|
|
let monthB = (dateNow.getMonth() + 1) > 10 ? dateNow.getMonth() + 1 : '0' + (dateNow.getMonth() + 1)
|
|
let monthB = (dateNow.getMonth() + 1) > 10 ? dateNow.getMonth() + 1 : '0' + (dateNow.getMonth() + 1)
|
|
@@ -559,12 +558,17 @@ export default {
|
|
|
this.jsDay = res.total
|
|
this.jsDay = res.total
|
|
|
if (this.jsDay >0){
|
|
if (this.jsDay >0){
|
|
|
const dateAdd = this.addDaysToDate(date, this.jsDay)
|
|
const dateAdd = this.addDaysToDate(date, this.jsDay)
|
|
|
- this.holidayE(now,dateAdd.toISOString().split('T')[0],Number(this.jsDay))
|
|
|
|
|
|
|
+ this.holidayE(now,dateAdd.toISOString().split('T')[0],Number(this.jsDay),type,sa_orderitemsid)
|
|
|
}else {
|
|
}else {
|
|
|
- this.daysChange(date,days)
|
|
|
|
|
|
|
+ if (type == '单'){
|
|
|
|
|
+ this.dayChange(date,days,sa_orderitemsid)
|
|
|
|
|
+ }else {
|
|
|
|
|
+ this.daysChange(date,days)
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
}
|
|
}
|
|
|
},
|
|
},
|
|
|
- async holidayE(now,date,days){
|
|
|
|
|
|
|
+ async holidayE(now,date,days,type,sa_orderitemsid){
|
|
|
let dateNow = new Date(now)
|
|
let dateNow = new Date(now)
|
|
|
let dateNow1 = new Date(date)
|
|
let dateNow1 = new Date(date)
|
|
|
let monthB = (dateNow.getMonth() + 1) > 10 ? dateNow.getMonth() + 1 : '0' + (dateNow.getMonth() + 1)
|
|
let monthB = (dateNow.getMonth() + 1) > 10 ? dateNow.getMonth() + 1 : '0' + (dateNow.getMonth() + 1)
|
|
@@ -588,9 +592,18 @@ export default {
|
|
|
this.jsYcDay = res.total - this.jsDay
|
|
this.jsYcDay = res.total - this.jsDay
|
|
|
if (this.jsYcDay >0){
|
|
if (this.jsYcDay >0){
|
|
|
const dateAdd = this.addDaysToDate(date, this.jsYcDay)
|
|
const dateAdd = this.addDaysToDate(date, this.jsYcDay)
|
|
|
- this.daysChange(dateAdd.toISOString().split('T')[0],this.value3)
|
|
|
|
|
|
|
+ if (type == '单'){
|
|
|
|
|
+ this.dayChange(date,days,sa_orderitemsid)
|
|
|
|
|
+ }else {
|
|
|
|
|
+ this.daysChange(dateAdd.toISOString().split('T')[0],this.value3)
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
}else {
|
|
}else {
|
|
|
- this.daysChange(date,this.value3)
|
|
|
|
|
|
|
+ if (type == '单'){
|
|
|
|
|
+ this.dayChange(date,days,sa_orderitemsid)
|
|
|
|
|
+ }else {
|
|
|
|
|
+ this.daysChange(date,this.value3)
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
},
|
|
},
|
|
|
async daysChange(date,days){
|
|
async daysChange(date,days){
|
|
@@ -608,7 +621,26 @@ export default {
|
|
|
})
|
|
})
|
|
|
this.listData(this.param.content.pageNumber = 1)
|
|
this.listData(this.param.content.pageNumber = 1)
|
|
|
},
|
|
},
|
|
|
- setDeliveryDay(val){
|
|
|
|
|
|
|
+ async dayChange(date,days,sa_orderitemsid){
|
|
|
|
|
+ this.tableData.forEach(item=>{
|
|
|
|
|
+ if (item.sa_orderitemsid == sa_orderitemsid){
|
|
|
|
|
+ item.deliverydate = date
|
|
|
|
|
+ }
|
|
|
|
|
+ })
|
|
|
|
|
+ console.log(this.tableData,'22222')
|
|
|
|
|
+ const res = await this.$api.requested({
|
|
|
|
|
+ "id": 20221109093602,
|
|
|
|
|
+ "content": {
|
|
|
|
|
+ "sa_orderid": this.data.sa_orderid, //订单ID
|
|
|
|
|
+ "sys_enterpriseid": this.data.sys_enterpriseid, //企业ID
|
|
|
|
|
+ "sa_contractid": this.data.contacts.contactsid, //合同ID
|
|
|
|
|
+ "type": this.data.type, //订单类型
|
|
|
|
|
+ "items": this.tableData
|
|
|
|
|
+ }
|
|
|
|
|
+ })
|
|
|
|
|
+ this.listData(this.param.content.pageNumber = 1)
|
|
|
|
|
+ },
|
|
|
|
|
+ setDeliveryDay(val,type,sa_orderitemsid){
|
|
|
let nowDate = new Date()
|
|
let nowDate = new Date()
|
|
|
let year = nowDate.getFullYear()
|
|
let year = nowDate.getFullYear()
|
|
|
let month = (nowDate.getMonth() + 1) > 10 ? nowDate.getMonth() + 1 : '0' + (nowDate.getMonth() + 1)
|
|
let month = (nowDate.getMonth() + 1) > 10 ? nowDate.getMonth() + 1 : '0' + (nowDate.getMonth() + 1)
|
|
@@ -616,7 +648,7 @@ export default {
|
|
|
let dateNew = year + '-' + month + '-' + date
|
|
let dateNew = year + '-' + month + '-' + date
|
|
|
const originalDate = new Date(dateNew);
|
|
const originalDate = new Date(dateNew);
|
|
|
const newDate = this.addDaysToDate(originalDate, Number(val));
|
|
const newDate = this.addDaysToDate(originalDate, Number(val));
|
|
|
- this.holiday(dateNew,newDate.toISOString().split('T')[0])
|
|
|
|
|
|
|
+ this.holiday(dateNew,newDate.toISOString().split('T')[0],Number(val),type,sa_orderitemsid)
|
|
|
},
|
|
},
|
|
|
addDaysToDate(date, days) {
|
|
addDaysToDate(date, days) {
|
|
|
const result = new Date(date); // 创建原始日期的副本
|
|
const result = new Date(date); // 创建原始日期的副本
|