diff --git a/fuintAdmin_zt/src/api/system/Site/site.js b/fuintAdmin_zt/src/api/system/Site/site.js
index 29ae1188f..95cf8b2e5 100644
--- a/fuintAdmin_zt/src/api/system/Site/site.js
+++ b/fuintAdmin_zt/src/api/system/Site/site.js
@@ -17,6 +17,15 @@ export function Userlist(id) {
 
   })
 }
+
+export function getMaxNumber(data) {
+  return request({
+    url: '/system/dept/getMaxNumber',
+    method: 'post',
+    data: data
+  })
+}
+
 // 查询校色列表
 export function jklist() {
   return request({
diff --git a/fuintAdmin_zt/src/views/Site/index.vue b/fuintAdmin_zt/src/views/Site/index.vue
index 8c37dbef7..f50c8b2e1 100644
--- a/fuintAdmin_zt/src/views/Site/index.vue
+++ b/fuintAdmin_zt/src/views/Site/index.vue
@@ -156,7 +156,7 @@
             />
   <!--          tab第一张-->
               </el-tab-pane>
-            <el-tab-pane label="机构信息" name="info">
+            <el-tab-pane  label="机构信息" name="info">
 
                 <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="130px" class="demo-ruleForm">
                   <el-form-item label="父级节点" prop="name" v-if="ruleForm.parentId != 0">
@@ -167,7 +167,10 @@
   <!--                <el-form-item label="上级部门" prop="parentId">-->
   <!--                  <treeselect v-model="cascader" :options="Thetree" :normalizer="normalizer" @change="handleChanges"  placeholder="啊" />-->
   <!--                </el-form-item>-->
-                  <el-form-item label="连锁店/油站名称" prop="deptName">
+                  <el-form-item v-if="deptType == 2" label="油站名称" prop="deptName">
+                    <el-input :disabled="isTopDept" v-model="ruleForm.deptName"></el-input>
+                  </el-form-item>
+                  <el-form-item  v-else label="连锁店/油站名称" prop="deptName">
                     <el-input :disabled="isTopDept" v-model="ruleForm.deptName"></el-input>
                   </el-form-item>
                   <el-form-item label="负责人名称" prop="leaderName">
@@ -426,8 +429,8 @@
                           <el-form-item label="可创建油站数量" label-width="110px">
 <!--                            <el-input-number :disabled="isTopDept" v-model="ruleForm.storeNum" @change="handleChangeInputNumber" :min="1"-->
 <!--                                             :max="1000" label="可创建油站数量"></el-input-number>-->
-                            <el-input type="number" :disabled="isTopDept" v-model="ruleForm.storeNum":min="1" style="width: 200px"
-                                      :max="1000">
+                            <el-input type="number" :disabled="isTopDept" v-model="ruleForm.storeNum":min="1" style="width: 200px" @blur="getMax"
+                                      :max="maxNumber">
                               <template slot="append">个</template>
                             </el-input>
                           </el-form-item>
@@ -460,8 +463,8 @@
                           <el-form-item label="可创建油站数量" label-width="110px">
 <!--                            <el-input-number :disabled="isTopDept" v-model="ruleForm.storeNum" @change="handleChangeInputNumber" :min="1"-->
 <!--                                             :max="1000" label="可创建油站数量"></el-input-number>-->
-                            <el-input type="number" :disabled="isTopDept" v-model="ruleForm.storeNum":min="1" style="width: 200px"
-                                      :max="1000">
+                            <el-input type="number" :disabled="isTopDept" v-model="ruleForm.storeNum":min="1" style="width: 200px" @blur="getMax"
+                                      :max="maxNumber">
                               <template slot="append">个</template>
                             </el-input>
                           </el-form-item>
@@ -783,7 +786,7 @@ import {
   deptedit,
   deptDelete,
   Userlist,
-  jklist, getDutyList, isTopLevelNodesApi
+  jklist, getDutyList, isTopLevelNodesApi,getMaxNumber
 } from "@/api/system/Site/site";
   // import { getStoreStaffList } from "@/api/staff";
   import { getAccountList, getAccount, delAccount, addAccount, updateAccount, resetAccountPwd, changeAccountStatus } from "@/api/system/account";
@@ -817,6 +820,7 @@ export default {
         }
       };
       return {
+        maxNumber:1,
         storeNum: false,
         isEditDept:true,
         isTopDept:true,
@@ -983,9 +987,11 @@ export default {
           ],
           leaderPhone: [
             { required: true, message: '电话不能为空', trigger: 'blur' },
+            { pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的手机号码", trigger: "blur" }
           ],
           mobile: [
             { required: true, message: '手机号不能为空', trigger: 'blur' },
+            { pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的手机号码", trigger: "blur" }
           ],
           deptType: [
             { required: true, message: '机构类型不能为空', trigger: 'blur' },
@@ -1354,6 +1360,7 @@ export default {
         this.queryParams.deptId = data.id
         this.queryParams1.storeId = data.id
         this.deptType = data.deptType
+        this.deptId = data.id
         this.parentDeptType = data.deptType
         // 新增节点
         this.appedit(data.id,data.label)
@@ -1392,8 +1399,20 @@ export default {
         let arr = value
         this.ruleForm.parentId = arr[arr.length - 1]
       },
+
+      getMax(val){
+        getMaxNumber(this.ruleForm).then(res=>{
+          console.log("8888888888",this.ruleForm.storeNum)
+          console.log("7777777777",res.data)
+          if(res.code ==200){
+              this.ruleForm.storeNum=res.data
+          }
+        });
+      },
       //新增节点
       submitForms(formName) {
+
+
         console.log("timeFrame ",this.timeFrame)
         console.log("this.ruleForm ",this.ruleForm,this.ruleForm.parentId)
         this.$refs[formName].validate((valid) => {
@@ -1666,6 +1685,9 @@ export default {
           this.Thetree = response.data
           if(this.Thetree.length>0 && !this.queryParams.deptId) {
             this.queryParams.deptId = this.Thetree[0].id
+            this.deptId = this.Thetree[0].id
+            this.appedit(this.deptId)
+            console.log("fdfdnfdfdfddf",this.Thetree)
             this.form.deptType = this.Thetree[0].deptType
             this.queryParams1.storeId = this.Thetree[0].id
             console.log("this.Thetree",this.Thetree[0])
diff --git a/fuintAdmin_zt/src/views/tag/tagCode/index.vue b/fuintAdmin_zt/src/views/tag/tagCode/index.vue
index 3f253c469..beea1c98c 100644
--- a/fuintAdmin_zt/src/views/tag/tagCode/index.vue
+++ b/fuintAdmin_zt/src/views/tag/tagCode/index.vue
@@ -59,11 +59,12 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
     <el-table v-loading="loading" :data="codeList" @selection-change="handleSelectionChange">
-      <el-table-column type="index" >
+      <el-table-column label="序号" type="index" >
       </el-table-column>
 <!--      <el-table-column label="码牌二维码：域名+字符串" align="center" prop="tagCodeSn" />-->
+      <el-table-column label="二维码ID" align="center" prop="id" />
       <el-table-column label="二维码SN号" align="center" prop="tagCodeSn" />
-      <el-table-column label="图片地址" align="center" prop="imageUrl" >
+      <el-table-column label="二维码" align="center" prop="imageUrl" >
         <template slot-scope="scope">
 
           <el-image