sunChengjie 11 months ago
parent
commit
e7e936f963
2 changed files with 47 additions and 30 deletions
  1. 26 23
      src/pages/express.vue
  2. 21 7
      src/pages/inexpress.vue

+ 26 - 23
src/pages/express.vue

@@ -567,34 +567,37 @@ export default {
 			}
 
 			const getPrinters = await getListOfPrinters({})
-			if (getPrinters.data.length == []) {
-				return Toast('请先绑定打印机')
-			}
+
+
 			if (getPrinters.code == 0) {
-				// const qwe = {
-				// 	IMEI: "8672970676795912",
-				// 	companyId: "990b526776e74ff9ab141ff28e09f0922",
-				// 	correspondingRoles: "揽件员2",
-				// 	id: 72,
-				// 	printerName: "禁魔石打印机2",
-				// 	recordDate: "2024-04-12 15:10:12.4282",
-				// 	shareCode: "9077782",
-				// 	st: "12",
-				// 	type: "12",
-				// 	useTheId: "11392",
-				// }  //脏数据
-				// getPrinters.data.push(qwe)
-				this.getPrintersList = getPrinters.data.map((item) => {
-					return { printerName: item.printerName, id: item.id }
-				})
-				if (this.getPrintersList.length === 1) {
-					this.shipServe(this.getPrintersList[0].id)
-					return
+
+				if (getPrinters.data.length == []) {
+					if (getPrinters.data.length == []) {
+						this.shipServe()
+						Toast('没有打印机')
+					}
+				} else {
+
+
+					if (getPrinters.data.length != []) {
+						this.getPrintersList = getPrinters.data.map((item) => {
+							return { printerName: item.printerName, id: item.id }
+						})
+					}
+
+					if (this.getPrintersList.length === 1) {
+						this.shipServe(this.getPrintersList[0].id)
+					} else {
+						this.printerShow = true
+					}
 				}
-				this.printerShow = true
+
 			} else {
 				Toast('系统异常')
 			}
+
+
+
 			return
 		},
 		// 打印机确认

+ 21 - 7
src/pages/inexpress.vue

@@ -299,14 +299,28 @@ export default {
 		async printer() {
 			const getPrinters = await getListOfPrinters({})
 			if (getPrinters.code == 0) {
-				this.getPrintersList = getPrinters.data.map((item) => {
-					return { printerName: item.printerName, id: item.id }
-				})
-				if (this.getPrintersList.length === 1) {
-					this.save(this.getPrintersList[0].id)
-					return
+
+				if (getPrinters.data.length == []) {
+					this.save()
+					Toast('没有打印机')
+
+				} else {
+
+					if (getPrinters.data.length != []) {
+						this.getPrintersList = getPrinters.data.map((item) => {
+							return { printerName: item.printerName, id: item.id }
+						})
+					}
+
+					if (this.getPrintersList.length === 1) {
+						this.save(this.getPrintersList[0].id)
+					} else {
+						this.printerShow = true
+					}
+
 				}
-				this.printerShow = true
+
+
 			} else {
 				Toast('系统异常')
 			}