cloud-web-corejs 1.0.54-dev.293 → 1.0.54-dev.296

package/src/components/wf/setCandidateDialog2.vue

@@ -0,0 +1,320 @@
+<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 #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 { selectDialogMixins } from "../../mixins/selectDialog/index.js";
+import userDialog from "../../views/user/user/dialog.vue";
+import wfTaskUserRangeDialog from './wfTaskUserRangeDialog.vue'
+export default {
+  mixins: [selectDialogMixins],
+  props: ['visiable', 'multi', 'rows', 'param', 'current_prefix',"modelId"],
+  components: {userDialog,wfTaskUserRangeDialog},
+  created() {
+
+  },
+  mounted() {
+
+    // this.initWfUserRangeParam();
+    this.initTableM1();
+  },
+  data() {
+    var that = this;
+    return {
+      showDialog: true,
+      falseValue: false,
+      selectMulti: true,
+      vxeOption: {},
+      showUserDialog: false,
+      userRows: [],
+      operateIndex: -1,
+
+      rangeTableDatas: [],
+      userRangeRows: [],
+      showWfTaskUserRangeDialog:false,
+
+      tableData: []
+
+
+
+      // wfUserRangeEnabled: false
+    };
+  },
+  methods: {
+    /* initWfUserRangeParam(){
+      this.$http({
+        url: USER_PREFIX + "/wf_diy_attribute/getValue",
+        method: `post`,
+        data: {attributeKey: "param12"},
+        success: (res) => {
+          this.wfUserRangeEnabled = res?.objx === true;
+        },
+      });
+    }, */
+    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.saveItem(item);
+    },
+    initTableM1() {
+      this.tableData = this.$baseLodash.cloneDeep(this.rows || []);
+      let that = this;
+      let tableOption = {
+        vue: that,
+        tableRef: 'table-m1',
+        tableName: 'setCandidateDialog2_dialog-m1',
+        // path: this.current_prefix + '/wf/getAllNodes',
+       /*  param: () => {
+          return {
+            stringOne: this.wfInfo.uuid
+          }
+        }, */
+        config: {
+          /*checkboxConfig: {
+            checkStrictly: true,
+            showHeader: this.selectMulti,
+          },*/
+          /* proxyConfig: {
+            props: {
+              result: "objx", // 配置响应结果列表字段
+              total: "objx.length", // 配置响应结果总页数字段
+            },
+          }, */
+        },
+        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){
+      //是否使用用户范围
+      /* if(!this.wfUserRangeEnabled){
+        //不使用用户范围
+        callback();
+        return
+      } */
+      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.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')
+    }
+  }
+};
+</script>

package/src/components/wf/wf.js

@@ -378,7 +378,7 @@ wfContentMixin = {
 
       showCandidate: false,
       candidateOption:{},
-      candidateDatas:[]
+      candidateDatas:[],
     };
   },
   provide() {
@@ -1560,6 +1560,11 @@ wfStartMixin = {
       showDialog: false,
       wfStartForm: {},
       wfDefItems: [],
+
+      startFormData:{},
+      wfUserRangeEnabled: false,
+      preStartResult:[],
+      showSetCandidateDialog2:false
     };
   },
   computed: {
@@ -1567,15 +1572,51 @@ wfStartMixin = {
       return this.serviceId ? "/" + this.serviceId : "";
     },
   },
-  async mounted() {
-    await this.initWfInfo(this.code);
+   mounted() {
+     this.initWfInfo(this.code);
     // this.showDialog = true;
   },
   methods: {
+    preStart(){
+      let that = getTarget(this);
+      return new Promise(resolve=>{
+        return that.$http({
+          url: this.current_prefix + "/wf/preStart",
+          method: `post`,
+          data: this.startFormData,
+          success: (res) => {
+            resolve(res.objx);
+          },
+        });
+      })
+    },
+    initWfUserRangeParam(){
+      let that = getTarget(this);
+      return that.$http({
+        url: USER_PREFIX + "/wf_diy_attribute/getValue",
+        method: `post`,
+        data: {attributeKey: "param12"},
+        success: (res) => {
+          this.wfUserRangeEnabled = res?.objx === true;
+        },
+      });
+    },
+    openSetCandidateDialog(){
+        this.showSetCandidateDialog2 = true;
+    },
+    confirmSetCandidateDialog(rows){
+      let formData = {
+        ...this.startFormData,
+        wfNodeDTOs: rows
+      }
+      this.startSubmitHanlde(formData);
+    },
     async initWfInfo(code) {
       let that = getTarget(this);
       var wfDefItems = null;
       var objId = this.dataId;
+
+      await this.initWfUserRangeParam();
       await that.$http({
         url: this.current_prefix + "/wf_obj_config_item/list",
         data: {
@@ -1640,14 +1681,14 @@ wfStartMixin = {
         this.subWfStartForm();
       }
     },
-    subWfStartForm() {
+    async subWfStartForm() {
       let that = getTarget(this);
       var modelId = this.wfStartForm.modelId;
       if (!modelId) {
         that.$baseAlert(this.$t2('请选择流程模版', 'components.wf.startWarnMsg2'));
         return false;
       }
-      this.showDialog = false;
+
       let option = this.option;
 
       var objId = this.dataId;
@@ -1655,21 +1696,37 @@ wfStartMixin = {
       let startParam = this.startParam || {};
       let formCode = this.formCode || null;
 
-      var data = JSON.stringify({
+      var data = {
         modelId: modelId,
         objTypeCode: this.code,
         objId: objId,
         formData: startParam,
         formCode: formCode
         // name:this.wfName
-      });
+      };
+      this.startFormData = data;
+
+      if(this.wfUserRangeEnabled){
+        this.preStartResult = await this.preStart() || []
+        if(this.preStartResult.length){
+          this.openSetCandidateDialog()
+          return
+        }
+      }
+      this.startSubmitHanlde(this.startFormData);
+
+    },
+    startSubmitHanlde(formData){
+      this.showDialog = false;
+      let that = getTarget(this);
+      let option = this.option;
       that.$http({
         url: this.current_prefix + "/wf/start",
-        data: data,
+        data: formData,
         method: "post",
-        headers: {
+       /*  headers: {
           "Content-Type": "application/json;charset=utf-8",
-        },
+        }, */
         isLoading: true,
         callback: (resultMsg) => {
           if (resultMsg.type == "success") {
@@ -1696,6 +1753,7 @@ wfStartMixin = {
       });
     },
     close() {
+      debugger
       this.$emit("update:visible", false);
     },
   },

package/src/components/wf/wfStartDialog.vue

@@ -1,49 +1,77 @@
 <template>
-  <el-dialog :title="$t2('流程启动', 'components.wf.wfStart')" :visible.sync="showDialog" v-if="showDialog"
-             :modal-append-to-body="false" @close="close"
-             custom-class="dialog-style wf-dialog" v-el-drag-dialog>
-    <el-form :model="wfStartForm">
-      <div id="containt">
-        <table class="table-detail">
-          <tbody>
-          <tr>
-            <th>
-                <span class="t">
-                  <em class="f-red">*</em>
-                  {{ $t2('流程', 'components.wf.flow') }}
-                </span>
-            </th>
-            <td>
-              <el-form-item field="modelId" label-width="120">
-                <el-radio-group v-model="wfStartForm.modelId">
-                  <el-radio v-for="(wfDefItem,index) in wfDefItems" :label="wfDefItem.modelId" :key="index">
-                    {{ wfDefItem.modelName }}
-                  </el-radio>
-                </el-radio-group>
-              </el-form-item>
-            </td>
-          </tr>
-          </tbody>
-        </table>
-      </div>
-    </el-form>
-    <span slot="footer" class="dialog-footer">
-      <el-button type="primary" plain class="button-sty" @click="showDialog = false">
-        <i class="el-icon-close el-icon"></i>
-        {{ $t2('取 消', 'system.button.cancel2') }}
-      </el-button>
-      <el-button type="primary" @click="startSubmit()" class="button-sty">
-        <i class="el-icon-check el-icon"></i>
-        {{ $t2('确 定', 'system.button.confirm2') }}
-      </el-button>
-    </span>
-  </el-dialog>
+  <div>
+    <el-dialog
+      :title="$t2('流程启动', 'components.wf.wfStart')"
+      :visible.sync="showDialog"
+      v-if="showDialog"
+      :modal-append-to-body="false"
+      @close="close"
+      custom-class="dialog-style wf-dialog"
+      v-el-drag-dialog
+    >
+      <el-form :model="wfStartForm">
+        <div id="containt">
+          <table class="table-detail">
+            <tbody>
+              <tr>
+                <th>
+                  <span class="t">
+                    <em class="f-red">*</em>
+                    {{ $t2("流程", "components.wf.flow") }}
+                  </span>
+                </th>
+                <td>
+                  <el-form-item field="modelId" label-width="120">
+                    <el-radio-group v-model="wfStartForm.modelId">
+                      <el-radio
+                        v-for="(wfDefItem, index) in wfDefItems"
+                        :label="wfDefItem.modelId"
+                        :key="index"
+                      >
+                        {{ wfDefItem.modelName }}
+                      </el-radio>
+                    </el-radio-group>
+                  </el-form-item>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button
+          type="primary"
+          plain
+          class="button-sty"
+          @click="showDialog = false"
+        >
+          <i class="el-icon-close el-icon"></i>
+          {{ $t2("取 消", "system.button.cancel2") }}
+        </el-button>
+        <el-button type="primary" @click="startSubmit()" class="button-sty">
+          <i class="el-icon-check el-icon"></i>
+          {{ $t2("确 定", "system.button.confirm2") }}
+        </el-button>
+      </span>
+    </el-dialog>
+    <setCandidateDialog2
+      v-if="showSetCandidateDialog2"
+      :visiable.sync="showSetCandidateDialog2"
+      :current_prefix="current_prefix"
+      :rows="preStartResult"
+      :modelId="startFormData.modelId"
+      @confirm="confirmSetCandidateDialog"
+    ></setCandidateDialog2>
+  </div>
 </template>
 
 <script>
-import {wfStartMixin} from './wf.js';
-
+import { wfStartMixin } from "./wf.js";
+// import setCandidateDialog2 from './setCandidateDialog2';
 export default {
-  mixins: [wfStartMixin]
+  mixins: [wfStartMixin],
+  components: {
+    setCandidateDialog2: () => import("./setCandidateDialog2.vue"),
+  },
 };
 </script>