cloud-web-corejs 1.0.54-dev.314 → 1.0.54-dev.316

package/src/components/wf/content.vue

@@ -38,6 +38,7 @@
                    v-show="wfInfo.toRevoke"
                    icon="el-icon-document-delete">{{ $t2('撤回', 'components.wf.revoke') }}
         </el-button>
+        <add0pinionButton v-if="!!getViewParam('wfSendTaskId')" @confirm="reloadContent()"></add0pinionButton>
       </div>
       <div class="title-name">
         <b>
@@ -94,8 +95,19 @@
                   <span class="name">{{ wftaskLineData.taskName }}</span>
                   <span>{{ $t2('执行人', 'components.wf.approverName') }}：{{ wftaskLineData.approverName }}</span>
                   <span>
-                  {{ $t2('候选人', 'components.wf.candidateName') }}：
-                  <span class="">{{ wftaskLineData.candidateNames }}</span>
+                    {{ $t2('候选人', 'components.wf.candidateName') }}：
+                    <span>
+                      <span style="float:left;width:auto;margin-right:10px;">{{ wftaskLineData.candidateNames }}</span>
+                      <setCandidateButton
+                      v-if="wftaskLineData.flag==1"
+                       style="float:left;width:auto;"
+                      :current_prefix="current_prefix"
+                      :wfInfo="wfInfo"
+                      :checkRow="wftaskLineData"
+                      @confirm="reloadContent()"
+                      ></setCandidateButton>
+                  </span>
+
                 </span>
                 </p>
                 <p class="t"><span class="t1">{{ $t2('备注/意见', 'components.wf.opinion') }}：</span><span>{{
@@ -776,8 +788,7 @@
       <setCandidateDialog v-if="showSetCandidateDialog" :visiable.sync="showSetCandidateDialog"
                           @close="closeSetCandidateDialog"
                           :wfInfo="wfInfo"
-                          :current_prefix="current_prefix"
-                          :wfUserRangeEnabled="wfUserRangeEnabled"></setCandidateDialog>
+                          :current_prefix="current_prefix"></setCandidateDialog>
     </template>
   </baseTabPane>
   <div v-else></div>
@@ -792,7 +803,9 @@ export default {
     urgingDialog: () => import('./urgingDialog'),
     deleteTaskUserDialog: () => import('./deleteTaskUserDialog'),
     addTaskUserdialog: () => import('./addTaskUserdialog'),
-    setCandidateDialog: () => import('./setCandidateDialog')
+    setCandidateDialog: () => import('./setCandidateDialog'),
+    setCandidateButton: () => import('./setCandidateButton'),
+    add0pinionButton: () => import('./add0pinionButton'),
   },
   mixins: [wfContentMixin]
 };

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

@@ -0,0 +1,161 @@
+import userDialog from "../../../views/user/user/dialog.vue";
+import wfTaskUserRangeDialog from '../wfTaskUserRangeDialog.vue'
+
+let moudule = {};
+moudule = {
+  props: ['visiable', 'multi', 'rows', 'param', 'current_prefix', 'wfInfo','checkRow'],
+  components: {userDialog,wfTaskUserRangeDialog},
+  created() {
+    this.init()
+  },
+  mounted() {
+
+  },
+  data() {
+    var that = this;
+    return {
+      showDialog: true,
+      falseValue: false,
+      selectMulti: true,
+      vxeOption: {},
+      showUserDialog: false,
+      userRows: [],
+      operateIndex: -1,
+
+      rangeTableDatas:[],
+      userRangeRows: [],
+      showWfTaskUserRangeDialog:false,
+      currentRow:null
+    };
+  },
+  methods: {
+    init(){
+      this.currentRow = this.$baseLodash.cloneDeep(this.checkRow);
+    },
+    openShowWfTaskUserRangeDialog(row, rangeTableDatas){
+      /* this.userRangeRows = row.wfTaskCandidateDTOs.map(item => {
+        return {
+          userId: item.id,
+          nickName: item.name
+        }
+      }); */
+      this.rangeTableDatas = rangeTableDatas;
+      this.showWfTaskUserRangeDialog = true;
+    },
+    confirmWfTaskUserRangeDialog(rows){
+      let wfInfo = this.wfInfo;
+      let item2s = []
+      rows.forEach(row => {
+        let userId = row.userId;
+        item2s.push({
+          id: userId,
+          name: row.nickName,
+          userFlag: 6
+        })
+      })
+
+      let formData = {
+        uuid: wfInfo.uuid,
+        taskId:this.currentRow.taskId,
+        nodeId:this.currentRow.taskDefinitionKey,
+        wfTaskCandidateDTOs:item2s
+      }
+
+      this.saveItem(formData);
+    },
+    checkWfTaskUserRange(row, callback){
+      //是否使用用户范围
+      let wfInfo = this.wfInfo;
+      this.$http({
+        url: this.current_prefix + '/wf_task_user_range/list',
+        method: `post`,
+        data: {
+          modelId: wfInfo.modelId,
+          taskDefinitionKey: row.taskDefinitionKey
+        },
+        isLoading: true,
+        errorMsg: false,
+        error:(error)=>{
+          if(error?.response?.status == 404){
+            //不使用用户范围
+            callback && callback();
+          }else{
+            this.$errorMsg({
+              content: error.message,
+              type: 'error',
+            })
+          }
+        },
+        success: res => {
+          let rows = res.objx || [];
+          if(!rows.length){
+            //不使用用户范围
+            callback && callback();
+          }else{
+            //使用用户范围
+            this.openShowWfTaskUserRangeDialog(row, rows)
+          }
+        }
+      });
+    },
+
+    openUserDialig() {
+      let row = this.currentRow;
+      //是否使用用户范围
+      this.checkWfTaskUserRange(row, ()=>{
+        //不使用用户范围
+        /* this.userRows = row.wfTaskCandidateDTOs.map(item => {
+          return {
+            id: item.id,
+            nickName: item.name
+          }
+        }); */
+        this.showUserDialog = true;
+      })
+    },
+    userConfirm(rows) {
+      let wfInfo = this.wfInfo;
+      let item2s = []
+      rows.forEach(row => {
+        let userId = row.id + "";
+        item2s.push({
+          id: userId,
+          name: row.nickName,
+          userFlag: 6
+        })
+      })
+
+      let formData = {
+        uuid: wfInfo.uuid,
+        taskId:this.currentRow.taskId,
+        nodeId:this.currentRow.taskDefinitionKey,
+        wfTaskCandidateDTOs:item2s
+      }
+
+      this.saveItem(formData);
+    },
+    saveItem(row) {
+      this.$http({
+        url: this.current_prefix + '/wf/setCurrentTaskUser',
+        method: `post`,
+        data: row,
+        isLoading: true,
+        success: res => {
+          this.$message({
+            message: res.content,
+            type: 'success',
+            duration: 500,
+            onClose: t => {
+              this.$emit('confirm')
+            }
+          });
+        }
+      });
+    },
+    closeWin() {
+      this.dialogClose();
+      this.$emit('close')
+    }
+  }
+};
+export default moudule;