|
@@ -5,7 +5,7 @@
|
|
|
<el-form :inline="true" :model="dataForm" @keyup.enter.native="search()">
|
|
|
<el-form-item label="类别">
|
|
|
<el-select
|
|
|
- v-model="dataForm.purchaseType"
|
|
|
+ v-model="dataForm.commissionType"
|
|
|
remote
|
|
|
placeholder="请选择">
|
|
|
<el-option
|
|
@@ -16,8 +16,8 @@
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="名称或说明" prop="supplierName">
|
|
|
- <el-input v-model="dataForm.supplierName" placeholder="产品名称" clearable/>
|
|
|
+ <el-form-item label="名称或说明" prop="goodsName">
|
|
|
+ <el-input v-model="dataForm.goodsName" placeholder="产品名称" clearable/>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="申请日期">
|
|
|
<el-date-picker
|
|
@@ -82,7 +82,7 @@
|
|
|
label="产品编号">
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- prop="purchaseType"
|
|
|
+ prop="commissionType"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
min-width="140"
|
|
@@ -169,7 +169,7 @@
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- prop="applyTime"
|
|
|
+ prop="createTime"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
min-width="140"
|
|
@@ -254,6 +254,7 @@ import { getOutsourceList } from '@/api/sale'
|
|
|
import AttachDetail from '../common/attach-detail'
|
|
|
import NoticeChangeSetting from '../cus/contract-record-notice-change-setting'
|
|
|
import ChangeForm from '../cus/contract-record-change'
|
|
|
+import { getDictList } from '@/api/dict'
|
|
|
export default {
|
|
|
name: 'outsource',
|
|
|
components: {
|
|
@@ -280,6 +281,10 @@ export default {
|
|
|
dataListSelections: [],
|
|
|
optionsType: [], // 类别
|
|
|
optionsOutsourceState: [
|
|
|
+ {
|
|
|
+ code: null,
|
|
|
+ value: '全部'
|
|
|
+ },
|
|
|
{
|
|
|
code: '0',
|
|
|
value: '待委外'
|
|
@@ -306,6 +311,7 @@ export default {
|
|
|
},
|
|
|
created () {
|
|
|
this.optionsState = this.$store.state.common.approveStates
|
|
|
+ this.getType()
|
|
|
this.getDataList()
|
|
|
},
|
|
|
methods: {
|
|
@@ -322,20 +328,28 @@ export default {
|
|
|
this.pageIndex = 1
|
|
|
this.getDataList()
|
|
|
},
|
|
|
+ // 获取类别
|
|
|
+ getType () {
|
|
|
+ getDictList({type: 'commission_type'}).then(({data}) => {
|
|
|
+ if (data) {
|
|
|
+ this.optionsType = data
|
|
|
+ }
|
|
|
+ })
|
|
|
+ },
|
|
|
// 获取数据列表
|
|
|
getDataList () {
|
|
|
this.dataListLoading = true
|
|
|
let params = {
|
|
|
'current': this.pageIndex,
|
|
|
'size': this.pageSize,
|
|
|
- 'supplierName': this.dataForm.supplierName ? this.dataForm.supplierName : null,
|
|
|
+ 'goodsName': this.dataForm.goodsName ? this.dataForm.goodsName : null,
|
|
|
'applyTimeBegin': this.dataForm.date ? this.dataForm.date[0] : null,
|
|
|
'applyTimeEnd': this.dataForm.date ? this.dataForm.date[1] : null,
|
|
|
'purchaseState': this.dataForm.purchaseState ? this.dataForm.purchaseState : null,
|
|
|
- 'purchaseType': this.dataForm.purchaseType ? this.dataForm.purchaseType : null
|
|
|
+ 'commissionType': this.dataForm.commissionType ? this.dataForm.commissionType : null
|
|
|
}
|
|
|
getOutsourceList(params).then(({data}) => {
|
|
|
- if (data && data.code === '200') {
|
|
|
+ if (data && data.code === '200' && data.data) {
|
|
|
this.dataList = data.data.records
|
|
|
this.totalPage = Number(data.data.total)
|
|
|
} else {
|