czg_team/cashier-web
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 代码合并冲突解决

Browse Source
This commit is contained in:
YeMingfei666
2025-04-22 10:16:48 +08:00
parent f5ff208fd6 593f5693ef
commit 21eda68ab0
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/views/product/index.vue
View File

@@ -206,7 +206,7 @@
</MyDialog> </MyDialog>
<!-- 库存修改 --> <!-- 库存修改 -->
<MyDialog ref="myDialogRefkucun" @confirm="confirmkucun" width="30%" title="库存修改"> <MyDialog ref="myDialogRefkucun" @confirm="confirmkucun" width="30%" title="库存修改">
<el-input-number v-model="kucundata.stockNumber" :min="0" /> <el-input-number v-model="kucundata.stockNumbers" :min="0" />
</MyDialog> </MyDialog>
</div> </div>
</template> </template>
@@ -343,13 +343,15 @@ function newHandleQueryClick(e: IObject | undefined) {
// 库存修改 // 库存修改
function kucunedit(item) { function kucunedit(item) {
kucundata.value = item; kucundata.value = item;
kucundata.value.stockNumbers = item.stockNumber;
myDialogRefkucun.value.open(); myDialogRefkucun.value.open();
} }
async function confirmkucun() { async function confirmkucun() {
let res = await UserAPI.modifyStock({ let res = await UserAPI.modifyStock({
id: kucundata.value.id, id: kucundata.value.id,
stockNumber: kucundata.value.stockNumber, stockNumber: kucundata.value.stockNumbers,
}); });
kucundata.value.stockNumber = kucundata.value.stockNumbers;
ElMessage.success("成功"); ElMessage.success("成功");
myDialogRefkucun.value.close(); myDialogRefkucun.value.close();
} }