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

8/27 优化

Browse Source
20240912_adapter_z
wangwei 7 months ago
parent 1996e3def9
commit beb2212c04
8 changed files with 86 additions and 41 deletions
Show Stats Download Patch File Download Diff File

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

@ -368,6 +368,7 @@ export default {
page: 1, page: 1,
limit: 10, limit: 10,
invCode: this.$store.getters.locInvCode, invCode: this.$store.getters.locInvCode,
deptCode: this.$store.getters.locDeptCode,
key: '', key: '',
userKey: '', userKey: '',
deptName: '' deptName: ''

4
src/views/collect/CollectOrderAllotCardComponents.vue
Unescape Escape View File

@ -223,6 +223,7 @@
<el-select <el-select
v-model="filterQuery.workPlaceCode" v-model="filterQuery.workPlaceCode"
placeholder="请选择作业工位" placeholder="请选择作业工位"
:disabled="showType != 1"
filterable filterable
remote remote
clearable> clearable>
@ -465,6 +466,7 @@ export default {
options: { options: {
findWorkPlace: [], findWorkPlace: [],
}, },
showType: 1
} }
}, },
@ -629,6 +631,8 @@ export default {
created() { created() {
if (this.$route.query.workplaceId != null) { if (this.$route.query.workplaceId != null) {
this.isLinkDisabled = true this.isLinkDisabled = true
this.filterQuery.workPlaceCode = this.$route.query.workplaceId
this.showType = 2
} }
this.findWorkPlace(this,""); this.findWorkPlace(this,"");
getHead("prescribeAllot", "1").then((re) => { getHead("prescribeAllot", "1").then((re) => {

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

@ -27,30 +27,29 @@
<el-menu <el-menu
:default-active="menuActive" :default-active="menuActive"
class="el-menu-vertical-demo" class="el-menu-vertical-demo"
@open="handleOpen" @open="handleOpen">
>
<el-menu-item :index=0 @click="clickMenuItem(0)"> <el-menu-item :index=0 @click="clickMenuItem(0)">
<i class="el-icon-menu"></i> <i class="el-icon-s-operation"></i>
<span slot="title">处理单据</span> <span slot="title">处理单据</span>
</el-menu-item> </el-menu-item>
<el-menu-item :index=1 @click="clickMenuItem(1)"> <el-menu-item :index=1 @click="clickMenuItem(1)">
<i class="el-icon-menu"></i> <i class="el-icon-truck"></i>
<span slot="title">工位上货</span> <span slot="title">工位上货</span>
</el-menu-item> </el-menu-item>
<el-menu-item :index=2 @click="clickMenuItem(2)"> <el-menu-item :index=2 @click="clickMenuItem(2)">
<i class="el-icon-document"></i> <i class="el-icon-s-fold"></i>
<span slot="title">工位退货</span> <span slot="title">工位退货</span>
</el-menu-item> </el-menu-item>
<el-menu-item :index=3 @click="clickMenuItem(3)"> <el-menu-item :index=3 @click="clickMenuItem(3)">
<i class="el-icon-setting"></i> <i class="el-icon-s-order"></i>
<span slot="title">工位存量</span> <span slot="title">工位存量</span>
</el-menu-item> </el-menu-item>
<el-menu-item :index=4 @click="clickMenuItem(4)"> <el-menu-item :index=4 @click="clickMenuItem(4)">
<i class="el-icon-setting"></i> <i class="el-icon-edit-outline"></i>
<span slot="title">待处理单</span> <span slot="title">待处理单</span>
</el-menu-item> </el-menu-item>
<el-menu-item :index=5 @click="clickMenuItem(5)"> <el-menu-item :index=5 @click="clickMenuItem(5)">
<i class="el-icon-setting"></i> <i class="el-icon-finished"></i>
<span slot="title">已完成单</span> <span slot="title">已完成单</span>
</el-menu-item> </el-menu-item>
</el-menu> </el-menu>

45
src/views/collect/DealOrderBlank.vue
Unescape Escape View File

@ -1,8 +1,26 @@
<template> <template>
<div> <!--<div>-->
<!-- <div style="display: flex; justify-content: space-between; align-items: center;" v-if="isLinkDisabled">-->
<!-- <div style="margin-left: auto;">-->
<!-- <span-->
<!-- style="margin: 10px;color: #2d8cf0;font-size: 14px;"-->
<!-- >部门&nbsp:&nbsp{{ this.userInfo.deptName }}</span>-->
<!-- <span-->
<!-- style="font-weight: 500;color:rgb(51 48 48); font-size: 14px; margin-right: 20px"-->
<!-- >&nbsp&nbsp&nbsp&nbsp用户&nbsp:&nbsp({{-->
<!-- this.userInfo.userName-->
<!-- }})</span>-->
<!-- </div>-->
<!-- </div>-->
<el-form :model="formData" class="order-el-form" ref="formData" label-width="120px"> <el-form :model="formData" class="order-el-form" ref="formData" label-width="120px">
<el-card> <el-card>
<!--<el-row :gutter="0">-->
<!-- <el-col :span="24" align="right">-->
<!-- </el-col>-->
<!--</el-row>-->
<!-- <el-alert--> <!-- <el-alert-->
<!-- style="margin-top: 15px"--> <!-- style="margin-top: 15px"-->
<!-- :title="msgTip"--> <!-- :title="msgTip"-->
@ -82,13 +100,14 @@
</el-col> </el-col>
<el-col :span="6"> <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" <el-select v-model="formData.busType"
filterable filterable
remote remote
@change="busTypeChange" @change="busTypeChange"
reserve-keyword reserve-keyword
placeholder="请选择业务类型" clearable style="width: 90%"> placeholder="请选择业务类型" clearable style="width: 90%"
>
<el-option <el-option
v-for="item in busTypeList" v-for="item in busTypeList"
:key="item.documentTypeCode" :key="item.documentTypeCode"
@ -108,7 +127,8 @@
filterable filterable
remote remote
reserve-keyword reserve-keyword
placeholder="请选择往来单位" clearable style="width: 90%"> placeholder="请选择往来单位" clearable style="width: 90%"
>
<el-option <el-option
v-for="item in fromInvOptions" v-for="item in fromInvOptions"
:key="item.erpId" :key="item.erpId"
@ -165,7 +185,8 @@
:type="scanResultType" :type="scanResultType"
:closable="false" :closable="false"
:dangerouslyUseHTMLString="true" :dangerouslyUseHTMLString="true"
:description="result"> :description="result"
>
</el-alert> </el-alert>
</div> </div>
@ -270,7 +291,7 @@
<div style="flex: 1; display: flex; flex-direction: column; justify-content: flex-end; padding-top: 10px;" <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.documentTypeCode }}</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" <el-button type="primary" style="position: absolute; bottom: 20px; right: 20px;" icon="el-icon-thumb"
@click="selectBusType(info.documentTypeCode)">开始作业 @click="selectBusType(info.documentTypeCode)">开始作业
</el-button> </el-button>
@ -797,8 +818,6 @@ export default {
}, },
startDeal() { startDeal() {
debugger
this.$message.error("开始处理单据")
this.curRow = this.formData; this.curRow = this.formData;
this.dealSplitOrder() this.dealSplitOrder()
this.formData.tagStatus = 2; this.formData.tagStatus = 2;
@ -871,7 +890,9 @@ export default {
this.formData.confirmFinish = false; this.formData.confirmFinish = false;
this.refreshCodesPanel(this) this.refreshCodesPanel(this)
}, },
focusInput() {
this.$refs.inputRef.focus();
}
}, },
created() { created() {
@ -898,7 +919,11 @@ export default {
this.getWorkBindBusTypes(this.formData.workPlaceCode); this.getWorkBindBusTypes(this.formData.workPlaceCode);
} }
},
mounted() {
this.$nextTick(() => {
this.focusInput();
});
} }
} }

49
src/views/collect/IoCreateOrderBlank.vue
Unescape Escape View File

@ -8,26 +8,23 @@
> >
<el-card style="margin: 5px;"> <el-card style="margin: 5px;">
<!-- <el-row :gutter="0" v-if="isLinkDisabled">--> <!--<el-row :gutter="0" v-if="isLinkDisabled">-->
<!-- <el-col :span="24" align="right">--> <!-- <el-col :span="24" align="right">-->
<!-- <div class="inv-hos-title">--> <!-- <div class="inv-hos-title">-->
<!-- <span--> <!-- <span-->
<!-- style="margin: 10px;color: #2d8cf0;font-size: 14px;"--> <!-- style="margin: 10px;color: #2d8cf0;font-size: 14px;"-->
<!-- >部门&nbsp:&nbsp{{ this.userInfo.deptName }}</span>--> <!-- >部门&nbsp:&nbsp{{ this.userInfo.deptName }}</span>-->
<!-- <span style="font-weight: 500;color:rgb(51 48 48); font-size: 14px;">用户&nbsp:&nbsp--> <!-- <span style="font-weight: 500;color:rgb(51 48 48); font-size: 14px;">用户-->
<!-- &lt;!&ndash; {{&ndash;&gt;--> <!-- </span>-->
<!-- &lt;!&ndash; this.userInfo.companyName&ndash;&gt;--> <!-- <span-->
<!-- &lt;!&ndash; }}&ndash;&gt;--> <!-- style="font-weight: 500;color:rgb(51 48 48); font-size: 14px; margin-right: 20px"-->
<!-- </span>--> <!-- >({{-->
<!-- <span--> <!-- this.userInfo.userName-->
<!-- style="font-weight: 500;color:rgb(51 48 48); font-size: 14px; margin-right: 20px"--> <!-- }})</span>-->
<!-- >({{--> <!-- </div>-->
<!-- this.userInfo.userName--> <!-- </el-col>-->
<!-- }})</span>--> <!--</el-row>-->
<!-- </div>-->
<!-- </el-col>-->
<!-- </el-row>-->
<el-alert <el-alert
style="margin-top: 1px;margin-bottom: 10px;font-size: 20px;" style="margin-top: 1px;margin-bottom: 10px;font-size: 20px;"
@ -1720,7 +1717,7 @@ export default {
this.loading = false; this.loading = false;
}); });
this.clearOrder() // this.clearOrder()
}, },
/** /**
* 上货完成后，清空数据 * 上货完成后，清空数据
@ -1747,14 +1744,14 @@ export default {
preSpaceCode: null, preSpaceCode: null,
preCurSpaceCode: null, //单据 preCurSpaceCode: null, //单据
sickerAdNum: null, sickerAdNum: null,
workPlaceCode: null, workPlaceCode: Number(this.$route.query.workplaceId),
fifoSplit: 1, fifoSplit: 1,
} }
this.scanCode = ""; this.scanCode = "";
this.result = ""; this.result = "";
this.refreshCodesPanel() this.refreshCodesPanel()
this.init(); this.init();
this.corpOrderIdDisabled = true
}, },
@ -1805,6 +1802,9 @@ export default {
this.showSearch = true this.showSearch = true
} }
},
focusInput() {
this.$refs.inputRef.focus();
} }
}, },
filters: {}, filters: {},
@ -1833,6 +1833,9 @@ export default {
} }
}; };
inputer.focus(); inputer.focus();
this.$nextTick(() => {
this.focusInput();
})
}, },
created() { created() {
this.splitType = this.$route.query.splitType; this.splitType = this.$route.query.splitType;

5
src/views/collect/IoSplitFifoCodePanel.vue
Unescape Escape View File

@ -503,6 +503,7 @@ export default {
resultTotal: 0, resultTotal: 0,
resultDetailLoading: false, resultDetailLoading: false,
resultDetailList: [], resultDetailList: [],
viewType: null
} }
}, },
@ -632,6 +633,10 @@ export default {
}, },
created() { created() {
if (this.$route.query.workplaceId != null) {
this.filterQuery.workPlaceCode = Number(this.$route.query.workplaceId)
this.viewType = 1
}
this.findWorkPlace(this,"") this.findWorkPlace(this,"")
console.log(this.panelType) console.log(this.panelType)
getHead("ioSplitFifoCode", "1").then((re) => { getHead("ioSplitFifoCode", "1").then((re) => {

5
src/views/collect/PanelOrderEndSearch.vue
Unescape Escape View File

@ -314,6 +314,7 @@ export default {
options: { options: {
findWorkPlace: [], findWorkPlace: [],
}, },
showType: 1
} }
}, },
@ -409,6 +410,10 @@ export default {
}, },
created() { created() {
if (this.$route.query.workplaceId != null) {
this.filterQuery.workPlaceCode = this.$route.query.workplaceId
this.showType = 2
}
this.findWorkPlace(this,""); this.findWorkPlace(this,"");
this.filterQuery.workPlaceCode = this.workPlaceCode +'' this.filterQuery.workPlaceCode = this.workPlaceCode +''
getHead("prescribePanel", "1").then((re) => { getHead("prescribePanel", "1").then((re) => {

3
src/views/collect/chooseDraftOrderDialog.vue
Unescape Escape View File

@ -1170,6 +1170,9 @@ export default {
//选入 //选入
choose(){ choose(){
if (this.currentRow.billNo == null){
return this.$message.error("请选择单据")
}
this.closeChooseDialog() this.closeChooseDialog()
this.handleChoose(this.currentRow) this.handleChoose(this.currentRow)
}, },

Write Preview
Loading…
Cancel
Save