10539622/2025-03-JS-SDK-PDA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of http://162.14.99.253:3000/10539622/2025-03-JS-SDK-PDA

Browse Source 
# Conflicts:
#	pages/material/features/ProduceReturnPage/index.vue
This commit is contained in:
18110972313 2025-04-23 20:00:33 +08:00
commit 4ef2bf7a85
2 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/down-select/down-select.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<view class='layout-column'> <view class='layout-column'>
<view id="parent" style="width:fit-content;"> <view id="parent" class="parent-view" style="width:fit-content;">
<slot></slot> <slot></slot>
</view> </view>
<view <view

26
pages/material/features/ProduceReturnPage/index.vue
View File

@ -11,6 +11,19 @@
<label>选择仓库:</label>&nbsp;&nbsp;&nbsp;&nbsp; <label>选择仓库:</label>&nbsp;&nbsp;&nbsp;&nbsp;
<zxzUniDataSelect filterable v-model="ERPLOCATION" :localdata="items" @change="change"> <zxzUniDataSelect filterable v-model="ERPLOCATION" :localdata="items" @change="change">
</zxzUniDataSelect> </zxzUniDataSelect>
<<<<<<< HEAD
=======
</u-form-item>
<!-- <u-form-item :border-bottom="false">
<label>选择库位：</label>
<zxzUniDataSelect filterable v-model="LOCATIONNAME" :localdata="items_Location"-->
<!-- :disabled="Locatiaon_state"></zxzUniDataSelect> -->
<u-form-item :border-bottom="false">
<label>选择库位: </label>
<downSelect class="downSelect-col" ref='selectRef' showKey="storageName" mode='single' :dataList="items_Location" @resultBack="resultBack">
<u-input :border="true" v-model="LOCATIONNAME" placeholder="请输入" @input="handleInput"/>
</downSelect>
>>>>>>> c596f28377050fefce42433c3bcbb7d676e49713
</u-form-item> </u-form-item>
<!-- <u-form-item :border-bottom="false"> <!-- <u-form-item :border-bottom="false">
@ -594,11 +607,11 @@
var materialSpecName = barCodeArr[0]; var materialSpecName = barCodeArr[0];
this.$MyRequest('/ProduceReturn/getBarCode', { this.$MyRequest('/ProduceReturn/getBarCode', {
MATERIALPACKINGNAME: this.MATERIALPACKINGNAME/* , MATERIALPACKINGNAME: this.MATERIALPACKINGNAME,
ERPLOCATION: this.ERPLOCATION, ERPLOCATION: this.ERPLOCATION,
ERPFACTORY: this.ERPFACTORY, ERPFACTORY: this.ERPFACTORY,
LOCATIONNAME: this.LOCATIONNAME, LOCATIONNAME: this.LOCATIONNAME,
materialSpecName: materialSpecName */ materialSpecName: materialSpecName
}).then(res => { }).then(res => {
if (res.data.success) { if (res.data.success) {
var _Arr = res.data.resultObj; var _Arr = res.data.resultObj;
@ -893,8 +906,15 @@
} }
} }
</script> </script>
<style lang="scss"> <style lang="scss">
.downSelect-col {
width: 83.5%;
::v-deep .parent-view {
width: 100% !important
}
}
switch { switch {
color: #FFCC33; color: #FFCC33;
} }