cloud-web-corejs 1.0.54-dev.6 → 1.0.54-dev.61

package/src/views/user/user/form_edit.vue

@@ -116,6 +116,17 @@
             </table>
           </template>
         </baseTabPane>
+        <baseTabPane :label="$t1('表单分类信息')">
+          <template #default>
+            <vxe-grid
+              ref="table-m1"
+              :data="menuKindAuthDTOs"
+              v-bind="vxeOption"
+              @resizable-change="$vxeTableUtil.onColumnWitchChange"
+              @custom="$vxeTableUtil.customHandle"
+            ></vxe-grid>
+          </template>
+        </baseTabPane>
       </baseTabs>
     </el-form>
     <groudDialog v-if="showGroupDialog" :visiable.sync="showGroupDialog"
@@ -126,6 +137,7 @@
 <script>
 import xeUtils from "xe-utils";
 import groudDialog from "@base/views/user/groups/dialog.vue";
+import {getBdEnv} from "@base/api/user";
 
 export default {
   name: 'UserEdit',
@@ -170,7 +182,6 @@ export default {
         flag: 8,
         groupCode: null
       },
-      vxeOption: {},
       companyInfoOption: {},
       userRoleOption: {},
       showRoleDialog: false,
@@ -218,7 +229,10 @@ export default {
       showCountryDialog: false,
       userInfo: {},
       userGroups: [],
-      showGroupDialog: false
+      showGroupDialog: false,
+      vxeOption: {},
+      menuKindAuthDTOs: [],
+      isDev: true
     };
   },
   computed: {
@@ -231,19 +245,19 @@ export default {
   },
   async mounted() {
 
-    // this.getEainsGroupDTO();
-    // await this.initOutUserRoleCode();
-    // await this.initDistributorRole();
     this.getUserInfo()
     this.getUserGroups()
     this.getData();
     this.getConpanyInfo()
+    await this.initBdEnv();
+    this.initTableM1();
   },
   methods: {
     getData() {
       if (this.dataId && !isNaN(this.dataId)) {
         this.isEdit = true;
         this.$commonHttp({
+          aes: true,
           url: USER_PREFIX + `/user/get`,
           method: `post`,
           data: {
@@ -287,6 +301,7 @@ export default {
           this.$baseConfirm(this.$t1('您确定要保存吗？')).then(() => {
             var url = USER_PREFIX + (this.isEdit ? '/user/update' : '/user/save');
             this.$http({
+              aes: true,
               url: url,
               method: `post`,
               data: this.user,
@@ -317,6 +332,7 @@ export default {
     getSaleOrgData() {
       if (this.dataId) {
         this.$http({
+          aes: true,
           url: USER_PREFIX + '/user/getUserSaleOrg',
           method: `post`,
           data: {id: this.dataId},
@@ -337,6 +353,7 @@ export default {
     getUserRoleData() {
       if (this.dataId) {
         this.$http({
+          aes: true,
           url: USER_PREFIX + '/user/getUserRole',
           method: `post`,
           data: {id: this.dataId},
@@ -360,6 +377,7 @@ export default {
     getCompanyInfoData(callback) {
       if (this.dataId) {
         this.$http({
+          aes: true,
           url: USER_PREFIX + '/user/getUserCompanyInfo',
           method: `post`,
           data: {id: this.dataId},
@@ -409,6 +427,7 @@ export default {
     },
     getConpanyInfo() {
       this.$http({
+        aes: true,
         url: USER_PREFIX + '/company_info/getCurrent',
         method: `post`,
         isLoading: true,
@@ -431,53 +450,11 @@ export default {
     addCurrentCompany(callback) {
       this.confirmInsertCompany([this.companyInfo], callback);
     },
-    initDistributorRole() {
-      if (this.outUserCodes && this.outUserCodes.length == 1) {
-        return this.$http({
-          url: USER_PREFIX + '/role/list',
-          method: 'post',
-          success: res => {
-            let roleList = res.objx || [];
-            let distributorCode = this.outUserCodes[0];
-            this.distributorRole = roleList.find(item => item.code == distributorCode);
-          }
-        });
-      }
-    },
-    async initOutUserRoleCode() {
-      //初始化外部用户编码
-      return this.$http({
-        url: USER_PREFIX + '/system_parameter/getByCode',
-        method: 'post',
-        data: {"code": "outUserRoleCode"},
-        success: res => {
-          let value = (!res.objx || !res.objx.value) ? "distributor" : res.objx.value;
-          let codes = value.split(',');
-          this.outUserCodes = codes;//外部用户编码
-          this.initRoleDialogParam();//初始化角色弹框的查询参数
-        }
-      });
-    },
-    initRoleDialogParam() {
-      //初始化角色弹框的查询参数
-      if (this.userType == 1) {
-        //企业用户
-        this.roleDialogParam = {
-          queryAll: true,
-          neCodes: [...this.outUserCodes]
-        };
-      } else if (this.userType == 2) {
-        //外部用户
-        this.roleDialogParam = {
-          queryAll: true,
-          eqCodes: [...this.outUserCodes]
-        };
-      }
-    },
     unlock() {
       this.$baseConfirm(this.$t1('您确定要解锁吗？')).then(() => {
         var url = USER_PREFIX + '/user/unlockLoginAccount';
         this.$http({
+          aes: true,
           url: url,
           method: `post`,
           data: {
@@ -506,6 +483,7 @@ export default {
     },
     getUserInfo() {
       return this.$http({
+        aes: true,
         url: USER_PREFIX + '/user/currentUser',
         method: 'post',
         success: res => {
@@ -519,6 +497,7 @@ export default {
     },
     getUserGroups() {
       return this.$http({
+        aes: true,
         url: USER_PREFIX + '/groups/listPage',
         method: 'post',
         data: {},
@@ -526,7 +505,96 @@ export default {
           this.userGroups = res.objx?.records || [];
         }
       });
-    }
+    },
+    initTableM1() {
+      const tableOption = {
+        vue: this,
+        tableRef: 'table-m1',
+        tableName: 'edit-user-menuKind-m1',
+        columns: [
+          {type: 'checkbox', fixed: 'left', width: 48, resizable: false},
+          {
+            title: this.$t1('表单分类名称'),
+            field: 'menuKindName',
+            width: 350,
+            fixed: 'left'
+          },
+          {
+            title: this.$t1('编辑'),
+            field: 'editAuth',
+            width: 150,
+            slots: {
+              default: ({row}) => {
+                if (row.editAuth) {
+                  return [<div class="txt-status">{this.$t1('是')}</div>];
+                } else {
+                  return [<div class="txt-status s-3">{this.$t1('否')}</div>];
+                }
+              }
+            }
+          },
+          {
+            title: this.$t1('导出发布'),
+            field: 'exportAuth',
+            width: 150,
+            slots: {
+              default: ({row}) => {
+                if (row.exportAuth) {
+                  return [<div class="txt-status">{this.$t1('是')}</div>];
+                } else {
+                  return [<div class="txt-status s-3">{this.$t1('否')}</div>];
+                }
+              }
+            }
+          },
+          ...(this.isDev ? [{
+            title: this.$t1('可选导出发布类型'),
+            field: 'selectTypeAuth',
+            width: 200,
+            slots: {
+              default: ({row}) => {
+                if (row.selectTypeAuth) {
+                  return [<div class="txt-status">{this.$t1('是')}</div>];
+                } else {
+                  return [<div class="txt-status s-3">{this.$t1('否')}</div>];
+                }
+              }
+            }
+          }] : []),
+          {
+            width: 47,
+            fixed: 'right',
+            title: '',
+            sortable: false
+          }
+        ]
+      };
+      this.$vxeTableUtil.initVxeTable(tableOption).then(opts => {
+        this.vxeOption = opts;
+      });
+      if (this.dataId) {
+        this.$http({
+          aes: true,
+          url: USER_PREFIX + `/menu_kind_auth/list`,
+          method: `post`,
+          data: {
+            userId: this.dataId
+          },
+          isLoading: true,
+          modalStrictly: true,
+          success: res => {
+            this.menuKindAuthDTOs = res.objx || [];
+          }
+        });
+      }
+    },
+    initBdEnv() {
+      return getBdEnv({
+        success: res => {
+          this.isDev = res.objx == "dev"
+        }
+      });
+    },
   }
 };
 </script>

package/src/views/user/user/form_list.vue

@@ -222,6 +222,7 @@ export default {
     getUserGroups() {
       return new Promise((resolve, reject) => {
         this.$http({
+          aes: true,
           url: USER_PREFIX + '/groups/listPage',
           method: 'post',
           data: {},

package/src/views/user/wf/wf_obj_config/list.vue

@@ -110,6 +110,9 @@
     <positionDialog v-if="showPositionDialog" :visiable.sync="showPositionDialog" @confirm="confirmPosition"/>
     <scriptDescriptionDialog path="static/readme/Wf.txt" v-if="showScriptDescriptionDialog"
                              :visiable.sync="showScriptDescriptionDialog"></scriptDescriptionDialog>
+    <wfBizDataSettingDialog v-if="showWfBizDataSettingDialog" :visiable.sync="showWfBizDataSettingDialog"
+                            @confirm="confirmWfBizDataSettingDialog"
+                            :objConfigItem="objConfigItem" :serviceId="currentRow.serviceId"></wfBizDataSettingDialog>
   </div>
 </template>
 <script>
@@ -123,6 +126,8 @@ import positionDialog from '../../../../views/user/position/dialog.vue';
 import wfParamEdit from '../../../../views/user/wf/wf_param/edit'
 import scriptDescriptionDialog from '@base/components/scriptDescription/dialog'
 import wfDiyAttributeEdit from '../../../../views/user/wf/wf_diy_attribute/edit'
+import wfBizDataSettingDialog from "./wfBizDataSettingDialog";
+
 
 export default {
   name: 'wf_obj_config:list',
@@ -133,7 +138,8 @@ export default {
     userDialog,
     positionDialog,
     scriptDescriptionDialog,
-    wfDiyAttributeEdit
+    wfDiyAttributeEdit,
+    wfBizDataSettingDialog
   },
   created() {
   },
@@ -180,7 +186,10 @@ export default {
       wfAssignFormTemplateCallback: null,
 
       showScriptDescriptionDialog: false,
-      showWfDiyAttributeEdit: false
+      showWfDiyAttributeEdit: false,
+
+      objConfigItem: null,
+      showWfBizDataSettingDialog: false
     };
   },
   watch: {
@@ -488,6 +497,18 @@ export default {
                                 popper-class="tooltip-skin">
                       <i class="iconfont icon-liuchengguanli-shejiqi_liucheng"/>
                     </el-tooltip>
+                  </a>,
+                  <a
+                    href="javascript:void(0);"
+                    onClick={() => {
+                      this.openWfBizDataSettingDialog(row, this.currentRow.serviceId);
+                    }}
+                    class="a-link"
+                  >
+                    <el-tooltip enterable={false} effect="dark" content={this.$t1('配置流程过程更改业务数据')} placement="top"
+                                popper-class="tooltip-skin">
+                      <i class="el-icon-setting"/>
+                    </el-tooltip>
                   </a>
                 ];
               }
@@ -608,6 +629,13 @@ export default {
         this.showScriptDescriptionDialog = true;
       };
     },
+    openWfBizDataSettingDialog(row) {
+      this.objConfigItem = row;
+      this.showWfBizDataSettingDialog = true
+    },
+    confirmWfBizDataSettingDialog(rows) {
+
+    }
   }
 };
 </script>

package/src/views/user/wf/wf_obj_config/wfBizDataSettingDialog.vue

@@ -0,0 +1,292 @@
+<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="1200px"
+      @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="addItem">
+                    {{ $t1('新增') }}
+                  </vxe-button>
+                </div>
+                <div class="fl screen-breadcrumb" style="margin-left: 30px;">
+                  <span style="font-size: 12px;">{{ $t1('表单模板名称') }}：</span>
+                  {{ objConfigItem.modelName }}
+                </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" :disabled="column.params.disabled"></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>
+  </div>
+</template>
+
+<script>
+
+export default {
+  props: {
+    objConfigItem: Object,
+    serviceId: String
+  },
+  components: {},
+  computed: {
+    current_prefix() {
+      return '/' + this.serviceId;
+    }
+  },
+  async mounted() {
+    this.initTableList();
+  },
+  data() {
+    let that = this;
+    return {
+      showDialog: true,
+      activeName: 'second',
+      value10: '',
+      dataId: '',
+      showEdit: false,
+      formData: {
+        nickName: null,
+      },
+      vxeOption: {},
+      showUserDialog: false,
+      showPositionDialog: false,
+      showSaleOrgDialog: false,
+      operateIndex: 0,
+      showViewDialog: false,
+
+      tableData: [],
+      showUserRowDialog: false,
+      showUserAddDialog: false,
+      currentRow: null,
+      isDev: true
+
+    };
+  },
+  methods: {
+    searchEvent() {
+      this.$refs['table-m1'].commitProxy('reload');
+    },
+    resetEvent() {
+      this.formData = {};
+      this.$refs['table-m1'].commitProxy('reload');
+    },
+    initTableList() {
+      let that = this;
+      let tableOption = {
+        vue: this,
+        tableRef: 'table-m1',
+        tableName: 'user_wf-objConfig-wfBizDataSetting-m1',
+        config: {
+          height: "auto"
+        },
+        columns: [
+          {type: 'checkbox', width: 48, resizable: false, fixed: 'left'},
+          {
+            title: this.$t1('流程动作'),
+            field: 'action',
+            width: 150,
+            slots: {
+              default: ({row}) => {
+                return [
+                  <el-select v-model={row.action} clearable>
+                    <el-option label="流程启动" value="start"></el-option>
+                    <el-option label="流程中断" value="interrupt"></el-option>
+                    <el-option label="流程完成" value="end"></el-option>
+                  </el-select>
+                ];
+              }
+            }
+          },
+          {
+            title: this.$t1('数据库表名'),
+            field: 'tableName',
+            width: 250,
+            slots: {
+              default: ({row}) => {
+                return [
+                  <el-input v-model={row.tableName} clearable></el-input>
+                ];
+              }
+            }
+          },
+          {
+            title: this.$t1('数据库字段名'),
+            field: 'tableField',
+            width: 250,
+            slots: {
+              default: ({row}) => {
+                return [
+                  <el-input v-model={row.tableField} clearable></el-input>
+                ];
+              }
+            }
+          },
+          {
+            title: this.$t1('设置的值'),
+            field: 'toValue',
+            width: 250,
+            slots: {
+              default: ({row}) => {
+                return [
+                  <el-input v-model={row.toValue} clearable></el-input>
+                ];
+              }
+            }
+          },
+          {
+            width: 100,
+            fixed: 'right',
+            title: '',
+            sortable: false,
+            slots: {
+              default: ({row, rowIndex, $table}) => {
+                return [
+                  <a
+                    href="javascript:void(0);"
+                    class="a-link"
+                    onClick={() => {
+                      this.tableData.splice(rowIndex, 1)
+                    }}
+                  >
+                    <el-tooltip enterable={false} effect="dark" content={this.$t1('删除')} placement="top"
+                                popper-class="tooltip-skin">
+                      <i class="el-icon-delete"/>
+                    </el-tooltip>
+                  </a>
+                ]
+              }
+            }
+          }
+        ]
+      };
+      this.$vxeTableUtil.initVxeTable(tableOption).then(opts => {
+        this.vxeOption = opts;
+      });
+      this.initData();
+    },
+    initData() {
+      this.$http({
+        // aes: true,
+        url: this.current_prefix + '/wf_biz_data_setting/list',
+        method: `post`,
+        data: {
+          objConfigItemId: this.objConfigItem.id,
+          modelId: this.objConfigItem.modelId,
+        },
+        isLoading: true,
+        modalStrictly: true,
+        success: res1 => {
+          let tableData = res1.objx || [];
+          this.tableData = tableData;
+
+        }
+      });
+    },
+    dialogClose() {
+      this.showDialog = false
+      this.$emit('update:visiable', false)
+    },
+    dialogConfirm() {
+      this.$emit('confirm');
+      this.$emit('update:visiable', false);
+    },
+    addItem() {
+      let row = this.createRow();
+      this.tableData.push(row)
+    },
+    saveData() {
+      this.$baseConfirm(this.$t1('您确定要保存吗？')).then(() => {
+        var url = this.current_prefix + `/wf_biz_data_setting/saveUpdates`;
+        this.$http({
+          aes: true,
+          url: url,
+          method: `post`,
+          data: {
+            objConfigItemId: this.objConfigItem.id,
+            modelId: this.objConfigItem.modelId,
+            wfBizDataSettingDTOs: this.tableData
+          },
+          isLoading: true,
+          success: res => {
+            this.$message({
+              message: res.content,
+              type: 'success',
+              duration: 500,
+              onClose: t => {
+                this.dialogConfirm()
+              }
+            });
+          }
+        });
+      });
+    },
+    createRow() {
+      let row = {
+        objConfigItemId: this.objConfigItem.id,
+        modelId: this.objConfigItem.modelId,
+        action: 'start',
+        tableName: null,
+        tableField: null,
+        toValue: null
+      }
+      return row;
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>