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

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

@@ -1,154 +1,164 @@
-<template>
-  <el-dialog
-    :title="$t1('组织列表')"
-    :append-to-body="true"
-    :modal-append-to-body="true"
-    :close-on-click-modal="falseValue"
-    :visible.sync="showDialog"
-    :modal="falseValue"
-    custom-class="dialog-style list-dialog dialog-checkbox pd_0"
-    width="1200px"
-    @close="dialogClose"
-    v-el-drag-dialog
-    v-el-dialog-center
-  >
-    <div class="cont" style="height:450px">
-      <vxe-grid
-        class="is-pointer"
-        ref="table-m1"
-        v-bind="vxeOption"
-        @resizable-change="$vxeTableUtil.onColumnWitchChange"
-        @custom="$vxeTableUtil.customHandle"
-        @checkbox-change="addDataTable"
-        @checkbox-all="checkAll"
-        @cell-dblclick="checkWithSubmit"
-      >
-        <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>
-              <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="companyName">
-              <template v-slot>
-                <el-input v-model="formData.companyName" size="small" clearable/>
-              </template>
-            </vxe-form-item>
-            <vxe-button type="submit" @click="searchEvent" v-show="false"></vxe-button>
-          </vxe-form>
-        </template>
-      </vxe-grid>
-    </div>
-    <label id="labBtn" class="transverse">
-      <div class="icon">
-        <i class="el-icon-more"></i>
-        <i class="el-icon-more"></i>
-      </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>
-      <div class="list">
-        <div class="item" v-for="(checkRow, index) in checkRows" :key="index">
-          <p>{{ checkRow.companyName }}</p>
-          <a class="el-icon-close" @click="clearTable1Select(index)"></a>
-        </div>
-      </div>
-    </div>
-    <span slot="footer" class="dialog-footer">
-			<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('取 消') }}
-			</el-button>
-			<el-button type="primary" @click="dialogPrimary" class="button-sty">
-				<i class="el-icon-check el-icon"></i>
-				{{ $t1('确 定') }}
-			</el-button>
-		</span>
-  </el-dialog>
-</template>
-
-<script>
-import {selectDialogMixins} from '@base/mixins/selectDialog/index.js';
-
-export default {
-  name: 'company_info_dialog',
-  props: ['visiable', 'multi', 'rows', 'param', 'firstEnabled'],
-  mixins: [selectDialogMixins],
-  created() {
-    this.initSetting();
-  },
-  mounted() {
-    this.initTableM1();
-  },
-  data() {
-    var that = this;
-    return {
-      showDialog: true,
-      falseValue: false,
-      selectMulti: true,
-      formData: {},
-      vxeOption: {}
-    };
-  },
-  methods: {
-    initTableM1() {
-      let that = this;
-      let tableOption = {
-        vue: that,
-        tableRef: 'table-m1',
-        tableName: 'basic_ompany_info_dialog_list',
-        path: USER_PREFIX + '/user_company_info/getCurrentList',
-        treeNodeUrl: USER_PREFIX + '/user_company_info/getChildren',
-        treeNodeParam: function (row) {
-          return {parentCompanyCode: row.companyCode};
-        },
-        param: () => {
-          return this.formData;
-        },
-        columns: [
-          {type: 'checkbox', width: 48, resizable: false, fixed: 'left'},
-          {title: this.$t1('组织名称'), field: 'companyName', width: 250, fixed: 'left', treeNode: true},
-          {title: this.$t1('组织编码'), field: 'companyCode', width: 200},
-          {
-            width: 47,
-            fixed: 'right',
-            title: '',
-            sortable: false
-          }
-        ],
-        config: {
-          checkboxConfig: {
-            checkStrictly: true,
-            showHeader: this.selectMulti,
-            trigger: 'row',
-            checkMethod: ({row}) => {
-              if (this.firstEnabled === 'true' || this.firstEnabled === true) {
-                return true;
-              } else {
-                if (!row.parentCompanyCode) {
-                  return false;
-                } else {
-                  return true;
-                }
-              }
-            }
-          }
-        }
-      };
-
-      this.$vxeTableUtil.initVxeTable(tableOption).then(opts => {
-        that.vxeOption = opts;
-      });
-    }
-  }
-};
-</script>
+<template>
+  <el-dialog
+    :title="title || $t1('组织列表')"
+    :append-to-body="true"
+    :modal-append-to-body="true"
+    :close-on-click-modal="falseValue"
+    :visible.sync="showDialog"
+    :modal="falseValue"
+    custom-class="dialog-style list-dialog dialog-checkbox pd_0"
+    width="1200px"
+    :before-close="handleBeforeClose"
+    @close="dialogClose"
+    v-el-drag-dialog
+    v-el-dialog-center
+  >
+    <div class="cont" style="height:65vh">
+      <vxe-grid
+        class="is-pointer"
+        ref="table-m1"
+        v-bind="vxeOption"
+        @resizable-change="$vxeTableUtil.onColumnWitchChange"
+        @custom="$vxeTableUtil.customHandle"
+        @checkbox-change="addDataTable"
+        @checkbox-all="checkAll"
+        @cell-dblclick="checkWithSubmit"
+      >
+        <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>
+              <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="companyName">
+              <template v-slot>
+                <el-input v-model="formData.companyName" size="small" clearable/>
+              </template>
+            </vxe-form-item>
+            <vxe-button type="submit" @click="searchEvent" v-show="false"></vxe-button>
+          </vxe-form>
+        </template>
+      </vxe-grid>
+    </div>
+    <label id="labBtn" class="transverse">
+      <div class="icon">
+        <i class="el-icon-more"></i>
+        <i class="el-icon-more"></i>
+      </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>
+      <div class="list">
+        <div class="item" v-for="(checkRow, index) in checkRows" :key="index">
+          <p>{{ checkRow.companyName }}</p>
+          <a class="el-icon-close" @click="clearTable1Select(index)"></a>
+        </div>
+      </div>
+    </div>
+    <span slot="footer" class="dialog-footer">
+			<span class="fl tips" v-if="!selectMulti">{{ $t1('注：双击确认选择（单选）') }}</span>
+			<el-button type="primary" plain class="button-sty" @click="dialogCancel">
+				<i class="el-icon-close el-icon"></i>
+				{{ $t1('取 消') }}
+			</el-button>
+			<el-button type="primary" @click="dialogPrimary" class="button-sty">
+				<i class="el-icon-check el-icon"></i>
+				{{ $t1('确 定') }}
+			</el-button>
+		</span>
+  </el-dialog>
+</template>
+
+<script>
+import {selectDialogMixins} from '@base/mixins/selectDialog/index.js';
+
+export default {
+  name: 'company_info_dialog',
+  props: ['title', 'visiable', 'multi', 'rows', 'param', 'firstEnabled', 'allCompany'],
+  mixins: [selectDialogMixins],
+  created() {
+    if (this.$attrs.fieldKey) this.fieldKey = this.$attrs.fieldKey;
+    this.initSetting();
+  },
+  mounted() {
+    this.initTableM1();
+  },
+  data() {
+    return {
+      showDialog: true,
+      falseValue: false,
+      selectMulti: true,
+      formData: {},
+      vxeOption: {},
+    };
+  },
+  methods: {
+    initTableM1() {
+      let that = this;
+      let path = USER_PREFIX + '/user_company_info/getCurrentList';
+      let treeNodeUrl = USER_PREFIX + '/user_company_info/getChildren';
+      if (this.allCompany) {
+        path = USER_PREFIX + '/company_info/getRoot';
+        treeNodeUrl = USER_PREFIX + '/company_info/getChildren';
+      }
+      let tableOption = {
+        vue: that,
+        tableRef: 'table-m1',
+        tableName: 'basic_ompany_info_dialog_list',
+        path: path,
+        treeNodeUrl: treeNodeUrl,
+        treeNodeParam: function (row) {
+          return {enabled: true, parentCompanyCode: row.companyCode};
+        },
+        param: () => {
+          return {
+            enabled: true,
+            ...this.formData
+          }
+        },
+        columns: [
+          {type: 'checkbox', width: 48, resizable: false, fixed: 'left'},
+          {title: this.$t1('组织名称'), field: 'companyName', width: 250, fixed: 'left', treeNode: true},
+          {title: this.$t1('组织编码'), field: 'companyCode', width: 200},
+          {
+            width: 47,
+            fixed: 'right',
+            title: '',
+            sortable: false
+          }
+        ],
+        config: {
+          checkboxConfig: {
+            checkStrictly: true,
+            showHeader: this.selectMulti,
+            trigger: 'row',
+            checkMethod: ({row}) => {
+              if (this.firstEnabled === 'true' || this.firstEnabled === true) {
+                return true;
+              } else {
+                if (!row.parentCompanyCode) {
+                  return false;
+                } else {
+                  return true;
+                }
+              }
+            }
+          }
+        }
+      };
+
+      this.$vxeTableUtil.initVxeTable(tableOption).then(opts => {
+        that.vxeOption = opts;
+      });
+    }
+  }
+};
+</script>

package/src/views/user/company_info/edit.vue

@@ -46,7 +46,7 @@
             </tr>
             <tr>
               <th>
-                {{ $t1('企业默认首页') }}
+                {{ $t1('组织默认首页') }}
               </th>
               <td colspan="3">
                 <el-form-item prop="defaultHomePage" :rules="[{ required: false, trigger: 'blur' }]">

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

@@ -119,6 +119,7 @@ export default {
         tableRef: 'table-m1',
         tableName: 'report_datasource_dialog-m1',
         path: USER_PREFIX + '/extend_datasource/listPage',
+        aes: true,
         param: () => {
           return {
             enabled: true,

package/src/views/user/extend_datasource/edit.vue

@@ -168,6 +168,7 @@ export default {
       if (this.dataId && !isNaN(this.dataId)) {
         this.isEdit = true;
         this.$http({
+          aes: true,
           url: USER_PREFIX + `/extend_datasource/get`,
           method: `post`,
           data: {
@@ -189,6 +190,7 @@ export default {
         if (valid) {
           this.$baseConfirm(this.$t1('您确定要测试数据库链接吗？')).then(() => {
             this.$http({
+              aes: true,
               url: USER_PREFIX + '/extend_datasource/dblinktest',
               method: `post`,
               data: this.dataSource,
@@ -211,6 +213,7 @@ export default {
           this.$baseConfirm(this.$t1('您确定要保存吗？')).then(() => {
             var url = USER_PREFIX + (this.isEdit ? `/extend_datasource/update` : `/extend_datasource/save`);
             this.$http({
+              aes: true,
               url: url,
               method: `post`,
               data: this.dataSource,

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

@@ -72,7 +72,7 @@
 import editView from './edit.vue';
 
 export default {
-  name: 'report_datasource:list',
+  name: 'extend_datasource:list',
   components: {editView},
   data() {
     return {
@@ -106,6 +106,7 @@ export default {
         tableRef: 'table-m1',
         tableName: 'user_report_datasource_list-m1',
         path: USER_PREFIX + '/extend_datasource/listPage',
+        aes: true,
         param: () => {
           return this.formData;
         },

package/src/views/user/fieldTranslation/editDialog.vue

@@ -29,10 +29,10 @@
                         :rules="[{ required: false, trigger: 'blur' }]" class="block">
             <el-input type="textarea" :rows="2" v-model="fieldTranslation[item.translationField]" clearable/>
           </el-form-item>
-          <el-form-item :label="$t1('多语言标签')" prop="translation1" :rules="[{ required: false, trigger: 'blur' }]"
+<!--          <el-form-item :label="$t1('多语言标签')" prop="translation1" :rules="[{ required: false, trigger: 'blur' }]"
                         class="block">
             <langTagView v-model="fieldTranslation.fieldTranslationTagDTOs" :readonly="!isDev"></langTagView>
-          </el-form-item>
+          </el-form-item>-->
           <el-form-item :label="$t1('创建时间')" prop="createDate" :rules="[{ required: false, trigger: 'blur' }]">
             <span>{{ fieldTranslation.createDate }}</span>
           </el-form-item>
@@ -53,23 +53,23 @@
       </el-button>
     </span>
     </el-dialog>
-    <langTagDialog v-if="showLangTagDialog"
+<!--    <langTagDialog v-if="showLangTagDialog"
                    :visiable.sync="showLangTagDialog"
                    @confirm="confirmLangTagDialog"
                    :multi="true"
                    :rows="fieldTranslationTagDTOs"
-                   fieldKey="tagCode"></langTagDialog>
+                   fieldKey="tagCode"></langTagDialog>-->
   </div>
 </template>
 
 <script>
 import {getBdFlag} from "@base/api/user";
-import langTagDialog from "../../../views/user/lang_tag/dialog.vue";
-import langTagView from "@base/components/langTag/view.vue";
+/*import langTagDialog from "../../../views/user/lang_tag/dialog.vue";
+import langTagView from "@base/components/langTag/view.vue";*/
 
 
 export default {
-  components: {langTagDialog, langTagView},
+  components: {/*langTagDialog, langTagView*/},
   props: {
     _dataId: [String, Number],
     currentDataType: Object

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

@@ -46,8 +46,8 @@
                     <vxe-button status="success" class="button-sty" icon="el-icon-upload2" @click="jsonExport"
                                 v-if="isDev">{{ $t1('导出发布') }}
                     </vxe-button>
-                    <langTagAddButton :option="addProjectTagOption" v-if="isDev"></langTagAddButton>
-                    <langTagDeleteButton :option="deleteProjectTagOption" v-if="isDev"></langTagDeleteButton>
+                    <!--                    <langTagAddButton :option="addProjectTagOption" v-if="isDev"></langTagAddButton>
+                                        <langTagDeleteButton :option="deleteProjectTagOption" v-if="isDev"></langTagDeleteButton>-->
                   </template>
                   <template #buttonRight>
                     <vxe-button icon="el-icon-brush" class="button-sty" @click="resetEvent" type="text" status="primary"
@@ -64,29 +64,29 @@
                       </template>
                     </vxe-form-item>
                   </template>
-                  <template #tag>
-                    <vxe-form-item :title="$t1('多语言标签')+':'" field="tag">
-                      <template v-slot>
-                        <el-input
-                          class="search-input"
-                          max="200"
-                          :value="getTabNames()"
-                          @clear="
-                            checkTags = [];
-                          "
-                          v-el-readonly
-                          clearable
-                        >
-                          <i slot="suffix" class="el-input__icon el-icon-search" @click="openLangTagDialog3"></i>
-                        </el-input>
-                      </template>
-                    </vxe-form-item>
-                  </template>
+                  <!--                  <template #tag>
+                                      <vxe-form-item :title="$t1('多语言标签')+':'" field="tag">
+                                        <template v-slot>
+                                          <el-input
+                                            class="search-input"
+                                            max="200"
+                                            :value="getTabNames()"
+                                            @clear="
+                                              checkTags = [];
+                                            "
+                                            v-el-readonly
+                                            clearable
+                                          >
+                                            <i slot="suffix" class="el-input__icon el-icon-search" @click="openLangTagDialog3"></i>
+                                          </el-input>
+                                        </template>
+                                      </vxe-form-item>
+                                    </template>-->
                 </tableForm>
               </template>
-              <template #tag="{row}">
-                <langTagView v-model="row.fieldTranslationTagDTOs" :readonly="true"></langTagView>
-              </template>
+              <!--              <template #tag="{row}">
+                              <langTagView v-model="row.fieldTranslationTagDTOs" :readonly="true"></langTagView>
+                            </template>-->
             </vxe-grid>
           </div>
         </div>
@@ -95,11 +95,11 @@
     <fieldTranslationEditDialog v-if="showFieldTranslationEditDialog" :visiable.sync="showFieldTranslationEditDialog"
                                 :_dataId.sync="dataId" :currentDataType="currentDataType"
                                 @confirm="confirmFieldTranslationEditDialog"></fieldTranslationEditDialog>
-    <langTagDialog v-if="showLangTagDialog3"
+<!--    <langTagDialog v-if="showLangTagDialog3"
                    :visiable.sync="showLangTagDialog3"
                    @confirm="confirmLangTagDialog3"
                    :rows="checkTags"
-                   :multi="true"></langTagDialog>
+                   :multi="true"></langTagDialog>-->
   </div>
 </template>
 
@@ -108,16 +108,16 @@ import fieldTranslationEditDialog from "../../../views/user/fieldTranslation/edi
 import {treeScollx} from '@base/utils/global.js';
 import {getBdFlag} from "@base/api/user";
 import tableForm from "@base/components/table/tableForm.vue";
-import langTagDialog from "../../../views/user/lang_tag/dialog.vue";
+/*import langTagDialog from "../../../views/user/lang_tag/dialog.vue";
 import langTagAddButton from "@base/components/langTag/addButton.vue";
 import langTagDeleteButton from "@base/components/langTag/deleteButton.vue";
-import langTagView from "@base/components/langTag/view.vue";
+import langTagView from "@base/components/langTag/view.vue";*/
 
 export default {
   name: 'fieldTranslation:list',
   components: {
-    langTagView,
-    langTagDialog, tableForm, fieldTranslationEditDialog, langTagAddButton, langTagDeleteButton
+    tableForm, fieldTranslationEditDialog/*, langTagView,
+    langTagDialog, langTagAddButton, langTagDeleteButton*/
   },
   data() {
     return {
@@ -284,7 +284,7 @@ export default {
               }
             }
           },
-          {
+          /*{
             title: this.$t1('多语言标签'), field: 'tag', width: 250, slots: {default: "tag"}, params: {
               exportVal: ({row}) => {
                 if (row.fieldTranslationTagDTOs) {
@@ -292,7 +292,7 @@ export default {
                 }
               }
             }
-          },
+          },*/
           {
             field: 'modifyDate',
             title: this.$t1('更新时间'),
@@ -337,7 +337,7 @@ export default {
           },
           {title: this.$t1('字段编码'), field: "fieldCode", type: "input", common: true},
           {title: this.$t1('中文'), field: "translation1", type: "input", common: true},
-          {title: this.$t1('多语言标签'), field: "tag", type: "input", common: true, slot: "tag"},
+          // {title: this.$t1('多语言标签'), field: "tag", type: "input", common: true, slot: "tag"},
         ]
       };
       this.$vxeTableUtil.initVxeTable(tableOption).then(opts => {