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

src/views/equipment/check.vue

@@ -403,10 +403,10 @@ export default {
     },
     deleteByType(){
       deleteByType(1).then(flag => {
-        if(flag.data > 0){
+        if(flag.data > 0 && flag.code === 200){
           this.$message.success("结束盘点成功")
         }else{
-              this.$message.error("结束盘点失败")
+            this.$message.error("结束盘点失败")
         }
       })
     },

src/views/equipment/checkProcess.vue

@@ -246,6 +246,7 @@ export default {
       openDetails: false,
       // // TODO: 模拟测试数据
       equipmentList: [],
+      selectList: [],
       // check: '开始盘点',
       typeParent: 'text',
       typePrimary: 'primary',

src/views/equipment/income.vue

@@ -73,8 +73,8 @@ export default {
       },
       rule: {
         pn: [{ required: true, message: '请输入pn', trigger: 'blur' }],
-        lot: [{ required: true, message: '请输入pn', trigger: 'blur' }],
-        plocation: [{ required: true, message: '请输入pn', trigger: 'blur' }],
+        lot: [{ required: true, message: '请输入lot', trigger: 'blur' }],
+        plocation: [{ required: true, message: '请输入位置', trigger: 'blur' }],
         phd: [{ pattern: /^\d+$/, message: '仅能输入数字', trigger: 'change' }],
         psm: [{ pattern: /^\d+$/, message: '仅能输入数字', trigger: 'change' }],
         pzl: [{ pattern: /^\d+$/, message: '仅能输入数字', trigger: 'change' }],