yangjun
/
hldy_app_mini
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

冲突

This commit is contained in:
wangweidong 2025-11-18 16:02:02 +08:00
parent 61aa1ddbd2 4e0428b95b
commit dc3bb2e04c
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
component/public/superpicker.vue
View File

@ -95,7 +95,7 @@
default: () => []
}
});
const emit = defineEmits(['update:modelValue', 'confirm', 'change', 'update:position', 'update:size']);
const emit = defineEmits(['update:modelValue', 'confirm', 'change', 'update:position', 'update:size','close']);
/* ========== 基本可见性 / 同步 ========== */
const visible = ref(props.modelValue);
@ -366,6 +366,7 @@
function cancel() {
visible.value = false;
emit('close');
}
/* ========== boxStyle ========== */

10
pages/Warehouse/picking.vue
View File

@ -1044,10 +1044,7 @@
</view>
</view>
</view>
<!-- <u-select v-model="opencgr" :list="cgrlist" label-name="cgBy" value-name="cgBy" ></u-select> -->
<!-- <u-select v-model="opengys" :list="gyslist" label-name="suppliersName" value-name="suppliers" ></u-select> -->
<superpicker v-model:modelValue="opengys" :columns="[gyslist]" nameKey="suppliersName" :init-left="80" :init-top="120" :init-width="360"
:init-height="360" />
<view class="mengban" v-if="open==1"> </view>
<equiment :open="open==1" @del="del()" @back="open = 0" :content="'是否删除此图片？'"></equiment>
</view>
@ -1066,6 +1063,11 @@
const opengaijia = ref(false);
const openjianhuo = ref(false);
const opendata = ref(false);
const gysclick = (res:any) => {
console.log("///",res);
opengys.value=false;
}
const openjianhuoclick = () => {
if(showvalue.value.jianhuobtn == false){