Merge branch 'dev' of http://60.209.125.238:20010/lijingjia/ds-wms-client-web into dev

src/views/baseinfo/clientflowtemplate/Lowflow/nodes/Approval/index.ts

@@ -10,6 +10,12 @@ export interface ApprovalNode extends FlowNode {
   roles: string[]
   // 执行SQL语句
   MarkerSQLText: string
+  // 执行人变更回调地址
+  MakerNotifyURL: string
+  // 回调地址
+  CallbackURL: string
+  // 审批类型
+  AuditType: string
   // 表单内人员
   formUser: string
   // 表单内角色

src/views/baseinfo/clientflowtemplate/Lowflow/penal/ApprovalAttr.vue

@@ -8,7 +8,7 @@
   import { FormProperty } from '/@/baseinfo/flowtemplate/Lowflow/views/index'
   import UserSelection from '/@/components/UserSelection'
   import RoleSelection from '/@/components/RoleSelection'
-
+  import { GetTaskTypeConstList } from '../../api'
   const activeName = ref('properties')
 
   export interface ApprovalAttr {
@@ -149,6 +149,13 @@
       })
     }
   })
+  const AuditTypeList = ref<any>([])
+  GetTaskTypeConstList().then((res) => {
+    AuditTypeList.value.splice(0)
+    res.data.forEach((item) => {
+      AuditTypeList.value.push(item)
+    })
+  })
   watch(
     () => node.users,
     (newVal, oldVal) => {
@@ -237,6 +244,29 @@
             <el-radio label="single">或签（其中一名审批人通过或驳回即可）</el-radio>
           </el-radio-group>
         </el-form-item>
+        <el-form-item prop="method" label="执行人变更回调地址">
+          <el-input
+            type="textarea"
+            :rows="6"
+            placeholder="请输入内容"
+            v-model="node.MakerNotifyURL"
+          >
+          </el-input>
+        </el-form-item>
+        <el-form-item prop="method" label="回调地址">
+          <el-input type="textarea" :rows="6" placeholder="请输入内容" v-model="node.CallbackURL">
+          </el-input>
+        </el-form-item>
+        <el-form-item prop="method" label="审批类型">
+          <el-select v-model="node.AuditType" placeholder="请选择审批类型">
+            <el-option
+              v-for="item in AuditTypeList"
+              :key="item.value"
+              :label="item.key"
+              :value="item.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
         <!-- <el-form-item prop="nobody" label="审批人为空">
           <el-radio-group v-model="node.nobody">
             <el-radio label="pass">自动通过</el-radio>

src/views/baseinfo/clientflowtemplate/api.ts

@@ -18,6 +18,15 @@ enum Api {
   downloadXml = '/stage-api/workflow/model/download',
   getByUsername = '/stage-api/user/info',
   getById = '/stage-api/role/info',
+  GetTaskTypeConstList = '/mainApi/ClientCommon/GetTaskTypeConstList',
+  
+
+}
+export function GetTaskTypeConstList() {
+  return request<DataResult>({
+    url: Api.GetTaskTypeConstList,
+    method: 'get',
+  })
 }
 export function GetClientFlowTemplateList(data: PageRequest) {
   return request<DataResult>({