cloud-web-corejs 1.0.54-dev.34 → 1.0.54-dev.36

package/src/views/bd/setting/form_template/wfObjConfigDialog.vue

@@ -0,0 +1,189 @@
+<template>
+  <el-dialog
+    custom-class="dialog-style list-dialog"
+    :title="'流程单据定义（'+formTemplate.formName+'）'"
+    :visible.sync="dialogVisible"
+    :show-close="!0"
+    :append-to-body="false"
+    :modal="false"
+    :close-on-click-modal="!1"
+    :close-on-press-escape="!1"
+    :destroy-on-close="!0"
+    width="1220px"
+    top="5vh"
+    v-dialog-drag
+    @close="closeDialog"
+  >
+    <div class="cont">
+      <el-form ref="editForm" :model="formData">
+        <el-table
+          ref="singleTable"
+          width="100%"
+          :data="formData.wfObjConfigDTOs"
+          height="500"
+          border=""
+          row-key="columnId"
+          stripe=""
+        >
+          <el-table-column type="index" width="35" fixed="left"></el-table-column>
+          <el-table-column :label="i18nt('表单类型名称')" width="250" prop="objTypeName">
+            <template slot-scope="scope">
+              <el-form-item :prop="'wfObjConfigDTOs.'+scope.$index+'.objTypeName'"
+                            :rules="[{ required: true, trigger: 'blur' }]">
+                <el-input v-model="scope.row.objTypeName" clearable></el-input>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column :label="i18nt('组织名称')" width="150" prop="companyCode">
+            <template slot-scope="scope">
+              {{ scope.row.companyName }}
+            </template>
+          </el-table-column>
+          <el-table-column :label="i18nt('表单类型编码')" width="200" prop="objTypeCode"></el-table-column>
+          <el-table-column :label="i18nt('服务名')" width="150" prop="serviceId"></el-table-column>
+          <el-table-column :label="i18nt('designer.setting.actionColumn')" width="100" align="center">
+            <template #header>
+              <span>{{ i18nt('designer.setting.actionColumn') }}</span>
+              <el-button :title="i18nt('designer.setting.addTableColumn')" size="mini" type="" circle=""
+                         icon="el-icon-plus" @click="openCompanyDialog"></el-button>
+            </template>
+            <template slot-scope="scope">
+              <el-button
+                :title="i18nt('designer.setting.deleteTableColumn')"
+                size="mini"
+                type=""
+                circle=""
+                icon="el-icon-minus"
+                @click="formData.wfObjConfigDTOs.splice(scope.$index,1)"
+              ></el-button>
+            </template>
+          </el-table-column>
+
+        </el-table>
+      </el-form>
+    </div>
+    <div class="dialog-footer" slot="footer">
+      <el-button @click="closeDialog" class="button-sty" icon="el-icon-close">
+        {{ i18nt('designer.hint.cancel') }}
+      </el-button>
+      <el-button type="primary" @click="saveData" class="button-sty" icon="el-icon-check">
+        {{ i18nt('designer.hint.confirm') }}
+      </el-button>
+    </div>
+    <companyInfoDialog v-if="showCompanyInfoDialog" :visiable.sync="showCompanyInfoDialog"
+                       @confirm="confirmCompanyDialog" multi="false"/>
+  </el-dialog>
+</template>
+<script>
+import i18n from '../../../../components/xform/utils/i18n';
+import companyInfoDialog from "@base/views/user/company_info/dialog.vue";
+
+export default {
+  components: {companyInfoDialog},
+  props: ['formTemplate'],
+  mixins: [i18n],
+  data() {
+    return {
+      dialogVisible: true,
+      formData: {
+        objTypeCode: null,
+        wfObjConfigDTOs: []
+      },
+      operateIndex: 0,
+      showCompanyInfoDialog: false
+    }
+  },
+  created() {
+
+  },
+  mounted() {
+    this.formData.objTypeCode = this.formTemplate.objTypeCode;
+    this.getListByObjTypeCode();
+  },
+  methods: {
+    getListByObjTypeCode(callback) {
+      let formTemplate = this.formTemplate
+      this.$http({
+        url: `/${formTemplate.serviceName}/wf_obj_config/listByObjTypeCode`,
+        method: `post`,
+        data: {
+          stringOne: formTemplate.objTypeCode
+        },
+        isLoading: true,
+        success: res => {
+          let rows = res.objx || [];
+          this.formData.wfObjConfigDTOs = rows;
+          callback && callback(rows)
+        }
+      });
+    },
+    saveData() {
+      this.$refs.editForm.$baseValidate(valid => {
+        if (valid) {
+          this.$baseConfirm(this.$t1('您确定要保存吗？')).then(() => {
+            var url = `/${this.formTemplate.serviceName}/wf_obj_config/saveUpdates`;
+            this.$http({
+              url: url,
+              method: `post`,
+              data: this.formData,
+              isLoading: true,
+              success: res => {
+                this.$message({
+                  message: res.content,
+                  type: 'success',
+                  duration: 1000
+                });
+                this.getListByObjTypeCode(rows => {
+                  this.$emit('confirm', rows)
+                  this.closeDialog();
+                })
+              }
+            });
+          });
+        }
+      });
+    },
+    addItem() {
+      let formTemplate = this.formTemplate;
+      let row = {
+        objTypeCode: formTemplate.objTypeCode,
+        objTypeName: formTemplate.objTypeName,
+        serviceId: formTemplate.serviceName,
+        url: "form",
+        companyCode: null,
+        companyName: null
+      }
+      this.formData.wfObjConfigDTOs.push(row);
+    },
+    closeDialog() {
+      this.dialogVisible = false;
+      this.$emit("update:visiable", false);
+    },
+    openCompanyDialog() {
+      this.showCompanyInfoDialog = true;
+    },
+    confirmCompanyDialog(rows) {
+      if (rows.length) {
+        let row = rows[0];
+        let formTemplate = this.formTemplate;
+        if (!this.formData.wfObjConfigDTOs.find(item => item.companyCode == row.companyCode)) {
+          let newrow = {
+            objTypeCode: formTemplate.objTypeCode,
+            objTypeName: formTemplate.formName,
+            serviceId: formTemplate.serviceName,
+            url: "form",
+            companyCode: row.companyCode,
+            companyName: row.companyName
+          }
+          this.formData.wfObjConfigDTOs.push(newrow);
+        }
+      }
+    }
+  }
+}
+</script>
+
+
+<style scoped>
+
+</style>

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

@@ -76,6 +76,7 @@ export default {
       if (this.dataId && !isNaN(this.dataId)) {
         this.isEdit = true;
         this.$commonHttp({
+          aes:true,
           url: USER_PREFIX + `/groups/get`,
           method: `post`,
           data: {
@@ -95,6 +96,7 @@ export default {
           this.$baseConfirm(this.$t1('您确定要保存吗？')).then(() => {
             var url = USER_PREFIX + (this.isEdit ? `/groups/update` : `/groups/save`);
             this.$http({
+              aes:true,
               url: url,
               method: `post`,
               data: this.groups,

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

@@ -86,6 +86,7 @@ export default {
         vue: this,
         tableRef: 'table-m1',
         tableName: 'user_groups_list-m1',
+        aes: true,
         path: USER_PREFIX + '/groups/listPage',
         param: () => {
           return this.formData;

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

@@ -137,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',
@@ -229,8 +230,9 @@ export default {
       userInfo: {},
       userGroups: [],
       showGroupDialog: false,
-      vxeOption:{},
-      menuKindAuthDTOs:[]
+      vxeOption: {},
+      menuKindAuthDTOs: [],
+      isDev: true
     };
   },
   computed: {
@@ -247,6 +249,7 @@ export default {
     this.getUserGroups()
     this.getData();
     this.getConpanyInfo()
+    await this.initBdEnv();
     this.initTableM1();
   },
   methods: {
@@ -254,6 +257,7 @@ export default {
       if (this.dataId && !isNaN(this.dataId)) {
         this.isEdit = true;
         this.$commonHttp({
+          aes: true,
           url: USER_PREFIX + `/user/get`,
           method: `post`,
           data: {
@@ -297,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,
@@ -327,6 +332,7 @@ export default {
     getSaleOrgData() {
       if (this.dataId) {
         this.$http({
+          aes: true,
           url: USER_PREFIX + '/user/getUserSaleOrg',
           method: `post`,
           data: {id: this.dataId},
@@ -347,6 +353,7 @@ export default {
     getUserRoleData() {
       if (this.dataId) {
         this.$http({
+          aes: true,
           url: USER_PREFIX + '/user/getUserRole',
           method: `post`,
           data: {id: this.dataId},
@@ -370,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},
@@ -419,6 +427,7 @@ export default {
     },
     getConpanyInfo() {
       this.$http({
+        aes: true,
         url: USER_PREFIX + '/company_info/getCurrent',
         method: `post`,
         isLoading: true,
@@ -445,6 +454,7 @@ export default {
       this.$baseConfirm(this.$t1('您确定要解锁吗？')).then(() => {
         var url = USER_PREFIX + '/user/unlockLoginAccount';
         this.$http({
+          aes: true,
           url: url,
           method: `post`,
           data: {
@@ -473,6 +483,7 @@ export default {
     },
     getUserInfo() {
       return this.$http({
+        aes: true,
         url: USER_PREFIX + '/user/currentUser',
         method: 'post',
         success: res => {
@@ -486,6 +497,7 @@ export default {
     },
     getUserGroups() {
       return this.$http({
+        aes: true,
         url: USER_PREFIX + '/groups/listPage',
         method: 'post',
         data: {},
@@ -507,6 +519,48 @@ export default {
             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',
@@ -534,6 +588,13 @@ export default {
         });
       }
     },
+    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: {},