Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
482b1aaa by renchao@pashanhoo.com
Options

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

2 parents d0e27e3c d84b37be
Inline Side-by-side
Showing 6 changed files with 43 additions and 26 deletions
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
33 <p v-if="item.operate=='D'">{{ item.qllxmc }} <span class="tpcolor">(删除)</span></p> 33 <p v-if="item.operate=='D'">{{ item.qllxmc }} <span class="tpcolor">(删除)</span></p>
34 <p v-else >{{ item.qllxmc }} <span class="tpcolor">({{ item.operate=="U"?"编辑":"新增" }})</span></p> 34 <p v-else >{{ item.qllxmc }} <span class="tpcolor">({{ item.operate=="U"?"编辑":"新增" }})</span></p>
35 </div> 35 </div>
36 <i class="el-icon-delete" v-if="delel"></i> 36 <i class="el-icon-delete" @click.stop="handleDel(item)" v-if="delel"></i>
37 </el-menu-item> 37 </el-menu-item>
38 </el-menu> 38 </el-menu>
39 </div> 39 </div>
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
6 import { getWorkFlowImage } from "@/api/workflow/jsydsyqFlow.js"; 6 import { getWorkFlowImage } from "@/api/workflow/jsydsyqFlow.js";
7 import { getPrintTemplateByCode } from "@/api/system"; 7 import { getPrintTemplateByCode } from "@/api/system";
8 import { getPrintApplicationInfo } from "@/api/fqsq"; 8 import { getPrintApplicationInfo } from "@/api/fqsq";
9 import { getQllxByBdcdyid } from "@/api/djbbl.js";
9 import { uploadUndo } from "@/api/clxx"; 10 import { uploadUndo } from "@/api/clxx";
10 import { deleteFlow } from "@/api/djbbl"; 11 import { deleteFlow } from "@/api/djbbl";
11 import { getLodop } from "@/utils/LodopFuncs" 12 import { getLodop } from "@/utils/LodopFuncs"
...@@ -137,7 +138,17 @@ export default { ...@@ -137,7 +138,17 @@ export default {
137 138
138 // break; 139 // break;
139 case "B5": 140 case "B5":
140 this.$refs.Menu.loadBdcdylist("add") 141 if (this.currentSelectProps.bdcdyid) {
142 getQllxByBdcdyid({ bdcdyid: this.currentSelectProps.bdcdyid }).then(
143 (res) => {
144 if (res.code === 200) {
145 this.$refs.qllxlist.qllxlistdata = res.result;
146 this.$refs.qllxlist.dialogVisible = true;
147 }
148 }
149 );
150 }
151 // this.$refs.Menu.loadBdcdylist("add")
141 // this.$popupDialog("选择新增权力类型", "djbworkflow/djbBook/components/qllxcloseDailog", this.currentSelectProps, '50%', true) 152 // this.$popupDialog("选择新增权力类型", "djbworkflow/djbBook/components/qllxcloseDailog", this.currentSelectProps, '50%', true)
142 153
143 154
......
...@@ -149,18 +149,18 @@ ...@@ -149,18 +149,18 @@
149 // this.supplementarylist = res.result; 149 // this.supplementarylist = res.result;
150 // }) 150 // })
151 // }, 151 // },
152 getQllxByBdcdyid () { 152 // getQllxByBdcdyid () {
153 if (this.currentSelectProps.bdcdyid) { 153 // if (this.currentSelectProps.bdcdyid) {
154 getQllxByBdcdyid({ bdcdyid: this.currentSelectProps.bdcdyid }).then( 154 // getQllxByBdcdyid({ bdcdyid: this.currentSelectProps.bdcdyid }).then(
155 (res) => { 155 // (res) => {
156 if (res.code === 200) { 156 // if (res.code === 200) {
157 this.$refs.qllxlist.qllxlistdata = res.result; 157 // this.$refs.qllxlist.qllxlistdata = res.result;
158 this.$refs.qllxlist.dialogVisible = true; 158 // this.$refs.qllxlist.dialogVisible = true;
159 } 159 // }
160 } 160 // }
161 ); 161 // );
162 } 162 // }
163 }, 163 // },
164 // 获取右侧选项卡 164 // 获取右侧选项卡
165 getCurrentSelectProps (val) { 165 getCurrentSelectProps (val) {
166 this.bsmRepair= val.bsmRepair 166 this.bsmRepair= val.bsmRepair
......
...@@ -155,18 +155,18 @@ export default { ...@@ -155,18 +155,18 @@ export default {
155 // this.supplementarylist = res.result; 155 // this.supplementarylist = res.result;
156 // }) 156 // })
157 // }, 157 // },
158 getQllxByBdcdyid() { 158 // getQllxByBdcdyid() {
159 if (this.currentSelectProps.bdcdyid) { 159 // if (this.currentSelectProps.bdcdyid) {
160 getQllxByBdcdyid({ bdcdyid: this.currentSelectProps.bdcdyid }).then( 160 // getQllxByBdcdyid({ bdcdyid: this.currentSelectProps.bdcdyid }).then(
161 (res) => { 161 // (res) => {
162 if (res.code === 200) { 162 // if (res.code === 200) {
163 this.$refs.qllxlist.qllxlistdata = res.result; 163 // this.$refs.qllxlist.qllxlistdata = res.result;
164 this.$refs.qllxlist.dialogVisible = true; 164 // this.$refs.qllxlist.dialogVisible = true;
165 } 165 // }
166 } 166 // }
167 ); 167 // );
168 } 168 // }
169 }, 169 // },
170 // 获取右侧选项卡 170 // 获取右侧选项卡
171 getCurrentSelectProps(val) { 171 getCurrentSelectProps(val) {
172 this.bsmRepair= val.bsmRepair 172 this.bsmRepair= val.bsmRepair
......
...@@ -197,6 +197,7 @@ export default { ...@@ -197,6 +197,7 @@ export default {
197 djywmc: '', 197 djywmc: '',
198 enabled: '1', 198 enabled: '1',
199 flowid: '', 199 flowid: '',
200 flowparams: '',
200 djqxcl: '', 201 djqxcl: '',
201 sfqydjyymb: '1', 202 sfqydjyymb: '1',
202 djyy: '' 203 djyy: ''
......
...@@ -50,6 +50,11 @@ ...@@ -50,6 +50,11 @@
50 <el-input v-model="form.ywDetail.flowid"></el-input> 50 <el-input v-model="form.ywDetail.flowid"></el-input>
51 </el-form-item> 51 </el-form-item>
52 </el-col> 52 </el-col>
53 <el-col :span="8">
54 <el-form-item label="流程参数" prop="flowparams">
55 <el-input v-model="form.ywDetail.flowparams"></el-input>
56 </el-form-item>
57 </el-col>
53 </el-row> 58 </el-row>
54 59
55 <el-row> 60 <el-row>
......