|
@@ -48,7 +48,7 @@
|
|
<!-- 审核 /详情-->
|
|
<!-- 审核 /详情-->
|
|
<div v-if="moduleType === 3 || moduleType === 2">
|
|
<div v-if="moduleType === 3 || moduleType === 2">
|
|
<el-button v-if="moduleType === 3" type="primary" size="mini" @click="onExamine('OK')">同意</el-button>
|
|
<el-button v-if="moduleType === 3" type="primary" size="mini" @click="onExamine('OK')">同意</el-button>
|
|
- <el-button size="mini" @click="onInvoice('SAVE')">撤回</el-button>
|
|
|
|
|
|
+ <el-button v-if="formData.status === 'OK'" size="mini" @click="onInvoice('SAVE')">撤回</el-button>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</template>
|
|
</template>
|
|
@@ -58,6 +58,8 @@ import TemplatePage from '@/components/template/template-page-1.vue'
|
|
import { getcustomerFrontList } from '@/api/stock'
|
|
import { getcustomerFrontList } from '@/api/stock'
|
|
import { getListCostBillV2 } from '@/api/logisticsBill'
|
|
import { getListCostBillV2 } from '@/api/logisticsBill'
|
|
|
|
|
|
|
|
+import { debounce } from '@/utils/common'
|
|
|
|
+
|
|
import { getStagecustomerListV2, getDealerListV2 } from '@/api/basic_data/dealer'
|
|
import { getStagecustomerListV2, getDealerListV2 } from '@/api/basic_data/dealer'
|
|
import {
|
|
import {
|
|
addCustomerTransfer,
|
|
addCustomerTransfer,
|
|
@@ -178,7 +180,6 @@ export default {
|
|
valueFormat: 'yyyy-MM-dd HH:mm:ss',
|
|
valueFormat: 'yyyy-MM-dd HH:mm:ss',
|
|
disabled: this.comDisabled,
|
|
disabled: this.comDisabled,
|
|
pickerOptions: this.setDisabled
|
|
pickerOptions: this.setDisabled
|
|
-
|
|
|
|
},
|
|
},
|
|
formItemAttributes: { label: '调整日期', prop: 'transferTime' }
|
|
formItemAttributes: { label: '调整日期', prop: 'transferTime' }
|
|
},
|
|
},
|
|
@@ -192,7 +193,7 @@ export default {
|
|
name: 'el-select',
|
|
name: 'el-select',
|
|
options: this.sonCustomerNumberList,
|
|
options: this.sonCustomerNumberList,
|
|
events: {
|
|
events: {
|
|
- change: (e) => this.handleChange(e, 'transferCustomerNumber')
|
|
|
|
|
|
+ change: e => this.handleChange(e, 'transferCustomerNumber')
|
|
},
|
|
},
|
|
md: 6,
|
|
md: 6,
|
|
attributes: {
|
|
attributes: {
|
|
@@ -207,7 +208,7 @@ export default {
|
|
options: this.sonCustomerNameList,
|
|
options: this.sonCustomerNameList,
|
|
md: 6,
|
|
md: 6,
|
|
events: {
|
|
events: {
|
|
- change: (e) => this.handleChange(e, 'transferCustomerName')
|
|
|
|
|
|
+ change: e => this.handleChange(e, 'transferCustomerName')
|
|
},
|
|
},
|
|
attributes: {
|
|
attributes: {
|
|
clearable: true,
|
|
clearable: true,
|
|
@@ -285,11 +286,13 @@ export default {
|
|
},
|
|
},
|
|
...(() => {
|
|
...(() => {
|
|
if (~[1].indexOf(this.moduleType)) {
|
|
if (~[1].indexOf(this.moduleType)) {
|
|
- return [{
|
|
|
|
- columnAttributes: {
|
|
|
|
- label: '可调拨库存数',
|
|
|
|
- prop: 'frontStockNum'
|
|
|
|
- }}
|
|
|
|
|
|
+ return [
|
|
|
|
+ {
|
|
|
|
+ columnAttributes: {
|
|
|
|
+ label: '可调拨库存数',
|
|
|
|
+ prop: 'frontStockNum'
|
|
|
|
+ }
|
|
|
|
+ }
|
|
]
|
|
]
|
|
}
|
|
}
|
|
return []
|
|
return []
|
|
@@ -302,14 +305,18 @@ export default {
|
|
},
|
|
},
|
|
render: (h, { column, row, index }) => {
|
|
render: (h, { column, row, index }) => {
|
|
return (
|
|
return (
|
|
- <div style='margin:0 20px'>
|
|
|
|
|
|
+ <div style="margin:0 20px">
|
|
<el-input
|
|
<el-input
|
|
- type='number'
|
|
|
|
|
|
+ type="number"
|
|
disabled={this.comDisabled}
|
|
disabled={this.comDisabled}
|
|
value={row.qty}
|
|
value={row.qty}
|
|
- onInput={e => (row.qty = e)}
|
|
|
|
- placeholder='调拨数量'
|
|
|
|
- size='mini'
|
|
|
|
|
|
+ // onInput={e => (row.qty = e)}
|
|
|
|
+ onInput={value => {
|
|
|
|
+ row.qty = value
|
|
|
|
+ this.debounceChange(value, index)
|
|
|
|
+ }}
|
|
|
|
+ placeholder="调拨数量"
|
|
|
|
+ size="mini"
|
|
></el-input>
|
|
></el-input>
|
|
</div>
|
|
</div>
|
|
)
|
|
)
|
|
@@ -323,12 +330,12 @@ export default {
|
|
render: (h, { column, row, index }) => {
|
|
render: (h, { column, row, index }) => {
|
|
return (
|
|
return (
|
|
<el-input
|
|
<el-input
|
|
- type='text'
|
|
|
|
|
|
+ type="text"
|
|
value={row.notes}
|
|
value={row.notes}
|
|
disabled={this.comDisabled}
|
|
disabled={this.comDisabled}
|
|
onInput={e => (row.notes = e)}
|
|
onInput={e => (row.notes = e)}
|
|
- placeholder='备注'
|
|
|
|
- size='mini'
|
|
|
|
|
|
+ placeholder="备注"
|
|
|
|
+ size="mini"
|
|
></el-input>
|
|
></el-input>
|
|
)
|
|
)
|
|
}
|
|
}
|
|
@@ -349,8 +356,8 @@ export default {
|
|
<div>
|
|
<div>
|
|
{!this.comDisabled ? (
|
|
{!this.comDisabled ? (
|
|
<el-button
|
|
<el-button
|
|
- type='text'
|
|
|
|
- size='default'
|
|
|
|
|
|
+ type="text"
|
|
|
|
+ size="default"
|
|
onClick={() => {
|
|
onClick={() => {
|
|
this.handleDel(index)
|
|
this.handleDel(index)
|
|
}}
|
|
}}
|
|
@@ -369,29 +376,29 @@ export default {
|
|
...[
|
|
...[
|
|
!this.comDisabled
|
|
!this.comDisabled
|
|
? {
|
|
? {
|
|
- name: 'slot-component',
|
|
|
|
- md: 24,
|
|
|
|
- attributes: { disabled: false },
|
|
|
|
- formItemAttributes: { label: '', prop: '' },
|
|
|
|
- render: (h, { props, onInput }) => {
|
|
|
|
- return (
|
|
|
|
- <div>
|
|
|
|
- <el-button
|
|
|
|
- size='mini'
|
|
|
|
- onClick={() => {
|
|
|
|
- this.visible = true
|
|
|
|
- this.recordSelected = []
|
|
|
|
- }}
|
|
|
|
- >
|
|
|
|
|
|
+ name: 'slot-component',
|
|
|
|
+ md: 24,
|
|
|
|
+ attributes: { disabled: false },
|
|
|
|
+ formItemAttributes: { label: '', prop: '' },
|
|
|
|
+ render: (h, { props, onInput }) => {
|
|
|
|
+ return (
|
|
|
|
+ <div>
|
|
|
|
+ <el-button
|
|
|
|
+ size="mini"
|
|
|
|
+ onClick={() => {
|
|
|
|
+ this.visible = true
|
|
|
|
+ this.recordSelected = []
|
|
|
|
+ }}
|
|
|
|
+ >
|
|
添加
|
|
添加
|
|
- </el-button>
|
|
|
|
- <el-button size='mini' onClick={() => this.handleAllDel()}>
|
|
|
|
|
|
+ </el-button>
|
|
|
|
+ <el-button size="mini" onClick={() => this.handleAllDel()}>
|
|
删除
|
|
删除
|
|
- </el-button>
|
|
|
|
- </div>
|
|
|
|
- )
|
|
|
|
|
|
+ </el-button>
|
|
|
|
+ </div>
|
|
|
|
+ )
|
|
|
|
+ }
|
|
}
|
|
}
|
|
- }
|
|
|
|
: {}
|
|
: {}
|
|
],
|
|
],
|
|
{
|
|
{
|
|
@@ -534,109 +541,127 @@ export default {
|
|
prop: 'materialCostType',
|
|
prop: 'materialCostType',
|
|
width: 200
|
|
width: 200
|
|
}
|
|
}
|
|
- }, {
|
|
|
|
|
|
+ },
|
|
|
|
+ {
|
|
columnAttributes: {
|
|
columnAttributes: {
|
|
label: '产品名称',
|
|
label: '产品名称',
|
|
prop: 'materialName',
|
|
prop: 'materialName',
|
|
width: 200
|
|
width: 200
|
|
}
|
|
}
|
|
- }, {
|
|
|
|
|
|
+ },
|
|
|
|
+ {
|
|
columnAttributes: {
|
|
columnAttributes: {
|
|
label: '规格型号',
|
|
label: '规格型号',
|
|
prop: 'materialSpecification',
|
|
prop: 'materialSpecification',
|
|
width: 350
|
|
width: 350
|
|
}
|
|
}
|
|
- }, {
|
|
|
|
|
|
+ },
|
|
|
|
+ {
|
|
columnAttributes: {
|
|
columnAttributes: {
|
|
label: '物料类型',
|
|
label: '物料类型',
|
|
prop: 'materialType',
|
|
prop: 'materialType',
|
|
width: 200
|
|
width: 200
|
|
}
|
|
}
|
|
- }, {
|
|
|
|
|
|
+ },
|
|
|
|
+ {
|
|
columnAttributes: {
|
|
columnAttributes: {
|
|
label: '商家编码',
|
|
label: '商家编码',
|
|
prop: 'merchantCode',
|
|
prop: 'merchantCode',
|
|
width: 200
|
|
width: 200
|
|
}
|
|
}
|
|
- }, {
|
|
|
|
|
|
+ },
|
|
|
|
+ {
|
|
columnAttributes: {
|
|
columnAttributes: {
|
|
label: '商家名称',
|
|
label: '商家名称',
|
|
prop: 'merchantName',
|
|
prop: 'merchantName',
|
|
width: 200
|
|
width: 200
|
|
}
|
|
}
|
|
- }, {
|
|
|
|
|
|
+ },
|
|
|
|
+ {
|
|
columnAttributes: {
|
|
columnAttributes: {
|
|
label: '订单号',
|
|
label: '订单号',
|
|
prop: 'orderCode',
|
|
prop: 'orderCode',
|
|
width: 200
|
|
width: 200
|
|
}
|
|
}
|
|
- }, {
|
|
|
|
|
|
+ },
|
|
|
|
+ {
|
|
columnAttributes: {
|
|
columnAttributes: {
|
|
label: '订单时间',
|
|
label: '订单时间',
|
|
prop: 'orderDate',
|
|
prop: 'orderDate',
|
|
width: 200
|
|
width: 200
|
|
}
|
|
}
|
|
- }, {
|
|
|
|
|
|
+ },
|
|
|
|
+ {
|
|
columnAttributes: {
|
|
columnAttributes: {
|
|
label: '订单类型',
|
|
label: '订单类型',
|
|
prop: 'orderType',
|
|
prop: 'orderType',
|
|
width: 200
|
|
width: 200
|
|
}
|
|
}
|
|
- }, {
|
|
|
|
|
|
+ },
|
|
|
|
+ {
|
|
columnAttributes: {
|
|
columnAttributes: {
|
|
label: '订单类型细分',
|
|
label: '订单类型细分',
|
|
prop: 'orderTypeDetail',
|
|
prop: 'orderTypeDetail',
|
|
width: 200
|
|
width: 200
|
|
}
|
|
}
|
|
- }, {
|
|
|
|
|
|
+ },
|
|
|
|
+ {
|
|
columnAttributes: {
|
|
columnAttributes: {
|
|
label: '收货送货地址',
|
|
label: '收货送货地址',
|
|
prop: 'receiptAddress',
|
|
prop: 'receiptAddress',
|
|
width: 200
|
|
width: 200
|
|
}
|
|
}
|
|
- }, {
|
|
|
|
|
|
+ },
|
|
|
|
+ {
|
|
columnAttributes: {
|
|
columnAttributes: {
|
|
label: '退货单号',
|
|
label: '退货单号',
|
|
prop: 'returnOrderCode',
|
|
prop: 'returnOrderCode',
|
|
width: 200
|
|
width: 200
|
|
}
|
|
}
|
|
- }, {
|
|
|
|
|
|
+ },
|
|
|
|
+ {
|
|
columnAttributes: {
|
|
columnAttributes: {
|
|
label: '补贴结算系数',
|
|
label: '补贴结算系数',
|
|
prop: 'subsidyCoefficient',
|
|
prop: 'subsidyCoefficient',
|
|
width: 200
|
|
width: 200
|
|
}
|
|
}
|
|
- }, {
|
|
|
|
|
|
+ },
|
|
|
|
+ {
|
|
columnAttributes: {
|
|
columnAttributes: {
|
|
label: '嘉贤创建时间',
|
|
label: '嘉贤创建时间',
|
|
prop: 'time',
|
|
prop: 'time',
|
|
width: 200
|
|
width: 200
|
|
}
|
|
}
|
|
- }, {
|
|
|
|
|
|
+ },
|
|
|
|
+ {
|
|
columnAttributes: {
|
|
columnAttributes: {
|
|
label: '费用汇总',
|
|
label: '费用汇总',
|
|
prop: 'totalCost',
|
|
prop: 'totalCost',
|
|
width: 200
|
|
width: 200
|
|
}
|
|
}
|
|
- }, {
|
|
|
|
|
|
+ },
|
|
|
|
+ {
|
|
columnAttributes: {
|
|
columnAttributes: {
|
|
label: '单价计算',
|
|
label: '单价计算',
|
|
prop: 'unitPrice',
|
|
prop: 'unitPrice',
|
|
width: 200
|
|
width: 200
|
|
}
|
|
}
|
|
- }, {
|
|
|
|
|
|
+ },
|
|
|
|
+ {
|
|
columnAttributes: {
|
|
columnAttributes: {
|
|
label: '卸货上楼结算系数',
|
|
label: '卸货上楼结算系数',
|
|
prop: 'unloadUpstairsCoefficient',
|
|
prop: 'unloadUpstairsCoefficient',
|
|
width: 200
|
|
width: 200
|
|
}
|
|
}
|
|
- }, {
|
|
|
|
|
|
+ },
|
|
|
|
+ {
|
|
columnAttributes: {
|
|
columnAttributes: {
|
|
label: '上楼卸货费用',
|
|
label: '上楼卸货费用',
|
|
prop: 'unloadUpstairsCost',
|
|
prop: 'unloadUpstairsCost',
|
|
width: 200
|
|
width: 200
|
|
}
|
|
}
|
|
- }, {
|
|
|
|
|
|
+ },
|
|
|
|
+ {
|
|
columnAttributes: {
|
|
columnAttributes: {
|
|
label: '发货仓库编码',
|
|
label: '发货仓库编码',
|
|
prop: 'warehouseCode',
|
|
prop: 'warehouseCode',
|
|
@@ -833,6 +858,13 @@ export default {
|
|
}
|
|
}
|
|
},
|
|
},
|
|
methods: {
|
|
methods: {
|
|
|
|
+ debounceChange: debounce(function (val, index) {
|
|
|
|
+ if (val <= 0) {
|
|
|
|
+ this.selectData[index].qty = 1
|
|
|
|
+ } else {
|
|
|
|
+ this.selectData[index].qty = parseInt(val)
|
|
|
|
+ }
|
|
|
|
+ }, 500),
|
|
// 列表请求函数
|
|
// 列表请求函数
|
|
getList(...p) {
|
|
getList(...p) {
|
|
this.recordSelected = []
|
|
this.recordSelected = []
|