cloud-web-corejs 1.0.54-dev.33 → 1.0.54-dev.331

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/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"

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

@@ -34,11 +34,11 @@
                     <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/>
                   </template>
-                </vxe-form-item>
+                </vxe-form-item> -->
               </vxe-form>
             </template>
           </vxe-grid>
@@ -106,11 +106,11 @@ export default {
             sortable: true,
             fixed: 'left'
           },
-          {
+          /* {
             title: this.$t1('角色编码'),
             field: 'code',
             width: 150
-          },
+          }, */
           {
             title: this.$t1('角色描述'),
             field: 'description',

package/src/views/user/sale_org/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"

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

@@ -7,7 +7,10 @@
                     @custom="$vxeTableUtil.customHandle">
             <template #form>
               <div class="clearfix screen-btns">
-                <div class="fl"></div>
+                <div class="fl">
+                  <base-table-export :option="{ title: $t1('机构导出'), targetRef: 'table-m1', conditionExport: false}"
+                                     :parent-target="_self"/>
+                </div>
                 <div class="fr">
                   <vxe-button icon="el-icon-brush" class="button-sty" @click="resetEvent" type="text" status="primary"
                               plain>{{ $t1('重置') }}

package/src/views/user/user/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"
@@ -24,30 +24,35 @@
         @cell-dblclick="checkWithSubmit"
       >
         <template #form>
-          <div class="clearfix screen-btns">
-            <div class="fr">
+          <tableForm :formData.sync="formData" @searchEvent="searchEvent" @resetEvent="resetEvent">
+            <template #buttonRight>
               <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 class="screen-box" title-width="92px" title-align="right" :data="formData" @submit="searchEvent"
-                    @reset="resetEvent">
-            <vxe-form-item :title="$t1('登录名')+':'" field="loginAccount">
-              <template v-slot>
-                <el-input v-model="formData.loginAccount" size="small" clearable/>
-              </template>
-            </vxe-form-item>
-            <vxe-form-item :title="$t1('姓名')+':'" field="nickName">
-              <template v-slot>
-                <el-input v-model="formData.nickName" size="small" clearable/>
-              </template>
-            </vxe-form-item>
-            <vxe-button type="submit" @click="searchEvent" v-show="false"></vxe-button>
-          </vxe-form>
+            </template>
+            <template #saleOrgName>
+              <vxe-form-item :title="$t1('机构')+':'">
+                <template v-slot>
+                  <el-input
+                    class="search-input"
+                    v-model="formData.saleOrgName"
+                    clearable
+                    @clear="
+                  formData.saleOrgId = null;
+                  formData.saleOrgName = null;
+                "
+                    v-el-readonly
+                  >
+                    <i slot="suffix" class="el-input__icon el-icon-search"
+                       @click="showSaleOrgDialog=true"></i>
+                  </el-input>
+                </template>
+              </vxe-form-item>
+            </template>
+          </tableForm>
         </template>
       </vxe-grid>
     </div>
@@ -62,7 +67,7 @@
         class="allDel icon-quanbushanchu" @click="clearChecked()"></a></el-tooltip>
       <div class="list">
         <div class="item" v-for="(checkRow, index) in checkRows" :key="index">
-          <p>{{ checkRow.nickName }}</p>
+          <p>{{ getCheckLabel(checkRow, 'nickName') }}</p>
           <a class="el-icon-close" @click="clearTable1Select(index)"></a>
         </div>
       </div>
@@ -78,14 +83,19 @@
 				{{ $t1('确 定') }}
 			</el-button>
 		</span>
+    <saleOrgDialog v-if="showSaleOrgDialog" :visiable.sync="showSaleOrgDialog" :multi="false"
+                   @confirm="confirmSaleOrgDialog"></saleOrgDialog>
   </el-dialog>
 </template>
 
 <script>
 import {selectDialogMixins} from '@base/mixins/selectDialog/index.js';
+import tableForm from "@base/components/table/tableForm.vue";
+import saleOrgDialog from "@base/views/user/sale_org/dialog.vue";
 
 export default {
   name: 'userDialog',
+  components: {tableForm, saleOrgDialog},
   props: ['visiable', 'multi', 'rows', 'param'],
   mixins: [selectDialogMixins],
   created() {
@@ -110,7 +120,8 @@ export default {
         saleOrgName: ''
       },
       selectMulti: true,
-      vxeOption: {}
+      vxeOption: {},
+      showSaleOrgDialog: false
     };
   },
   methods: {
@@ -129,6 +140,11 @@ export default {
             ...this.param
           }
         },
+        searchColumns: [
+          {title: this.$t1('登录名'), field: "loginAccount", type: "input", common: true},
+          {title: this.$t1('姓名'), field: "nickName", type: "input", common: true},
+          {title: this.$t1('机构'), field: "saleOrgName", type: "input", common: true, slot: "saleOrgName"},
+        ],
         config: {
           checkboxConfig: {
             checkStrictly: true,
@@ -147,9 +163,9 @@ export default {
             slots: {
               default: ({row}) => {
                 if (row.enabled) {
-                  return [<div class="txt-status">{ this.$t1('启用') }</div>];
+                  return [<div class="txt-status">{this.$t1('启用')}</div>];
                 } else {
-                  return [<div class="txt-status s-3">{ this.$t1('禁用') }</div>];
+                  return [<div class="txt-status s-3">{this.$t1('禁用')}</div>];
                 }
               }
             }
@@ -189,6 +205,13 @@ export default {
       this.$vxeTableUtil.initVxeTable(tableOption).then(opts => {
         that.vxeOption = opts;
       });
+    },
+    confirmSaleOrgDialog(rows) {
+      if (rows.length) {
+        let row = rows[0];
+        this.$set(this.formData, 'saleOrgId', row.id);
+        this.$set(this.formData, 'saleOrgName', row.name);
+      }
     }
   }
 };