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

src/views/equipment/basicInfo.vue

@@ -216,6 +216,7 @@
 import { add, listBasicInfo, updataInfo, getDetailById, deleteLogical } from '@/api/equipment/basicInfo'
 import { parseTime } from '@/utils'
 import { getDictData } from '@/api/equipment/application'
+import { resetForm } from '@/utils/common'
 export default {
   name: 'BasicInfo',
   data() {
@@ -298,16 +299,15 @@ export default {
         ],
         prank: [
           { required: true, message: '请输入prank', trigger: 'change' },
-          { pattern: /^[0-9]+(\.[0-9]+)?$/, message: '请输入纯数字或小数', trigger: 'change' }],
+          { pattern: /^-?\d+$/, message: '请输入纯数字', trigger: 'change' }],
         pissb: [
           { required: true, message: '请选择pissb', trigger: 'blur' }
         ],
         psm: [
           { required: true, message: '请输入psm', trigger: 'change' },
-          { pattern: /^[0-9]+(\.[0-9]+)?$/, message: '请输入纯数字或小数', trigger: 'change' }],
+          { pattern: /^-?\d+$/, message: '请输入纯数字', trigger: 'change' }],
         psy: [
-          { required: true, message: '请输入psy', trigger: 'change' },
-          { pattern: /^[0-9]+(\.[0-9]+)?$/, message: '请输入纯数字或小数', trigger: 'change' }
+          { required: true, message: '请输入psy', trigger: 'change' }
         ]
       },
       deptOptions: []
@@ -471,6 +471,7 @@ export default {
               if (res.code === 200) {
                 this.open = false
                 this.$message.success('操作成功')
+                this.queryParams.page = 1
                 this.getList()
                 this.reFrom()
               } else if (res.code === null) {
@@ -482,6 +483,7 @@ export default {
               if (res.code === 200) {
                 this.open = false
                 this.$message.success('操作成功')
+                this.queryParams.page = 1
                 this.getList()
                 this.reFrom()
               } else if (res.code === null) {

src/views/equipment/check.vue

@@ -37,12 +37,12 @@
         <el-button style="padding: 8px 7px;" icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
       </el-form-item>
       <div style="float: right">
-        
+
 
         <el-form-item>
           <el-button style="padding: 8px 7px;" :type="typePrimary" :size="smallSize" :icon="addIcon" @click="checkType">开始盘点  </el-button>
         </el-form-item>
-        
+
         <el-form-item>
           <el-button style="padding: 8px 7px;" type="danger" :size="smallSize" @click="deleteByType" icon="el-icon-minus">结束盘点 </el-button>
         </el-form-item>
@@ -50,7 +50,7 @@
         <el-form-item>
           <el-button style="padding: 8px 7px;" :type="'warning'" :size="smallSize" icon="el-icon-view" @click="checkInventory">查看盘点  </el-button>
         </el-form-item>
-        
+
       </div>
     </el-form>
     <div class="placeholder" />
@@ -165,7 +165,7 @@
           </el-col>
         </el-row>
 
-        
+
 
         <el-row>
           <el-col :span="12">
@@ -198,7 +198,7 @@
         </el-form-item>
           </el-col>
           <el-col :span="12">
-            
+
           </el-col>
         </el-row>
         <el-row>
@@ -213,7 +213,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        
+
       </el-form>
     </el-dialog>
     <el-dialog
@@ -223,7 +223,7 @@
       size="50%"
        >
       <el-table v-loading="loading" border :data="tableList" @selection-change="handleSelectionChange" style="padding: 0 10px;">
-        
+
         <el-table-column type="index" label="序号" width="80" />
 
         <el-table-column label="pn" prop="pn" >
@@ -291,7 +291,7 @@ export default {
       // 是否显示弹出层（数据详情）
       openDetails: false,
       // // TODO: 模拟测试数据
-    
+
       // check: '开始盘点',
       typeParent: 'text',
       typePrimary: 'primary',
@@ -387,7 +387,7 @@ export default {
         ptype: 1,
         pstatus:0,
         delFlag:0
-        
+
       },
       // 表单参数
       form: {

src/views/sample/sampleType/index.vue

@@ -163,9 +163,27 @@ export default {
       open: false,
       form: {},
       rules: {
-        pn: [{ required: true, message: '请输入pn', trigger: 'blur' }],
-        dname: [{ required: true, message: '请输入dname', trigger: 'blur' }],
-        dno: [{ required: true, message: '请输入dno', trigger: 'blur' }]
+        pn: [
+          { required: true, message: '请输入pn', trigger: 'blur' },
+          { pattern: /^[^`~!#$^&*()=|{}':;'\[\].<>/?~！#￥……&*（）——|{}【】‘；：·@”“'。，、？]+$/, // 使用正则表达式匹配不含特殊字符的内容
+            message: '不能含有特殊字符',
+            trigger: 'blur'
+          }
+        ],
+        dname: [
+          { required: true, message: '请输入dname', trigger: 'blur' },
+          { pattern: /^[^`~!#$^&*()=|{}':;'\[\].<>/?~！#￥……&*（）——|{}【】‘；：·@”“'。，、？]+$/, // 使用正则表达式匹配不含特殊字符的内容
+            message: '不能含有特殊字符',
+            trigger: 'blur'
+          }
+        ],
+        dno: [
+          { required: true, message: '请输入dno', trigger: 'blur' },
+          { pattern: /^[^`~!#$^&*()=|{}':;'\[\].<>/?~！#￥……&*（）——|{}【】‘；：·@”“'。，、？]+$/, // 使用正则表达式匹配不含特殊字符的内容
+            message: '不能含有特殊字符',
+            trigger: 'blur'
+          }
+        ]
       },
       total: 0,
       loading: false,
@@ -222,6 +240,7 @@ export default {
                 this.$message.success('操作成功')
                 this.getList()
                 this.reFrom()
+                this.queryParams.page = 1
               } else if (res.code === null) {
                 this.$message.error(res.message)
               }
@@ -233,6 +252,7 @@ export default {
                 this.$message.success('操作成功')
                 this.getList()
                 this.reFrom()
+                this.queryParams.page = 1
               } else if (res.code === null) {
                 this.$message.error(res.message)
               }