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

工位上货添加业务类型

Browse Source
20240912_adapter_z
yewj 7 months ago
parent 6786afe220
commit 9b0d2675c2
5 changed files with 174 additions and 172 deletions
Show Stats Download Patch File Download Diff File

2
src/views/basic/collectPoint/userWorkplace.vue
Unescape Escape View File

@ -122,7 +122,7 @@
<span>{{ workplaceTypes[scope.row.workplaceType] }}</span>
</template>
</el-table-column>
<el-table-column label="库存预警数" prop="invRemindNumber" width="90"></el-table-column>
<!-- <el-table-column label="库存预警数" prop="invRemindNumber" width="90"></el-table-column>-->
<el-table-column label="工位负责人" prop="employeeName" width="90"></el-table-column>
<!--<el-table-column label="往来单位标题" prop="unitTittle" width="100"></el-table-column>-->
<!--<el-table-column label="往来单位类型" prop="corpType" width="100">-->

11
src/views/collect/CollectOrderAllot.vue
Unescape Escape View File

@ -22,7 +22,6 @@
</el-tab-pane>
</el-tabs>
</div>
@ -40,7 +39,7 @@ import CollectOrderAllotCardComponents from "./CollectOrderAllotCardComponents.v
export default {
name: "PrescribeTagCode",
components: {
CollectOrderAllotComponents,CollectOrderAllotCardComponents
CollectOrderAllotComponents, CollectOrderAllotCardComponents
},
data() {
return {
@ -48,11 +47,11 @@ export default {
}
},
methods: {
parentMethod(data,url) {
parentMethod(data, url) {
// 处理从子组件传来的数据
if (this.workPlaceCode == null){
if (this.workPlaceCode == null) {
this.callParentMethod(url)
}else {
} else {
this.callParentMethodA(data)
}
@ -66,7 +65,7 @@ export default {
},
},
created() {
if (this.$route.query.workplaceId != null){
if (this.$route.query.workplaceId != null) {
this.workPlaceCode = Number(this.$route.query.workplaceId);
}
}

219
src/views/collect/CollectOrderTabs.vue
Unescape Escape View File

@ -7,51 +7,51 @@
<div>
<el-form :model="formData" class="order-el-form" ref="formData" label-width="120px" style="margin-top: 5px">
<el-col :span="6">
<el-form-item prop="workPlaceCode" class="query-form-item" label="当前工位:">
<el-select
v-model="formData.workPlaceCode"
placeholder="当前工位"
style="width: 90%"
disabled
>
<el-option
v-for="item in curWorkPlaces"
:key="item.workplaceId"
:label="item.workplaceName"
:value="item.workplaceId"
>
<span style="float: left">{{ item.workplaceName }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{
item.workplaceId
}}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item prop="busType" class="query-form-item" label="当前业务类型:" >
<el-select v-model="formData.busType"
filterable
remote
reserve-keyword
disabled
placeholder="请选择业务类型" clearable style="width: 55%">
<el-option
v-for="item in busTypeList"
:key="item.documentTypeCode"
:label="item.busName"
:value="item.documentTypeCode"
<el-col :span="6">
<el-form-item prop="workPlaceCode" class="query-form-item" label="当前工位:">
<el-select
v-model="formData.workPlaceCode"
placeholder="当前工位"
style="width: 90%"
disabled
>
<span style="float: left">{{ item.busName }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.documentTypeCode }}</span>
</el-option>
</el-select>
<el-option
v-for="item in curWorkPlaces"
:key="item.workplaceId"
:label="item.workplaceName"
:value="item.workplaceId"
>
<span style="float: left">{{ item.workplaceName }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{
item.workplaceId
}}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-button type="primary" @click="toggleBusType" style="margin-left: 5px">切换业务</el-button>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item prop="busType" class="query-form-item" label="当前业务类型:">
<el-select v-model="formData.busType"
filterable
remote
reserve-keyword
disabled
placeholder="请选择业务类型" clearable style="width: 55%">
<el-option
v-for="item in busTypeList"
:key="item.documentTypeCode"
:label="item.busName"
:value="item.documentTypeCode"
>
<span style="float: left">{{ item.busName }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.documentTypeCode }}</span>
</el-option>
</el-select>
<el-button type="primary" @click="toggleBusType" style="margin-left: 5px">切换业务</el-button>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item>
@ -59,7 +59,7 @@
</el-form-item>
</el-col>
</el-form>
</div>
</div>
<el-col :span="4" align="right" style="margin-top: 10px">
<div class="inv-hos-title">
@ -76,51 +76,51 @@
</el-row>
<el-row class="tac">
<el-col :span="2">
<!-- <h5>默认颜色</h5>-->
<el-menu
:default-active="menuActive"
class="el-menu-vertical-demo"
@open="handleOpen">
<el-menu-item :index=0 @click="clickMenuItem(0)">
<i class="el-icon-edit-outline"></i>
<span slot="title">处理单据</span>
</el-menu-item>
<el-menu-item :index=1 @click="clickMenuItem(1)">
<i class="el-icon-s-unfold"></i>
<span slot="title">工位上货</span>
</el-menu-item>
<el-menu-item :index=2 @click="clickMenuItem(2)">
<i class="el-icon-s-fold"></i>
<span slot="title">工位退货</span>
</el-menu-item>
<el-menu-item :index=3 @click="clickMenuItem(3)">
<i class="el-icon-s-platform"></i>
<span slot="title">工位存量</span>
</el-menu-item>
<el-menu-item :index=4 @click="clickMenuItem(4)">
<i class="el-icon-s-order"></i>
<span slot="title">待处理单</span>
</el-menu-item>
<el-menu-item :index=5 @click="clickMenuItem(5)">
<i class="el-icon-s-claim"></i>
<span slot="title">已完成单</span>
</el-menu-item>
<el-menu-item :index=6 @click="clickMenuItem(6)">
<i class="el-icon-s-claim"></i>
<span slot="title">单据上传</span>
</el-menu-item>
<el-menu-item :index=7 @click="clickMenuItem(7)">
<i class="el-icon-s-claim"></i>
<span slot="title">损耗出库</span>
</el-menu-item>
</el-menu>
</el-col>
<el-row class="tac">
<el-col :span="2">
<!-- <h5>默认颜色</h5>-->
<el-menu
:default-active="menuActive"
class="el-menu-vertical-demo"
@open="handleOpen">
<el-menu-item :index=0 @click="clickMenuItem(0)">
<i class="el-icon-edit-outline"></i>
<span slot="title">处理单据</span>
</el-menu-item>
<el-menu-item :index=1 @click="clickMenuItem(1)">
<i class="el-icon-s-unfold"></i>
<span slot="title">工位上货</span>
</el-menu-item>
<el-menu-item :index=2 @click="clickMenuItem(2)">
<i class="el-icon-s-fold"></i>
<span slot="title">工位退货</span>
</el-menu-item>
<el-menu-item :index=3 @click="clickMenuItem(3)">
<i class="el-icon-s-platform"></i>
<span slot="title">工位存量</span>
</el-menu-item>
<el-menu-item :index=4 @click="clickMenuItem(4)">
<i class="el-icon-s-order"></i>
<span slot="title">待处理单</span>
</el-menu-item>
<el-menu-item :index=5 @click="clickMenuItem(5)">
<i class="el-icon-s-claim"></i>
<span slot="title">已完成单</span>
</el-menu-item>
<el-menu-item :index=6 @click="clickMenuItem(6)">
<i class="el-icon-s-claim"></i>
<span slot="title">单据上传</span>
</el-menu-item>
<el-menu-item :index=7 @click="clickMenuItem(7)">
<i class="el-icon-s-claim"></i>
<span slot="title">损耗出库</span>
</el-menu-item>
</el-menu>
</el-col>
<el-col :span="22">
<el-tabs v-model="editableTabsValue" type="card" closable @tab-remove="removeTab"
@tab-click="upodateMenuActive" @contextmenu.native.prevent="handleContextMenu">
@tab-click="upodateMenuActive" @contextmenu.native.prevent="handleContextMenu">
<el-tab-pane
v-for="(item, index) in editableTabs"
:key="item.name"
@ -128,8 +128,9 @@
:name="item.name"
>
<div >
<component v-if="showChild" :is="item.component" v-bind="item.componentProps" :reset-key="resetKeys[item.name]" @parent-method="parentMethod" />
<div>
<component v-if="showChild" :is="item.component" v-bind="item.componentProps"
:reset-key="resetKeys[item.name]" @parent-method="parentMethod"/>
</div>
</el-tab-pane>
@ -179,7 +180,8 @@
<div style="flex: 1; display: flex; flex-direction: column; justify-content: flex-end; padding-top: 10px;"
>
<!-- 假设这里有一些信息内容 -->
<p style="font-size: 14px;background-color: #e1f3fb" @click="selectBusType(info.documentTypeCode)">{{ info.remark }}</p>
<p style="font-size: 14px;background-color: #e1f3fb" @click="selectBusType(info.documentTypeCode)">
{{ info.remark }}</p>
<el-button type="primary" style="position: absolute; bottom: 20px; right: 20px;" icon="el-icon-thumb"
@click="selectBusType(info.documentTypeCode)">开始作业
</el-button>
@ -224,8 +226,8 @@ export default {
data() {
return {
showContextMenu: false, // 控制上下文菜单的显示
contextMenuPosition: { x: 0, y: 0 }, // 上下文菜单的位置
selectBusTypeDisabled: false,
contextMenuPosition: {x: 0, y: 0}, // 上下文菜单的位置
selectBusTypeDisabled: false,
busQuery: {
busKey: '',
workplaceCode: null,
@ -233,8 +235,8 @@ export default {
limit: 100
},
formData: {},
curWorkPlaces:[],
busTypeList:[],
curWorkPlaces: [],
busTypeList: [],
logo: logoImg,
isLinkDisabled: false,
showChild: true,
@ -264,7 +266,7 @@ export default {
component: IoCreateOrderOut,
// 假设你需要传递的参数
componentProps: {
fromSplitType: 'out'
fromSplitType: 'out',
}
},
{
@ -330,21 +332,21 @@ export default {
],
tabIndex: 0,
menuActive: 0,
resetKeys:{}
resetKeys: {}
}
},
methods: {
toggleBusType(){
toggleBusType() {
//隐藏下拉框内容
// this.$refs.selectHeadEmpId.blur();
this.selectBusTypeDisabled = true
},
selectBusType(val) {
this.formData.busType = val
let newQuery = { ...this.$route.query };
let newQuery = {...this.$route.query};
delete newQuery.billNo;
newQuery.busType = val
this.$router.push({ query: newQuery, path: this.$route.path });
this.$router.push({query: newQuery, path: this.$route.path});
this.editableTabs = []
this.clickMenuItem(0)
this.showChild = false;
@ -441,15 +443,15 @@ export default {
this.busTypeList = res.data.list
this.busTypeTotal = res.data.total
if (this.$route.query.busType != null){
if (this.$route.query.busType != null) {
this.formData.busType = this.$route.query.busType
}else if (this.busTypeList.length == 1) {
this.formData.busType = this.busTypeList[0].documentTypeCode
this.selectBusTypeDisabled = false
} else {
this.selectBusTypeDisabled = true
this.formData.busType = null
}
} else if (this.busTypeList.length == 1) {
this.formData.busType = this.busTypeList[0].documentTypeCode
this.selectBusTypeDisabled = false
} else {
this.selectBusTypeDisabled = true
this.formData.busType = null
}
}
return
@ -459,7 +461,7 @@ export default {
handleContextMenu(event, tabItem) {
console.log("右击")
this.showContextMenu = true;
this.contextMenuPosition = { x: event.clientX, y: event.clientY };
this.contextMenuPosition = {x: event.clientX, y: event.clientY};
// 这里可以显示一个自定义的菜单，例如使用 Element UI 的 Dialog 或 Popover
// 假设你有一个名为 showContextMenu 的方法来显示菜单，并传递 tabItem 作为参数
this.showContextMenu(tabItem, event.clientX, event.clientY);
@ -467,7 +469,7 @@ export default {
showContextMenu(tabItem, x, y) {
// 显示你的自定义菜单逻辑，这里只是示例
this.contextMenuVisible = true;
this.contextMenuPosition = { x, y };
this.contextMenuPosition = {x, y};
this.selectedTabItem = tabItem;
},
// 其他菜单操作的方法，如 closeCurrent, closeOthers, closeAll
@ -518,6 +520,7 @@ export default {
vertical-align: middle;
margin-left: 25px;
}
.context-menu {
position: absolute;
z-index: 1000; /* 确保它在其他内容之上 */

107
src/views/collect/DealOrder.vue
Unescape Escape View File

@ -56,53 +56,53 @@
</el-row>
<el-row style="margin-top: 15px">
<!-- <el-col :span="6">-->
<!-- <el-form-item prop="workPlaceCode" class="query-form-item" label="当前工位:">-->
<!-- <el-select-->
<!-- v-model="formData.workPlaceCode"-->
<!-- placeholder="当前工位"-->
<!-- style="width: 90%"-->
<!-- :disabled="corpOrderIdDisabled"-->
<!-- filterable-->
<!-- @change="workPlaceCodeChange"-->
<!-- >-->
<!-- <el-option-->
<!-- v-for="item in curWorkPlaces"-->
<!-- :key="item.workplaceId"-->
<!-- :label="item.workplaceName"-->
<!-- :value="item.workplaceId"-->
<!-- >-->
<!-- <span style="float: left">{{ item.workplaceName }}</span>-->
<!-- <span style="float: right; color: #8492a6; font-size: 13px">{{-->
<!-- item.workplaceId-->
<!-- }}</span>-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="6">-->
<!-- <el-form-item prop="busType" class="query-form-item" label="当前业务类型:">-->
<!-- <el-select v-model="formData.busType"-->
<!-- filterable-->
<!-- remote-->
<!-- @change="busTypeChange"-->
<!-- reserve-keyword-->
<!-- disabled-->
<!-- placeholder="请选择业务类型" clearable style="width: 55%">-->
<!-- <el-option-->
<!-- v-for="item in busTypeList"-->
<!-- :key="item.documentTypeCode"-->
<!-- :label="item.busName"-->
<!-- :value="item.documentTypeCode"-->
<!-- >-->
<!-- <span style="float: left">{{ item.busName }}</span>-->
<!-- <span style="float: right; color: #8492a6; font-size: 13px">{{ item.documentTypeCode }}</span>-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- <el-button type="primary" @click="toggleBusType" style="margin-left: 5px">切换业务</el-button>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="6">-->
<!-- <el-form-item prop="workPlaceCode" class="query-form-item" label="当前工位:">-->
<!-- <el-select-->
<!-- v-model="formData.workPlaceCode"-->
<!-- placeholder="当前工位"-->
<!-- style="width: 90%"-->
<!-- :disabled="corpOrderIdDisabled"-->
<!-- filterable-->
<!-- @change="workPlaceCodeChange"-->
<!-- >-->
<!-- <el-option-->
<!-- v-for="item in curWorkPlaces"-->
<!-- :key="item.workplaceId"-->
<!-- :label="item.workplaceName"-->
<!-- :value="item.workplaceId"-->
<!-- >-->
<!-- <span style="float: left">{{ item.workplaceName }}</span>-->
<!-- <span style="float: right; color: #8492a6; font-size: 13px">{{-->
<!-- item.workplaceId-->
<!-- }}</span>-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="6">-->
<!-- <el-form-item prop="busType" class="query-form-item" label="当前业务类型:">-->
<!-- <el-select v-model="formData.busType"-->
<!-- filterable-->
<!-- remote-->
<!-- @change="busTypeChange"-->
<!-- reserve-keyword-->
<!-- disabled-->
<!-- placeholder="请选择业务类型" clearable style="width: 55%">-->
<!-- <el-option-->
<!-- v-for="item in busTypeList"-->
<!-- :key="item.documentTypeCode"-->
<!-- :label="item.busName"-->
<!-- :value="item.documentTypeCode"-->
<!-- >-->
<!-- <span style="float: left">{{ item.busName }}</span>-->
<!-- <span style="float: right; color: #8492a6; font-size: 13px">{{ item.documentTypeCode }}</span>-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- <el-button type="primary" @click="toggleBusType" style="margin-left: 5px">切换业务</el-button>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="6" v-if="this.formDataVisible != null && this.formDataVisible.scanType == 1">
<el-form-item class="query-form-item" :label="this.formDataVisible.unitTittle + ':'">
@ -272,7 +272,8 @@
<div style="flex: 1; display: flex; flex-direction: column; justify-content: flex-end; padding-top: 10px;"
>
<!-- 假设这里有一些信息内容 -->
<p style="font-size: 14px;background-color: #e1f3fb" @click="selectBusType(info.documentTypeCode)">{{ info.remark }}</p>
<p style="font-size: 14px;background-color: #e1f3fb" @click="selectBusType(info.documentTypeCode)">
{{ info.remark }}</p>
<el-button type="primary" style="position: absolute; bottom: 20px; right: 20px;" icon="el-icon-thumb"
@click="selectBusType(info.documentTypeCode)">开始作业
</el-button>
@ -442,8 +443,7 @@ export default {
if (this.formData.billNo != null) {
this.getBillNo(this.formData.billNo)
this.startDeal();
}
else {
} else {
if (this.busTypeList.length == 1 && this.$route.query.busType == null) {
let busType = this.busTypeList[0]
this.formData.busType = this.busTypeList[0].documentTypeCode
@ -740,7 +740,7 @@ export default {
//选择单据
selectPrescribe() {
// console.log(this.formData.workPlaceCode)
if (this.$route.query.busType != null){
if (this.$route.query.busType != null) {
this.formData.busType = this.$route.query.busType
}
this.selectPrescriptionVisible = true;
@ -891,7 +891,7 @@ export default {
this.formData.confirmFinish = false;
this.refreshCodesPanel(this)
},
toggleBusType(){
toggleBusType() {
//隐藏下拉框内容
// this.$refs.selectHeadEmpId.blur();
this.selectBusTypeDisabled = true
@ -925,9 +925,6 @@ export default {
}
}
}

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

@ -407,6 +407,7 @@ export default {
sickerAdNum: null,
workPlaceCode: null,
fifoSplit: 1,
splitBusType: null,
},
detailList: [],
@ -1081,7 +1082,7 @@ export default {
parseTime(date, "{y}{m}{d}{h}{i}{s}") +
Math.ceil(Math.random() * 89 + 10);
}
debugger
this.loading = true;
let tQuery = Object.assign(
JSON.parse(JSON.stringify(this.orderFormData))
@ -1751,6 +1752,7 @@ export default {
preCurSpaceCode: null, //单据
sickerAdNum: null,
workPlaceCode: null,
splitBusType: null,
fifoSplit: 1,
}
this.scanCode = "";
@ -1847,7 +1849,8 @@ export default {
this.corpOrderIdDisabled = true
this.isLinkDisabled = true
this.workplaceId = this.$route.query.workplaceId
this.orderFormData.workPlaceCode = Number(this.$route.query.workplaceId)
this.orderFormData.workPlaceCode = Number(this.$route.query.workplaceId);
this.orderFormData.splitBusType = "YPCF002"
}
},

Write Preview
Loading…
Cancel
Save