UDI
/
udiwms-vue-frame
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

选择业务单

Browse Source
yanshishuju
yewj 7 months ago
parent 23a5ec740f
commit d0d9d560a0
3 changed files with 425 additions and 149 deletions
Show Stats Download Patch File Download Diff File

1
src/views/collect/CollectOrderNew.vue
Unescape Escape View File

@ -133,7 +133,6 @@
<el-divider style="margin: 15px"></el-divider>
<el-tabs type="border-card" style="margin-top: 55px">
<el-tab-pane label="原始单据">
<el-table v-loading="loading" :data="list" style="width: 100%;" border highlight-current-row
@row-click="(row) => executeFuc(row,'0',tableObj.handleChangeFuc)" ref="multipleTable"
:default-sort="defaultSort"

6
src/views/collect/IoCreateOrder.vue
Unescape Escape View File

@ -573,7 +573,11 @@ export default {
curWorkPlace: null,
fifoSplitEnable: false,
scanDisabled: false,//是否禁用扫码输入框
valiCodes: []
valiCodes: [],
warnResult: "",
errResult: "",
warnVisible: false,
errVisible: false,
};
},
components: {

279
src/views/collect/selectCollectOrderDialog.vue
Unescape Escape View File

@ -100,7 +100,120 @@
</el-button-group>
</div>
<el-divider style="margin: 15px"></el-divider>
<el-tabs type="border-card" style="margin-top: 55px">
<el-tab-pane label="挂起单据">
<el-table v-loading="loading" :data="draftList" style="width: 100%;" border highlight-current-row
@row-click="(row) => executeFuc(row,'0',tableObj.handleChangeFuc)"
ref="multipleTable"
@current-change="handleChange"
:default-sort="defaultSort"
:row-style="{ height: '32px' }"
@sort-change="handleSortChange">
<template v-for="(item, index) in tableHeader">
<el-table-column
v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"
type="index" :label="item.columnDesc"></el-table-column>
<el-table-column
v-if="item.columnType == 'selection'"
type="selection"
:width="item.width"
:selectable="(row,number) => executeFuc(row,'3',item.clickFuc)"
></el-table-column>
<el-table-column
v-if="item.columnType == 'radio' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
<el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
</template>
</el-table-column>
<el-table-column
v-if="item.columnType == 'laber' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
<span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{
item.lableRuleObj[scope.row[item.columnName]]
}}</span>
</template>
</el-table-column>
<el-table-column
v-if="item.columnType == 'eltag' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
<el-tag
:type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])">
<span>{{
item.lableRuleObj ? item.lableRuleObj[scope.row[item.columnName]] : scope.row[item.columnName]
}}</span>
</el-tag>
</template>
</el-table-column>
<el-table-column
v-if="item.columnType == 'button' && executeEval(row,item.expression,true) && viewType != 1"
:prop="item.columnName"
:label="item.columnDesc"
:width="item.width"
:key="item.columnName"
fixed="right"
>
<template slot-scope="scope">
<el-button v-for="(buttonItem, buttonIndex) in item.buttonRulObj"
:type="buttonItem.type"
:size="buttonItem.size"
:style="buttonItem.style"
:key="buttonItem"
v-if="executeEval(scope.row,buttonItem.hasPermi,true)"
:disabled="executeEval(scope.row,buttonItem.disabledFuc,false)"
@click.native.stop="executeFuc(scope.row,'1',buttonItem.clickFuc)"
>{{ buttonItem.name }}
</el-button>
</template>
</el-table-column>
<el-table-column
v-if="item.columnType == 'text' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
<span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{
scope.row[item.columnName]
}}</span>
</template>
</el-table-column>
</template>
</el-table>
<pagination
v-show="draftTotal>0"
:total="draftTotal"
:limit.sync="filterQuery.limit"
:page.sync="filterQuery.page"
@pagination="handleCurrentChange"
></pagination>
</el-tab-pane>
<el-tab-pane label="待处理单据">
<el-table v-loading="loading" :data="list" style="width: 100%;" border highlight-current-row
@row-click="(row) => executeFuc(row,'0',tableObj.handleChangeFuc)"
ref="multipleTable"
@ -204,7 +317,6 @@
</el-table-column>
</template>
</el-table>
<pagination
v-show="total>0"
:total="total"
@ -212,6 +324,120 @@
:page.sync="filterQuery.page"
@pagination="handleCurrentChange"
></pagination>
</el-tab-pane>
<el-tab-pane label="其他工位单据">
<el-table v-loading="loading" :data="otherList" style="width: 100%;" border highlight-current-row
@row-click="(row) => executeFuc(row,'0',tableObj.handleChangeFuc)"
ref="multipleTable"
@current-change="handleChange"
:default-sort="defaultSort"
:row-style="{ height: '32px' }"
@sort-change="handleSortChange">
<template v-for="(item, index) in tableHeader">
<el-table-column
v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"
type="index" :label="item.columnDesc"></el-table-column>
<el-table-column
v-if="item.columnType == 'selection'"
type="selection"
:width="item.width"
:selectable="(row,number) => executeFuc(row,'3',item.clickFuc)"
></el-table-column>
<el-table-column
v-if="item.columnType == 'radio' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
<el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
</template>
</el-table-column>
<el-table-column
v-if="item.columnType == 'laber' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
<span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{
item.lableRuleObj[scope.row[item.columnName]]
}}</span>
</template>
</el-table-column>
<el-table-column
v-if="item.columnType == 'eltag' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
<el-tag
:type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])">
<span>{{
item.lableRuleObj ? item.lableRuleObj[scope.row[item.columnName]] : scope.row[item.columnName]
}}</span>
</el-tag>
</template>
</el-table-column>
<el-table-column
v-if="item.columnType == 'button' && executeEval(row,item.expression,true) && viewType != 1"
:prop="item.columnName"
:label="item.columnDesc"
:width="item.width"
:key="item.columnName"
fixed="right"
>
<template slot-scope="scope">
<el-button v-for="(buttonItem, buttonIndex) in item.buttonRulObj"
:type="buttonItem.type"
:size="buttonItem.size"
:style="buttonItem.style"
:key="buttonItem"
v-if="executeEval(scope.row,buttonItem.hasPermi,true)"
:disabled="executeEval(scope.row,buttonItem.disabledFuc,false)"
@click.native.stop="executeFuc(scope.row,'1',buttonItem.clickFuc)"
>{{ buttonItem.name }}
</el-button>
</template>
</el-table-column>
<el-table-column
v-if="item.columnType == 'text' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
<span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{
scope.row[item.columnName]
}}</span>
</template>
</el-table-column>
</template>
</el-table>
<pagination
v-show="otherTotal>0"
:total="otherTotal"
:limit.sync="filterQuery.limit"
:page.sync="filterQuery.page"
@pagination="handleCurrentChange"
></pagination>
</el-tab-pane>
</el-tabs>
</el-card>
<el-tabs type="border-card" style="margin: 15px">
<el-tab-pane label="单据明细">
@ -292,6 +518,7 @@ export default {
billNo: null,
page: 1,
limit: 10,
excludeWorkCode: null,
tagStatusList: [0, 1, -1], // 0:原始单据未处理，1:已分配工位待处理；2：处理中；4：处理异常,-1:草稿，挂起状态
// invAlerts:[0,1]
},
@ -299,6 +526,13 @@ export default {
loading: false,
list: [],
total: 0,
draftList: [],
draftTotal: 0,
otherList: [],
otherTotal: 0,
deleteData: {},
radioCheck: null,
curRow: null,
@ -357,6 +591,9 @@ export default {
onSubmit() {
this.filterQuery.page = 1;
this.getList();
this.getDraftList();
this.getOtherList();
},
onConfirm() {
@ -365,10 +602,10 @@ export default {
getList() {
this.loading = true;
this.filterQuery.workPlaceCode = this.workPlaceCode
this.filterQuery.busType = this.busType
// this.filterQuery.fromCorp = this.fromCorp
this.filterQuery.excludeWorkCode = null
this.filterQuery.tagStatus = 1
orderPage(this.filterQuery).then(res => {
this.loading = false
this.list = res.data.list || []
@ -379,6 +616,40 @@ export default {
this.total = 0
})
},
getDraftList() {
this.loading = true;
this.filterQuery.busType = this.busType
this.filterQuery.excludeWorkCode = null
// this.filterQuery.fromCorp = this.fromCorp
this.filterQuery.tagStatus = -1
orderPage(this.filterQuery).then(res => {
this.loading = false
this.draftList = res.data.list || []
this.draftTotal = res.data.total || 0
}).catch(() => {
this.loading = false
this.draftList = []
this.draftTotal = 0
})
},
getOtherList() {
this.loading = true;
this.filterQuery.busType = this.busType
// this.filterQuery.fromCorp = this.fromCorp
this.filterQuery.excludeWorkCode = this.workPlaceCode
this.filterQuery.tagStatus = 1
orderPage(this.filterQuery).then(res => {
this.loading = false
this.otherList = res.data.list || []
this.otherTotal = res.data.total || 0
}).catch(() => {
this.loading = false
this.otherList = []
this.otherTotal = 0
})
},
handleCurrentChange(val) {
this.filterQuery.page = val.page;
this.getList();
@ -473,6 +744,8 @@ export default {
this.queryList = re.data.queryList;
this.fromList = re.data.fromList;
this.getList();
this.getDraftList();
this.getOtherList();
// this.findCorpList(this,this.fromCorp);
});

Write Preview
Loading…
Cancel
Save