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

fix:修改冲突

Browse Source
This commit is contained in:
郭飞 2025-04-24 13:35:21 +08:00
parent 4ef2bf7a85
commit 8730a4fcdf
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,8 +11,6 @@
<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>
<!-- <u-form-item :border-bottom="false"> <!-- <u-form-item :border-bottom="false">
<label>选择库位：</label> <label>选择库位：</label>
@ -23,7 +21,6 @@
<downSelect class="downSelect-col" ref='selectRef' showKey="storageName" mode='single' :dataList="items_Location" @resultBack="resultBack"> <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"/> <u-input :border="true" v-model="LOCATIONNAME" placeholder="请输入" @input="handleInput"/>
</downSelect> </downSelect>
>>>>>>> c596f28377050fefce42433c3bcbb7d676e49713
</u-form-item> </u-form-item>
<!-- <u-form-item :border-bottom="false"> <!-- <u-form-item :border-bottom="false">
@ -33,12 +30,6 @@
</downSelect> </downSelect>
</u-form-item> --> </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 /> --> <!-- <br /> -->
<!-- <u-row align="left"> <!-- <u-row align="left">
<u-col span="2"><label>组织：</label> </u-col> <u-col span="2"><label>组织：</label> </u-col>