优化界面

src/views/system/dept/extend.vue

@@ -125,37 +125,33 @@
     <div v-if="type == 4" class="info-box">
       <!--  下拉框选择    -->
       <div>
-        <span>是否自有产权</span>
-        <el-select style="margin-left: 30px;"
-                v-model="ownership"
-                placeholder="是否自有产权"
+        <el-form
+          inline
+          class="demo-form-inline"
+          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.org_extend_is"
+                  v-for="dict in dict.type.property_situation"
                   :key="dict.value"
                   :label="dict.label"
                   :value="dict.value"
                 ></el-option>
               </el-select>
-        <!-- <el-switch
-          v-model="ownership"
-          active-text
-          inactive-text="是否自有产权"
-          :active-value="1"
-          :inactive-value="0"
-        ></el-switch> -->
-        <!-- <el-switch
-          style="margin-left: 50px"
-          v-model="outsideArea"
-          active-text
-          inactive-text="是否区域外"
-          :active-value="1"
-          :inactive-value="0"
-        ></el-switch> -->
-        <span style="margin-left: 209px;">是否区域外</span>
-        <el-select style="margin-left: 45px;"
-                v-model="outsideArea"
-                placeholder="是否区域外"
+            </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"
@@ -163,7 +159,11 @@
                   :label="dict.label"
                   :value="dict.value"
                 ></el-option>
-              </el-select>
+            </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        </el-form>
       </div>
       <!--  表格   -->
       <div style="margin-top: 30px">
@@ -296,13 +296,13 @@
             </div>
           </el-col> -->
             <!--            <el-image class="zoom-image border-color-change" :src="uplp" fit="contain"></el-image>-->
-          
+
         </el-row>
       </div>
     </div>
     <el-switch
       v-if="type == 4"
-      style="margin-top: 30px"
+      style="margin-top: 30px; margin-left: 30px"
       v-model="businessLibrary"
       active-text
       inactive-text="是否有业务库"
@@ -1120,6 +1120,7 @@ export default {
     "org_extend_self_service_bank_standard",
     "org_extend_detached_standard",
     "org_extend_is",
+    "property_situation"
   ],
   props: [],
   components: {},

src/views/system/dept/index.vue

@@ -102,7 +102,7 @@
               size="mini"
               @click="showDialogEdit(0)"
               v-hasPermi="['system:dept:add']"
-              >新增离行式自助银行</el-button
+              ></el-button
             >
             <el-button
               type="primary"
@@ -291,6 +291,9 @@
                   :key="dict.value"
                   :label="dict.label"
                   :value="dict.value"
+                  v-show="addIndex == 2
+                  || (addIndex == 3 && dict.value == 5)
+                  || (addIndex == 3 && dict.value == 6)"
                 />
               </el-select>
             </el-form-item>
@@ -399,6 +402,8 @@ export default {
       deptList: [],
       // 总条数
       total: 0,
+      //新增机构打开标识
+      addIndex: 1,
       // 机构树选项
       deptOptions: [],
       deptOptions2: [],
@@ -575,6 +580,7 @@ export default {
     async handleAdd() {
       // console.log(this.queryParams.parentId, "this.queryParams.parentId");
       // console.log(this.form.parentId, "this.form.parentId");
+      this.addIndex = 3;
       this.reset();
       if (this.queryParams.parentId != undefined) {
         if (this.pId != -1) {
@@ -598,10 +604,11 @@ export default {
     },
     /** 修改按钮操作 */
     async handleUpdate(row) {
+      this.addIndex = 2;
       this.reset();
       getDept(row.id).then((response) => {
         this.form = response.data;
-        
+
         this.pId = response.data.parentId;
       });
       if (this.pId != -1) {
@@ -619,9 +626,10 @@ export default {
     },
     /** 提交按钮 */
     changeSubmitForm() {
+      this.addIndex = 2;
+      debugger
       this.$refs["form"].validate((valid) => {
         if (valid) {
-          console.log(this.form, "this.form");
           updateDept(this.form).then((response) => {
             this.$modal.msgSuccess("处理成功");
             this.open = false;
@@ -632,6 +640,7 @@ export default {
       });
     },
     addSubmitForm() {
+      this.addIndex = 3;
       this.$refs["form"].validate((valid) => {
         if (valid) {
           addDept(this.form).then((response) => {

src/views/system/device/index.vue

@@ -113,7 +113,7 @@
     <el-dialog :title="title" :visible="open" width="800px" append-to-body @close="cancel">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
-          <el-col :span="12">
+          <el-col :span="24">
             <el-form-item label="所属机构" prop="orgId">
               <tree-select
                 style="width: 100%"
@@ -122,18 +122,16 @@
               </tree-select>
             </el-form-item>
           </el-col>
-
+        </el-row>
+        <el-row>
           <el-col :span="12">
             <el-form-item label="资产类别" prop="assetType">
               <el-select style="width: 100%;" v-model="form.assetType" placeholder="请选择" @change="changeSelectDevice">
                 <el-option v-for="dict in dict.type.sys_asset_type" :key="dict.value" :label="dict.label"
-                  :value="`${dict.value}`"></el-option>
+                           :value="`${dict.value}`"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
-
           <el-col :span="12">
             <el-form-item label="设备分类" prop="deviceType">
               <el-select style="width: 100%" v-model="form.deviceType" placeholder="请选择">
@@ -141,13 +139,19 @@
               </el-select>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="12">
             <el-form-item label="设备名称" prop="deviceName">
               <el-input v-model="form.deviceName" placeholder="请输入" />
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="设备品牌" prop="deviceBrand">
+              <el-input v-model="form.deviceBrand" placeholder="请输入" maxlength="30" />
+            </el-form-item>
+          </el-col>
         </el-row>
-
         <el-row>
           <el-col :span="12">
             <el-form-item v-if="form.deviceType == 2" label="主机" prop="hostId">
@@ -168,12 +172,6 @@
 
         <el-row>
           <el-col :span="12">
-            <el-form-item label="设备品牌" prop="deviceBrand">
-              <el-input v-model="form.deviceBrand" placeholder="请输入" maxlength="30" />
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
             <el-form-item  v-if="form.assetType == 0" label="有效期至" prop="checkTime">
               <el-date-picker style="width: 100%" clearable v-model="form.checkTime" type="date" value-format="yyyy-MM-dd HH:mm:ss"
                 placeholder="请选择时间">

src/views/system/user/extend.vue

@@ -81,7 +81,7 @@
         </el-row>
 
         <el-row>
-   
+
           <el-col :xs="24" :sm="12" :md="8" :lg="6">
             <el-form-item label="持证上岗未通过原因" prop="certificateFailReason">
               <el-select style="width: 217px;" v-model="formData.certificateFailReason" placeholder="请选择">
@@ -135,13 +135,13 @@
                 @input="getImgUrl"></image-upload>
             </el-form-item>
           </el-col>
-          <el-col :xs="24" :sm="12" :md="8" :lg="6">
+          <!--<el-col :xs="24" :sm="12" :md="8" :lg="6">
             <el-form-item label="示例图">
               <div style="width: 280px;">
                 <el-image :src="uplp"></el-image>
               </div>
             </el-form-item>
-          </el-col>
+          </el-col>-->
         </el-row>
       </el-form>
     </div>

src/views/system/user/index.vue

@@ -335,7 +335,7 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="10">
+          <el-col :span="20">
             <el-form-item label="所属机构" prop="orgId">
               <tree-select
                 v-model="form.orgId"
@@ -348,11 +348,13 @@
               />
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="10">
             <el-form-item label="用户角色" prop="roleIds">
               <el-select
-              ref="mySelect"
-              @visible-change="selectRoles"
+                ref="mySelect"
+                @visible-change="selectRoles"
                 style="width: 100%"
                 v-model="form.roleIds"
                 multiple
@@ -368,18 +370,6 @@
               </el-select>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="10">
-            <el-form-item label="手机号码" prop="phone">
-              <el-input
-                v-model="form.phone"
-                placeholder="请输入手机号码"
-                maxlength="11"
-                :readonly="form.source == 1"
-              />
-            </el-form-item>
-          </el-col>
           <el-col :span="10">
             <el-form-item label="用户性别">
               <el-select
@@ -397,24 +387,16 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <!-- <el-col :span="12">
-            <el-form-item label="邮箱" prop="email">
-              <el-input v-model="form.phone" placeholder="请输入邮箱" maxlength="50" />
-            </el-form-item>
-          </el-col> -->
         </el-row>
         <el-row>
           <el-col :span="10">
-            <el-form-item label="状态">
-              <el-radio-group v-model="form.isLock">
-                <el-radio
-                  v-for="dict in dict.type.sys_user_is_lock"
-                  :key="`${dict.value}`"
-                  :label="dict.value"
-                  :disabled="form.source == 1"
-                  >{{ dict.label }}</el-radio
-                >
-              </el-radio-group>
+            <el-form-item label="手机号码" prop="phone">
+              <el-input
+                v-model="form.phone"
+                placeholder="请输入手机号码"
+                maxlength="11"
+                :readonly="form.source == 1"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="10">
@@ -429,6 +411,22 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="10">
+            <el-form-item label="状态">
+              <el-radio-group v-model="form.isLock">
+                <el-radio
+                  v-for="dict in dict.type.sys_user_is_lock"
+                  :key="`${dict.value}`"
+                  :label="dict.value"
+                  :disabled="form.source == 1"
+                  >{{ dict.label }}</el-radio
+                >
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>