前:准入范围查询;年审没到期不能添加

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/basicindex.vue

@@ -459,9 +459,9 @@
                   message: res.data.message
                 })
               } else if (res.data.code === -3) {
-                this.$confirm(res.data.message + '，点击继续可继续进行年审')
+                this.$confirm(res.data.message )
                   .then(_ => {
-                    this.addannualdirect()
+                    // this.addannualdirect()
                   })
                   .catch(_ => {})
               } else {
@@ -528,9 +528,9 @@
                   message: res.data.message
                 })
               } else if (res.data.code === -3) {
-                this.$confirm(res.data.message + '，点击继续可继续进行年审')
+                this.$confirm(res.data.message )
                   .then(_ => {
-                    this.addannualdirect()
+                    // this.addannualdirect()
                   })
                   .catch(_ => {})
               } else {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/goodsindex.vue

@@ -461,9 +461,9 @@
                 })
               } else if (res.data.code === -3) {
                 console.log('年审申请4444')
-                this.$confirm(res.data.message + '，点击继续可继续进行年审')
+                this.$confirm(res.data.message )
                   .then(_ => {
-                    this.addannualdirect()
+                    // this.addannualdirect()
                   })
                   .catch(_ => {})
               } else {
@@ -532,9 +532,9 @@
                 })
               } else if (res.data.code === -3) {
                 console.log('年审审批2222')
-                this.$confirm(res.data.message + '，点击继续可继续进行年审')
+                this.$confirm(res.data.message )
                   .then(_ => {
-                    this.addannualdirect()
+                    // this.addannualdirect()
                   })
                   .catch(_ => {})
               } else {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/techindex.vue

@@ -461,9 +461,9 @@ import WfHistory from '@/components/workflow/wfmultihistory.vue'
                   message: res.data.message
                 })
               } else if (res.data.code === -3) {
-                this.$confirm(res.data.message + '，点击继续可继续进行年审')
+                this.$confirm(res.data.message )
                   .then(_ => {
-                    this.addannualdirect()
+                    // this.addannualdirect()
                   })
                   .catch(_ => {})
               } else {
@@ -530,9 +530,9 @@ import WfHistory from '@/components/workflow/wfmultihistory.vue'
                   message: res.data.message
                 })
               } else if (res.data.code === -3) {
-                this.$confirm(res.data.message + '，点击继续可继续进行年审')
+                this.$confirm(res.data.message )
                   .then(_ => {
-                    this.addannualdirect()
+                    // this.addannualdirect()
                   })
                   .catch(_ => {})
               } else {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/basisbuild/index.vue

@@ -27,10 +27,10 @@
               start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
           </el-form-item>
           <el-form-item label="编码">
-            <el-input size="mini" v-model="searchForm.Code" style="width:100%" placeholder="请输入"></el-input>
+            <el-input size="mini" v-model="searchForm.Code" style="width:100%" placeholder="请输入" clearable></el-input>
           </el-form-item>
           <el-form-item label="名称">
-            <el-input size="mini" v-model="searchForm.Name" style="width:100%" placeholder="请输入"></el-input>
+            <el-input size="mini" v-model="searchForm.Name" style="width:100%" placeholder="请输入" clearable></el-input>
           </el-form-item>
 
           <el-form-item>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/goodsaptitude/index.vue

@@ -25,13 +25,16 @@
 
         </span>
         <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
-
           <el-form-item label="时间">
             <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
               start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
           </el-form-item>
-
-
+          <el-form-item label="编码">
+            <el-input size="mini" v-model="searchForm.Code" style="width:100%" placeholder="请输入" clearable></el-input>
+          </el-form-item>
+          <el-form-item label="名称">
+            <el-input size="mini" v-model="searchForm.Name" style="width:100%" placeholder="请输入" clearable></el-input>
+          </el-form-item>
           <el-form-item>
             <el-dropdown split-button type="primary" size="mini" @click="handleSearch" @command="searchCommand">
               查询

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

@@ -178,15 +178,16 @@
           </el-card>
         </el-tab-pane>
 
-        <el-tab-pane label="准入范围" :disabled="!certId">
-          <business-list ref="businessList" :data.sync="businessList" @close="getbuslist" :canadd="add_flat"
-            height="360px" style="margin-top: 20px"></business-list>
-        </el-tab-pane>
         <el-tab-pane label="企业资质" :disabled="!certId">
           <subfile-list ref="subfileList" :data.sync="subfileList" :canadd="add_flat" @close="selectAuditOrg"
             height="360px" style="margin-top: 20px"></subfile-list>
         </el-tab-pane>
 
+        <el-tab-pane label="准入范围" :disabled="!certId">
+          <business-list ref="businessList" :data.sync="businessList" @close="getbuslist" :canadd="add_flat"
+                         height="360px" style="margin-top: 20px"></business-list>
+        </el-tab-pane>
+
         <el-tab-pane label="审批流程" v-if="formDataCert.Status != 0">
           <el-card class="box-card" style="margin-top: 20px">
             <div slot="header" class="clearfix">

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

@@ -179,15 +179,16 @@
           </el-card>
         </el-tab-pane>
 
-        <el-tab-pane label="准入范围" :disabled="!certId">
-          <goods-list ref="goodsList" :data.sync="goodsList" @close="getbuslist" :canadd="add_flat" height="360px"
-            style="margin-top: 20px"></goods-list>
-        </el-tab-pane>
         <el-tab-pane label="企业资质" :disabled="!certId">
           <subfile-list ref="subfileList" :data.sync="subfileList" :canadd="add_flat" @close="selectAuditOrg"
             height="360px" style="margin-top: 20px"></subfile-list>
         </el-tab-pane>
 
+        <el-tab-pane label="准入范围" :disabled="!certId">
+          <goods-list ref="goodsList" :data.sync="goodsList" @close="getbuslist" :canadd="add_flat" height="360px"
+                      style="margin-top: 20px"></goods-list>
+        </el-tab-pane>
+
         <el-tab-pane label="审批流程" v-if="formDataCert.Status != 0">
           <el-card class="box-card" style="margin-top: 20px">
             <div slot="header" class="clearfix">

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

@@ -186,15 +186,17 @@
             </winning-list>
           </el-card>
         </el-tab-pane>
-        <el-tab-pane name="3" label="准入范围" :disabled="!certId">
-          <tech-list ref="techList" :data.sync="techList" @close="getbuslist" :canadd="add_flat" height="360px"
-            style="margin-top: 20px"></tech-list>
-        </el-tab-pane>
-        <el-tab-pane name="4" label="企业资质" :disabled="!certId">
+
+        <el-tab-pane name="3" label="企业资质" :disabled="!certId">
           <subfile-list ref="subfileList" :data.sync="subfileList" :canadd="add_flat" @close="selectAuditOrg"
             height="360px" style="margin-top: 20px"></subfile-list>
         </el-tab-pane>
 
+        <el-tab-pane name="4" label="准入范围" :disabled="!certId">
+          <tech-list ref="techList" :data.sync="techList" @close="getbuslist" :canadd="add_flat" height="360px"
+                     style="margin-top: 20px"></tech-list>
+        </el-tab-pane>
+
         <el-tab-pane name="5" label="审批流程" v-if="formDataCert.Status != 0">
           <el-card class="box-card" style="margin-top: 20px">
             <div slot="header" class="clearfix">

src/dashoo.cn/frontend_web/src/pages/oilsupplier/technologyservice/index.vue

@@ -26,7 +26,12 @@
             <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
               start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
           </el-form-item>
-
+          <el-form-item label="编码">
+            <el-input size="mini" v-model="searchForm.Code" style="width:100%" placeholder="请输入" clearable></el-input>
+          </el-form-item>
+          <el-form-item label="名称">
+            <el-input size="mini" v-model="searchForm.Name" style="width:100%" placeholder="请输入" clearable></el-input>
+          </el-form-item>
           <el-form-item>
             <el-dropdown split-button type="primary" size="mini" @click="handleSearch" @command="searchCommand">
               查询