cloud-web-corejs 1.0.54-dev.27 → 1.0.54-dev.271

package/src/views/user/user/form_info.vue

@@ -0,0 +1,210 @@
+<template>
+  <el-dialog
+    :title="$t1('个人设置')"
+    :append-to-body="true"
+    :modal-append-to-body="falseValue"
+    :close-on-click-modal="falseValue"
+    :visible.sync="showDialog"
+    :modal="falseValue"
+    custom-class="dialog-style list-dialog demo-sty_2"
+    width="500px"
+    @close="dialogClose"
+    v-el-drag-dialog
+    v-el-dialog-center
+  >
+    <div id="containt" style="height: 300px">
+      <div class="detail-wrap">
+        <el-form ref="editForm" :model="user">
+          <div class="d-header clearfix">
+            <div class="fl">
+              <i class="el-icon-info"/>
+              {{ dataId ? $t1('查看用户') : $t1('新增用户') }}
+            </div>
+            <div class="fr">
+              <el-button type="primary" plain class="button-sty" @click="reloadContent" icon="el-icon-refresh-right">
+                {{ $t1('重置') }}
+              </el-button>
+              <el-button type="primary" class="button-sty" icon="el-icon-check" @click="saveData">{{ $t1('保存') }}
+              </el-button>
+            </div>
+          </div>
+          <div class="d-cont" style="height: auto">
+            <div class="d-item" style="padding-right: 0">
+              <div class="title first"><b>{{ $t1('基本信息') }}</b></div>
+              <table class="table-detail">
+                <tbody>
+                <tr>
+                  <th>
+                    <em class="f-red">*</em>
+                    {{ $t1('登录名') }}
+                  </th>
+                  <td colspan="3">
+                    {{ user.loginAccount }}
+                  </td>
+                </tr>
+                <tr>
+                  <th>
+                    <em class="f-red">*</em>
+                    {{ $t1('姓名') }}
+                  </th>
+                  <td colspan="3">
+                    <el-form-item prop="nickName" :rules="[{ required: true, trigger: 'blur' }]">
+                      <el-input size="small" v-model="user.nickName" maxlength="200" lay-verify="required" required=""
+                                clearable/>
+                    </el-form-item>
+                  </td>
+                </tr>
+                <tr>
+                  <th>{{ $t1('密码') }}</th>
+                  <td colspan="3">
+                    <el-form-item prop="password" :rules="passRules">
+                      <el-input
+                        size="small"
+                        type="password"
+                        v-model="user.password"
+                        show-password
+                        maxlength="255"
+                        autocomplete="off"
+                        auto-complete="new-password"
+                        clearable
+                      />
+                    </el-form-item>
+                  </td>
+                </tr>
+                <tr>
+                  <th>{{ $t1('确认密码') }}</th>
+                  <td colspan="3">
+                    <el-form-item prop="rePassword" :rules="pass2Rules">
+                      <el-input
+                        size="small"
+                        type="password"
+                        v-model="user.rePassword"
+                        show-password
+                        maxlength="255"
+                        autocomplete="off"
+                        auto-complete="new-password"
+                        lay-verify="confirmPass"
+                        clearable
+                      />
+                    </el-form-item>
+                  </td>
+                </tr>
+                </tbody>
+              </table>
+            </div>
+          </div>
+        </el-form>
+      </div>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  name: 'userInfo',
+  components: {},
+  props: ['_dataId'],
+  created() {
+    if (this._dataId && !isNaN(this._dataId)) this.dataId = this._dataId;
+  },
+  mounted() {
+    this.getData();
+  },
+  data() {
+    var validatePass = (rule, value, callback) => {
+      const isPassRequired = !this.dataId;
+      if (isPassRequired && (value == '' || value == undefined)) {
+        callback(new Error(this.$t1('密码不能为空')));
+      } else {
+        callback();
+      }
+      this.$refs.editForm.validateField('rePassword');
+    };
+    var validatePass2 = (rule, value, callback) => {
+      const isPassRequired = !this.dataId;
+      const rePassword = value != undefined ? value : '';
+      const password = this.user.password != undefined ? this.user.password : '';
+
+      if (isPassRequired && rePassword == '') {
+        callback(new Error(this.$t1('确认密码不能为空')));
+      } else if (rePassword != password) {
+        callback(new Error(this.$t1('两次输入密码不一致!')));
+      } else {
+        callback();
+      }
+    };
+    return {
+      showDialog: true,
+      falseValue: false,
+      dataId: '',
+      hBtn: true,
+      user: {},
+      vxeOption: {},
+      companyInfoOption: {},
+      userRoleOption: {},
+      showContent: true,
+      passRules: [{validator: validatePass, trigger: 'blur', required: false}],
+      pass2Rules: [{validator: validatePass2, trigger: 'blur', required: false}]
+    };
+  },
+  methods: {
+    getData() {
+      let t = this._dataId;
+      if (this.dataId && !isNaN(this.dataId)) {
+        this.isEdit = true;
+        this.$commonHttp({
+          url: USER_PREFIX + `/user/get`,
+          method: `post`,
+          data: {
+            id: this.dataId
+          },
+          isLoading: true,
+          modalStrictly: true,
+          success: res => {
+            var user = res.objx || {};
+            this.user = res.objx || {};
+            this.user.password = '';
+          }
+        });
+      } else {
+        this.isEdit = false;
+        this.user = {
+          enabled: true
+        };
+      }
+    },
+    saveData() {
+      this.$refs.editForm.$baseValidate(valid => {
+        if (valid) {
+          this.$baseConfirm(this.$t1('您确定要保存吗？')).then(() => {
+            var url = USER_PREFIX + '/user/updateUserInfo';
+            this.$http({
+              url: url,
+              method: `post`,
+              data: this.user,
+              isLoading: true,
+              success: res => {
+                this.$message({
+                  message: res.content,
+                  type: 'success',
+                  duration: 500,
+                  onClose: t => {
+                    this.reloadContent();
+                  }
+                });
+              }
+            });
+          });
+        }
+      });
+    },
+    dialogClose() {
+      this.$emit('update:visiable', false);
+    },
+    reloadContent() {
+      this.user = {};
+      this.getData();
+    }
+  }
+};
+</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/user/list.vue

@@ -73,9 +73,6 @@
 import editView from './form_edit.vue';
 import {treeScollx} from '@base/utils/global.js';
 import tableForm from "@base/components/table/tableForm";
-import {
-  Loading,
-} from 'element-ui';
 
 export default {
   name: 'user:form_list',
@@ -94,12 +91,6 @@ export default {
   },
   activated() {
     // this.initTableList();
-    /*let opts = {
-      lock: true,
-      background: 'unset',
-      target: this.$el
-    };
-    Loading.service(opts);*/
   },
   async mounted() {
     treeScollx({target: this, type: 'default'});
@@ -226,7 +217,7 @@ export default {
           };
           let outUserCodes = this.outUserCodes;
           if (this.userType == 1) {
-            //企业用户
+            //组织用户
             formData.neRoleCodes = [...outUserCodes];
           } else if (this.userType == 2) {
             //外部用户
@@ -488,14 +479,7 @@ export default {
         excel: USER_PREFIX + '/excelTemplate/user/user.xlsx',
         multi: true,
         saveUrl: USER_PREFIX + '/user/batchImport',
-        onBeforeConfirm: ({data,successRows,failRows}) => {
-
-        },
-        onBeforeCancel: ({data,successRows,failRows}) => {
-
-        },
-        callback: ({data,successRows,failRows}) => {
-          debugger
+        callback: () => {
           that.searchEvent();
         }
       });
@@ -509,7 +493,7 @@ export default {
             let rows = res.objx || [];
             let outUserCodes = this.outUserCodes;
             if (this.userType == 1) {
-              //企业用户
+              //组织用户
               rows = rows.filter(row => !outUserCodes.includes(row.code));
             } else if (this.userType == 2) {
               //外部用户
@@ -551,7 +535,7 @@ export default {
           let rows = res.objx || [];
           let outUserCodes = this.outUserCodes;
           if (this.userType == 1) {
-            //企业用户
+            //组织用户
             rows = rows.filter(row => !outUserCodes.includes(row.code));
           } else if (this.userType == 2) {
             //外部用户

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

@@ -100,6 +100,7 @@
                         size="small"
                         clearable
                         value-format="yyyy-MM-dd HH:mm:ss"
+                        default-time="23:59:59"
                         :picker-options="$baseEndPickerOptions(formData.startToExeTime)"
                       ></el-date-picker>
                     </template>
@@ -211,6 +212,7 @@
                           size="small"
                           clearable
                           value-format="yyyy-MM-dd HH:mm:ss"
+                          default-time="23:59:59"
                           :picker-options="$baseEndPickerOptions(formData2.startToExeTime)"
                         ></el-date-picker>
                       </template>

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

@@ -93,6 +93,35 @@
                       </el-select>
                     </template>
                   </vxe-form-item>
+                  <vxe-form-item :title="$t1('启动人')+':'" field="starterName">
+                    <template v-slot>
+                      <el-input v-model="formData.starterName" size="small" clearable/>
+                    </template>
+                  </vxe-form-item>
+                  <vxe-form-item title="启动时间:">
+                    <template v-slot>
+                      <el-date-picker
+                        v-model="formData.startTime"
+                        type="datetime"
+                        placeholder=""
+                        size="small"
+                        clearable
+                        value-format="yyyy-MM-dd HH:mm:ss"
+                        :picker-options="$baseStartPickerOptions(formData.endTime)"
+                      ></el-date-picker>
+                      <span>-</span>
+                      <el-date-picker
+                        v-model="formData.endTime"
+                        type="datetime"
+                        placeholder=""
+                        size="small"
+                        clearable
+                        value-format="yyyy-MM-dd HH:mm:ss"
+                        default-time="23:59:59"
+                        :picker-options="$baseEndPickerOptions(formData.startTime)"
+                      ></el-date-picker>
+                    </template>
+                  </vxe-form-item>
                 </vxe-form>
               </template>
             </vxe-grid>
@@ -370,7 +399,7 @@ export default {
           dataId: wfDataId
         };
         let url = '/user/form/vform/render.vue';
-        this.wfContent = require('@/views' + url).default;
+        this.wfContent = require('@base/views' + url).default;
       } else {
         this.param = {
           _dataId: wfDataId

package/src/views/user/wf/wf_manage/wfContentDialog.vue

@@ -87,7 +87,7 @@ export default {
           dataId: wfDataId
         });
         let url = '/user/form/vform/render.vue';
-        this.wfContent = require('@/views' + url).default;
+        this.wfContent = require('@base/views' + url).default;
       } else {
         this.param = Object.assign(param, {
           _dataId: wfDataId

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

@@ -0,0 +1,109 @@
+<template>
+    <el-dialog
+      :title="$t1('导入流程模板XML')"
+      :append-to-body="falseValue"
+      :modal-append-to-body="falseValue"
+      :close-on-click-modal="falseValue"
+      :visible.sync="showImportDialog"
+      :modal="falseValue"
+      custom-class="dialog-style"
+      width="501px"
+      v-el-drag-dialog
+    >
+      <div class="import-box">
+        <!--        <div class="tips">{{ $t2('请下载文件模板，填写信息后再上传文件', 'components.excelImport.tip') }}</div>-->
+        <el-upload v-if="!fileRaw" ref="uploadBtn" action="" class="upload-file" :auto-upload="false"
+                   :on-change="fileChange" accept=".xml">
+          <div class="el-upload-dragger">
+            <i class="el-icon-upload"></i>
+            <div class="el-upload__text"><em>{{ $t2('点击上传', 'components.excelImport.uploadBUtton') }}</em></div>
+          </div>
+        </el-upload>
+        <div class="upload-finish" v-if="fileRaw">
+          <img :src="require('@/resources' + '/images/ico-txt.svg')" class="ico"/>
+          <p class="name">{{ fileRaw.name }}</p>
+          <!-- <p>2022-1-17</p> -->
+          <el-tooltip :enterable="false" class="item" effect="dark"
+                      :content="$t2('关闭', 'components.excelImport.closeBUtton')" placement="bottom">
+            <i
+              class="el-icon-error js-close"
+              @click="
+								fileRaw = false;
+								$refs.uploadBtn.clearFiles();
+							"
+            ></i>
+          </el-tooltip>
+        </div>
+      </div>
+      <span slot="footer" class="dialog-footer">
+				<el-button type="primary" plain class="button-sty" @click="dialogClose1">
+					<i class="el-icon-close el-icon"></i>
+					{{ $t2('取 消', 'system.button.cancel2') }}
+				</el-button>
+				<el-button type="primary" @click="dialogPrimary1" class="button-sty">
+					<i class="el-icon-check el-icon"></i>
+					{{ $t2('确 定', 'system.button.confirm2') }}
+				</el-button>
+			</span>
+    </el-dialog>
+</template>
+
+<script>
+
+export default {
+  name: 'excelImport',
+  data() {
+    return {
+      excTime: 0,
+      showImportDialog: true,
+      showImportDialog2: false,
+      falseValue: false,
+      fileRaw: false,
+      isEnd: false,
+      currentIndex: 0,
+      excelTemplate: "",
+      prefix: '/user',
+      dataSize: 0,
+      totalSuccessNum: 0,
+      totalErrorNum: 0,
+      percentageNum: 0,
+      successRows: [],
+      failRows: [],
+      oriCols: [],
+      showImportResult: false,
+      resultType: '',
+      option: {},
+      showContent: false,
+      resOption: {},
+      abc: "A"
+    }
+  },
+
+  methods: {
+    fileChange(file) {
+      if (file) {
+        this.fileRaw = file.raw;
+      } else {
+        this.fileRaw = false;
+      }
+    },
+    dialogClose1() {
+      this.$emit("update:visiable", false);
+      this.showContent = false;
+    },
+    async dialogPrimary1() {
+      let that = this;
+      if (!(this.fileRaw)) {
+        this.$baseAlert(this.$t2('请上传附件', 'components.excelImport.warmMsg1'));
+        return false;
+      }
+      this.showImportDialog = false;
+
+      this.dialogClose1();
+      this.$emit("confirm",that.fileRaw)
+
+    },
+
+  }
+};
+</script>

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

@@ -111,6 +111,27 @@
                   </el-radio-group>
                 </el-form-item>
               </td>
+              <th>
+                {{ $t1('序号') }}
+              </th>
+              <td>
+                <el-form-item prop="orders" :rules="[{ required: false, trigger: 'blur' }]">
+                  <base-input-number autocomplete="off" v-model="wfObjConfigItem.orders" clearable/>
+                </el-form-item>
+              </td>
+            </tr>
+            <tr>
+              <th>
+                {{ $t1('流程启动不允许更改候选人') }}
+              </th>
+              <td>
+                <el-form-item prop="startNoSetCandidate" :rules="[{ required: false, trigger: 'blur' }]">
+                  <el-radio-group v-model="wfObjConfigItem.startNoSetCandidate">
+                    <el-radio :label="true">{{ $t1('是') }}</el-radio>
+                    <el-radio :label="false">{{ $t1('否') }}</el-radio>
+                  </el-radio-group>
+                </el-form-item>
+              </td>
             </tr>
             <tr>
               <th>
@@ -195,7 +216,9 @@ export default {
         startMode: 3,
         skipSameUserTask: false,
         toNextNode: null,
-        enabled: true
+        enabled: true,
+        orders: undefined,
+        startNoSetCandidate: false
       },
       showWfObjConfigDialog: false,
       configServiceId: null,
@@ -233,6 +256,7 @@ export default {
           modalStrictly: true,
           success: res => {
             let wfObjConfigItem = res.objx || {};
+            if (wfObjConfigItem.orders === null) wfObjConfigItem.orders = undefined
             if (wfObjConfigItem.toNextNode === 1) {
               wfObjConfigItem.toRejectNode = null
             }