|
|
@@ -103,10 +103,10 @@
|
|
|
v-input-limit="2"
|
|
|
size="small"
|
|
|
:disabled="item.disabled || detailData.seeDisabled"
|
|
|
- v-model="form[item.prop]"
|
|
|
+ v-model.trim="form[item.prop]"
|
|
|
/>
|
|
|
- <el-input type="textarea" v-else-if="item.type === 'textarea'" v-model="form[item.prop]" size="small" autocomplete="off" :disabled="item.disabled || detailData.seeDisabled"></el-input>
|
|
|
- <el-input type="age" v-else v-model="form[item.prop]" size="small" autocomplete="off" :disabled="item.disabled || detailData.seeDisabled" clearable></el-input>
|
|
|
+ <el-input type="textarea" v-else-if="item.type === 'textarea'" v-model.trim="form[item.prop]" size="small" autocomplete="off" :disabled="item.disabled || detailData.seeDisabled"></el-input>
|
|
|
+ <el-input type="age" v-else v-model.trim="form[item.prop]" size="small" autocomplete="off" :disabled="item.disabled || detailData.seeDisabled" clearable></el-input>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
@@ -123,7 +123,7 @@
|
|
|
:disabled="detailData.seeDisabled"/>
|
|
|
<el-input
|
|
|
v-else-if="(item.prop === 'advancePayment') || (item.prop === 'settlmentAmount') || (item.prop === 'overPayment')"
|
|
|
- v-model="form[item.prop]" size="small" autocomplete="off"
|
|
|
+ v-model.trim="form[item.prop]" size="small" autocomplete="off"
|
|
|
@change="computedCost"
|
|
|
:disabled="detailData.seeDisabled"
|
|
|
v-input-limit="2"
|
|
|
@@ -131,7 +131,7 @@
|
|
|
<el-select v-else-if="item.prop === 'orderStatus'" v-model="form[item.prop]" placeholder="请选择" clearable filterable style="width: 100%" size="small" :disabled="detailData.seeDisabled">
|
|
|
<el-option v-for="(item,index) in statusOption" :key="index" :label="item.dictValue" :value="item.dictValue"></el-option>
|
|
|
</el-select>
|
|
|
- <el-input type="age" v-else-if="item.prop === 'grossProfitRate'" v-model="form[item.prop]" size="small" autocomplete="off" placeholder="请输入" :disabled="detailData.seeDisabled" v-input-limit="2">
|
|
|
+ <el-input type="age" v-else-if="item.prop === 'grossProfitRate'" v-model.trim="form[item.prop]" size="small" autocomplete="off" placeholder="请输入" :disabled="detailData.seeDisabled" v-input-limit="2">
|
|
|
<template slot="append">%</template>
|
|
|
</el-input>
|
|
|
<el-input
|
|
|
@@ -140,10 +140,10 @@
|
|
|
v-input-limit="2"
|
|
|
size="small"
|
|
|
:disabled="item.disabled || detailData.seeDisabled"
|
|
|
- v-model="form[item.prop]"
|
|
|
+ v-model.trim="form[item.prop]"
|
|
|
/>
|
|
|
- <el-input type="textarea" v-else-if="item.type === 'textarea'" v-model="form[item.prop]" size="small" autocomplete="off" :disabled="item.disabled || detailData.seeDisabled"></el-input>
|
|
|
- <el-input v-else type="age" v-model="form[item.prop]" size="small" autocomplete="off" :disabled="item.disabled || detailData.seeDisabled"></el-input>
|
|
|
+ <el-input type="textarea" v-else-if="item.type === 'textarea'" v-model.trim="form[item.prop]" size="small" autocomplete="off" :disabled="item.disabled || detailData.seeDisabled"></el-input>
|
|
|
+ <el-input v-else type="age" v-model.trim="form[item.prop]" size="small" autocomplete="off" :disabled="item.disabled || detailData.seeDisabled"></el-input>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
@@ -218,7 +218,7 @@
|
|
|
<template slot="orderQuantity" slot-scope="{ row }">
|
|
|
<el-input
|
|
|
v-if="row.$cellEdit"
|
|
|
- v-model="row.orderQuantity"
|
|
|
+ v-model.trim="row.orderQuantity"
|
|
|
oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
|
|
|
size="small"
|
|
|
@input="quantityChange(row)"
|
|
|
@@ -324,13 +324,13 @@
|
|
|
</span>
|
|
|
</template>
|
|
|
<template slot="amount" slot-scope="{ row }">
|
|
|
- <el-input v-if="row.$cellEdit" v-model="row.amount"
|
|
|
+ <el-input v-if="row.$cellEdit" v-model.trim="row.amount"
|
|
|
size="small" v-input-limit="2"
|
|
|
></el-input>
|
|
|
<span v-else>{{ row.amount }}</span>
|
|
|
</template>
|
|
|
<template slot="settlmentAmount" slot-scope="{ row }">
|
|
|
- <el-input v-if="row.$cellEdit" v-model="row.settlmentAmount"
|
|
|
+ <el-input v-if="row.$cellEdit" v-model.trim="row.settlmentAmount"
|
|
|
size="small" v-input-limit="2"
|
|
|
></el-input>
|
|
|
<span v-else>{{ row.settlmentAmount }}</span>
|
|
|
@@ -991,6 +991,17 @@ export default {
|
|
|
}
|
|
|
]
|
|
|
}, {
|
|
|
+ label: '特价占比',
|
|
|
+ prop: 'a',
|
|
|
+ disabled: false,
|
|
|
+ rules: [
|
|
|
+ {
|
|
|
+ required: false,
|
|
|
+ message: ' ',
|
|
|
+ trigger: 'blur'
|
|
|
+ }
|
|
|
+ ]
|
|
|
+ }, {
|
|
|
label: '制单人',
|
|
|
prop: 'createUserName',
|
|
|
disabled: true,
|
|
|
@@ -1054,6 +1065,7 @@ export default {
|
|
|
{
|
|
|
label: '发货地址',
|
|
|
prop: 'shippingAddress',
|
|
|
+ disabled: true,
|
|
|
rules: [
|
|
|
{
|
|
|
required: true,
|
|
|
@@ -1225,8 +1237,8 @@ export default {
|
|
|
//初始化查询
|
|
|
async created() {
|
|
|
this.rowHeight = (window.innerHeight - 130) + 'px'
|
|
|
- this.customerContact = customerContact
|
|
|
- // this.customerContact = await this.getColumnData(this.getColumnName(15), customerContact);
|
|
|
+ // this.customerContact = customerContact
|
|
|
+ this.customerContact = await this.getColumnData(this.getColumnName(15), customerContact);
|
|
|
this.advantageProject = await this.getColumnData(this.getColumnName(16), advantageProject);
|
|
|
this.getWorkDicts("payment_term").then(res => {
|
|
|
this.paymentOption = res.data.data
|
|
|
@@ -1237,6 +1249,7 @@ export default {
|
|
|
this.$set(this.form, 'orderStatus', '录入')
|
|
|
this.$set(this.form, 'overPayment', 0)
|
|
|
this.$set(this.form, 'orderAmount', 0)
|
|
|
+ this.$set(this.form, 'oceanFreight', 0)
|
|
|
if (this.detailData.id) {
|
|
|
this.queryData(this.detailData.id)
|
|
|
}
|
|
|
@@ -1255,7 +1268,6 @@ export default {
|
|
|
methods: {
|
|
|
getGoodsRow(event,row) {
|
|
|
row.priceCategory = event.goodsTypeName
|
|
|
- this.$set(row, 'priceType', '一般')
|
|
|
row.code = event.code
|
|
|
row.typeno = event.typeno
|
|
|
row.itemType = event.typeno
|
|
|
@@ -1488,7 +1500,6 @@ export default {
|
|
|
this.$set(item, 'purchaseAmount', '0')
|
|
|
}
|
|
|
})
|
|
|
- this.$set(item, 'priceType', '一般')
|
|
|
this.$set(item, 'actualQuantity', '0')
|
|
|
this.$set(item, 'purchaseAmount', '0')
|
|
|
this.$set(item, 'price', '0')
|
|
|
@@ -1519,6 +1530,11 @@ export default {
|
|
|
this.switchDialog = val;
|
|
|
},
|
|
|
getShipmentD() {
|
|
|
+ for (let item in this.selection) {
|
|
|
+ if (!this.selection[item].id) {
|
|
|
+ return this.$message.error('选中数据有新数据，请先保存')
|
|
|
+ }
|
|
|
+ }
|
|
|
if (this.$store.getters.inStatus) {
|
|
|
this.$alert("发货单存在,请保存发货单再进行操作", "温馨提示", {
|
|
|
confirmButtonText: "确定",
|
|
|
@@ -1656,7 +1672,6 @@ export default {
|
|
|
},
|
|
|
getRow(event,row) {
|
|
|
row.priceCategory = event[0].goodsTypeName
|
|
|
- this.$set(row, 'priceType', '一般')
|
|
|
row.code = event[0].code
|
|
|
row.typeno = event[0].typeno
|
|
|
row.itemType = event[0].typeno
|
|
|
@@ -1709,6 +1724,7 @@ export default {
|
|
|
this.tableDataCost[item].feeName = this.tableDataCost[item].cname
|
|
|
this.$set(this.tableDataCost[item], 'amount', 0)
|
|
|
this.$set(this.tableDataCost[item], 'settlmentAmount', 0)
|
|
|
+ this.$set(this.tableDataCost[item], 'corpId', this.form.corpId)
|
|
|
this.tableDataCost[item].sort = this.maxFeeNum + 1
|
|
|
this.maxFeeNum++
|
|
|
delete this.tableDataCost[item].id
|
|
|
@@ -1734,7 +1750,6 @@ export default {
|
|
|
delete this.tableData[item].goodsTypeName
|
|
|
this.tableData[item].itemId = this.tableData[item].id
|
|
|
this.$set(this.tableData[item], 'itemType', this.tableData[item].typeno)
|
|
|
- this.$set(this.tableData[item], 'priceType', '一般')
|
|
|
this.$set(this.tableData[item], 'orderQuantity', 0)
|
|
|
this.$set(this.tableData[item], 'actualQuantity', 0)
|
|
|
this.$set(this.tableData[item], 'purchaseAmount', '0')
|
|
|
@@ -1754,6 +1769,9 @@ export default {
|
|
|
})
|
|
|
this.tableData[item].amount = 0
|
|
|
this.tableData[item].sort = this.maxGoodsNum + 1
|
|
|
+ if (this.form.packageRemarks) {
|
|
|
+ this.tableData[item].packageRemarks = this.form.packageRemarks
|
|
|
+ }
|
|
|
delete this.tableData[item].id
|
|
|
delete this.tableData[item].pid
|
|
|
delete this.tableData[item].isDeleted
|
|
|
@@ -1819,6 +1837,7 @@ export default {
|
|
|
},
|
|
|
//刷新触发
|
|
|
refreshChange() {
|
|
|
+ this.treeDeptId = ''
|
|
|
this.page.currentPage = 1;
|
|
|
this.onLoad(this.page);
|
|
|
},
|
|
|
@@ -1981,6 +2000,7 @@ export default {
|
|
|
},
|
|
|
//
|
|
|
goodsSearch(params, done) {
|
|
|
+ this.treeDeptId = ''
|
|
|
this.onLoad(this.page, params);
|
|
|
done()
|
|
|
},
|
|
|
@@ -1998,6 +2018,7 @@ export default {
|
|
|
},
|
|
|
// 费用查询按钮
|
|
|
feesSearch(params, done) {
|
|
|
+ this.treeDeptIdCost = '';
|
|
|
this.onLoadCost(this.pageCost, params)
|
|
|
done()
|
|
|
},
|
lichao