cloud-web-corejs 1.0.54-dev.52 → 1.0.54-dev.520

package/src/views/user/request_setting/list.vue

@@ -0,0 +1,248 @@
+<template>
+  <div id="containt">
+    <el-tabs v-model="activeName" class="tab-box">
+      <el-tab-pane :label="$t1('常规')" name="first">
+        <editView v-if="showEdit" visible-key="showEdit" :_dataId.sync="dataId" :copyId.sync="copyId"
+                  :parent-target="_self" @reload="$reloadHandle"></editView>
+      </el-tab-pane>
+      <el-tab-pane :label="$t1('列表')" name="second">
+        <div class="grid-height">
+          <vxe-grid ref="table-m1" v-bind="vxeOption" @resizable-change="$vxeTableUtil.onColumnWitchChange"
+                    @custom="$vxeTableUtil.customHandle">
+            <template #form>
+              <div class="clearfix screen-btns">
+                <div class="fl">
+                  <vxe-button status="primary" class="button-sty" icon="el-icon-plus" @click="openEditDialog">{{ $t1('新增') }}
+                  </vxe-button>
+                </div>
+                <div class="fr">
+                  <vxe-button icon="el-icon-brush" class="button-sty" @click="resetEvent" type="text" status="primary"
+                              plain>{{$t1('重置')}}
+                  </vxe-button>
+                  <vxe-button status="warning" icon="el-icon-search" class="button-sty" @click="searchEvent">
+                    {{$t1('搜索')}}
+                  </vxe-button>
+                </div>
+              </div>
+              <vxe-form ref="form" class="screen-box" title-width="92px" title-align="right" :data="formData"
+                        @submit="searchEvent" @reset="searchEvent">
+                <vxe-form-item title="请求编码:" field="reqCode">
+                  <template v-slot>
+                    <el-input v-model="formData.reqCode" size="small" clearable/>
+                  </template>
+                </vxe-form-item>
+                <vxe-form-item title="请求名称:" field="reqName">
+                  <template v-slot>
+                    <el-input v-model="formData.reqName" size="small" clearable/>
+                  </template>
+                </vxe-form-item>
+                <vxe-form-item title="是否启用:" field="enabled">
+                  <template v-slot>
+                    <el-select v-model="formData.enabled" clearable>
+                      <el-option :value="true" label="启用"></el-option>
+                      <el-option :value="false" label="禁用"></el-option>
+                    </el-select>
+                  </template>
+                </vxe-form-item>
+              </vxe-form>
+            </template>
+          </vxe-grid>
+        </div>
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+<script>
+import editView from './edit.vue';
+
+export default {
+  name: 'request_setting:list',
+  components: {editView},
+  data() {
+    return {
+      activeName: 'second',
+      dataId: 0,
+      copyId: 0,
+      showEdit: false,
+      showAdvancedSearch: false,
+      vxeOption: {},
+      formData: {},
+      advancedFormData: {},
+    };
+  },
+  mounted() {
+    this.initTableList();
+  },
+  methods: {
+    searchEvent() {
+      this.$refs['table-m1'].commitProxy('reload');
+    },
+    resetEvent() {
+      this.formData = {};
+      this.advancedFormData = {};
+      this.$refs['table-m1'].commitProxy('reload');
+    },
+    openEditDialog(id) {
+      this.copyId = 0;
+      this.dataId = !id || typeof id == 'object' ? 0 : id;
+      this.activeName = 'first';
+      this.$openEditView('showEdit');
+    },
+    initTableList() {
+      let that = this;
+      let pushTypeMap = {0: '异步推送', 1: '同步调用'};
+      let tableOption = {
+        vue: this,
+        tableRef: 'table-m1',
+        tableName: 'user_requestSetting_list-m1',
+        path: USER_PREFIX + '/request_setting/listPage',
+        param: () => {
+          return {
+            ...this.formData,
+            ...this.advancedFormData
+          }
+        },
+        columns: [
+          {type: 'checkbox', width: 48, resizable: false, fixed: 'left'},
+          {
+            title: '请求名称',
+            field: 'reqName',
+            width: 150,
+            fixed: 'left'
+          },
+          {
+            title: '请求编码',
+            field: 'reqCode',
+            width: 150,
+            fixed: 'left'
+          },
+          {
+            title: '请求Url',
+            field: 'url',
+            width: 150
+          },
+          {
+            title: '请求头',
+            field: 'header',
+            width: 150
+          },
+          {
+            title: '连接超时',
+            field: 'connectTimeout',
+            width: 150
+          },
+          {
+            title: '读取超时',
+            field: 'readTimeout',
+            width: 150
+          },
+          {
+            field: 'enabled',
+            title: this.$t1('是否启用'),
+            width: 150,
+            slots: {
+              default: ({row}) => {
+                if (row.enabled) {
+                  return [
+                    <div class="txt-status">
+                      <span>启用</span>
+                    </div>
+                  ];
+                } else {
+                  return [
+                    <div class="txt-status disable">
+                      <span>禁用</span>
+                    </div>
+                  ];
+                }
+              }
+            }
+          },
+          {
+            title: '备注',
+            field: 'remark',
+            width: 150
+          },
+          {
+            title: '执行组织编码',
+            field: 'exeCompanyCode',
+            width: 150
+          },
+          {
+            field: 'enabled',
+            title: this.$t1('是否启用'),
+            width: 150,
+            slots: {
+              default: ({row}) => {
+                if (row.enabled) {
+                  return [
+                    <div class="txt-status">
+                      <span>启用</span>
+                    </div>
+                  ];
+                } else {
+                  return [
+                    <div class="txt-status disable">
+                      <span>禁用</span>
+                    </div>
+                  ];
+                }
+              }
+            }
+          },
+          {
+            field: 'createBy',
+            title: this.$t1('创建人'),
+            width: 150
+          },
+          {
+            field: 'createDate',
+            title: this.$t1('创建时间'),
+            width: 150
+          },
+          {
+            field: 'modifyBy',
+            title: this.$t1('更新人'),
+            width: 150
+          },
+          {
+            field: 'modifyDate',
+            title: this.$t1('更新时间'),
+            width: 150
+          },
+          {
+            width: 47,
+            fixed: 'right',
+            title: '',
+            sortable: false,
+            slots: {
+              default: ({row}) => {
+                return [
+                  <div>
+                    <a
+                      href="javascript:void(0);"
+                      class="a-link"
+                      onclick={() => {
+                        this.openEditDialog(row.id);
+                      }}
+                    >
+                      <el-tooltip enterable={false} effect="dark" content={ this.$t1('查看') } placement="top"
+                                  popper-class="tooltip-skin">
+                        <i class="el-icon-edit"/>
+                      </el-tooltip>
+                    </a>
+                  </div>
+                ];
+              }
+            }
+          }
+        ]
+      };
+      this.$vxeTableUtil.initVxeTable(tableOption).then(opts => {
+        this.vxeOption = opts;
+      });
+    }
+  }
+};
+</script>

package/src/views/user/role/authConfig.vue

@@ -0,0 +1,89 @@
+<template>
+  <el-form
+    :model="formData"
+    status-icon
+    label-width="100px"
+    class="demo-ruleForm"
+    style="border: solid 1px #e9e9e9; padding: 5px"
+  >
+    <el-form-item :label="$t1('查询数据权限')">
+      <el-radio-group
+        v-model="formData.permissions"
+        @change="formData.menuRolePermOrgDTOs = []"
+      >
+        <el-radio :label="1">{{ $t1("创建人") }}</el-radio>
+        <el-radio :label="3">{{ $t1("所有") }}</el-radio>
+        <el-radio :label="2">{{ $t1("当前与下级所有机构权限") }}</el-radio>
+      </el-radio-group>
+    </el-form-item>
+    <el-form-item :label="$t1('额外机构')" v-if="formData.permissions == 2">
+      <el-tag
+        v-for="(item, index) in formData.menuRolePermOrgDTOs"
+        :key="index"
+        type="warning"
+        :disable-transitions="false"
+        :closable="true"
+        @close="formData.menuRolePermOrgDTOs.splice(index, 1)"
+      >
+        <el-tooltip
+          :enterable="false"
+          effect="dark"
+          :content="item.saleOrgName"
+          placement="bottom"
+        >
+          <span>{{ item.saleOrgName }}</span>
+        </el-tooltip>
+      </el-tag>
+      <el-button
+        icon="el-icon-plus"
+        type="warning"
+        class="el-button-tag"
+        @click="openProjectTagDialog"
+      ></el-button>
+    </el-form-item>
+    <saleOrgsDialog
+      v-if="showSaleOrgsDialog"
+      :visiable.sync="showSaleOrgsDialog"
+      @confirm="confirmSaleOrgsDialog"
+    ></saleOrgsDialog>
+  </el-form>
+</template>
+<script>
+import saleOrgsDialog from "@base/views/user/sale_org/dialog.vue";
+export default {
+  props: {
+    formData: {
+      type: Object,
+      default: () => {},
+    },
+  },
+  components: {
+    saleOrgsDialog,
+  },
+  data() {
+    return {
+      showSaleOrgsDialog: false,
+    };
+  },
+  methods: {
+    openProjectTagDialog() {
+      this.showSaleOrgsDialog = true;
+    },
+    confirmSaleOrgsDialog(rows) {
+      if (rows.length) {
+        let ids = this.formData.menuRolePermOrgDTOs.map((item) => item.saleOrgId);
+        let items = rows
+          .filter((item) => !ids.includes(item.id))
+          .map((item) => {
+            return {
+              menus: this.formData.id,
+              saleOrgId: item.id,
+              saleOrgName: item.name,
+            };
+          });
+        if (items.length) this.formData.menuRolePermOrgDTOs.push(...items);
+      }
+    },
+  },
+};
+</script>

package/src/views/user/role/dialog.vue

@@ -12,7 +12,7 @@
     v-el-drag-dialog
     v-el-dialog-center
   >
-    <div class="cont" style="height:450px">
+    <div class="cont" style="height: 65vh">
       <vxe-grid
         class="is-pointer"
         ref="table-m1"
@@ -26,24 +26,41 @@
         <template #form>
           <div class="clearfix screen-btns">
             <div class="fr">
-              <vxe-button icon="el-icon-brush" class="button-sty" @click="resetEvent" type="text" status="primary"
-                          plain>{{ $t1('重置') }}
+              <vxe-button
+                icon="el-icon-brush"
+                class="button-sty"
+                @click="resetEvent"
+                type="text"
+                status="primary"
+                plain
+                >{{ $t1("重置") }}
               </vxe-button>
-              <vxe-button status="warning" icon="el-icon-search" class="button-sty" @click="searchEvent">
-                {{ $t1('搜索') }}
+              <vxe-button
+                status="warning"
+                icon="el-icon-search"
+                class="button-sty"
+                @click="searchEvent"
+              >
+                {{ $t1("搜索") }}
               </vxe-button>
             </div>
           </div>
-          <vxe-form class="screen-box" title-width="92px" title-align="right" :data="formData" @submit="searchEvent"
-                    @reset="resetEvent">
-            <vxe-form-item :title="$t1('用户角色')+':'" field="name">
+          <vxe-form
+            class="screen-box"
+            title-width="92px"
+            title-align="right"
+            :data="formData"
+            @submit="searchEvent"
+            @reset="resetEvent"
+          >
+            <vxe-form-item :title="$t1('用户角色') + ':'" field="name">
               <template v-slot>
-                <el-input v-model="formData.name" size="small" clearable/>
+                <el-input v-model="formData.name" size="small" clearable />
               </template>
             </vxe-form-item>
-            <vxe-form-item :title="$t1('角色编码')+':'" field="code">
+            <vxe-form-item :title="$t1('角色编码') + ':'" field="code">
               <template v-slot>
-                <el-input v-model="formData.code" size="small" clearable/>
+                <el-input v-model="formData.code" size="small" clearable />
               </template>
             </vxe-form-item>
             <vxe-button type="submit" @click="searchEvent" v-show="false"></vxe-button>
@@ -58,9 +75,12 @@
       </div>
     </label>
     <div class="multipleChoice">
-      <el-tooltip :enterable="false" effect="dark" :content="$t1('全部删除')" placement="top"><a
-        class="allDel icon-quanbushanchu"
-        @click="clearChecked()"></a>
+      <el-tooltip
+        :enterable="false"
+        effect="dark"
+        :content="$t1('全部删除')"
+        placement="top"
+        ><a class="allDel icon-quanbushanchu" @click="clearChecked()"></a>
       </el-tooltip>
       <div class="list">
         <div class="item" v-for="(checkRow, index) in checkRows" :key="index">
@@ -70,25 +90,27 @@
       </div>
     </div>
     <span slot="footer" class="dialog-footer">
-      <span class="fl tips" v-if="!selectMulti">{{ $t1('注：双击确认选择（单选）') }}</span>
+      <span class="fl tips" v-if="!selectMulti">{{
+        $t1("注：双击确认选择（单选）")
+      }}</span>
       <el-button type="primary" plain class="button-sty" @click="dialogClose">
         <i class="el-icon-close el-icon"></i>
-        {{ $t1('取 消') }}
+        {{ $t1("取 消") }}
       </el-button>
       <el-button type="primary" @click="dialogPrimary" class="button-sty">
         <i class="el-icon-check el-icon"></i>
-        {{ $t1('确 定') }}
+        {{ $t1("确 定") }}
       </el-button>
     </span>
   </el-dialog>
 </template>
 
 <script>
-import {selectDialogMixins} from '@base/mixins/selectDialog/index.js';
+import { selectDialogMixins } from "@base/mixins/selectDialog/index.js";
 
 export default {
-  name: 'roleDialog',
-  props: ['visiable', 'multi', 'rows', 'param'],
+  name: "roleDialog",
+  props: ["visiable", "multi", "rows", "param"],
   mixins: [selectDialogMixins],
   created() {
     this.initSetting();
@@ -103,64 +125,64 @@ export default {
       falseValue: false,
       selectMulti: true,
       formData: {},
-      vxeOption: {}
+      vxeOption: {},
     };
   },
   methods: {
     initTableM1() {
       let that = this;
-      let url = USER_PREFIX + '/role/listCurrentPage';
+      let url = USER_PREFIX + "/role/listCurrentPage";
       let tableOption = {
         vue: that,
-        tableRef: 'table-m1',
-        tableName: 'basic_role_dialog-m1',
+        tableRef: "table-m1",
+        tableName: "basic_role_dialog-m1",
         path: url,
         param: () => {
           return {
             ...this.formData,
-            ...this.param
+            ...this.param,
           };
         },
         columns: [
-          {type: 'checkbox', width: 48, resizable: false, fixed: 'left'},
-          {title: this.$t1('用户角色'), field: 'name', width: 250, fixed: 'left'},
-          {title: this.$t1('角色编码'), field: 'code', width: 150},
-          {title: this.$t1('角色描述'), field: 'description', width: 150},
+          { type: "checkbox", width: 48, resizable: false, fixed: "left" },
+          { title: this.$t1("用户角色"), field: "name", width: 250, fixed: "left" },
+          { title: this.$t1("角色编码"), field: "code", width: 150 },
+          { title: this.$t1("角色描述"), field: "description", width: 150 },
           {
-            title: this.$t1('是否内置'),
-            field: 'systems',
+            title: this.$t1("是否内置"),
+            field: "systems",
             width: 150,
             slots: {
-              default: ({row}) => {
+              default: ({ row }) => {
                 if (row.systems) {
-                  return this.$t1('是');
+                  return this.$t1("是");
                 } else {
-                  return this.$t1('否');
+                  return this.$t1("否");
                 }
-              }
-            }
+              },
+            },
           },
-          {title: this.$t1('所属组织'), field: 'companyName', width: 150},
-          {title: this.$t1('创建时间'), field: 'createDate', width: 150},
+          { title: this.$t1("所属组织"), field: "companyName", width: 150 },
+          { title: this.$t1("创建时间"), field: "createDate", width: 150 },
           {
             width: 47,
-            fixed: 'right',
-            title: '',
-            sortable: false
-          }
+            fixed: "right",
+            title: "",
+            sortable: false,
+          },
         ],
         config: {
           checkboxConfig: {
             checkStrictly: true,
             showHeader: this.selectMulti,
-            trigger: 'row'
-          }
-        }
+            trigger: "row",
+          },
+        },
       };
-      this.$vxeTableUtil.initVxeTable(tableOption).then(opts => {
+      this.$vxeTableUtil.initVxeTable(tableOption).then((opts) => {
         that.vxeOption = opts;
       });
-    }
-  }
+    },
+  },
 };
 </script>