diff --git a/manifest.json b/manifest.json index 386341a..245210b 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "护理单元", "appid" : "__UNI__FB2D473", "description" : "护理单元", - "versionName" : "1.6.8", - "versionCode" : 168, + "versionName" : "1.6.9", + "versionCode" : 169, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { diff --git a/pages/Warehouse/api/lunpan.js b/pages/Warehouse/api/lunpan.js index 088ff99..0a32af7 100644 --- a/pages/Warehouse/api/lunpan.js +++ b/pages/Warehouse/api/lunpan.js @@ -58,3 +58,39 @@ export const queryWlInfoByWlId = (params) => { data: params, }) } +export const addShoppingCartList = (params) => { + return request({ + url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/addShoppingCartList`, + method: 'post', + data: params, + }) +} +export const queryShoppingCartList = (params) => { + return request({ + url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/queryShoppingCartList`, + method: 'get', + data: params, + }) +} +export const generatedPurchaseOrder = (params) => { + return request({ + url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/generatedPurchaseOrder`, + method: 'post', + data: params, + }) +} +export const generatedPurchaseViewOrder = (params) => { + return request({ + url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/generatedPurchaseViewOrder`, + method: 'post', + data: params, + }) +} +export const deleteQgInfoById = (params) => { + return request({ + url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/deleteQgInfoById`, + method: 'DELETE', + data: params, + }) +} + diff --git a/pages/Warehouse/procurecart.vue b/pages/Warehouse/procurecart.vue index 2eafff2..075ca2b 100644 --- a/pages/Warehouse/procurecart.vue +++ b/pages/Warehouse/procurecart.vue @@ -8,9 +8,9 @@ - {{v.materialName}} - 规格型号: {{v.specificationModel}} - 采购单位: {{v.materialUnits}} + {{v.wlName}} + 规格型号: {{v.wlSpecificationModel}} + 采购单位: {{v.wlUnits}} - {{v.materialName}} - 规格型号: {{v.specificationModel}} - 采购单位: {{v.materialUnits}} + {{v.wlName}} + 规格型号: {{v.wlSpecificationModel}} + 采购单位: {{v.wlUnits}} 库存数量: {{v.kcsl}} @@ -72,10 +72,10 @@ - 采购数量:50 - 供应商:长春市天林商贸有限公司 + 采购数量:{{v.purchaseQuantity}} + 供应商:{{v.suppliersName}} - + @@ -161,9 +161,8 @@ - + class="donghua" /> @@ -186,77 +185,81 @@ - 纸尿裤-拉拉裤纸尿裤-拉拉裤纸尿裤-拉拉裤纸尿裤-拉拉裤 + {{wuliaoobj.materialName}} - + - 生活用品 - 照护用品 + {{wuliaoobj.categoryName}} + {{wuliaoobj.typeName}} + {{wuliaoobj.medicationName}} - 物料编码: ZHYP044 + 物料编码: {{ wuliaoobj.materialNo }} - 规格型号: XL800mm*690mm + 规格型号: {{ wuliaoobj.specificationModel }} - 物料小类: ZHYP044 + 物料小类: {{wuliaoobj.tagName}} - 物料单位: 片 + 物料单位: {{wuliaoobj.materialUnits}} - 医保报销: 是 + 医保报销: {{ wuliaoobj.izYbbxName }} - 机构优惠: 否 + 机构优惠: {{ wuliaoobj.izJgyhName }} - 853 + {{ wuliaoobj.kcsl }} 库存数量 - 4000 + {{ wuliaoobj.upperLimit }} 物料上限 - 4000 + {{ wuliaoobj.lowerLimit }} 物料下限 + 采购单 - - 供应商:长春市天林商贸有限公司 + + 供应商:{{v.suppliersName}} - 采购单号:A0120251010001 + 采购单号:{{v.cgdNo}} 采购人:梁嘉豪 采购金额:1356.82 - - {{v.materialName}} - 规格型号: {{v.specificationModel}} - 采购单位: {{v.materialUnits}} - 库存数量: {{v.kcsl}} + + {{f.materialName}} + 规格型号: {{f.specificationModel}} + 采购单位: {{f.materialUnits}} + 库存数量: {{f.kcsl}} - + + v-if="f.tagType==1"> + v-if="f.tagType==2"> - {{v.tagName}} + v-if="f.tagType>2"> + {{f.tagName}} @@ -279,7 +282,7 @@ @@ -827,13 +860,13 @@ bottom: 11vw; right: 1.5vw; z-index: 103; - padding: 4vw 2.2vw 2vw; + padding: 2vw 2.2vw 2vw; .dibu { width: 100%; display: flex; justify-content: space-between; - margin: 2vw auto 0; + margin: 3vw auto 0; view { width: 4vw; @@ -1260,11 +1293,11 @@ margin: 0 1.3vw 1.2vw 0; border: 2px dashed #fff; display: inline-block; - padding:1.5vw 2.3vw 2.3vw; + padding:1vw 2.3vw 2.3vw; position: relative; .dbgys{ width: 100%; - height: 4.3vw; + height: 5.3vw; position: absolute; left: 0; bottom: 0vw; @@ -1272,8 +1305,9 @@ border-radius:0 0 1.6vw 1.6vw; border: 2px solid rgba(239, 240, 244, 1); display: flex; - padding: 0.6vw 1.5vw; + padding: 0.4vw 1.5vw 0; justify-content: space-between; + align-items: center; .act{ background: rgba(231, 240, 251, 1) !important; border: 1px solid rgba(0, 118, 214, 1) !important; @@ -1300,6 +1334,7 @@ font-weight: 400; font-size: 1vw; color: #888888; + width: 14vw; text{ font-weight: bold; font-size: 1.4vw; @@ -1362,7 +1397,7 @@ height: 7vw; position: absolute; right: 1vw; - bottom: 4.3vw; + bottom: 5.3vw; image { width: 100%; diff --git a/pages/Warehouse/procurement.vue b/pages/Warehouse/procurement.vue index 407050d..7a44054 100644 --- a/pages/Warehouse/procurement.vue +++ b/pages/Warehouse/procurement.vue @@ -153,10 +153,8 @@ - - - + + @@ -182,26 +180,34 @@ 供应商 - 选择 + 选择 - - 请选择供应商 + + {{gysarr[gysidnum]?.name}} 采购数量 - + - - 1500 + {{caigouobj.Limitnum}} - + + + + + + {{v.name}} + + + + - + @@ -211,42 +217,42 @@ - 纸尿裤-拉拉裤纸尿裤-拉拉裤拉拉裤拉拉裤拉拉裤拉拉裤 + {{caigouobj.materialName}} - 物料编码: ZHYP044 - 物料小类: ZHYP044 + 物料编码: {{caigouobj.materialNo}} + 物料小类: {{caigouobj.tagName}} - 规格型号: XL800mm*690mm - 物料单位: 片 + 规格型号: {{ caigouobj.specificationModel }} + 物料单位: {{ caigouobj.materialUnits}} - 医保报销: 是 - 机构优惠: 否 + 医保报销: {{ caigouobj.izYbbxName }} + 机构优惠: {{ caigouobj.izJgyhName }} - 生活用品 - 照护用品 + {{caigouobj.categoryId_dictText}} + {{caigouobj.typeId_dictText}} - 853 + {{caigouobj.kcsl}} 库存数量 - 4000 + {{caigouobj.upperLimit}} 物料上限 - 4000 + {{caigouobj.lowerLimit}} 物料下限 @@ -255,25 +261,25 @@ 供应商: - 长春市天林商贸有限公司 + {{gysarr[gysidnum]?.name}} 采购数量 - + - - 1500 + {{caigouobj.Limitnum}} - + + - 确定 + 确定 - 采购数量:1500 + 采购数量: {{caigouobj.Limitnum}} @@ -324,43 +330,46 @@ - 纸尿裤-拉拉裤纸尿裤-拉拉裤纸尿裤-拉拉裤纸尿裤-拉拉裤 + {{wuliaoobj.materialName}} - + - 生活用品 - 照护用品 + {{wuliaoobj.categoryName}} + {{wuliaoobj.typeName}} + {{wuliaoobj.medicationName}} - 物料编码: ZHYP044 + 物料编码: {{ wuliaoobj.materialNo }} - 规格型号: XL800mm*690mm + 规格型号: {{ wuliaoobj.specificationModel }} - 物料小类: ZHYP044 + 物料小类: {{wuliaoobj.tagName}} - 物料单位: 片 + 物料单位: {{wuliaoobj.materialUnits}} - 医保报销: 是 + 医保报销: {{ wuliaoobj.izYbbxName }} - 机构优惠: 否 + 机构优惠: {{ wuliaoobj.izJgyhName }} - 853 + {{ wuliaoobj.kcsl }} 库存数量 - 4000 + {{ wuliaoobj.upperLimit }} 物料上限 - 4000 + {{ wuliaoobj.lowerLimit }} 物料下限 @@ -370,7 +379,7 @@