update

src/views/education/component/head.vue

@@ -81,7 +81,7 @@ export default {
             productNameArr:[],
             argID:'',
             input:'',
-            placeText:'请输入名称',
+            placeText:'请输入关键字',
             headText:'产品名称',
             dateValue: [moment().format('YYYY-MM-DD 00:00:00'), moment().format('YYYY-MM-DD 23:59:59')],
             value:'不限',
@@ -218,7 +218,7 @@ export default {
                 ]
             } 
          }else{
-              this.placeText = '请输入名称'
+              this.placeText = '请输入关键字'
          }
       },
       methods:{

src/views/education/component/linePop.vue

@@ -32,6 +32,12 @@
                     <span>{{name}}编号：</span>
                     <input v-model="Nuber" class="nameipt" />
                 </div>
+
+                
+                 <div v-if="type == 4" style="margin-top:10px" class="name">
+                    <span>{{name}}编号：</span>
+                    <input v-model="numberV" class="nameipt" />
+                </div>
                                 
                 <div v-if="type != 6" class="name"  style="margin-top:10px">
                     <span>{{name}}名称：</span>
@@ -90,11 +96,6 @@
                     <input v-model="Proalert" disabled class="nameipt" style="width: 360px !important; margin-right: 25px;" />
                 </div>
 
-                 <div v-if="type == 4" style="margin-top:10px" class="name">
-                    <span>{{name}}编号：</span>
-                    <input v-model="numberV" class="nameipt" />
-                </div>
-
                  <div v-if="type == 5" style="margin-top:20px" class="name">
                     <span>{{name}}描述：</span>
                     <input v-model="prodescribe" class="nameipt" />
@@ -122,7 +123,7 @@
                 </div>
 
                 <div v-if="type == 4" style="margin-top:10px" class="name">
-                    <span>单位：</span>
+                    <span>物料单位：</span>
                     <input v-model="Company" class="nameipt" />
                 </div>
 

src/views/education/materiel.vue

@@ -180,7 +180,14 @@ export default {
         addFun(value){
            let data = value
            data.UpdateTime = value.CreateTime
-           console.log('materiel',value)
+           // 正则匹配只能输入数字+字母组合
+           var reg = /^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{2,20}$/
+           if (!reg.test(value.MID)) {
+              this.typeV = '5'
+              this.deleteShow = true
+              this.deletetext = '物料编号需为字母加数字组合'
+              return
+           }
             this.$axios({
               method:"post",
               url:`/api/Materiel/Materiel_WindowAddSave`,
@@ -204,7 +211,14 @@ export default {
         A_editFun(value){
             let data = value
             data.UpdateTime = value.CreateTime
-            console.log('编辑',value)
+            // 正则匹配只能输入数字+字母组合
+            var reg = /^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{2,20}$/
+            if (!reg.test(value.MID)) {
+                this.typeV = '5'
+                this.deleteShow = true
+                this.deletetext = '物料编号需为字母加数字组合'
+                return
+            }
             this.$axios({
               method:"post",
               url:`/api/Materiel/Materiel_WindowEditSave`,

src/views/education/technology.vue

@@ -255,6 +255,18 @@ export default {
               UpdateTime:value.CreateTime,
               Cells:[],
             }
+            if (value.Nuber.trim() == '') {
+              this.typeV = '5'
+              this.deleteShow = true
+              this.deletetext = '工艺编号不能为空'
+              return
+            }
+            if (value.Desc.trim() == '') {
+              this.typeV = '5'
+              this.deleteShow = true
+              this.deletetext = '工艺描述不能为空'
+            return
+            }
             var CellListName = []
             for(let i=0;i<value.data.length;i++){
                 var value1 = {

src/views/education/wordProcedure.vue

@@ -175,7 +175,14 @@ export default {
         addFun(value){
            let data = value
            data.UpdateTime = data.CreateTime
-           console.log('value==>',data)
+           // 正则匹配只能输入数字+字母组合
+            var reg = /^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{2,20}$/
+            if (!reg.test(value.CellNuber)) {
+                this.typeV = '5'
+                this.deleteShow = true
+                this.deletetext = '物料编号需为字母加数字组合'
+                return
+            }
             this.$axios({
               method:"post",
               url:`/api/Cell/Cell_WindowAddSave`,
@@ -199,7 +206,14 @@ export default {
         A_editFun(value){
             let data = value
             data.UpdateTime = data.CreateTime
-            console.log('编辑保存',data)
+            // 正则匹配只能输入数字+字母组合
+            var reg = /^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{2,20}$/
+            if (!reg.test(value.CellNuber)) {
+                this.typeV = '5'
+                this.deleteShow = true
+                this.deletetext = '物料编号需为字母加数字组合'
+                return
+            }
             this.$axios({
               method:"post",
               url:`/api/Cell/Cell_WindowEditSave`,