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

package/src/views/bd/setting/table_model/mixins/otherAuthDialog.js

@@ -0,0 +1,201 @@
+import userDialog from "@base/views/user/user/form_dialog.vue";
+import {getJsxBtn} from "@base/views/bd/setting/utils/index";
+import {getBdEnv} from "@base/api/user";
+
+let modules = {};
+modules = {
+  props: {
+    currentMenuKind: Object,
+    sid:String
+  },
+  components: {
+    userDialog
+  },
+  computed: {
+
+  },
+  async mounted() {
+    // await this.initBdEnv();
+    this.initTableList();
+  },
+  data() {
+    let that = this;
+    return {
+      showDialog: true,
+      activeName: 'second',
+      value10: '',
+      dataId: '',
+      showEdit: false,
+      formData: {
+        sid: null,
+        szTaMbAuthDTOs:[]
+      },
+      vxeOption: {},
+      showUserDialog: false,
+      showPositionDialog: false,
+      showSaleOrgDialog: false,
+      operateIndex: 0,
+      showViewDialog: false,
+
+      tableData: [],
+      showUserRowDialog: false,
+      showUserAddDialog: false,
+      currentRow: null,
+      isDev: true
+
+    };
+  },
+  methods: {
+    getFieldDisabled() {
+
+    },
+    searchEvent() {
+      this.$refs['table-m1'].commitProxy('reload');
+    },
+    resetEvent() {
+      this.formData = {};
+      this.$refs['table-m1'].commitProxy('reload');
+    },
+    initBdEnv() {
+      return getBdEnv({
+        success: res => {
+          this.isDev = res.objx == "dev"
+        }
+      });
+    },
+    initTableList() {
+      let that = this;
+      let tableOption = {
+        vue: this,
+        tableRef: 'table-m1',
+        tableName: 'user_sz_ta_mb_auth-list-m1',
+        config: {
+          height: "auto"
+        },
+        columns: [
+          {type: 'checkbox', width: 48, resizable: false, fixed: 'left'},
+          {
+            title: this.$t1('用户'),
+            field: 'nickName',
+            width: 250
+          },
+          {
+            title: this.$t1('编辑'),
+            field: 'editAuth',
+            width: 150,
+            slots: {
+              default: "switch"
+            }
+          },
+          {
+            width: 47,
+            fixed: 'right',
+            title: '',
+            sortable: false,
+            slots: {
+              default: ({row, rowIndex, $table}) => {
+                return getJsxBtn({
+                  iconName: "el-icon-delete",
+                  content: this.$t1('删除'),
+                  onclick: () => {
+                    this.tableData.splice(rowIndex, 1)
+                  }
+                });
+              }
+            }
+          }
+        ]
+      };
+      this.$vxeTableUtil.initVxeTable(tableOption).then(opts => {
+        this.vxeOption = opts;
+      });
+      this.initData();
+    },
+    initData() {
+      let sid = this.sid;
+      this.$http({
+        // aes: true,
+        url: USER_PREFIX + '/sz_ta_mb_auth/list',
+        method: `post`,
+        data: {
+          sid,
+        },
+        isLoading: true,
+        modalStrictly: true,
+        success: res1 => {
+          let rows = res1.objx || [];
+          this.tableData = rows;
+          /*this.formData = {
+            sid,
+            szTaMbAuthDTOs: rows
+          };*/
+
+        }
+      });
+    },
+    dialogClose() {
+      this.$emit('update:visiable', false)
+    },
+    dialogConfirm(){
+      this.$emit('confirm')
+      this.dialogClose()
+    },
+    openUserAddDialog(row, rowIndex) {
+      this.showUserAddDialog = true;
+    },
+    confirmtUserAddDialog(rows) {
+      if (rows.length) {
+        const tableData = this.tableData;
+        const map = {};
+        tableData.filter(item => !!item.userId).forEach(function (item) {
+          map[item.userId] = 1;
+        });
+        let items = [];
+
+        rows.forEach((row, index) => {
+          let item = this.createRow();
+          item.userId = row.id;
+          item.nickName = row.nickName;
+          if (!map[item.userId]) {
+            items.push(item);
+          }
+        });
+        this.tableData.push(...items);
+      }
+    },
+    saveData() {
+      this.$baseConfirm(this.$t1('您确定要保存吗？')).then(() => {
+        var url = USER_PREFIX + `/sz_ta_mb_auth/save`;
+        this.$http({
+          // aes: true,
+          url: url,
+          method: `post`,
+          data: {
+            sid:this.sid,
+            szTaMbAuthDTOs: this.tableData
+          },
+          isLoading: true,
+          success: res => {
+            this.$message({
+              message: res.content,
+              type: 'success',
+              duration: 500,
+              onClose: t => {
+                this.dialogConfirm()
+              }
+            });
+          }
+        });
+      });
+    },
+    createRow() {
+      let row = {
+        nickName: null,
+        userId: null,
+        editAuth: 1
+      }
+      return row;
+    }
+  }
+}
+export default modules

package/src/views/bd/setting/table_model/otherAuthDialog.vue

@@ -0,0 +1,83 @@
+<template>
+  <div>
+    <el-dialog
+      :title="$t1('数据表分派')"
+      :append-to-body="true"
+      :modal-append-to-body="true"
+      :close-on-click-modal="false"
+      :visible.sync="showDialog"
+      :modal="false"
+      custom-class="dialog-style list-dialog dialog-checkbox pd_0"
+      width="650px"
+      @close="dialogClose"
+      v-el-drag-dialog
+      v-el-dialog-center
+    >
+      <div class="cont">
+        <div class="grid-height" style="height: 500px">
+          <vxe-grid
+            class="is-pointer"
+            ref="table-m1"
+            :data="tableData"
+            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="openUserAddDialog">
+                    {{ $t1('新增用户') }}
+                  </vxe-button>
+                </div>
+              </div>
+            </template>
+            <template #user="{row,rowIndex}">
+              <el-input
+                class="search-input"
+                v-model="row.nickName"
+                clearable
+                @clear="
+                  row.userId = null;
+                "
+                v-if="!row._isParent"
+                v-el-readonly
+              >
+                <i slot="suffix" class="el-input__icon el-icon-search" @click="openUserRowDialog(row,rowIndex)"></i>
+              </el-input>
+              <template v-else>{{ row.nickName }}</template>
+            </template>
+            <template #switch="{row,column,rowIndex}">
+              <el-switch v-model="row[column.field]" :key="column.field+rowIndex" :active-value="1"
+                         :inactive-value="0"></el-switch>
+            </template>
+          </vxe-grid>
+        </div>
+      </div>
+      <span slot="footer" class="dialog-footer">
+			<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="saveData" class="button-sty">
+				<i class="el-icon-check el-icon"></i>
+				{{ $t1('确 定') }}
+			</el-button>
+		</span>
+    </el-dialog>
+    <userDialog v-if="showUserAddDialog" :visiable.sync="showUserAddDialog" @confirm="confirmtUserAddDialog"
+                multi="true" :param="{flag:8}"/>
+  </div>
+</template>
+
+<script>
+import mixin from "./mixins/otherAuthDialog";
+
+export default {
+  mixins: [mixin]
+}
+</script>
+
+<style scoped>
+
+</style>

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
           },