init

src/api/modules/api.js

@@ -702,6 +702,14 @@ export function wifiFindById(query) {
     params:query
   })
 }
+//录音开启关闭
+export function audioStatusControl(data) {
+  return request({
+    url: 'autoSR/zk/equipment/audioStatusControl',
+    method:'post',
+    data
+  })
+}
 //Wifi修改
 export function wifiUpdate(data) {
   return request({

src/page/check/chose.vue

@@ -337,7 +337,11 @@ export default {
       }
     },
     chose(item) {
-      console.log(item);
+      // console.log(item);
+      if(item.lockFlag!=0){
+        this.$message.warning('您已经被禁用')
+        return
+      }
       if (this.flag == 1) {
         localStorage.setItem("agentId", item.id);
         localStorage.setItem("orgCode", '');

src/views/Customer/AgentManagement.vue

@@ -176,7 +176,7 @@
               </el-date-picker>
           </el-form-item>
           <el-form-item label="联系人：" prop="linkman">
-              <el-input v-model="addagentobj.linkman"   maxlength="8" clearable></el-input>
+              <el-input v-model="addagentobj.linkman"   maxlength="20" clearable></el-input>
           </el-form-item>
           <el-form-item label="联系手机：" prop="linkmanPhone">
               <el-input v-model="addagentobj.linkmanPhone"  type="tel"  maxlength="11" onkeypress="return (/[\d]/.test(String.fromCharCode(event.keyCode)));"></el-input>
@@ -206,7 +206,7 @@
           </el-form-item>
 
           <el-form-item label="详细地址：" prop="address">
-              <el-input v-model="addagentobj.address" type="textarea" maxlength="50"  show-word-limit></el-input>
+              <el-input v-model="addagentobj.address" type="textarea" maxlength="60"  show-word-limit></el-input>
           </el-form-item>
            <!-- <el-form-item label="运营人员：" prop="operationalPeople">
               <el-select v-model="addagentobj.operationalPeople" placeholder="请选择">
@@ -253,7 +253,7 @@
               </el-date-picker>
           </el-form-item>
           <el-form-item label="联系人：" prop="linkman">
-              <el-input v-model="editoragentobj.linkman"  maxlength="8" clearable></el-input>
+              <el-input v-model="editoragentobj.linkman"  maxlength="20" clearable></el-input>
           </el-form-item>
           <el-form-item label="联系手机：" prop="linkmanPhone">
               <el-input v-model="editoragentobj.linkmanPhone"  type="tel"  maxlength="11" onkeypress="return (/[\d]/.test(String.fromCharCode(event.keyCode)));"></el-input>
@@ -279,7 +279,7 @@
           </el-select>
           </el-form-item>
           <el-form-item label="详细地址：" prop="address">
-              <el-input v-model="editoragentobj.address" type="textarea" maxlength="50"  show-word-limit></el-input>
+              <el-input v-model="editoragentobj.address" type="textarea" maxlength="60"  show-word-limit></el-input>
           </el-form-item>
            <!-- <el-form-item label="运营人员：" prop="operationalPeople">
               <el-select v-model="editoragentobj.operationalPeople" placeholder="请选择">
@@ -342,6 +342,21 @@
 import { mapGetters } from "vuex";
 export default {
   data() {
+
+      var validatePass1 = (rule, value, callback) => {
+      if (value === "") {
+        // callback(new Error("请输入手机号"));
+        callback();
+      } else {
+        if (value) {
+          if (!/^1[3456789]\d{9}$/.test(value)) {
+            // alert("手机号码不合法，请重新输入");
+            callback(new Error("手机号格式错误，请重新输入"));
+          }
+        }
+        callback();
+      }
+    };
       var validatePass = (rule, value, callback) => {
       if (value === "") {
         callback(new Error("请输入管理员账号"));
@@ -461,7 +476,7 @@ export default {
             { required: true, message: '请选择时间', trigger: 'blur' },
           ],
          linkman: [
-            { required: true, message: '请输入联系人名称', trigger: 'blur' },
+            // { required: true, message: '请输入联系人名称', trigger: 'blur' },
           ],
           provinceId: [
             { required: true, message: '请输入选择省', trigger: 'blur' },
@@ -484,8 +499,9 @@ export default {
           { min: 6, max: 18, message: '请输入6~18位，数字或字母组合的密码', trigger: 'blur' }
           ],
           linkmanPhone: [
-            { required: true, message: '请输入联系人手机号', trigger: 'blur' },
-            { min: 11, max: 11, message: '请输入手机号', trigger: 'blur' }
+            // { required: true, message: '请输入联系人手机号', trigger: 'blur' },
+            // { min: 11, max: 11, message: '请输入手机号', trigger: 'blur' }
+            { validator: validatePass1, trigger: "blur" }
           ],
       },
       editorrules:{
@@ -496,7 +512,7 @@ export default {
             { required: true, message: '请选择时间', trigger: 'blur' },
           ],
          linkman: [
-            { required: true, message: '请输入联系人名称', trigger: 'blur' },
+            // { required: true, message: '请输入联系人名称', trigger: 'blur' },
           ],
           provinceId: [
             { required: true, message: '请输入选择省', trigger: 'blur' },
@@ -511,8 +527,9 @@ export default {
           //   { required: true, message: '请选择运营人员', trigger: 'blur' },
           // ],
           linkmanPhone: [
-            { required: true, message: '请输入联系人手机号', trigger: 'blur' },
-            { min: 11, max: 11, message: '请输入手机号', trigger: 'blur' }
+            // { required: true, message: '请输入联系人手机号', trigger: 'blur' },
+            // { min: 11, max: 11, message: '请输入手机号', trigger: 'blur' }
+            { validator: validatePass1, trigger: "blur" }
           ],
       },
       operaForm:{

src/views/Customer/CompanyRecord.vue

@@ -129,10 +129,10 @@
               </el-select> -->
           <!-- </el-form-item> -->
            <el-form-item label="公司名称：" prop="name">
-              <el-input v-model="addagentobj.name" maxlength="30"></el-input>
+              <el-input v-model="addagentobj.name" maxlength="60"></el-input>
           </el-form-item>
           <el-form-item label="联系人：" prop="contactPerson">
-              <el-input v-model="addagentobj.contactPerson"></el-input>
+              <el-input v-model="addagentobj.contactPerson"  maxlength="20"></el-input>
           </el-form-item>
           <el-form-item label="联系手机：" prop="contactNumber">
               <el-input v-model="addagentobj.contactNumber"    onkeypress="return (/[\d]/.test(String.fromCharCode(event.keyCode)));" maxlength="11"></el-input>
@@ -155,7 +155,7 @@
           </el-select>
           </el-form-item>
           <el-form-item label="详细地址：" prop="address">
-              <el-input v-model="addagentobj.address" type="textarea" maxlength="50"  show-word-limit></el-input>
+              <el-input v-model="addagentobj.address" type="textarea" maxlength="60"  show-word-limit></el-input>
           </el-form-item>
            <!-- <el-form-item label="运营人员：" prop="operationStaff">
               <el-select v-model="addagentobj.operationStaff" placeholder="请选择">
@@ -192,10 +192,10 @@
               </el-select> -->
           <!-- </el-form-item> -->
            <el-form-item label="公司名称：" prop="name">
-              <el-input v-model="editoragentobj.name" maxlength="30"></el-input>
+              <el-input v-model="editoragentobj.name" maxlength="60"></el-input>
           </el-form-item>
           <el-form-item label="联系人：" prop="contactPerson">
-              <el-input v-model="editoragentobj.contactPerson"></el-input>
+              <el-input v-model="editoragentobj.contactPerson" maxlength="20"></el-input>
           </el-form-item>
           <el-form-item label="联系手机：" prop="contactNumber">
               <el-input v-model="editoragentobj.contactNumber"  onkeypress="return (/[\d]/.test(String.fromCharCode(event.keyCode)));" maxlength="11"></el-input>
@@ -217,7 +217,7 @@
           </el-select>
           </el-form-item>
           <el-form-item label="详细地址：" prop="address">
-              <el-input v-model="editoragentobj.address"></el-input>
+              <el-input v-model="editoragentobj.address" type="textarea" maxlength="60"  show-word-limit></el-input>
           </el-form-item>
            <!-- <el-form-item label="运营人员：" prop="operationStaff">
               <el-select v-model="editoragentobj.operationStaff" placeholder="请选择">
@@ -356,7 +356,8 @@ export default {
     };
     var validatePass1 = (rule, value, callback) => {
       if (value === "") {
-        callback(new Error("请输入手机号"));
+        callback();
+        // callback(new Error("请输入手机号"));
       } else {
         if (value) {
           if (!/^1[3456789]\d{9}$/.test(value)) {
@@ -386,14 +387,14 @@ export default {
         //   ],
           name: [
             { required: true, message: '请输入公司名称', trigger: 'blur' },
-            { min: 1, max: 30, message: '最多输入30个汉字', trigger: 'blur' },
+            { min: 1, max: 60, message: '最多输入60个汉字', trigger: 'blur' },
           ],
          contactPerson: [
-            { required: true, message: '请输入联系人名称', trigger: 'blur' },
-            { min: 1, max: 10, message: '最多输入10个汉字', trigger: 'blur' }
+            { required: false, message: '请输入联系人名称', trigger: 'blur' },
+            { min: 1, max: 20, message: '最多输入20个汉字', trigger: 'blur' }
           ],
           contactNumber: [
-            { required: true, message: '请输入联系人手机号', trigger: 'blur' },
+            { required: false, message: '请输入联系人手机号', trigger: 'blur' },
             // { min: 11, max: 11, message: '请输入手机号', trigger: 'blur' }
              { validator: validatePass1, trigger: "blur" },
           ],
@@ -405,7 +406,7 @@ export default {
           ],
           address: [
             // { required: false, message: '请输入详细地址', trigger: 'blur' },
-            { min: 1, max: 50, message: '最多输入50个汉字', trigger: 'blur' },
+            { min: 1, max: 60, message: '最多输入60个汉字', trigger: 'blur' },
           ],
           // operationStaff: [
           //   { required: true, message: '请选择运营人员', trigger: 'blur' },
@@ -489,11 +490,11 @@ export default {
           // ],
           name: [
             { required: true, message: '请输入公司名称', trigger: 'blur' },
-            { min: 1, max: 30, message: '最多输入30个汉字', trigger: 'blur' },
+            { min: 1, max: 60, message: '最多输入60个汉字', trigger: 'blur' },
           ],
          contactPerson: [
-            { required: true, message: '请输入联系人名称', trigger: 'blur' },
-            { min: 1, max: 10, message: '最多输入10个汉字', trigger: 'blur' },
+            { required: false, message: '请输入联系人名称', trigger: 'blur' },
+            { min: 1, max: 20, message: '最多输入20个汉字', trigger: 'blur' },
           ],
           contactNumber: [
             // { required: true, message: '请输入联系人手机号', trigger: 'blur' },
@@ -508,7 +509,7 @@ export default {
           ],
           address: [
             { required: true, message: '请输入详细地址', trigger: 'blur' },
-            { min: 1, max: 50, message: '最多输入50个汉字', trigger: 'blur' },
+            { min: 1, max: 60, message: '最多输入60个汉字', trigger: 'blur' },
           ],
           // operationStaff: [
           //   { required: true, message: '请选择运营人员', trigger: 'blur' },
@@ -887,6 +888,7 @@ export default {
           operatorName:this.operatorName,
           operationStaffName:this.operationStaffName,
           name:this.name,
+          operationType:1,
           agentId:localStorage.getItem('agentId'),
           orgType: localStorage.getItem("orgType"),
       }

src/views/Customer/Companymanagement.vue

@@ -787,6 +787,7 @@ export default {
           operatorName:this.operatorName,
           operationStaffName:this.operationStaffName,
           name:this.name,
+          operationType:0,
           agentId:localStorage.getItem('agentId'),
           orgType: localStorage.getItem("orgType"),
       }

src/views/Customer/index.vue

@@ -46,18 +46,21 @@
         </div>
         <div class="toptimeqhuan">
           <div
+            style="cursor: pointer;"
             :class="{ tophove: searchForm.dateType == 0 }"
             @click="tabtimetap(0)"
           >
             今日
           </div>
           <div
+            style="cursor: pointer;"
             :class="{ tophove: searchForm.dateType == 2 }"
             @click="tabtimetap(2)"
           >
             近7天
           </div>
           <div
+            style="cursor: pointer;"
             :class="{ tophove: searchForm.dateType == 6 }"
             @click="tabtimetap(6)"
           >

src/views/Equipment/index.vue

@@ -396,11 +396,11 @@
                 >
                 <el-dropdown-item
                   command="toinfobinding"
-                  v-if="orgType == 0 && equ_index_bind"
+                  v-if="orgType == 0 && equ_index_bind&&row.receiveType!=2"
                   >绑定</el-dropdown-item
                 >
                 <!-- <el-dropdown-item command="infoeditor">修改</el-dropdown-item> -->
-                <el-dropdown-item command="toinifodelete" v-if="equ_index_del"
+                <el-dropdown-item command="toinifodelete" v-if="equ_index_del&&row.receiveType!=2"
                   >删除</el-dropdown-item
                 >
               </el-dropdown-menu>
@@ -1133,6 +1133,10 @@ export default {
     },
     //绑定
     toinfobinding(row) {
+      if(row.receiveType==2){
+        this.$message.warning('设备使用中不能删除')
+        return
+      }
       this.dialogVisible3 = true;
       this.bindForm.imeis = row.imei;
     },
@@ -1210,10 +1214,10 @@ export default {
             });
         })
         .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消",
-          });
+          // this.$message({
+          //   type: "info",
+          //   message: "已取消",
+          // });
         });
     },
     //验收
@@ -1339,6 +1343,10 @@ export default {
     },
     //删除
     toinifodelete(row) {
+      if(row.receiveType==2){
+        this.$message.warning('设备使用中不能删除')
+        return
+      }
       this.$confirm("此操作将永久删除, 是否继续?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",

src/views/Equipment/state.vue

@@ -275,7 +275,7 @@
         </el-table-column>
         <el-table-column prop="simAudioStatus" label="录音状态" align="center">
           <template slot-scope="{ row }">
-            {{ row.simAudioStatus ? "开启" : "关闭" }}
+            {{ row.simAudioStatus=='true' ? "开启" : "关闭" }}
           </template>
         </el-table-column>
         <el-table-column
@@ -365,6 +365,7 @@
                   }}指示灯</el-dropdown-item
                 >
                 <el-dropdown-item v-if="equ_state_WiFi" command="wifiShow">WiFi管理</el-dropdown-item>
+                <el-dropdown-item v-if="equ_state_Voice" command="voiceOpen">录音{{row.simAudioStatus=='true'?'关闭':'开启'}}</el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
           </template>
@@ -554,11 +555,11 @@ export default {
       ],
       uploadStatusList: [
         {
-          value: true,
+          value: false,
           label: "无上传",
         },
         {
-          value: false,
+          value: true,
           label: "上传中",
         },
       ],
@@ -688,10 +689,10 @@ export default {
       dialogVisible5: false,
       wifiVisible: false,
       customColors: [
-        { color: "#f56c6c", percentage: 20 },
-        { color: "#e6a23c", percentage: 40 },
-        { color: "#5cb87a", percentage: 60 },
-        { color: "#1989fa", percentage: 80 },
+        { color: "red", percentage: 20 },
+        // { color: "#e6a23c", percentage: 40 },
+        // { color: "#5cb87a", percentage: 60 },
+        // { color: "#1989fa", percentage: 80 },
         { color: "#6f7ad3", percentage: 100 },
       ],
     };
@@ -707,6 +708,7 @@ export default {
     this.equ_state_unbind = this.permissions["equ_state_unbind"];
     this.equ_state_take = this.permissions["equ_state_take"];
     this.equ_state_WiFi = this.permissions["equ_state_WiFi"];
+    this.equ_state_Voice = this.permissions["equ_state_Voice"];
   },
   mounted() {
     this.getTableList();
@@ -823,10 +825,7 @@ export default {
             });
         })
         .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消批量归还",
-          });
+
         });
     },
     zkequipmentUnbind() {
@@ -856,10 +855,7 @@ export default {
             });
         })
         .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消操作",
-          });
+
         });
     },
     zkhousePage() {
@@ -986,6 +982,33 @@ export default {
           this.userList = res.data;
         });
     },
+    voiceOpen(row){
+        this.$confirm(
+        `确认${row.simAudioStatus == "true" ? "关闭" : "开启"}录音吗?`,
+        "提示",
+        {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        }
+      )
+        .then(() => {
+          this.$api.api
+            .audioStatusControl({
+              imeis: row.imei,
+              simAudioStatus: row.simAudioStatus == "true" ? "false" : "true",
+            })
+            .then((res) => {
+              this.$message({
+                type: "success",
+                message: "操作成功!",
+              });
+              this.getTableList();
+            });
+        })
+        .catch(() => {
+        });
+    },
     // 指示灯开启关闭
     lightStatusChange(row) {
       this.$confirm(
@@ -1012,10 +1035,6 @@ export default {
             });
         })
         .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消操作",
-          });
         });
     },
     openAllLight() {
@@ -1043,10 +1062,6 @@ export default {
             });
         })
         .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消操作",
-          });
         });
     },
     closeAllLight() {
@@ -1074,10 +1089,6 @@ export default {
             });
         })
         .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消操作",
-          });
         });
     },
     //归还
@@ -1101,10 +1112,7 @@ export default {
             });
         })
         .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消归还",
-          });
+
         });
     },
     timeChange(e) {

src/views/Statistics/dataScreeAge.vue

@@ -85,9 +85,13 @@
           <div class="text2">{{ firstTab.agentQuantity || 0 }}</div>
         </div> -->
         <div class="grid-content">
+          <div class="text1">服务器内楼盘总数</div>
+          <div class="text2">{{ firstTab.houseQofEnough || 0 }}</div>
+        </div>
+        <!-- <div class="grid-content">
           <div class="text1">服务器内代理商数</div>
           <div class="text2">{{ firstTab.agentQofEnough || 0 }}</div>
-        </div>
+        </div> -->
         <!-- <div class="grid-content">
           <div class="text1">过期代理商数</div>
           <div class="text2">

src/views/Statistics/houseDataSys.vue

@@ -163,7 +163,7 @@
         </div>
         <div class="grid-content" @click="secondChange('2')"  style="height:auto;cursor: pointer;">
           <div class="text1" :class="{ tophovese: secindex == 2 }">
-            服务器内楼盘数
+            服务期内楼盘数
           </div>
           <div class="text2" :class="{ tophovese: secindex == 2 }">
             {{ compare.houseQofEnough || 0 }}
@@ -322,7 +322,7 @@ export default {
             arr1.push(item.data);
           });
         } else if (idx == 2) {
-          Strname = ["服务器内楼盘数"];
+          Strname = ["服务期内楼盘数"];
           this.compare.houseQofEnoughList.map((item) => {
             timeDate.push(item.time.substring(5, 10));
             arr1.push(item.data);
@@ -412,7 +412,7 @@ export default {
       this.checked = false;
       this.selectTime = "";
       this.selectTime1 = "";
-      //给时间选择器赋值
+      //给时间选择期赋值
       let num = 24 * 3600 * 1000;
       //	获取当前时间戳转换为日期格式
       if (this.dateType == 4) {

src/views/admin/dept/index.vue

@@ -215,7 +215,16 @@ export default {
           console.log(res);
           this.deptList=res.data
           if(this.deptList.length==0){
-            this.$message.warning('没有别的部门啦！')
+            // this.$message.warning('没有别的部门啦！')
+          this.$api.api.deptDel({
+            houseId:this.houseId,
+            // ...this.deptForm,
+           })
+           .then(res=>{
+             console.log(res);
+             this.deptFindByPage();
+             this.$message.success('删除成功')
+           })
           }else{
             this.deptVisible = true;
           }

src/views/admin/log/index.vue

@@ -174,6 +174,7 @@ export default {
         name: "",
         params: "",
       };
+      this.time=[]
       this.value = "";
       this.getList(this.page);
     },

src/views/admin/log/log.vue

@@ -175,6 +175,7 @@ export default {
         params: "",
       };
       this.value = "";
+      this.time=[]
       this.getList(this.page);
     },
     timeChange(e) {

src/views/admin/user/index.vue

@@ -364,7 +364,7 @@
         @current-change="handleCurrentChange"
         :current-page.sync="page.current"
         :page-sizes="[10, 30, 50]"
-        :page-size="page.pageSize"
+        :page-size="page.size"
         layout="total, sizes,prev, pager, next, jumper"
         :total="page.total"
       >
@@ -790,9 +790,8 @@
             background
             @size-change="handleSizeChange1"
             @current-change="handleCurrentChange1"
-            :current-page.sync="page.current"
-            :page-size="page1.pageSize"
-            layout="total,size, prev, pager, next, jumper"
+            :current-page.sync="page1.current"
+            :page-size="page1.size"
             :total="page1.total"
           >
           </el-pagination>
@@ -1082,13 +1081,13 @@ export default {
       page: {
         total: 0, // 总页数
         current: 1, // 当前页数
-        pageSize: 10, // 每页显示多少条,
+        size: 10, // 每页显示多少条,
         isAsc: false, // 是否倒序
       },
       page1: {
         total: 0, // 总页数
         current: 1, // 当前页数
-        pageSize: 10, // 每页显示多少条,
+        size: 10, // 每页显示多少条,
         isAsc: false, // 是否倒序
       },
       list: [],
@@ -1819,7 +1818,7 @@ export default {
           accountId: this.accountId,
           orgCode: this.orgCode,
           current: this.page1.current,
-          pageSize: this.page1.pageSize,
+          size: this.page1.size,
           ...this.searchhouseMsg,
         })
         .then((res) => {
@@ -2118,7 +2117,7 @@ export default {
     },
     //分页器
     handleSizeChange(val) {
-      this.page.pageSize = val;
+      this.page.size = val;
       this.roleList();
       console.log(`每页 ${val} 条`);
     },
@@ -2129,7 +2128,7 @@ export default {
     },
     //分页器
     handleSizeChange1(val) {
-      this.page1.pageSize = val;
+      this.page1.size = val;
       this.gethouseList();
       console.log(`每页 ${val} 条`);
     },
@@ -2370,7 +2369,7 @@ export default {
         Object.assign(
           {
             current: page.currentPage,
-            size: page.pageSize,
+            size: page.size,
           },
           params,
           this.searchForm
@@ -2388,8 +2387,8 @@ export default {
       this.getList(this.page, param);
       done();
     },
-    sizeChange(pageSize) {
-      this.page.pageSize = pageSize;
+    sizeChange(size) {
+      this.page.size = size;
     },
     currentChange(current) {
       this.page.currentPage = current;

src/views/building/Count.vue

@@ -183,7 +183,7 @@
         </el-table-column>
         <!-- <el-table-column prop="agentName" label="代理商" align="center">
         </el-table-column> -->
-        <el-table-column prop="area" label="服务器内楼盘" align="center">
+        <el-table-column prop="area" label="服务期内楼盘" align="center">
         </el-table-column>
         <el-table-column prop="onlineQuantity" label="在线设备" align="center">
         </el-table-column>
@@ -229,9 +229,9 @@
         <el-table  v-if="activeTotal==1" :data="tableData" stripe style="width: 100%">
         <el-table-column prop="agentName" label="代理商名称" align="center">
         </el-table-column>
-        <!-- <el-table-column prop="area" label="服务器内公司" align="center">
+        <!-- <el-table-column prop="area" label="服务期内公司" align="center">
         </el-table-column> -->
-        <el-table-column prop="houseQuantityOfEnough" label="服务器内楼盘" align="center">
+        <el-table-column prop="houseQuantityOfEnough" label="服务期内楼盘" align="center">
         </el-table-column>
         <el-table-column prop="sumReception" label="接待量" align="center">
         </el-table-column>

src/views/building/index.vue

@@ -205,7 +205,7 @@
         >
           <template slot-scope="{ row }">
             {{
-              row.houseType == 0 ? "正式" : row.houseType == 1 ? "试用" : "演示"
+              row.houseType == 0 ? "正式" : row.houseType == 1 ? "试用" :row.houseType == 2? "演示":'测试'
             }}
           </template>
         </el-table-column>
@@ -320,7 +320,7 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item label="联系人" prop="linkman">
-          <el-input v-model="ruleForm.linkman" maxlength="8" clearable></el-input>
+          <el-input v-model="ruleForm.linkman" maxlength="20" clearable></el-input>
         </el-form-item>
         <el-form-item label="联系手机" prop="linkmanPhone">
           <el-input
@@ -343,7 +343,7 @@
           ></el-cascader>
         </el-form-item>
         <el-form-item label="详细地址" prop="address">
-          <el-input v-model="ruleForm.address"  type="textarea" maxlength="50"  show-word-limit></el-input>
+          <el-input v-model="ruleForm.address"  type="textarea" maxlength="60"  show-word-limit></el-input>
         </el-form-item>
         <!-- <el-form-item
           label="运营人员"
@@ -537,7 +537,8 @@ export default {
   data() {
     var validatePass = (rule, value, callback) => {
       if (value === "") {
-        callback(new Error("请输入手机号"));
+        // callback(new Error("请输入手机号"));
+        callback();
       } else {
         if (value) {
           if (!/^1[3456789]\d{9}$/.test(value)) {
@@ -744,6 +745,9 @@ export default {
             { validator: validatePass1, trigger: "blur" }
           ],
         linkmanPhone: [{ validator: validatePass, trigger: "blur" }],
+        provinceId:[
+           { required: true, message: "请选择省市", trigger: "change" },
+        ]
       },
       operaForm: {
         operationalPeople: "",