令牌发放列表页增加搜索，新增页面必填项校验

src/components/safeControl/AddToken.vue

@@ -24,13 +24,13 @@
                     @click="tokenAnalysis"
                     >解析</el-button> -->
             </el-form-item>
-            
+            <el-form-item class="isRequired" label="服务商：">
+                 <el-input v-model="server" placeholder="请输服务商"></el-input>
+            </el-form-item>
              <el-form-item class="isRequired" label="医院：" >
                 <el-input v-model="hospital" placeholder="请输医院"></el-input>
             </el-form-item>
-             <el-form-item class="isRequired" label="服务商：">
-                 <el-input v-model="server" placeholder="请输服务商"></el-input>
-            </el-form-item>
+             
              <el-form-item class="isRequired" label="cpu：" >
                 {{this.cpu}}
             </el-form-item>

src/components/safeControl/TokenControl.vue

@@ -11,12 +11,15 @@
                     <el-select size="mini" v-model="filter.tagAdscription" @change="getValue"  placeholder="标签归属" clearable>
                         <el-option v-for="item in Adscriptions" :label="item.name" :value="item.val" :key="item.id" ></el-option>
                     </el-select>
-                </el-form-item>
-                <el-form-item label="标签系统名称：">
-                    <el-input size="mini" v-model="filter.tagSysName" placeholder="标签系统名称" clearable></el-input>
                 </el-form-item> -->
+                <el-form-item label="服务商：">
+                    <el-input size="mini" v-model="filter.server" placeholder="标签系统名称" clearable></el-input>
+                </el-form-item>
+                <el-form-item label="医院：">
+                    <el-input size="mini" v-model="filter.hospital" placeholder="标签系统名称" clearable></el-input>
+                </el-form-item>
                 <el-form-item>
-                    <!-- <el-button size="mini" @click="filterDatas">确认</el-button> -->
+                    <el-button size="mini" @click="filterDatas">确认</el-button>
                     <el-button size="mini" type="warning" @click="addToken">新增令牌</el-button>
                 </el-form-item>
             </el-form>
@@ -110,7 +113,8 @@ export default {
         return {
             list: [],
             filter: {
-              
+              hospital:'', 
+              server:''
             },
             currentPage: 1,
             modifier: '',
@@ -273,6 +277,8 @@ export default {
             const param = {
                 current: this.inCurrentPage||this.currentPage,
                 size: this.pageSize,
+                hospital: this.filter.hospital,
+                server: this.filter.server
             };
             return param;
         },