Merge branch 'dev' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web into dev

@@ -33,7 +33,7 @@
               <p v-if="item.operate=='D'">{{ item.qllxmc }} <span class="tpcolor">(删除)</span></p>
               <p v-else >{{ item.qllxmc }} <span class="tpcolor">({{ item.operate=="U"?"编辑":"新增" }})</span></p>
             </div>
-            <i class="el-icon-delete" v-if="delel"></i>
+            <i class="el-icon-delete" @click.stop="handleDel(item)" v-if="delel"></i>
           </el-menu-item>
         </el-menu>
       </div>

@@ -6,6 +6,7 @@
 import { getWorkFlowImage } from "@/api/workflow/jsydsyqFlow.js";
 import { getPrintTemplateByCode } from "@/api/system";
 import { getPrintApplicationInfo } from "@/api/fqsq";
+import { getQllxByBdcdyid } from "@/api/djbbl.js";
 import { uploadUndo } from "@/api/clxx";
 import { deleteFlow } from "@/api/djbbl";
 import { getLodop } from "@/utils/LodopFuncs"
@@ -137,7 +138,17 @@ export default {
 
         //   break;
           case "B5":
-            this.$refs.Menu.loadBdcdylist("add")
+            if (this.currentSelectProps.bdcdyid) {
+              getQllxByBdcdyid({ bdcdyid: this.currentSelectProps.bdcdyid }).then(
+                (res) => {
+                  if (res.code === 200) {
+                    this.$refs.qllxlist.qllxlistdata = res.result;
+                    this.$refs.qllxlist.dialogVisible = true;
+                  }
+                }
+              );
+            }
+            // this.$refs.Menu.loadBdcdylist("add")
             // this.$popupDialog("选择新增权力类型", "djbworkflow/djbBook/components/qllxcloseDailog", this.currentSelectProps, '50%', true)
 
 

@@ -149,18 +149,18 @@
       //     this.supplementarylist = res.result;
       //    })
       // },
-      getQllxByBdcdyid () {
-        if (this.currentSelectProps.bdcdyid) {
-          getQllxByBdcdyid({ bdcdyid: this.currentSelectProps.bdcdyid }).then(
-            (res) => {
-              if (res.code === 200) {
-                this.$refs.qllxlist.qllxlistdata = res.result;
-                this.$refs.qllxlist.dialogVisible = true;
-              }
-            }
-          );
-        }
-      },
+      // getQllxByBdcdyid () {
+      //   if (this.currentSelectProps.bdcdyid) {
+      //     getQllxByBdcdyid({ bdcdyid: this.currentSelectProps.bdcdyid }).then(
+      //       (res) => {
+      //         if (res.code === 200) {
+      //           this.$refs.qllxlist.qllxlistdata = res.result;
+      //           this.$refs.qllxlist.dialogVisible = true;
+      //         }
+      //       }
+      //     );
+      //   }
+      // },
       // 获取右侧选项卡
       getCurrentSelectProps (val) {
        this.bsmRepair= val.bsmRepair

@@ -155,18 +155,18 @@ export default {
     //     this.supplementarylist = res.result;
     //    })
     // },
-    getQllxByBdcdyid() {
-      if (this.currentSelectProps.bdcdyid) {
-        getQllxByBdcdyid({ bdcdyid: this.currentSelectProps.bdcdyid }).then(
-          (res) => {
-            if (res.code === 200) {
-              this.$refs.qllxlist.qllxlistdata = res.result;
-              this.$refs.qllxlist.dialogVisible = true;
-            }
-          }
-        );
-      }
-    },
+    // getQllxByBdcdyid() {
+    //   if (this.currentSelectProps.bdcdyid) {
+    //     getQllxByBdcdyid({ bdcdyid: this.currentSelectProps.bdcdyid }).then(
+    //       (res) => {
+    //         if (res.code === 200) {
+    //           this.$refs.qllxlist.qllxlistdata = res.result;
+    //           this.$refs.qllxlist.dialogVisible = true;
+    //         }
+    //       }
+    //     );
+    //   }
+    // },
     // 获取右侧选项卡
     getCurrentSelectProps(val) {
       this.bsmRepair= val.bsmRepair

@@ -197,6 +197,7 @@ export default {
         djywmc: '',
         enabled: '1',
         flowid: '',
+        flowparams: '',
         djqxcl: '',
         sfqydjyymb: '1',
         djyy: ''

@@ -50,6 +50,11 @@
               <el-input v-model="form.ywDetail.flowid"></el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item label="流程参数" prop="flowparams">
+              <el-input v-model="form.ywDetail.flowparams"></el-input>
+            </el-form-item>
+          </el-col>
         </el-row>
 
         <el-row>