fix bug

src/assets/sass/common.scss

@@ -170,3 +170,9 @@
   .el-table--striped .el-table__body tr.el-table__row--striped.current-row td, .el-table__body tr.current-row>td {
     background-color: #C1D0F3!important;
   }
+  // 去除number框上下箭头
+  input[type=number]::-webkit-inner-spin-button,
+  input[type=number]::-webkit-outer-spin-button{
+    -webkit-appearance: none;
+    margin: 0;
+  }
\ No newline at end of file

src/views/education/MaterialDelivery.vue

@@ -253,6 +253,24 @@ export default {
     },
     conserve (data) {
       var $this = this
+      if (data.LID.trim() === '') {
+        $this.typeV = '5'
+        $this.deleteShow = true
+        $this.deletetext = '线体编号不能为空'
+        return
+      }
+      if (data.MID.trim() === '') {
+        $this.typeV = '5'
+        $this.deleteShow = true
+        $this.deletetext = '物料编号不能为空'
+        return
+      }
+      if (data.Quantity.trim() == '') {
+        $this.typeV = '5'
+        $this.deleteShow = true
+        $this.deletetext = '出库数量不能为空'
+        return
+      }
 
       this.$axios({
         method:"post",

src/views/education/MaterialWarehousingMoudle.vue

@@ -263,6 +263,24 @@ export default {
     },
     conserve (data) {
       var $this = this
+      if (data.LID.trim() === '') {
+        $this.typeV = '5'
+        $this.deleteShow = true
+        $this.deletetext = '线体编号不能为空'
+        return
+      }
+      if (data.MID.trim() === '') {
+        $this.typeV = '5'
+        $this.deleteShow = true
+        $this.deletetext = '物料编号不能为空'
+        return
+      }
+      if (data.Quantity.trim() == '') {
+        $this.typeV = '5'
+        $this.deleteShow = true
+        $this.deletetext = '入库数量不能为空'
+        return
+      }
       this.$axios({
         method:"post",
         url:`/api/MaterialWarehousing/MWarehousing_WindowAddSave`,

src/views/education/ProductionPlan.vue

@@ -235,6 +235,42 @@ export default {
         addFun(value){
           var $this = this
           let data = value
+          if (data.ProductID.trim() == '') {
+              $this.typeV = '5'
+              $this.deleteShow = true
+              $this.deletetext = '产品编号不能为空'
+              return
+            }
+          if (data.Quantity ==='' || data.Quantity <= 0) {
+              $this.typeV = '5'
+              $this.deleteShow = true
+              $this.deletetext = '计划数量不能为空且不能小于等于0'
+              return
+            }
+          if (data.VPID.trim() === '') {
+              $this.typeV = '5'
+              $this.deleteShow = true
+              $this.deletetext = '请绑定生产计划编号变量'
+              return
+            }
+          if (data.VPlanQuantity.trim() == '') {
+              $this.typeV = '5'
+              $this.deleteShow = true
+              $this.deletetext = '请绑定计划数量变量'
+              return
+            }
+          if (data.VDeliveryDt.trim() === '') {
+              $this.typeV = '5'
+              $this.deleteShow = true
+              $this.deletetext = '请绑定计划交货日期变量'
+              return
+            }
+          if (data.VStatus.trim() == '') {
+              $this.typeV = '5'
+              $this.deleteShow = true
+              $this.deletetext = '请绑定交货日期临近报警变量'
+              return
+            }
            console.log('value',value)
            if(data.DeliveryDt == 'Invalid date' || data.DeliveryDt == ''){
              console.log('停止')
@@ -263,6 +299,66 @@ export default {
          //编辑
         A_editFun(data){
           var $this = this
+          if (data.ProductID.trim() == '') {
+              $this.typeV = '5'
+              $this.deleteShow = true
+              $this.deletetext = '产品编号不能为空'
+              return
+            }
+          if (data.Quantity ==='' || data.Quantity <= 0) {
+              $this.typeV = '5'
+              $this.deleteShow = true
+              $this.deletetext = '计划数量不能为空且不能小于等于0'
+              return
+            }
+          if (data.VPID.trim() === '') {
+              $this.typeV = '5'
+              $this.deleteShow = true
+              $this.deletetext = '请绑定生产计划编号变量'
+              return
+            }
+          if (data.VPlanQuantity.trim() == '') {
+              $this.typeV = '5'
+              $this.deleteShow = true
+              $this.deletetext = '请绑定计划数量变量'
+              return
+            }
+          if (data.VDeliveryDt.trim() === '') {
+              $this.typeV = '5'
+              $this.deleteShow = true
+              $this.deletetext = '请绑定计划交货日期变量'
+              return
+            }
+          if (data.VStatus.trim() == '') {
+              $this.typeV = '5'
+              $this.deleteShow = true
+              $this.deletetext = '请绑定交货日期临近报警变量'
+              return
+            }
+          if (data.VPID.trim() === '') {
+            $this.typeV = '5'
+            $this.deleteShow = true
+            $this.deletetext = '请绑定生产计划编号变量'
+            return
+          }
+          if (data.VPlanQuantity.trim() == '') {
+              $this.typeV = '5'
+              $this.deleteShow = true
+              $this.deletetext = '请绑定计划数量变量'
+              return
+            }
+          if (data.VDeliveryDt.trim() === '') {
+              $this.typeV = '5'
+              $this.deleteShow = true
+              $this.deletetext = '请绑定计划交货日期变量'
+              return
+            }
+          if (data.VStatus.trim() == '') {
+              $this.typeV = '5'
+              $this.deleteShow = true
+              $this.deletetext = '请绑定交货日期临近报警变量'
+              return
+            }
             this.$axios({
               method:"post",
               url:`/api/Plan/Plan_WindowEditSave`,

src/views/education/component/linePop.vue

@@ -57,7 +57,7 @@
                 </div>
                   <div v-if="type == 6" style="margin-top: 20px" class="newName">
                     <span>产品编号：</span>
-                      <el-select class="apply applySelect" v-model="ProductID" clearable placeholder="请选择">
+                      <el-select class="apply applySelect" v-model="ProductID" placeholder="请选择">
                         <el-option
                         v-for="item in proList"
                         :key="item.ProNumber"
@@ -69,7 +69,7 @@
 
                  <div v-if="type == 7" style="margin-top:20px" class="name">
                     <span>工序名称：</span>
-                    <el-select class="apply" v-model="workValue" clearable placeholder="请选择">
+                    <el-select class="apply" v-model="workValue" placeholder="请选择">
                         <el-option
                         v-for="item in deviceOptions"
                         :key="item.name"
@@ -80,7 +80,7 @@
                 </div>
                 <div v-if="type == 7" style="margin-top:20px" class="name">
                     <span>线体名称：</span>
-                    <el-select class="apply" v-model="lineValue" clearable placeholder="请选择">
+                    <el-select class="apply" v-model="lineValue" placeholder="请选择">
                         <el-option
                         v-for="item in deviceOptions2"
                         :key="item.name"
@@ -108,7 +108,7 @@
                 
                  <div v-if="type == 5" style="margin-top:10px" class="name">
                     <span>产品工艺：</span>
-                     <el-select :disabled="istech" class="apply" v-model="applyValue" clearable placeholder="请选择">
+                     <el-select :disabled="istech" class="apply" v-model="applyValue" placeholder="请选择">
                         <el-option
                         v-for="item in technologyOptions"
                         :key="item.name"
@@ -131,7 +131,7 @@
                     <span>计划数量：</span>
                     <span @click="openRelate('VPlanQuantity')" class="relateBtn plan_relateBtn" >选 择</span>
                     <input v-model="VPlanQuantity" disabled class="name2_input"/>
-                    <input @change="dNumFun()" class="planName" style="width:460px;height:40px;margin-left:46px" v-model="Quantity" type="text"/>
+                    <input @change="dNumFun()" class="planName" style="width:460px;height:40px;margin-left:46px" v-model="Quantity" type="number"/>
                 </div>
                  <div v-if="type == 6" class="name2" style="margin:15px auto">
                     <span style="float:left;display:block">计划交货日期: </span>

src/views/education/component/relateDialog.vue

@@ -180,7 +180,7 @@ export default {
           var $this = this
           this.$axios({
             method:"post",
-            url:`/api/NewTrendChart/GstVariableList?argKeyWord=${this.argKeyWord}&argDevice=${this.argDevice}&argGroup=${this.argGroup}&argDataType=${this.argDataType}&argPageSize=${this.$refs.page.pageSize}&argPageIndex=${this.$refs.page.pageIndex}`,
+            url:`/api/FormulaManage/FormulaManage_GstVariableList?argKeyWord=${this.argKeyWord}&argDevice=${this.argDevice}&argGroup=${this.argGroup}&argDataType=${this.argDataType}&argPageSize=${this.$refs.page.pageSize}&argPageIndex=${this.$refs.page.pageIndex}`,
           }).then((res)=>{
               this.AllTableData = res.data.data.DataList.map(item => ({
                 ...item,