问题更新

src/components/wfd/behavior/deleteItem.js

@@ -8,17 +8,17 @@ export default function(G6) {
       }
     },
     onKeydown(e) {
-      const items = this.graph.get('selectedItems')
-      const focus = this.graph.get('focusGraphWrapper')
-      if (e.keyCode === 8 && items && items.length > 0 && focus) {
-        if (this.graph.executeCommand) {
-          this.graph.executeCommand('delete', {})
-        } else {
-          this.graph.remove(items[0])
-        }
-        this.graph.set('selectedItems', [])
-        this.graph.emit('afteritemselected', [])
-      }
+      // const items = this.graph.get('selectedItems')
+      // const focus = this.graph.get('focusGraphWrapper')
+      // if (e.keyCode === 46 && items && items.length > 0 && focus) {
+      //   if (this.graph.executeCommand) {
+      //     this.graph.executeCommand('delete', {})
+      //   } else {
+      //     this.graph.remove(items[0])
+      //   }
+      //   this.graph.set('selectedItems', [])
+      //   this.graph.emit('afteritemselected', [])
+      // }
     },
     onCanvasLeave(e) {
       this.graph.set('focusGraphWrapper', false)

src/components/wfd/components/DetailPanel/DefaultDetail.vue

@@ -10,7 +10,7 @@
         @input="(value) => {onChange('label', value)}"
       />
     </div>
-    <div class="panelRow">
+    <!-- <div class="panelRow">
       <div><span style="color: red">*</span> 顺序：</div>
       <el-input
         size="small"
@@ -19,7 +19,7 @@
         :value="model.sort"
         @input="(value) => {onChange('sort', value)}"
       />
-    </div>
+    </div> -->
     <div class="panelRow">
       <el-checkbox
         size="small"
@@ -52,6 +52,9 @@ export default {
       type: Boolean,
       default: false
     }
+  },
+  mounted() {
+    this.onChange('sort', 1)
   }
 }
 </script>

src/components/wfd/components/DetailPanel/FlowDetail.vue

@@ -27,13 +27,43 @@
           :value="model.conditionExpression"
           @input="(value) => {onChange('conditionExpression', value)}"
         /> -->
-
+        <div v-for="(item, index) in conditionList" :key="index">
+          <el-select
+            v-model="item.key"
+            style="width:90%; font-size:12px"
+            placeholder="请选择关联字段"
+          >
+            <el-option label="同意" value="1" />
+            <el-option label="拒绝" value="0" />
+            <el-option label="其他" value="2" />
+          </el-select>
+          <el-select
+            v-model="item.sign"
+            style="width:90%; font-size:12px"
+            placeholder="请选择标识"
+          >
+            <el-option label="大于" value=">" />
+            <el-option label="大于等于" value=">=" />
+            <el-option label="小于" value="<" />
+            <el-option label="小于等于" value="<=" />
+            <el-option label="不等于" value="!=" />
+            <el-option label="等于" value="==" />
+          </el-select>
+          <el-input
+            v-model="item.value"
+            style="width:90%; font-size:12px"
+            type="number"
+          />
+          <hr v-if="conditionList.length > 1" style="background-color: #dcdfe6; border:none; height:1px;">
+        </div>
+        <el-button type="text" icon="el-icon-circle-plus-outline" @click="addDisplayCondition">新  增</el-button>
       </div>
     </div>
   </div>
 </template>
 <script>
 import DefaultDetail from './DefaultDetail'
+// import { templateDetails } from '@/api/process/admin/template'
 export default {
   inject: ['i18n'],
   components: {
@@ -61,8 +91,28 @@ export default {
       default: false
     }
   },
+  data() {
+    return {
+      conditionList: [{
+        key: null,
+        sign: null,
+        value: null
+      }]
+    }
+  },
   mounted() {
     console.log(this.templates, this.templatesBase)
+    // api-oa/api/v1/tpl/details?template_id=28
+  },
+  methods: {
+    addDisplayCondition() {
+      // 添加验证
+      this.conditionList.push({
+        key: null,
+        sign: null,
+        value: null
+      })
+    }
   }
 }
 </script>

src/views/process/admin/process-manager.vue

@@ -141,18 +141,14 @@
                   </el-select>
                 </el-form-item>
               </el-col>
-              <!-- <el-col :span="12">
-                <el-form-item label="任务">
-                  <el-select v-model="ruleForm.task" multiple filterable clearable placeholder="请选择流程任务" style="width: 100%">
-                    <el-option
-                      v-for="(item, index) in taskListData"
-                      :key="index"
-                      :label="item.name"
-                      :value="item.full_name"
-                    />
+              <el-col :span="12">
+                <el-form-item label="模板类型" prop="sub">
+                  <el-select v-model="ruleForm.sub" filterable placeholder="请选择模板类型" style="width: 100%">
+                    <el-option label="父流程" :value="0" />
+                    <el-option label="子流程" :value="1" />
                   </el-select>
                 </el-form-item>
-              </el-col> -->
+              </el-col>
             </el-row>
             <el-form-item label="描述" prop="remarks">
               <el-input
@@ -267,6 +263,9 @@ export default {
         tpls: [
           { required: true, message: '请选择模版', trigger: 'blur, change' }
         ],
+        sub: [
+          { required: true, message: '请选择模版类型', trigger: 'blur, change' }
+        ],
         structure: [
           { required: true, message: '请设计流程', trigger: 'blur' }
         ],
@@ -294,7 +293,15 @@ export default {
         page: 1,
         per_page: 99999
       }).then(response => {
-        this.processData = response.data.data
+        const tempList = response.data.data || []
+        const subList = []
+        tempList.forEach(item => {
+          if (item.sub == 1) {
+            subList.push(item)
+          }
+        })
+        console.log(response.data.data)
+        this.processData = subList
       })
     },
     // 获取流程分类列表
@@ -381,6 +388,7 @@ export default {
         classify: '',
         task: [],
         notice: [1],
+        sub: 0,
         icon: '',
         remarks: ''
       }
@@ -407,6 +415,7 @@ export default {
           classify: response.data.classify,
           task: response.data.task,
           notice: response.data.notice,
+          sub: response.data.sub,
           icon: response.data.icon,
           remarks: response.data.remarks
         }
@@ -481,6 +490,7 @@ export default {
               classify: this.ruleForm.classify,
               task: this.ruleForm.task,
               notice: this.ruleForm.notice,
+              sub: this.ruleForm.sub,
               icon: this.ruleForm.icon,
               remarks: this.ruleForm.remarks
             }).then(response => {