|
@@ -164,24 +164,24 @@
|
|
|
></el-input>
|
|
|
<span v-else>{{ row.price }}</span>
|
|
|
</template>
|
|
|
- <template slot="storageQuantity" slot-scope="{ row }">
|
|
|
- <el-input
|
|
|
- v-if="row.$cellEdit"
|
|
|
- v-model.trim="row.storageQuantity"
|
|
|
- size="small"
|
|
|
- oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
|
|
|
- ></el-input>
|
|
|
- <span v-else>{{ row.storageQuantity }}</span>
|
|
|
- </template>
|
|
|
- <template slot="actualQuantity" slot-scope="{ row }">
|
|
|
- <el-input
|
|
|
- v-if="row.$cellEdit"
|
|
|
- v-model.trim="row.actualQuantity"
|
|
|
- size="small"
|
|
|
- oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
|
|
|
- ></el-input>
|
|
|
- <span v-else>{{ row.actualQuantity }}</span>
|
|
|
- </template>
|
|
|
+<!-- <template slot="storageQuantity" slot-scope="{ row }">-->
|
|
|
+<!-- <el-input-->
|
|
|
+<!-- v-if="row.$cellEdit"-->
|
|
|
+<!-- v-model.trim="row.storageQuantity"-->
|
|
|
+<!-- size="small"-->
|
|
|
+<!-- oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'-->
|
|
|
+<!-- ></el-input>-->
|
|
|
+<!-- <span v-else>{{ row.storageQuantity }}</span>-->
|
|
|
+<!-- </template>-->
|
|
|
+<!-- <template slot="actualQuantity" slot-scope="{ row }">-->
|
|
|
+<!-- <el-input-->
|
|
|
+<!-- v-if="row.$cellEdit"-->
|
|
|
+<!-- v-model.trim="row.actualQuantity"-->
|
|
|
+<!-- size="small"-->
|
|
|
+<!-- oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'-->
|
|
|
+<!-- ></el-input>-->
|
|
|
+<!-- <span v-else>{{ row.actualQuantity }}</span>-->
|
|
|
+<!-- </template>-->
|
|
|
<template slot="code" slot-scope="{row,index}">
|
|
|
<el-button type="text" size="mini" style="padding:4px 10px;float:left" @click="commodityChoice(row)" :disabled="detailData.seeDisabled || !row.$cellEdit">选择</el-button>
|
|
|
<span>{{ row.code }}</span>
|
|
@@ -227,6 +227,7 @@
|
|
|
:disabled="detailData.seeDisabled"
|
|
|
feeUrl="/trade-purchase/purchase-order/removeByFees"
|
|
|
optionType="GN"
|
|
|
+ @beforeFinance="beforeFinance"
|
|
|
/>
|
|
|
<!-- <containerTitle title="费用明细"></containerTitle>-->
|
|
|
<!-- <basic-container style="margin-bottom: 10px">-->
|
|
@@ -735,6 +736,7 @@ export default {
|
|
|
label: '已付金额',
|
|
|
prop: 'settlmentAmount',
|
|
|
type: 'number',
|
|
|
+ disabled: true,
|
|
|
rules: [
|
|
|
{
|
|
|
required: false,
|
|
@@ -1102,7 +1104,7 @@ export default {
|
|
|
this.$set(this.goodsListSave[item], 'storageQuantity', res.data.data)
|
|
|
this.goodsListSave[item].itemId = this.goodsListSave[item].id
|
|
|
this.goodsListSave[item].priceCategory = this.goodsListSave[item].goodsTypeName
|
|
|
- delete this.tableData[item].id
|
|
|
+ delete this.goodsListSave[item].id
|
|
|
this.$set(this.goodsListSave[item], 'itemType', this.goodsListSave[item].typeno)
|
|
|
this.$set(this.goodsListSave[item], 'specificationAndModel', this.goodsListSave[item].typeno)
|
|
|
this.$set(this.goodsListSave[item], 'priceType', '一般')
|
|
@@ -1373,7 +1375,8 @@ export default {
|
|
|
}
|
|
|
//商品信息
|
|
|
this.form.itemsVOList = this.contactsData
|
|
|
- this.form.orderFeesList = this.advantageProjectData
|
|
|
+ // this.form.orderFeesList = this.advantageProjectData
|
|
|
+ this.form.orderFeesList = this.$refs.feeInfo.submitData()
|
|
|
this.form.orderFilesList = this.bankOfDepositData
|
|
|
if (typeof this.form.corpsTypeId == 'object') {
|
|
|
this.form.corpsTypeId = this.form.corpsTypeId.join(",")
|
|
@@ -1420,7 +1423,7 @@ export default {
|
|
|
this.billType = type
|
|
|
//采购明细提单号 list
|
|
|
this.billData = {
|
|
|
- srcOrderno:this.form.srcOrderNo,
|
|
|
+ srcOrderno:this.form.orderNo,
|
|
|
itemType:"采购",
|
|
|
corpsName:this.form.corpsName,
|
|
|
corpId:this.form.corpId,
|
|
@@ -1430,6 +1433,7 @@ export default {
|
|
|
taxRate: '0',
|
|
|
accDate: this.form.businesDate,
|
|
|
srcType: 1,
|
|
|
+ tradeType: 'GN'
|
|
|
}
|
|
|
if(bool){ //申请货款
|
|
|
this.billData.srcId = -1
|
|
@@ -1562,6 +1566,14 @@ export default {
|
|
|
importStagList(row, index) {
|
|
|
this.goodsListSave.push(row);
|
|
|
},
|
|
|
+ beforeFinance(feesData,callback) {
|
|
|
+ this.orderFeesList = feesData;
|
|
|
+ let params = {}
|
|
|
+ params.valid = true
|
|
|
+ params.parentId = this.form.id
|
|
|
+ params.srcOrderno = this.form.orderNo
|
|
|
+ callback(params)
|
|
|
+ },
|
|
|
}
|
|
|
}
|
|
|
</script>
|