|
@@ -17,7 +17,7 @@
|
|
<el-dropdown-menu slot="dropdown">
|
|
<el-dropdown-menu slot="dropdown">
|
|
<el-dropdown-item :disabled="form.status > 0 || (!form.status && form.status !== 0)" @click.native="pleaseCheck">请核数据
|
|
<el-dropdown-item :disabled="form.status > 0 || (!form.status && form.status !== 0)" @click.native="pleaseCheck">请核数据
|
|
</el-dropdown-item>
|
|
</el-dropdown-item>
|
|
- <el-dropdown-item @click.native="checkScheduleDialog = true,checkId = form.id">审核进度</el-dropdown-item>
|
|
|
|
|
|
+ <el-dropdown-item :disabled="form>0" @click.native="checkScheduleDialog = true,checkId = form.id">审核进度</el-dropdown-item>
|
|
<!-- <el-dropdown-item disabled>撤销请核</el-dropdown-item>-->
|
|
<!-- <el-dropdown-item disabled>撤销请核</el-dropdown-item>-->
|
|
</el-dropdown-menu>
|
|
</el-dropdown-menu>
|
|
</el-dropdown>
|
|
</el-dropdown>
|
|
@@ -209,7 +209,7 @@
|
|
</template>
|
|
</template>
|
|
</avue-form>
|
|
</avue-form>
|
|
</trade-card>
|
|
</trade-card>
|
|
- <goods-info ref="goodsInfo" :form="form" :data="data" :detailData="detailData" :orderFeesList.sync="orderFeesList"
|
|
|
|
|
|
+ <goods-info ref="goodsInfo" :key="form" :form="form" :data="data" :detailData="detailData" :orderFeesList.sync="orderFeesList"
|
|
@formGoodstoFees="formGoodstoFees" @backToList="getDetail"></goods-info>
|
|
@formGoodstoFees="formGoodstoFees" @backToList="getDetail"></goods-info>
|
|
<!-- <trade-card title="商品信息">
|
|
<!-- <trade-card title="商品信息">
|
|
<avue-crud ref="crud" :data="data" :option="tableOption" @row-del="rowDel"
|
|
<avue-crud ref="crud" :data="data" :option="tableOption" @row-del="rowDel"
|
|
@@ -2055,8 +2055,7 @@ export default {
|
|
getDetail(id) {
|
|
getDetail(id) {
|
|
this.showBut = false;
|
|
this.showBut = false;
|
|
this.pageLoading = true;
|
|
this.pageLoading = true;
|
|
- detail(id)
|
|
|
|
- .then(res => {
|
|
|
|
|
|
+ detail(id).then(res => {
|
|
if (this.detailData.status == "copy") {
|
|
if (this.detailData.status == "copy") {
|
|
delete res.data.data.id;
|
|
delete res.data.data.id;
|
|
delete res.data.data.sysNo;
|
|
delete res.data.data.sysNo;
|
|
@@ -2118,8 +2117,7 @@ export default {
|
|
this.oldorderFeesList = this.deepClone(res.data.data.orderFeesList);
|
|
this.oldorderFeesList = this.deepClone(res.data.data.orderFeesList);
|
|
this.oldorderFilesList = this.deepClone(res.data.data.orderFilesList);
|
|
this.oldorderFilesList = this.deepClone(res.data.data.orderFilesList);
|
|
this.oldExchange = this.deepClone(this.form.exchangeRate);
|
|
this.oldExchange = this.deepClone(this.form.exchangeRate);
|
|
- })
|
|
|
|
- .finally(() => {
|
|
|
|
|
|
+ }).finally(() => {
|
|
this.showBut = true;
|
|
this.showBut = true;
|
|
this.pageLoading = false;
|
|
this.pageLoading = false;
|
|
});
|
|
});
|
|
@@ -2233,8 +2231,7 @@ export default {
|
|
orderItemsList: this.data,
|
|
orderItemsList: this.data,
|
|
orderFeesList: orderFeesList,
|
|
orderFeesList: orderFeesList,
|
|
orderFilesList: this.orderFilesList
|
|
orderFilesList: this.orderFilesList
|
|
- })
|
|
|
|
- .then(res => {
|
|
|
|
|
|
+ }).then(res => {
|
|
this.form = res.data.data;
|
|
this.form = res.data.data;
|
|
this.data = res.data.data.orderItemsList;
|
|
this.data = res.data.data.orderItemsList;
|
|
this.orderFeesList = res.data.data.orderFeesList;
|
|
this.orderFeesList = res.data.data.orderFeesList;
|