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

Merge remote-tracking branch 'origin/20240912_adapter' into 20240912_adapter

Browse Source
yanshishuju
yewj 1 year ago
parent 6f4a995ba4 78372b85b8
commit 5635083105
4 changed files with 412 additions and 364 deletions
Show Stats Download Patch File Download Diff File

8
src/api/basic/collectPoint/cargowWorkplaceManage.js
Unescape Escape View File

@ -12,6 +12,14 @@ export function bindCollect(query) {
}); });
} }
//删除采集工位
export function delCollect(query) {
return axios({
url: "/udiwms/sysWorkplace/delCollect",
method: "post",
data: query
});
}
export function getBindCollectList(query) { export function getBindCollectList(query) {

25
src/views/basic/workplace/addCollectWorkplace.vue
Unescape Escape View File

@ -161,20 +161,17 @@ export default {
// return collect.workplaceCode === row.workplaceCode && collect.documentTypeCode === row.documentTypeCode // return collect.workplaceCode === row.workplaceCode && collect.documentTypeCode === row.documentTypeCode
// }) // })
// }, // },
// checkSelectable(row) { checkSelectable(row) {
// if (this.collectWorks == null) { if (this.collectWorks == null) {
// return true return true
// } else { } else {
// if (this.collectWorks.length > 0) { if (this.collectWorks.length > 0) {
// if (this.containsObject(this.collectWorks,row)){ return this.collectWorks.indexOf(row.collectAndTypeCodes) === -1
// return -1 } else {
// } return true
// return true }
// } else { }
// return true },
// }
// }
// },
//新增数据 //新增数据
handCurrentChange(row) { handCurrentChange(row) {
this.rowList = row this.rowList = row

727
src/views/basic/workplace/cargowWorkplaceManage.vue
Unescape Escape View File

@ -66,324 +66,325 @@
</el-button> </el-button>
<el-col style="border-left: 3px solid #dddddd; overflow-y: hidden"> <el-col style="border-left: 3px solid #dddddd; overflow-y: hidden">
<el-card> <el-card>
<el-form :model="query" label-width="auto" v-show="showSearch" size="mini" class="order-el-form"> <el-form :model="query" label-width="auto" v-show="showSearch" size="mini" class="order-el-form">
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="8"> <el-col :span="8">
<el-form-item label="当前部门:" class="query-form-item">
<el-select v-model="query.deptCode" class="width-full" placeholder="请选择" filterable clearable
@change="changeDept" style="width: 80%"
>
<el-option v-for="item in DeptList" :key="item.id" :label="item.name" :value="item.code"/>
</el-select>
<!--<el-option v-for="item in " :key="item.id" :label="item.name" :value="item.code"/>-->
<!-- <deptSelect :value.sync="userQuery.deptCode"-->
<!-- :changeValue.sync="changeUsers"/>-->
<!-- &lt;!&ndash;<deptSelect :value.sync="query.invCode" :params.sync="filterBadInv" :changeValue.sync="invChange"/>&ndash;&gt;-->
</el-form-item>
</el-col>
<!--<el-col :span="8">-->
<!-- <el-form-item label="当前部门:" class="query-form-item">-->
<!-- <deptSelect style="width: 80%" :value.sync="query.deptCode"/>-->
<!-- &lt;!&ndash;<deptSelect :value.sync="query.invCode" :params.sync="filterBadInv" :changeValue.sync="invChange"/>&ndash;&gt;-->
<!-- </el-form-item>-->
<!--</el-col>-->
<el-col :span="8">
<el-form-item label="编码/名称:" class="query-form-item">
<el-input v-model="query.key" placeholder="请输入编码/工位名称" clearable style="width: 80%">
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="工位状态:" class="query-form-item">
<el-select v-model="query.workplaceStatus" placeholder="工位状态" clearable style="width: 80%">
<el-option label="暂停" :value="0"></el-option>
<el-option label="启用" :value="1"></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div class="top-right-btn">
<el-button-group>
<el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
<el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
<el-button type="primary" icon="el-icon-search" @click="onSubmit">查询</el-button>
<el-button type="primary" icon="el-icon-plus" @click="addCargowWorkplace">新增上货工位</el-button>
</el-button-group>
</div>
<el-table v-loading="loading" :data="list" style="width: 100%" :row-style="{height: '32px' }"
highlight-current-row @current-change="handCurrentChange"
>
<el-table-column type="index" label="序号"></el-table-column>
<el-table-column label="工位编码" prop="workplaceId" width="90"></el-table-column>
<el-table-column label="工位名称" prop="workplaceName" width="120"></el-table-column>
<!--<el-table-column label="工位类型" prop="workplaceType" width="90">-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{ workplaceTypeMao[scope.row.workplaceType] }}</span>-->
<!-- </template>-->
<!--</el-table-column>-->
<!-- <el-table-column label="库存预警数" prop="invRemindNumber" width="90"></el-table-column>-->
<el-table-column label="工位状态" prop="workplaceStatus" width="90">
<template slot-scope="scope">
<span>{{ workplaceStatusMap[scope.row.workplaceStatus] }}</span>
</template>
</el-table-column>
<el-table-column label="工位类型" prop="workPlaceClass" width="90">
<template slot-scope="scope">
<span>{{ workPlaceClasss[scope.row.workPlaceClass] }}</span>
</template>
</el-table-column>
<!--<el-table-column label="所属组别" prop="categoryName" width="90"></el-table-column>-->
<!--<el-table-column label="单据类型编号" prop="busTypeCode" width="100"></el-table-column>-->
<!--<el-table-column label="单据类型名称" prop="busTypeName" width="100"></el-table-column>-->
<!--<el-table-column label="单据来源系统" prop="fromTypeName" width="100"></el-table-column>-->
<el-table-column label="所属部门" prop="deptCodeName" width="90"></el-table-column>
<!--<el-table-column label="默认仓库" prop="invName" width="90"></el-table-column>-->
<el-table-column label="工位负责人" prop="employeeName" width="90"></el-table-column>
<el-table-column label="创建时间" prop="createTime" width="140"></el-table-column>
<el-table-column label="备注" prop="remake" width="140"></el-table-column>
<el-table-column label="操作" fixed="right" width="160">
<template slot-scope="scope">
<el-button
type="text"
size="small"
@click.native.stop="printLabel(scope.row)"
>工位标签
</el-button>
<el-button <el-form-item label="当前部门:" class="query-form-item">
type="text" <el-select v-model="query.deptCode" class="width-full" placeholder="请选择" filterable clearable
size="small" @change="changeDept" style="width: 80%"
@click.native.stop="edit(scope.row)" >
>编辑 <el-option v-for="item in DeptList" :key="item.id" :label="item.name" :value="item.code"/>
</el-button> </el-select>
<el-button <!--<el-option v-for="item in " :key="item.id" :label="item.name" :value="item.code"/>-->
type="text" <!-- <deptSelect :value.sync="userQuery.deptCode"-->
size="small" <!-- :changeValue.sync="changeUsers"/>-->
@click.native.stop="deleteWorkplace(scope.row)" <!-- &lt;!&ndash;<deptSelect :value.sync="query.invCode" :params.sync="filterBadInv" :changeValue.sync="invChange"/>&ndash;&gt;-->
>删除 </el-form-item>
</el-button> </el-col>
</template> <!--<el-col :span="8">-->
</el-table-column> <!-- <el-form-item label="当前部门:" class="query-form-item">-->
</el-table> <!-- <deptSelect style="width: 80%" :value.sync="query.deptCode"/>-->
<pagination <!-- &lt;!&ndash;<deptSelect :value.sync="query.invCode" :params.sync="filterBadInv" :changeValue.sync="invChange"/>&ndash;&gt;-->
:total="total" <!-- </el-form-item>-->
:limit.sync="query.limit" <!--</el-col>-->
:page.sync="query.page" <el-col :span="8">
@pagination="getList" <el-form-item label="编码/名称:" class="query-form-item">
> <el-input v-model="query.key" placeholder="请输入编码/工位名称" clearable style="width: 80%">
</pagination> </el-input>
</el-card> </el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="工位状态:" class="query-form-item">
<el-select v-model="query.workplaceStatus" placeholder="工位状态" clearable style="width: 80%">
<el-option label="暂停" :value="0"></el-option>
<el-option label="启用" :value="1"></el-option>
</el-select>
</el-form-item>
<el-tabs type="border-card" style="margin: 15px"> </el-col>
<el-tab-pane> </el-row>
<!-- {{ workplaceName }}---> </el-form>
<span slot="label">采集工位</span> <div class="top-right-btn">
<el-form :inline="true" :model="busQuery" class="query-form" size="mini"
style="margin-bottom: 10px"
>
<el-form-item class="query-form-item" label="采集工位名称:">
<el-input
v-model="busQuery.busKey"
placeholder="采集工位名称"
clearable
></el-input>
</el-form-item>
<el-form-item>
<el-button-group> <el-button-group>
<el-button <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
type="primary" <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
icon="el-icon-refresh" <el-button type="primary" icon="el-icon-search" @click="onSubmit">查询</el-button>
@click="onBusTypeReset" <el-button type="primary" icon="el-icon-plus" @click="addCargowWorkplace">新增上货工位</el-button>
>重置
</el-button>
<el-button type="primary" @click="loadBusList"
icon="el-icon-search"
>查询
</el-button
>
<el-button type="primary" @click="chooseCollect"
icon="el-icon-plus"
>选入采集工位
</el-button
>
</el-button-group> </el-button-group>
</el-form-item> </div>
</el-form> <el-table v-loading="loading" :data="list" style="width: 100%" :row-style="{height: '32px' }"
<el-table :data="collectList" style="width: 100%;" :row-style="{height: '32px' }" highlight-current-row @current-change="handCurrentChange"
highlight-current-row >
> <el-table-column type="index" label="序号"></el-table-column>
<el-table-column type="index" label="序号"></el-table-column> <el-table-column label="工位编码" prop="workplaceId" width="90"></el-table-column>
<!-- <el-table-column label="业务类型编码 " prop="documentTypeCode" width="100"></el-table-column>--> <el-table-column label="工位名称" prop="workplaceName" width="120"></el-table-column>
<el-table-column label="采集工位名称" prop="collectName" ></el-table-column> <!--<el-table-column label="工位类型" prop="workplaceType" width="90">-->
<el-table-column label="业务名称 " prop="busTypeName" ></el-table-column> <!-- <template slot-scope="scope">-->
<el-table-column label="操作" fixed="right" width="120"> <!-- <span>{{ workplaceTypeMao[scope.row.workplaceType] }}</span>-->
<template slot-scope="scope"> <!-- </template>-->
<!-- <el-button--> <!--</el-table-column>-->
<!-- type="text"--> <!-- <el-table-column label="库存预警数" prop="invRemindNumber" width="90"></el-table-column>-->
<!-- size="small"--> <el-table-column label="工位状态" prop="workplaceStatus" width="90">
<!-- @click.native.stop="updateBusType(scope.row)"--> <template slot-scope="scope">
<!-- >编辑--> <span>{{ workplaceStatusMap[scope.row.workplaceStatus] }}</span>
<!-- </el-button>--> </template>
<el-button </el-table-column>
type="text" <el-table-column label="工位类型" prop="workPlaceClass" width="90">
size="small" <template slot-scope="scope">
@click.native.stop="removeBusType(scope.row)" <span>{{ workPlaceClasss[scope.row.workPlaceClass] }}</span>
>删除 </template>
</el-button> </el-table-column>
</template> <!--<el-table-column label="所属组别" prop="categoryName" width="90"></el-table-column>-->
</el-table-column> <!--<el-table-column label="单据类型编号" prop="busTypeCode" width="100"></el-table-column>-->
</el-table> <!--<el-table-column label="单据类型名称" prop="busTypeName" width="100"></el-table-column>-->
<!--<pagination--> <!--<el-table-column label="单据来源系统" prop="fromTypeName" width="100"></el-table-column>-->
<!-- :total="busTypeTotal"--> <el-table-column label="所属部门" prop="deptCodeName" width="90"></el-table-column>
<!-- :limit.sync="busQuery.limit"--> <!--<el-table-column label="默认仓库" prop="invName" width="90"></el-table-column>-->
<!-- :page.sync="busQuery.page"-->
<!-- @pagination="getWorkBindBusTypes()"-->
<!--&gt;-->
<!--</pagination>-->
</el-tab-pane>
</el-tabs>
</el-col>
<el-dialog <el-table-column label="工位负责人" prop="employeeName" width="90"></el-table-column>
title="选入采集工位"
:visible.sync="chooseCollectDialogVisible"
width="60%"
v-if="chooseCollectDialogVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
@close=""
>
<addCollectWorkplace
:workplaceId="workplaceId"
:collectWorks="collectWorks"
:closeDialog="closeDialog">
</addCollectWorkplace> <el-table-column label="创建时间" prop="createTime" width="140"></el-table-column>
</el-dialog> <el-table-column label="备注" prop="remake" width="140"></el-table-column>
<el-table-column label="操作" fixed="right" width="160">
<template slot-scope="scope">
<el-button
type="text"
size="small"
@click.native.stop="printLabel(scope.row)"
>工位标签
</el-button>
<el-dialog <el-button
:title="fromMap[fromName]" type="text"
:visible.sync="addWorkplaceDialogVisible" size="small"
width="60%" @click.native.stop="edit(scope.row)"
v-if="addWorkplaceDialogVisible" >编辑
:close-on-press-escape="false" </el-button>
:close-on-click-modal="false" <el-button
:show-close="false" type="text"
> size="small"
<el-form :model="formData" style="width: 100%;" ref="dataForm" :rules="formRules" @click.native.stop="deleteWorkplace(scope.row)"
label-width="auto" >删除
> </el-button>
<el-row :gutter="24"> </template>
<el-col :span="12" class="el-col"> </el-table-column>
<el-form-item label="工位编码:" prop="workplaceId" class="query-form-item"> </el-table>
<el-input <pagination
disabled :total="total"
v-model="formData.workplaceId" style="width: 80%" :limit.sync="query.limit"
auto-complete="off" :page.sync="query.page"
></el-input> @pagination="getList"
</el-form-item> >
</el-col> </pagination>
<el-col :span="12" class="el-col"> </el-card>
<el-form-item label="工位名称:" prop="workplaceName" class="query-form-item">
<el-input
v-model="formData.workplaceName" style="width: 80%"
auto-complete="off"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="12" class="el-col">
<el-form-item label="工位状态:" prop="workplaceStatus" class="query-form-item">
<el-select v-model="formData.workplaceStatus" style="width: 80%" placeholder="工位状态">
<el-option label="暂停" :value="0"></el-option>
<el-option label="启用" :value="1"></el-option>
</el-select>
</el-form-item>
</el-col>
<!--<el-col :span="12" class="el-col">-->
<!-- <el-form-item label="工位类型:" prop="workPlaceClass" class="query-form-item">-->
<!-- <el-select v-model="formData.workPlaceClass" style="width: 80%" placeholder="工位类型" disabled>-->
<!-- <el-option label="采集工位" :value="1"></el-option>-->
<!-- <el-option label="上货工位" :value="2"></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!--</el-col>-->
<el-col :span="12" class="el-col">
<el-form-item prop="deptCode" label="所属部门:">
<el-select v-model="formData.deptCode" placeholder="请选择部门" clearable
style="width: 80%"
@change="handleInvChange"
>
<el-option v-for="item in deptList" :key="item.id" :label="item.name" :value="item.code"/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="12" class="el-col"> <el-tabs type="border-card" style="margin: 15px">
<el-form-item label="工位负责人:" prop="chargeUser" class="query-form-item"> <el-tab-pane>
<el-select v-model="formData.chargeUser" placeholder="请选择负责人" <!-- {{ workplaceName }}--->
style="width: 80%" <span slot="label">采集工位</span>
clearable <el-form :inline="true" :model="cargowQuery" class="query-form" size="mini"
style="margin-bottom: 10px"
> >
<el-option <el-form-item class="query-form-item" label="采集工位名称:">
v-for="item in users" <el-input
:key="item.id" v-model="cargowQuery.keyWords"
:label="item.employeeName" placeholder="采集工位/业务名称"
:value="item.id" clearable
> ></el-input>
<span style="float: left">{{ item.employeeName }}</span> </el-form-item>
</el-option> <el-form-item>
</el-select> <el-button-group>
</el-form-item> <el-button
</el-col> type="primary"
<el-col :span="12" class="el-col"> icon="el-icon-refresh"
<el-form-item label="所属组别:" prop="constituencies" class="query-form-item"> @click="onCollectList"
<el-select v-model="formData.constituencies" placeholder="请选择所属组别" >重置
style="width: 80%" </el-button>
<el-button type="primary" @click="loadCollectList"
icon="el-icon-search"
>查询
</el-button
>
<el-button type="primary" @click="chooseCollect"
icon="el-icon-plus"
>选入采集工位
</el-button
>
</el-button-group>
</el-form-item>
</el-form>
<el-table :data="collectList" style="width: 100%;" :row-style="{height: '32px' }"
highlight-current-row
> >
<el-option <el-table-column type="index" label="序号"></el-table-column>
v-for="item in fromDeptOptions" <!-- <el-table-column label="业务类型编码 " prop="documentTypeCode" width="100"></el-table-column>-->
:key="item.code" <el-table-column label="采集工位名称" prop="collectName"></el-table-column>
:label="item.label" <el-table-column label="业务名称 " prop="busTypeName"></el-table-column>
:value="item.code" <el-table-column label="操作" fixed="right" width="120">
> <template slot-scope="scope">
<span style="float: left">{{ item.label }}</span> <!-- <el-button-->
</el-option> <!-- type="text"-->
</el-select> <!-- size="small"-->
</el-form-item> <!-- @click.native.stop="updateBusType(scope.row)"-->
</el-col> <!-- >编辑-->
</el-row> <!-- </el-button>-->
<el-row :gutter="24"> <el-button
type="text"
size="small"
@click.native.stop="removeCollect(scope.row)"
>删除
</el-button>
</template>
</el-table-column>
</el-table>
<pagination
:total="collectTotal"
:limit.sync="cargowQuery.limit"
:page.sync="cargowQuery.page"
@pagination="getCargowBindCollectList()"
>
</pagination>
</el-tab-pane>
</el-tabs>
</el-col>
<el-col :span="12" class="el-col"> <el-dialog
<el-form-item label="备注:" prop="remake" class="query-form-item"> title="选入采集工位"
<el-input :visible.sync="chooseCollectDialogVisible"
v-model="formData.remake" style="width: 80%" width="60%"
auto-complete="off" v-if="chooseCollectDialogVisible"
></el-input> :close-on-click-modal="false"
</el-form-item> :close-on-press-escape="false"
</el-col> @close=""
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click.native="hideForm">取消</el-button>
<el-button
type="primary"
@click.native="formSubmit()"
>提交
</el-button
> >
</div> <addCollectWorkplace
</el-dialog> :workplaceId="workplaceId"
:collectWorks="collectWorks"
:closeDialog="closeDialog"
>
</addCollectWorkplace>
</el-dialog>
<el-dialog
:title="fromMap[fromName]"
:visible.sync="addWorkplaceDialogVisible"
width="60%"
v-if="addWorkplaceDialogVisible"
:close-on-press-escape="false"
:close-on-click-modal="false"
:show-close="false"
>
<el-form :model="formData" style="width: 100%;" ref="dataForm" :rules="formRules"
label-width="auto"
>
<el-row :gutter="24">
<el-col :span="12" class="el-col">
<el-form-item label="工位编码:" prop="workplaceId" class="query-form-item">
<el-input
disabled
v-model="formData.workplaceId" style="width: 80%"
auto-complete="off"
></el-input>
</el-form-item>
</el-col>
<el-col :span="12" class="el-col">
<el-form-item label="工位名称:" prop="workplaceName" class="query-form-item">
<el-input
v-model="formData.workplaceName" style="width: 80%"
auto-complete="off"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="12" class="el-col">
<el-form-item label="工位状态:" prop="workplaceStatus" class="query-form-item">
<el-select v-model="formData.workplaceStatus" style="width: 80%" placeholder="工位状态">
<el-option label="暂停" :value="0"></el-option>
<el-option label="启用" :value="1"></el-option>
</el-select>
</el-form-item>
</el-col>
<!--<el-col :span="12" class="el-col">-->
<!-- <el-form-item label="工位类型:" prop="workPlaceClass" class="query-form-item">-->
<!-- <el-select v-model="formData.workPlaceClass" style="width: 80%" placeholder="工位类型" disabled>-->
<!-- <el-option label="采集工位" :value="1"></el-option>-->
<!-- <el-option label="上货工位" :value="2"></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!--</el-col>-->
<el-col :span="12" class="el-col">
<el-form-item prop="deptCode" label="所属部门:">
<el-select v-model="formData.deptCode" placeholder="请选择部门" clearable
style="width: 80%"
@change="handleInvChange"
>
<el-option v-for="item in deptList" :key="item.id" :label="item.name" :value="item.code"/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="12" class="el-col">
<el-form-item label="工位负责人:" prop="chargeUser" class="query-form-item">
<el-select v-model="formData.chargeUser" placeholder="请选择负责人"
style="width: 80%"
clearable
>
<el-option
v-for="item in users"
:key="item.id"
:label="item.employeeName"
:value="item.id"
>
<span style="float: left">{{ item.employeeName }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12" class="el-col">
<el-form-item label="所属组别:" prop="constituencies" class="query-form-item">
<el-select v-model="formData.constituencies" placeholder="请选择所属组别"
style="width: 80%"
>
<el-option
v-for="item in fromDeptOptions"
:key="item.code"
:label="item.label"
:value="item.code"
>
<span style="float: left">{{ item.label }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="12" class="el-col">
<el-form-item label="备注:" prop="remake" class="query-form-item">
<el-input
v-model="formData.remake" style="width: 80%"
auto-complete="off"
></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click.native="hideForm">取消</el-button>
<el-button
type="primary"
@click.native="formSubmit()"
>提交
</el-button
>
</div>
</el-dialog>
<el-dialog <el-dialog
:title="formMap[formName]" :title="formMap[formName]"
@ -476,17 +477,17 @@ import {
listPage, listPage,
printWorkLabel, updateWorkplace printWorkLabel, updateWorkplace
} from '@/api/basic/workPlace/sysWorkplaceManage' } from '@/api/basic/workPlace/sysWorkplaceManage'
import {addTree, deleteTree, getTree, updateTree} from '@/api/basic/collectPoint/collectPointManage' import { addTree, deleteTree, getTree, updateTree } from '@/api/basic/collectPoint/collectPointManage'
import { getBindCollectList } from '@/api/basic/collectPoint/cargowWorkplaceManage' import { delCollect, getBindCollectList } from '@/api/basic/collectPoint/cargowWorkplaceManage'
import addCollectWorkplace from "./addCollectWorkplace" import addCollectWorkplace from './addCollectWorkplace'
export default { export default {
components: {addCollectWorkplace}, components: { addCollectWorkplace },
data() { data() {
return { return {
Dictionary: false, Dictionary: false,
showSearch: true, showSearch: true,
workplaceCode: '6001',
treeList: [ treeList: [
{ {
code: '1001', code: '1001',
@ -500,13 +501,15 @@ export default {
code: null, code: null,
workplaceStatus: 1, workplaceStatus: 1,
workPlaceClass: 2, workPlaceClass: 2,
deptCode: this.$store.getters.locDeptCode, deptCode: this.$store.getters.locDeptCode
}, },
DeptList:[], DeptList: [],
list:[], list: [],
collectList:[], collectList: [],
busTypeTotal:0, collectAndTypeIds: [],
total:0, users: [],
busTypeTotal: 0,
total: 0,
subFormVisible: false, subFormVisible: false,
subData: { subData: {
parentName: '全部', parentName: '全部',
@ -565,7 +568,7 @@ export default {
0: '完全赋码', 0: '完全赋码',
1: '部分赋码', 1: '部分赋码',
2: '赋码超出', 2: '赋码超出',
4: '', 4: ''
}, },
warnTypeMap: { warnTypeMap: {
1: '信息提醒', 1: '信息提醒',
@ -574,12 +577,12 @@ export default {
}, },
isPopulars: { isPopulars: {
1: '是', 1: '是',
0: '否', 0: '否'
}, },
shippers: { shippers: {
1: '原始单据的发货方', 1: '原始单据的发货方',
2: '原始单据的收货方', 2: '原始单据的收货方',
3: '用户所属仓库', 3: '用户所属仓库'
}, },
consignees: { consignees: {
1: '原始单据的收货方', 1: '原始单据的收货方',
@ -588,7 +591,7 @@ export default {
4: '客户', 4: '客户',
5: '特殊往来', 5: '特殊往来',
6: '内部科室', 6: '内部科室',
7: '填写', 7: '填写'
}, },
userList: [], userList: [],
userLoading: false, userLoading: false,
@ -598,9 +601,10 @@ export default {
cargowQuery: { cargowQuery: {
page: 1, page: 1,
limit: 10, limit: 10,
userKey: null, keyWords: null,
workPlaceCode: null workPlaceCode: null
}, },
collectTotal:0,
busQuery: { busQuery: {
busKey: '', busKey: '',
workplaceCode: null, workplaceCode: null,
@ -643,15 +647,16 @@ export default {
}, },
formRules: { formRules: {
workplaceName: [ workplaceName: [
{required: true, message: '请输入工位名称', trigger: 'blur'} { required: true, message: '请输入工位名称', trigger: 'blur' }
], ],
workplaceStatus: [ workplaceStatus: [
{required: true, message: '请选择工位状态', trigger: 'blur'} { required: true, message: '请选择工位状态', trigger: 'blur' }
] ]
// workplaceType: [ // workplaceType: [
// { required: true, message: '请选择工位类型', trigger: 'blur' } // { required: true, message: '请选择工位类型', trigger: 'blur' }
// ] // ]
}, },
} }
}, },
computed: {}, computed: {},
@ -702,11 +707,11 @@ export default {
limit: 20, limit: 20,
workplaceStatus: 1, workplaceStatus: 1,
workPlaceClass: 2, workPlaceClass: 2,
deptCode: this.$store.getters.locDeptCode, deptCode: this.$store.getters.locDeptCode
} }
this.getList() this.getList()
}, },
changeDept(){ changeDept() {
this.collectList = [] this.collectList = []
this.getList() this.getList()
}, },
@ -750,27 +755,65 @@ export default {
// this.getWorkBindBusTypes() // this.getWorkBindBusTypes()
this.getCargowBindCollectList() this.getCargowBindCollectList()
}, },
getCargowBindCollectList(){ getCargowBindCollectList() {
this.cargowQuery.workPlaceCode = this.rowData.workplaceId this.cargowQuery.workPlaceCode = this.rowData.workplaceId
getBindCollectList(this.cargowQuery).then(res => { getBindCollectList(this.cargowQuery).then(res => {
if (res.code != 20000){ if (res.code != 20000) {
return this.$message.error("获取失败") return this.$message.error('获取失败')
} }
this.collectList = res.data.list || [] this.collectList = res.data.list || []
this.collectTotal = res.data.total || 0
}) })
}, },
chooseCollect(){ onCollectList() {
if (this.rowData.workplaceId == null) {
return this.$message.error('请选择上货工位')
}
this.$router.push({
path: ''
})
this.cargowQuery = {
page: 1,
limit: 10,
keyWords: null,
workPlaceCode: null
},
this.getCargowBindCollectList()
},
loadCollectList() {
if (this.rowData.workplaceId == null) {
return this.$message.error('请选择上货工位')
}
this.cargowQuery.page = 1
this.getCargowBindCollectList()
},
chooseCollect() {
if (this.rowData.workplaceId == null) { if (this.rowData.workplaceId == null) {
return this.$message.error('请选择上货工位') return this.$message.error('请选择上货工位')
} }
console.log("hhhhhhh",this.collectList) this.collectWorks = this.collectList.map(item => item.collectAndTypeCodes)
this.collectWorks = this.collectList.map(item => ({
workplaceCode: item.collectWorkPlaceCode,
documentTypeCode: item.collectBusTypeCode
}));
// this.collectWorks = this.collectWorkPlaceCodes.concat(this.collectBusTypeCodes); // this.collectWorks = this.collectWorkPlaceCodes.concat(this.collectBusTypeCodes);
this.chooseCollectDialogVisible = true this.chooseCollectDialogVisible = true
}, },
removeCollect(row){
this.$confirm('此操作将永久删除该采集工位, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
delCollect(row).then(res => {
if (res.code != 20000) {
this.$message.error(res.message)
} else {
this.$message.success("删除成功")
this.getCargowBindCollectList()
}
})
}).catch(() => {
})
},
handleNodeClick(row) { handleNodeClick(row) {
this.groupData = row this.groupData = row
this.query.code = row.code this.query.code = row.code
@ -779,7 +822,7 @@ export default {
} }
this.getList() this.getList()
}, },
closeDialog(){ closeDialog() {
this.getCargowBindCollectList() this.getCargowBindCollectList()
this.chooseCollectDialogVisible = false this.chooseCollectDialogVisible = false
}, },
@ -789,7 +832,7 @@ export default {
const binaryData = [] const binaryData = []
binaryData.push(response) binaryData.push(response)
let url = window.URL.createObjectURL( let url = window.URL.createObjectURL(
new Blob(binaryData, {type: 'application/pdf'}) new Blob(binaryData, { type: 'application/pdf' })
) )
this.loading = false this.loading = false
window.open(url) window.open(url)
@ -825,7 +868,7 @@ export default {
workPlaceClass: 2, workPlaceClass: 2,
deptCode: null, deptCode: null,
chargeUser: null, chargeUser: null,
constituencies: "1001", constituencies: '1001',
invRemindNumber: 0, invRemindNumber: 0,
remake: null remake: null
} }
@ -837,7 +880,7 @@ export default {
createWorkplaceId().then(res => { createWorkplaceId().then(res => {
if (res.code == 20000) { if (res.code == 20000) {
if (res.data == null) { if (res.data == null) {
this.formData.workplaceId = this.workplaceCode + 1001 this.formData.workplaceId = this.workplaceCode + 1002
this.addWorkplaceDialogVisible = true this.addWorkplaceDialogVisible = true
this.getTree() this.getTree()
} else { } else {
@ -852,7 +895,7 @@ export default {
this.$message.error('获取错误') this.$message.error('获取错误')
}) })
}, },
hideForm(){ hideForm() {
this.addWorkplaceDialogVisible = false this.addWorkplaceDialogVisible = false
this.getList() this.getList()
this.collectList = [] this.collectList = []
@ -889,7 +932,7 @@ export default {
return this.$message.error(res.message) return this.$message.error(res.message)
} }
this.addWorkplaceDialogVisible = false this.addWorkplaceDialogVisible = false
this.$message.success("更新成功") this.$message.success('更新成功')
this.getList() this.getList()
}).catch(() => { }).catch(() => {
this.addWorkplaceDialogVisible = false this.addWorkplaceDialogVisible = false
@ -969,7 +1012,7 @@ export default {
this.deptList = res.data.list || [] this.deptList = res.data.list || []
} }
}) })
}, }
}, },
created() { created() {
this.getDepts() this.getDepts()

16
src/views/basic/workplace/workplaceManage.vue
Unescape Escape View File

@ -421,14 +421,14 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" class="el-col"> <!--<el-col :span="12" class="el-col">-->
<el-form-item label="工位类型:" prop="workPlaceClass" class="query-form-item"> <!-- <el-form-item label="工位类型:" prop="workPlaceClass" class="query-form-item">-->
<el-select v-model="formData.workPlaceClass" style="width: 80%" placeholder="工位类型"> <!-- <el-select v-model="formData.workPlaceClass" style="width: 80%" placeholder="工位类型">-->
<el-option label="采集工位" :value="1"></el-option> <!-- <el-option label="采集工位" :value="1"></el-option>-->
<el-option label="上货工位" :value="2"></el-option> <!-- <el-option label="上货工位" :value="2"></el-option>-->
</el-select> <!-- </el-select>-->
</el-form-item> <!-- </el-form-item>-->
</el-col> <!--</el-col>-->
<!--<el-col :span="12" class="el-col">--> <!--<el-col :span="12" class="el-col">-->
<!-- <el-form-item label="工位类型:" prop="workplaceType" class="query-form-item">--> <!-- <el-form-item label="工位类型:" prop="workplaceType" class="query-form-item">-->
<!-- <el-select v-model="formData.workplaceType" style="width: 80%" placeholder="工位类型">--> <!-- <el-select v-model="formData.workplaceType" style="width: 80%" placeholder="工位类型">-->

Write Preview
Loading…
Cancel
Save