From 82b5e29df503f17d01c88a9632751fcd930a5d93 Mon Sep 17 00:00:00 2001
From: zichen1019 <1510748736@qq.com>
Date: Mon, 30 Aug 2021 09:43:32 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=97=A5=E6=9C=9F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ysjl/3000/common/index.vue | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/src/views/ysjl/3000/common/index.vue b/src/views/ysjl/3000/common/index.vue
index 6f05c65..b7d958b 100644
--- a/src/views/ysjl/3000/common/index.vue
+++ b/src/views/ysjl/3000/common/index.vue
@@ -689,7 +689,7 @@
             </el-row>
             <el-row :gutter="20">
               <el-col :span="9">
-                <el-form-item label="检验日期" prop="jianyankaishiriqi">
+                <el-form-item label="检验开始日期" prop="jianyankaishiriqi">
                   <el-date-picker
                     v-model="ysjl.jianyankaishiriqi"
                     value-format="yyyy-MM-dd"
@@ -699,9 +699,9 @@
                 </el-form-item>
               </el-col>
               <el-col :span="9">
-                <el-form-item label="现场检验日期" prop="xianchangjianyanriqi">
+                <el-form-item label="检验结束日期" prop="jianyanjieshuriqi">
                   <el-date-picker
-                    v-model="ysjl.xianchangjianyanriqi"
+                    v-model="ysjl.jianyanjieshuriqi"
                     value-format="yyyy-MM-dd"
                     placeholder="选择日期"
                     style="width: 100%"
@@ -710,16 +710,6 @@
               </el-col>
             </el-row>
             <el-row :gutter="20">
-              <el-col v-if="fromType !== 5" :span="9">
-                <el-form-item label="检验完成日期" prop="jianyanjieshuriqi">
-                  <el-date-picker
-                    v-model="ysjl.jianyanjieshuriqi"
-                    value-format="yyyy-MM-dd"
-                    placeholder="选择日期"
-                    style="width: 100%"
-                  />
-                </el-form-item>
-              </el-col>
               <el-col :span="9">
                 <el-form-item label="下次检验日期" prop="xiacijianyanriqi">
                   <el-date-picker
@@ -730,8 +720,6 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row :gutter="20">
               <el-col :span="9">
                 <el-form-item label="选择科室" prop="departmentId">
                   <el-cascader

From dba6e21c2b6a0420f9f66152b78d68fc8ae1da53 Mon Sep 17 00:00:00 2001
From: zichen1019 <1510748736@qq.com>
Date: Mon, 30 Aug 2021 10:28:05 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/common.js           | 6 +++++-
 src/views/borrow/returned.vue | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/utils/common.js b/src/utils/common.js
index 7106a25..7757c14 100644
--- a/src/utils/common.js
+++ b/src/utils/common.js
@@ -4,6 +4,7 @@ import router from '../router'
 import Utils from './contact.js'
 import preview from './preview'
 import Vue from 'vue'
+import qs from 'qs'
 
 export default {
   // 原始记录预览
@@ -144,8 +145,11 @@ export default {
       url: '/print/batchGeneratePDF',
       method: 'post',
       data: {
-        ids: id,
+        ids: [id],
         generateType: viewType
+      },
+      paramsSerializer: function(data) {
+        return qs.stringify(data, { indices: false })
       }
     }).then(() => {
       console.info('重新生成成功')
diff --git a/src/views/borrow/returned.vue b/src/views/borrow/returned.vue
index baa0a1a..bae7b26 100644
--- a/src/views/borrow/returned.vue
+++ b/src/views/borrow/returned.vue
@@ -175,7 +175,7 @@ export default {
     },
     returnFn(row) {
       console.log(row)
-      const currentTime = this.formatter.getNowTime()
+      const currentTime = this.formatter.dateFormat('YYYY-MM-dd HH:mm:ss')
       const data = {
         guihuanTime: currentTime,
         id: row.id,

From 97d21bd89ec189712706d566e6188fa69cb4b517 Mon Sep 17 00:00:00 2001
From: zichen1019 <1510748736@qq.com>
Date: Mon, 30 Aug 2021 11:11:37 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=AD=BE=E5=90=8D?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/user/user.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/user/user.vue b/src/views/user/user.vue
index d50bbc0..b0e39aa 100644
--- a/src/views/user/user.vue
+++ b/src/views/user/user.vue
@@ -367,7 +367,7 @@ export default {
         method: 'post',
         data: fd
       }).then((data) => {
-        this.tempUser.signImg = data
+        this.tempUser.signImg = [{ name: data }]
         this.fileList = JSON.parse(data)
         this.fileList[0].url = process.env.VUE_APP_IMG_URL + 'signImage/' + this.fileList[0].name
       })