diff --git a/pages/NursingNew/component/pleasetake/component/requestform.vue b/pages/NursingNew/component/pleasetake/component/requestform.vue
index 46eac5b..9c1a990 100644
--- a/pages/NursingNew/component/pleasetake/component/requestform.vue
+++ b/pages/NursingNew/component/pleasetake/component/requestform.vue
@@ -130,7 +130,7 @@
-
diff --git a/pages/procurement/api/lunpan.js b/pages/procurement/api/lunpan.js
index 81c746d..289d18b 100644
--- a/pages/procurement/api/lunpan.js
+++ b/pages/procurement/api/lunpan.js
@@ -347,4 +347,11 @@ export const orderReturn = (params) => {
data: params,
})
}
-
+// 出库
+export const outbound = (params) => {
+ return request({
+ url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/qld/outbound`,
+ method: 'POST',
+ data: params,
+ })
+}
diff --git a/pages/procurement/outbound.vue b/pages/procurement/outbound.vue
index a2fe5bd..721a6ae 100644
--- a/pages/procurement/outbound.vue
+++ b/pages/procurement/outbound.vue
@@ -1,32 +1,1214 @@
-
-
- {{code==0?'请领出库':'退货入库'}}
-
+
+
+
+
+
+
+ 检索
+
+
+
+
+ 重置
+
+
+
+
+
+
+
+
+ 批量选择
+
+
+
+
+
+ 回退
+
+
+
+
+
+ 返回
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 耗材用品
+
+
+ 支架
+
+
+
+
+ {{ item.materialInfo.materialName }}
+
+
+ 规格型号
+
+
+ {{ item.materialInfo.materialNo }}
+
+
+
+
+ {{ item.qlNum }}
+
+
+ 请领数量
+
+
+
+
+
+ {{ item.materialInfo.materialUnits }}
+
+
+ 请领单位
+
+
+
+
+
+
+
+
+
+
+
+
+ 取消
+
+
+ 出库
+
+
+
+
-
-
+ .right-container-tem {
+ display: flex;
+
+ .right-container-tem-text {
+ font-size: 30rpx;
+ margin-right: 20rpx;
+ }
+
+
+ .right-container-tem-img {
+ width: 38rpx;
+ height: 38rpx;
+ }
+ }
+
+ .buttons-father {
+ width: 100%;
+ height: 7.5vh;
+ // transition: opacity 1s ease;
+ display: flex;
+ position: relative;
+ // background-color: rgb(239, 240, 244);
+ // padding-top: 5vh;
+
+ .ipt {
+ display: flex;
+ align-items: center;
+ width: 20vw;
+ background: #E2E4E9;
+ border-radius: 1.65vw;
+ height: 3.3vw;
+
+ image {
+ width: 2.2vw;
+ height: 2.2vw;
+ margin: 0 0.5vw;
+ }
+
+ input {
+ width: 18vw;
+ height: 3.5vw;
+ font-size: 1.4vw;
+ padding-left: 1.6vw;
+
+ }
+ }
+
+ .scr {
+ border-radius: 1.65vw;
+ font-weight: 400;
+ font-size: 1.4vw;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ margin: 0 0 0 0.7vw;
+ background-color: #fff;
+ border: 1px solid #D9DADC;
+ color: #555555;
+ width: 6.5vw;
+ height: 3.3vw;
+ }
+
+ .shx {
+ width: 6.5vw;
+ height: 3.3vw;
+ background-color: #fff;
+ border-radius: 1.65vw;
+ border: 1px solid #D9DADC;
+ font-weight: 400;
+ font-size: 1.4vw;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ margin: 0 0 0 0.5vw;
+ color: #555555;
+
+ image {
+ width: 1.5vw;
+ height: 1.5vw;
+ margin: 0 0.2vw 0 0;
+ }
+
+
+ }
+
+ .right-button {
+ width: 7vw;
+ height: 3.3vw;
+ background-color: #fff;
+ border-radius: 1.65vw;
+ border: 1px solid #D9DADC;
+ font-weight: 400;
+ font-size: 1.4vw;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ color: #555555;
+
+ image {
+ width: 1.5vw;
+ height: 1.5vw;
+ margin: 0.1vw 0.2vw 0 0;
+ }
+ }
+
+ .right-button-white {
+ width: 10vw;
+ height: 3.3vw;
+ background-color: #fff;
+ border-radius: 1.65vw;
+ border: 1px solid #D9DADC;
+ font-weight: 400;
+ font-size: 1.4vw;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ color: #555555;
+ margin-right: 15rpx;
+
+ image {
+ width: 1.5vw;
+ height: 1.5vw;
+ margin: 0.1vw 0.2vw 0 0;
+ }
+ }
+
+ .right-button-blue {
+ width: 10vw;
+ height: 3.3vw;
+ background-color: #fff;
+ border-radius: 1.65vw;
+ border: 1px solid #1083F8;
+ font-weight: 400;
+ font-size: 1.4vw;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ color: #1083F8;
+ margin-right: 15rpx;
+
+ image {
+ width: 1.5vw;
+ height: 1.5vw;
+ margin: 0.1vw 0.2vw 0 0;
+ }
+ }
+
+ .right-button:active,
+ .scr:active,
+ .shx:active {
+ color: #1083F8;
+ background: linear-gradient(-45deg, rgba(223, 244, 252, 1), rgba(204, 228, 249, 0.43));
+ border: 1rpx solid #1083F8;
+ transition: .4s;
+ -webkit-transform-style: preserve-3d;
+ -webkit-overflow-scrolling: touch;
+ }
+ }
+
+ .other-contain {
+ width: 100%;
+ height: 87vh;
+ display: flex;
+ // background-color: rgb(239, 240, 244);
+ // transition: opacity 1s ease;
+
+ .other-contain-left {
+ width: 32%;
+ height: 100%;
+
+ .left-menu-scroll {
+ margin-top: 3%;
+ height: 91%;
+ width: 100%;
+ // position: relative;
+ // overflow: auto;
+
+ // background-color: red;
+ .pls-card {
+ width: 98%;
+ height: 25.3vh;
+ border: #0f9fff 3rpx solid;
+ background-color: #fff;
+ border-radius: 40rpx;
+ margin-bottom: 1.5vh;
+ // margin: 1vh 0;
+ padding: 0 30rpx;
+ position: relative;
+
+ .pls-card-title {
+ height: 5.5vh;
+ width: 105%;
+ display: flex;
+ justify-content: space-between;
+ align-items: flex-end;
+
+ padding-left: 10rpx;
+ padding-right: 35rpx;
+
+ .middle-title-spec {
+ color: #888888;
+ font-size: 29rpx;
+ }
+
+ .title-left {
+ font-weight: 600;
+ font-size: 34rpx;
+ // color: #888888;
+ }
+
+ .title-right {
+ display: flex;
+ align-items: flex-end;
+ font-size: 30rpx;
+ position: relative;
+
+ .title-right-big {
+ font-weight: 600;
+ font-size: 40rpx;
+ margin-right: 35rpx;
+ color: #555555;
+ }
+
+ .title-right-img {
+ position: absolute;
+ right: -10rpx;
+ bottom: 6rpx;
+ width: 40rpx;
+ height: 40rpx;
+ }
+ }
+ }
+
+ .pls-card-middle {
+ width: 100%;
+ height: 11vh;
+ margin-top: 1.5vh;
+ display: flex;
+ position: relative;
+
+ .middle-heng {
+ position: absolute;
+ left: 4%;
+ top: 35%;
+ transform: translateY(-35%);
+ width: 92%;
+ height: 2px;
+ /* 虚线粗细 */
+ background-image: repeating-linear-gradient(to right,
+ #E5E5E5 0,
+ #E5E5E5 6px,
+ transparent 6px,
+ transparent 10px);
+ }
+
+ .pls-card-middle-one {
+ width: 33.3%;
+ height: 100%;
+
+ // background-color: yellow;
+ .middle-title {
+ width: 100%;
+ height: 2.1vh;
+ // background-color: #007CFF;
+ color: #888888;
+ text-align: center;
+ font-size: 25rpx;
+ overflow: hidden;
+ }
+
+ .middle-heng-father {
+ width: 100%;
+ height: 4vh;
+ position: relative;
+
+ .middle-ball-img {
+ width: 35rpx;
+ height: 35rpx;
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ transform: translate(-50%, -50%);
+ }
+
+ .middle-ball {
+ width: 20rpx;
+ height: 20rpx;
+ background-color: #1083F8;
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ transform: translate(-50%, -50%);
+ border-radius: 50%;
+ }
+ }
+
+ .end-font {
+ width: 100%;
+ height: 6vh;
+ text-align: center;
+ color: #666666;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ }
+ }
+ }
+
+ .pls-card-end {
+ width: 100%;
+ height: 6vh;
+ display: flex;
+ justify-content: space-between;
+ position: relative;
+ padding-left: 15rpx;
+ margin-top: 10rpx;
+
+ .end-left {
+ height: 100%;
+ display: flex;
+ align-items: center;
+
+ .end-left-img {
+ width: 35rpx;
+ height: 35rpx;
+ }
+
+ .end-left-font {
+ margin-top: 3rpx;
+ width: 400rpx;
+ // background-color: #007CFF;
+ // font-size: 26rpx;
+ color: #666666;
+ margin-left: 3rpx;
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ }
+ }
+
+ .tag-fail {
+ width: 120rpx;
+ height: 50rpx;
+ border-radius: 30rpx;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ background-color: #FDEBEC;
+ color: #FF5757;
+ border: 1rpx solid #FF5757;
+ position: absolute;
+ right: 0rpx;
+ bottom: 20rpx;
+ }
+
+ .tag-success {
+ width: 120rpx;
+ height: 50rpx;
+ border-radius: 30rpx;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ background-color: #ECF6FF;
+ color: #1083F8;
+ border: 1rpx solid #1083F8;
+ position: absolute;
+ right: 0rpx;
+ bottom: 20rpx;
+ }
+ }
+ }
+ }
+
+ .left-selecttype {
+ width: 98%;
+ height: 80rpx;
+ border-radius: 40rpx;
+ background-color: #FFFFFF;
+ display: flex;
+ padding-right: 30rpx;
+ padding-left: 15rpx;
+ position: relative;
+
+
+ .heng-blue {
+ position: absolute;
+ bottom: 0;
+ left: 50%;
+ transform: translateX(-50%);
+ width: 25rpx;
+ height: 8rpx;
+ border-radius: 10rpx;
+ background-color: #1083F8;
+ transition: 0.3s all ease;
+
+ }
+
+ .selecttype {
+ width: 25%;
+ height: 100%;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ color: #999999;
+ font-size: 31rpx;
+ position: relative;
+
+ }
+
+ .selecttype-target {
+ width: 25%;
+ height: 100%;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ color: #222222;
+ font-size: 31rpx;
+ font-weight: 600;
+ position: relative;
+ }
+ }
+ }
+
+ .other-contain-right {
+ width: 65%;
+ margin-left: 1%;
+ height: 98%;
+ background-color: #fff;
+ border-radius: 40rpx;
+ position: relative;
+
+ .right-contain {
+ width: 100%;
+ height: 95%;
+ margin-top: 20rpx;
+ display: flex;
+ flex-wrap: wrap;
+ position: relative;
+
+
+ .right-ones {
+ display: flex;
+ width: 100%;
+ flex-wrap: wrap;
+ padding-left: 20rpx;
+ padding-bottom: 80rpx;
+
+
+ .right-one {
+ width: 630rpx;
+ height: 270rpx;
+ margin-left: 20rpx;
+ margin-top: 15rpx;
+ background-color: #F9F9F9;
+ border-radius: 30rpx;
+ display: flex;
+
+ .right-one-left {
+ height: 100%;
+ width: 40%;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+
+ .left-image {
+ width: 150rpx;
+ height: 150rpx;
+ // margin: 15rpx 0;
+ margin-top: 10rpx;
+ margin-bottom: 15rpx;
+ // margin-top: 5rpx;
+ }
+
+ .left-tages {
+ width: 130rpx;
+ height: 43rpx;
+ border-radius: 30rpx;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ color: #555555;
+ border: 1rpx solid #D2D2D2;
+ margin-top: 5rpx;
+ font-size: 23rpx;
+ }
+ }
+
+ .right-one-right {
+ height: 100%;
+ width: 60%;
+
+ .right-title {
+ font-size: 34rpx;
+ font-weight: 600;
+ margin-top: 25rpx;
+ color: #222222;
+ width: 300rpx;
+ overflow: hidden;
+ /* 必须 */
+ white-space: nowrap;
+ /* 强制单行 */
+ text-overflow: ellipsis;
+ /* 显示省略号 */
+ }
+
+ .right-setting {
+ color: #888888;
+ margin-top: 5rpx;
+ font-size: 25rpx;
+ }
+
+ .right-mm {
+ color: #555555;
+ font-size: 28rpx;
+ }
+
+ .right-down {
+ display: flex;
+ margin-top: 15rpx;
+
+ .right-first-num {
+ font-size: 35rpx;
+ color: #555555;
+ font-weight: 600;
+ }
+
+ .right-first-type {
+ color: #888888;
+ font-size: 23rpx;
+ }
+
+ .right-shu {
+ width: 2rpx;
+ height: 50rpx;
+ background-color: #C9C9C9;
+ margin: 0 40rpx;
+ margin-top: 10rpx;
+ }
+ }
+ }
+ }
+ }
+
+ }
+ }
+ }
+
+ .bottom-buttons {
+ position: absolute;
+ bottom: 0;
+ left: 0;
+ width: 100%;
+ height: 10%;
+ display: flex;
+ justify-content: flex-end;
+ align-items: center;
+ background-color: #fff;
+ border-radius: 40rpx;
+ }
+
+ .button-gray {
+ background-color: #f8f8f8;
+ color: #555555;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ color: #555555;
+ width: 180rpx;
+ height: 70rpx;
+ border-radius: 40rpx;
+ margin-right: 30rpx;
+ }
+
+ .button-blue {
+ background: linear-gradient(-45deg, rgba(223, 244, 252, 1), rgba(204, 228, 249, 0.43));
+ border: 1rpx solid #1083F8;
+ color: #1083F8;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ width: 180rpx;
+ height: 70rpx;
+ border-radius: 40rpx;
+ margin-right: 60rpx;
+ }
+
+ .button-gray:active {
+ color: #1083F8;
+ background: linear-gradient(-45deg, rgba(223, 244, 252, 1), rgba(204, 228, 249, 0.43));
+ border: 1rpx solid #1083F8;
+ transition: .4s;
+ -webkit-transform-style: preserve-3d;
+ -webkit-overflow-scrolling: touch;
+ }
+
+ .right-buttons {
+ position: absolute;
+ right: 1.8vw;
+ top: 0;
+ display: flex;
+
+ .contain-right-button {
+ width: 7.3vw;
+ height: 3.3vw;
+ background: #FFFFFF;
+ border-radius: 1.65vw;
+ border: 1px solid #D9DADC;
+ font-weight: 400;
+ font-size: 1.4vw;
+ color: #222;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ margin: 0 0 0 0.7vw;
+ color: #555555;
+
+ image {
+ width: 1.5vw;
+ height: 1.5vw;
+ margin: 0 0.2vw 0 0;
+ }
+ }
+ }
+
+ .zhedang {
+ position: fixed;
+ width: 50%;
+ right: 0;
+ top: 0;
+ height: 500rpx;
+ background-color: #fff;
+ }
+
\ No newline at end of file
diff --git a/static/index/warehouse/procurement/picking/huitui.png b/static/index/warehouse/procurement/picking/huitui.png
new file mode 100644
index 0000000..b51d25b
Binary files /dev/null and b/static/index/warehouse/procurement/picking/huitui.png differ
diff --git a/static/index/warehouse/procurement/picking/piliang.png b/static/index/warehouse/procurement/picking/piliang.png
new file mode 100644
index 0000000..9a23835
Binary files /dev/null and b/static/index/warehouse/procurement/picking/piliang.png differ
diff --git a/static/index/warehouse/procurement/picking/piliangtarget.png b/static/index/warehouse/procurement/picking/piliangtarget.png
new file mode 100644
index 0000000..4df0df3
Binary files /dev/null and b/static/index/warehouse/procurement/picking/piliangtarget.png differ