Merge branch 'main' of http://47.115.223.229:8888/yangjun/hldy_app_mini
This commit is contained in:
commit
2d93dc8751
|
|
@ -182,14 +182,13 @@
|
|||
cgdwflag.value = false;
|
||||
type.value = {};
|
||||
sx.value = false;
|
||||
gysidnum.value = 0
|
||||
}
|
||||
})
|
||||
const jssl=()=>{
|
||||
let num = Number(props.caigouobj.upperLimit)-Number(props.caigouobj.kcsl);
|
||||
let m = Math.floor(num/type.value.num)
|
||||
console.log(m)
|
||||
huansuan(m)
|
||||
console.log(stringShow.value)
|
||||
}
|
||||
const huansuan=(m:number)=>{
|
||||
relNumber.value = m;
|
||||
|
|
|
|||
|
|
@ -215,6 +215,11 @@
|
|||
getTreelnum()
|
||||
}
|
||||
}
|
||||
defineExpose({
|
||||
typescroll,
|
||||
config,
|
||||
qingkong
|
||||
})
|
||||
</script>
|
||||
|
||||
<style scoped lang="less">
|
||||
|
|
|
|||
|
|
@ -13,8 +13,9 @@
|
|||
<image src="/static/index/procurement/sx.png" mode="aspectFill"></image>
|
||||
筛选
|
||||
</view>
|
||||
<view class="shx" @click="chongzhi">
|
||||
<image src="/static/index/procurement/sx.png" mode="aspectFill"></image>
|
||||
<view class="shx" @click="chongzhi"
|
||||
v-if="form.categoryId!=''||form.wlParamInfo!=''||form.suppliers!=''"
|
||||
>
|
||||
重置
|
||||
</view>
|
||||
<view class="back" @click="uni.navigateBack()">
|
||||
|
|
@ -95,7 +96,7 @@
|
|||
<calculator :show="addflag" @jjnum="jjnum" :caigouobj="caigouobj" @colse="qk" @right="right"></calculator>
|
||||
<!-- 筛选 -->
|
||||
<view class="mengban" v-if="ification" @click="qk"></view>
|
||||
<classification @confirm="confirm" :show="ification" :typenum="0"></classification>
|
||||
<classification @confirm="confirm" :show="ification" :typenum="0" ref="classication"></classification>
|
||||
<!-- more -->
|
||||
<view class="mengban" v-if="Invenshow" @click="Invenshow = false;moredex=0"></view>
|
||||
<Inventory @addcartory="addcartory" :show="Invenshow" :InvoicingList="Material"
|
||||
|
|
@ -160,11 +161,8 @@
|
|||
wlParamInfo: '',
|
||||
isWaring: 1
|
||||
})
|
||||
const parentMethod = inject('typescroll','qingkong');
|
||||
const chongzhi=()=>{
|
||||
typescroll(1,-1,{});
|
||||
qingkong()
|
||||
}
|
||||
const classication = ref<InstanceType<typeof ChildComponent>>()
|
||||
|
||||
onLoad(() => {
|
||||
serverUrl.value = uni.getStorageSync('serverUrl') + '/sys/common/static/';
|
||||
})
|
||||
|
|
@ -241,6 +239,18 @@
|
|||
queryInvo();
|
||||
qk()
|
||||
}
|
||||
const chongzhi=()=>{
|
||||
form.categoryId = '';
|
||||
form.typeId = '';
|
||||
form.medicationId = '';
|
||||
form.suppliers = '';
|
||||
form.pageNo=1;
|
||||
form.wlParamInfo= '',
|
||||
InvoicingList.value = [];
|
||||
classication.value.typescroll(1,-1,{});
|
||||
classication.value.qingkong();
|
||||
classication.value.config();
|
||||
}
|
||||
const search = (x : number) => {
|
||||
if (x === 0) { form.wlParamInfo = '' }
|
||||
form.pageNo = 1;
|
||||
|
|
@ -717,7 +727,7 @@
|
|||
.ipt {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
width: 22vw;
|
||||
width: 24.2vw;
|
||||
background: #E2E4E9;
|
||||
border-radius: 1.65vw;
|
||||
height: 3.3vw;
|
||||
|
|
@ -731,7 +741,7 @@
|
|||
input {
|
||||
width: 25vw;
|
||||
height: 3.3vw;
|
||||
font-size: 1.1vw;
|
||||
font-size: 1.5vw;
|
||||
padding-left: 1.6vw;
|
||||
|
||||
}
|
||||
|
|
@ -771,7 +781,7 @@
|
|||
height: 3.3vw;
|
||||
background: linear-gradient(-45deg, rgba(223, 244, 252, 1), rgba(204, 228, 249, 0.43));
|
||||
border: 1px solid #1083F8;
|
||||
margin: 0 1.2vw;
|
||||
margin: 0 0 0 1.2vw;
|
||||
}
|
||||
|
||||
.shx {
|
||||
|
|
@ -787,6 +797,7 @@
|
|||
justify-content: center;
|
||||
align-items: center;
|
||||
box-shadow: 0.5rpx 5rpx 5rpx #dadee1;
|
||||
margin: 0 0 0 1.2vw;
|
||||
|
||||
image {
|
||||
width: 1.5vw;
|
||||
|
|
|
|||
|
|
@ -14,6 +14,11 @@
|
|||
<image src="/static/index/procurement/sx.png" mode="aspectFill"></image>
|
||||
筛选
|
||||
</view>
|
||||
<view class="shx" @click="chongzhi"
|
||||
v-if="form.categoryId!=''||form.wlParamInfo!=''||form.suppliers!=''"
|
||||
>
|
||||
重置
|
||||
</view>
|
||||
</view>
|
||||
<view class="rightbtn">
|
||||
<view @click="open = 1">
|
||||
|
|
@ -37,7 +42,7 @@
|
|||
|
||||
<!-- 筛选 -->
|
||||
<view class="mengban" v-if="ification" @click="ification = false"></view>
|
||||
<classification @confirm="confirm" :show="ification" :typenum="1"></classification>
|
||||
<classification @confirm="confirm" :show="ification" :typenum="1" ref="classication"></classification>
|
||||
<defaultr cont="暂无数据" v-if="status=='nomore'&&InvoicingList.length==0"></defaultr>
|
||||
|
||||
<view class="mengban" v-if="addflag" @click="addflag = false"></view>
|
||||
|
|
@ -76,6 +81,19 @@
|
|||
onLoad(()=>{
|
||||
queryInvo()
|
||||
})
|
||||
const classication = ref<InstanceType<typeof ChildComponent>>()
|
||||
const chongzhi=()=>{
|
||||
form.categoryId = '';
|
||||
form.typeId = '';
|
||||
form.medicationId = '';
|
||||
form.suppliers = '';
|
||||
form.pageNo=1;
|
||||
form.wlParamInfo= '',
|
||||
InvoicingList.value = [];
|
||||
classication.value.typescroll(1,-1,{});
|
||||
classication.value.qingkong();
|
||||
classication.value.config();
|
||||
}
|
||||
const queryInvo = () => {
|
||||
queryShoppingCartList(form).then(res => {
|
||||
res.result.records.forEach((item,i)=>{
|
||||
|
|
@ -264,7 +282,7 @@
|
|||
.ipt {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
width: 30vw;
|
||||
width: 27vw;
|
||||
background: #E2E4E9;
|
||||
border-radius: 1.65vw;
|
||||
height: 3.3vw;
|
||||
|
|
@ -278,7 +296,7 @@
|
|||
input {
|
||||
width: 25vw;
|
||||
height: 3.3vw;
|
||||
font-size: 1.1vw;
|
||||
font-size: 1.5vw;
|
||||
padding-left: 1.6vw;
|
||||
|
||||
}
|
||||
|
|
@ -316,7 +334,7 @@
|
|||
height: 3.3vw;
|
||||
background: linear-gradient(-45deg, rgba(223, 244, 252, 1), rgba(204, 228, 249, 0.43));
|
||||
border: 1px solid #1083F8;
|
||||
margin: 0 1.2vw;
|
||||
margin:0 0 0 1.2vw;
|
||||
}
|
||||
|
||||
.shx {
|
||||
|
|
@ -332,6 +350,7 @@
|
|||
justify-content: center;
|
||||
align-items: center;
|
||||
box-shadow: 0.5rpx 5rpx 5rpx #dadee1;
|
||||
margin:0 0 0 1.2vw;
|
||||
|
||||
image {
|
||||
width: 1.5vw;
|
||||
|
|
|
|||
|
|
@ -574,7 +574,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
|
|||
)
|
||||
]);
|
||||
}
|
||||
const camera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/hldy_app_mini/pages/camera.nvue"]]);
|
||||
const camera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/项目/hldy_app_mini/pages/camera.nvue"]]);
|
||||
export {
|
||||
camera as default
|
||||
};
|
||||
|
|
|
|||
|
|
@ -577,7 +577,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
|
|||
)
|
||||
]);
|
||||
}
|
||||
const fullcamera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/hldy_app_mini/pages/fullcamera.nvue"]]);
|
||||
const fullcamera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/项目/hldy_app_mini/pages/fullcamera.nvue"]]);
|
||||
export {
|
||||
fullcamera as default
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in New Issue