Compare commits

...

2 Commits

Author SHA1 Message Date
2b818848eb Merge branch 'main' of http://162.14.99.253:3000/10539622/2025-03-JS-SDK-PDA
# Conflicts:
#	pages/material/features/ProduceReturnPage/index.vue
2025-04-24 13:36:13 +08:00
8730a4fcdf fix:修改冲突 2025-04-24 13:35:21 +08:00

View File

@ -16,7 +16,12 @@
<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>
</u-form-item>
<!-- <u-form-item :border-bottom="false">
<label>选择库位</label>
<downSelect ref='selectRef' showKey="storageName" mode='single' :dataList="items_Location" @resultBack="resultBack">
@ -24,12 +29,6 @@
</downSelect>
</u-form-item> -->
<u-form-item :border-bottom="false">
<label>选择库位:</label>&nbsp;&nbsp;&nbsp;&nbsp;
<zxzUniDataSelect filterable v-model="LOCATIONNAME" :localdata="items_Location"
@inputChange="getitems_LocationAll"></zxzUniDataSelect>
</u-form-item>
<!-- <br /> -->
<!-- <u-row align="left">
<u-col span="2"><label>组织</label> </u-col>