Merge branch 'main' of http://47.115.223.229:8888/yangjun/hldy_app_mini

manifest.json

@@ -2,8 +2,8 @@
     "name" : "护理单元",
     "appid" : "__UNI__FB2D473",
     "description" : "护理单元",
-    "versionName" : "1.0.008",
+    "versionName" : "1.0.009",
-    "versionCode" : 10008,
+    "versionCode" : 10009,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

pages/procurement/components/addall.vue

@@ -5,7 +5,7 @@
 			<view>
 				<image src="/static/index/procurement/ddj.png" mode="aspectFill"></image>
 			</view>
-			<view>确认将所有未添加状态的库存预警物料添加至购物车中，并且物料的采购数量为物料的库存上限-库存数量吗？</view>
+			<view>确认将所有未添加状态的库存预警物料添加至购物车中，并且物料的采购数量为物料的库存上限减去库存数量吗？</view>
 			<view>
 				<view @click="$emit('back')">取消</view>
 				<view class="qd" @click="add()">确定</view>

pages/procurement/components/calculator.vue

@@ -147,9 +147,17 @@
 						num:1
 					}
 				];
-				type.value = a.find(item=>
+				if(props.caigouobj.wlUnits){
-					item.multiUnitType == props.caigouobj.multiUnitType
+					type.value = a.find(item=>
-				);
+						item.unit == props.caigouobj.wlUnits
+					);
+					console.log(props.caigouobj.wlUnits,type.value)
+				}else{
+					type.value = a.find(item=>
+						item.multiUnitType == props.caigouobj.multiUnitType
+					);
+				}
+				
 				cgdwarr.value = a;
 				
 				let n = [];
@@ -159,6 +167,9 @@
 				id = props.caigouobj.suppliers.split(/[, ]+/);
 				n.forEach((item,i)=>{
 					gysarr.value.push({'name':item,'id':id[i]})
+					if(item==props.caigouobj.suppliersName){
+						gysid(i)
+					}
 				})
 				if(props.caigouobj.purchaseQuantity){
 					props.caigouobj.upperLimit=props.caigouobj.wlUpperLimit

pages/procurement/components/carditem.vue

@@ -92,7 +92,7 @@
 	})
 	const caigouobj = ref({})
 	const addcar = (v : any,i:number) => {
-		if(v.kcsl>=v.upperLimit){
+		if(Number(v.kcsl)>=Number(v.upperLimit)){
 			uni.showToast({
 				title:'库存数量已满，不可添加购物车！',
 				icon:'none'

pages/procurement/components/carlist.vue

@@ -33,7 +33,7 @@
 								<text>采购单位: {{v.wlUnits}}</text>
 							</view>
 							<view>
-								<text>供应商: {{v.suppliersName}}{{v.suppliersName}}</text>
+								<text>供应商: {{v.suppliersName}}</text>
 							</view>
 							<view>
 								<view style="align-items: flex-start;">

pages/procurement/components/classification.vue

@@ -55,7 +55,7 @@
 
 			</view>
 			<view class="btnbotm">
-				<view class="bt" @click="typescroll(1,-1,{})">重置</view>
+				<view class="bt" @click="typescroll(1,-1,{});qingkong()">重置</view>
 				<view class="bt qd" @click="config">确定 <text v-if="num>0">（{{num>99?'99+':num}}件物料）</text></view>
 			</view>
 		</view>
@@ -116,10 +116,12 @@
 			medicationId: scroll.act3 > -1 ? TreeData.value[scroll.act1].children[scroll.act2].children[scroll.act3].key : '',
 			suppliers: gysidnum.value > -1 ? gysarr.value[gysidnum.value].suppliers : ''
 		}
+		console.log(obj)
 		switch (props.typenum) {
 			case 0:
 				// 采购单
 				getTreeDataWlnum(obj).then(res => {
+					console.log(res)
 					num.value = res.result.totalSize;
 				})
 				break;
@@ -138,13 +140,13 @@
 			default:
 				break;
 		}
-
 	}
 	const getMaterial = () => {
 		switch (props.typenum) {
 			case 0:
 				// 采购单
 				getMaterialTreeData({ 'nuId': uni.getStorageSync('nuId') }).then(res => {
+					console.log(res, uni.getStorageSync('nuId'))
 					TreeData.value = res.result;
 					getTreelnum()
 				})

pages/procurement/purchaseorder.vue

@@ -445,13 +445,7 @@
 		form.cgdId = plsbuy.value[index].id
 		form.pageNo = 1
 		form.canpull = true;
-		queryCgdInfoList(form).then(res => {
+		queryInvo();
-			InvoicingList.value = []
-			InvoicingList.value.push(...res.result.records);
-			if (form.pageNo) {
-				clickmiddle(0);
-			}
-		})
 	}
 	const showvalue = ref({
 		materialImg: ""
@@ -461,7 +455,7 @@
 		uni.navigateBack()
 	}
 	const form = reactive({
-		nuId: '',
+		nuId: uni.getStorageSync('nuId'),
 		pageNo: 1,
 		pageSize: 9,
 		categoryId: '',
@@ -474,7 +468,7 @@
 		canpull: true,
 	})
 	const mobanform = {
-		nuId: '',
+		nuId: uni.getStorageSync('nuId'),
 		pageNo: 1,
 		pageSize: 9,
 		categoryId: '',
@@ -493,8 +487,9 @@
 	const InvoicingList = ref([])
 	const queryInvo = () => {
 		queryCgdInfoList(form).then(res => {
+			console.log(res.result.records)
 			InvoicingList.value.push(...res.result.records);
-			clickmiddle(0);
+			clickmiddle(middletarget.value);
 		})
 	}
  
@@ -503,9 +498,22 @@
 		form.pageNo = 1;
 		InvoicingList.value = [];
 		middletarget.value = 0;
-		form.wlParamInfo = searchValue.value;
+		// form.wlParamInfo = searchValue.value;
-		form.cgdId = plsbuy.value[lefttarget.value].id
+		// form.cgdId = plsbuy.value[lefttarget.value].id
-		queryInvo();
+		// queryInvo();
+		
+		plzinfo.pageNo = 1;
+		plsbuy.value = [];
+		queryCgdList(plzinfo).then((res : any) => {
+			plsbuy.value.push(...res.result.records)
+			if (res.result.records.length) {
+				form.cgdId = plsbuy.value[0].id
+				queryInvo();
+			}
+			if (res.result.records.length < plzinfo.pageSize) {
+				plzinfo.canpull = false;
+			}
+		})
 	}
 	const moreindex = ref(-1);
 	const zuofeiindex = ref(-1);

unpackage/dist/dev/.nvue/pages/camera.js

@@ -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
 };

unpackage/dist/dev/.nvue/pages/fullcamera.js

@@ -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
 };