Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z

20240912_adapter_z
wangwei 10 months ago
commit b2207905b7

@ -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">-->

@ -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);
}
}

@ -31,7 +31,7 @@
</el-col>
<el-col :span="6">
<el-form-item prop="busType" class="query-form-item" label="当前业务类型:" >
<el-form-item prop="busType" class="query-form-item" label="当前业务类型:">
<el-select v-model="formData.busType"
filterable
remote
@ -126,8 +126,13 @@
:key="item.name"
:label="item.title"
:name="item.name"
@contextmenu.stop.prevent="handleTabContextMenu($event, item)"
>
<ul v-if="showContextMenu" class="context-menu" :style="contextMenuPosition">
<li @click="closeCurrentTab(contextMenuIndex)"></li>
<li @click="closeOtherTabs"></li>
<li @click="closeAllTabs"></li>
</ul>
<div >
<component v-if="showChild" :is="item.component" v-bind="item.componentProps" :reset-key="resetKeys[item.name]" @parent-method="parentMethod" />
</div>
@ -179,7 +184,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>
@ -233,8 +239,8 @@ export default {
limit: 100
},
formData: {},
curWorkPlaces:[],
busTypeList:[],
curWorkPlaces: [],
busTypeList: [],
logo: logoImg,
isLinkDisabled: false,
showChild: true,
@ -264,7 +270,7 @@ export default {
component: IoCreateOrderOut,
//
componentProps: {
fromSplitType: 'out'
fromSplitType: 'out',
}
},
{
@ -330,21 +336,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,10 +447,11 @@ 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.$router.push({query: {...this.$route.query, busType: this.formData.busType}, path: this.$route.path})
this.selectBusTypeDisabled = false
} else {
this.selectBusTypeDisabled = true
@ -456,47 +463,46 @@ export default {
})
},
handleContextMenu(event, tabItem) {
console.log("右击")
handleContextMenu() {
this.showContextMenu = true;
},
handleTabContextMenu(event, tab) {
this.showContextMenu = true;
this.contextMenuTab = tab;
this.contextMenuPosition = { x: event.clientX, y: event.clientY };
// 使 Element UI Dialog Popover
// showContextMenu tabItem
this.showContextMenu(tabItem, event.clientX, event.clientY);
},
showContextMenu(tabItem, x, y) {
//
this.contextMenuVisible = true;
this.contextMenuPosition = { x, y };
this.selectedTabItem = tabItem;
closeContextMenu() {
this.showContextMenu = false;
this.contextMenuStyle.display = 'none'; //
},
// closeCurrent, closeOthers, closeAll
closeCurrent() {
closeCurrentTab(index) {
//
const index = this.editableTabs.findIndex(tab => tab.name === this.selectedTabItem.name);
if (index !== -1) {
this.editableTabs.splice(index, 1);
this.editableTabsValue = this.editableTabs[this.editableTabs.length - 1]?.name || '';
}
this.editableTabs.splice(index, 1); //
this.editableTabsValue = this.editableTabs.length > 0 ? this.editableTabs[0].name : '';
this.closeContextMenu();
},
closeOthers() {
closeOtherTabs() {
//
this.editableTabs = this.editableTabs.filter(tab => tab.name === this.selectedTabItem.name);
this.editableTabsValue = this.selectedTabItem.name;
// ...
this.closeContextMenu();
},
closeAll() {
closeAllTabs() {
//
this.editableTabs = [];
this.editableTabsValue = '';
}
this.closeContextMenu();
},
},
computed: {
contextMenuStyle() {
contextMenuPosition() {
return {
position: 'fixed', // 使 fixed
left: `${this.contextMenuPosition.x}px`,
top: `${this.contextMenuPosition.y}px`,
//
zIndex: 1000, //
// ...
};
},
},
@ -511,7 +517,7 @@ export default {
}
</script>
<style scoped>
<style lang="css" scoped>
.sidebar-logo {
width: 80px;
height: 60px;
@ -519,8 +525,25 @@ export default {
margin-left: 25px;
}
.context-menu {
position: absolute;
z-index: 1000; /* 确保它在其他内容之上 */
zIndex: 1000;
position: fixed ;
list-style-type: none;
padding: 0;
margin: 0;
background-color: #f9f9f9;
border: 1px solid #d4d4d4;
border-radius: 4px;
/* 其他样式... */
}
.context-menu li {
padding: 8px 16px;
cursor: pointer;
/* 其他样式... */
}
.context-menu li:hover {
background-color: #e1e1e1;
}
</style>

@ -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 {
}
}
}

@ -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"
}
},

Loading…
Cancel
Save