|
@@ -46,7 +46,8 @@
|
|
|
</el-button>
|
|
|
<el-dropdown-menu slot="dropdown">
|
|
|
<el-dropdown-item :disabled="!form.id" @click.native="copyDoc">复制单据</el-dropdown-item>
|
|
|
- <el-dropdown-item @click.native="orderNoVisible=true;orderForm.primaryOrdNo=form.orderNo">更改销售订单号</el-dropdown-item>
|
|
|
+ <el-dropdown-item
|
|
|
+ @click.native="orderNoVisible = true; orderForm.primaryOrdNo = form.orderNo">更改销售订单号</el-dropdown-item>
|
|
|
</el-dropdown-menu>
|
|
|
</el-dropdown>
|
|
|
<el-button type="primary" :disabled="disabled" @click="editCustomer" :loading="subLoading"
|
|
@@ -489,7 +490,8 @@
|
|
|
<check :checkData="checkData" :checkDetail="false" :idList="[]" @choceCheckFun="choceCheckFun">
|
|
|
</check>
|
|
|
</el-dialog>
|
|
|
- <el-dialog title="更改销售订单号" :visible.sync="orderNoVisible" width="350px" size="small" @close="orderClose" append-to-body>
|
|
|
+ <el-dialog title="更改销售订单号" :visible.sync="orderNoVisible" width="350px" size="small" @close="orderClose"
|
|
|
+ append-to-body>
|
|
|
<span>
|
|
|
<avue-form v-model="orderForm" :option="orderoption"></avue-form>
|
|
|
</span>
|
|
@@ -576,22 +578,22 @@ export default {
|
|
|
name: "detailsPageEdit",
|
|
|
data() {
|
|
|
return {
|
|
|
- orderForm:{},
|
|
|
- orderoption:{
|
|
|
+ orderForm: {},
|
|
|
+ orderoption: {
|
|
|
submitBtn: false,
|
|
|
emptyBtn: false,
|
|
|
column: [{
|
|
|
label: "原销售订单号",
|
|
|
prop: "primaryOrdNo",
|
|
|
- disabled:true,
|
|
|
- span:24
|
|
|
- },{
|
|
|
+ disabled: true,
|
|
|
+ span: 24
|
|
|
+ }, {
|
|
|
label: "新销售订单号",
|
|
|
prop: "ordNo",
|
|
|
- span:24
|
|
|
+ span: 24
|
|
|
}]
|
|
|
},
|
|
|
- orderNoVisible:false,
|
|
|
+ orderNoVisible: false,
|
|
|
// 开户银行list
|
|
|
corpsBankList: [
|
|
|
{ id: 1, accountName: "a" }, { id: 2, accountName: "b" }
|
|
@@ -1390,7 +1392,7 @@ export default {
|
|
|
mounted() {
|
|
|
},
|
|
|
methods: {
|
|
|
- retrieve(){
|
|
|
+ retrieve() {
|
|
|
this.getDetail(this.form.id);
|
|
|
},
|
|
|
// 获取运输方式数据
|
|
@@ -1468,17 +1470,17 @@ export default {
|
|
|
this.$emit("copyOrder", this.form.id);
|
|
|
},
|
|
|
upDateOrderNo() {
|
|
|
- this.orderForm.billId=this.form.id
|
|
|
- synchronization(this.orderForm).then(res=>{
|
|
|
+ this.orderForm.billId = this.form.id
|
|
|
+ synchronization(this.orderForm).then(res => {
|
|
|
this.$message.success("更改成功");
|
|
|
this.getDetail(this.form.id);
|
|
|
- this.orderNoVisible=false
|
|
|
+ this.orderNoVisible = false
|
|
|
})
|
|
|
},
|
|
|
- orderClose(){
|
|
|
- this.orderForm={
|
|
|
- primaryOrdNo:null,
|
|
|
- ordNo:null
|
|
|
+ orderClose() {
|
|
|
+ this.orderForm = {
|
|
|
+ primaryOrdNo: null,
|
|
|
+ ordNo: null
|
|
|
}
|
|
|
},
|
|
|
rowCorpData(row) {
|
|
@@ -1584,25 +1586,25 @@ export default {
|
|
|
// this.form.exchangeRate
|
|
|
// );
|
|
|
e.price = addPrice(e.outFactoryPrice, e.shareAmount, e.internationalAmount)
|
|
|
- e.amount = amountCal(
|
|
|
- addPrice(e.outFactoryPrice, e.shareAmount, e.internationalAmount),
|
|
|
- e.orderQuantity,
|
|
|
- e.freight,
|
|
|
- e.insurance,
|
|
|
- e.discount
|
|
|
- );
|
|
|
- e.itemMargin = grossProfitCal(
|
|
|
- e.purchaseAmount,
|
|
|
- e.partsPrice,
|
|
|
- e.outFactoryPrice,
|
|
|
- this.form.exchangeRate
|
|
|
- );
|
|
|
- e.goodsGrossProfit = goodsGrossProfitCal(
|
|
|
- e.purchaseAmount,
|
|
|
- e.partsPrice,
|
|
|
- e.outFactoryPrice,
|
|
|
- this.form.exchangeRate
|
|
|
- );
|
|
|
+ e.amount = amountCal(
|
|
|
+ addPrice(e.outFactoryPrice, e.shareAmount, e.internationalAmount),
|
|
|
+ e.orderQuantity,
|
|
|
+ e.freight,
|
|
|
+ e.insurance,
|
|
|
+ e.discount
|
|
|
+ );
|
|
|
+ e.itemMargin = grossProfitCal(
|
|
|
+ e.purchaseAmount,
|
|
|
+ e.partsPrice,
|
|
|
+ e.outFactoryPrice,
|
|
|
+ this.form.exchangeRate
|
|
|
+ );
|
|
|
+ e.goodsGrossProfit = goodsGrossProfitCal(
|
|
|
+ e.purchaseAmount,
|
|
|
+ e.partsPrice,
|
|
|
+ e.outFactoryPrice,
|
|
|
+ this.form.exchangeRate
|
|
|
+ );
|
|
|
});
|
|
|
}
|
|
|
},
|
|
@@ -2349,6 +2351,13 @@ export default {
|
|
|
this.goodsoptions = res.data.data
|
|
|
})
|
|
|
getCopy(id).then(res => {
|
|
|
+ // 获取银行信息数据
|
|
|
+ customeDetail(res.data.data.belongToCorpId).then(res => {
|
|
|
+ this.banksData = res.data.data.corpsBankList.map(item => {
|
|
|
+ item.accountBank = item.accountBank + ' - ' + item.accountNo
|
|
|
+ return item
|
|
|
+ })
|
|
|
+ })
|
|
|
delete res.data.data.id;
|
|
|
delete res.data.data.sysNo;
|
|
|
delete res.data.data.orderNo;
|