From d7fe8ae3888c8e2b1eea3c1e3769be0d42a21cc9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 16 十月 2023 09:03:47 +0800
Subject: [PATCH] Merge branch '1.0.3' of http://139.186.142.91:10010/r/productDev/dmMes into 1.0.3
---
minipro_standard/pages/OutOperation/OutOperation.vue | 625 +++++++++++++++++++++++++++++++++-----------------------
1 files changed, 364 insertions(+), 261 deletions(-)
diff --git a/minipro_standard/pages/OutOperation/OutOperation.vue b/minipro_standard/pages/OutOperation/OutOperation.vue
index e899d02..01809b9 100644
--- a/minipro_standard/pages/OutOperation/OutOperation.vue
+++ b/minipro_standard/pages/OutOperation/OutOperation.vue
@@ -2,10 +2,10 @@
<view>
<InOutInfo :info="info" />
<uni-collapse @change="change" @close="close" @open="open">
- <uni-collapse-item v-for="(item, index) in wtransferWarehouseList" :key="index">
+ <uni-collapse-item :open="item1.wtransferDetailList.length" v-if="type==7" v-for="(item1, index) in warehouseList" :key="index">
<view class="p30 cY" style="border-bottom: 4rpx solid #f7f7f7;" slot="title">
<image src="../../static/chuku_ic_cangku@2x.png" class="img36 mr10" mode=""></image>
- <view>{{ item.warehouseName }}</view>
+ <view>{{ item1.warehouseName }}</view>
</view>
<view class="p30">
<div class="page_dck">
@@ -14,12 +14,12 @@
<span>寰呭嚭搴撶墿鏂�</span>
</div>
</div>
- <div class="page_content" v-for="(item, index) in info.woutboundDetailsWait" :key="index"
+ <div class="page_content" v-for="(item, index) in item1.wtransferDetailList" :key="index"
:name="index">
<div class="page_content_title">
<div class="page_content_title_top">
- <span v-if="item.batch">{{ item.materialName + ' | ' + item.materialCode }}</span>
- <span v-else>{{ item.materialName + ' | ' + item.materialCode }}</span>
+ <span>{{ item.materialName + ' | ' + item.materialCode }}</span>
+ <span>寰呭嚭<span>{{ item.outPlannum }}</span> {{ item.unitName }}</span>
</div>
<div class="page_content_title_bottom">
<span class="green" v-if="item.qualityType === 0">鍚堟牸 <span
@@ -33,123 +33,121 @@
<span>{{item.batch ? item.batch : '-'}}</span>
</div>
</div>
- <div class="page_content_list">
+ <div class="page_content_list" v-for="(childer, idxs) in item.wstockExtListVOList" :key="idxs">
<div class="page_content_list_item">
<div class="page_content_list_item_label">鍑哄簱璐т綅锛�</div>
- <div class="page_content_list_item_nr">
- {{item.locationName ? item.locationName : '-'}}
- </div>
+ <div class="page_content_list_item_nr">{{ childer.locationName }}</div>
</div>
<div class="page_content_list_items">
<div class="page_content_list_item_label">鏁伴噺锛�</div>
- <div class="page_content_list_item_nr">{{item.num ? item.num : '-'}}{{item.unitName}}
- </div>
+ <div class="page_content_list_item_nr">{{ childer.num }}{{ childer.unitName }}</div>
+ </div>
+ <div class="page_content_list_item">
+ <div class="page_content_list_item_label">鎵规鍙凤細</div>
+ <div class="page_content_list_item_nr">{{ childer.batch ? childer.batch : '-' }}</div>
+ </div>
+ </div>
+ </div>
+ </view>
+ </uni-collapse-item>
+ <uni-collapse-item v-if="type==8">
+ <view class="p30 cY" style="border-bottom: 4rpx solid #f7f7f7;" slot="title">
+ <image src="../../static/chuku_ic_cangku@2x.png" class="img36 mr10" mode=""></image>
+ <view>{{ info.warehouseName }}</view>
+ </view>
+ <view class="p30">
+ <div class="page_dck">
+ <div class="page_dck_title">
+ <div class="page_dck_title_x"></div>
+ <span>寰呭嚭搴撶墿鏂�</span>
+ </div>
+ </div>
+ <div class="page_content" v-for="(item, index) in woutboundDetailsWait" :key="index" :name="index">
+ <div class="page_content_title">
+ <div class="page_content_title_top">
+ <span>{{ item.materialName + ' | ' + item.materialCode }}</span>
+ <span>寰呭嚭 <span>{{ item.num }}</span> {{ item.unitName }}</span>
+ </div>
+ <div class="page_content_title_bottom">
+ <span class="green" v-if="item.qualityType === 0">鍚堟牸 <span
+ class="black">/</span> </span>
+ <span class="warning" v-else-if="item.qualityType === 1">涓嶈壇 <span
+ class="black">/</span> </span>
+ <span class="error" v-else-if="item.qualityType === 2">鎶ュ簾 <span
+ class="black">/</span> </span>
+ <span v-else>- / </span>
+ <span>{{item.procedureName ? item.procedureName : '-'}} / </span>
+ <span>{{item.batch ? item.batch : '-'}}</span>
+ </div>
+ </div>
+ <div class="page_content_list" v-for="(items, ind) in item.wstockExtListVOList" :key="ind">
+ <div class="page_content_list_item">
+ <div class="page_content_list_item_label">鎵规鍙凤細</div>
+ <div class="page_content_list_item_nr">{{ items.batch ? items.batch : '-' }}</div>
+ </div>
+ <div class="page_content_list_items">
+ <div class="page_content_list_item_label">鏁伴噺锛�</div>
+ <div class="page_content_list_item_nr">{{ items.num }}{{ items.umodel.name }}</div>
+ </div>
+ <div class="page_content_list_item" v-if="items.lmodel">
+ <div class="page_content_list_item_label">鍑哄簱璐т綅锛�</div>
+ <div class="page_content_list_item_nr">{{ items.lmodel.unionName }}</div>
</div>
</div>
</div>
</view>
</uni-collapse-item>
</uni-collapse>
- <div class="page_h"></div>
+
+ <div class="page_h"></div>
<div class="page_yxwl">
<div class="page_yxwl_title">
<div class="left">
<div class="page_yxwl_title_x"></div>
<span>宸查�夋嫨鐗╂枡</span>
- </div>
-
+ </div>
+
<div class="right" v-if="isZKD" @click="openxz">
<image src="../../static/gongdan_ic_shoudong@2x.png" class="img36" mode=""></image><span>鎵嬪姩鍑哄簱</span>
- <!-- <img src="@/assets/icon/gongdan_ic_shoudong@2x.png" alt=""> -->
</div>
</div>
- <!-- 鍏ュ簱鍗曪紙鍗曚釜浠撳簱锛� -->
- <template
- v-if="route.query.type == 9 && info.woScanMaterialBeanList && info.woScanMaterialBeanList.length > 0">
- <div class="page_yxwl_list">
- <div class="page_yxwl_list_item" v-for="(item, index) in info.woScanMaterialBeanList" :key="index">
- <div class="page_yxwl_list_item_top">
- <!-- <div class="page_yxwl_list_item_top_left" v-if="item.batch">{{item.materialName}} | {{item.materialCode}}锝渰{item.batch}}</div>-->
- <div class="page_yxwl_list_item_top_left">{{item.materialName}} | {{item.materialCode}}
+ <div class="page_yxwl_list" v-if="outboundList.length > 0">
+ <div class="page_yxwl_list_item" v-for="(item, index) in outboundList" :key="index">
+ <div class="page_yxwl_list_item_top">
+ <div class="page_yxwl_list_item_top_left">{{ item.materialName }} | {{ item.materialCode }}
+ </div>
+
+ </div>
+ <div class="page_yxwl_list_item_sx">
+ <span class="green" v-if="item.qualityType == 0">鍚堟牸 <span>/</span></span>
+ <span class="yellow" v-else-if="item.qualityType == 1">涓嶈壇 <span>/</span></span>
+ <span class="red" v-else-if="item.qualityType == 2">鎶ュ簾 <span>/</span></span>
+ <span v-else>- / </span>
+ <span> {{ item.procedureName ? item.procedureName : '-' }} / </span>
+ <span> {{ item.batch ? item.batch : '-' }}</span>
+ </div>
+ <div class="page_yxwl_list_item_num">
+ <div class="item">
+ <div class="label">鍑哄簱璐т綅锛�</div>
+ <div class="nr">
+ <span>{{ item.locationName }}</span>
</div>
</div>
- <div class="page_yxwl_list_item_sx">
- <span class="green" v-if="item.qualityType === 0">鍚堟牸 <span>/</span> </span>
- <span class="warning" v-else-if="item.qualityType === 1">涓嶈壇 <span>/</span> </span>
- <span class="red" v-else-if="item.qualityType === 2">鎶ュ簾 <span>/</span> </span>
- <span>{{item.procedureName ? item.procedureName : '-'}} <span>/</span> </span>
- <span>{{item.batch ? item.batch : '-'}}</span>
+ <div class="item">
+ <div class="label">鏁伴噺锛�</div>
+ <div class="nr">
+ <!-- @input="changeNum(item)" -->
+ <input type="number" v-model="item.num" placeholder="璇疯緭鍏�">
+ <span>{{ item.unitName }}</span>
+ </div>
</div>
- <div class="page_yxwl_list_item_num">
- <div class="dis">
- <div class="item">
- <div class="label">鍑哄簱璐т綅锛�</div>
- <div class="nr">
- <span>{{item.locationName ? item.locationName : '-'}}</span>
- </div>
- </div>
- <div class="items">
- <div class="label">鏁伴噺锛�</div>
- <div class="nr">
- <input type="text" v-model="item.scanNum" placeholder="璇疯緭鍏�" />
- <span>{{item.unitName}}</span>
- </div>
- </div>
- </div>
- <div class="itemy" v-for="(item1, idx) in item.woutboundRedisCodeBeanList" :key="idx">
- <div class="label">宸ヨ{{item1.scanCode}}锛�</div>
- <div class="nr">{{item1.num}}{{item1.unitName}}</div>
- <div class="dele" @click="dele(item1)">
- <image src="../../static/chuku_ic_delete@2x.png" class="img36" mode=""></image>
- </div>
- </div>
+ <div class="dele" @click="dele(index)">
+ <!-- <img src="@/assets/icon/chuku_ic_delete@2x.png" alt="" /> -->
+ <image src="../../static/chuku_ic_delete@2x.png" class="img24" mode=""></image>
</div>
</div>
</div>
- </template>
- <!-- 杞簱鍗曪紙澶氫釜浠撳簱锛� -->
- <template v-else-if="route.query.type == 7 && seleMateriaList.length > 0">
- <!-- <template v-for="(item, index) in info.wtransferWarehouseList" :key="index"> -->
- <div class="page_yxwl_list">
- <div class="page_yxwl_list_item" v-for="(item1, idx) in seleMateriaList" :key="idx">
- <div class="page_yxwl_list_item_top">
- <!-- <div class="page_yxwl_list_item_top_left" v-if="item1.batch">{{item1.materialName}} | {{item1.materialCode}}锝渰{item1.batch}}</div>-->
- <div class="page_yxwl_list_item_top_left">{{item1.materialName}} | {{item1.materialCode}}
- </div>
- </div>
- <div class="page_yxwl_list_item_sx">
- <span class="green" v-if="item1.qualityType === 0">鍚堟牸 <span>/</span> </span>
- <span class="yellow" v-else-if="item1.qualityType === 1">涓嶈壇 <span>/</span> </span>
- <span class="red" v-else-if="item1.qualityType === 2">鎶ュ簾 <span>/</span> </span>
- <span>{{item1.procedureName ? item1.procedureName : '-'}} <span>/</span> </span>
- <span>{{item1.batch ? item1.batch : '-'}}</span>
- </div>
- <div class="page_yxwl_list_item_num">
- <div class="itemy">
- <div class="itemy_item">
- <div class="label">鍏ュ簱璐т綅锛�</div>
- <div class="nr">
- <span>{{item1.locationName}}</span>
- </div>
- </div>
- <div class="itemy_item">
- <div class="label">鏁伴噺锛�</div>
- <div class="nr">
- <!-- @input="inputNum(item1)" -->
- <input type="number" v-model="item1.outActnum" placeholder="璇疯緭鍏�" />
- <span>{{item1.unitName}}</span>
- </div>
- </div>
- <!-- @click="dele()" -->
- <div class="dele" @click="dele(idx)">
- <image src="../../static/chuku_ic_delete@2x.png" class="img36" mode=""></image>
- </div>
- </div>
- </div>
- </div>
- </div>
- <!-- </template> -->
- </template>
+ </div>
<div class="page_yxwl_kong" v-else>鏆傛棤鏁版嵁</div>
</div>
<div class="page_zw"></div>
@@ -158,58 +156,237 @@
<div class="page_footer_ck" @click="submit">
<span>纭鍑哄簱</span>
</div>
- </div>
- <SelectMultipleMaterial ref="selectMultipleMaterial" />
+ </div>
+ <SelectTraMultipleMaterial ref="selectTraMultipleMaterial" @selectes="selectMaterail" />
</view>
</template>
<script>
- import InOutInfo from '@/components/InOutInfo.vue'
- import SelectMultipleMaterial from '@/components/SelectMultipleMaterial.vue'
- import { QRCodeType } from '@/common/config.js'
+ import InOutInfo from '@/components/InOutInfo.vue'
+ import SelectTraMultipleMaterial from '@/components/SelectTraMultipleMaterial.vue'
+ import {
+ QRCodeType
+ } from '@/common/config.js'
+ import {
+ outScanAppliances,
+ wTransferForInOut,
+ wTransferForInOutUpload,
+ wOutBoundForInOut,
+ wOutBoundForUpload,
+ transferToOutNew
+ } from '@/util/api/ExWarehouse'
+ import {
+ getDB
+ } from '@/util/api/agencyAPI'
+ import {
+ logout
+ } from '../../util/api'
export default {
components: {
- InOutInfo,
- SelectMultipleMaterial
+ InOutInfo,
+ SelectTraMultipleMaterial
},
data() {
- return {
- type: '',
- isZKD: false,
+ return {
+ type: '',
+ id: '',
+ dbid: '',
+ isZKD: false,
show: false,
info: {
- outPlandate: '2022/02/14',
- originType: 1,
- wtransferRedisCodeBeanList: [],
- remark: 'Vue鏄墠绔紑鍙戜腑骞挎硾浣跨敤鐨勪竴涓狫avaScript妗嗘灦锛屽畠鍙互璁╂垜浠洿杞绘澗鍦扮鐞嗛〉闈㈢殑鐘舵�併�佹覆鏌撳拰浜や簰銆備絾鏄湪缂栧啓Vue搴旂敤鏃讹紝鏈夋椂浼氶亣鍒扳�淪yntaxError: Unexpected token鈥濇姤閿欙紝杩欎釜閿欒鎻愮ず鎰忓懗鐫�浠ｇ爜涓瓨鍦ㄨ娉曢敊璇紝JavaScript寮曟搸鏃犳硶瑙ｆ瀽锛屼粠鑰屽鑷寸▼搴忚繍琛屽け璐ャ�傛湰绡囨枃绔犲皢浠嬬粛甯歌寮曡捣鈥淪yntaxError: Unexpected token鈥濈殑鍘熷洜浠ュ強瑙ｅ喅鏂规硶銆�'
- },
+
+ },
+ warehouseId: '',
ids: [],
- wtransferWarehouseList: [{
- warehouseName: '娴嬭瘯搴�'
- }]
+ warehouseList: [{
+
+ }],
+ woutboundDetailsWait: [],
+ outboundList: []
};
- },
- onLoad(option) {
- this.type = option.type||'ZKD'
- this.isZKD = this.type==QRCodeType.ZKD
- // console.log(this.type, QRCodeType.ZKD, this.type==QRCodeType.ZKD);
+ },
+ onLoad(option) {
+ this.type = option.type
+ this.id = option.id
+ this.isZKD = this.type == QRCodeType.ZKD
+ this.dbid = option.dbid
+ if (option.dbid) {
+ this.getDBs(option.dbid)
+ } else {
+ this.getInfo()
+ }
},
methods: {
+ // 鍒ゆ柇鏄惁瀹屾垚
+ getDBs(dbid) {
+ getDB(dbid)
+ .then(res => {
+ let {
+ data
+ } = res
+ if (data.status == 1) {
+ // 宸插畬鎴�
+ } else {
+ this.getInfo()
+ }
+ })
+ .catch(err => {})
+ },
+ getInfo() {
+ let infoAction
+ let data = {
+ id: this.id
+ }
+ if (this.type == QRCodeType.CKD) {
+ infoAction = wOutBoundForInOut
+ data.wOutboundType = '0'
+ } else if (this.type == QRCodeType.ZKD) {
+ infoAction = wTransferForInOut
+ data.wTransferType = '0'
+ }
+ infoAction(data).then(res => {
+ if (this.isZKD) {
+ this.info = res.data.wtransfer
+ this.warehouseList = res.data.wtransferWarehouseList
+ this.warehouseId = this.warehouseList[0].warehouseId
+ } else {
+ this.info = res.data.woutbound
+ this.woutboundDetailsWait = res.data.woutboundDetailsWait
+ this.warehouseId = this.woutboundDetailsWait[0].warehouseId
+ }
+ }).catch(err => {
+ uni.$u.toast(err)
+ uni.navigateBack()
+ })
+ },
change() {},
close() {},
- open() {},
- openxz() {
- let arr = []
- if (this.info.wtransferRedisCodeBeanList.length !== 0) {
- this.info.wtransferRedisCodeBeanList.forEach(element => {
- arr.push(element.appliancesId)
- })
- this.ids = arr.join(',')
- } else {
- this.ids = ''
- }
- this.$refs.selectMultipleMaterial.open({})
+ open() {},
+ openxz() {
+ this.$refs.selectTraMultipleMaterial.open({
+ transferId: this.id,
+ warehouseId: this.warehouseId
+ })
+ },
+ selectMaterail(v) {
+ let tempList = this.warehouseList[0].wtransferDetailList
+ let materials = v.materials
+
+ materials.forEach(materail => {
+
+ tempList.forEach(item => {
+ item.wstockExtListVOList.forEach(hw => {
+ if (materail.materialId == hw.materialId && materail.procedureId == hw
+ .procedureId && materail.qualityType == hw.qualityType && materail.batch ==
+ hw.batch) {
+ let isExist = false
+ this.outboundList.forEach(selected => {
+ if (selected.newId == materail.id) {
+ isExist = true
+ return
+ }
+ })
+ if (isExist) {
+ uni.$u.toast('璇ョ墿鏂欐壒娆″凡瀛樺湪')
+ return
+ }
+ let obj = JSON.parse(JSON.stringify(materail))
+ obj.newId = item.id
+ this.outboundList.push(obj)
+ }
+ })
+
+ })
+ })
},
+ dele(index) {
+ this.outboundList.splice(index, 1)
+ },
+ submit() {
+ if (this.type == QRCodeType.ZKD) {
+ if (this.outboundList.length > 0) {
+ let result = this.outboundList.reduce((a, b) => {
+ if (a[b.newId]) {
+ a[b.newId].push(b);
+ } else {
+ a[b.newId] = [b];
+ }
+ return a;
+ }, {});
+ let tempList = this.warehouseList[0].wtransferDetailList
+
+ for (let i = 0; i < tempList.length; i++) {
+ let item = tempList[i]
+ for (let a in result) {
+ if (item.id == a) {
+ let total = 0
+ for (let b = 0; b < result[a].length; b++) {
+ total = Number(total) + Number(result[a][b].num)
+ }
+ if (!total || total <= 0) {
+ uni.$u.toast('鍑哄簱鐗╂枡鏁伴噺蹇呴』澶т簬0')
+ return
+ }
+ console.log(total, item.outPlannum);
+ if (total > item.outPlannum) {
+ uni.$u.toast('鍑哄簱鏁伴噺涓嶈兘澶т簬寰呭嚭搴撴暟閲�')
+ return
+ }
+ }
+ }
+ }
+ let submitTransferOutDetailDTOList = []
+ this.outboundList.forEach(item => {
+ tempList.forEach(child => {
+ if (item.newId == child.id) {
+ submitTransferOutDetailDTOList.push({
+ outNum: item.num,
+ wstockId: item.id,
+ wtransferDetailId: child.id
+ })
+ }
+ })
+ })
+ transferToOutNew({
+ submitTransferOutDetailDTOList,
+ wtransferId: this.id
+ }).then(res => {
+ if (res.code === 200) {
+ this.$store.dispatch('getUpcomingNum')
+ uni.$u.toast('鎿嶄綔鎴愬姛')
+ uni.redirectTo({
+ url: `/pages/warehousingDetails/warehousingDetails?id=${this.info.id}&dbid=${this.dbid}`
+ })
+ // uni.redirectTo({
+ // url: `/pages_adjust/pages/outboundDetails/outboundDetails?id=${this.info.id}&dbid=${this.dbid}`
+ // })
+ // setTimeout(() => {
+ // router.replace({ name: 'wTransferDetail', query: { id: info.value.wtransfer.id, dbid: route.query.dbid } })
+ // }, 2000)
+ }
+ })
+ } else {
+ uni.$u.toast('璇烽�夋嫨鍑哄簱鐗╂枡')
+ }
+ } else if (this.type === QRCodeType.CKD) {
+ wOutBoundForUpload({
+ id: info.value.woutbound.id,
+ wOutboundType: 0
+ }).then(res => {
+ if (res.code === 200) {
+ this.$store.dispatch('getUpcomingNum')
+ uni.$u.toast('鎿嶄綔鎴愬姛')
+ uni.redirectTo({
+ url: `/pages_adjust/pages/outboundDetails/outboundDetails?id=${this.info.id}`
+ })
+ // setTimeout(() => {
+ // // router.go(-1)
+ // router.replace({ name: 'wOutboundDetail', query: { id: info.value.wtransfer.id } })
+ // }, 2000)
+ }
+ })
+ }
+ }
}
}
</script>
@@ -492,135 +669,61 @@
margin-top: 15rpx;
}
- .page_yxwl_list_item_num {
- display: flex;
- flex-direction: column;
-
- // margin-top: 30rpx;
- &:first-child {
- margin-top: 0;
- }
-
- .dis {
- display: flex;
- }
-
- .itemy {
- margin-top: 20rpx;
- width: 100%;
- display: flex;
- align-items: center;
- position: relative;
-
- .itemy_item {
- flex: 1;
- display: flex;
- align-items: center;
-
- .label {
- font-size: 26rpx;
- font-weight: 400;
- color: #666666;
- flex-shrink: 0;
- }
-
- .nr {
- font-size: 26rpx;
- font-weight: 400;
- color: #222222;
-
- input {
- width: 100rpx;
- height: 35rpx;
- border-radius: 8rpx;
- border: 1rpx solid #E5E5E5;
- margin-right: 10rpx;
- margin-left: 5rpx;
- }
-
- span {
- font-size: 26rpx;
- font-weight: 400;
- color: #222222;
- }
- }
- }
-
- .dele {
- position: absolute;
- right: -30rpx;
- width: 48rpx;
- height: 48rpx;
-
- img {
- width: 100%;
- height: 100%;
- }
- }
- }
-
- .items {
- width: 50%;
- display: flex;
- align-items: center;
-
- .label {
- font-size: 26rpx;
- font-weight: 400;
- color: #666666;
- flex-shrink: 0;
- }
-
- .nr {
- font-size: 26rpx;
- font-weight: 400;
- color: #222222;
-
- input {
- width: 100rpx;
- height: 40rpx;
- margin-right: 10rpx;
- }
-
- span {
- font-size: 26rpx;
- font-weight: 400;
- color: #222222;
- }
- }
- }
-
- .item {
- width: 70%;
- display: flex;
- align-items: center;
-
- .label {
- font-size: 26rpx;
- font-weight: 400;
- color: #666666;
- flex-shrink: 0;
- }
-
- .nr {
- font-size: 26rpx;
- font-weight: 400;
- color: #222222;
-
- input {
- width: 100rpx;
- height: 40rpx;
- margin-right: 10rpx;
- }
-
- span {
- font-size: 26rpx;
- font-weight: 400;
- color: #222222;
- }
- }
- }
- }
+ .page_yxwl_list_item_num {
+ display: flex;
+ position: relative;
+ margin-top: 36rpx;
+
+ &:first-child {
+ margin-top: 0;
+ }
+
+ .dele {
+ position: absolute;
+ right: -30rpx;
+ width: 48rpx;
+ height: 48rpx;
+
+ img {
+ width: 100%;
+ height: 100%;
+ }
+ }
+
+ .item {
+ width: 50%;
+ display: flex;
+ align-items: center;
+
+ .label {
+ flex-shrink: 0;
+ font-size: 26rpx;
+ font-weight: 400;
+ color: #666666;
+ flex-shrink: 0;
+ }
+
+ .nr {
+ flex: 1;
+ display: flex;
+ align-items: center;
+
+ input {
+ width: 130rpx;
+ height: 40rpx;
+ border-radius: 8rpx;
+ border: 1rpx solid #E5E5E5;
+ margin-right: 10rpx;
+ }
+
+ span {
+ font-size: 26rpx;
+ font-weight: 400;
+ color: #222222;
+ }
+ }
+ }
+ }
}
}
@@ -647,7 +750,7 @@
bottom: 0;
left: 30rpx;
padding-bottom: 68rpx;
-
+ z-index: 9999;
.page_footer_qr {
flex: 1;
height: 88rpx;
--
Gitblit v1.9.3