Merge branch 'master' of http://git.mingansei.com/xiaobai/equipment

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('重新生成成功')

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,

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
       })

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