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

src/views/equipment/income.vue

@@ -41,7 +41,7 @@
       <el-row>
         <el-col :span="12" style="padding-left: 8.6%;">
           <el-form-item label="prank:" style="flex-basis: 50%;" prop="prank">
-            <el-input v-model="form.rank" placeholder="请输入prank" :style="{ width: '400px', height: '30px' }" :maxlength="10" />
+            <el-input v-model="form.prank" placeholder="请输入prank" :style="{ width: '400px', height: '30px' }" :maxlength="10" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -66,7 +66,10 @@ export default {
         phd: '',
         psm: '',
         pzl: '',
-        prank: ''
+        prank: '',
+        flag: 1,
+        ptype: 1,
+        pstatus: 0
       },
       rule: {
         pn: [{ required: true, message: '请输入pn', trigger: 'blur' }],

src/views/sample/basicInformation/index.vue

@@ -157,7 +157,7 @@
 
 <script>
 import { queryList, add, getDetailById, updataInfo, deleteLogical } from '@/api/sample/basicInformation'
-import {parseTime} from "@/utils";
+import { parseTime } from "@/utils";
 
 export default {
   name: 'Index',