前:已入库保存判断准入范围

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierstore/_opera/basisedit.vue

@@ -809,17 +809,23 @@
       saveEntity () {
         this.$refs['BasisInfo'].$refs['EntityForm'].validate((valid) => {
           if (valid) {
-            if (!this.formData.SetupTime) {
-              this.formData.SetupTime = null
-            } else {
-              this.formData.SetupTime = new Date(this.formData.SetupTime)
-            }
-            // this.formData.WellNo = this.$refs.selectWellNo.selectedLabel + '';
-            if (!this.formData.Id || !this.certId) {
-              this.addEntity()
-            } else {
-              this.updateEntity()
-            }
+            this.$refs['BasisInfo'].$refs['EntityFormCert'].validate((valid1) => {
+              if (valid1) {
+                if (!this.formData.SetupTime) {
+                  this.formData.SetupTime = null
+                } else {
+                  this.formData.SetupTime = new Date(this.formData.SetupTime)
+                }
+                // this.formData.WellNo = this.$refs.selectWellNo.selectedLabel + '';
+                if (!this.formData.Id || !this.certId) {
+                  this.addEntity()
+                } else {
+                  this.updateEntity()
+                }
+              } else {
+                return false
+              }
+            })
           } else {
             return false
           }

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierstore/_opera/goodsedit.vue

@@ -819,17 +819,23 @@
       saveEntity () {
         this.$refs['GoodsInfo'].$refs['EntityForm'].validate((valid) => {
           if (valid) {
-            if (!this.formData.SetupTime) {
-              this.formData.SetupTime = null
-            } else {
-              this.formData.SetupTime = new Date(this.formData.SetupTime)
-            }
-            // this.formData.WellNo = this.$refs.selectWellNo.selectedLabel + '';
-            if (!this.formData.Id || !this.certId) {
-              this.addEntity()
-            } else {
-              this.updateEntity()
-            }
+            this.$refs['GoodsInfo'].$refs['EntityFormCert'].validate((valid1) => {
+              if (valid1) {
+                if (!this.formData.SetupTime) {
+                  this.formData.SetupTime = null
+                } else {
+                  this.formData.SetupTime = new Date(this.formData.SetupTime)
+                }
+                // this.formData.WellNo = this.$refs.selectWellNo.selectedLabel + '';
+                if (!this.formData.Id || !this.certId) {
+                  this.addEntity()
+                } else {
+                  this.updateEntity()
+                }
+              } else {
+                return false
+              }
+            })
           } else {
             return false
           }

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierstore/_opera/techedit.vue

@@ -804,17 +804,23 @@
       saveEntity () {
         this.$refs['TechInfo'].$refs['EntityForm'].validate((valid) => {
           if (valid) {
-            if (!this.formData.SetupTime) {
-              this.formData.SetupTime = null
-            } else {
-              this.formData.SetupTime = new Date(this.formData.SetupTime)
-            }
-            // this.formData.WellNo = this.$refs.selectWellNo.selectedLabel + '';
-            if (!this.formData.Id || !this.certId) {
-              this.addEntity()
-            } else {
-              this.updateEntity()
-            }
+            this.$refs['TechInfo'].$refs['EntityFormCert'].validate((valid1) => {
+              if (valid1) {
+                if (!this.formData.SetupTime) {
+                  this.formData.SetupTime = null
+                } else {
+                  this.formData.SetupTime = new Date(this.formData.SetupTime)
+                }
+                // this.formData.WellNo = this.$refs.selectWellNo.selectedLabel + '';
+                if (!this.formData.Id || !this.certId) {
+                  this.addEntity()
+                } else {
+                  this.updateEntity()
+                }
+              } else {
+                return false
+              }
+            })
           } else {
             return false
           }

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierstore/goodslist.vue

@@ -10,18 +10,18 @@
           <i class="icon icon-table2"></i> 物资类
         </span>
         <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
-          <el-form-item label="准入编码">
-            <el-input size="mini" v-model="searchForm.Code" style="width:100%" clearable placeholder="请输入"></el-input>
+          <el-form-item label="准入编码" style="margin-right: -23px">
+            <el-input size="mini" v-model="searchForm.Code" style="width:80%" clearable placeholder="请输入"></el-input>
           </el-form-item>
-          <el-form-item label="企业名称">
-            <el-input size="mini" v-model="searchForm.SupplierName" clearable style="width:100%" placeholder="请输入"></el-input>
+          <el-form-item label="企业名称" style="margin-right: -23px">
+            <el-input size="mini" v-model="searchForm.SupplierName" clearable style="width:80%" placeholder="请输入"></el-input>
           </el-form-item>
           <el-form-item label="时间">
-            <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" clearable type="daterange" range-separator="至"
+            <el-date-picker size="mini" style="width: 200px" v-model="CreateOn" clearable type="daterange" range-separator="至"
                             start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
           </el-form-item>
           <el-form-item label="准入标识">
-            <el-select size="mini" style="width:100px" v-model="InFlag" placeholder="准入标识">
+            <el-select size="mini" style="width:80px" v-model="InFlag" placeholder="准入标识">
               <el-option label="全部" value=""></el-option>
               <el-option label="准入" value="1"></el-option>
               <el-option label="暂停" value="2"></el-option>
@@ -36,7 +36,7 @@
                 <el-dropdown-item command="clear">查询重置</el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
-            <el-button type="primary" size="mini" style="margin-left:20px; margin-top: -4px;" @click="importExcel">导入中石油准入证编号</el-button>
+            <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" @click="importExcel">导入中石油准入证编号</el-button>
           </el-form-item>
         </el-form>
       </div>