Merge branch 'dwb' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into test
This commit is contained in:
commit
904c01ef23
|
|
@ -113,42 +113,42 @@
|
|||
<view class="u-m-t-16">
|
||||
<radio-group class="u-flex u-flex-wrap" @change="sizeChange($event,'printMethod')">
|
||||
<label class="radio u-m-r-60">
|
||||
<radio value="normal" :checked="form.printMethod == '1'" class="scale7" />
|
||||
<text>普通出菜</text>
|
||||
<radio value="all" :checked="form.printMethod == '1'" class="scale7" />
|
||||
<text>打印全部</text>
|
||||
</label>
|
||||
<label class="radio u-m-r-60">
|
||||
<radio value="one" :checked="form.printMethod == '2'" class="scale7" />
|
||||
<text>一菜一品</text>
|
||||
<text>仅打印结账单</text>
|
||||
</label>
|
||||
<label class="radio u-m-r-60">
|
||||
<radio value="callTicket" :checked="form.printMethod == '2'" class="scale7" />
|
||||
<text>排队取号</text>
|
||||
<radio value="normal" :checked="form.printMethod == '2'" class="scale7" />
|
||||
<text>仅打印结账单[前台]</text>
|
||||
</label>
|
||||
</radio-group>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
|
||||
<!-- <view class="u-p-b-24 u-m-b-24 border-bottom">
|
||||
<view class="u-p-b-24 u-m-b-24 border-bottom">
|
||||
<view class="title">打印类型</view>
|
||||
<view class="u-m-t-16" style="display: flex;">
|
||||
<up-checkbox-group v-model="form.printType">
|
||||
<up-checkbox :customStyle="{marginBottom: '8px'}" label="确认退款单" name="1"
|
||||
<up-checkbox :customStyle="{marginBottom: '8px'}" label="确认退款单" name="refund"
|
||||
style="margin-right: 40rpx;font-size: 28rpx;">
|
||||
</up-checkbox>
|
||||
<up-checkbox :customStyle="{marginBottom: '8px'}" label="交班单" name="2"
|
||||
<up-checkbox :customStyle="{marginBottom: '8px'}" label="交班单" name="handover"
|
||||
style="margin-right: 40rpx;font-size: 28rpx;">
|
||||
</up-checkbox>
|
||||
<up-checkbox :customStyle="{marginBottom: '8px'}" label="排队取号" name="3"
|
||||
<up-checkbox :customStyle="{marginBottom: '8px'}" label="排队取号" name="queue"
|
||||
style="margin-right: 40rpx;font-size: 28rpx;">
|
||||
</up-checkbox>
|
||||
</up-checkbox-group>
|
||||
</view>
|
||||
</view> -->
|
||||
</view>
|
||||
|
||||
|
||||
|
||||
<view class="u-p-b-24 u-m-b-24 border-bottom">
|
||||
<!-- <view class="u-p-b-24 u-m-b-24 border-bottom">
|
||||
<view class="title">打印单据</view>
|
||||
<view class="u-m-t-16">
|
||||
<radio-group class="u-flex u-flex-wrap" @change="sizeChange($event,'printReceipt')">
|
||||
|
|
@ -165,7 +165,7 @@
|
|||
</label>
|
||||
</radio-group>
|
||||
</view>
|
||||
</view>
|
||||
</view> -->
|
||||
|
||||
<view class="u-p-b-24 u-flex u-row-between u-m-b-24 border-bottom">
|
||||
<view class="title">打印机状态</view>
|
||||
|
|
@ -215,11 +215,9 @@
|
|||
} from '@/pagePrinter/devices.js'
|
||||
import {
|
||||
onLoad,
|
||||
onShow
|
||||
} from '@dcloudio/uni-app'
|
||||
import {
|
||||
ref,
|
||||
onBeforeUnmount,
|
||||
reactive,
|
||||
computed,
|
||||
watch,
|
||||
|
|
@ -294,14 +292,11 @@
|
|||
})
|
||||
}
|
||||
})
|
||||
|
||||
partList.value = arr
|
||||
}
|
||||
|
||||
function sizeChange(e, name) {
|
||||
form[name] = e.detail.value
|
||||
}
|
||||
|
||||
//打印份数
|
||||
const printerNums = reactive({
|
||||
list: new Array(4).fill(1).map((v, index) => {
|
||||
|
|
@ -316,7 +311,6 @@
|
|||
const feets = ref([0, 1, 2, 3, 4, 5, 8].map(v => {
|
||||
return v + '行'
|
||||
}))
|
||||
|
||||
let form = reactive({
|
||||
sort: "0",
|
||||
status: 0,
|
||||
|
|
@ -348,13 +342,11 @@
|
|||
...form
|
||||
})
|
||||
}
|
||||
|
||||
go.to('/pagePrinter/index/index')
|
||||
}
|
||||
// watch(() => form.config.model, (newval) => {
|
||||
// console.log(newval);
|
||||
// })
|
||||
|
||||
// const option = reactive({})
|
||||
async function getdetails() {
|
||||
const res = await Api.printerd(userId.value)
|
||||
|
|
@ -365,6 +357,7 @@
|
|||
})
|
||||
res.selectcheckbox = arrs
|
||||
form = Object.assign(form, res)
|
||||
form.printType = JSON.parse(form.printType)
|
||||
}
|
||||
onLoad((options) => {
|
||||
if (options.id) {
|
||||
|
|
@ -376,10 +369,6 @@
|
|||
}
|
||||
// Object.assign(option, opt)
|
||||
})
|
||||
onBeforeUnmount(() => {
|
||||
|
||||
})
|
||||
onShow(() => {})
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
|
|
|
|||
Loading…
Reference in New Issue