cloud-web-corejs-haier 1.0.5 → 1.0.6

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

@@ -22,22 +22,22 @@
             <tr>
               <th>
                 <em class="f-red">*</em>
-                {{ $t1('流程模版名称') }}
+                {{ $t1('流程名称') }}
               </th>
               <td>
-                <el-form-item prop="modelName" :rules="[{ required: true, trigger: 'blur' }]">
-                  <el-input autocomplete="off" v-model="wfObjConfigItem.modelName" clearable/>
+                <el-form-item prop="flowName" :rules="[{ required: true, trigger: 'blur' }]">
+                  <el-input autocomplete="off" v-model="wfObjConfigItem.flowName" clearable/>
                 </el-form-item>
               </td>
               <th>
                 <em class="f-red">*</em>
-                {{ $t1('流程模版KEY') }}
+                {{ $t1('流程编码') }}
               </th>
               <td>
-                <el-form-item prop="modelKey" :rules="[{ required: true, trigger: 'blur' }]" v-if="!dataId">
-                  <el-input autocomplete="off" v-model="wfObjConfigItem.modelKey" clearable/>
+                <el-form-item prop="flowCode" :rules="[{ required: true, trigger: 'blur' }]" v-if="!dataId">
+                  <el-input autocomplete="off" v-model="wfObjConfigItem.flowCode" clearable/>
                 </el-form-item>
-                <template v-else>{{ wfObjConfigItem.modelKey }}</template>
+                <template v-else>{{ wfObjConfigItem.flowCode }}</template>
               </td>
               <th>
                 <em class="f-red">*</em>
@@ -47,56 +47,15 @@
                 {{ wfObjConfigItem.objTypeCode }}
               </td>
             </tr>
-            <tr>
-              <th>
-                {{ $t1('跳过相邻任务') }}
-              </th>
-              <td>
-                <el-form-item prop="skipAdjacentTask" :rules="[{ required: false, trigger: 'blur' }]">
-                  <el-radio-group v-model="wfObjConfigItem.skipAdjacentTask">
-                    <el-radio :label="true">{{ $t1('是') }}</el-radio>
-                    <el-radio :label="false">{{ $t1('否') }}</el-radio>
-                  </el-radio-group>
-                </el-form-item>
-              </td>
-              <th>
-                {{ $t1('驳回后提交模式') }}
-              </th>
-              <td colspan="5">
-                <el-form-item prop="toRejectNode" :rules="[{ required: false, trigger: 'blur' }]">
-                  <el-radio-group v-model="wfObjConfigItem.toRejectNode" @change="changeToRejectNode">
-                    <el-radio :label="true">{{ $t1('由提交人确定节点提交') }}</el-radio>
-                    <el-radio :label="false">{{ $t1('直接提交到驳回节点') }}</el-radio>
-                  </el-radio-group>
-                  <el-radio :label="1" v-model="wfObjConfigItem.toNextNode" @change="changeToNextNode"
-                            style="margin-left: 30px;">{{ $t1('顺延下一步提交') }}
-                  </el-radio>
-                </el-form-item>
-              </td>
-            </tr>
-            <tr>
-              <th>
-                {{ $t1('流程启动处理') }}
-              </th>
-              <td colspan="5">
-                <el-form-item prop="startMode" :rules="[{ required: false, trigger: 'blur' }]">
-                  <el-radio-group v-model="wfObjConfigItem.startMode">
-                    <el-radio :label="1">{{ $t1('节点无候选人，提示异常') }}</el-radio>
-                    <el-radio :label="2">{{ $t1('节点无候选人，提示警告') }}</el-radio>
-                    <el-radio :label="3">{{ $t1('节点无候选人，无提示') }}</el-radio>
-                  </el-radio-group>
-                </el-form-item>
-              </td>
-            </tr>
-            <tr>
-              <th>
-                {{ $t1('跨任务跳过') }}
+           <tr>
+            <th>
+                {{ $t1('设计器模型') }}
               </th>
               <td>
-                <el-form-item prop="skipSameUserTask" :rules="[{ required: false, trigger: 'blur' }]">
-                  <el-radio-group v-model="wfObjConfigItem.skipSameUserTask">
-                    <el-radio :label="true">{{ $t1('是') }}</el-radio>
-                    <el-radio :label="false">{{ $t1('否') }}</el-radio>
+                <el-form-item prop="modelValue" :rules="[{ required: false, trigger: 'blur' }]">
+                  <el-radio-group v-model="wfObjConfigItem.modelValue" :disabled="isEdit">
+                    <el-radio label="CLASSICS">{{ $t1('经典模型') }}</el-radio>
+                    <el-radio label="MIMIC">{{ $t1('仿钉钉模型') }}</el-radio>
                   </el-radio-group>
                 </el-form-item>
               </td>
@@ -120,60 +79,6 @@
                 </el-form-item>
               </td>
             </tr>
-            <tr>
-              <th>
-                {{ $t1('是否允许流程启动更改候选人') }}
-              </th>
-              <td>
-                <el-form-item prop="startNoSetCandidate" :rules="[{ required: false, trigger: 'blur' }]">
-                  <el-radio-group v-model="wfObjConfigItem.startNoSetCandidate">
-                    <el-radio :label="false">{{ $t1('是') }}</el-radio>
-                    <el-radio :label="true">{{ $t1('否') }}</el-radio>
-                  </el-radio-group>
-                </el-form-item>
-              </td>
-            </tr>
-            <tr>
-              <th>
-                {{ $t1('任务action脚本') }}<br/>
-                <scriptDescriptionButton path="static/readme/Wf.txt"></scriptDescriptionButton>
-                <scriptTestButton :script.sync="wfObjConfigItem.script"></scriptTestButton>
-              </th>
-              <td colspan="7">
-                <el-form-item prop="script" :rules="[{ required: false, trigger: 'blur' }]">
-                  <code-editor mode="java" :readonly="!1" v-model="wfObjConfigItem.script"
-                               v-if="showCodeEditor"></code-editor>
-                </el-form-item>
-              </td>
-            </tr>
-            <tr>
-              <th class="no"></th>
-              <td colspan="7">
-                <span class="fl tips">{{ $t1('注：流程任务执行过程中，每一次的action动作都会执行此脚本。') }}</span>
-              </td>
-            </tr>
-            <tr>
-              <th>
-                {{ $t1('模板筛选脚本') }}<br/>
-                <scriptDescriptionButton path="static/readme/Wf.txt"></scriptDescriptionButton>
-                <scriptTestButton :script.sync="wfObjConfigItem.script"></scriptTestButton>
-              </th>
-              <td colspan="7">
-                <el-form-item prop="filterScript" :rules="[{ required: false, trigger: 'blur' }]">
-                  <code-editor mode="java" :readonly="!1" v-model="wfObjConfigItem.filterScript"
-                               v-if="showCodeEditor"></code-editor>
-                </el-form-item>
-              </td>
-            </tr>
-            <tr>
-              <th class="no"></th>
-              <td colspan="7">
-                <span
-                  class="fl tips">{{
-                    $t1('注：流程启动时，执行筛选脚本，返回true或者不配置筛选脚本表示选用当前模板，返回false表示不选用当前模板。')
-                  }}</span>
-              </td>
-            </tr>
             <tr>
               <th>{{ $t1('创建人') }}</th>
               <td>{{ wfObjConfigItem.createBy }}</td>
@@ -210,15 +115,9 @@ export default {
       isEdit: false,
       dataId: '',
       wfObjConfigItem: {
-        skipFirstTask: true,
-        skipAdjacentTask: false,
-        toRejectNode: false,
-        startMode: 3,
-        skipSameUserTask: false,
-        toNextNode: null,
+        modelValue: "CLASSICS",
         enabled: true,
         orders: undefined,
-        startNoSetCandidate: false
       },
       showWfObjConfigDialog: false,
       configServiceId: null,

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

@@ -0,0 +1,414 @@
+<template>
+  <el-dialog
+    :append-to-body="true"
+    :modal-append-to-body="false"
+    :close-on-click-modal="false"
+    :visible.sync="showDialog"
+    :modal="false"
+    custom-class="dialog-style list-dialog dialog-checkbox pd_0"
+    width="1300px"
+    @close="closeDialog"
+    v-el-drag-dialog
+    v-el-dialog-center
+  >
+    <template #title>
+      <span class="el-dialog__title"
+        >流程设置<span style="margin-left: 10px; margin-right: 10px">—</span
+        ><b class="f-red" style="font-size: 12px"
+          >{{ pRow.objTypeName }}：{{ row.flowName }}({{ row.flowCode }})</b
+        ></span
+      >
+    </template>
+    <div class="cont" style="height:450px;padding-bottom: 5px;">
+      <vxe-grid
+        ref="table-m1"
+        v-bind="vxeOption"
+        @resizable-change="$vxeTableUtil.onColumnWitchChange"
+        @custom="$vxeTableUtil.customHandle"
+      >
+      </vxe-grid>
+    </div>
+    <!-- <span slot="footer" class="dialog-footer">
+			<el-button type="primary" plain class="button-sty" @click="closeDialog">
+				<i class="el-icon-close el-icon"></i>
+				{{ $t1('取 消') }}
+			</el-button>
+			<el-button type="primary" class="button-sty" @click="closeDialog">
+				<i class="el-icon-check el-icon"></i>
+				{{ $t1('确 定') }}
+			</el-button>
+		</span> -->
+    <el-dialog
+      :title="scritpDialogTitle"
+      :append-to-body="true"
+      :modal-append-to-body="true"
+      :close-on-click-modal="false"
+      v-if="showScriptDialog"
+      :visible.sync="showScriptDialog"
+      :modal="false"
+      custom-class="dialog-style tips-dialog tips-1 "
+      width="800px"
+      v-el-drag-dialog
+      v-el-dialog-center
+    >
+      <template #title>
+      <span class="el-dialog__title"
+        >通用脚本设置<span style="margin-left: 10px; margin-right: 10px">—</span
+        ><b class="f-red" style="font-size: 12px"
+          >{{ pRow.objTypeName }}：{{ currentRow.flowName }}({{ currentRow.flowCode }}) - {{currentRow.version}}</b
+        ></span
+      >
+    </template>
+      <div class="cont" style="height: 700px">
+        <code-editor
+          mode="java"
+          :readonly="!1"
+          v-model="script"
+          height="414px;"
+        ></code-editor>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button
+          type="primary"
+          plain
+          class="button-sty"
+          @click="showScriptDialog = false"
+        >
+          <i class="el-icon-close el-icon"></i>
+          {{ $t1("取 消") }}
+        </el-button>
+        <el-button type="primary" @click="saveScript" class="button-sty">
+          <i class="el-icon-check el-icon"></i>
+          {{ $t1("确 定") }}
+        </el-button>
+      </span>
+    </el-dialog>
+  </el-dialog>
+</template>
+
+<script>
+import { Row } from 'element-ui';
+
+export default {
+  name: 'wfObjConfigDialog11',
+  props: ['visiable', 'pRow', 'row'],
+  created() {
+  },
+  mounted() {
+    this.initTableM1();
+  },
+  data() {
+    var that = this;
+    return {
+      showDialog: true,
+      falseValue: false,
+      selectMulti: true,
+      formData: {},
+      vxeOption: {},
+
+
+      script:"",
+      currentRow:null,
+      operateRow:null,
+      showScriptDialog:false,
+      scriptTypeMap:{
+        'pre': '前置事件',
+        'post': '后置事件',
+        'candidate': '候选人事件',
+        'start': '开始事件',
+        'end': '结束事件',
+        'interrupt': '中断事件',
+        'conditions': '条件事件',
+        'countersignSubmit': '会签提交事件'
+      },
+      scritpDialogTitle: null
+    };
+  },
+  methods: {
+    searchEvent() {
+      this.$refs['table-m1'].commitProxy('reload');
+    },
+    initTableM1() {
+      let that = this;
+      let modelValueMap = {
+        CLASSICS: "经典模型",
+        MIMIC: "仿钉钉模型",
+      }
+      let tableOption = {
+        vue: that,
+        tableRef: 'table-m1',
+        tableName: 'user-wf-itemOperateDialog',
+        path: '/' + this.pRow.serviceId + '/wf_obj_config_item/getDefinitions',
+        param: () => {
+          return {
+            stringOne:this.row.flowCode
+          };
+        },
+        columns: [
+          {type: 'checkbox', width: 48, resizable: false, fixed: 'left'},
+          {
+            title: this.$t1('流程名称'),
+            field: 'flowName',
+            width: 150,
+            fixed: 'left'
+          },
+          {
+            title: this.$t1('流程编码'),
+            field: 'flowCode',
+            width: 150
+          },
+          {
+            title: this.$t1('流程版本'),
+            field: 'version',
+            width: 120
+          },
+          {
+            field: 'isPublish',
+            title: this.$t1('是否发布'),
+            width: 120,
+            slots: {
+              default: ({row}) => {
+                if (row.isPublish === 1) {
+                  return [<div class="txt-status">{this.$t1('已发布')}</div>];
+                } else if(row.isPublish === 0){
+                  return [<div class="txt-status s-3">{this.$t1('未发布')}</div>];
+                } else if(row.isPublish === 9){
+                  return [<div class="txt-status s-2">{this.$t1('已失效')}</div>];
+                }
+              }
+            }
+          },
+          {
+            title: this.$t1('设计器模型'),
+            field: 'modelValue',
+            width: 150,
+            slots: {
+              default: ({row}) => {
+                return modelValueMap[row.modelValue]
+              }
+            }
+          },
+          {
+            field: 'createDate',
+            title: this.$t1('创建时间'),
+            width: 150
+          },
+          {
+            field: 'modifyDate',
+            title: this.$t1('修改时间'),
+            width: 150
+          },
+          {
+            width: 230,
+            fixed: 'right',
+            sortable: false,
+            title: '',
+            slots: {
+              default: ({row}) => {
+                return [
+                  <a
+                    href="javascript:void(0);"
+                    class="a-link"
+                    onclick={() => {
+                      this.copy(row);
+                    }}
+                  >
+                    <el-tooltip enterable={false} effect="dark" content={this.$t1('复制')} placement="top"
+                                popper-class="tooltip-skin">
+                      <i class="el-icon-copy-document"/>
+                    </el-tooltip>
+                  </a>,
+                  <a
+                    href="javascript:void(0);"
+                    onClick={() => {
+                      this.openWfDesignDialog(row);
+                    }}
+                    class="a-link"
+                  >
+                    <el-tooltip enterable={false} effect="dark" content={this.$t1('流程设计')} placement="top"
+                                popper-class="tooltip-skin">
+                      <i class="iconfont icon-liuchengguanli-shejiqi_liucheng"/>
+                    </el-tooltip>
+                  </a>,
+                  <a
+                    href="javascript:void(0);"
+                    class="a-link"
+                    onclick={() => {
+                      this.wfPublish(row);
+                    }}
+                  >
+                    <el-tooltip enterable={false} effect="dark" content={this.$t1('发布')} placement="top"
+                                popper-class="tooltip-skin">
+                      <i class="el-icon-upload2"/>
+                    </el-tooltip>
+                  </a>,
+                  <a
+                    href="javascript:void(0);"
+                    class="a-link"
+                    onclick={() => {
+                      this.wfUnPublish(row);
+                    }}
+                  >
+                    <el-tooltip enterable={false} effect="dark" content={this.$t1('取消发布')} placement="top"
+                                popper-class="tooltip-skin">
+                      <i class="el-icon-download"/>
+                    </el-tooltip>
+                  </a>,
+                  <a
+                    href="javascript:void(0);"
+                    class="a-link"
+                    onclick={() => {
+                      this.openScriptDialog(row);
+                    }}
+                  >
+                    <el-tooltip enterable={false} effect="dark" content={this.$t1('通用脚本设置')} placement="top"
+                                popper-class="tooltip-skin">
+                      <i class="el-icon-edit"/>
+                    </el-tooltip>
+                  </a>
+                ];
+              }
+            }
+          }
+        ],
+        config: {
+          proxyConfig: {
+            props: {
+              result: 'objx', // 配置响应结果列表字段
+              total: 'objx.length' // 配置响应结果总页数字段
+            }
+          },
+        }
+      };
+      this.$vxeTableUtil.initVxeTable(tableOption).then(opts => {
+        that.vxeOption = opts;
+      });
+    },
+    wfPublish(row){
+      this.$baseConfirm(this.$t1('您确定要发布吗？')).then(() => {
+        this.$http({
+          url: '/' + this.pRow.serviceId + '/wf_obj_config_item/publish',
+          method: `post`,
+          data: {
+            id:row.id
+          },
+          isLoading: true,
+        success: res => {
+          this.$message({
+            message: res.content,
+            type: 'success',
+            duration: 2000
+          });
+          this.searchEvent();
+        }
+        });
+      });
+    },
+    wfUnPublish(row){
+      this.$baseConfirm(this.$t1('您确定要取消发布吗？')).then(() => {
+        this.$http({
+          url: '/' + this.pRow.serviceId + '/wf_obj_config_item/unPublish',
+          method: `post`,
+          data: {
+            id:row.id
+          },
+          isLoading: true,
+        success: res => {
+          this.$message({
+            message: res.content,
+            type: 'success',
+            duration: 2000
+          });
+          this.searchEvent();
+        }
+        });
+      });
+    },
+    copy(row){
+      this.$baseConfirm(this.$t1('您确定要复制吗？')).then(() => {
+        this.$http({
+          url: '/' + this.pRow.serviceId + '/wf_obj_config_item/copyDef',
+          method: `post`,
+          data: {
+            id:row.id
+          },
+          isLoading: true,
+        success: res => {
+          this.$message({
+            message: res.content,
+            type: 'success',
+            duration: 2000
+          });
+          this.searchEvent();
+        }
+        });
+      });
+    },
+    openWfDesignDialog(row) {
+      this.$emit('openWfDesignDialog',row.id, this.pRow.serviceId);
+    },
+    closeDialog(){
+      this.showDialog = false;
+      this.$emit('update:visiable',false);
+      this.$emit('close');
+    },
+    openScriptDialog(row){
+      var url = '/' + this.pRow.serviceId + '/wf_def_script/getCommon';
+      this.$http({
+          url: url,
+          method: `post`,
+          data: {
+            id: row.id
+          },
+          isLoading: true,
+          success: res => {
+            this.currentRow = row
+            this.operateRow = res.objx || {
+              definitionId: row.id,
+              scriptType: "common",
+              script: null
+            }
+            let scriptTypeMap = this.scriptTypeMap
+            this.scritpDialogTitle = row.nodeName + "(" + scriptTypeMap[row.scriptType] + ")"
+            this.script = this.operateRow.script
+            this.showScriptDialog = true
+          }
+      })
+    },
+    saveScript() {
+      this.$baseConfirm(this.$t1('您确定要保存脚本吗？')).then(() => {
+        var url = '/' + this.pRow.serviceId + '/wf_def_script/save';
+        this.$http({
+          url: url,
+          method: `post`,
+          data: {
+            ...this.operateRow,
+            script: this.script
+          },
+          isLoading: true,
+          success: res => {
+            this.$message({
+              message: res.content,
+              type: 'success'
+            });
+            this.showScriptDialog = false;
+            this.searchEvent();
+          }
+        });
+      });
+
+    },
+  }
+};
+</script>
+<style scoped>
+  ::v-deep .vxe-grid--pager-wrapper{
+    display: none;
+  }
+  .txt-status.s-2{
+    background-color: rgb(244, 244, 245);color: rgb(144, 147, 153);
+  }
+  .txt-status.s-2:before{
+    background-color: rgb(144, 147, 153);
+  }
+</style>