From 90c5ee18bd4d89594d0092d879b74fbfc035cea4 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Sat, 7 Oct 2023 14:49:38 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/login/setup.vue |  23 ---------
 utils/api.js          |  16 ------
 utils/getData2.js     | 115 ++++++++++++++++++++++++++----------------
 3 files changed, 71 insertions(+), 83 deletions(-)
 delete mode 100644 utils/api.js

diff --git a/pages/login/setup.vue b/pages/login/setup.vue
index 02851bb..c196bb1 100644
--- a/pages/login/setup.vue
+++ b/pages/login/setup.vue
@@ -14,22 +14,14 @@
 					<input type="text" class="setup-input" placeholder="请输入刷新时间" v-model="setTime">
 				</view>
 			</view>
-			<!-- <view class="zd_wrapper">
-				<view class="input-wrap">
-					<view class="input-label" style="margin-right: 20upx;">客户标签打印</view>
-					<uni-data-select v-model="index" :localdata="options" @change="selectChange"></uni-data-select>
-				</view>
-			</view> -->
 		</view>
 		<view class="submit-bar">
 		  <button class="submit-button" @click="_submit">确认</button>
-		  <!-- <button class="submit-button" @click="_virtualprintType">查询</button> -->
 		</view>
 	</view>
 </template>
 
 <script>
-	// import {virtualprintType} from '@/utils/getData2.js'
 	import NavBar from '@/components/NavBar.vue'
 	export default {
 		components: {
@@ -43,27 +35,12 @@
 				setTime: this.$store.getters.setTime / 1000
 			};
 		},
-		created () {
-			// this._virtualprintType()
-		},
 		methods: {
 			goIn () {
 				uni.redirectTo({
 					url: '/pages/login/login'
 				})
 			},
-			/** 选择器 */
-			selectChange(e) {
-				this.index = e
-			},
-			/** 打印机类型下拉框查询 */
-			async _virtualprintType () {
-				let res = await virtualprintType(this.addrip)
-				this.options = [...res.data]
-				// if (this.$store.getters.setPrintName !== '') {
-				// 	this.index = this.$store.getters.setPrintName
-				// }
-			},
 			_submit () {
 				if (this.addrip === '') {
 					uni.showToast({
diff --git a/utils/api.js b/utils/api.js
deleted file mode 100644
index bcc7a47..0000000
--- a/utils/api.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import request from './request.js'
-// 登录
-export const handLogin = (user, password) => request({
-	url:'mobile/auth/login',
-	data: {
-		username: user,
-		password: password
-	}
-})
-
-// 测试状态码报错接口
-export const handRequest = () => request({
-	url:'getInfo/4',
-	data: {}
-})
-
diff --git a/utils/getData2.js b/utils/getData2.js
index ac85f99..deaa8a6 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -21,43 +21,6 @@ export const handLogin = (user, password) => request({
 		password: password
 	}
 })
-// export const handLogin = (user, password) => {
-// 	let res = {
-//     "user": {
-//         "user": {
-//             "user_id": "1",
-//             "username": "admin",
-//             "person_name": "管理员",
-//             "gender": "男",
-//             "phone": "18312365896",
-//             "email": "201507802@qq.com",
-//             "avatar_name": "avatar-20200806032259161.png",
-//             "avatar_path": "/Users/jie/Documents/work/me/admin/eladmin/~/avatar/avatar-20200806032259161.png",
-//             "password": "f52020dca765fd3943ed40a615dc2c5c",
-//             "is_admin": true,
-//             "is_used": true,
-//             "pwd_reset_user_id": 0,
-//             "pwd_reset_time": null,
-//             "create_id": null,
-//             "create_name": "",
-//             "create_time": "2022-12-01 00:00:00",
-//             "update_id": "1",
-//             "update_name": "admin",
-//             "update_time": "2023-05-06 14:00:14",
-//             "extperson_id": null,
-//             "extuser_id": null
-//         }
-//     },
-//     "token": "Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJsb2dpblR5cGUiOiJsb2dpbiIsImxvZ2luSWQiOiIxIiwicm5TdHIiOiIyZENCQk1uYW03ellTb21aVVN2ZzZnMndJOHJ0V0RmciIsImxvZ2luSW5mbyI6eyJpZCI6IjEiLCJ1c2VybmFtZSI6ImFkbWluIiwicHJlc29uTmFtZSI6IueuoeeQhuWRmCIsInVzZXIiOnsidXNlcl9pZCI6IjEiLCJ1c2VybmFtZSI6ImFkbWluIiwicGVyc29uX25hbWUiOiLnrqHnkIblkZgiLCJnZW5kZXIiOiLnlLciLCJwaG9uZSI6IjE4MzEyMzY1ODk2IiwiZW1haWwiOiIyMDE1MDc4MDJAcXEuY29tIiwiYXZhdGFyX25hbWUiOiJhdmF0YXItMjAyMDA4MDYwMzIyNTkxNjEucG5nIiwiYXZhdGFyX3BhdGgiOiIvVXNlcnMvamllL0RvY3VtZW50cy93b3JrL21lL2FkbWluL2VsYWRtaW4vfi9hdmF0YXIvYXZhdGFyLTIwMjAwODA2MDMyMjU5MTYxLnBuZyIsInBhc3N3b3JkIjoiZjUyMDIwZGNhNzY1ZmQzOTQzZWQ0MGE2MTVkYzJjNWMiLCJpc19hZG1pbiI6dHJ1ZSwiaXNfdXNlZCI6dHJ1ZSwicHdkX3Jlc2V0X3VzZXJfaWQiOjAsImNyZWF0ZV9uYW1lIjoiIiwiY3JlYXRlX3RpbWUiOjE2Njk4MjQwMDAsInVwZGF0ZV9pZCI6IjEiLCJ1cGRhdGVfbmFtZSI6ImFkbWluIiwidXBkYXRlX3RpbWUiOjE2ODMzNTI4MTR9LCJwZXJtaXNzaW9ucyI6WyJhZG1pbiIsIm1vbml0b3I6bGlzdCIsInRpbWluZzpkZWwiLCJ0aW1pbmc6ZWRpdCIsInRpbWluZzphZGQiLCJkaWN0OmRlbCIsImRpY3Q6ZWRpdCIsImRpY3Q6YWRkIiwiZGVwdDpkZWwiLCJkZXB0OmVkaXQiLCJkZXB0OmFkZCIsIm1lbnU6ZGVsIiwibWVudTplZGl0IiwibWVudTphZGQiLCJyb2xlczpkZWwiLCJtZW51Omxpc3QiLCJyb2xlczplZGl0Iiwicm9sZXM6YWRkIiwidXNlcjpkZWwiLCJ1c2VyOmVkaXQiLCJ1c2VyOmFkZCIsInN0b3JhZ2U6ZGVsIiwic3RvcmFnZTplZGl0Iiwic3RvcmFnZTphZGQiLCJzdG9yYWdlOmxpc3QiLCJkaWN0Omxpc3QiLCJkZXB0Omxpc3QiLCJyb2xlczpsaXN0IiwidGltaW5nOmxpc3QiLCJ1c2VyOmxpc3QiLCI5OTkiLCJnZW5Db2RlOmVkaXQiLCJnZW5Db2RlOmRlbCIsImdlbkNvZGU6YWRkIiwiZ2VuQ29kZTpsaXN0Il19fQ.cur9GPyns_MCRCw9vwNogGiCAOxzSd_9-KKythjc9dU"
-// }
-// return res
-// }
-
-// 测试状态码报错接口
-export const handRequest = () => request({
-	url:'getInfo/4',
-	data: {}
-})
 
 /**
  * 设备点检
@@ -83,13 +46,6 @@ export const deviceCheckVerify = (code, user, remark, status) => request({
 	}
 })
 
-
-// 1.3打印机类型
-export const virtualprintType = (url) => request1({
-	url: `${url}/` + 'api/pda/virtual/printType',
-	data: {}
-})
-
 /**
  * 强制静置
  */
@@ -105,4 +61,75 @@ export const forcedRestingSubmit = (stime, id) => request({
 		stand_time: stime,
 		group_id: id
 	}
+})
+
+/**
+ * 分拣排产
+ */
+// 显示工单/刷新
+export const manualSortingOrders = () => request({
+	url:'api/pda/manualSorting/orders',
+	data: {}
+})
+// 开工
+export const manualSortingProductionScheduling = (code, user) => request({
+	url:'api/pda/manualSorting/productionScheduling',
+	data: {
+		workorder_code: code,
+		username: user
+	}
+})
+// 完工
+export const manualSortingProductionComplete = (code, user) => request({
+	url:'api/pda/manualSorting/productionComplete',
+	data: {
+		workorder_code: code,
+		username: user
+	}
+})
+
+/**
+ * 剩料入库
+ */
+// 刷新
+export const callingResidueMaterialTaskShow = () => request({
+	url:'api/pda/manualSorting/callingResidueMaterialTaskShow',
+	data: {}
+})
+// 确认
+export const callingResidueMaterialTask = (code, qty) => request({
+	url:'api/pda/manualSorting/callingResidueMaterialTask',
+	data: {
+		vehicle_code: code,
+		qty: qty
+	}
+})
+
+/**
+ * 托盘绑定
+ */
+// 确认
+export const manualSortingBindingVehicle = (ocode, tcode) => request({
+	url:'api/pda/manualSorting/bindingVehicle',
+	data: {
+		origin_vehicle_code: ocode,
+		target_vehicle_code: tcode
+	}
+})
+
+/**
+ * 包装入库
+ */
+// 刷新
+export const manualSortingPackingTaskShow = () => request({
+	url:'api/pda/manualSorting/packingTaskShow',
+	data: {}
+})
+// 确认
+export const manualSortingPackingTask = (code, qty) => request({
+	url:'/api/pda/manualSorting/packingTask',
+	data: {
+		vehicle_code: code,
+		qty: qty
+	}
 })
\ No newline at end of file