From feef84fd23c96f35b5763b2dc1837f47f0af3641 Mon Sep 17 00:00:00 2001
From: xy <271556543@qq.com>
Date: Fri, 28 Apr 2023 09:34:39 +0800
Subject: [PATCH] 2023-4-28

---
 pages/scan/index.vue   | 6 +++---
 pages/upload/index.vue | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pages/scan/index.vue b/pages/scan/index.vue
index 580eb4d..b0c06eb 100644
--- a/pages/scan/index.vue
+++ b/pages/scan/index.vue
@@ -74,7 +74,7 @@
 			<view style="padding: 20rpx 40rpx;">
 				<u-form :model="fund" ref="form" label-position="top">
 					<u-form-item label="名称">
-						<u-input disabled v-model="fund.name" placeholder="资产名称"></u-input>
+						<u-input v-model="fund.name" placeholder="资产名称"></u-input>
 					</u-form-item>
 					<u-form-item label="盘点时间">
 						<u-input disabled :value="$moment(new Date()).format('YYYY-MM-DD')" placeholder="盘点时间">
@@ -240,7 +240,7 @@
 			},
 
 			async confirm() {
-				if (!this.fund.position || !this.fund.assets_status) {
+				if (!this.fund.position || !this.fund.assets_status || !this.fund.name) {
 					androidModule.showToast("请填写完整信息")
 				}
 				try {
@@ -252,7 +252,7 @@
 						this.fund.photo = filePath[1]?.savedFilePath
 					}
 					await executeSql(`
-					    update property set position = "${this.fund.position}",worker_id = ${this.fund.worker_id},assets_status = "${this.fund.assets_status}",content = "${this.fund.content}",is_check = 1${this.fund.photo ? ',photo = "' + this.fund.photo + '"' : '' } where assets_id = ${this.fund.assets_id};
+					    update property set name = "${this.fund.name}",position = "${this.fund.position}",worker_id = ${this.fund.worker_id},assets_status = "${this.fund.assets_status}",content = "${this.fund.content}",is_check = 1${this.fund.photo ? ',photo = "' + this.fund.photo + '"' : '' } where assets_id = ${this.fund.assets_id};
 					`)
 					uni.showToast({
 						icon: 'success',
diff --git a/pages/upload/index.vue b/pages/upload/index.vue
index f304596..7cdbc8b 100644
--- a/pages/upload/index.vue
+++ b/pages/upload/index.vue
@@ -92,7 +92,7 @@
 				}
 				try {
 					let res = await selectFromTable(`
-					    select assets_id,position,assets_status,photo,content,worker_id from property where is_check = 1;
+					    select assets_id,position,assets_status,photo,content,worker_id,name from property where is_check = 1;
 					`)
 
 					if (res.length === 0) {