1 #6
@@ -11,11 +11,7 @@
|
||||
<div class="generalDetails_card_container">
|
||||
<div v-for="(item, index) in dataPage" :key="index">
|
||||
<el-card class="generalDetails_card">
|
||||
<div
|
||||
@click="isShow(item)"
|
||||
class="generalDetails_card_header"
|
||||
slot="header"
|
||||
>
|
||||
<div @click="isShow(item)" class="generalDetails_card_header" slot="header">
|
||||
<div>
|
||||
<span class="generalDetails-card-header-icon">
|
||||
<svg-icon style="color: #118dde" :icon-class="item.iconClass" />
|
||||
@@ -25,30 +21,18 @@
|
||||
}}</span>
|
||||
</div>
|
||||
<div class="fold">
|
||||
<i
|
||||
:style="{
|
||||
transform: `rotate(${item.isFold ? 0 : 180}deg)`,
|
||||
}"
|
||||
class="el-icon-arrow-down generalDetails_card_arrow_down"
|
||||
></i>
|
||||
<i :style="{
|
||||
transform: `rotate(${item.isFold ? 0 : 180}deg)`,
|
||||
}" class="el-icon-arrow-down generalDetails_card_arrow_down"></i>
|
||||
</div>
|
||||
</div>
|
||||
<div
|
||||
:style="{ maxHeight: item.isFold ? '100vh' : '0px' }"
|
||||
class="my-cell"
|
||||
>
|
||||
<template
|
||||
v-if="item.listData.length && item.listData[0].field !== 'table'"
|
||||
>
|
||||
<div :style="{ maxHeight: item.isFold ? '100vh' : '0px' }" class="my-cell">
|
||||
<template v-if="item.listData.length && item.listData[0].field !== 'table'">
|
||||
<div v-for="(i, x) in item.listData" :key="x" class="cell-item">
|
||||
<span :title="i.remark" class="color-999 test-tst">
|
||||
{{ i.label }}
|
||||
<i v-if="i.remark" class="header-icon el-icon-info"></i>
|
||||
<i
|
||||
@click="isCopy($event)"
|
||||
v-if="i.isCopy"
|
||||
class="el-icon-document-copy"
|
||||
></i>
|
||||
<i @click="isCopy($event)" v-if="i.isCopy" class="el-icon-document-copy"></i>
|
||||
</span>
|
||||
<br />
|
||||
<slot class="inner-data" :name="`${i.field}`">
|
||||
@@ -126,7 +110,7 @@ export default {
|
||||
let value =
|
||||
(typeof carItem.value == "function" &&
|
||||
carItem.value(shineData)) ||
|
||||
shineData[carItem.value] == 0
|
||||
shineData[carItem.value] == 0
|
||||
? 0
|
||||
: shineData[carItem.value] || carItem.fieldDefault || "";
|
||||
return {
|
||||
@@ -172,6 +156,7 @@ export default {
|
||||
.title_bottom {
|
||||
margin-top: 20px;
|
||||
}
|
||||
|
||||
.fold {
|
||||
display: flex;
|
||||
justify-content: flex-end;
|
||||
|
||||
@@ -227,10 +227,13 @@ export default {
|
||||
this.billListMeth()
|
||||
// this.$set(this.billData.list,this.billData.index,this.billAddData)
|
||||
this.$message.success(res.msg)
|
||||
this.dialogDelivery = false
|
||||
this.dialogDelivery = false;
|
||||
console.log('更新前',this.billData)
|
||||
this.$emit('billOfLading', this.billData, 2);
|
||||
this.$forceUpdate()
|
||||
|
||||
}
|
||||
});
|
||||
this.$emit('billOfLading', this.billData, 2)
|
||||
},
|
||||
billSubmit(e, index) {
|
||||
if (e.deliveryStatus == 'PLATENUM_SUCCESS') {
|
||||
@@ -240,7 +243,7 @@ export default {
|
||||
} else if (e.deliveryStatus == 'PLATENUM_LOCKED') {
|
||||
this.billAddData = JSON.parse(JSON.stringify(e))
|
||||
this.billAddData.deliveryStatus = 'PLATENUM_SUCCESS'
|
||||
this.$confirm('是否确认?', '提示', { type: 'info' }).then(() => {
|
||||
this.$confirm('是否确认?', '提示', { type: 'info' }).then(() => {
|
||||
console.log(this.billData.list, index, this.billAddData, 'aaaaaaaaaaa')
|
||||
order.update(this.billAddData).then(res => {
|
||||
if (res.code == 20000) {
|
||||
@@ -275,39 +278,41 @@ export default {
|
||||
this.dialogBillAdd = true
|
||||
},
|
||||
//创建修改提货单
|
||||
billAddSave(e, item) {
|
||||
async billAddSave(e, item) {
|
||||
if (!e) {
|
||||
this.$refs["form"].validate((valid) => {
|
||||
this.$refs["form"].validate( async (valid) => {
|
||||
if (valid) {
|
||||
this.billAddData.orderId = this.controlWindows.addInfo.id
|
||||
this.billAddData.productMeasurement = this.controlWindows.addInfo.productMeasurement
|
||||
order.billSave(this.billAddData).then(res => {
|
||||
await order.billSave(this.billAddData).then(res => {
|
||||
if (res.code == 20000) {
|
||||
this.billAddData.deliveryStatus = 'SUBMITED'
|
||||
this.billData.list.push(this.billAddData)
|
||||
this.billListMeth()
|
||||
this.$message.success(res.msg)
|
||||
this.dialogBillAdd = false;
|
||||
this.$emit('billOfLading', this.billData.orderInfo, 2)
|
||||
}
|
||||
})
|
||||
}
|
||||
})
|
||||
} else {
|
||||
this.$confirm(`确定${e==1?'修改':'锁定'}提货单?`, '提示', { type: 'error' }).then(() => {
|
||||
} else {
|
||||
this.$confirm(`确定${e == 1 ? '修改' : '锁定'}提货单?`, '提示', { type: 'error' }).then( async () => {
|
||||
// this.billAddData = item ? JSON.parse(JSON.stringify(item)) : {};
|
||||
this.billAddData.deliveryStatus = e == 2 ? 'PLATENUM_LOCKED' : '';
|
||||
console.log(this.billAddData,'this.billAddData')
|
||||
order.update(this.billAddData).then(res => {
|
||||
console.log(this.billAddData, 'this.billAddData')
|
||||
await order.update(this.billAddData).then(res => {
|
||||
if (res.code == 20000) {
|
||||
this.billListMeth()
|
||||
this.$message.success(res.msg)
|
||||
this.dialogBillAdd = false;
|
||||
|
||||
this.$emit('billOfLading', this.billData.orderInfo, 2)
|
||||
}
|
||||
})
|
||||
})
|
||||
}
|
||||
this.$emit('billOfLading', this.billData.orderInfo, 2)
|
||||
};
|
||||
console.log('代码底部');
|
||||
|
||||
},
|
||||
//更新提货单数据
|
||||
billListMeth() {
|
||||
|
||||
@@ -363,6 +363,7 @@ export default {
|
||||
}
|
||||
if(!selectIndex||selectIndex==2){
|
||||
await order.findByOrderId(row.id).then((res) => {
|
||||
console.log('更新',res)
|
||||
this.billData.orderInfo = Object.assign(res.data,{id:row.id})
|
||||
});
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user