Parcourir la source

修改页面逻辑

lsj2008bj il y a 1 an
Parent
commit
f72e610fb4

+ 13 - 8
sso-ui/sso-ui-admin-vue3/src/views/system/dept/DeptForm.vue

@@ -24,8 +24,8 @@
       <el-form-item label="原机构名称"  prop="originalName" >
         <el-input v-model="formData.originalName" placeholder="请输入原机构名称" maxlength="60" />
       </el-form-item>
-      <el-form-item label="机构编码"  prop="code" >
-        <el-input v-model="formData.code" placeholder="请输入编码" maxlength="30" />
+      <el-form-item label="机构编码"  v-if="formData.id != undefined" prop="code"  >
+        <el-input v-model="formData.code" placeholder="请输入编码" maxlength="30" disabled/>
       </el-form-item>
       <el-form-item label="原机构编码"  prop="originalCode" >
         <el-input v-model="formData.originalCode" placeholder="请输入原机构编码" maxlength="30" />
@@ -135,12 +135,15 @@
 <!--          />-->
 <!--        </el-select>-->
 <!--      </el-form-item>-->
-<!--      <el-form-item label="联系电话" prop="phone">-->
-<!--        <el-input v-model="formData.phone" maxlength="11" placeholder="请输入联系电话"  />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="邮箱" prop="email">-->
-<!--        <el-input v-model="formData.email" maxlength="50" placeholder="请输入邮箱" />-->
-<!--      </el-form-item>-->
+      <el-form-item label="负责人" prop="leaderUserName">
+        <el-input v-model="formData.leaderUserName" maxlength="30" placeholder="请输入负责人"  />
+      </el-form-item>
+      <el-form-item label="联系电话" prop="phone">
+        <el-input v-model="formData.phone" maxlength="11" placeholder="请输入联系电话"  />
+      </el-form-item>
+      <el-form-item label="邮箱" prop="email">
+        <el-input v-model="formData.email" maxlength="50" placeholder="请输入邮箱" />
+      </el-form-item>
     </el-form>
     <template #footer>
       <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -175,6 +178,7 @@ const formData = ref({
   code: undefined,
   sort: undefined,
   leaderUserId: undefined,
+  leaderUserName: undefined,
   phone: undefined,
   email: undefined,
   status: CommonStatusEnum.ENABLE
@@ -258,6 +262,7 @@ const resetForm = () => {
     code: undefined,
     sort: undefined,
     leaderUserId: undefined,
+    leaderUserName: undefined,
     phone: undefined,
     email: undefined,
     status: CommonStatusEnum.ENABLE

+ 8 - 1
sso-ui/sso-ui-admin-vue3/src/views/system/dept/index.vue

@@ -65,7 +65,14 @@
 <!--        </template>-->
 <!--      </el-table-column>-->
       <el-table-column prop="code" label="编码" />
-      <el-table-column prop="sort" label="排序" />
+      <el-table-column prop="businessPattern" label="排序" >
+        <template #default="scope">
+          <span v-if="scope.row.businessPattern === 1">自建自营</span>
+          <span v-if="scope.row.businessPattern === 2">合作项目</span>
+          <span v-if="scope.row.businessPattern === 3">委托运营</span>
+          <span v-if="scope.row.businessPattern === 0">未设置</span>
+        </template>
+      </el-table-column>
       <el-table-column prop="status" label="状态">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />

+ 16 - 16
sso-ui/sso-ui-admin-vue3/src/views/system/oauth2/client/index.vue

@@ -30,14 +30,14 @@
       <el-form-item>
         <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
         <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
-        <el-button
-          plain
-          type="primary"
-          @click="openForm('create')"
-          v-hasPermi="['system:oauth2-client:create']"
-        >
-          <Icon icon="ep:plus" class="mr-5px" /> 新增
-        </el-button>
+<!--        <el-button-->
+<!--          plain-->
+<!--          type="primary"-->
+<!--          @click="openForm('create')"-->
+<!--          v-hasPermi="['system:oauth2-client:create']"-->
+<!--        >-->
+<!--          <Icon icon="ep:plus" class="mr-5px" /> 新增-->
+<!--        </el-button>-->
       </el-form-item>
     </el-form>
   </ContentWrap>
@@ -97,14 +97,14 @@
           >
             编辑
           </el-button>
-          <el-button
-            link
-            type="danger"
-            @click="handleDelete(scope.row.id)"
-            v-hasPermi="['system:oauth2-client:delete']"
-          >
-            删除
-          </el-button>
+<!--          <el-button-->
+<!--            link-->
+<!--            type="danger"-->
+<!--            @click="handleDelete(scope.row.id)"-->
+<!--            v-hasPermi="['system:oauth2-client:delete']"-->
+<!--          >-->
+<!--            删除-->
+<!--          </el-button>-->
         </template>
       </el-table-column>
     </el-table>

+ 1 - 1
sso-ui/sso-ui-admin-vue3/src/views/system/user/UserClientForm.vue

@@ -71,7 +71,7 @@
           <el-button
             type="primary"
             @click="handlerLink(scope.row.clientId)"
-            v-show = "scope.row.syncStatus==1"
+            v-show = "scope.row.syncStatus==1 && scope.row.permissionsLink==0"
             v-hasClient="[scope.row.clientId+'']"
           >
             权限设置