From a66e64cf7f86e1e28afefc9b6d7fcbb772d3531e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E5=89=8D=E6=98=8E?= <909355014@qq.com>
Date: Thu, 7 Jul 2022 14:24:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=B5=81=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E5=9F=BA=E6=9C=ACok?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/route.js            |   2 +-
 src/views/wf/configuration.vue |   2 +-
 src/views/wf/field.vue         |  30 +-
 src/views/wf/state.vue         | 943 ++++++++++++++++++++-------------
 src/views/wf/transform.vue     |  64 ++-
 5 files changed, 616 insertions(+), 425 deletions(-)

diff --git a/src/config/route.js b/src/config/route.js
index 14b4f10b..6adcde0b 100644
--- a/src/config/route.js
+++ b/src/config/route.js
@@ -168,7 +168,7 @@ const routes = [
         "name": "configuration",
         "path": "/wf/configuration",
         "meta": {
-          "title": "工单",
+          "title": "工作流配置",
           "icon": "el-icon-menu",
           "hidden": true
         },
diff --git a/src/views/wf/configuration.vue b/src/views/wf/configuration.vue
index d588d34f..df35ddef 100644
--- a/src/views/wf/configuration.vue
+++ b/src/views/wf/configuration.vue
@@ -1,6 +1,6 @@
 <template>
 	<el-container>
-		<el-tabs style="width: 100%" type="border-card" v-model="activeName" @tab-click="handleClick">
+		<el-tabs style="width: 100%; height:100%" type="border-card" v-model="activeName" @tab-click="handleClick">
 			<el-tab-pane label="自定义字段" name="customField">
 				<field v-if="activeName==='customField'"></field>
 			</el-tab-pane>
diff --git a/src/views/wf/field.vue b/src/views/wf/field.vue
index 24872024..5949a26b 100644
--- a/src/views/wf/field.vue
+++ b/src/views/wf/field.vue
@@ -6,7 +6,7 @@
 			</div>
 		</el-header>
 		<el-main class="nopadding">
-			<scTable ref="table" :apiObj="apiObj" row-key="id" stripe highlightCurrentRow>
+			<scTable ref="table" :data="list" row-key="id" stripe highlightCurrentRow hidePagination>
 				<el-table-column type="index" width="50"/>
 				<el-table-column label="字段标识" prop="field_key"></el-table-column>
 				<el-table-column label="字段名称" prop="field_name"></el-table-column>
@@ -121,9 +121,8 @@
 		name: "field",
 		data() {
 			return {
-				apiObj: this.$API.wf.field.list,
 				id: sessionStorage.getItem('jinYuWorkflowId'),
-				list: null,
+				list: [],
 				type: "add",
 				titleMap: {
 					add: '新增',
@@ -193,28 +192,6 @@
 			}
 		},
 		mounted() {
-			this.list = [
-				{
-					id: "5001",
-					name: "scEcharts",
-					subtitle: "重新封装的Echarts，暴露源对象",
-					state: "1",
-					type: "数据",
-					progress: 70,
-					user: "sss",
-					time: "2010-10-10"
-				},
-				{
-					id: "5002",
-					name: "scEditor",
-					subtitle: "Tinymce封装的富文本编辑器",
-					state: "2",
-					type: "表单",
-					progress: 40,
-					user: "sss",
-					time: "2010-10-10"
-				}
-			];
 			this.getList();
 		},
 		methods: {
@@ -271,8 +248,7 @@
 				this.addForm = Object.assign({}, row);
 			},
 			async getList() {
-				let res = await this.$API.wf.getCustomfields.get(this.id);
-				console.log(res);
+				let res = await this.$API.wf.workflow.customfields.req(this.id);
 				this.list = res;
 			},
 		},
diff --git a/src/views/wf/state.vue b/src/views/wf/state.vue
index 3043cac7..04f5ceaf 100644
--- a/src/views/wf/state.vue
+++ b/src/views/wf/state.vue
@@ -1,381 +1,590 @@
 <template>
-	<el-container>
-		<el-header>
-			<div class="left-panel">
-				<el-button type="primary" icon="el-icon-plus" @click="handleAdd"></el-button>
-			</div>
-		</el-header>
-		<el-main class="nopadding">
-			<el-table ref="table" :apiObj="apiObj" row-key="id" stripe highlightCurrentRow>
-				<el-table-column type="index" width="50"/>
-				<el-table-column label="名称" prop="name"></el-table-column>
-				<el-table-column label="是否隐藏">
-					<template #default="scope">
-						<span v-if="scope.row.is_hidde">是</span>
-						<span v-else>否</span>
-					</template>
-				</el-table-column>
-				<el-table-column label="顺序ID" prop="sort"></el-table-column>
-				<el-table-column label="类型">
-					<template #default="scope">
-						<el-tag effect="plain" v-if="scope.row.type==0">
-							普通类型
-						</el-tag>
-						<el-tag effect="plain" v-if="scope.row.type==1">
-							初始状态
-						</el-tag>
-						<el-tag effect="plain" v-if="scope.row.type==2">
-							结束状态
-						</el-tag>
-					</template>
-				</el-table-column>
-				<el-table-column label="参与人类型">
-					<template #default="scope">{{ options_[scope.row.participant_type] }}</template>
-				</el-table-column>
-				<el-table-column label="创建时间" prop="create_time"></el-table-column>
-				<el-table-column label="操作" fixed="right" align="right" width="120">
-					<template #default="scope">
-						<el-button type="text" size="small" @click="handleEdit(scope.row)">编辑</el-button>
-						<el-popconfirm title="确定删除吗？">
-							<template #reference>
-								<el-button type="text" size="small">删除</el-button>
-							</template>
-						</el-popconfirm>
-					</template>
-				</el-table-column>
-			</el-table>
-			<el-dialog
-				v-model="dialogVisible"
-				:title="titleMap[type]"
-			>
-				<el-form
-					ref="Form"
-					:model="addForm"
-					label-width="100px"
-					label-position="right"
-					:rules="rule"
-				>
-					<el-form-item label="名称" prop="name">
-						<el-input v-model="addForm.name" placeholder="名称"/>
-					</el-form-item>
-					<el-form-item
-						label="是否隐藏"
-						prop="is_hidden"
-						label-width="120px"
-					>
-						<el-switch v-model="addForm.is_hidden"></el-switch>
-					</el-form-item>
+  <el-container>
+    <el-header>
+      <div class="left-panel">
+        <el-button
+          type="primary"
+          icon="el-icon-plus"
+          @click="handleAdd"
+        ></el-button>
+      </div>
+    </el-header>
+    <el-main class="nopadding">
+      <scTable
+        ref="table"
+        :data="list"
+        row-key="id"
+        stripe
+        highlightCurrentRow
+        hidePagination
+      >
+        <el-table-column label="ID" prop="id"></el-table-column>
+        <el-table-column label="名称" prop="name"></el-table-column>
+        <el-table-column label="是否隐藏">
+          <template #default="scope">
+            <span v-if="scope.row.is_hidde">是</span>
+            <span v-else>否</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="顺序ID" prop="sort"></el-table-column>
+        <el-table-column label="类型">
+          <template #default="scope">
+            <el-tag effect="plain" v-if="scope.row.type == 0">
+              普通类型
+            </el-tag>
+            <el-tag effect="plain" v-if="scope.row.type == 1">
+              初始状态
+            </el-tag>
+            <el-tag effect="plain" v-if="scope.row.type == 2">
+              结束状态
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="参与人类型">
+          <template #default="scope">{{
+            options_[scope.row.participant_type]
+          }}</template>
+        </el-table-column>
+		<el-table-column label="分配方式">
+          <template #default="scope">{{
+            options2_[scope.row.distribute_type]
+          }}</template>
+        </el-table-column>
+        <el-table-column label="创建时间" prop="create_time"></el-table-column>
+        <el-table-column label="操作" fixed="right" align="right" width="120">
+          <template #default="scope">
+            <el-button type="text" size="small" @click="handleEdit(scope.row)"
+              >编辑</el-button
+            >
+            <el-popconfirm title="确定删除吗？">
+              <template #reference>
+                <el-button type="text" size="small">删除</el-button>
+              </template>
+            </el-popconfirm>
+          </template>
+        </el-table-column>
+      </scTable>
+      <el-dialog v-model="dialogVisible" :title="titleMap[type]">
+        <el-form
+          ref="Form"
+          :model="addForm"
+          label-width="100px"
+          label-position="right"
+        >
+          <el-form-item label="名称" prop="name">
+            <el-input v-model="addForm.name" placeholder="名称" />
+          </el-form-item>
+          <el-form-item label="是否隐藏" prop="is_hidden" label-width="120px">
+            <el-switch v-model="addForm.is_hidden"></el-switch>
+          </el-form-item>
 
-					<el-form-item label="状态顺序" prop="sort">
-						<el-input v-model="addForm.sort" type="number" placeholder="状态顺序"/>
-					</el-form-item>
-					<el-form-item label="状态类型" prop="type">
-						<el-select style="width: 100%" v-model="addForm.type" placeholder="请选择">
-							<el-option
-								v-for="item in options"
-								:key="item.value"
-								:label="item.label"
-								:value="item.value">
-							</el-option>
-						</el-select>
-					</el-form-item>
-					<el-form-item
-						label="允许撤回"
-						prop="enable_retreat"
-						label-width="120px"
-					>
-						<el-switch v-model="addForm.enable_retreat"></el-switch>
-					</el-form-item>
-					<el-form-item label="参与者类型" prop="participant_type">
-						<el-select style="width: 100%" v-model="addForm.participant_type" placeholder="请选择"
-								   @change="typeChange">
-							<el-option
-								v-for="item in typeoptions"
-								:key="item.value"
-								:label="item.label"
-								:value="item.value">
-							</el-option>
-						</el-select>
-					</el-form-item>
-					<el-form-item label="参与者" prop="participant" v-if="addForm.participant_type==1">
-						<el-select style="width: 100%" v-model="participant" placeholder="请选择参与者">
-							<el-option v-for="item in staffs" :key="item.id" :label="item.name" :value="item.id">
-							</el-option>
-						</el-select>
-					</el-form-item>
-					<el-form-item label="参与者" prop="participant" v-if="addForm.participant_type==2">
-						<el-select style="width: 100%" v-model="participants" multiple placeholder="请选择参与者">
-							<el-option v-for="item in staffs" :key="item.id" :label="item.name" :value="item.id">
-							</el-option>
-						</el-select>
-					</el-form-item>
-					<el-form-item label="参与者" prop="participant" v-if="addForm.participant_type==7">
-						<el-select style="width: 100%" v-model="participant" placeholder="请选择字段">
-							<el-option v-for="item in fieldList" :key="item.id" :label="item.field_name"
-									   :value="item.field_key">
-							</el-option>
-						</el-select>
-					</el-form-item>
-					<el-form-item label="分配方式" prop="participant" v-if="addForm.participant_type==2">
-						<el-select style="width: 100%" v-model="addForm.distribute_type" placeholder="请选择分配方式">
-							<el-option label="主动接单" value="1"></el-option>
-							<el-option label="直接处理" value="2"></el-option>
-							<el-option label="随机分配" value="3"></el-option>
-							<el-option label="全部处理" value="4"></el-option>
-						</el-select>
-					</el-form-item>
-					<el-form-item label="角色" prop="participant" v-if="addForm.participant_type==4">
-						<el-select style="width: 100%" v-model="participants" multiple placeholder="请选择角色">
-							<el-option v-for="item in roles" :key="item.id" :label="item.name" :value="item.id">
-							</el-option>
-						</el-select>
-					</el-form-item>
-					<el-form-item label="过滤策略" prop="participant" v-if="addForm.participant_type==4">
-						<el-select style="width: 100%" v-model="addForm.filter_policy" placeholder="请选择过滤策略">
-							<el-option label="无" value="0"></el-option>
-							<el-option label="和工单同属以及上级部门" value="1"></el-option>
-							<el-option label="和创建人同属以及上级部门" value="2"></el-option>
-							<el-option label="和上步处理人同属以及上级部门" value="3"></el-option>
-						</el-select>
-					</el-form-item>
-					<el-form-item label="代码选择" prop="participant" v-if="addForm.participant_type==9">
+          <el-form-item label="状态顺序" prop="sort">
+            <el-input
+              v-model="addForm.sort"
+              type="number"
+              placeholder="状态顺序"
+            />
+          </el-form-item>
+          <el-form-item label="状态类型" prop="type">
+            <el-select
+              style="width: 100%"
+              v-model="addForm.type"
+              placeholder="请选择"
+            >
+              <el-option
+                v-for="item in options"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item
+            label="允许撤回"
+            prop="enable_retreat"
+            label-width="120px"
+          >
+            <el-switch v-model="addForm.enable_retreat"></el-switch>
+          </el-form-item>
+          <el-form-item label="参与者类型" prop="participant_type">
+            <el-select
+              style="width: 100%"
+              v-model="addForm.participant_type"
+              placeholder="请选择"
+            >
+              <el-option
+                v-for="item in typeoptions"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item
+            label="参与者"
+            prop="participant"
+            v-if="addForm.participant_type == 1"
+          >
+            <el-select
+              style="width: 100%"
+              v-model="addForm.participant"
+              placeholder="请选择参与者"
+            >
+              <el-option
+                v-for="item in staffs"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item
+            label="参与者"
+            prop="participant"
+            v-if="addForm.participant_type == 2"
+          >
+            <el-select
+              style="width: 100%"
+              v-model="addForm.participant"
+              multiple
+              placeholder="请选择参与者"
+            >
+              <el-option
+                v-for="item in staffs"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item
+            label="参与者"
+            prop="participant"
+            v-if="addForm.participant_type == 7"
+          >
+            <el-select
+              style="width: 100%"
+              v-model="addForm.participant"
+              placeholder="请选择字段"
+            >
+              <el-option
+                v-for="item in fieldList"
+                :key="item.id"
+                :label="item.field_name"
+                :value="item.field_key"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item
+            label="分配方式"
+            prop="participant"
+          >
+            <el-select
+              style="width: 100%"
+              v-model="addForm.distribute_type"
+              placeholder="请选择分配方式"
+            >
+			<el-option
+                v-for="item in dis_type_options"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item
+            label="角色"
+            prop="participant"
+            v-if="addForm.participant_type == 4"
+          >
+            <el-select
+              style="width: 100%"
+              v-model="addForm.participant"
+              multiple
+              placeholder="请选择角色"
+            >
+              <el-option
+                v-for="item in roles"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item
+            label="岗位"
+            prop="participant"
+            v-if="addForm.participant_type == 10"
+          >
+            <el-select
+              style="width: 100%"
+              v-model="addForm.participant"
+              multiple
+              placeholder="请选择岗位"
+            >
+              <el-option
+                v-for="item in roles"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item
+            label="过滤策略"
+            prop="participant"
+            v-if="
+              addForm.participant_type == 4 || addForm.participant_type == 0
+            "
+          >
+            <el-select
+              style="width: 100%"
+              v-model="addForm.filter_policy"
+              placeholder="请选择过滤策略"
+            >
+              <el-option label="无" value="0"></el-option>
+              <el-option label="和工单同属以及上级部门" value="1"></el-option>
+              <el-option label="和创建人同属以及上级部门" value="2"></el-option>
+              <el-option
+                label="和上步处理人同属以及上级部门"
+                value="3"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <!-- <el-form-item label="代码选择" prop="participant" v-if="addForm.participant_type==9">
 						<el-select style="width: 100%" v-model="participants" placeholder="请选择代码">
 							<el-option v-for="item in codes" :key="item.func" :label="item.name" :value="item.func">
 							</el-option>
 						</el-select>
-					</el-form-item>
-					<el-form-item label="抄送给" prop="participant">
-						<el-select style="width: 100%" v-model="addForm.participant_cc" multiple placeholder="请选择抄送给谁">
-							<el-option v-for="item in staffs" :key="item.id" :label="item.name" :value="item.id">
+					</el-form-item> -->
+          <el-form-item
+            label="代码名"
+            prop="participant"
+            v-if="addForm.participant_type == 9"
+          >
+            <!-- <el-select style="width: 100%" v-model="participants" placeholder="请选择代码">
+							<el-option v-for="item in codes" :key="item.func" :label="item.name" :value="item.func">
 							</el-option>
-						</el-select>
-					</el-form-item>
-					<el-form-item label="字段状态">
-						<el-button @click="addWordStateChange">添加修改</el-button>
-						<el-row v-for="(item,$index) in stateChange" :key="item+$index" style="margin-top: 2px">
-							<el-col :span="11">
-								<el-select style="width: 100%" v-model="item.name" placeholder="请选择字段">
-									<el-option v-for="item in fieldList" :key="item.id" :label="item.field_name"
-											   :value="item.field_key">
-									</el-option>
-								</el-select>
-							</el-col>
-							<el-col :span="1" style="height: 1px;"></el-col>
-							<el-col :span="8">
-								<el-select style="width: 100%" v-model="item.value" placeholder="请选择状态">
-									<el-option
-										v-for="item in state_fields"
-										:label="item.label"
-										:value="item.value"
-										:key="item.value"
-									></el-option>
-								</el-select>
-							</el-col>
-							<el-col :span="2" style="text-align: center" v-if="$index!==0">
-								<i
-									class="el-icon-remove-outline"
-									style="color: red;font-size: 16px;"
-									@click.prevent="removeStateChange($index)"
-								></i>
-							</el-col>
-						</el-row>
-					</el-form-item>
-				</el-form>
-				<div style="text-align: right">
-					<el-button type="danger" @click="dialogVisible = false">取消</el-button>
-					<el-button type="primary" @click="submitHandle('Form')">确认</el-button>
-				</div>
-			</el-dialog>
-		</el-main>
-	</el-container>
-
+						</el-select> -->
+            <el-input v-model="addForm.participant" placeholder="方法名" />
+          </el-form-item>
+          <el-form-item label="抄送给" prop="participant">
+            <el-select
+              style="width: 100%"
+              v-model="addForm.participant_cc"
+              multiple
+              placeholder="请选择抄送给谁"
+            >
+              <el-option
+                v-for="item in staffs"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="字段状态">
+            <el-button @click="addWordStateChange">添加修改</el-button>
+            <el-row
+              v-for="(item, $index) in stateChange"
+              :key="item + $index"
+              style="margin-top: 2px"
+            >
+              <el-col :span="11">
+                <el-select
+                  style="width: 100%"
+                  v-model="item.name"
+                  placeholder="请选择字段"
+                >
+                  <el-option
+                    v-for="item in fieldList"
+                    :key="item.id"
+                    :label="item.field_name"
+                    :value="item.field_key"
+                  >
+                  </el-option>
+                </el-select>
+              </el-col>
+              <el-col :span="1" style="height: 1px"></el-col>
+              <el-col :span="8">
+                <el-select
+                  style="width: 100%"
+                  v-model="item.value"
+                  placeholder="请选择状态"
+                >
+                  <el-option
+                    v-for="item in state_fields"
+                    :label="item.label"
+                    :value="item.value"
+                    :key="item.value"
+                  ></el-option>
+                </el-select>
+              </el-col>
+              <el-col :span="2" style="text-align: center" v-if="$index !== 0">
+                <i
+                  class="el-icon-remove-outline"
+                  style="color: red; font-size: 16px"
+                  @click.prevent="removeStateChange($index)"
+                ></i>
+              </el-col>
+            </el-row>
+          </el-form-item>
+        </el-form>
+        <div style="text-align: right">
+          <el-button type="danger" @click="dialogVisible = false"
+            >取消</el-button
+          >
+          <el-button type="primary" @click="submitHandle('Form')"
+            >确认</el-button
+          >
+        </div>
+      </el-dialog>
+    </el-main>
+  </el-container>
 </template>
 
 <script>
-	export default {
-		name: "state",
-		data() {
-			return {
-				apiObj: this.$API.wf.state.list,
-				id: sessionStorage.getItem('jinYuWorkflowId'),
-				list: null,
-				type: "add",
-				titleMap: {
-					add: '新增',
-					edit: '编辑',
-					show: '查看'
-				},
-				participant: '',
-				participants: [],
-				roles: [],
-				staffs: [],
-				stateChange: [],
-				fieldList: [],
-				//表单数据
-				addForm: {
-					name: '',
-					is_hidden: false,
-					sort: '',
-					type: '',
-					participant_cc: [],
-					enable_retreat: false,
-					participant_type: 0,
-					filter_policy: 0,
-					distribute_type: '2',//分发类型
-					state_fields: {}//字段状态是否可写
-				},
-				//验证规则
-				rules: {
-					name: [
-						{required: true, message: '请输入工作流名称'}
-					]
-				},
-				options_: {
-					"0": '无处理',
-					"1": '个人',
-					"2": '多人',
-					"4": '角色',
-					"6": '脚本',
-					"7": '工单的字段',
-					"9": '代码获取',
-				},
-				options: [{
-					value: 0,
-					label: '普通类型'
-				}, {
-					value: 1,
-					label: '初始状态'
-				}, {
-					value: 2,
-					label: '结束状态'
-				}],
-				typeoptions: [{
-					value: 0,
-					label: '无处理'
-				}, {
-					value: 1,
-					label: '个人'
-				}, {
-					value: 2,
-					label: '多人'
-				}
-					, {
-						value: 4,
-						label: '角色'
-					}
-					, {
-						value: 6,
-						label: '脚本'
-					}
-					, {
-						value: 7,
-						label: '工单的字段'
-					}
-					, {
-						value: 9,
-						label: '代码获取'
-					}],
-				state_fields: [
-					{
-						value: 1,
-						label: '只读'
-					}, {
-						value: 2,
-						label: '必填'
-					}, {
-						value: 3,
-						label: '可选'
-					}, {
-						value: 4,
-						label: '隐藏'
-					},
-				],
-				editId: null,
-				dialogVisible: false,
-			}
-		},
-		mounted() {
-			debugger;
-			this.id = sessionStorage.getItem('jinYuWorkflowId');
-			this.getList();
-			this.getUsers();
-			this.getRole();
-			this.getField();
-		},
-		methods: {
-			//添加字段选项
-			addWordStateChange() {
-				this.stateChange.push({name: '', value: ''})
-			},
-			//删除字段选项
-			removeStateChange(index) {
-				this.stateChange.splice(index, 1)
-			},
-			//获取员工
-			async getUsers() {
-				let staffs = await this.$API.system.user.get({page: 0});
-				this.staffs = staffs;
-			},
-			//获取角色
-			async getRole() {
-				let roles = await this.$API.system.role.get({page: 0});
-				this.roles = roles;
-			},
-			//获取字段
-			async getField() {
-				let fieldList = await this.$API.wf.getCustomfields.get(this.id);
-				this.fieldList = fieldList;
-			},
-			handleAdd() {
-				this.type = 'add';
-				this.dialogVisible = true;
-			},
-			submitHandle() {
-				let that = this;
-				debugger;
-				this.$refs.Form.validate((valid) => {
-					if (valid) {
-						let state_fields = {};
-						if (this.stateChange.length > 0) {
-							for (let i = 0; i < this.stateChange.length; i++) {
-								state_fields[this.stateChange[i].name] = this.stateChange[i].value;
-							}
-						}
-						this.addForm.state_fields = state_fields;
-						this.addForm.participant = this.addForm.participant_type === 1 ? this.participant : this.participants;
-						that.isSaveing = true;
-						let res = null;
-						if (that.type === 'add') {
-							that.addForm.workflow = this.id;
-							res = that.$API.wf.stateAdd.post(that.addForm)
-						} else {
-							res = that.$API.wf.stateEdit.put(that.editId, that.addForm);
-						}
-						if (res.err_msg) {
-							that.isSaveing = false;
-						} else {
-							that.isSaveing = false;
-							that.dialogVisible = false;
-							that.getList();
-						}
-					}
-				})
-			},
-			handleEdit(row) {
-				this.type = 'edit';
-				this.editId = row.id;
-				this.dialogVisible = true;
-				this.addForm = Object.assign({}, row);
-			},
-			async getList() {
-				let res = await this.$API.wf.getWorkflowState.get(this.id);
-				console.log(res);
-				this.list = res;
-			},
-		},
-	}
+export default {
+  name: "state",
+  data() {
+    return {
+      id: sessionStorage.getItem("jinYuWorkflowId"),
+      list: null,
+      type: "add",
+      titleMap: {
+        add: "新增",
+        edit: "编辑",
+        show: "查看",
+      },
+      participant: "",
+      participants: [],
+      roles: [],
+      staffs: [],
+      stateChange: [],
+      fieldList: [],
+      //表单数据
+      addForm: {
+        name: "",
+        is_hidden: false,
+        sort: "",
+        type: "",
+        participant_cc: [],
+        enable_retreat: false,
+        participant_type: 0,
+        filter_policy: 0,
+        distribute_type: 2, //分发类型
+        state_fields: {}, //字段状态是否可写
+      },
+      //验证规则
+      rules: {
+        name: [{ required: true, message: "请输入工作流名称" }],
+      },
+      options_: {
+        0: "无处理",
+        1: "个人",
+        2: "多人",
+        4: "角色",
+        6: "脚本",
+        7: "工单的字段",
+        9: "代码获取",
+        10: "岗位",
+      },
+	  options2_: {
+        1: "主动接单",
+        2: "直接处理",
+        3: "随机分配",
+        4: "全部处理",
+      },
+      options: [
+        {
+          value: 0,
+          label: "普通类型",
+        },
+        {
+          value: 1,
+          label: "初始状态",
+        },
+        {
+          value: 2,
+          label: "结束状态",
+        },
+      ],
+      typeoptions: [
+        {
+          value: 0,
+          label: "无处理",
+        },
+        {
+          value: 1,
+          label: "个人",
+        },
+        {
+          value: 2,
+          label: "多人",
+        },
+        {
+          value: 4,
+          label: "角色",
+        },
+        {
+          value: 6,
+          label: "脚本",
+        },
+        {
+          value: 7,
+          label: "工单的字段",
+        },
+        {
+          value: 9,
+          label: "代码获取",
+        },
+        {
+          value: 10,
+          label: "岗位",
+        },
+      ],
+      state_fields: [
+        {
+          value: 1,
+          label: "只读",
+        },
+        {
+          value: 2,
+          label: "必填",
+        },
+        {
+          value: 3,
+          label: "可选",
+        },
+        {
+          value: 4,
+          label: "隐藏",
+        },
+      ],
+      dis_type_options: [
+        {
+          label: "主动接单",
+          value: 1,
+        },
+        {
+          label: "直接处理",
+          value: 2,
+        },
+        {
+          label: "随机分配",
+          value: 3,
+        },
+        {
+          label: "全部处理",
+          value: 4,
+        },
+      ],
+      editId: null,
+      dialogVisible: false,
+    };
+  },
+  mounted() {
+    this.id = sessionStorage.getItem("jinYuWorkflowId");
+    this.getList();
+    this.getUsers();
+    this.getRole();
+    this.getField();
+  },
+  methods: {
+    //添加字段选项
+    addWordStateChange() {
+      this.stateChange.push({ name: "", value: "" });
+    },
+    //删除字段选项
+    removeStateChange(index) {
+      this.stateChange.splice(index, 1);
+    },
+    //获取员工
+    async getUsers() {
+      let staffs = await this.$API.system.user.list.req({ page: 0 });
+      this.staffs = staffs;
+    },
+    //获取角色
+    async getRole() {
+      let roles = await this.$API.system.role.list.req({ page: 0 });
+      this.roles = roles;
+    },
+    //获取字段
+    async getField() {
+      let fieldList = await this.$API.wf.workflow.customfields.req(this.id);
+      this.fieldList = fieldList;
+    },
+    handleAdd() {
+      this.type = "add";
+      this.dialogVisible = true;
+    },
+    async submitHandle() {
+      let that = this;
+      that.isSaveing = true;
+      let res = null;
+      if (that.type === "add") {
+        that.addForm.workflow = this.id;
+        res = await that.$API.wf.state.create.req(that.addForm);
+      } else {
+        res = await that.$API.wf.state.update.req(that.editId, that.addForm);
+      }
+      if (res.err_msg) {
+        that.isSaveing = false;
+      } else {
+        that.isSaveing = false;
+        that.dialogVisible = false;
+        that.getList();
+      }
+      // this.$refs.Form.validate((valid) => {
+      // 	if (valid) {
+      // 		let state_fields = {};
+      // 		if (this.stateChange.length > 0) {
+      // 			for (let i = 0; i < this.stateChange.length; i++) {
+      // 				state_fields[this.stateChange[i].name] = this.stateChange[i].value;
+      // 			}
+      // 		}
+      // 		this.addForm.state_fields = state_fields;
+      // 		this.addForm.participant = this.addForm.participant_type === 1 ? this.participant : this.participants;
+      // 		that.isSaveing = true;
+      // 		let res = null;
+      // 		if (that.type === 'add') {
+      // 			that.addForm.workflow = this.id;
+      // 			res = that.$API.wf.stateAdd.post(that.addForm)
+      // 		} else {
+      // 			res = that.$API.wf.stateEdit.put(that.editId, that.addForm);
+      // 		}
+      // 		if (res.err_msg) {
+      // 			that.isSaveing = false;
+      // 		} else {
+      // 			that.isSaveing = false;
+      // 			that.dialogVisible = false;
+      // 			that.getList();
+      // 		}
+      // 	}
+      // })
+    },
+    handleEdit(row) {
+      this.type = "edit";
+      this.editId = row.id;
+      this.dialogVisible = true;
+      this.addForm = Object.assign({}, row);
+    },
+    async getList() {
+      let res = await this.$API.wf.workflow.states.req(this.id);
+      console.log(res);
+      this.list = res;
+    },
+  },
+};
 </script>
 
 <style scoped>
-
 </style>
diff --git a/src/views/wf/transform.vue b/src/views/wf/transform.vue
index c3aa717d..a52f8575 100644
--- a/src/views/wf/transform.vue
+++ b/src/views/wf/transform.vue
@@ -1,11 +1,17 @@
 <template>
-	<el-main class="nopadding">
-		<el-button type="primary" icon="el-icon-plus" @click="handleAdd"></el-button>
-		<el-table
-			:data="list"
-			style="width: 100%"
+<el-container>
+	<el-header>
+		<div class="left-panel">
+				<el-button type="primary" icon="el-icon-plus" @click="handleAdd"></el-button>
+			</div>
+	</el-header>
+		<el-main class="nopadding">
+		
+		<scTable
+			:data="list" ref="table"
+			row-key="id" stripe highlightCurrentRow hidePagination
 		>
-			<el-table-column type="index" width="50"/>
+			<el-table-column label="ID" prop="id"></el-table-column>
 			<el-table-column label="名称" prop="name"></el-table-column>
 			<el-table-column label="定时器（单位秒）" prop="timer"></el-table-column>
 			<el-table-column label="源状态">
@@ -38,7 +44,7 @@
 					</el-link>
 				</template>
 			</el-table-column>
-		</el-table>
+		</scTable>
 		<el-dialog
 			v-model="dialogVisible"
 			:title="titleMap[type]"
@@ -48,7 +54,6 @@
 				:model="addForm"
 				label-width="130px"
 				label-position="right"
-				:rules="rule"
 			>
 				<el-form-item label="名称" prop="name">
 					<el-input v-model="addForm.name" placeholder="名称"/>
@@ -78,6 +83,7 @@
 				</el-form-item>
 				<el-form-item label="条件表达式" prop="condition_expression">
 					<vue-json-editor
+						style="width:100%"
 						v-model="addForm.condition_expression"
 						:showBtns="false"
 						:mode="'code'"
@@ -105,6 +111,8 @@
 			</div>
 		</el-dialog>
 	</el-main>
+</el-container>
+
 </template>
 
 <script>
@@ -176,36 +184,34 @@
 				this.addForm = Object.assign({}, row);
 			},
 			async getList() {
-				let res = await this.$API.wf.getWorkflowTransition.get(this.id);
+				let res = await this.$API.wf.workflow.transitions.req(this.id);
 				this.list = res;
 			},
 			async getStateList() {
-				let res = await this.$API.wf.getWorkflowState.get(this.id);
+				let res = await this.$API.wf.workflow.states.req(this.id);
 				console.log(res);
 				this.stateList = res;
 			},
-			submitHandle(){
+			async submitHandle(){
 				let that = this;
+				let res = null;
+				if (that.type === 'add') {
+					debugger;
+					that.addForm.workflow = this.id;
+					res = await that.$API.wf.transition.create.req(that.addForm);
+				} else {
+					res = await that.$API.wf.transition.update.req(that.editId, that.addForm);
+				}
+				if(res.err_msg){
+					that.isSaveing = false;
+				}else{
+					that.isSaveing = false;
+					that.dialogVisible = false;
+					that.getList();
+				}
 				this.$refs.Form.validate((valid) => {
 					if (valid) {
-						let res = null;
-						if (that.type === 'add') {
-							debugger;
-							that.addForm.workflow = this.id;
-							res = that.$API.wf.transitionAdd.post(that.addForm);
-						} else {
-							res = that.$API.wf.transitionEdit.put(that.editId, that.addForm);
-						}
-						if(res.err_msg){
-							this.$message.error(res.err_msg)
-						}else{
-							that.isSaveing = false;
-							that.limitedVisible = false;
-							that.$refs.table.refresh();
-						}
-						that.isSaveing = false;
-						that.limitedVisible = false;
-						that.getList();
+						
 					}
 				})
 			},