代码更新

pagePrinter/add-printer/add-printer.vue

@@ -6,6 +6,8 @@
 				:list="pageData.brandList"></picker-item>
 			<picker-item title="小票打印" required v-model="form.subType" :modelValue="form.subType"
 				:list="pageData.receiptsList"></picker-item>
+			<picker-item title="类型" required v-model="form.connectionType" :modelValue="form.connectionType"
+				:list="pageData.connectionTypeList"></picker-item>	
 			<view class="u-p-b-14 u-m-b-24 border-bottom">
 				<view class="title"><span style="color: red;">*</span>打印机名称</view>
 				<view class="">
@@ -122,18 +124,18 @@
 	import go from '@/commons/utils/go.js';
 	import pickerItem from './components/picker-item.vue';
 	import myRadioGroup from './components/my-radio-group.vue';
-	import * as Api from '@/http/yskApi/devices.js'
 	
-	import { devices, models, subTypes, brand, receipts } from '@/pagePrinter/devices.js'
+	import { devices, subTypes, brand, receipts,connectionType } from '@/pagePrinter/devices.js'
 	import { getPrinterDetail, addPrinter, updatePrinter } from '@/api/printer.js'
 	import { categoryPage } from '@/api/cateGory.js'
 
 	const pageData = reactive({
 		brandList: brand,         // 打印机品牌列表
 		receiptsList: receipts,   // 小票
+		connectionTypeList: connectionType,   // 类型
 		deciveSizeList: [		  // 小票尺寸
 			{ label: '58mm', value: '58mm' },
-			{ label: '80mm', value: '58mm' },
+			{ label: '80mm', value: '80mm' },
 		],
 		classifyPrintList: [	  // 分类打印
 			{ label: '打印所有', value: '0' },

pagePrinter/add-printer/components/picker-item.vue

@@ -1,13 +1,6 @@
 <template>
 	<view class="u-p-b-24 u-m-b-24 border-bottom">
 		<view class="title font-bold"> <text v-if="required" style="color: red;">*</text>{{title}}</view>
-		<!-- 	<up-popup customStyle="overflow: hidden;" @change="change" :value="value" :range="list" range-key="name" round="20" mode="bottom">
-			<view class="u-m-t-16 u-flex u-row-between ">
-				<view class="color-333" v-if="selText">{{selText}}</view>
-				<view class="color-999" v-else>请选择</view>
-				<uni-icons type="right" color="#999" size="16"></uni-icons>
-			</view>
-		</up-popup> -->
 		<picker @change="change" range-key="name" :value="value" :range="list">
 			<view class="u-m-t-16 u-flex u-row-between ">
 				<view class="color-333" v-if="selText">{{selText}}</view>
@@ -19,11 +12,7 @@
 </template>
 
 <script setup>
-	import {
-		computed,
-		ref,
-		watch
-	} from 'vue';
+	import { computed, ref, watch } from 'vue';
 	const props = defineProps({
 		list: {
 			type: Array,

pagePrinter/devices.js

@@ -1,63 +1,76 @@
 export const brand = [{
-		value: 'yxyPrinter',
+		value: '云想印',
 		name: '云想印'
 	},
 	{
-		value: 'fePrinter',
+		value: '飞鹅',
 		name: '飞鹅'
 	}
 ]
 export const receipts = [{
-		value: 'label',
+		value: '标签',
 		name: '标签'
 	},
 	{
-		value: 'kitchen',
+		value: '出品',
 		name: '出品'
 	},
 	{
-		value: 'cash',
+		value: '小票',
 		name: '小票'
 	}
 ]
 export const devices = [{
-		value: 'printer',
+		value: '本地',
 		name: '本地'
 	},
 	{
-		value: 'yxyPrinter',
+		value: '云想印',
 		name: '云想印'
 	},
 	{
-		value: 'fePrinter',
+		value: '飞鹅',
 		name: '飞鹅'
 	}
 ]
 
 export const models = [{
-		value: 'normal',
+		value: '普通出单',
 		name: '普通出单'
 	},
 	{
-		value: 'one',
+		value: '一菜一品',
 		name: '一菜一品'
 	},
 	{
-		value: 'category',
+		value: '分类出单',
 		name: '分类出单'
 	}
 ]
 
 export const subTypes = [{
-		value: 'kitchen',
+		value: '出品',
 		name: '出品'
 	},
 	{
-		value: 'cash',
+		value: '小票',
 		name: '小票'
 	},
 	{
-		value: 'label',
+		value: '标签',
 		name: '标签'
 	}
+]
+export const connectionType = [{
+		value: 'USB',
+		name: 'USB'
+	},
+	{
+		value: '蓝牙',
+		name: '蓝牙'
+	},
+	{
+		value: '网络',
+		name: '网络'
+	}
 ]

pagePrinter/index/components/printer-item.vue

@@ -30,26 +30,27 @@
 			</view>
 			<view class="u-flex u-row-between u-m-t-32">
 				<view class="u-flex u-col-center">
-					<image class="icon" src="/pagePrinter/static/icon/icon-type.svg" mode=""></image>
-					<view class="color-666 u-m-l-10">类型</view>
+					<image class="icon" src="/pagePrinter/static/icon/icon-category.svg" mode=""></image>
+					<view class="color-666 u-m-l-10">品牌</view>
 				</view>
 				<view>
-					{{subTypesName(data.subType)}}
+					{{data.contentType}}
 				</view>
 			</view>
 			<view class="u-flex u-row-between u-m-t-32">
 				<view class="u-flex u-col-center">
-					<image class="icon" src="/pagePrinter/static/icon/icon-category.svg" mode=""></image>
-					<view class="color-666 u-m-l-10">分类</view>
+					<image class="icon" src="/pagePrinter/static/icon/icon-type.svg" mode=""></image>
+					<view class="color-666 u-m-l-10">类型</view>
 				</view>
 				<view>
-					{{devicesName(data.contentType)}}
+					{{data.connectionType}}
 				</view>
 			</view>
+			
 			<view class="u-m-t-32 u-flex u-row-right gap-20">
-				<my-button v-if="data.connectionType == 'network'" shape="circle" :width="140" :height="56"
+				<my-button shape="circle" :width="140" :height="56"
 					type="cancel" @tap="delTableHandleEvent()" plain>删除</my-button>
-				<my-button v-if="data.connectionType == 'network'" shape="circle" @click="toUrl" :width="140"
+				<my-button shape="circle" @click="toUrl" :width="140"
 					:height="56" plain>编辑</my-button>
 			</view>
 		</view>
@@ -75,7 +76,7 @@
 	})
 	const emit = defineEmits(['init'])
 	const delModel=ref(null)
-	
+	console.log(props.data)
 	/**
 	 * 编辑
 	 */
@@ -86,15 +87,16 @@
 	}
 
 	function devicesName(value) {
-		return devices.find(item => item.value == value).name
+		console.log(devices.find(item => (item.value == value||item.name == value)))
+		return devices.find(item => (item.value == value||item.name == value)).name
 	}
 
 	function modelsName(value) {
-		return models.find(item => item.value == value).name
+		return models.find(item => (item.value == value||item.name == value)).name
 	}
 
 	function subTypesName(value) {
-		return subTypes.find(item => item.value == value).name
+		return subTypes.find(item => (item.value == value||item.name == value)).name
 	}
 
 	function timeFilter(s) {