diff --git a/manifest.json b/manifest.json
index 00c8ba7..d31377f 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name" : "护理单元",
"appid" : "__UNI__FB2D473",
"description" : "护理单元",
- "versionName" : "1.7.2",
- "versionCode" : 172,
+ "versionName" : "1.7.3",
+ "versionCode" : 173,
"transformPx" : false,
/* 5+App特有相关 */
"app-plus" : {
diff --git a/pages/Warehouse/Warehouse.vue b/pages/Warehouse/Warehouse.vue
index 40854ca..7525ea8 100644
--- a/pages/Warehouse/Warehouse.vue
+++ b/pages/Warehouse/Warehouse.vue
@@ -62,6 +62,21 @@
const housactive = (index : number) => {
if (index > 5) { return }
+ if(housedex.value == index){
+ if (housedex.value == 1) {
+ navurl.value = 'pages/Warehouse/procurement'
+ uni.navigateTo({
+ url: '/' + navurl.value
+ })
+ }
+ if (housedex.value == 2) {
+ navurl.value = 'pages/Warehouse/purchaseorder'
+ uni.navigateTo({
+ url: '/' + navurl.value
+ })
+ }
+ return
+ }
housedex.value = index;
console.log("index", index)
// 只有中心的四个有动画.....所以点不到监控室
diff --git a/pages/Warehouse/procurecart.vue b/pages/Warehouse/procurecart.vue
index c93dff2..274d5d7 100644
--- a/pages/Warehouse/procurecart.vue
+++ b/pages/Warehouse/procurecart.vue
@@ -32,8 +32,8 @@
-
-
+
+
@@ -50,7 +50,7 @@
+ @scrolltolower="scrolltolower" :lower-threshold="400" @scroll="scrollview">
@@ -73,8 +73,8 @@
-
-
+
+
@@ -137,10 +137,10 @@
-
- 全部
+ {{v+'级分类'}}
+
-
{{v.name}}
@@ -487,9 +486,10 @@
res.result.records.forEach((item,i)=>{
item.flag = true
})
- console.log(res.result.records)
+ console.log(res.result)
InvoicingList.value.push(...res.result.records);
- status.value = res.result.total == InvoicingList.value.length ? 'nomore' : 'loadmore';
+ status.value = (res.result.total == InvoicingList.value.length ? 'nomore' : 'loadmore');
+
panduan();
})
}
@@ -611,11 +611,11 @@
return
}
InvoicingList.value[shopitem.value].flag = !InvoicingList.value[shopitem.value].flag;
- panduan();
setTimeout(()=>{
- anmidex.value = -1;
tmr.value = true;
- },1000)
+ panduan();
+ anmidex.value = -1;
+ },800)
break;
case 1:
let arr = [];
@@ -683,6 +683,7 @@
uni.navigateTo({
url:'/pages/Warehouse/purchaseorder'
})
+ tmr.value = true;
anmidex.value = -1;
break;
// case 1:
@@ -762,10 +763,7 @@
})
}
const panduan =()=>{
- animArray.value[0].name =InvoicingList.value[shopitem.value].flag? '取消':'选择'
- }
- const animArray = ref([
- {
+ let xz = {
url: genPaths(
'/static/index/warehouse/procurement/select',
'select',
@@ -775,7 +773,33 @@
false // 不补零
),
name: '选择',
- imgurl: '/static/index/warehouse/procurement/select/select1.png'
+ }
+
+ let qx = {
+ url: genPaths(
+ '/static/index/warehouse/procurement/scrap',
+ 'scrap',
+ 5, // 张数
+ 'png',
+ 0, // 起始索引为 1
+ false // 不补零
+ ),
+ name: '取消',
+ }
+ animArray.value[0] = InvoicingList.value[shopitem.value].flag? qx:xz;
+ // animArray.value[0].name = InvoicingList.value[shopitem.value].flag? '取消':'选择'
+ }
+ const animArray = ref([
+ {
+ url: genPaths(
+ '/static/index/warehouse/procurement/scrap',
+ 'scrap',
+ 5, // 张数
+ 'png',
+ 0, // 起始索引为 1
+ false // 不补零
+ ),
+ name: '取消',
},
{
url: genPaths(
@@ -787,7 +811,6 @@
false // 不补零
),
name: '采 购',
- imgurl: '/static/index/warehouse/procurement/procure/procure01.png'
},
{
url: genPaths(
@@ -799,7 +822,6 @@
false // 不补零
),
name: '物料详情',
- imgurl: '/static/index/warehouse/procurement/details/details01.png'
},
{
url: genPaths(
@@ -811,7 +833,6 @@
false // 不补零
),
name: '删除',
- imgurl: '/static/index/warehouse/procurement/del/del1.png'
},
{
url: genPaths(
@@ -835,7 +856,6 @@
false // 不补零
),
name: '采购单',
- imgurl: '/static/index/warehouse/procurement/Purchase/Purchase01.png'
},
])
@@ -1255,11 +1275,11 @@
width: 100%;
height: 9vw;
display: flex;
- justify-content: flex-start;
+ justify-content: space-between;
flex-wrap: wrap;
-
+
>view {
- width: 7.8vw;
+ width: 7.4vw;
height: 3.7vw;
display: flex;
justify-content: center;
@@ -1280,7 +1300,7 @@
}
.donghua {
- margin: 0;
+ margin: 0 0.1vw;
}
}
@@ -1293,11 +1313,11 @@
.typeitem {
width: 100%;
- height: 38vh;
+ height: 40vh;
.scroltype {
width: 100%;
- height: calc(34vh - 2vw);
+ height: calc(36vh);
display: flex;
justify-content: space-around;
.scrl1{
@@ -1314,8 +1334,8 @@
}
}
.scroll-Y {
- height: calc(38vh - 2vw);
-
+ height: calc(35vh - 2vh);
+ margin-top: 0.5vw;
view {
height: 3.8vw;
background: rgba(255, 255, 255, .5);
@@ -1366,8 +1386,6 @@
display: flex;
justify-content: center;
align-items: center;
- background: rgba(255, 255, 255, .5);
- border:1px solid rgba(255, 255, 255, .5);
font-weight: 400;
font-size: 1.2vw;
color: #333333;
@@ -1661,8 +1679,9 @@
}
.yujing {
- border: 2px solid rgba(255, 102, 107, 0.51) !important;
- box-shadow: 0 0 8px rgba(255, 102, 107, 0.051) inset;
+ border: 1px solid rgba(250, 177, 181, 0.5) !important;
+ box-shadow: 5px 2px 8px rgba(250, 177, 181, 1);
+
view {
.num {
diff --git a/pages/Warehouse/procurement.vue b/pages/Warehouse/procurement.vue
index 39468f8..4276978 100644
--- a/pages/Warehouse/procurement.vue
+++ b/pages/Warehouse/procurement.vue
@@ -55,10 +55,11 @@
{{v.materialName}}
- 采购单位： {{v.materialUnits}}
+ 物料编码： {{v.materialNo}}
规格型号: {{v.specificationModel}}
+ 采购单位： {{v.materialUnits}}
-
+
-
-
+
+
@@ -122,10 +123,10 @@
-
- 全部
+ {{v+'级分类'}}
+
- {{wuliaoobj.materialName}}
+ {{wuliaoobj?.materialName}}
- 全部
+ {{v+'级分类'}}
+
{
@@ -519,7 +520,6 @@
const getqueryCgdList = () => {
if (!plzinfo.canpull) return
queryCgdList(plzinfo).then((res : any) => {
- console.log("请购单", res.result.records)
plsbuy.value.push(...res.result.records)
if (res.result.records.length < plzinfo.pageSize) {
plzinfo.canpull = false;
@@ -546,17 +546,13 @@
}
const cell = () => {
queryNuInfoByNuId(form).then(res => {
- console.log("ceshi", form, cellobj.value)
cellobj.value = res.result;
shyp.value = res.result.status == 5 ? false : true
})
}
const getMaterial = () => {
getCgdMaterialTreeData(form).then(res => {
- // console.log(form)
- // console.log(res)
TreeData.value = res.result;
- console.log("TreeData.value", TreeData.value)
})
}
const setout = ref(true)
@@ -1523,18 +1519,18 @@
.typeitem {
width: 100%;
- height: 54vh;
+ height: 56vh;
.scroltype {
width: 100%;
- height: calc(58vh);
+ height: calc(56vh);
display: flex;
justify-content: space-around;
.scroll-Y {
width: 8.5vw;
- height: calc(58vh);
-
+ height: calc(55vh - 2vh);
+ margin-top: 0.5vw;
view {
width: 100%;
height: 3.8vw;
@@ -1588,8 +1584,6 @@
display: flex;
justify-content: center;
align-items: center;
- background: rgba(255, 255, 255, .5);
- border: 1px solid rgba(255, 255, 255, .5);
font-weight: 400;
font-size: 1.2vw;
color: #333333;
diff --git a/static/index/warehouse/procurement/scrap/scrap0.png b/static/index/warehouse/procurement/scrap/scrap0.png
new file mode 100644
index 0000000..8b19744
Binary files /dev/null and b/static/index/warehouse/procurement/scrap/scrap0.png differ
diff --git a/static/index/warehouse/procurement/scrap/scrap1.png b/static/index/warehouse/procurement/scrap/scrap1.png
new file mode 100644
index 0000000..5d3d216
Binary files /dev/null and b/static/index/warehouse/procurement/scrap/scrap1.png differ
diff --git a/static/index/warehouse/procurement/scrap/scrap2.png b/static/index/warehouse/procurement/scrap/scrap2.png
new file mode 100644
index 0000000..4082c39
Binary files /dev/null and b/static/index/warehouse/procurement/scrap/scrap2.png differ
diff --git a/static/index/warehouse/procurement/scrap/scrap3.png b/static/index/warehouse/procurement/scrap/scrap3.png
new file mode 100644
index 0000000..d392357
Binary files /dev/null and b/static/index/warehouse/procurement/scrap/scrap3.png differ
diff --git a/static/index/warehouse/procurement/scrap/scrap4.png b/static/index/warehouse/procurement/scrap/scrap4.png
new file mode 100644
index 0000000..9b1b7b2
Binary files /dev/null and b/static/index/warehouse/procurement/scrap/scrap4.png differ
diff --git a/static/index/warehouse/procurement/select/qxxz0.png b/static/index/warehouse/procurement/select/qxxz0.png
new file mode 100644
index 0000000..95b8dfc
Binary files /dev/null and b/static/index/warehouse/procurement/select/qxxz0.png differ