From dc1675c02f238ac98170c49ec0493ba5eba4017c Mon Sep 17 00:00:00 2001
From: shaoyong <yorkshao@163.com>
Date: Fri, 19 Apr 2024 10:19:35 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E6=97=B6=E9=97=B4=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/quality/qcInventory/index.vue   | 18 +++++++++---------
 src/views/quality/qcMarket/index.vue      |  8 ++++----
 src/views/quality/qcWarehousing/index.vue | 14 ++++++++++----
 src/views/quality/unqualified/index.vue   |  7 +++++--
 src/views/system/datasource/index.vue     |  5 ++++-
 5 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/src/views/quality/qcInventory/index.vue b/src/views/quality/qcInventory/index.vue
index c80efba..860481a 100644
--- a/src/views/quality/qcInventory/index.vue
+++ b/src/views/quality/qcInventory/index.vue
@@ -184,7 +184,7 @@
 				</template>
 			</el-table-column>
 		</el-table>
-		
+
 		<pagination
 			v-show="total>0"
 			:total="total"
@@ -244,9 +244,9 @@
 							</el-date-picker>
 						</el-form-item>
 					</el-col>
-				</el-row>	
+				</el-row>
 				<el-row>
-					<el-col :span="6">	
+					<el-col :span="6">
 						<el-form-item label="抽样数量" prop="sampleQuality">
 							<el-input type="number" v-model="form.sampleQuality" placeholder="请输入抽样数量"/>
 						</el-form-item>
@@ -265,7 +265,7 @@
 							</el-input>
 						</el-form-item>
 					</el-col>
-				   <el-col :span="8">	
+				   <el-col :span="8">
 						<el-form-item label="仓库编码" prop="supplierCode">
 							<el-input v-model="form.supplierCode" placeholder="请输入供应商编码" disabled/>
 						</el-form-item>
@@ -284,7 +284,7 @@
 							<el-input v-model="form.checkManCode" placeholder="请输入检测人工号" disabled/>
 						</el-form-item>
 					</el-col>
-					<el-col :span="8">	
+					<el-col :span="8">
 						<el-form-item label="检测地点" prop="checkLoc">
 							<el-input v-model="form.checkLoc" placeholder="请输入检测地点" />
 						</el-form-item>
@@ -388,7 +388,7 @@ export default {
 			// 表单校验
 			rules: {
 				checkType:[
-                  { required: true, message: "检验类型不能为空", trigger: "blur" } 
+                  { required: true, message: "检验类型不能为空", trigger: "blur" }
 				],
 				incomeBatchNo: [
 					{ required: true, message: "批次号不能为空", trigger: "blur" }
@@ -452,12 +452,12 @@ export default {
 		/** 查询库存检验列表 */
 		getList() {
 			this.loading = true;
-
+      console.log("--------"+this.queryParams)
 			if(this.queryParams.incomeTimeArray!=null && this.queryParams.incomeTimeArray.length>0){
 				this.queryParams.incomeTimeStart = moment(this.queryParams.incomeTimeArray[0]).format('YYYY-MM-DD HH:mm:ss');
 				this.queryParams.incomeTimeEnd = moment(this.queryParams.incomeTimeArray[1]).format('YYYY-MM-DD HH:mm:ss');
 			}else{
-                this.queryParams.incomeTimeStart = null;
+        this.queryParams.incomeTimeStart = null;
 				this.queryParams.incomeTimeEnd = null;
 			}
 
@@ -619,7 +619,7 @@ export default {
            this.form.supplierCode = obj.code;
 		   this.form.supplierName = obj.name;
 		},
-		
+
 		/**人员选择弹出框**/
 		handleSelectUser() {
 		  this.$refs.itemSelectUser.showFlag = true;
diff --git a/src/views/quality/qcMarket/index.vue b/src/views/quality/qcMarket/index.vue
index 3e3d01e..95be25d 100644
--- a/src/views/quality/qcMarket/index.vue
+++ b/src/views/quality/qcMarket/index.vue
@@ -185,7 +185,7 @@
 				</template>
 			</el-table-column>
 		</el-table>
-		
+
 		<pagination
 			v-show="total>0"
 			:total="total"
@@ -427,7 +427,7 @@ export default {
 			// 表单校验
 			rules: {
 				checkType:[
-                  { required: true, message: "检验类型不能为空", trigger: "blur" } 
+                  { required: true, message: "检验类型不能为空", trigger: "blur" }
 				],
 				incomeBatchNo: [
 					{ required: true, message: "批次号不能为空", trigger: "blur" }
@@ -498,7 +498,7 @@ export default {
 				this.queryParams.incomeTimeStart = moment(this.queryParams.incomeTimeArray[0]).format('YYYY-MM-DD HH:mm:ss');
 				this.queryParams.incomeTimeEnd = moment(this.queryParams.incomeTimeArray[1]).format('YYYY-MM-DD HH:mm:ss');
 			}else{
-                this.queryParams.incomeTimeStart = null;
+        this.queryParams.incomeTimeStart = null;
 				this.queryParams.incomeTimeEnd = null;
 			}
 
@@ -665,7 +665,7 @@ export default {
            this.form.supplierCode = obj.code;
 		   this.form.supplierName = obj.name;
 		},
-		
+
 		/**人员选择弹出框**/
 		handleSelectUser() {
 		  this.$refs.itemSelectUser.showFlag = true;
diff --git a/src/views/quality/qcWarehousing/index.vue b/src/views/quality/qcWarehousing/index.vue
index 9cdaee2..2abe4b3 100644
--- a/src/views/quality/qcWarehousing/index.vue
+++ b/src/views/quality/qcWarehousing/index.vue
@@ -523,15 +523,21 @@ export default {
 		getList() {
 			this.loading = true;
 
-			if(this.queryParams.incomeTimeArray.length>0){
+			if(this.queryParams.incomeTimeArray != null && this.queryParams.incomeTimeArray.length>0){
 				this.queryParams.incomeTimeStart = moment(this.queryParams.incomeTimeArray[0]).format('YYYY-MM-DD HH:mm:ss');
 				this.queryParams.incomeTimeEnd = moment(this.queryParams.incomeTimeArray[1]).format('YYYY-MM-DD HH:mm:ss');
-			}
+			}else{
+        this.queryParams.incomeTimeStart = null;
+				this.queryParams.incomeTimeEnd = null;
+      }
 
-			if(this.queryParams.checkTimeArray.length>0){
+			if(this.queryParams.checkTimeArray != null && this.queryParams.checkTimeArray.length>0){
 				this.queryParams.checkTimeStart = moment(this.queryParams.checkTimeArray[0]).format('YYYY-MM-DD HH:mm:ss');
 				this.queryParams.checkTimeEnd = moment(this.queryParams.checkTimeArray[1]).format('YYYY-MM-DD HH:mm:ss');
-			}
+			}else{
+        this.queryParams.checkTimeStart = null;
+				this.queryParams.checkTimeEnd = null;
+      }
 
 			listWarehousing(this.queryParams).then(response => {
 				this.warehousingList = response.rows;
diff --git a/src/views/quality/unqualified/index.vue b/src/views/quality/unqualified/index.vue
index a5c6ae8..78be986 100644
--- a/src/views/quality/unqualified/index.vue
+++ b/src/views/quality/unqualified/index.vue
@@ -389,10 +389,13 @@ export default {
 		getList() {
 			this.loading = true;
 
-			if(this.queryParams.checkTimeArray.length>0){
+			if(this.queryParams.checkTimeArray != null && this.queryParams.checkTimeArray.length>0){
 				this.queryParams.checkTimeStart = moment(this.queryParams.checkTimeArray[0]).format('YYYY-MM-DD HH:mm:ss');
 				this.queryParams.checkTimeEnd = moment(this.queryParams.checkTimeArray[1]).format('YYYY-MM-DD HH:mm:ss');
-			}
+			}else {
+        this.queryParams.checkTimeStart = null;
+        this.queryParams.checkTimeEnd = null;
+      }
 
 			listUnqualified(this.queryParams).then(response => {
 				this.unqualifiedList = response.rows;
diff --git a/src/views/system/datasource/index.vue b/src/views/system/datasource/index.vue
index 13a7aa1..5aea8d8 100644
--- a/src/views/system/datasource/index.vue
+++ b/src/views/system/datasource/index.vue
@@ -128,7 +128,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -172,6 +172,9 @@
         <el-form-item label="数据源名称" prop="parkName">
           <el-input v-model="form.parkName" placeholder="请输入数据源名称" disabled/>
         </el-form-item>
+        <el-form-item label="数据源名称" prop="parkName">
+          <el-input v-model="form.poolName" placeholder="请输入数据源标识"/>
+        </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
         </el-form-item>