cloud-web-corejs 1.0.54-dev.240 → 1.0.54-dev.242

package/src/components/xform/form-render/indexMixin.js

@@ -581,6 +581,7 @@ modules = {
       if (toModify && formConfig.wfAgreenBindSave) {
 
         let modelKey = wfInfo.modelKey;
+        let modelOrders = wfInfo.orders;
         let companyCode = this.$store.getters.companyCode;
         let taskStep = (wfInfo.taskStep ?? "") + "";
         let taskDefinitionKey = wfInfo.taskDefinitionKey;
@@ -595,7 +596,8 @@ modules = {
             let companyCodeStr = item.companyCodes;
             let companyCodes = companyCodeStr ? companyCodeStr.split(",").filter(item => !!item) : [];
             let flag1 = !item.serveName || item.serveName == bdService;
-            let flag2 = !item.modelKey || item.modelKey == modelKey;
+            // let flag2 = !item.modelKey || item.modelKey == modelKey;
+            let flag2 = item.modelOrders === undefined || item.modelOrders === null || item.modelOrders === modelOrders;
             let flag3 = !companyCodes.length || companyCodes.includes(companyCode)
             if (flag1 && flag2 && flag3) {
               //可编辑
@@ -618,6 +620,7 @@ modules = {
       if (toModify && formConfig.wfConfigDataEnabled) {
 
         let modelKey = wfInfo.modelKey;
+        let modelOrders = wfInfo.orders;
         let companyCode = this.$store.getters.companyCode;
         let taskStep = (wfInfo.taskStep ?? "") + "";
         let taskDefinitionKey = wfInfo.taskDefinitionKey;
@@ -632,7 +635,8 @@ modules = {
             let companyCodeStr = item.companyCodes;
             let companyCodes = companyCodeStr ? companyCodeStr.split(",").filter(item => !!item) : [];
             let flag1 = !item.serveName || item.serveName == bdService;
-            let flag2 = !item.modelKey || item.modelKey == modelKey;
+            // let flag2 = !item.modelKey || item.modelKey == modelKey;
+            let flag2 = item.modelOrders === undefined || item.modelOrders === null || item.modelOrders === modelOrders;
             let flag3 = !companyCodes.length || companyCodes.includes(companyCode)
             if (flag1 && flag2 && flag3) {
               //可编辑
@@ -702,6 +706,7 @@ modules = {
       let wfParam = this.wfParam;
       let wfInfo = wfParam.wfInfo
       let modelKey = wfInfo.modelKey;
+      let modelOrders = wfInfo.orders;
       let companyCode = this.$store.getters.companyCode;
       let taskStep = (wfInfo.taskStep ?? "") + "";
 
@@ -718,7 +723,9 @@ modules = {
             let companyCodeStr = item.companyCodes;
             let companyCodes = companyCodeStr ? companyCodeStr.split(",").filter(item => !!item) : [];
             let flag1 = !item.serveName || item.serveName == bdService;
-            let flag2 = !item.modelKey || item.modelKey == modelKey;
+            // let flag2 = !item.modelKey || item.modelKey == modelKey;
+
+            let flag2 = item.modelOrders === undefined || item.modelOrders === null || item.modelOrders === modelOrders;
             let flag3 = !companyCodes.length || companyCodes.includes(companyCode)
             if (flag1 && flag2 && flag3) {
               if (type === 1) {
@@ -771,11 +778,12 @@ modules = {
           if (widgetShowRuleConfig.length) {
             let item1 = null;//匹配服务+组织
             let item2 = null;//匹配服务
-            let item3 = null;//serveType==5,匹配所有服务和组织
+            let item3 = null;//匹配所有服务和组织
             widgetShowRuleConfig.forEach(item => {
               let serveName = item.serveName ?? null;
 
-              let flag1 = item.serveType === 5;//所有组织和服务
+              // let flag1 = item.serveType === 5;//所有组织和服务
+              let flag1 = !item.serveName && !item.companyCodes;//所有组织和服务
 
               //匹配服务名
               let flag2 = serveName === bdService
@@ -2383,9 +2391,37 @@ modules = {
     },
     validate(callback) {
       this.$refs['renderForm'].$baseValidate(valid => {
+        if(!valid){
+          // this.scrollToFirstError();
+        }
         callback && callback(valid);
       })
     },
+    scrollToFirstError() {
+      // 获取第一个验证失败的字段
+      let formTarget = this.$refs['renderForm'];
+      const firstErrorField = Object.keys(formTarget.fields).find(key => {
+        return formTarget.fields[key].validateState === 'error';
+      });
+
+      if (firstErrorField) {
+        const field = this.$refs.form.fields[firstErrorField];
+
+        // 滚动到该字段位置
+        field.$el.scrollIntoView({
+          behavior: 'smooth',
+          block: 'center'
+        });
+
+        // 添加高亮效果
+        field.$el.classList.add('highlight');
+
+        // 3秒后移除高亮效果
+        setTimeout(() => {
+          field.$el.classList.remove('highlight');
+        }, 3000);
+      }
+    },
     openSearchDialog(option) {
       this.searchDialogOption = option;
       this.showSearchDialog = true;

package/src/components/xform/mixins/scriptHttp.js

@@ -44,16 +44,6 @@ modules = {
     getHttpTarget() {
       return this.getFormRef ? this.getFormRef() : this;
     },
-    getLoadingTarget() {
-      let that = this.getHttpTarget();
-      if(!that ||!that.$el){
-        debugger
-      }
-      let loadingTarget = that.$el || document.body;
-
-      // let loadingTarget = document.body;
-      // return loadingTarget;
-    },
     formHttp(opts) {
       let data = opts.data;
       let scriptCode = opts.scriptCode;

package/src/views/bd/setting/bd_company_env/dialog.vue

@@ -0,0 +1,161 @@
+<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>
+          <tableForm :formData.sync="formData" @searchEvent="searchEvent" @resetEvent="resetEvent">
+            <template #buttonLeft>
+            </template>
+            <template #buttonRight>
+              <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>
+            </template>
+          </tableForm>
+        </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>{{ getCheckLabel(checkRow,'name') }}</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';
+import tableForm from "@base/components/table/tableForm.vue";
+
+export default {
+  name: 'positionDialog',
+  props: ['visiable', 'multi', 'rows', 'param'],
+  mixins: [selectDialogMixins],
+  components: {
+    tableForm
+  },
+  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 url = USER_PREFIX + '/bd_company_env/listPage';
+      let tableOption = {
+        vue: that,
+        tableRef: 'table-m1',
+        tableName: 'basic_position_dialog-m1',
+        path: url,
+        param: () => {
+          return {
+            ...this.formData
+          }
+        },
+        columns: [
+          {type: 'checkbox', fixed: 'left', width: 48, resizable: false},
+          {
+            title: '服务',
+            field: 'bdService',
+            width: 150,
+            fixed: 'left'
+          },
+          {
+            title: '组织编码',
+            field: 'bdCompanyCode',
+            width: 150,
+            fixed: 'left'
+          },
+          {
+            width: 47,
+            fixed: 'right',
+            title: '',
+            sortable: false
+          }
+        ],
+        searchColumns: [
+          {
+            title: this.$t1("服务"),
+            field: "bdService",
+            type: "input",
+            common: true,
+          },
+          {
+            title: this.$t1("组织编码"),
+            field: "bdCompanyCode",
+            type: "input",
+            common: true,
+          }
+        ],
+        config: {
+          checkboxConfig: {
+            checkStrictly: true,
+            showHeader: this.selectMulti,
+            trigger: 'row'
+          }
+        }
+      };
+      this.$vxeTableUtil.initVxeTable(tableOption).then(opts => {
+        that.vxeOption = opts;
+      });
+    }
+  }
+};
+</script>

package/src/views/bd/setting/bd_company_env/edit.vue

@@ -0,0 +1,151 @@
+<template>
+  <div class="detail-wrap">
+    <el-form ref="editForm" :model="bdCompanyEnv">
+      <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="$baseReload()" 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">
+        <div class="d-item">
+          <div class="title first"><b>{{ $t1('基本信息') }}</b></div>
+          <table class="table-detail">
+            <tbody>
+            <tr>
+              <th>
+                <em class="f-red">*</em>
+                {{ $t1('服务') }}
+              </th>
+              <td>
+                <el-form-item prop="bdService" :rules="[{ required: true, trigger: 'blur' }]">
+                  <el-input type="text" autocomplete="off" v-model="bdCompanyEnv.bdService" clearable/>
+                </el-form-item>
+              </td>
+              <th>
+                <em class="f-red">*</em>
+                {{ $t1('组织编码') }}
+              </th>
+              <td>
+                <el-form-item prop="bdCompanyCode" :rules="[{ required: true, trigger: 'blur' }]">
+                  <el-input type="text" autocomplete="off" v-model="bdCompanyEnv.bdCompanyCode" clearable/>
+                </el-form-item>
+              </td>
+            </tr>
+            <tr>
+              <th>{{ $t1('创建人') }}</th>
+              <td>{{ bdCompanyEnv.createBy }}</td>
+              <th>{{ $t1('创建时间') }}</th>
+              <td>{{ bdCompanyEnv.createDate }}</td>
+              <th>{{ $t1('更新人') }}</th>
+              <td>{{ bdCompanyEnv.modifyBy }}</td>
+              <th>{{ $t1('更新时间') }}</th>
+              <td>{{ bdCompanyEnv.modifyDate }}</td>
+            </tr>
+            </tbody>
+          </table>
+        </div>
+      </div>
+    </el-form>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'request_setttingEdit',
+  props: {
+    _dataId: [String, Number],
+    copyId: [String, Number]
+  },
+  components: {},
+  data() {
+    return {
+      isEdit: false,
+      tabIndex: 'first',
+      dataId: '',
+      bdCompanyEnv: {
+        enabled: true,
+        connectTimeout: 10000,
+        readTimeout: 60000,
+        preScript: null,
+        postScript: null,
+        exeCompanyCode:null
+      },
+      showCodeEditor: false
+    };
+  },
+  created() {
+    if (this._dataId && !isNaN(this._dataId)) this.dataId = this._dataId;
+  },
+  mounted() {
+    this.getData();
+  },
+  methods: {
+    getData() {
+      if (this.copyId) {
+        return;
+      }
+      if (this.dataId && !isNaN(this.dataId)) {
+        this.isEdit = true;
+        this.$commonHttp({
+          url: USER_PREFIX + `/bd_company_env/get`,
+          method: `post`,
+          data: {
+            id: this.dataId
+          },
+          isLoading: true,
+          modalStrictly: true,
+          success: res => {
+            this.bdCompanyEnv = res.objx || {};
+            this.showCodeEditor = true;
+          }
+        });
+      } else {
+        this.showCodeEditor = true;
+      }
+    },
+    saveData() {
+      this.$refs.editForm.$baseValidate(valid => {
+        if (valid) {
+          this.$baseConfirm(this.$t1('您确定要保存吗？')).then(() => {
+            var url = USER_PREFIX + (this.isEdit ? `/bd_company_env/update` : `/bd_company_env/save`);
+            this.$http({
+              url: url,
+              method: `post`,
+              data: this.bdCompanyEnv,
+              isLoading: true,
+              success: res => {
+                this.$message({
+                  message: res.content,
+                  type: 'success',
+                  duration: 500,
+                  onClose: t => {
+                    if (this.isEdit) {
+                      this.$baseReload();
+                    } else {
+                      this.$baseReload({
+                        updateParam: {
+                          _dataId: res.objx,
+                          copyId: null
+                        }
+                      });
+                    }
+                  }
+                });
+              }
+            });
+          });
+        }
+      });
+    }
+  }
+};
+
+</script>

package/src/views/bd/setting/bd_company_env/list.vue

@@ -0,0 +1,164 @@
+<template>
+  <div id="containt">
+    <el-tabs v-model="activeName" class="tab-box">
+      <el-tab-pane :label="$t1('常规')" name="first">
+        <editView v-if="showEdit" visible-key="showEdit" :_dataId.sync="dataId" :copyId.sync="copyId"
+                  :parent-target="_self" @reload="$reloadHandle"></editView>
+      </el-tab-pane>
+      <el-tab-pane :label="$t1('列表')" name="second">
+        <div class="grid-height">
+          <vxe-grid ref="table-m1" v-bind="vxeOption" @resizable-change="$vxeTableUtil.onColumnWitchChange"
+                    @custom="$vxeTableUtil.customHandle">
+            <template #form>
+              <tableForm :formData.sync="formData" @searchEvent="searchEvent" @resetEvent="resetEvent">
+                <template #buttonLeft>
+                  <vxe-button status="primary" class="button-sty" icon="el-icon-plus" @click="openEditDialog">{{ $t1('新增') }}
+                  </vxe-button>
+                  <base-table-export :option="{ title: '企业组织环境设置导出', targetRef: 'table-m1'}" :parent-target="_self"/>
+                </template>
+                <template #buttonRight>
+                  <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>
+                </template>
+              </tableForm>
+            </template>
+          </vxe-grid>
+        </div>
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+<script>
+import editView from './edit.vue';
+import tableForm from "@base/components/table/tableForm.vue";
+
+export default {
+  name: 'bd_company_env:list',
+  components: {tableForm, editView},
+  data() {
+    return {
+      activeName: 'second',
+      dataId: 0,
+      showEdit: false,
+      vxeOption: {},
+      formData: {},
+    };
+  },
+  mounted() {
+    this.initTableList();
+  },
+  methods: {
+    searchEvent() {
+      this.$refs['table-m1'].commitProxy('reload');
+    },
+    resetEvent() {
+      this.formData = {};
+      this.advancedFormData = {};
+      this.$refs['table-m1'].commitProxy('reload');
+    },
+    openEditDialog(id) {
+      this.copyId = 0;
+      this.dataId = !id || typeof id == 'object' ? 0 : id;
+      this.activeName = 'first';
+      this.$openEditView('showEdit');
+    },
+    initTableList() {
+      let that = this;
+      let pushTypeMap = {0: '异步推送', 1: '同步调用'};
+      let tableOption = {
+        vue: this,
+        tableRef: 'table-m1',
+        tableName: 'bd_company_env_list-m1',
+        path: USER_PREFIX + '/bd_company_env/listPage',
+        param: () => {
+          return {
+            ...this.formData
+          }
+        },
+        columns: [
+          {type: 'checkbox', width: 48, resizable: false, fixed: 'left'},
+          {
+            title: '服务',
+            field: 'bdService',
+            width: 150,
+            fixed: 'left'
+          },
+          {
+            title: '组织编码',
+            field: 'bdCompanyCode',
+            width: 150,
+            fixed: 'left'
+          },
+          {
+            field: 'createBy',
+            title: this.$t1('创建人'),
+            width: 150
+          },
+          {
+            field: 'createDate',
+            title: this.$t1('创建时间'),
+            width: 150
+          },
+          {
+            field: 'modifyBy',
+            title: this.$t1('更新人'),
+            width: 150
+          },
+          {
+            field: 'modifyDate',
+            title: this.$t1('更新时间'),
+            width: 150
+          },
+          {
+            width: 47,
+            fixed: 'right',
+            title: '',
+            sortable: false,
+            slots: {
+              default: ({row}) => {
+                return [
+                  <div>
+                    <a
+                      href="javascript:void(0);"
+                      class="a-link"
+                      onclick={() => {
+                        this.openEditDialog(row.id);
+                      }}
+                    >
+                      <el-tooltip enterable={false} effect="dark" content={ this.$t1('查看') } placement="top"
+                                  popper-class="tooltip-skin">
+                        <i class="el-icon-edit"/>
+                      </el-tooltip>
+                    </a>
+                  </div>
+                ];
+              }
+            }
+          }
+        ],
+        searchColumns: [
+          {
+            title: this.$t1("服务"),
+            field: "bdService",
+            type: "input",
+            common: true,
+          },
+          {
+            title: this.$t1("组织编码"),
+            field: "bdCompanyCode",
+            type: "input",
+            common: true,
+          }
+        ]
+      };
+      this.$vxeTableUtil.initVxeTable(tableOption).then(opts => {
+        this.vxeOption = opts;
+      });
+    }
+  }
+};
+</script>

package/src/views/bd/setting/config_manage/list.vue

@@ -1,6 +1,6 @@
 <template>
   <div id="containt">
-    <div  class="flex">
+    <div class="flex">
       <div class="tab-box-vertical">
         <div class="list-scroll">
           <div class="item" v-for="(item,index) in typeTabs" :key="item.name" :class="{on:item.name==activeName}"
@@ -19,16 +19,18 @@
 <script>
 import bd_attach_setting_list from "@base/views/bd/setting/bd_attach_setting/list.vue";
 import request_setting_list from "@base/views/user/request_setting/list.vue";
+import bd_company_env_list from "@base/views/bd/setting/bd_company_env/list.vue";
 
 export default {
   name: "list",
-  components: {bd_attach_setting_list, request_setting_list},
+  components: {bd_attach_setting_list, request_setting_list, bd_company_env_list},
   data() {
     return {
       activeName: "bd_attach_setting_list",
       typeTabs: [
         {label: this.$t1("导入模板"), name: "bd_attach_setting_list", inited: true},
         {label: this.$t1("同步调用接口"), name: "request_setting_list", inited: false},
+        {label: this.$t1("企业组织环境设置"), name: "bd_company_env_list", inited: false},
       ]
     }
   },

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

@@ -111,6 +111,14 @@
                   </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>
@@ -195,7 +203,8 @@ export default {
         startMode: 3,
         skipSameUserTask: false,
         toNextNode: null,
-        enabled: true
+        enabled: true,
+        orders:undefined
       },
       showWfObjConfigDialog: false,
       configServiceId: null,
@@ -233,6 +242,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
             }

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

@@ -390,6 +390,11 @@ export default {
             width: 150,
             fixed: 'left'
           },
+          {
+            title: this.$t1('序号'),
+            field: 'orders',
+            width: 150
+          },
           {
             title: this.$t1('流程模版KEY'),
             field: 'modelKey',
@@ -590,7 +595,6 @@ export default {
     },
     initWinUserDialog() {
       window.openAssignUserDialog = opts => {
-        debugger
         this.wfAssignMulti = opts.multi;
         this.wfAssignData = opts.data || [];
         this.wfAssignCallback = opts.callback;