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

src/views/equipment/basicInfo.vue

@@ -135,14 +135,14 @@
       @pagination="getList"
     />
 
-    <!-- 添加或修改设备基本信息配置对话框 -->
+    <!-- 添加或修改 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false" @close="cancel">
       <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
         <el-form-item label="pn" prop="pn">
           <el-input
             ref="input1"
             v-model.trim="form.pn"
-            :maxlength="5"
+            :maxlength="100"
             placeholder="请输入pn"
             @keyup.enter.native="handelTab(1,$event)"
           />
@@ -179,7 +179,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="prank" prop="prank">
-          <el-input v-model.trim="form.prank" :maxlength="5" placeholder="请输入prank" />
+          <el-input v-model.trim="form.prank" :maxlength="9" placeholder="请输入prank" />
         </el-form-item>
         <el-form-item label="pissb" prop="pissb">
           <el-select
@@ -198,10 +198,10 @@
           </el-select>
         </el-form-item>
         <el-form-item label="psm" prop="psm">
-          <el-input v-model.trim="form.psm" :maxlength="5" placeholder="请输入psm" />
+          <el-input v-model.trim="form.psm" :maxlength="9" placeholder="请输入psm" />
         </el-form-item>
         <el-form-item label="psy" prop="psy">
-          <el-input v-model.trim="form.psy" :maxlength="5" placeholder="请输入psy" />
+          <el-input v-model.trim="form.psy" :maxlength="10" placeholder="请输入psy" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -217,7 +217,7 @@ import { add, listBasicInfo, updataInfo, getDetailById, deleteLogical } from '@/
 import { parseTime } from '@/utils'
 import { getDictData } from '@/api/equipment/application'
 export default {
-  name: 'Role',
+  name: 'BasicInfo',
   data() {
     return {
       // 遮罩层
@@ -288,8 +288,7 @@ export default {
       // 表单校验
       rules: {
         pn: [
-          { required: true, message: '请输入pn', trigger: 'change' },
-          { pattern: /^\d{1,5}$/, message: '请输入数字且少于五位', trigger: 'change' }
+          { required: true, message: '请输入pn', trigger: 'change' }
         ],
         ptype: [
           { required: true, message: '请选择ptype', trigger: 'change' }
@@ -299,16 +298,16 @@ export default {
         ],
         prank: [
           { required: true, message: '请输入prank', trigger: 'change' },
-          { pattern: /^\d{1,5}$/, message: '请输入数字且少于五位', trigger: 'change' }],
+          { pattern: /^[0-9]+(\.[0-9]+)?$/, message: '请输入纯数字或小数', trigger: 'change' }],
         pissb: [
           { required: true, message: '请选择pissb', trigger: 'blur' }
         ],
         psm: [
           { required: true, message: '请输入psm', trigger: 'change' },
-          { pattern: /^\d{1,5}$/, message: '请输入数字且少于五位', trigger: 'change' }],
+          { pattern: /^[0-9]+(\.[0-9]+)?$/, message: '请输入纯数字或小数', trigger: 'change' }],
         psy: [
           { required: true, message: '请输入psy', trigger: 'change' },
-          { pattern: /^\d{1,5}$/, message: '请输入数字且少于五位', trigger: 'change' }
+          { pattern: /^[0-9]+(\.[0-9]+)?$/, message: '请输入纯数字或小数', trigger: 'change' }
         ]
       },
       deptOptions: []
@@ -404,7 +403,11 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      // this.dateRange = []
+      this.queryParams = {
+        page: 1,
+        rows: 10,
+        ptype: ''
+      }
       this.resetForm('queryForm')
       this.handleQuery()
     },

src/views/equipment/draw.vue

@@ -235,13 +235,6 @@
           </template>
         </el-table-column>
       </el-table>
-<!--      <pagination-->
-<!--        v-show="totalDetail>0"-->
-<!--        :total="totalDetail"-->
-<!--        :page.sync="queryParams.page"-->
-<!--        :limit.sync="queryParams.rows"-->
-<!--        @pagination="getDeviceList"-->
-<!--      />-->
     </el-dialog>
 
     <!-- TODO: 处理 -->
@@ -348,7 +341,7 @@
 import { listWbApply, deleteLogical, detailList, batchAddition, detail } from '@/api/equipment/draw'
 import { parseTime } from '@/utils'
 export default {
-  name: 'Role',
+  name: 'Draw',
   data() {
     return {
       totalApplyDetail: 0,

src/views/equipment/income.vue

@@ -17,7 +17,7 @@
       <el-row :gutter="40" style="padding-left: 8.6%;">
         <el-col :span="12">
           <el-form-item label="厚度:" style="flex-basis: 50%;" prop="phd">
-            <el-input ref="input3" v-model="form.phd" placeholder="请输入厚度" :style="{ width: '400px', height: '30px' }" :maxlength="100" @keyup.enter.native="handelTab(3,$event)" />
+            <el-input ref="input3" v-model="form.phd" placeholder="请输入厚度" :style="{ width: '400px', height: '30px' }" :maxlength="10" @keyup.enter.native="handelTab(3,$event)" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -27,7 +27,7 @@
         </el-col>
       </el-row>
     </el-form>
-    <el-table border :data="tableData" style="width: 1250px; padding-left: 8.6%;">
+    <el-table border :data="tableData" :gutter="40" style="width: 85%; margin-left: 80px; padding-left: 8.6%;">
       <el-table-column type="index" label="序号" width="50px"/>
       <el-table-column label="pn" prop="businessId">
         <template slot-scope="scope">
@@ -106,17 +106,17 @@ export default {
       rule: {
         pn: [
           { required: true, message: '请输入pn', trigger: 'blur' },
-          { max: 100, message: '输入长度不能超过100个字符', trigger: 'blur' }
+          { max: 100, message: '输入长度不能超过100个字符', trigger: 'change' }
         ],
         lot: [
           { required: true, message: '请输入lot', trigger: 'blur' },
-          { max: 100, message: '输入长度不能超过100个字符', trigger: 'blur' }
+          { max: 100, message: '输入长度不能超过100个字符', trigger: 'change' }
         ],
         plocation: [
           { required: true, message: '请输入位置', trigger: 'blur' },
-          { max: 100, message: '输入长度不能超过100个字符', trigger: 'blur' }
+          { max: 100, message: '输入长度不能超过100个字符', trigger: 'change' }
         ],
-        phd: [{ pattern: /^\d+$/, message: '仅能输入数字', trigger: 'change' }]
+        phd: [{ pattern: /^\d+$/, message: '仅能输入整数', trigger: 'change' }]
       }
     }
   },
@@ -217,7 +217,6 @@ export default {
             this.form.pn = ''
             this.form.lot = ''
             this.form.phd = ''
-            this.form.plocation = ''
             this.form.index = undefined
           }
         }
@@ -259,9 +258,6 @@ export default {
     // 提交时要调的接口
     submitForm() {
       const {
-        pn,
-        lot,
-        phd,
         plocation
       } = this.form
       if (this.tableData.length === 0) {
@@ -273,12 +269,9 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        const newRow = {
-          pn,
-          lot,
-          phd,
-          plocation
-        }
+        // const newRow = {
+        //   plocation
+        // }
         this.$refs.form.validate((valid) => {
           if (valid) {
             console.log('form', this.form)
@@ -289,14 +282,12 @@ export default {
               if (res.code === 200) {
                 this.open = false
                 this.$message.success('操作成功')
-                this.tableData.push(newRow)
-                // 清空输入框
-                this.form.pn = ''
-                this.form.lot = ''
-                this.form.phd = ''
-                this.from.plocation = ''
+                this.tableData = []
+                this.form.plocation = ''
               } else if (res.code === null) {
                 this.$message.error(res.message)
+                // this.tableData = []
+                // this.form.plocation = ''
               }
             })
           } else {
@@ -335,5 +326,23 @@ export default {
 
 }
 
+.form-table-container {
+  display: flex;
+  flex-wrap: wrap;
+}
+
+.form-table-container > .el-row {
+  flex: 1 1 100%;
+}
+
+.form-table-container > .el-form-item {
+  width: 50%;
+}
+
+.form-table-container > .el-table {
+  width: 100%;
+  padding-left: 8.6%;
+}
+
 </style>
 

src/views/equipment/management.vue

@@ -127,7 +127,7 @@
           <el-input ref="input3" v-model.trim="form.plocation" :maxlength="30" placeholder="请输入plocation" @keyup.enter.native="handelTab(3,$event)" />
         </el-form-item>
         <el-form-item label="厚度" prop="phd">
-          <el-input ref="input4" v-model.trim="form.phd" :maxlength="30" placeholder="请输入厚度" @keyup.enter.native="handelTab(4,$event)" />
+          <el-input ref="input4" v-model.trim="form.phd" :maxlength="9" placeholder="请输入厚度" @keyup.enter.native="handelTab(4,$event)" />
         </el-form-item>
         <el-form-item label="psm" prop="psm">
           <el-input ref="input5" v-model.trim="form.psm" :maxlength="30" placeholder="请输入psm" @keyup.enter.native="handelTab(5,$event)" />
@@ -136,7 +136,7 @@
           <el-input ref="input6" v-model.trim="form.pzl" :maxlength="30" placeholder="请输入pzl" @keyup.enter.native="handelTab(6,$event)" />
         </el-form-item>
         <el-form-item label="parnk" prop="prank">
-          <el-input ref="input7" v-model.trim="form.prank" :maxlength="30" placeholder="请输入prank" @keyup.enter.native="handelTab(7,$event)" />
+          <el-input ref="input7" v-model.trim="form.prank" :maxlength="9" placeholder="请输入prank" @keyup.enter.native="handelTab(7,$event)" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">

src/views/processManagement/deviceReuse/index.vue

@@ -24,14 +24,14 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="厚度:" style="flex-basis: 50%;" prop="phd">
-            <el-input ref="input4" v-model="form.phd" placeholder="请输入厚度" :style="{ width: '400px', height: '30px' }" :maxlength="100" @keyup.enter.native="handelTab(4,$event)" />
+            <el-input ref="input4" v-model="form.phd" placeholder="请输入厚度" :style="{ width: '400px', height: '30px' }" :maxlength="10" @keyup.enter.native="handelTab(4,$event)" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="40">
         <el-col :span="12" style="padding-left: 10%;">
           <el-form-item label="psm:" style="flex-basis: 50%;" prop="psm">
-            <el-input ref="input5" v-model="form.psm" placeholder="请输入psm" :style="{ width: '400px', height: '30px' }" :maxlength="100" @keyup.enter.native="handelTab(5,$event)" />
+            <el-input ref="input5" v-model="form.psm" placeholder="请输入psm" :style="{ width: '400px', height: '30px' }" :maxlength="10" @keyup.enter.native="handelTab(5,$event)" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -43,7 +43,7 @@
       <el-row>
         <el-col :span="12" style="padding-left: 8.9%;">
           <el-form-item label="prank:" style="flex-basis: 50%;" prop="prank">
-            <el-input ref="input7" v-model="form.prank" placeholder="请输入prank" :style="{ width: '400px', height: '30px' }" :maxlength="100" @keyup.enter.native="handelTab(7,$event)" />
+            <el-input ref="input7" v-model="form.prank" placeholder="请输入prank" :style="{ width: '400px', height: '30px' }" :maxlength="10" @keyup.enter.native="handelTab(7,$event)" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -75,9 +75,27 @@ export default {
       },
       historForm: {},
       rule: {
-        pn: [{ required: true, message: '请输入pn', trigger: 'blur' }],
-        lot: [{ required: true, message: '请输入lot', trigger: 'blur' }],
-        plocation: [{ required: true, message: '请输入位置', trigger: 'blur' }],
+        pn: [
+          { required: true, message: '请输入pn', trigger: 'blur' },
+          { pattern: /^[^`~!#$^&*()=|{}':;'\[\].<>/?~！#￥……&*（）——|{}【】‘；：·@”“'。，、？]+$/, // 使用正则表达式匹配不含特殊字符的内容
+            message: '不能含有特殊字符',
+            trigger: 'blur'
+          }
+        ],
+        lot: [
+          { required: true, message: '请输入lot', trigger: 'blur' },
+          { pattern: /^[^`~!#$^&*()=|{}':;'\[\].<>/?~！#￥……&*（）——|{}【】‘；：·@”“'。，、？]+$/, // 使用正则表达式匹配不含特殊字符的内容
+            message: '不能含有特殊字符',
+            trigger: 'blur'
+          }
+        ],
+        plocation: [
+          { required: true, message: '请输入位置', trigger: 'blur' },
+          { pattern: /^[^`~!#$^&*()=|{}':;'\[\].<>/?~！#￥……&*（）——|{}【】‘；：·@”“'。，、？]+$/, // 使用正则表达式匹配不含特殊字符的内容
+            message: '不能含有特殊字符',
+            trigger: 'blur'
+          }
+        ],
         phd: [{ pattern: /^\d+$/, message: '请输入整数', trigger: 'change' }],
         psm: [{ pattern: /^\d+$/, message: '请输入整数', trigger: 'change' }],
         pzl: [{ pattern: /^\d+$/, message: '请输入整数', trigger: 'change' }],
@@ -125,7 +143,7 @@ export default {
                 this.$message.success('操作成功')
                 this.resetFrom()
               } else if (res.code === null) {
-                this.$message.success(res.message)
+                this.$message.error(res.message)
               }
             })
           }

src/views/processManagement/inventoryRecord/index.vue

@@ -4,12 +4,13 @@
       <el-form v-show="showSearch" ref="queryForm" style="padding: 0 0 0 10px" :model="queryEntity" :inline="true">
 
         <el-form-item label="pn" prop="pn">
+
           <el-input
             ref="autoGetFocusInput"
             v-model="queryEntity.entity.pn"
             placeholder="请输入pn"
             clearable
-            :maxlength="20"
+            :maxlength="inputMaxLength"
             size="small"
             @keyup.enter.native="handleQuery"
           />
@@ -20,7 +21,7 @@
             v-model="queryEntity.entity.lot"
             placeholder="请输入lot"
             clearable
-            :maxlength="20"
+            :maxlength="inputMaxLength"
             size="small"
             @keyup.enter.native="handleQuery"
           />
@@ -31,7 +32,7 @@
             v-model="queryEntity.entity.plocation"
             placeholder="请输入plocation"
             clearable
-            :maxlength="20"
+            :maxlength="inputMaxLength"
             size="small"
             @keyup.enter.native="handleQuery"
           />
@@ -234,6 +235,9 @@ export default {
       delIcon: 'el-icon-delete',
       exportIcon: 'el-icon-download',
 
+      // TODO: 限制搜索输入框的最大能输入数
+      inputMaxLength: 100,
+
       // TODO:遮罩层
       loading: true,
       // 非多个禁用
@@ -471,7 +475,6 @@ export default {
           return ''
       }
     },
-
     /** TODO: 查询按钮操作 */
     handleQuery() {
       this.queryParams.page = 1
@@ -599,8 +602,6 @@ export default {
     }
   }
 
-
-
   /* TODO: 专门用来解决el-input边框的问题 */
   .aboutSingleDetails{
     .el-form{

src/views/sample/inventoryRecord/index.vue

@@ -9,7 +9,7 @@
             v-model="queryEntity.entity.pn"
             placeholder="请输入pn"
             clearable
-            :maxlength="20"
+            :maxlength="inputMaxLength"
             size="small"
             @keyup.enter.native="handleQuery"
           />
@@ -20,7 +20,7 @@
             v-model="queryEntity.entity.lot"
             placeholder="请输入lot"
             clearable
-            :maxlength="20"
+            :maxlength="inputMaxLength"
             size="small"
             @keyup.enter.native="handleQuery"
           />
@@ -180,7 +180,8 @@ export default {
       exportSize: 'small',
       delIcon: 'el-icon-delete',
       exportIcon: 'el-icon-download',
-
+      // TODO: 限制搜索输入框的最大能输入数
+      inputMaxLength: 100,
       // TODO:遮罩层
       loading: true,
       // 非多个禁用
@@ -414,23 +415,17 @@ export default {
       }
       this.getList()
     },
-    /* TODO: 获取详情信息*/
     handleDetail: function(row) {
-      /* TODO: 如果库状态为‘废弃’，即为‘4’时，则可以进入 */
-      if (row.poperate !== '4') {
-        this.singleDetails = { ...row }
-      } else {
-        /* TODO: 设置单项详情的查询的条件 */
-        this.singleLogIdAndPn['businessId'] = row.businessId
-        this.singleLogIdAndPn['pn'] = row.pn
-        /* TODO: 进行单项详情的查询 */
-        findSingleLogDetail(this.singleLogIdAndPn).then(
-          response => {
-            this.title = '记录详情'
-            this.singleDetails = Object.assign({}, response.data, { ...row })
-          }
-        )
-      }
+      this.singleDetails = { ...row }
+      /* TODO: 设置单项详情的查询的条件 */
+      this.singleLogIdAndPn['businessId'] = row.businessId
+      this.singleLogIdAndPn['pn'] = row.pn
+      /* TODO: 进行单项详情的查询 */
+      findSingleLogDetail(this.singleLogIdAndPn).then(
+        response => {
+          this.singleDetails = Object.assign({}, response.data, { ...row })
+        }
+      )
       this.title = '记录详情'
       this.openDetails = true
     },