cloud-web-corejs 1.0.54-dev.57 → 1.0.54-dev.571

package/src/components/wf/mixins/setCandidateDialog2.js

@@ -0,0 +1,252 @@
+import userDialog from "../../../views/user/user/dialog.vue";
+import wfTaskUserRangeDialog from '../wfTaskUserRangeDialog.vue'
+
+let moudule = {};
+moudule = {
+  props: ['visiable', 'multi', 'rows', 'param', 'current_prefix',"modelId", "objTypeCode"],
+  components: {userDialog,wfTaskUserRangeDialog},
+  created() {
+
+  },
+  mounted() {
+    this.initWfParam15();
+    this.initTableM1();
+  },
+  data() {
+    var that = this;
+    return {
+      showDialog: true,
+      falseValue: false,
+      selectMulti: true,
+      vxeOption: {},
+      showUserDialog: false,
+      userRows: [],
+      operateIndex: -1,
+
+      rangeTableDatas: [],
+      userRangeRows: [],
+      showWfTaskUserRangeDialog:false,
+
+      tableData: [],
+      showModifyButton:false,
+      showPreWfNodesButton:false
+
+    };
+  },
+  methods: {
+    initWfParam15(){
+      //初始化是否开启获取上一次候选人功能
+      return this.$http({
+        url: USER_PREFIX + "/wf_diy_attribute/getValue",
+        method: `post`,
+        data: {attributeKey: "param15"},
+        success: (res) => {
+          this.showPreWfNodesButton = res?.objx === true;
+        },
+      });
+    },
+    handleModifyButtonState(){
+      let result = false;
+      this.tableData.forEach(item => {
+        if (item.modifyCandidates && !item.wfTaskCandidateDTOs?.length) {
+          result = true;
+        }
+      })
+      this.showModifyButton = result
+    },
+    openShowWfTaskUserRangeDialog(row,rowIndex,rangeTableDatas){
+      this.userRangeRows = row.wfTaskCandidateDTOs.map(item => {
+        return {
+          userId: item.id,
+          nickName: item.name
+        }
+      });
+      this.rangeTableDatas = rangeTableDatas;
+      this.operateIndex = rowIndex;
+      this.showWfTaskUserRangeDialog = true;
+    },
+    confirmWfTaskUserRangeDialog(rows){
+      let $grid = this.$refs["table-m1"];
+      let item = $grid.getTableData().fullData[this.operateIndex];
+      let wfTaskCandidateDTOs = item.wfTaskCandidateDTOs;
+      let item1s = [];
+      let item2s = []
+      rows.forEach(row => {
+        let userId = row.userId;
+        let wfTaskCandidateDTO = wfTaskCandidateDTOs.find(item => item.id == userId)
+        if (wfTaskCandidateDTO) {
+          if (!wfTaskCandidateDTO.userFlag) wfTaskCandidateDTO.userFlag = 6
+          item1s.push({...wfTaskCandidateDTO});
+        } else {
+          item2s.push({
+            id: userId,
+            name: row.nickName,
+            userFlag: 6
+          })
+        }
+      })
+      item.wfTaskCandidateDTOs = item1s.concat(item2s)
+      this.handleModifyButtonState();
+    },
+    initTableM1() {
+      this.tableData = this.$baseLodash.cloneDeep(this.rows || []);
+      this.handleModifyButtonState();
+      let that = this;
+      let tableOption = {
+        vue: that,
+        tableRef: 'table-m1',
+        tableName: 'setCandidateDialog2_dialog-m1',
+        columns: [
+          {type: 'checkbox', width: 50, resizable: false, fixed: 'left'},
+          {title: this.$t2('节点名称', 'components.wf.nodeName'), field: 'nodeName', width: 250, fixed: 'left'},
+          {
+            field: 'wfTaskCandidates',
+            title: this.$t2('候选人', 'components.wf.candidate'),
+            width: 450,
+            slots: {
+              default: 'wfTaskCandidates'
+            }
+          },
+          {
+            width: 150,
+            fixed: 'right',
+            title: '',
+            sortable: false,
+            slots: {
+              default: 'operate'
+            }
+          }
+        ]
+      };
+      this.$vxeTableUtil.initVxeTable(tableOption).then(opts => {
+        that.vxeOption = opts;
+      });
+    },
+    getUsernames(row) {
+      return row.wfTaskCandidateDTOs.map(item => item.name).join(",")
+    },
+    checkWfTaskUserRange(row, rowIndex, callback){
+      //是否使用用户范围
+      this.$http({
+        url: this.current_prefix + '/wf_task_user_range/list',
+        method: `post`,
+        data: {
+          modelId: this.modelId,
+          taskDefinitionKey: row.nodeId
+        },
+        isLoading: true,
+        success: res => {
+          let rows = res.objx || [];
+          if(!rows.length){
+            //不使用用户范围
+            callback();
+          }else{
+            //使用用户范围
+            this.openShowWfTaskUserRangeDialog(row, rowIndex,rows)
+          }
+        }
+      });
+    },
+
+    openUserDialig(row, rowIndex) {
+      //是否使用用户范围
+      this.checkWfTaskUserRange(row, rowIndex, ()=>{
+        //不使用用户范围
+        this.userRows = row.wfTaskCandidateDTOs.map(item => {
+          return {
+            id: item.id,
+            nickName: item.name
+          }
+        });
+        this.operateIndex = rowIndex;
+        this.showUserDialog = true;
+      })
+    },
+    userConfirm(rows) {
+      let $grid = this.$refs["table-m1"];
+      let item = $grid.getTableData().fullData[this.operateIndex];
+      let wfTaskCandidateDTOs = item.wfTaskCandidateDTOs;
+      let item1s = [];
+      let item2s = []
+      rows.forEach(row => {
+        let userId = row.id + "";
+        let wfTaskCandidateDTO = wfTaskCandidateDTOs.find(item => item.id == userId)
+        if (wfTaskCandidateDTO) {
+          if (!wfTaskCandidateDTO.userFlag) wfTaskCandidateDTO.userFlag = 6
+          item1s.push({...wfTaskCandidateDTO});
+        } else {
+          item2s.push({
+            id: userId,
+            name: row.nickName,
+            userFlag: 6
+          })
+        }
+      })
+      item.wfTaskCandidateDTOs = item1s.concat(item2s)
+      this.handleModifyButtonState();
+      // this.saveItem(item);
+    },
+    saveItem(row) {
+      this.$http({
+        url: this.current_prefix + '/wf/setTaskUser',
+        method: `post`,
+        data: row,
+        isLoading: true,
+        success: res => {
+          this.$message({
+            message: res.content,
+            type: 'success',
+            duration: 500,
+            onClose: t => {
+              this.searchEvent();
+            }
+          });
+        }
+      });
+    },
+    confirmDialog(){
+      this.$emit("confirm",this.tableData)
+      this.closeWin()
+    },
+    closeWin() {
+      this.dialogClose();
+      this.$emit('close')
+    },
+    fillCandidates() {
+      this.$baseConfirm(this.$t1('您确定要获取上次候选人吗？')).then(() => {
+        this.$http({
+          url: this.current_prefix + '/wf/getPreWfNodes',
+          method: `post`,
+          data: {
+            objTypeCode: this.objTypeCode,
+            modelId: this.modelId,
+            userFlag: 5
+          },
+          isLoading: true,
+          success: res => {
+            let rows = res.objx || []
+            if(rows.length){
+              let dataMap = {};
+              rows.forEach(row=>{
+                let items = row.wfTaskCandidateDTOs || [];
+                items.forEach(item=>{
+                  item.userFlag = 5
+                })
+                dataMap[row.nodeId] = row.wfTaskCandidateDTOs || [];
+              })
+              this.tableData.forEach(item => {
+                if (item.modifyCandidates && !item.wfTaskCandidateDTOs?.length) {
+                  item.wfTaskCandidateDTOs = dataMap[item.nodeId] || [];
+                }
+              })
+              this.handleModifyButtonState();
+            }
+          }
+        });
+
+      });
+
+    },
+  }
+};
+export default moudule;

package/src/components/wf/mixins/wfFlowEleScriptDialog.js

@@ -0,0 +1,131 @@
+let modules = {};
+ 
+modules = {
+  props: ['visiable', 'multi', 'rows', 'param', 'current_prefix', 'wfInfo'],
+  data() {
+    return {
+      vxeOption: {},
+      script:null,
+      showDialog: true,
+      currentRow:null,
+      showScriptDialog:false,
+      scriptTypeMap:{
+        'pre': '前置事件',
+        'post': '后置事件',
+        'candidate': '候选人事件',
+        'start': '开始事件',
+        'end': '结束事件',
+        'interrupt': '中断事件',
+        'conditions': '条件事件',
+        'countersignSubmit': '会签提交事件'
+      },
+      scritpDialogTitle: null
+
+
+    }
+  },
+  mounted() {
+    this.initTableM1()
+  },
+  methods: {
+    searchEvent() {
+      this.$refs['table-m1'].commitProxy('reload');
+    },
+    closeDialog(){
+      this.$emit("update:visiable", false);
+    },
+    initTableM1() {
+      let that = this;
+      let scriptTypeMap = this.scriptTypeMap
+      let tableOption = {
+        vue: that,
+        tableRef: 'table-m1',
+        tableName: 'setCandidateDialog_dialog-m1',
+        path: this.current_prefix + '/wf_flow_ele_script/list',
+        param: () => {
+          return {
+            modelId: this.wfInfo.modelId,
+            procDefId: this.wfInfo.procDefId,
+          }
+        },
+        config: {
+          /*checkboxConfig: {
+            checkStrictly: true,
+            showHeader: this.selectMulti,
+          },*/
+          pagerConfig:{
+            autoHidden: true
+          },
+          proxyConfig: {
+            props: {
+              result: "objx", // 配置响应结果列表字段
+              total: "objx.length", // 配置响应结果总页数字段
+            },
+          },
+        },
+        columns: [
+          {type: 'checkbox', width: 50, resizable: false, fixed: 'left'},
+          {title: this.$t2('节点名称', 'components.wf.nodeName'), field: 'eleName', width: 250, fixed: 'left'},
+          {
+            field: 'scriptType',
+            title: this.$t1('脚本类型'),
+            width: 150,
+            slots: {
+              default: ({row})=>{
+                return scriptTypeMap[row.scriptType]
+              }
+            }
+          },
+          {title: this.$t1('更新时间'), field: 'modifyDate', width: 150},
+          {
+            width: 150,
+            fixed: 'right',
+            title: '',
+            sortable: false,
+            slots: {
+              default: 'operate'
+            }
+          }
+        ]
+      };
+      this.$vxeTableUtil.initVxeTable(tableOption).then(opts => {
+        that.vxeOption = opts;
+      });
+    },
+    openScriptDialog(row){
+      let scriptTypeMap = this.scriptTypeMap
+      this.scritpDialogTitle = row.eleName + "(" + scriptTypeMap[row.scriptType] + ")"
+      this.script = row.script
+      this.currentRow = row
+      this.showScriptDialog = true
+    },
+    saveScript() {
+      this.$baseConfirm(this.$t1('您确定要保存脚本吗？')).then(() => {
+        var url = this.current_prefix + '/wf_flow_ele_script/updateScript';
+        this.$http({
+          url: url,
+          method: `post`,
+          data: {
+            ...this.currentRow,
+            script: this.script
+          },
+          isLoading: true,
+          success: res => {
+            this.$message({
+              message: res.content,
+              type: 'success'
+            });
+            this.showScriptDialog = false;
+            this.searchEvent();
+          }
+        });
+      });
+
+    },
+    
+  }
+
+
+};
+
+export default modules

package/src/components/wf/mixins/wfTaskUserRangeDialog.js

@@ -0,0 +1,69 @@
+let moudule = {};
+
+moudule = {
+  props: ['visiable', 'multi', 'rows','rangeTableDatas', 'param','current_prefix','modelId','taskDefinitionKey'],
+  created() {
+    this.initSetting();
+  },
+  mounted() {
+    this.initTableM1();
+  },
+  data() {
+    var that = this;
+    return {
+      showDialog: true,
+      falseValue: false,
+      selectMulti: true,
+      formData: {},
+      vxeOption: {},
+      tableData: [],
+      fieldKey:"userId"
+    };
+  },
+  methods: {
+    initTableM1() {
+      this.tableData = this.$baseLodash.cloneDeep(this.rangeTableDatas || []);
+      let that = this;
+      let tableOption = {
+        vue: that,
+        tableRef: 'table-m1',
+        tableName: 'wf_task_user_range_dialog-m1',
+        columns: [
+          {type: 'checkbox', fixed: 'left', width: 48, resizable: false},
+          {
+            title: this.$t1('候选人姓名'),
+            field: 'nickName',
+            width: 250,
+            fixed: 'left'
+          },
+          {
+            width: 47,
+            fixed: 'right',
+            title: '',
+            sortable: false
+          }
+        ],
+        config: {
+          checkboxConfig: {
+            checkStrictly: true,
+            showHeader: this.selectMulti,
+            trigger: 'row'
+          }
+        }
+      };
+      this.$vxeTableUtil.initVxeTable(tableOption).then(opts => {
+        that.vxeOption = opts;
+      });
+    },
+    confirmDialog(){
+      let checkRows = this.checkRows;
+      if(!checkRows.length){
+        this.$baseAlert(this.$t1("请选择候选人"));
+        return
+      }
+      this.dialogPrimary(checkRows)
+    }
+  }
+};
+
+export default moudule;

package/src/components/wf/setCandidateButton.vue

@@ -0,0 +1,40 @@
+<template>
+  <a
+    href="javascript:void(0);"
+    class="a-link"
+    @click="openUserDialig"
+  >
+    <div>
+      <el-tooltip :enterable="false" effect="dark" :content="$t1('修改候选人')" placement="top"
+                popper-class="tooltip-skin">
+      <i class="el-icon-edit"/>
+    </el-tooltip>
+      <user-dialog
+        v-if="showUserDialog"
+        :visiable.sync="showUserDialog"
+        @close="showUserDialog = false"
+        @confirm="userConfirm"
+        multi="true"
+        :rows="userRows"
+      ></user-dialog>
+      <wfTaskUserRangeDialog
+        v-if="showWfTaskUserRangeDialog"
+        :visiable.sync="showWfTaskUserRangeDialog"
+        @close="showWfTaskUserRangeDialog = false"
+        @confirm="confirmWfTaskUserRangeDialog"
+        multi="true"
+        :rows="userRangeRows"
+        :rangeTableDatas="rangeTableDatas"
+      ></wfTaskUserRangeDialog>
+    </div>
+  </a>
+</template>
+
+<script>
+import mixin from "../../components/wf/mixins/setCandidateButton";
+import { selectDialogMixins } from "../../mixins/selectDialog/index.js";
+
+export default {
+  mixins: [selectDialogMixins, mixin],
+};
+</script>

package/src/components/wf/setCandidateDialog.vue

@@ -10,6 +10,7 @@
       @close="closeWin"
       v-el-drag-dialog
       v-el-dialog-center
+      :append-to-body="true"
     >
       <template #title>
         <span class="el-dialog__title">
@@ -73,6 +74,15 @@
       multi="true"
       :rows="userRows"
     ></user-dialog>
+    <wfTaskUserRangeDialog
+      v-if="showWfTaskUserRangeDialog"
+      :visiable.sync="showWfTaskUserRangeDialog"
+      @close="showWfTaskUserRangeDialog = false"
+      @confirm="confirmWfTaskUserRangeDialog"
+      multi="true"
+      :rows="userRangeRows"
+      :rangeTableDatas="rangeTableDatas"
+    ></wfTaskUserRangeDialog>
   </div>
 </template>
 

package/src/components/wf/setCandidateDialog2.vue

@@ -0,0 +1,105 @@
+<template>
+  <el-dialog
+    :title="$t2('查看候选人', 'components.wf.setCandidateTitle')"
+    :close-on-click-modal="falseValue"
+    :visible.sync="showDialog"
+    :modal="falseValue"
+    custom-class="dialog-style list-dialog dialog-checkbox pd_0"
+    width="1200px"
+    @close="closeWin"
+    v-el-drag-dialog
+    v-el-dialog-center
+    :append-to-body="true"
+  >
+    <template #title>
+      <span class="el-dialog__title">
+        {{ $t2("查看候选人", "components.wf.setCandidateTitle") }}
+      </span>
+    </template>
+    <div class="cont" style="height: 450px">
+      <vxe-grid
+        ref="table-m1"
+        :data="tableData"
+        v-bind="vxeOption"
+        @resizable-change="$vxeTableUtil.onColumnWitchChange"
+        @custom="$vxeTableUtil.customHandle"
+      >
+        <template #form>
+          <div class="clearfix screen-btns" v-show="showPreWfNodesButton && showModifyButton">
+            <div class="fl" v-show="showModifyButton">
+              <vxe-button
+                icon="el-icon-user"
+                class="button-sty"
+                @click="fillCandidates()"
+                type="text"
+                status="primary"
+                plain
+                >{{ $t1("获取上次候选人") }}
+              </vxe-button>
+            </div>
+          </div>
+        </template>
+        <template #wfTaskCandidates="{ row }">
+          {{ getUsernames(row) }}
+        </template>
+        <template #operate="{ row, rowIndex }">
+          <a
+            @click="openUserDialig(row, rowIndex)"
+            class="a-link"
+            v-if="row.modifyCandidates"
+          >
+            <el-tooltip
+              :enterable="false"
+              effect="dark"
+              :content="$t2('设置候选人', 'components.wf.modifyCandidate')"
+              placement="top"
+              popper-class="tooltip-skin"
+            >
+              <div>
+                <i class="el-icon-edit"></i
+                ><span>{{ $t2("设置候选人", "components.wf.modifyCandidate") }}</span>
+              </div>
+            </el-tooltip>
+          </a>
+        </template>
+      </vxe-grid>
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <el-button type="primary" plain class="button-sty" @click="closeWin">
+        <i class="el-icon-close el-icon"></i>
+        {{ $t2("取 消", "system.button.cancel2") }}
+      </el-button>
+      <el-button type="primary" @click="confirmDialog" class="button-sty">
+        <i class="el-icon-check el-icon"></i>
+        {{ $t2("确 定", "system.button.confirm2") }}
+      </el-button>
+    </span>
+    <user-dialog
+      v-if="showUserDialog"
+      :visiable.sync="showUserDialog"
+      @close="showUserDialog = false"
+      @confirm="userConfirm"
+      multi="true"
+      :rows="userRows"
+    ></user-dialog>
+    <wfTaskUserRangeDialog
+      v-if="showWfTaskUserRangeDialog"
+      :visiable.sync="showWfTaskUserRangeDialog"
+      @close="showWfTaskUserRangeDialog = false"
+      @confirm="confirmWfTaskUserRangeDialog"
+      multi="true"
+      :rows="userRangeRows"
+      :rangeTableDatas="rangeTableDatas"
+      :current_prefix="current_prefix"
+    ></wfTaskUserRangeDialog>
+  </el-dialog>
+</template>
+
+<script>
+import mixin from "../../components/wf/mixins/setCandidateDialog2";
+import { selectDialogMixins } from "../../mixins/selectDialog/index.js";
+
+export default {
+  mixins: [selectDialogMixins, mixin],
+};
+</script>