cloud-web-corejs 1.0.54-dev.15 → 1.0.54-dev.150

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

@@ -35,7 +35,7 @@
             </label>
           </el-popover>
           <el-popover
-            :disabled="!value1 || cities.length==0"
+            :disabled="selectTopLevel || (!value1 || cities.length==0)"
             placement="bottom"
             width="486"
             trigger="click"
@@ -55,7 +55,7 @@
             </label>
           </el-popover>
           <el-popover
-            :disabled="!value2 || districts.length==0"
+            :disabled="selectTopLevel || (!value2 || districts.length==0)"
             placement="bottom"
             width="486"
             trigger="click"
@@ -75,7 +75,7 @@
             </label>
           </el-popover>
           <el-popover
-            :disabled="!value3 || counties.length == 0"
+            :disabled="selectTopLevel || (!value3 || counties.length == 0)"
             placement="bottom"
             width="486"
             trigger="click"
@@ -107,7 +107,7 @@
               @checkbox-all="checkAll"
               @cell-dblclick="checkWithSubmit"
             >
-              <template #form>
+              <template #form v-if="!(param && param.onlySearchTopLevel)">
                 <div class="clearfix screen-btns">
                   <div class="fr">
                     <vxe-button icon="el-icon-brush" class="button-sty" @click="resetEvent" type="text" status="primary"
@@ -175,7 +175,7 @@ import {selectDialogMixins} from '@base/mixins/selectDialog/index.js';
 
 export default {
   name: 'areaDialog',
-  props: ['visiable', 'multi', 'rows', 'param'],
+  props: ['visiable', 'multi', 'rows', 'param', 'selectTopLevel'],
   mixins: [selectDialogMixins],
   created() {
     this.initSetting();
@@ -210,7 +210,6 @@ export default {
       if (val == 'second') {
         if (!this.tableInited) {
           this.$nextTick(() => {
-            // debugger
             this.initTableM1();
           })
           this.tableInited = true;
@@ -329,7 +328,8 @@ export default {
         url: USER_PREFIX + '/area/getChildren',
         method: "post",
         data: {
-          id: id
+          id: id,
+          enabled: true
         },
         success: res => {
           // const {level} = node;
@@ -378,7 +378,8 @@ export default {
             field: 'name',
             width: 250,
             fixed: 'left',
-            treeNode: true,
+            // treeNode: true,
+            treeNode: !(this.param && this.param.onlySearchTopLevel)
           },
           {
             field: 'fullName',
@@ -396,7 +397,18 @@ export default {
           checkboxConfig: {
             checkStrictly: true,
             showHeader: this.selectMulti,
-            trigger: 'row'
+            trigger: 'row',
+            checkMethod: ({row}) => {
+              if (this.selectTopLevel) {
+                if (row.parent) {
+                  return false;
+                } else {
+                  return true;
+                }
+              }
+
+              return true;
+            }
           }
         }
       };

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

@@ -87,7 +87,7 @@
               </td>
               <th>
                 <em class="f-red" v-if="!billSetting.allCompany">*</em>
-                {{ $t1('执行企业编码') }}
+                {{ $t1('执行组织编码') }}
               </th>
               <td>
                 <el-form-item prop="exeCompanyCode" :rules="[{ required: !billSetting.allCompany, trigger: 'blur' }]">

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

@@ -219,7 +219,7 @@ export default {
             }
           },
           {
-            title: this.$t1('执行企业编码'),
+            title: this.$t1('执行组织编码'),
             field: 'exeCompanyCode',
             width: 150
           },

package/src/views/user/common_attribute/itemEdit.vue

@@ -62,7 +62,7 @@
             </tr>
             <tr>
               <th>
-                {{ $t1('企业编码') }}
+                {{ $t1('组织编码') }}
               </th>
               <td colspan="5">
                 <el-form-item prop="exeCompanyCode" :rules="[{ required: false, trigger: 'blur' }]">
@@ -71,7 +71,7 @@
               </td>
               <td colspan="2"><span
                 class="f-red">{{
-                  $t1('注：多个企业用逗号隔开，未配置全企业可见，已配置只允许配置企业才可见当前属性值。')
+                  $t1('注：多个组织用逗号隔开，未配置全组织可见，已配置只允许配置组织才可见当前属性值。')
                 }}</span></td>
             </tr>
             <tr>

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

@@ -272,7 +272,7 @@ export default {
             width: 150
           },
           {
-            title: this.$t1('企业编码'),
+            title: this.$t1('组织编码'),
             field: 'exeCompanyCode',
             width: 250
           },

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

@@ -72,7 +72,7 @@
               </td>
               <th>
                 <em class="f-red" v-if="!commonScript.allCompany">*</em>
-                {{ $t1('执行企业编码') }}
+                {{ $t1('执行组织编码') }}
               </th>
               <td>
                 <el-form-item prop="exeCompanyCode" :rules="[{ required: !commonScript.allCompany, trigger: 'blur' }]">

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

@@ -174,7 +174,7 @@ export default {
             width: 150
           },
           {
-            title: this.$t1('执行企业编码'),
+            title: this.$t1('执行组织编码'),
             field: 'exeCompanyCode',
             width: 150
           },

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

@@ -55,6 +55,30 @@
                   </el-radio-group>
                 </el-form-item>
               </td>
+              <th>
+                <em class="f-red">*</em>
+                {{ $t1('文件操作，是否发系统通知') }}
+              </th>
+              <td>
+                <el-form-item prop="toNotify" :rules="[{ required: true, trigger: 'blur' }]">
+                  <el-radio-group v-model="fileStoreArea.toNotify">
+                    <el-radio :label="1">{{ $t1('是') }}</el-radio>
+                    <el-radio :label="0">{{ $t1('否') }}</el-radio>
+                  </el-radio-group>
+                </el-form-item>
+              </td>
+              <th>
+                <em class="f-red">*</em>
+                {{ $t1('文件下载，是否打水印') }}
+              </th>
+              <td>
+                <el-form-item prop="toDownWatermark" :rules="[{ required: true, trigger: 'blur' }]">
+                  <el-radio-group v-model="fileStoreArea.toDownWatermark">
+                    <el-radio :label="1">{{ $t1('是') }}</el-radio>
+                    <el-radio :label="0">{{ $t1('否') }}</el-radio>
+                  </el-radio-group>
+                </el-form-item>
+              </td>
             </tr>
             <tr>
               <th>{{ $t1('备注') }}</th>
@@ -94,7 +118,12 @@ export default {
       tabIndex: 0,
       isEdit: false,
       dataId: '',
-      fileStoreArea: {storeAreaType: 0, hasAuth: 0},
+      fileStoreArea: {
+        storeAreaType: 0,
+        hasAuth: 0,
+        toNotify: 0,
+        toDownWatermark: 0
+      },
     };
   },
   created() {

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

@@ -154,6 +154,34 @@ export default {
               }
             }
           },
+          {
+            field: 'toNotify',
+            title: this.$t1('文件操作，是否发系统通知'),
+            width: 220,
+            slots: {
+              default: ({row}) => {
+                if (row.toNotify == 1) {
+                  return [<div class="txt-status">{this.$t1('是')}</div>];
+                } else {
+                  return [<div class="txt-status s-3">{this.$t1('否')}</div>];
+                }
+              }
+            }
+          },
+          {
+            field: 'toDownWatermark',
+            title: this.$t1('文件下载，是否打水印'),
+            width: 200,
+            slots: {
+              default: ({row}) => {
+                if (row.toDownWatermark == 1) {
+                  return [<div class="txt-status">{this.$t1('是')}</div>];
+                } else {
+                  return [<div class="txt-status s-3">{this.$t1('否')}</div>];
+                }
+              }
+            }
+          },
           {
             title: this.$t1('备注'),
             field: 'note',