cloud-web-corejs 1.0.54-dev.5 → 1.0.54-dev.500

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/system_notice/edit.vue

@@ -1,186 +1,232 @@
-<template>
-  <div class="detail-wrap">
-    <el-form ref="editForm" :model="system_notice">
-      <div class="d-header clearfix">
-        <div class="fl">
-          <i class="el-icon-info"/>
-          {{ dataId ? $t1('查看公告') : $t1('新增公告') }}
-        </div>
-        <div class="fr">
-          <el-button type="primary" plain class="button-sty" @click="$baseReload()" icon="el-icon-refresh-right">
-            {{ $t1('重置') }}
-          </el-button>
-          <el-button type="primary" class="button-sty" icon="el-icon-check" @click="saveData">{{ $t1('保存') }}
-          </el-button>
-        </div>
-      </div>
-      <baseTabs>
-        <baseTabPane :label="$t1('基本信息')">
-          <template #default>
-            <table class="table-detail">
-              <tbody>
-              <tr>
-                <th>
-                  <em class="f-red">*</em>
-                  {{ $t1('标题') }}
-                </th>
-                <td>
-                  <el-form-item prop="title" :rules="[{ required: true, trigger: 'blur' }]">
-                    <el-input type="text" autocomplete="off" v-model="system_notice.title" clearable/>
-                  </el-form-item>
-                </td>
-                <th>{{ $t1('副标题') }}</th>
-                <td>
-                  <el-form-item prop="secondTitle" :rules="[{ required: false, trigger: 'blur' }]">
-                    <el-input type="text" autocomplete="off" v-model="system_notice.secondTitle" clearable/>
-                  </el-form-item>
-                </td>
-                <th>{{ $t1('设置') }}</th>
-                <td colspan="3">
-                  <el-checkbox :label="$t1('是否发布')" v-model="system_notice.publish"></el-checkbox>
-                  <el-checkbox :label="$t1('是否置顶')" v-model="system_notice.top"></el-checkbox>
-                  <el-checkbox :label="$t1('重要')" v-model="system_notice.important"></el-checkbox>
-                </td>
-              </tr>
-              <tr>
-                <th>{{ $t1('附件') }}</th>
-                <td colspan="7">
-                  <baseUpload accept="file" multi="true" :file.sync="sysNoticeAttachmentDTOs"></baseUpload>
-                </td>
-              </tr>
-              <tr>
-                <th>{{ $t1('创建人') }}</th>
-                <td>{{ system_notice.createBy }}</td>
-                <th>{{ $t1('创建时间') }}</th>
-                <td>{{ system_notice.createDate }}</td>
-                <th>{{ $t1('更新人') }}</th>
-                <td>{{ system_notice.modifyBy }}</td>
-                <th>{{ $t1('更新时间') }}</th>
-                <td>{{ system_notice.modifyDate }}</td>
-              </tr>
-              </tbody>
-            </table>
-          </template>
-        </baseTabPane>
-        <baseTabPane :label="$t1('内容')">
-          <template #default>
-            <table class="table-detail" style="width: 100%;">
-              <tbody>
-              <tr>
-                <td colspan="=6">
-                  <tinymce v-model="system_notice.content" :language="lan" :height="300"/>
-                </td>
-              </tr>
-              </tbody>
-            </table>
-          </template>
-        </baseTabPane>
-      </baseTabs>
-    </el-form>
-  </div>
-</template>
-
-<script>
-import Tinymce from '@base/components/Tinymce';
-
-export default {
-  name: 'system_noticeEdit',
-  props: ['_dataId'],
-  components: {
-    Tinymce
-  },
-  data() {
-    return {
-      lan: 'zh_CN',
-      tabIndex: 0,
-      isEdit: false,
-      dataId: '',
-      system_notice: {
-        publish: false,
-        top: false,
-        important: false
-      },
-      sysNoticeAttachmentDTOs: []
-    };
-  },
-  created() {
-    if (this._dataId && !isNaN(this._dataId)) this.dataId = this._dataId;
-  },
-  mounted() {
-    this.initAttachfo();
-    this.getData();
-  },
-  methods: {
-    getData() {
-      if (this.dataId && !isNaN(this.dataId)) {
-        this.isEdit = true;
-        this.$commonHttp({
-          url: USER_PREFIX + `/system_notice/get`,
-          method: `post`,
-          data: {
-            id: this.dataId
-          },
-          isLoading: true,
-          modalStrictly: true,
-          success: res => {
-            this.system_notice = res.objx || {};
-          }
-        });
-      }
-    },
-    saveData() {
-      this.$refs.editForm.$baseValidate(valid => {
-        if (valid) {
-          this.$baseConfirm(this.$t1('您确定要保存吗？')).then(() => {
-            var url = USER_PREFIX + (this.isEdit ? `/system_notice/update` : `/system_notice/save`);
-            let formData = this.system_notice;
-            formData.sysNoticeAttachmentDTOs = this.sysNoticeAttachmentDTOs || [];
-
-            this.$http({
-              url: url,
-              method: `post`,
-              data: formData,
-              isLoading: true,
-              success: res => {
-                this.$message({
-                  message: res.content,
-                  type: 'success',
-                  duration: 500,
-                  onClose: t => {
-                    if (this.isEdit) {
-                      this.$baseReload();
-                    } else {
-                      this.$baseReload({
-                        updateParam: {
-                          _dataId: res.objx
-                        }
-                      });
-                    }
-                  }
-                });
-              }
-            });
-          });
-        }
-      });
-    },
-    initAttachfo() {
-      //初始化附件信息
-      if (this.dataId) {
-        this.$http({
-          url: USER_PREFIX + '/system_notice/getAttachments',
-          method: `post`,
-          data: {id: this.dataId},
-          isLoading: true,
-          modalStrictly: true,
-          success: res => {
-            this.sysNoticeAttachmentDTOs = res.objx || [];
-          }
-        });
-      }
-    }
-  }
-};
-</script>
-
-<style></style>
+<template>
+  <div class="detail-wrap">
+    <el-form ref="editForm" :model="system_notice">
+      <div class="d-header clearfix">
+        <div class="fl">
+          <i class="el-icon-info" />
+          {{ dataId ? $t1("查看公告") : $t1("新增公告") }}
+        </div>
+        <div class="fr">
+          <el-button
+            type="primary"
+            plain
+            class="button-sty"
+            @click="$baseReload()"
+            icon="el-icon-refresh-right"
+          >
+            {{ $t1("重置") }}
+          </el-button>
+          <el-button
+            type="primary"
+            class="button-sty"
+            icon="el-icon-check"
+            @click="saveData"
+            >{{ $t1("保存") }}
+          </el-button>
+        </div>
+      </div>
+      <baseTabs>
+        <baseTabPane :label="$t1('基本信息')">
+          <template #default>
+            <table class="table-detail">
+              <tbody>
+                <tr>
+                  <th>
+                    <em class="f-red">*</em>
+                    {{ $t1("标题") }}
+                  </th>
+                  <td>
+                    <el-form-item
+                      prop="title"
+                      :rules="[{ required: true, trigger: 'blur' }]"
+                    >
+                      <el-input
+                        type="text"
+                        autocomplete="off"
+                        v-model="system_notice.title"
+                        clearable
+                      />
+                    </el-form-item>
+                  </td>
+                  <th>{{ $t1("副标题") }}</th>
+                  <td>
+                    <el-form-item
+                      prop="secondTitle"
+                      :rules="[{ required: false, trigger: 'blur' }]"
+                    >
+                      <el-input
+                        type="text"
+                        autocomplete="off"
+                        v-model="system_notice.secondTitle"
+                        clearable
+                      />
+                    </el-form-item>
+                  </td>
+                  <th>{{ $t1("设置") }}</th>
+                  <td colspan="3">
+                    <el-checkbox
+                      :label="$t1('是否发布')"
+                      v-model="system_notice.publish"
+                    ></el-checkbox>
+                    <el-checkbox
+                      :label="$t1('是否置顶')"
+                      v-model="system_notice.top"
+                    ></el-checkbox>
+                    <el-checkbox
+                      :label="$t1('重要')"
+                      v-model="system_notice.important"
+                    ></el-checkbox>
+                  </td>
+                </tr>
+                <tr>
+                  <th>{{ $t1("附件") }}</th>
+                  <td colspan="7">
+                    <baseUpload
+                      accept="file"
+                      multi="true"
+                      :file.sync="sysNoticeAttachmentDTOs"
+                    ></baseUpload>
+                  </td>
+                </tr>
+                <tr>
+                  <th>{{ $t1("创建人") }}</th>
+                  <td>{{ system_notice.createBy }}</td>
+                  <th>{{ $t1("创建时间") }}</th>
+                  <td>{{ system_notice.createDate }}</td>
+                  <th>{{ $t1("更新人") }}</th>
+                  <td>{{ system_notice.modifyBy }}</td>
+                  <th>{{ $t1("更新时间") }}</th>
+                  <td>{{ system_notice.modifyDate }}</td>
+                </tr>
+              </tbody>
+            </table>
+          </template>
+        </baseTabPane>
+        <baseTabPane :label="$t1('内容')">
+          <template #default>
+            <table class="table-detail" style="width: 100%">
+              <tbody>
+                <tr>
+                  <td colspan="=6">
+                    <tinymce
+                      v-model="system_notice.content"
+                      :language="lan"
+                      :height="300"
+                    />
+                  </td>
+                </tr>
+              </tbody>
+            </table>
+          </template>
+        </baseTabPane>
+      </baseTabs>
+    </el-form>
+  </div>
+</template>
+
+<script>
+import Tinymce from "@base/components/Tinymce";
+
+export default {
+  name: "system_noticeEdit",
+  props: ["_dataId"],
+  components: {
+    Tinymce,
+  },
+  data() {
+    return {
+      lan: "zh_CN",
+      tabIndex: 0,
+      isEdit: false,
+      dataId: "",
+      system_notice: {
+        publish: false,
+        top: false,
+        important: false,
+      },
+      sysNoticeAttachmentDTOs: [],
+    };
+  },
+  created() {
+    if (this._dataId && !isNaN(this._dataId)) this.dataId = this._dataId;
+  },
+  mounted() {
+    this.initAttachfo();
+    this.getData();
+  },
+  methods: {
+    getData() {
+      if (this.dataId && !isNaN(this.dataId)) {
+        this.isEdit = true;
+        this.$commonHttp({
+          url: USER_PREFIX + `/system_notice/get`,
+          method: `post`,
+          data: {
+            id: this.dataId,
+          },
+          isLoading: true,
+          modalStrictly: true,
+          success: (res) => {
+            this.system_notice = res.objx || {};
+          },
+        });
+      }
+    },
+    saveData() {
+      this.$refs.editForm.$baseValidate((valid) => {
+        if (valid) {
+          this.$baseConfirm(this.$t1("您确定要保存吗？")).then(() => {
+            var url =
+              USER_PREFIX +
+              (this.isEdit ? `/system_notice/update` : `/system_notice/save`);
+            let formData = this.system_notice;
+            formData.sysNoticeAttachmentDTOs = this.sysNoticeAttachmentDTOs || [];
+
+            this.$http({
+              url: url,
+              method: `post`,
+              data: formData,
+              isLoading: true,
+              success: (res) => {
+                this.$message({
+                  message: res.content,
+                  type: "success",
+                  duration: 500,
+                  onClose: (t) => {
+                    if (this.isEdit) {
+                      this.$baseReload();
+                    } else {
+                      this.$baseReload({
+                        updateParam: {
+                          _dataId: res.objx,
+                        },
+                      });
+                    }
+                  },
+                });
+              },
+            });
+          });
+        }
+      });
+    },
+    initAttachfo() {
+      //初始化附件信息
+      if (this.dataId) {
+        this.$http({
+          url: USER_PREFIX + "/system_notice/getAttachments",
+          method: `post`,
+          data: { id: this.dataId },
+          isLoading: true,
+          modalStrictly: true,
+          success: (res) => {
+            this.sysNoticeAttachmentDTOs = res.objx || [];
+          },
+        });
+      }
+    },
+  },
+};
+</script>
+
+<style></style>

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);
+      }
     }
   }
 };