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

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

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

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

@ -9,11 +9,11 @@
class="query-form-item" class="query-form-item"
:label="item.columnDesc+`:`" :key="item.id"> :label="item.columnDesc+`:`" :key="item.id">
<el-input <el-input
v-model="filterQuery[item.columnName]" v-model="filterQuery[item.columnName]"
:placeholder="item.columnDesc" :placeholder="item.columnDesc"
:disabled="executeEval(null,item.disabledFuc,false)" :disabled="executeEval(null,item.disabledFuc,false)"
@keyup.enter.native="executeFuc($event,'5',item.clickFuc)" @keyup.enter.native="executeFuc($event,'5',item.clickFuc)"
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)" <el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)"
@ -24,10 +24,10 @@
:disabled="executeEval(null,item.disabledFuc,false)" :disabled="executeEval(null,item.disabledFuc,false)"
clearable> clearable>
<el-option <el-option
v-for="dict in item.lableRuleObj" v-for="dict in item.lableRuleObj"
:key="dict.value" :key="dict.value"
:label="dict.label" :label="dict.label"
:value="dict.value" :value="dict.value"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -35,19 +35,19 @@
class="query-form-item" class="query-form-item"
:label="item.columnDesc+`:`"> :label="item.columnDesc+`:`">
<el-select <el-select
v-model="filterQuery[item.columnName]" v-model="filterQuery[item.columnName]"
:placeholder="item.columnDesc" :placeholder="item.columnDesc"
@change="executeFuc($event,'5',item.checkRules)" @change="executeFuc($event,'5',item.checkRules)"
:disabled="executeEval(null,item.disabledFuc,false)" :disabled="executeEval(null,item.disabledFuc,false)"
filterable filterable
remote remote
:remote-method="(query) => executeFuc(query,'5',item.clickFuc)" :remote-method="(query) => executeFuc(query,'5',item.clickFuc)"
clearable> clearable>
<el-option <el-option
v-for="item in options[item.clickFuc]" v-for="item in options[item.clickFuc]"
:key="item.code" :key="item.code"
:label="item.label" :label="item.label"
:value="item.code" :value="item.code"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -55,26 +55,26 @@
class="query-form-item" class="query-form-item"
:label="item.columnDesc+`:`"> :label="item.columnDesc+`:`">
<el-date-picker <el-date-picker
:picker-options="pickerOptions" :picker-options="pickerOptions"
v-model="actDateRange" v-model="actDateRange"
type="daterange" type="daterange"
format="yyyy 年 MM 月 dd 日" format="yyyy 年 MM 月 dd 日"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
range-separator="至" range-separator="至"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期" end-placeholder="结束日期"
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)" <el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)"
class="query-form-item" class="query-form-item"
:label="item.columnDesc+`:`"> :label="item.columnDesc+`:`">
<el-date-picker <el-date-picker
v-model="filterQuery[item.columnName]" v-model="filterQuery[item.columnName]"
:style="`width:${item.width+'px'}`" :style="`width:${item.width+'px'}`"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
:disabled="executeEval(null,item.disabledFuc,false)" :disabled="executeEval(null,item.disabledFuc,false)"
type="date" type="date"
:placeholder="item.columnDesc" :placeholder="item.columnDesc"
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
</template> </template>
@ -84,9 +84,9 @@
<el-button-group> <el-button-group>
<el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button> <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
<el-button <el-button
type="primary" type="primary"
icon="el-icon-refresh" icon="el-icon-refresh"
@click="onReset" @click="onReset"
>重置 >重置
</el-button> </el-button>
<el-button type="primary" icon="el-icon-search" @click="onSubmit" <el-button type="primary" icon="el-icon-search" @click="onSubmit"
@ -100,124 +100,350 @@
</el-button-group> </el-button-group>
</div> </div>
<el-divider style="margin: 15px"></el-divider> <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">
<el-table v-loading="loading" :data="list" style="width: 100%;" border highlight-current-row <template v-for="(item, index) in tableHeader">
@row-click="(row) => executeFuc(row,'0',tableObj.handleChangeFuc)" <el-table-column
ref="multipleTable" v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"
@current-change="handleChange" type="index" :label="item.columnDesc"></el-table-column>
:default-sort="defaultSort" <el-table-column
:row-style="{ height: '32px' }" v-if="item.columnType == 'selection'"
@sort-change="handleSortChange"> type="selection"
:width="item.width"
:selectable="(row,number) => executeFuc(row,'3',item.clickFuc)"
></el-table-column>
<template v-for="(item, index) in tableHeader"> <el-table-column
<el-table-column v-if="item.columnType == 'radio' && executeEval(row,item.expression,true)"
v-if="item.columnType == 'id' && executeEval(row,item.expression,true)" :prop="item.columnName"
type="index" :label="item.columnDesc"></el-table-column> :label="item.columnDesc"
<el-table-column :sortable="item.sort"
v-if="item.columnType == 'selection'" :width="item.width"
type="selection" :show-overflow-tooltip="item.tooltip"
:width="item.width" :key="item.columnName"
:selectable="(row,number) => executeFuc(row,'3',item.clickFuc)" >
></el-table-column> <template slot-scope="scope">
<el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
<el-table-column </template>
v-if="item.columnType == 'radio' && executeEval(row,item.expression,true)" </el-table-column>
:prop="item.columnName" <el-table-column
:label="item.columnDesc" v-if="item.columnType == 'laber' && executeEval(row,item.expression,true)"
:sortable="item.sort" :prop="item.columnName"
:width="item.width" :label="item.columnDesc"
:show-overflow-tooltip="item.tooltip" :sortable="item.sort"
:key="item.columnName" :width="item.width"
> :show-overflow-tooltip="item.tooltip"
<template slot-scope="scope"> :key="item.columnName"
<el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio> >
</template> <template slot-scope="scope">
</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]])}">{{ <span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{
item.lableRuleObj[scope.row[item.columnName]] item.lableRuleObj[scope.row[item.columnName]]
}}</span> }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
v-if="item.columnType == 'eltag' && executeEval(row,item.expression,true)" v-if="item.columnType == 'eltag' && executeEval(row,item.expression,true)"
:prop="item.columnName" :prop="item.columnName"
:label="item.columnDesc" :label="item.columnDesc"
:sortable="item.sort" :sortable="item.sort"
:width="item.width" :width="item.width"
:show-overflow-tooltip="item.tooltip" :show-overflow-tooltip="item.tooltip"
:key="item.columnName" :key="item.columnName"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag <el-tag
:type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])"> :type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])">
<span>{{ <span>{{
item.lableRuleObj ? item.lableRuleObj[scope.row[item.columnName]] : scope.row[item.columnName] item.lableRuleObj ? item.lableRuleObj[scope.row[item.columnName]] : scope.row[item.columnName]
}}</span> }}</span>
</el-tag> </el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
v-if="item.columnType == 'button' && executeEval(row,item.expression,true) && viewType != 1" v-if="item.columnType == 'button' && executeEval(row,item.expression,true) && viewType != 1"
:prop="item.columnName" :prop="item.columnName"
:label="item.columnDesc" :label="item.columnDesc"
:width="item.width" :width="item.width"
:key="item.columnName" :key="item.columnName"
fixed="right" fixed="right"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-button v-for="(buttonItem, buttonIndex) in item.buttonRulObj" <el-button v-for="(buttonItem, buttonIndex) in item.buttonRulObj"
:type="buttonItem.type" :type="buttonItem.type"
:size="buttonItem.size" :size="buttonItem.size"
:style="buttonItem.style" :style="buttonItem.style"
:key="buttonItem" :key="buttonItem"
v-if="executeEval(scope.row,buttonItem.hasPermi,true)" v-if="executeEval(scope.row,buttonItem.hasPermi,true)"
:disabled="executeEval(scope.row,buttonItem.disabledFuc,false)" :disabled="executeEval(scope.row,buttonItem.disabledFuc,false)"
@click.native.stop="executeFuc(scope.row,'1',buttonItem.clickFuc)" @click.native.stop="executeFuc(scope.row,'1',buttonItem.clickFuc)"
>{{ buttonItem.name }} >{{ buttonItem.name }}
</el-button> </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> </template>
</el-table-column> </el-table>
<el-table-column <pagination
v-if="item.columnType == 'text' && executeEval(row,item.expression,true)" v-show="draftTotal>0"
:prop="item.columnName" :total="draftTotal"
:label="item.columnDesc" :limit.sync="filterQuery.limit"
:sortable="item.sort" :page.sync="filterQuery.page"
:width="item.width" @pagination="handleCurrentChange"
:show-overflow-tooltip="item.tooltip" ></pagination>
:key="item.columnName" </el-tab-pane>
> <el-tab-pane label="待处理单据">
<template slot-scope="scope"> <el-table v-loading="loading" :data="list" 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])}">{{ <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{
scope.row[item.columnName] scope.row[item.columnName]
}}</span> }}</span>
</template>
</el-table-column>
</template> </template>
</el-table-column> </el-table>
</template> <pagination
</el-table> v-show="total>0"
:total="total"
:limit.sync="filterQuery.limit"
: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>
<pagination <el-table-column
v-show="total>0" v-if="item.columnType == 'radio' && executeEval(row,item.expression,true)"
:total="total" :prop="item.columnName"
:limit.sync="filterQuery.limit" :label="item.columnDesc"
:page.sync="filterQuery.page" :sortable="item.sort"
@pagination="handleCurrentChange" :width="item.width"
></pagination> :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-card>
<el-tabs type="border-card" style="margin: 15px"> <el-tabs type="border-card" style="margin: 15px">
<el-tab-pane label="单据明细"> <el-tab-pane label="单据明细">
<PannelOrderDetail <PannelOrderDetail
v-if="panelALive" v-if="panelALive"
:prescribeData="curRow" :prescribeData="curRow"
></PannelOrderDetail> ></PannelOrderDetail>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
@ -235,7 +461,7 @@ import prescribeDownloadDialog from "@/views/collect/prescribe/prescribeDownload
import prescribeOriginPanel from "./PannelOrderBiz"; import prescribeOriginPanel from "./PannelOrderBiz";
import PannelOrderDetail from "./PannelOrderDetail" import PannelOrderDetail from "./PannelOrderDetail"
import {orderPage} from "@/api/collect/collectOrder"; import {orderPage} from "@/api/collect/collectOrder";
import { selectCorpList } from '@/api/basic/basicUnitMaintain' import {selectCorpList} from '@/api/basic/basicUnitMaintain'
import {filterWorkOptimize} from "@/api/basic/workPlace/sysWorkplaceManage"; import {filterWorkOptimize} from "@/api/basic/workPlace/sysWorkplaceManage";
import {getWorkBindBusTypes, removeBusTypeById} from '@/api/basic/workPlace/sysWorkplaceDocuments' import {getWorkBindBusTypes, removeBusTypeById} from '@/api/basic/workPlace/sysWorkplaceDocuments'
@ -292,13 +518,21 @@ export default {
billNo: null, billNo: null,
page: 1, page: 1,
limit: 10, limit: 10,
tagStatusList: [0,1,-1], // 0:原始单据未处理，1:已分配工位待处理；2：处理中；4：处理异常,-1:草稿，挂起状态 excludeWorkCode: null,
tagStatusList: [0, 1, -1], // 0:原始单据未处理，1:已分配工位待处理；2：处理中；4：处理异常,-1:草稿，挂起状态
// invAlerts:[0,1] // invAlerts:[0,1]
}, },
defaultSort: {prop: 'createTime', order: 'desc'}, defaultSort: {prop: 'createTime', order: 'desc'},
loading: false, loading: false,
list: [], list: [],
total: 0, total: 0,
draftList: [],
draftTotal: 0,
otherList: [],
otherTotal: 0,
deleteData: {}, deleteData: {},
radioCheck: null, radioCheck: null,
curRow: null, curRow: null,
@ -312,7 +546,7 @@ export default {
}, },
components: { components: {
addOrder, errOrder, prescribeDownloadDialog, prescribeOriginPanel,PannelOrderDetail addOrder, errOrder, prescribeDownloadDialog, prescribeOriginPanel, PannelOrderDetail
}, },
methods: { methods: {
@ -346,7 +580,7 @@ export default {
billNo: null, billNo: null,
page: 1, page: 1,
limit: 10, limit: 10,
tagStatusList: [0,1,2,4,-1] // 0:原始单据未处理，1:已分配工位待处理；2：处理中；4：处理异常,-1:草稿，挂起状态 tagStatusList: [0, 1, 2, 4, -1] // 0:原始单据未处理，1:已分配工位待处理；2：处理中；4：处理异常,-1:草稿，挂起状态
}; };
this.actDateRange = []; this.actDateRange = [];
this.getList(); this.getList();
@ -357,6 +591,9 @@ export default {
onSubmit() { onSubmit() {
this.filterQuery.page = 1; this.filterQuery.page = 1;
this.getList(); this.getList();
this.getDraftList();
this.getOtherList();
}, },
onConfirm() { onConfirm() {
@ -365,10 +602,10 @@ export default {
getList() { getList() {
this.loading = true; this.loading = true;
this.filterQuery.workPlaceCode = this.workPlaceCode
this.filterQuery.busType = this.busType this.filterQuery.busType = this.busType
// this.filterQuery.fromCorp = this.fromCorp // this.filterQuery.fromCorp = this.fromCorp
this.filterQuery.excludeWorkCode = null
this.filterQuery.tagStatus = 1
orderPage(this.filterQuery).then(res => { orderPage(this.filterQuery).then(res => {
this.loading = false this.loading = false
this.list = res.data.list || [] this.list = res.data.list || []
@ -379,6 +616,40 @@ export default {
this.total = 0 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) { handleCurrentChange(val) {
this.filterQuery.page = val.page; this.filterQuery.page = val.page;
this.getList(); this.getList();
@ -434,8 +705,8 @@ export default {
}); });
}, },
changePlace(_this,query) { changePlace(_this, query) {
_this.getWorkBindBusTypes(_this,query) _this.getWorkBindBusTypes(_this, query)
}, },
getWorkBindBusTypes(_this, query) { getWorkBindBusTypes(_this, query) {
_this.busQuery.workplaceCode = query _this.busQuery.workplaceCode = query
@ -449,7 +720,7 @@ export default {
label: busType.busName label: busType.busName
}; };
}); });
_this.options.getBusType = getWorkPlace _this.options.getBusType = getWorkPlace
if (_this.options.getBusType.length == 1) { if (_this.options.getBusType.length == 1) {
_this.filterQuery.busType = _this.options.getBusType[0].code _this.filterQuery.busType = _this.options.getBusType[0].code
} else { } else {
@ -473,6 +744,8 @@ export default {
this.queryList = re.data.queryList; this.queryList = re.data.queryList;
this.fromList = re.data.fromList; this.fromList = re.data.fromList;
this.getList(); this.getList();
this.getDraftList();
this.getOtherList();
// this.findCorpList(this,this.fromCorp); // this.findCorpList(this,this.fromCorp);
}); });

Write Preview
Loading…
Cancel
Save