Merge branch 'project1' of http://gitlab.91isoft.com:90/yangshuo/template_vue into project1

src/views/equipment/application.vue

@@ -117,18 +117,24 @@ export default {
     },
     // 提价时要调的接口
     submitForm() {
-      this.$refs.form.validate((valid) => {
-        if (valid) {
-          addApplication(this.form).then(res => {
-            console.log('res', res)
-            if (res.code === 200) {
-              this.$message.success('操作成功')
-              this.resetFrom()
-            } else if (res.code === null) {
-              this.$message.success(res.message)
-            }
-          })
-        }
+      this.$confirm('是否确认提交?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(res => {
+        this.$refs.form.validate((valid) => {
+          if (valid) {
+            addApplication(this.form).then(res => {
+              console.log('res', res)
+              if (res.code === 200) {
+                this.$message.success('操作成功')
+                this.resetFrom()
+              } else if (res.code === null) {
+                this.$message.success(res.message)
+              }
+            })
+          }
+        })
       })
     },
     // 调数据字典查询

src/views/equipment/boundManagement.vue

@@ -303,7 +303,11 @@ export default {
       form: {
         pn: '',
         lot: '',
-        plocation: ''
+        plocation: '',
+        phd: '',
+        psm: '',
+        pzl: '',
+        prank: ''
       },
       defaultProps: {
         children: 'children',

src/views/equipment/income.vue

@@ -54,7 +54,6 @@
 
 <script>
 import { add, updatadevice } from '@/api/magnagement'
-
 export default {
   name: 'Role',
   data() {
@@ -105,36 +104,40 @@ export default {
     },
     // 提交时要调的接口
     submitForm() {
-      this.$refs.form.validate((valid) => {
-        if (valid) {
-          console.log('form', this.form)
-          // 校验通过，提交表单或进行其他操作
-          if (this.form.businessId !== undefined) {
-            updatadevice(this.form).then(res => {
-              if (res.code === 200) {
-                this.open = false
-                this.$message.success('操作成功')
-                this.getList()
-                this.reFrom()
-              } else if (res.code === null) {
-                this.$message.error(res.message)
-              }
-            })
+      this.$confirm('是否确认操作?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.$refs.form.validate((valid) => {
+          if (valid) {
+            console.log('form', this.form)
+            // 校验通过，提交表单或进行其他操作
+            if (this.form.businessId !== undefined) {
+              updatadevice(this.form).then(res => {
+                if (res.code === 200) {
+                  this.open = false
+                  this.$message.success('操作成功')
+                  this.resetFrom()
+                } else if (res.code === null) {
+                  this.$message.error(res.message)
+                }
+              })
+            } else {
+              add(this.form).then(res => {
+                if (res.code === 200) {
+                  this.open = false
+                  this.$message.success('操作成功')
+                  this.resetFrom()
+                } else if (res.code === null) {
+                  this.$message.error(res.message)
+                }
+              })
+            }
           } else {
-            add(this.form).then(res => {
-              if (res.code === 200) {
-                this.open = false
-                this.$message.success('操作成功')
-                this.getList()
-                this.reFrom()
-              } else if (res.code === null) {
-                this.$message.error(res.message)
-              }
-            })
+            // 校验失败，显示错误信息或进行其他操作
           }
-        } else {
-          // 校验失败，显示错误信息或进行其他操作
-        }
+        })
       })
     },
     // 调数据字典查询
@@ -161,7 +164,7 @@ export default {
   }
   .button{
     margin-top: 7%;
-    margin-left: 48%;
+    margin-left: 11%;
   }
 
 }

src/views/sample/sampleType/index.vue

@@ -80,7 +80,7 @@
         </el-table-column>
         <el-table-column label="操作时间" prop="createDate" :show-overflow-tooltip="true">
           <template slot-scope="scope">
-            {{ scope.row.createDate || '-' }}
+            {{ parseTime(scope.row.createDate, '{y}-{m}-{d} {h}:{i}') || '-' }}
           </template>
         </el-table-column>
         <el-table-column label="操作">