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

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

Browse Source 
# Conflicts:
#	src/views/collect/CollectOrderTabs.vue
20240912_adapter_z
chenhc 10 months ago
parent a244b1e241 9b0d2675c2
commit ec2bb507ff
5 changed files with 164 additions and 170 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> <span>{{ workplaceTypes[scope.row.workplaceType] }}</span>
</template> </template>
</el-table-column> </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="employeeName" width="90"></el-table-column>
<!--<el-table-column label="往来单位标题" prop="unitTittle" width="100"></el-table-column>--> <!--<el-table-column label="往来单位标题" prop="unitTittle" width="100"></el-table-column>-->
<!--<el-table-column label="往来单位类型" prop="corpType" width="100">--> <!--<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-tab-pane>
</el-tabs> </el-tabs>
</div> </div>
@ -40,7 +39,7 @@ import CollectOrderAllotCardComponents from "./CollectOrderAllotCardComponents.v
export default { export default {
name: "PrescribeTagCode", name: "PrescribeTagCode",
components: { components: {
CollectOrderAllotComponents,CollectOrderAllotCardComponents CollectOrderAllotComponents, CollectOrderAllotCardComponents
}, },
data() { data() {
return { return {
@ -48,11 +47,11 @@ export default {
} }
}, },
methods: { methods: {
parentMethod(data,url) { parentMethod(data, url) {
// 处理从子组件传来的数据 // 处理从子组件传来的数据
if (this.workPlaceCode == null){ if (this.workPlaceCode == null) {
this.callParentMethod(url) this.callParentMethod(url)
}else { } else {
this.callParentMethodA(data) this.callParentMethodA(data)
} }
@ -66,7 +65,7 @@ export default {
}, },
}, },
created() { created() {
if (this.$route.query.workplaceId != null){ if (this.$route.query.workplaceId != null) {
this.workPlaceCode = Number(this.$route.query.workplaceId); this.workPlaceCode = Number(this.$route.query.workplaceId);
} }
} }

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

@ -7,51 +7,51 @@
<div> <div>
<el-form :model="formData" class="order-el-form" ref="formData" label-width="120px" style="margin-top: 5px"> <el-form :model="formData" class="order-el-form" ref="formData" label-width="120px" style="margin-top: 5px">
<el-col :span="6"> <el-col :span="6">
<el-form-item prop="workPlaceCode" class="query-form-item" label="当前工位:"> <el-form-item prop="workPlaceCode" class="query-form-item" label="当前工位:">
<el-select <el-select
v-model="formData.workPlaceCode" v-model="formData.workPlaceCode"
placeholder="当前工位" placeholder="当前工位"
style="width: 90%" style="width: 90%"
disabled 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"
> >
<span style="float: left">{{ item.busName }}</span> <el-option
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.documentTypeCode }}</span> v-for="item in curWorkPlaces"
</el-option> :key="item.workplaceId"
</el-select> :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-col :span="6">
</el-form-item> <el-form-item prop="busType" class="query-form-item" label="当前业务类型:">
</el-col> <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-col :span="6">
<el-form-item> <el-form-item>
@ -59,7 +59,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-form> </el-form>
</div> </div>
<el-col :span="4" align="right" style="margin-top: 10px"> <el-col :span="4" align="right" style="margin-top: 10px">
<div class="inv-hos-title"> <div class="inv-hos-title">
@ -76,47 +76,47 @@
</el-row> </el-row>
<el-row class="tac"> <el-row class="tac">
<el-col :span="2"> <el-col :span="2">
<!-- <h5>默认颜色</h5>--> <!-- <h5>默认颜色</h5>-->
<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-edit-outline"></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=1 @click="clickMenuItem(1)"> <el-menu-item :index=1 @click="clickMenuItem(1)">
<i class="el-icon-s-unfold"></i> <i class="el-icon-s-unfold"></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-s-fold"></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-s-platform"></i> <i class="el-icon-s-platform"></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-s-order"></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=5 @click="clickMenuItem(5)"> <el-menu-item :index=5 @click="clickMenuItem(5)">
<i class="el-icon-s-claim"></i> <i class="el-icon-s-claim"></i>
<span slot="title">已完成单</span> <span slot="title">已完成单</span>
</el-menu-item> </el-menu-item>
<el-menu-item :index=6 @click="clickMenuItem(6)"> <el-menu-item :index=6 @click="clickMenuItem(6)">
<i class="el-icon-s-claim"></i> <i class="el-icon-s-claim"></i>
<span slot="title">单据上传</span> <span slot="title">单据上传</span>
</el-menu-item> </el-menu-item>
<el-menu-item :index=7 @click="clickMenuItem(7)"> <el-menu-item :index=7 @click="clickMenuItem(7)">
<i class="el-icon-s-claim"></i> <i class="el-icon-s-claim"></i>
<span slot="title">损耗出库</span> <span slot="title">损耗出库</span>
</el-menu-item> </el-menu-item>
</el-menu> </el-menu>
</el-col> </el-col>
<el-col :span="22"> <el-col :span="22">
<el-tabs v-model="editableTabsValue" type="card" closable @tab-remove="removeTab" <el-tabs v-model="editableTabsValue" type="card" closable @tab-remove="removeTab"
@ -138,18 +138,12 @@
</div> </div>
</el-tab-pane> </el-tab-pane>
<!-- 自定义的上下文菜单（这里只是一个占位符，你需要实现它） -->
<!-- 上下文菜单 --> <div v-if="showContextMenu" class="context-menu" :style="contextMenuStyle">
<button @click="closeCurrentTab">关闭当前</button>
<!-- <ul v-show="showContextMenu" :style="{left:left+'px',top:top+'px'}" class="contextmenu">--> <button @click="closeOtherTabs">关闭其他</button>
<!-- <li> <i class="el-icon-refresh-right"></i> 刷新页面</li>--> <button @click="closeAllTabs">关闭所有</button>
<!-- <li @click="refreshSelectedTag(selectedTag)"><i class="el-icon-refresh-right"></i> 刷新页面</li>--> </div>
<!-- <li v-if="!isAffix(selectedTag)" @click="closeSelectedTag(selectedTag)"><i class="el-icon-close"></i> 关闭当前</li>-->
<!-- <li @click="closeOthersTags"><i class="el-icon-circle-close"></i> 关闭其他</li>-->
<!-- <li v-if="!isFirstView()" @click="closeLeftTags"><i class="el-icon-back"></i> 关闭左侧</li>-->
<!-- <li v-if="!isLastView()" @click="closeRightTags"><i class="el-icon-right"></i> 关闭右侧</li>-->
<!-- <li @click="closeAllTags(selectedTag)"><i class="el-icon-circle-close"></i> 全部关闭</li>-->
<!-- </ul>-->
</el-tabs> </el-tabs>
</el-col> </el-col>
@ -190,7 +184,8 @@
<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.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" <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>
@ -244,8 +239,8 @@ export default {
limit: 100 limit: 100
}, },
formData: {}, formData: {},
curWorkPlaces:[], curWorkPlaces: [],
busTypeList:[], busTypeList: [],
logo: logoImg, logo: logoImg,
isLinkDisabled: false, isLinkDisabled: false,
showChild: true, showChild: true,
@ -275,7 +270,7 @@ export default {
component: IoCreateOrderOut, component: IoCreateOrderOut,
// 假设你需要传递的参数 // 假设你需要传递的参数
componentProps: { componentProps: {
fromSplitType: 'out' fromSplitType: 'out',
} }
}, },
{ {
@ -341,21 +336,21 @@ export default {
], ],
tabIndex: 0, tabIndex: 0,
menuActive: 0, menuActive: 0,
resetKeys:{} resetKeys: {}
} }
}, },
methods: { methods: {
toggleBusType(){ toggleBusType() {
//隐藏下拉框内容 //隐藏下拉框内容
// this.$refs.selectHeadEmpId.blur(); // this.$refs.selectHeadEmpId.blur();
this.selectBusTypeDisabled = true this.selectBusTypeDisabled = true
}, },
selectBusType(val) { selectBusType(val) {
this.formData.busType = val this.formData.busType = val
let newQuery = { ...this.$route.query }; let newQuery = {...this.$route.query};
delete newQuery.billNo; delete newQuery.billNo;
newQuery.busType = val newQuery.busType = val
this.$router.push({ query: newQuery, path: this.$route.path }); this.$router.push({query: newQuery, path: this.$route.path});
this.editableTabs = [] this.editableTabs = []
this.clickMenuItem(0) this.clickMenuItem(0)
this.showChild = false; this.showChild = false;
@ -452,7 +447,7 @@ export default {
this.busTypeList = res.data.list this.busTypeList = res.data.list
this.busTypeTotal = res.data.total this.busTypeTotal = res.data.total
if (this.$route.query.busType != null){ if (this.$route.query.busType != null) {
this.formData.busType = this.$route.query.busType this.formData.busType = this.$route.query.busType
}else if (this.busTypeList.length == 1) { }else if (this.busTypeList.length == 1) {
this.formData.busType = this.busTypeList[0].documentTypeCode this.formData.busType = this.busTypeList[0].documentTypeCode

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

@ -56,53 +56,53 @@
</el-row> </el-row>
<el-row style="margin-top: 15px"> <el-row style="margin-top: 15px">
<!-- <el-col :span="6">--> <!-- <el-col :span="6">-->
<!-- <el-form-item prop="workPlaceCode" class="query-form-item" label="当前工位:">--> <!-- <el-form-item prop="workPlaceCode" class="query-form-item" label="当前工位:">-->
<!-- <el-select--> <!-- <el-select-->
<!-- v-model="formData.workPlaceCode"--> <!-- v-model="formData.workPlaceCode"-->
<!-- placeholder="当前工位"--> <!-- placeholder="当前工位"-->
<!-- style="width: 90%"--> <!-- style="width: 90%"-->
<!-- :disabled="corpOrderIdDisabled"--> <!-- :disabled="corpOrderIdDisabled"-->
<!-- filterable--> <!-- filterable-->
<!-- @change="workPlaceCodeChange"--> <!-- @change="workPlaceCodeChange"-->
<!-- >--> <!-- >-->
<!-- <el-option--> <!-- <el-option-->
<!-- v-for="item in curWorkPlaces"--> <!-- v-for="item in curWorkPlaces"-->
<!-- :key="item.workplaceId"--> <!-- :key="item.workplaceId"-->
<!-- :label="item.workplaceName"--> <!-- :label="item.workplaceName"-->
<!-- :value="item.workplaceId"--> <!-- :value="item.workplaceId"-->
<!-- >--> <!-- >-->
<!-- <span style="float: left">{{ item.workplaceName }}</span>--> <!-- <span style="float: left">{{ item.workplaceName }}</span>-->
<!-- <span style="float: right; color: #8492a6; font-size: 13px">{{--> <!-- <span style="float: right; color: #8492a6; font-size: 13px">{{-->
<!-- item.workplaceId--> <!-- item.workplaceId-->
<!-- }}</span>--> <!-- }}</span>-->
<!-- </el-option>--> <!-- </el-option>-->
<!-- </el-select>--> <!-- </el-select>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<!-- </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-->
<!-- disabled--> <!-- disabled-->
<!-- placeholder="请选择业务类型" clearable style="width: 55%">--> <!-- placeholder="请选择业务类型" clearable style="width: 55%">-->
<!-- <el-option--> <!-- <el-option-->
<!-- v-for="item in busTypeList"--> <!-- v-for="item in busTypeList"-->
<!-- :key="item.documentTypeCode"--> <!-- :key="item.documentTypeCode"-->
<!-- :label="item.busName"--> <!-- :label="item.busName"-->
<!-- :value="item.documentTypeCode"--> <!-- :value="item.documentTypeCode"-->
<!-- >--> <!-- >-->
<!-- <span style="float: left">{{ item.busName }}</span>--> <!-- <span style="float: left">{{ item.busName }}</span>-->
<!-- <span style="float: right; color: #8492a6; font-size: 13px">{{ item.documentTypeCode }}</span>--> <!-- <span style="float: right; color: #8492a6; font-size: 13px">{{ item.documentTypeCode }}</span>-->
<!-- </el-option>--> <!-- </el-option>-->
<!-- </el-select>--> <!-- </el-select>-->
<!-- <el-button type="primary" @click="toggleBusType" style="margin-left: 5px">切换业务</el-button>--> <!-- <el-button type="primary" @click="toggleBusType" style="margin-left: 5px">切换业务</el-button>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<!-- </el-col>--> <!-- </el-col>-->
<el-col :span="6" v-if="this.formDataVisible != null && this.formDataVisible.scanType == 1"> <el-col :span="6" v-if="this.formDataVisible != null && this.formDataVisible.scanType == 1">
<el-form-item class="query-form-item" :label="this.formDataVisible.unitTittle + ':'"> <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;" <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" <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>
@ -442,8 +443,7 @@ export default {
if (this.formData.billNo != null) { if (this.formData.billNo != null) {
this.getBillNo(this.formData.billNo) this.getBillNo(this.formData.billNo)
this.startDeal(); this.startDeal();
} } else {
else {
if (this.busTypeList.length == 1 && this.$route.query.busType == null) { if (this.busTypeList.length == 1 && this.$route.query.busType == null) {
let busType = this.busTypeList[0] let busType = this.busTypeList[0]
this.formData.busType = this.busTypeList[0].documentTypeCode this.formData.busType = this.busTypeList[0].documentTypeCode
@ -740,7 +740,7 @@ export default {
//选择单据 //选择单据
selectPrescribe() { selectPrescribe() {
// console.log(this.formData.workPlaceCode) // 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.formData.busType = this.$route.query.busType
} }
this.selectPrescriptionVisible = true; this.selectPrescriptionVisible = true;
@ -891,7 +891,7 @@ export default {
this.formData.confirmFinish = false; this.formData.confirmFinish = false;
this.refreshCodesPanel(this) this.refreshCodesPanel(this)
}, },
toggleBusType(){ toggleBusType() {
//隐藏下拉框内容 //隐藏下拉框内容
// this.$refs.selectHeadEmpId.blur(); // this.$refs.selectHeadEmpId.blur();
this.selectBusTypeDisabled = true 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, sickerAdNum: null,
workPlaceCode: null, workPlaceCode: null,
fifoSplit: 1, fifoSplit: 1,
splitBusType: null,
}, },
detailList: [], detailList: [],
@ -1081,7 +1082,7 @@ export default {
parseTime(date, "{y}{m}{d}{h}{i}{s}") + parseTime(date, "{y}{m}{d}{h}{i}{s}") +
Math.ceil(Math.random() * 89 + 10); Math.ceil(Math.random() * 89 + 10);
} }
debugger
this.loading = true; this.loading = true;
let tQuery = Object.assign( let tQuery = Object.assign(
JSON.parse(JSON.stringify(this.orderFormData)) JSON.parse(JSON.stringify(this.orderFormData))
@ -1751,6 +1752,7 @@ export default {
preCurSpaceCode: null, //单据 preCurSpaceCode: null, //单据
sickerAdNum: null, sickerAdNum: null,
workPlaceCode: null, workPlaceCode: null,
splitBusType: null,
fifoSplit: 1, fifoSplit: 1,
} }
this.scanCode = ""; this.scanCode = "";
@ -1847,7 +1849,8 @@ export default {
this.corpOrderIdDisabled = true this.corpOrderIdDisabled = true
this.isLinkDisabled = true this.isLinkDisabled = true
this.workplaceId = this.$route.query.workplaceId 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