feat: 半屏扫码、改密退出与表格并升至1.1.19
This commit is contained in:
@@ -15,10 +15,22 @@
|
||||
<u-form-item>
|
||||
<text class="title" style="width: 200px">备注内容:{{ BillRemark }}</text>
|
||||
</u-form-item>
|
||||
<PlusBarcodePanel
|
||||
v-if="usePhoneScanFallback"
|
||||
:visible.sync="phoneScanPanelOpen"
|
||||
hint-text="连续扫码配布,扫完可继续下一条"
|
||||
:scan-time-space="1200"
|
||||
@success="onPlusBarcodeSuccess"
|
||||
/>
|
||||
<u-form-item label-width="130" label="条码资料:">
|
||||
<input type="text" v-model="QRBarCode" maxlength="-1" style="width: 170px" @confirm="SalePickBillDetailScan" />
|
||||
<text
|
||||
v-if="usePhoneScanFallback && phoneScanPanelOpen"
|
||||
class="phone-scan-close"
|
||||
@click.stop="handlePhoneScan"
|
||||
>关闭扫码</text>
|
||||
<u-icon
|
||||
v-if="usePhoneScanFallback"
|
||||
v-else-if="usePhoneScanFallback"
|
||||
name="scan"
|
||||
size="44"
|
||||
color="#2979ff"
|
||||
@@ -83,8 +95,10 @@ import util, {
|
||||
} from "../../common/util";
|
||||
import wybTable from "@/components/wyb-table/wyb-table.vue";
|
||||
import scanMixin from "@/common/scanMixin.js";
|
||||
import PlusBarcodePanel from "@/components/common/PlusBarcodePanel.vue";
|
||||
let that = "";
|
||||
export default {
|
||||
components: { PlusBarcodePanel },
|
||||
mixins: [scanMixin],
|
||||
data() {
|
||||
return {
|
||||
@@ -215,7 +229,10 @@ export default {
|
||||
|
||||
methods: {
|
||||
handlePhoneScan() {
|
||||
this.openPhoneScan();
|
||||
this.togglePhoneScanPanel();
|
||||
},
|
||||
onPlusBarcodeSuccess(scanResult) {
|
||||
this.handleScanResult(scanResult, this._scanCallback);
|
||||
},
|
||||
|
||||
playSuccess(text) {
|
||||
@@ -454,6 +471,18 @@ export default {
|
||||
</script>
|
||||
|
||||
<style>
|
||||
.phone-scan-close {
|
||||
margin-left: 8px;
|
||||
padding: 0 12px;
|
||||
height: 36px;
|
||||
line-height: 36px;
|
||||
border: 1px solid #2979ff;
|
||||
border-radius: 4px;
|
||||
color: #2979ff;
|
||||
background: #eaf2ff;
|
||||
font-size: 34rpx;
|
||||
white-space: nowrap;
|
||||
}
|
||||
page {
|
||||
background-color: #f8f8f8;
|
||||
padding-bottom: 260rpx;
|
||||
|
||||
Reference in New Issue
Block a user