cloud-web-corejs 1.0.116 → 1.0.117

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>

package/src/components/wf/wfTaskUserRangeDialog.vue

@@ -0,0 +1,131 @@
+<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"
+        :data="tableData"
+        v-bind="vxeOption"
+        @resizable-change="$vxeTableUtil.onColumnWitchChange"
+        @custom="$vxeTableUtil.customHandle"
+        @checkbox-change="addDataTable"
+        @checkbox-all="checkAll"
+        @cell-dblclick="checkWithSubmit"
+      ></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>{{ checkRow.nickName }}</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';
+
+export default {
+  props: ['visiable', 'multi', 'rows','rangeTableDatas', 'param','current_prefix','modelId','taskDefinitionKey'],
+  mixins: [selectDialogMixins],
+  created() {
+    this.initSetting();
+  },
+  mounted() {
+    this.initTableM1();
+  },
+  data() {
+    var that = this;
+    return {
+      showDialog: true,
+      falseValue: false,
+      selectMulti: true,
+      formData: {},
+      vxeOption: {},
+      tableData: []
+    };
+  },
+  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',
+        /*path: this.current_prefix + '/wf_task_user_range/list',
+         param: () => {
+          return {
+            modelId:this.modelId,
+            taskDefinitionKey:this.taskDefinitionKey,
+          }
+        }, */
+        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'
+          },
+          /* proxyConfig: {
+            props: {
+              result: "objx",
+              total: "objx.length",
+            }
+          } */
+        }
+      };
+      this.$vxeTableUtil.initVxeTable(tableOption).then(opts => {
+        that.vxeOption = opts;
+      });
+    }
+  }
+};
+</script>