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

src/views/equipment/application.vue

@@ -117,6 +117,11 @@ export default {
     },
     // 提价时要调的接口
     submitForm() {
+      this.$confirm('是否确认提交?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(res => {
         this.$refs.form.validate((valid) => {
           if (valid) {
             addApplication(this.form).then(res => {
@@ -130,6 +135,7 @@ export default {
             })
           }
         })
+      })
     },
     // 调数据字典查询
     getDict() {

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,6 +104,11 @@ export default {
     },
     // 提交时要调的接口
     submitForm() {
+      this.$confirm('是否确认操作?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
         this.$refs.form.validate((valid) => {
           if (valid) {
             console.log('form', this.form)
@@ -114,8 +118,7 @@ export default {
                 if (res.code === 200) {
                   this.open = false
                   this.$message.success('操作成功')
-                this.getList()
-                this.reFrom()
+                  this.resetFrom()
                 } else if (res.code === null) {
                   this.$message.error(res.message)
                 }
@@ -125,8 +128,7 @@ export default {
                 if (res.code === 200) {
                   this.open = false
                   this.$message.success('操作成功')
-                this.getList()
-                this.reFrom()
+                  this.resetFrom()
                 } else if (res.code === null) {
                   this.$message.error(res.message)
                 }
@@ -136,6 +138,7 @@ export default {
             // 校验失败，显示错误信息或进行其他操作
           }
         })
+      })
     },
     // 调数据字典查询
     getDict() {
@@ -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="操作">