diff --git a/src/views/oem/oemOrderSettlement/components/settlementAnomaly.vue b/src/views/oem/oemOrderSettlement/components/settlementAnomaly.vue index 11df2c7d..a1ff884c 100644 --- a/src/views/oem/oemOrderSettlement/components/settlementAnomaly.vue +++ b/src/views/oem/oemOrderSettlement/components/settlementAnomaly.vue @@ -139,19 +139,19 @@ export default { }, { label: '质量等级', - prop: 'prodIdent', + prop: 'productIdent', sortable: true, filter: true, span: 24, search: true, width: 120, - type:'select', + // type:'select', searchOrder:6, - dicUrl:"/api/blade-scheduling/qualityGrade/getGrades", - props:{ - label:'qualityGrade', - value:"id" - } + // dicUrl:"/api/blade-scheduling/qualityGrade/getGrades", + // props:{ + // label:'qualityGrade', + // value:"id" + // } }, { label: '工序', @@ -180,6 +180,7 @@ export default { search: true, searchOrder:9, width: 120, + type:'select', dicUrl:"/api/blade-desk/BA/craftAbility/findList", props:{ label:"caName", @@ -188,11 +189,11 @@ export default { }, { label: '流程卡号', - prop: 'ocCode', + prop: 'cardNo', sortable: true, filter: true, span: 24, - hide: true, + // hide: true, search: true, width: 120, searchOrder:3, diff --git a/src/views/oem/oemOrderSettlement/components/settlementCompleted.vue b/src/views/oem/oemOrderSettlement/components/settlementCompleted.vue index 208e167e..f59389c3 100644 --- a/src/views/oem/oemOrderSettlement/components/settlementCompleted.vue +++ b/src/views/oem/oemOrderSettlement/components/settlementCompleted.vue @@ -133,23 +133,23 @@ export default { }, { label: '质量等级', - prop: 'prodIdent', + prop: 'productIdent', sortable: true, filter: true, span: 24, search: true, width: 120, - type:'select', + // type:'select', searchOrder:6, - dicUrl:"/api/blade-scheduling/qualityGrade/getGrades", - props:{ - label:'qualityGrade', - value:"id" - } + // dicUrl:"/api/blade-scheduling/qualityGrade/getGrades", + // props:{ + // label:'qualityGrade', + // value:"id" + // } }, { label: '工序', - prop: 'psId', + prop: 'ppsId', sortable: true, filter: true, span: 24, @@ -201,10 +201,10 @@ export default { }, { label: '流程卡号', - prop: 'ocName', + prop: 'cardNo', sortable: true, filter: true, - hide: true, + // hide: true, span: 24, search: true, width: 120, @@ -427,7 +427,7 @@ export default { sortable: true, filter: true, span: 24, - search: true, + search: false, hide: true, width: 120, type:'select', @@ -604,11 +604,16 @@ export default { }, onLoad() { this.loading = true - getStatement({ + let params = { current:this.page.currentPage, size:this.page.pageSize, - ...this.query - }).then(res =>{ + ...this.query, + postPlatingStorageTimeStart:this.query && this.query.putStoreTime && this.query.putStoreTime.length != 0 && this.query.putStoreTime[0], + postPlatingStorageTimeEnd:this.query && this.query.putStoreTime && this.query.putStoreTime.length != 0 && this.query.putStoreTime[1], + memo:this.query && this.query.memo && this.query.memo.length != 0 && this.query.memo.join(';'), + } + if(params.putStoreTime) delete params.putStoreTime; + getStatement(params).then(res =>{ this.data = res.data.data.records this.page.total = res.data.data.total this.loading = false diff --git a/src/views/oem/oemOrderSettlement/components/underReview.vue b/src/views/oem/oemOrderSettlement/components/underReview.vue index b4dca37e..141b8169 100644 --- a/src/views/oem/oemOrderSettlement/components/underReview.vue +++ b/src/views/oem/oemOrderSettlement/components/underReview.vue @@ -178,19 +178,19 @@ export default { }, { label: '质量等级', - prop: 'prodIdent', + prop: 'productIdent', sortable: true, filter: true, span: 24, search: true, width: 120, - type:'select', + // type:'select', searchOrder:5, - dicUrl:"/api/blade-scheduling/qualityGrade/getGrades", - props:{ - label:'qualityGrade', - value:"id" - } + // dicUrl:"/api/blade-scheduling/qualityGrade/getGrades", + // props:{ + // label:'qualityGrade', + // value:"id" + // } }, { label: '工序', @@ -211,13 +211,14 @@ export default { }, { label: '工艺能力', - prop: 'caName', + prop: 'caId', sortable: true, filter: true, span: 24, search: true, searchOrder:8, width: 120, + type:'select', dicUrl:"/api/blade-desk/BA/craftAbility/findList", props:{ label:"caName", diff --git a/src/views/oem/oemOrderSettlement/components/unsettled.vue b/src/views/oem/oemOrderSettlement/components/unsettled.vue index 9ce7c6bb..b923ed76 100644 --- a/src/views/oem/oemOrderSettlement/components/unsettled.vue +++ b/src/views/oem/oemOrderSettlement/components/unsettled.vue @@ -12,14 +12,14 @@ - 预结算 - 结算 - 无需结算 + 预结算 + 结算 + 无需结算 @@ -96,6 +96,7 @@ import 'nprogress/nprogress.css'; import { downloadXls } from '@/utils/util'; import settlementDailog from './SettlementDailog.vue' import {getStatement,noSettlementItem,calculate,preSettlement,supplement} from "@/api/outsourcingManagement/oemOrderSettlement" +import { mapGetters } from 'vuex'; export default { components: { settlementDailog @@ -212,14 +213,15 @@ export default { filter: true, span: 24, search: true, - width: 120, - type:'select', searchOrder:5, - dicUrl:"/api/blade-scheduling/qualityGrade/getGrades", - props:{ - label:'qualityGrade', - value:"id" - } + width: 120, + // type:'select', + // searchOrder:5, + // dicUrl:"/api/blade-scheduling/qualityGrade/getGrades", + // props:{ + // label:'qualityGrade', + // value:"id" + // } }, { label:"流程卡号", @@ -490,6 +492,9 @@ export default { } } }, + computed: { + ...mapGetters(['permission']), + }, methods: { // 表格排序 sortChange({ prop, order }) { diff --git a/src/views/oem/oemOrderSettlement/index.vue b/src/views/oem/oemOrderSettlement/index.vue index a8524e27..40227623 100644 --- a/src/views/oem/oemOrderSettlement/index.vue +++ b/src/views/oem/oemOrderSettlement/index.vue @@ -1,19 +1,19 @@ @@ -24,6 +24,7 @@ import settlementAnomaly from './components/settlementAnomaly.vue' import settlementCompleted from './components/settlementCompleted.vue' import underReview from './components/underReview.vue' import inReview from './components/inReview.vue' +import { mapGetters } from 'vuex'; export default { components:{ unsettled, @@ -39,6 +40,9 @@ export default { isOpen:false, } }, + computed: { + ...mapGetters(['permission']), + }, methods:{ }