调整机构,用户页面

src/views/system/dept/extend.vue

@@ -32,7 +32,7 @@
         <el-row>
           <el-col :span="8">
             <el-form-item label="机构类型" v-if="false">
-              <el-select v-model="type" placeholder="机构类型">
+              <el-select v-model="type" placeholder="请选择机构类型">
                 <el-option
                   v-for="dict in dict.type.sys_org_type"
                   :key="dict.value"
@@ -44,26 +44,29 @@
           </el-col>
           <el-col :span="8">
             <el-form-item v-if="type == 4" label="城市天气区域">
-<!--              <el-input
+              <!--              <el-input
                 v-model="weatherAreaCode"
                 placeholder="天气区域编码"
                 @input="handleInput2"
               ></el-input>-->
-<!--              <el-select v-model="weatherAreaCode" placeholder="请选择"   clearable>
+              <!--              <el-select v-model="weatherAreaCode" placeholder="请选择"   clearable>
                 <el-option v-for="item in areaList" :key="item.key" :label="item.value" :value="item.key"></el-option>
               </el-select>-->
               <el-cascader
+              clearable
                 v-model="weatherAreaCode"
                 :options="areaList"
                 @change="selectArea"
+                placeholder="请选择城市天气区域"
               ></el-cascader>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item v-if="type == 4" label="营业场所面积">
               <el-input
+              clearable
                 v-model="premisesArea"
-                placeholder="营业场所面积"
+                placeholder="请输入营业场所面积"
                 @input="handleInput"
               ></el-input>
             </el-form-item>
@@ -95,14 +98,14 @@
                 v-model="lastUpdateTime"
                 type="date"
                 value-format="yyyy-MM-dd HH:mm:ss"
-                placeholder="请选择更新日期"
+                placeholder="请选择最近一次更新"
               >
               </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item v-if="type == 10" label="平台品牌">
-              <el-select v-model="platformBrand" placeholder="平台品牌">
+              <el-select clearable v-model="platformBrand" placeholder="请选择平台品牌">
                 <el-option
                   v-for="dict in dict.type.org_platform_brand"
                   :key="dict.value"
@@ -115,8 +118,9 @@
           <el-col :span="8">
             <el-form-item v-if="type == 10" label="平台供应商品牌">
               <el-select
+              clearable
                 v-model="platformSupplierBrand"
-                placeholder="平台供应商品牌"
+                placeholder="请选择平台供应商品牌"
               >
                 <el-option
                   v-for="dict in dict.type.org_platform_supplier_brand"
@@ -139,38 +143,32 @@
           label-position="left"
           label-width="120px"
         >
-        <el-row>
-          <el-col :span="8">
-            <el-form-item label="是否自有产权">
-              <el-select
-                         v-model="ownership"
-                         placeholder="是否自有产权"
-              >
-                <el-option
-                  v-for="dict in dict.type.property_situation"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="是否区域外">
-              <el-select
-                         v-model="outsideArea"
-                         placeholder="是否区域外"
-              >
-                <el-option
-                  v-for="dict in dict.type.org_extend_is"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                ></el-option>
-            </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="是否自有产权">
+                <el-select clearable v-model="ownership" placeholder="请选择是否自有产权">
+                  <el-option
+                    v-for="dict in dict.type.property_situation"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="是否区域外">
+                <el-select clearable v-model="outsideArea" placeholder="请选择是否区域外">
+                  <el-option
+                    v-for="dict in dict.type.org_extend_is"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
         </el-form>
       </div>
       <!--  表格   -->
@@ -299,8 +297,7 @@
               <el-image :src="uplp"></el-image>
             </div>
           </el-col> -->
-            <!--            <el-image class="zoom-image border-color-change" :src="uplp" fit="contain"></el-image>-->
-
+          <!--            <el-image class="zoom-image border-color-change" :src="uplp" fit="contain"></el-image>-->
         </el-row>
       </div>
     </div>
@@ -320,7 +317,11 @@
           <el-row>
             <el-col :span="7">
               <el-form-item label="业务库类型">
-                <el-select v-model="businessLibraryType" placeholder="请选择业务库类型">
+                <el-select
+                clearable
+                  v-model="businessLibraryType"
+                  placeholder="请选择业务库类型"
+                >
                   <el-option
                     v-for="dict in dict.type.business_library_type"
                     :key="dict.value"
@@ -1096,8 +1097,8 @@ import {
   updateOrgPhysicalDefenseConstruction,
   delOrgPhysicalDefenseConstruction,
 } from "@/api/system/OrgPhysicalDefenseConstruction";
-import {selectCityInfoVoList} from "@/api/core/weather";
-import TreeNodeDialogVue from '../../tool/build/TreeNodeDialog.vue';
+import { selectCityInfoVoList } from "@/api/core/weather";
+import TreeNodeDialogVue from "../../tool/build/TreeNodeDialog.vue";
 
 export default {
   dicts: [
@@ -1112,18 +1113,22 @@ export default {
     "org_extend_self_service_bank_standard",
     "org_extend_detached_standard",
     "org_extend_is",
-    "property_situation"
+    "property_situation",
   ],
   props: [],
   components: {},
   data() {
     return {
-      reqmsg:false,
+      reqmsg: false,
       //表单验证
       rules: {
         standard: [{ required: true, message: "请输入标准", trigger: "blur" }],
         dateOfCompliance: [
-          { required: TreeNodeDialogVue, message: "请输入达标日期", trigger: "blur" },
+          {
+            required: TreeNodeDialogVue,
+            message: "请输入达标日期",
+            trigger: "blur",
+          },
         ],
         certificate: [
           { validator: this.isreq, message: "请选择图片", trigger: "blur" },
@@ -1153,8 +1158,8 @@ export default {
       premisesArea: null,
       ownership: null,
       outsideArea: null,
-      askari: 1,
-      businessLibrary: 1,
+      askari: 0,
+      businessLibrary: 0,
       businessLibraryType: null,
       dutyMode: 0,
       remoteControl: null,
@@ -1238,44 +1243,42 @@ export default {
       propItem: "",
 
       row: "",
-      areaList:[],
+      areaList: [],
     };
   },
   watch: {
-    'detachedform.certificateEvidence'(newValue) {
+    "detachedform.certificateEvidence"(newValue) {
       if (newValue === 1) {
-        this.reqmsg=true;
+        this.reqmsg = true;
       }
       if (newValue === 0) {
-        this.reqmsg=false;
+        this.reqmsg = false;
       }
     },
-    'Bankform.certificateEvidence'(newValue) {
+    "Bankform.certificateEvidence"(newValue) {
       if (newValue === 1) {
-        this.reqmsg=true;
+        this.reqmsg = true;
       }
       if (newValue === 0) {
-        this.reqmsg=false;
+        this.reqmsg = false;
       }
     },
-    'Businessform.certificateEvidence'(newValue) {
+    "Businessform.certificateEvidence"(newValue) {
       if (newValue === 1) {
-        this.reqmsg=true;
+        this.reqmsg = true;
       }
       if (newValue === 0) {
-        this.reqmsg=false;
+        this.reqmsg = false;
       }
     },
-    'orgform.certificateEvidence'(newValue) {
+    "orgform.certificateEvidence"(newValue) {
       if (newValue === 1) {
-        this.reqmsg=true;
+        this.reqmsg = true;
       }
       if (newValue === 0) {
-        this.reqmsg=false;
+        this.reqmsg = false;
       }
     },
-
-
   },
   computed: {
     switchModel: {
@@ -1298,11 +1301,10 @@ export default {
   },
   mounted() {},
   methods: {
-
     isreq(rule, value, callback) {
-      if(this.reqmsg){
-        callback(new Error('证书为必填项'));
-      }else{
+      if (this.reqmsg) {
+        callback(new Error("证书为必填项"));
+      } else {
         callback();
       }
     },
@@ -1317,12 +1319,12 @@ export default {
       console.log(this.askariCertificate, "imgs");
     },
     getAreaList() {
-      selectCityInfoVoList({}).then(response => {
+      selectCityInfoVoList({}).then((response) => {
         this.areaList = response.data;
       });
     },
-    selectArea(value){
-      this.weatherAreaCode=value[1];
+    selectArea(value) {
+      this.weatherAreaCode = value[1];
     },
     downBusiness(file) {
       window.open(file);
@@ -1362,7 +1364,15 @@ export default {
     },
     handleInput() {
       // 使用正则表达式过滤输入，只保留数字和小数点
-      this.premisesArea = this.premisesArea.replace(/[^0-9.]/g, "");
+      // this.premisesArea = this.premisesArea.replace(/[^0-9.]/g, "");
+      // 限制只能输入1到999999之间的数字
+      let value = parseInt(this.premisesArea, 10); // 将输入的值转为整数
+
+      if (isNaN(value) || value < 1 || value > 999999) { // 判断是否在范围内
+        this.premisesArea = ''; // 不在范围内则清空输入的值
+      } else {
+        this.premisesArea = value.toString(); // 在范围内则保留输入的值
+      }
     },
     handleInput2() {
       // 使用正则表达式过滤输入，只保留数字和小数点
@@ -1478,7 +1488,7 @@ export default {
         updateBy: null,
         orgId: null,
       };
-      this.reqmsg=false;
+      this.reqmsg = false;
       this.resetForm("Businessform");
     },
     // 多选框选中数据
@@ -1543,9 +1553,7 @@ export default {
     handleBusinessDelete(row) {
       const Businessids = row.id || this.Businessids;
       this.$modal
-        .confirm(
-          '确认删除？'
-        )
+        .confirm("确认删除？")
         .then(function () {
           return delOrgPhysicalDefenseConstruction(Businessids);
         })
@@ -1578,7 +1586,7 @@ export default {
         updateBy: null,
         orgId: null,
       };
-      this.reqmsg=false;
+      this.reqmsg = false;
       this.resetForm("Bankform");
     },
     // 多选框选中数据
@@ -1642,7 +1650,7 @@ export default {
     handleBankDelete(row) {
       const Bankids = row.id || this.Bankids;
       this.$modal
-        .confirm('确认删除？')
+        .confirm("确认删除？")
         .then(function () {
           return delOrgPhysicalDefenseConstruction(Bankids);
         })
@@ -1673,7 +1681,7 @@ export default {
         updateBy: null,
         orgId: null,
       };
-      this.reqmsg=false;
+      this.reqmsg = false;
       this.resetForm("detachedform");
     },
     // 多选框选中数据
@@ -1737,9 +1745,7 @@ export default {
     handledetachedDelete(row) {
       const detachedids = row.id || this.detachedids;
       this.$modal
-        .confirm(
-          '确认删除？'
-        )
+        .confirm("确认删除？")
         .then(function () {
           return delOrgPhysicalDefenseConstruction(detachedids);
         })
@@ -1765,7 +1771,7 @@ export default {
         updateBy: null,
         orgId: null,
       };
-      this.reqmsg=false;
+      this.reqmsg = false;
       this.resetForm("orgform");
     },
     // 取消按钮
@@ -1833,7 +1839,7 @@ export default {
     handleOrgDelete(row) {
       const orgids = row.id || this.orgids;
       this.$modal
-        .confirm('确认删除？')
+        .confirm("确认删除？")
         .then(function () {
           return delOrgPhysicalDefenseConstruction(orgids);
         })
@@ -1849,8 +1855,8 @@ export default {
         weatherAreaCode: this.weatherAreaCode,
         askariCertificate: this.askariCertificate,
         premisesArea: this.premisesArea,
-        ownership: this.ownership ,
-        outsideArea: this.outsideArea ,
+        ownership: this.ownership,
+        outsideArea: this.outsideArea,
         askari: this.askari ? 1 : 0,
         businessLibraryType: this.businessLibraryType,
         dutyMode: this.dutyMode,

src/views/system/dept/index.vue

@@ -73,7 +73,7 @@
             <el-form-item label="状态" prop="isLock">
               <el-select
                 v-model="queryParams.isLock"
-                placeholder="机构状态"
+                placeholder="请选择状态"
                 clearable
               >
                 <el-option
@@ -87,7 +87,7 @@
             <el-form-item label="机构类型" prop="type">
               <el-select
                 v-model="queryParams.type"
-                placeholder="机构类型"
+                placeholder="请选择机构类型"
                 clearable
               >
                 <el-option
@@ -289,7 +289,7 @@
                 v-model="form.parentId"
                 :options="deptOptions2"
                 :normalizer="tenantIdnormalizer"
-                placeholder="选择上级机构"
+                placeholder="请选择上级机构"
               />
             </el-form-item>
           </el-col>

src/views/system/user/index.vue

@@ -30,15 +30,17 @@
                 @keyup.enter.native="handleQuery"
               />
             </el-form-item>
-            
-            <el-form-item label="用户角色" prop="roleIds">
-              <!-- <el-input
+            <el-form-item label="手机号码" prop="phone">
+              <el-input
                 v-model="queryParams.phone"
                 placeholder="请输入手机号码"
                 clearable
                 style="width: 200px"
                 @keyup.enter.native="handleQuery"
-              /> -->
+              />
+            </el-form-item>
+            <el-form-item label="用户角色" prop="roleIds">
+             
               <!-- @visible-change="selectAllRoles" -->
               <el-select
                 style="width: 200px"