Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web
Showing
13 changed files
with
120 additions
and
128 deletions
... | @@ -155,3 +155,12 @@ export function stopTask (data) { | ... | @@ -155,3 +155,12 @@ export function stopTask (data) { |
155 | data | 155 | data |
156 | }) | 156 | }) |
157 | } | 157 | } |
158 | |||
159 | // 获取用户任务权限 | ||
160 | export function judgeUserTaskPermission (params) { | ||
161 | return request({ | ||
162 | url: SERVER.SERVERAPI + '/rest/business/workFlow/judgeUserTaskPermission', | ||
163 | method: 'get', | ||
164 | params | ||
165 | }) | ||
166 | } | ... | ... |
... | @@ -16,7 +16,7 @@ | ... | @@ -16,7 +16,7 @@ |
16 | :data="data" style="width: 100%" :span-method="this.merge ? this.mergeMethod : this.spanMethod"> | 16 | :data="data" style="width: 100%" :span-method="this.merge ? this.mergeMethod : this.spanMethod"> |
17 | <el-table-column width="45" align="center" v-if="isRadio"> | 17 | <el-table-column width="45" align="center" v-if="isRadio"> |
18 | <template slot-scope="scope"> | 18 | <template slot-scope="scope"> |
19 | <el-radio v-model="selected" :label="scope.$index"></el-radio> | 19 | <el-radio v-model="selected" :label="scope.$index" class="table-radio"></el-radio> |
20 | </template> | 20 | </template> |
21 | </el-table-column> | 21 | </el-table-column> |
22 | 22 | ||
... | @@ -31,7 +31,7 @@ | ... | @@ -31,7 +31,7 @@ |
31 | 31 | ||
32 | <el-table-column width="45" align="center" v-if="isRadio"> | 32 | <el-table-column width="45" align="center" v-if="isRadio"> |
33 | <template slot-scope="scope"> | 33 | <template slot-scope="scope"> |
34 | <el-radio v-model="selected" :label="scope.$index"></el-radio> | 34 | <el-radio v-model="selected" :label="scope.$index" class="table-radio"></el-radio> |
35 | </template> | 35 | </template> |
36 | </el-table-column> | 36 | </el-table-column> |
37 | <lb-column v-bind="$attrs" v-for="(item, index) in column" :key="index" :column="item"> | 37 | <lb-column v-bind="$attrs" v-for="(item, index) in column" :key="index" :column="item"> |
... | @@ -222,7 +222,13 @@ export default { | ... | @@ -222,7 +222,13 @@ export default { |
222 | padding-right: 3px; | 222 | padding-right: 3px; |
223 | } | 223 | } |
224 | 224 | ||
225 | /deep/.el-radio__label { | 225 | .table-radio { |
226 | /deep/.el-radio__label { | ||
226 | display: none; | 227 | display: none; |
228 | } | ||
229 | } | ||
230 | |||
231 | /deep/.el-radio { | ||
232 | margin-right: 5px !important; | ||
227 | } | 233 | } |
228 | </style> | 234 | </style> | ... | ... |
... | @@ -16,7 +16,7 @@ | ... | @@ -16,7 +16,7 @@ |
16 | :data="data" style="width: 100%" :span-method="this.merge ? this.mergeMethod : this.spanMethod"> | 16 | :data="data" style="width: 100%" :span-method="this.merge ? this.mergeMethod : this.spanMethod"> |
17 | <el-table-column width="45" align="center" v-if="isRadio"> | 17 | <el-table-column width="45" align="center" v-if="isRadio"> |
18 | <template slot-scope="scope"> | 18 | <template slot-scope="scope"> |
19 | <el-radio v-model="selected" :label="scope.$index"></el-radio> | 19 | <el-radio v-model="selected" :label="scope.$index" class="table-radio"></el-radio> |
20 | </template> | 20 | </template> |
21 | </el-table-column> | 21 | </el-table-column> |
22 | 22 | ||
... | @@ -31,7 +31,7 @@ | ... | @@ -31,7 +31,7 @@ |
31 | 31 | ||
32 | <el-table-column width="45" align="center" v-if="isRadio"> | 32 | <el-table-column width="45" align="center" v-if="isRadio"> |
33 | <template slot-scope="scope"> | 33 | <template slot-scope="scope"> |
34 | <el-radio v-model="selected" :label="scope.$index"></el-radio> | 34 | <el-radio v-model="selected" :label="scope.$index" class="table-radio"></el-radio> |
35 | </template> | 35 | </template> |
36 | </el-table-column> | 36 | </el-table-column> |
37 | <lb-column v-bind="$attrs" v-for="(item, index) in column" :key="index" :column="item"> | 37 | <lb-column v-bind="$attrs" v-for="(item, index) in column" :key="index" :column="item"> |
... | @@ -222,7 +222,13 @@ export default { | ... | @@ -222,7 +222,13 @@ export default { |
222 | padding-right: 3px; | 222 | padding-right: 3px; |
223 | } | 223 | } |
224 | 224 | ||
225 | /deep/.el-radio__label { | 225 | .table-radio { |
226 | /deep/.el-radio__label { | ||
226 | display: none; | 227 | display: none; |
228 | } | ||
229 | } | ||
230 | |||
231 | /deep/.el-radio { | ||
232 | margin-right: 5px !important; | ||
227 | } | 233 | } |
228 | </style> | 234 | </style> | ... | ... |
... | @@ -8,7 +8,7 @@ class data extends filter { | ... | @@ -8,7 +8,7 @@ class data extends filter { |
8 | constructor() { | 8 | constructor() { |
9 | super() | 9 | super() |
10 | } | 10 | } |
11 | djqxCol (){ | 11 | djqxCol () { |
12 | return [ | 12 | return [ |
13 | { | 13 | { |
14 | width: '60', | 14 | width: '60', |
... | @@ -97,8 +97,8 @@ class data extends filter { | ... | @@ -97,8 +97,8 @@ class data extends filter { |
97 | render: (h, scope) => { | 97 | render: (h, scope) => { |
98 | return ( | 98 | return ( |
99 | <div> | 99 | <div> |
100 | <el-button type='text' disabled={scope.$index == 0} onClick={() => { vm.moveUpward(scope.$index, scope.row,'djqx') }}>上移</el-button> | 100 | <el-button type='text' disabled={scope.$index == 0} onClick={() => { vm.moveUpward(scope.$index, scope.row, 'djqx') }}>上移</el-button> |
101 | <el-button type='text' disabled={(scope.$index + 1) == vm.form.djqx.length} onClick={() => { vm.moveDown(scope.$index, scope.row,'djqx') }}>下移</el-button > | 101 | <el-button type='text' disabled={(scope.$index + 1) == vm.form.djqx.length} onClick={() => { vm.moveDown(scope.$index, scope.row, 'djqx') }}>下移</el-button > |
102 | </div> | 102 | </div> |
103 | ) | 103 | ) |
104 | } | 104 | } |
... | @@ -106,7 +106,7 @@ class data extends filter { | ... | @@ -106,7 +106,7 @@ class data extends filter { |
106 | ] | 106 | ] |
107 | } | 107 | } |
108 | 108 | ||
109 | clxxCol(){ | 109 | clxxCol () { |
110 | return [ | 110 | return [ |
111 | { | 111 | { |
112 | width: '60', | 112 | width: '60', |
... | @@ -126,12 +126,15 @@ class data extends filter { | ... | @@ -126,12 +126,15 @@ class data extends filter { |
126 | }, | 126 | }, |
127 | { | 127 | { |
128 | label: '是否必填', | 128 | label: '是否必填', |
129 | width: '100', | 129 | prop: 'isrequired', |
130 | width: '110', | ||
130 | render: (h, scope) => { | 131 | render: (h, scope) => { |
131 | return ( | 132 | return ( |
132 | <el-radio-group v-model={scope.row.isrequired} onChange={(val) => { scope.row[scope.column.property] = val }}> | 133 | <el-radio-group value={scope.row[scope.column.property]} onInput={(val) => { |
133 | <el-radio label={'1'}>是</el-radio> | 134 | scope.row[scope.column.property] = val |
135 | }}> | ||
134 | <el-radio label={'0'}>否</el-radio> | 136 | <el-radio label={'0'}>否</el-radio> |
137 | <el-radio label={'1'}>是</el-radio> | ||
135 | </el-radio-group> | 138 | </el-radio-group> |
136 | ) | 139 | ) |
137 | } | 140 | } |
... | @@ -213,8 +216,8 @@ class data extends filter { | ... | @@ -213,8 +216,8 @@ class data extends filter { |
213 | render: (h, scope) => { | 216 | render: (h, scope) => { |
214 | return ( | 217 | return ( |
215 | <div> | 218 | <div> |
216 | <el-button type='text' disabled={scope.$index == 0} onClick={() => { vm.moveUpward(scope.$index, scope.row,'clxx') }}>上移</el-button> | 219 | <el-button type='text' disabled={scope.$index == 0} onClick={() => { vm.moveUpward(scope.$index, scope.row, 'clxx') }}>上移</el-button> |
217 | <el-button type='text' disabled={(scope.$index + 1) == vm.form.clxx.length} onClick={() => { vm.moveDown(scope.$index, scope.row,'clxx') }}>下移</el-button > | 220 | <el-button type='text' disabled={(scope.$index + 1) == vm.form.clxx.length} onClick={() => { vm.moveDown(scope.$index, scope.row, 'clxx') }}>下移</el-button > |
218 | </div> | 221 | </div> |
219 | ) | 222 | ) |
220 | } | 223 | } | ... | ... |
1 | <template> | 1 | <template> |
2 | <el-dialog | 2 | <el-dialog :title="sqqlRule.nodename" custom-class="dialogBox contentCenter" width="80%" top="0" |
3 | :title="sqqlRule.nodename" | 3 | :visible.sync="dialogVisible" :before-close="cancelDialog"> |
4 | custom-class="dialogBox contentCenter" | ||
5 | width="80%" | ||
6 | top="0" | ||
7 | :visible.sync="dialogVisible" | ||
8 | :before-close="cancelDialog" | ||
9 | > | ||
10 | <ul class="edit-title-list" v-if="djlxList.length > 0"> | 4 | <ul class="edit-title-list" v-if="djlxList.length > 0"> |
11 | <li | 5 | <li v-for="(item, index) in djlxList" @click="handleTitleSelct(item, index)" :key="index" |
12 | v-for="(item, index) in djlxList" | 6 | :class="{ active: index == tn }"> |
13 | @click="handleTitleSelct(item, index)" | ||
14 | :key="index" | ||
15 | :class="{ active: index == tn }" | ||
16 | > | ||
17 | {{ item.nodename }} | 7 | {{ item.nodename }} |
18 | </li> | 8 | </li> |
19 | </ul> | 9 | </ul> |
... | @@ -22,18 +12,8 @@ | ... | @@ -22,18 +12,8 @@ |
22 | <el-row> | 12 | <el-row> |
23 | <el-col :span="8"> | 13 | <el-col :span="8"> |
24 | <el-form-item label="申请分类"> | 14 | <el-form-item label="申请分类"> |
25 | <el-select | 15 | <el-select v-model="form.ywDetail.sqfl" disabled placeholder="请选择" class="width100"> |
26 | v-model="form.ywDetail.sqfl" | 16 | <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"> |
27 | disabled | ||
28 | placeholder="请选择" | ||
29 | class="width100" | ||
30 | > | ||
31 | <el-option | ||
32 | v-for="item in options" | ||
33 | :key="item.value" | ||
34 | :label="item.label" | ||
35 | :value="item.value" | ||
36 | > | ||
37 | </el-option> | 17 | </el-option> |
38 | </el-select> | 18 | </el-select> |
39 | </el-form-item> | 19 | </el-form-item> |
... | @@ -52,18 +32,8 @@ | ... | @@ -52,18 +32,8 @@ |
52 | <el-row> | 32 | <el-row> |
53 | <el-col :span="8"> | 33 | <el-col :span="8"> |
54 | <el-form-item label="发起业务单元类型"> | 34 | <el-form-item label="发起业务单元类型"> |
55 | <el-select | 35 | <el-select v-model="form.ywDetail.fqywdylx" disabled placeholder="请选择" class="width100"> |
56 | v-model="form.ywDetail.fqywdylx" | 36 | <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"> |
57 | disabled | ||
58 | placeholder="请选择" | ||
59 | class="width100" | ||
60 | > | ||
61 | <el-option | ||
62 | v-for="item in options" | ||
63 | :key="item.value" | ||
64 | :label="item.label" | ||
65 | :value="item.value" | ||
66 | > | ||
67 | </el-option> | 37 | </el-option> |
68 | </el-select> | 38 | </el-select> |
69 | </el-form-item> | 39 | </el-form-item> |
... | @@ -94,42 +64,20 @@ | ... | @@ -94,42 +64,20 @@ |
94 | </el-col> | 64 | </el-col> |
95 | <el-col :span="8"> | 65 | <el-col :span="8"> |
96 | <el-form-item label="登记情形及材料"> | 66 | <el-form-item label="登记情形及材料"> |
97 | <el-input | 67 | <el-input v-model="form.ywDetail.djqxcl" placeholder="仅支持execl文件导入"></el-input> |
98 | v-model="form.ywDetail.djqxcl" | ||
99 | placeholder="仅支持execl文件导入" | ||
100 | ></el-input> | ||
101 | </el-form-item> | 68 | </el-form-item> |
102 | </el-col> | 69 | </el-col> |
103 | <el-col :span="1"> | 70 | <el-col :span="1"> |
104 | <el-upload | 71 | <el-upload ref="upload" :action="imgUploadUrl" :limit="1" accept=".xls, .xlsx" :show-file-list="false" |
105 | ref="upload" | 72 | :disabled="requested" :file-list="fileList" :before-upload="uploadRecord" :on-success="handleSuccess"> |
106 | :action="imgUploadUrl" | 73 | <el-button type="primary" icon="el-icon-upload" :loading="requested">上传材料</el-button> |
107 | :limit="1" | ||
108 | accept=".xls, .xlsx" | ||
109 | :show-file-list="false" | ||
110 | :disabled="requested" | ||
111 | :file-list="fileList" | ||
112 | :before-upload="uploadRecord" | ||
113 | :on-success="handleSuccess" | ||
114 | > | ||
115 | <el-button | ||
116 | type="primary" | ||
117 | icon="el-icon-upload" | ||
118 | :loading="requested" | ||
119 | >上传材料</el-button | ||
120 | > | ||
121 | </el-upload> | 74 | </el-upload> |
122 | </el-col> | 75 | </el-col> |
123 | </el-row> | 76 | </el-row> |
124 | <el-row> | 77 | <el-row> |
125 | <el-col :span="24"> | 78 | <el-col :span="24"> |
126 | <el-form-item label="登记原因模板" prop="djyy"> | 79 | <el-form-item label="登记原因模板" prop="djyy"> |
127 | <el-input | 80 | <el-input type="textarea" :rows="4" placeholder="请输入内容" v-model="form.ywDetail.djyy"> |
128 | type="textarea" | ||
129 | :rows="4" | ||
130 | placeholder="请输入内容" | ||
131 | v-model="form.ywDetail.djyy" | ||
132 | > | ||
133 | </el-input> | 81 | </el-input> |
134 | </el-form-item> | 82 | </el-form-item> |
135 | </el-col> | 83 | </el-col> |
... | @@ -137,35 +85,18 @@ | ... | @@ -137,35 +85,18 @@ |
137 | </el-form> | 85 | </el-form> |
138 | <el-collapse accordion> | 86 | <el-collapse accordion> |
139 | <el-collapse-item title="登记情形设置" name="1"> | 87 | <el-collapse-item title="登记情形设置" name="1"> |
140 | <lb-table | 88 | <lb-table :column="djqxCol" border :pagination="false" heightNumSetting :data="form.djqx"> |
141 | :column="djqxCol" | ||
142 | border | ||
143 | :pagination="false" | ||
144 | heightNumSetting | ||
145 | :data="form.djqx" | ||
146 | > | ||
147 | </lb-table> | 89 | </lb-table> |
148 | </el-collapse-item> | 90 | </el-collapse-item> |
149 | <el-collapse-item title="材料信息设置" name="2"> | 91 | <el-collapse-item title="材料信息设置" name="2"> |
150 | <lb-table | 92 | <lb-table :column="clxxCol" border heightNumSetting :pagination="false" :data="form.clxx"> |
151 | :column="clxxCol" | ||
152 | border | ||
153 | heightNumSetting | ||
154 | :pagination="false" | ||
155 | :data="form.clxx" | ||
156 | > | ||
157 | </lb-table> | 93 | </lb-table> |
158 | </el-collapse-item> | 94 | </el-collapse-item> |
159 | <el-collapse-item | 95 | <el-collapse-item title="刷选权利设置" name="3" v-if="form.ywDetail.sfsxql == '1'"> |
160 | title="刷选权利设置" | ||
161 | name="3" | ||
162 | v-if="form.ywDetail.sfsxql == '1'" | ||
163 | > | ||
164 | <div class="dyztsd-title"> | 96 | <div class="dyztsd-title"> |
165 | <b>请勾选需要查询的权利信息</b> | 97 | <b>请勾选需要查询的权利信息</b> |
166 | <div> | 98 | <div> |
167 | <el-button type="text" @click="handleSelectall" | 99 | <el-button type="text" @click="handleSelectall">选择全部 |
168 | >选择全部 | ||
169 | </el-button> | 100 | </el-button> |
170 | <el-button type="text" @click="handleInvert">清除全部</el-button> | 101 | <el-button type="text" @click="handleInvert">清除全部</el-button> |
171 | </div> | 102 | </div> |
... | @@ -224,7 +155,7 @@ export default { | ... | @@ -224,7 +155,7 @@ export default { |
224 | }, | 155 | }, |
225 | components: {}, | 156 | components: {}, |
226 | name: "componentDialog", | 157 | name: "componentDialog", |
227 | data() { | 158 | data () { |
228 | return { | 159 | return { |
229 | tn: 0, | 160 | tn: 0, |
230 | n: 0, | 161 | n: 0, |
... | @@ -239,12 +170,12 @@ export default { | ... | @@ -239,12 +170,12 @@ export default { |
239 | computed: { | 170 | computed: { |
240 | ...mapGetters(["dictData"]), | 171 | ...mapGetters(["dictData"]), |
241 | }, | 172 | }, |
242 | mounted() { | 173 | mounted () { |
243 | sendThis(this); | 174 | sendThis(this); |
244 | }, | 175 | }, |
245 | methods: { | 176 | methods: { |
246 | //页面初始化 | 177 | //页面初始化 |
247 | init() { | 178 | init () { |
248 | this.tn = 0; | 179 | this.tn = 0; |
249 | getDjlxInfo(this.sqqlRule.bsmSqyw).then((res) => { | 180 | getDjlxInfo(this.sqqlRule.bsmSqyw).then((res) => { |
250 | let { result } = res; | 181 | let { result } = res; |
... | @@ -258,13 +189,13 @@ export default { | ... | @@ -258,13 +189,13 @@ export default { |
258 | //} | 189 | //} |
259 | }, | 190 | }, |
260 | //tab选项卡事件 | 191 | //tab选项卡事件 |
261 | handleTitleSelct(obj, index) { | 192 | handleTitleSelct (obj, index) { |
262 | this.n = 0; | 193 | this.n = 0; |
263 | this.tn = index; | 194 | this.tn = index; |
264 | this.getDetail(this.djlxList[index].bsmSqyw); | 195 | this.getDetail(this.djlxList[index].bsmSqyw); |
265 | }, | 196 | }, |
266 | //获取业务具体明细内容 | 197 | //获取业务具体明细内容 |
267 | getDetail(bsmSqyw) { | 198 | getDetail (bsmSqyw) { |
268 | getSqdjywDetail(bsmSqyw).then((res) => { | 199 | getSqdjywDetail(bsmSqyw).then((res) => { |
269 | if (res.code === 200) { | 200 | if (res.code === 200) { |
270 | this.form = res.result; | 201 | this.form = res.result; |
... | @@ -274,7 +205,7 @@ export default { | ... | @@ -274,7 +205,7 @@ export default { |
274 | }); | 205 | }); |
275 | }, | 206 | }, |
276 | //提交保存数据 | 207 | //提交保存数据 |
277 | submit() { | 208 | submit () { |
278 | let that = this; | 209 | let that = this; |
279 | saveSqdjyw(this.form).then((res) => { | 210 | saveSqdjyw(this.form).then((res) => { |
280 | if (res.code == 200) { | 211 | if (res.code == 200) { |
... | @@ -287,22 +218,22 @@ export default { | ... | @@ -287,22 +218,22 @@ export default { |
287 | }); | 218 | }); |
288 | }, | 219 | }, |
289 | //修改父组件传过来的值 | 220 | //修改父组件传过来的值 |
290 | cancelDialog() { | 221 | cancelDialog () { |
291 | this.$emit("update:dialogVisible", false); | 222 | this.$emit("update:dialogVisible", false); |
292 | }, | 223 | }, |
293 | // 上移下移 | 224 | // 上移下移 |
294 | moveUpward (index, row,type) { | 225 | moveUpward (index, row, type) { |
295 | if(type=="clxx"){ | 226 | if (type == "clxx") { |
296 | upward(index, this.form.clxx) | 227 | upward(index, this.form.clxx) |
297 | }else{ | 228 | } else { |
298 | upward(index, this.form.djqx) | 229 | upward(index, this.form.djqx) |
299 | } | 230 | } |
300 | 231 | ||
301 | }, | 232 | }, |
302 | moveDown (index, row,type) { | 233 | moveDown (index, row, type) { |
303 | if(type=="clxx"){ | 234 | if (type == "clxx") { |
304 | down(index, this.form.clxx) | 235 | down(index, this.form.clxx) |
305 | }else{ | 236 | } else { |
306 | down(index, this.form.djqx) | 237 | down(index, this.form.djqx) |
307 | } | 238 | } |
308 | }, | 239 | }, | ... | ... |
... | @@ -6,6 +6,8 @@ | ... | @@ -6,6 +6,8 @@ |
6 | </div> | 6 | </div> |
7 | <div class="invalid-reson">终止原因:</div> | 7 | <div class="invalid-reson">终止原因:</div> |
8 | <el-input v-model="stopMessage" placeholder="请输入终止原因" type="textarea" :rows="4"></el-input> | 8 | <el-input v-model="stopMessage" placeholder="请输入终止原因" type="textarea" :rows="4"></el-input> |
9 | <el-button style="float:right">取消</el-button> | ||
10 | <el-button type="primary" @click="onSubmit" style="float:right">退件</el-button> | ||
9 | </div> | 11 | </div> |
10 | </template> | 12 | </template> |
11 | 13 | ||
... | @@ -24,7 +26,7 @@ export default { | ... | @@ -24,7 +26,7 @@ export default { |
24 | } | 26 | } |
25 | }, | 27 | }, |
26 | methods: { | 28 | methods: { |
27 | childFn () { | 29 | onSubmit () { |
28 | stopTask({ | 30 | stopTask({ |
29 | bsmSlsq: this.formData.bsmSlsq, | 31 | bsmSlsq: this.formData.bsmSlsq, |
30 | bestepid: this.formData.bestepid, | 32 | bestepid: this.formData.bestepid, |
... | @@ -32,8 +34,7 @@ export default { | ... | @@ -32,8 +34,7 @@ export default { |
32 | }).then(res => { | 34 | }).then(res => { |
33 | this.$message.success('终止成功') | 35 | this.$message.success('终止成功') |
34 | setTimeout(() => { | 36 | setTimeout(() => { |
35 | window.opener = null; | 37 | window.opener.location.reload(); //刷新父窗口 |
36 | window.open("about:blank", "_self"); | ||
37 | window.close(); | 38 | window.close(); |
38 | this.$emit('input', false) | 39 | this.$emit('input', false) |
39 | }, 1000); | 40 | }, 1000); | ... | ... |
... | @@ -15,6 +15,10 @@ | ... | @@ -15,6 +15,10 @@ |
15 | <el-form-item label="退回意见:"> | 15 | <el-form-item label="退回意见:"> |
16 | <el-input class="textArea" type="textarea" v-model="outstepopinion"></el-input> | 16 | <el-input class="textArea" type="textarea" v-model="outstepopinion"></el-input> |
17 | </el-form-item> | 17 | </el-form-item> |
18 | <el-form-item> | ||
19 | <el-button style="float:right">取消</el-button> | ||
20 | <el-button type="primary" @click="onSubmit" style="float:right">退回</el-button> | ||
21 | </el-form-item> | ||
18 | </el-form> | 22 | </el-form> |
19 | </div> | 23 | </div> |
20 | </div> | 24 | </div> |
... | @@ -41,7 +45,7 @@ export default { | ... | @@ -41,7 +45,7 @@ export default { |
41 | this.getBackNode(); | 45 | this.getBackNode(); |
42 | }, | 46 | }, |
43 | methods: { | 47 | methods: { |
44 | childFn () { | 48 | onSubmit () { |
45 | this.selectItem.outstepopinion = this.outstepopinion; | 49 | this.selectItem.outstepopinion = this.outstepopinion; |
46 | sendBackTask({ | 50 | sendBackTask({ |
47 | bsmSlsq: this.formData.bsmSlsq, | 51 | bsmSlsq: this.formData.bsmSlsq, |
... | @@ -49,8 +53,7 @@ export default { | ... | @@ -49,8 +53,7 @@ export default { |
49 | }).then(res => { | 53 | }).then(res => { |
50 | this.$message.success('退回成功') | 54 | this.$message.success('退回成功') |
51 | setTimeout(() => { | 55 | setTimeout(() => { |
52 | window.opener = null; | 56 | window.opener.location.reload(); //刷新父窗口 |
53 | window.open("about:blank", "_self"); | ||
54 | window.close(); | 57 | window.close(); |
55 | this.$emit('input', false) | 58 | this.$emit('input', false) |
56 | }, 1000); | 59 | }, 1000); | ... | ... |
... | @@ -138,7 +138,7 @@ export default { | ... | @@ -138,7 +138,7 @@ export default { |
138 | popupDialog("退回", "workflow/components/th", { | 138 | popupDialog("退回", "workflow/components/th", { |
139 | bsmSlsq: this.bsmSlsq, | 139 | bsmSlsq: this.bsmSlsq, |
140 | bestepid: this.bestepid | 140 | bestepid: this.bestepid |
141 | }, '30%', "200px", true) | 141 | }, '800px') |
142 | break; | 142 | break; |
143 | case "transfer": //转件按钮 | 143 | case "transfer": //转件按钮 |
144 | getNextLinkInfo({ | 144 | getNextLinkInfo({ |
... | @@ -158,7 +158,7 @@ export default { | ... | @@ -158,7 +158,7 @@ export default { |
158 | popupDialog("终止", "workflow/components/stop", { | 158 | popupDialog("终止", "workflow/components/stop", { |
159 | bsmSlsq: this.bsmSlsq, | 159 | bsmSlsq: this.bsmSlsq, |
160 | bestepid: this.bestepid, | 160 | bestepid: this.bestepid, |
161 | }, '30%', "330px", true) | 161 | }, '600px') |
162 | break; | 162 | break; |
163 | case "signout": | 163 | case "signout": |
164 | window.close(); | 164 | window.close(); | ... | ... |
... | @@ -20,7 +20,15 @@ export default { | ... | @@ -20,7 +20,15 @@ export default { |
20 | }, | 20 | }, |
21 | //切换选项卡内容组件 | 21 | //切换选项卡内容组件 |
22 | getFromRouter (tabname) { | 22 | getFromRouter (tabname) { |
23 | console.log(tabname); | 23 | //根据tabname获取选中的表单 |
24 | for(let item of this.tabList){ | ||
25 | if(item.value === tabname){ | ||
26 | this.currentSelectTab = item | ||
27 | break; | ||
28 | } | ||
29 | } | ||
30 | console.log(this.currentSelectTab); | ||
31 | |||
24 | this.componentTag = getForm(tabname, this.$route.query.sqywbm); | 32 | this.componentTag = getForm(tabname, this.$route.query.sqywbm); |
25 | } | 33 | } |
26 | } | 34 | } | ... | ... |
... | @@ -100,6 +100,8 @@ export default { | ... | @@ -100,6 +100,8 @@ export default { |
100 | bestepid: this.$route.query.bestepid, | 100 | bestepid: this.$route.query.bestepid, |
101 | //设置那个表单选中 | 101 | //设置那个表单选中 |
102 | tabName: "", | 102 | tabName: "", |
103 | //设置那个表单选择 | ||
104 | currentSelectTab: {}, | ||
103 | //表单集合 | 105 | //表单集合 |
104 | tabList: [], | 106 | tabList: [], |
105 | //选择加载哪一个组件 | 107 | //选择加载哪一个组件 | ... | ... |
... | @@ -74,6 +74,7 @@ import table from "@/utils/mixin/table" | ... | @@ -74,6 +74,7 @@ import table from "@/utils/mixin/table" |
74 | import searchMin from "../components/mixin/index" | 74 | import searchMin from "../components/mixin/index" |
75 | import { datas, sendThis } from "./dbxdata" | 75 | import { datas, sendThis } from "./dbxdata" |
76 | import { searchTaskToDo, deleteFlow, claimTask } from "@/api/ywbl" | 76 | import { searchTaskToDo, deleteFlow, claimTask } from "@/api/ywbl" |
77 | import { judgeUserTaskPermission } from "@/api/fqsq" | ||
77 | export default { | 78 | export default { |
78 | name: "dbx", | 79 | name: "dbx", |
79 | components: { searchBox }, | 80 | components: { searchBox }, |
... | @@ -169,11 +170,29 @@ export default { | ... | @@ -169,11 +170,29 @@ export default { |
169 | }) | 170 | }) |
170 | }, | 171 | }, |
171 | ywhClick (item) { | 172 | ywhClick (item) { |
173 | //判断用户是否拥有该任务的权限,若有则跳转,无权限则给予提示并刷新页面 | ||
174 | judgeUserTaskPermission({ | ||
175 | bsmSlsq: item.bsmSlsq, | ||
176 | bestepid: item.bestepid | ||
177 | }).then(res => { | ||
178 | if(res.code == 200){ | ||
179 | if(res.result){ | ||
180 | //有任务权限 | ||
172 | // const { href } = this.$router.resolve('/workFrame?bsmSlsq=' + item.bsmSlsq + '&bestepid=' + item.bestepid + '&bsmBusiness=' + '&sqywbm=' + item.djywbm); | 181 | // const { href } = this.$router.resolve('/workFrame?bsmSlsq=' + item.bsmSlsq + '&bestepid=' + item.bestepid + '&bsmBusiness=' + '&sqywbm=' + item.djywbm); |
173 | const { href } = this.$router.resolve('/workFramecs?bsmSlsq=' + item.bsmSlsq + '&bestepid=' + item.bestepid + '&bsmBusiness=' + '&sqywbm=' + item.djywbm); | 182 | const { href } = this.$router.resolve('/workFramecs?bsmSlsq=' + item.bsmSlsq + '&bestepid=' + item.bestepid + '&bsmBusiness=' + '&sqywbm=' + item.djywbm); |
174 | window.open(href, '_blank'); | 183 | window.open(href, '_blank'); |
175 | //从待办箱进入的调取任务领取接口 | 184 | //从待办箱进入的调取任务领取接口 |
176 | claimTask(item.bsmSlsq, item.bestepid) | 185 | claimTask(item.bsmSlsq, item.bestepid) |
186 | }else{ | ||
187 | //无任务权限 | ||
188 | this.$message.error("无该任务操作权限,或已被他人抢办,请重新操作") | ||
189 | //刷新页面 | ||
190 | this.queryClick(); | ||
191 | } | ||
192 | }else{ | ||
193 | this.$message.error("用户任务权限判断失败,请联系管理员") | ||
194 | } | ||
195 | }) | ||
177 | } | 196 | } |
178 | } | 197 | } |
179 | } | 198 | } | ... | ... |
... | @@ -213,7 +213,7 @@ | ... | @@ -213,7 +213,7 @@ |
213 | 抵押人信息 | 213 | 抵押人信息 |
214 | <div class="triangle"></div> | 214 | <div class="triangle"></div> |
215 | </div> | 215 | </div> |
216 | <InformationTable :tableData="ruleForm.ywrList" @upDateQlrxxList="upDateYwrxxList" | 216 | <qlrCommonTable :tableData="ruleForm.ywrList" @upDateQlrxxList="upDateYwrxxList" |
217 | :viewtype="$route.query.viewtype" /> | 217 | :viewtype="$route.query.viewtype" /> |
218 | 218 | ||
219 | <div class="slxx_title title-block"> | 219 | <div class="slxx_title title-block"> | ... | ... |
... | @@ -165,7 +165,7 @@ | ... | @@ -165,7 +165,7 @@ |
165 | <el-row :gutter="10"> | 165 | <el-row :gutter="10"> |
166 | <el-col> | 166 | <el-col> |
167 | <el-form-item :class="flag ? 'marginBot0' : ''" label="附记:" prop="fj"> | 167 | <el-form-item :class="flag ? 'marginBot0' : ''" label="附记:" prop="fj"> |
168 | <el-input type="textarea" v-model="ruleForm.nydsyq.fj" :disabled="$route.query.viewtype == 1"></el-input> | 168 | <el-input type="textarea" v-model="ruleForm.nydsyq.fj" :disabled="$route.query.viewtype"></el-input> |
169 | </el-form-item> | 169 | </el-form-item> |
170 | </el-col> | 170 | </el-col> |
171 | </el-row> | 171 | </el-row> |
... | @@ -176,7 +176,7 @@ | ... | @@ -176,7 +176,7 @@ |
176 | <el-row :gutter="10"> | 176 | <el-row :gutter="10"> |
177 | <el-col :span="14"> | 177 | <el-col :span="14"> |
178 | <el-form-item :class="flag ? 'marginBot0' : ''" label="共有方式:"> | 178 | <el-form-item :class="flag ? 'marginBot0' : ''" label="共有方式:"> |
179 | <el-radio-group :disabled="$route.query.viewtype == 1" v-model="ruleForm.slywxx.gyfs"> | 179 | <el-radio-group v-model="ruleForm.slywxx.gyfs" :disabled="$route.query.viewtype"> |
180 | <el-radio label="0">单独所有</el-radio> | 180 | <el-radio label="0">单独所有</el-radio> |
181 | <el-radio label="1">共同共有</el-radio> | 181 | <el-radio label="1">共同共有</el-radio> |
182 | <el-radio label="2">按份所有</el-radio> | 182 | <el-radio label="2">按份所有</el-radio> |
... | @@ -216,14 +216,14 @@ | ... | @@ -216,14 +216,14 @@ |
216 | <el-row :gutter="10"> | 216 | <el-row :gutter="10"> |
217 | <el-col> | 217 | <el-col> |
218 | <el-form-item :class="flag ? 'marginBot0' : ''" label="登记原因:" prop="djyy"> | 218 | <el-form-item :class="flag ? 'marginBot0' : ''" label="登记原因:" prop="djyy"> |
219 | <el-input class="textArea" type="textarea" :disabled="$route.query.viewtype == 1" | 219 | <el-input class="textArea" type="textarea" :disabled="$route.query.viewtype" |
220 | v-model="ruleForm.nydsyq.djyy"> | 220 | v-model="ruleForm.nydsyq.djyy"> |
221 | </el-input> | 221 | </el-input> |
222 | </el-form-item> | 222 | </el-form-item> |
223 | </el-col> | 223 | </el-col> |
224 | </el-row> | 224 | </el-row> |
225 | </div> | 225 | </div> |
226 | <el-row class="btn" v-if="!$route.query.viewtype"> | 226 | <el-row class="btn" v-if="!$route.query.viewtype && ableOperation"> |
227 | <el-form-item :class="flag ? 'marginBot0' : ''"> | 227 | <el-form-item :class="flag ? 'marginBot0' : ''"> |
228 | <el-button type="primary" @click="onSubmit">保存</el-button> | 228 | <el-button type="primary" @click="onSubmit">保存</el-button> |
229 | </el-form-item> | 229 | </el-form-item> |
... | @@ -238,6 +238,7 @@ import qlrCommonTable from "@/views/workflow/components/qlrCommonTable" | ... | @@ -238,6 +238,7 @@ import qlrCommonTable from "@/views/workflow/components/qlrCommonTable" |
238 | import JtcyTable from "@/views/workflow/components/JtcyTable" | 238 | import JtcyTable from "@/views/workflow/components/JtcyTable" |
239 | export default { | 239 | export default { |
240 | created () { | 240 | created () { |
241 | this.ableOperation = this.$parent.currentSelectTab.ableOperation | ||
241 | this.propsParam = this.$attrs; | 242 | this.propsParam = this.$attrs; |
242 | var formdata = new FormData(); | 243 | var formdata = new FormData(); |
243 | formdata.append("bsmSldy", this.propsParam.bsmSldy); | 244 | formdata.append("bsmSldy", this.propsParam.bsmSldy); |
... | @@ -261,10 +262,13 @@ export default { | ... | @@ -261,10 +262,13 @@ export default { |
261 | data () { | 262 | data () { |
262 | return { | 263 | return { |
263 | disabled: true, | 264 | disabled: true, |
265 | //持证人选项 | ||
264 | czrOptions: [], | 266 | czrOptions: [], |
265 | ruleForm: {}, | 267 | ruleForm: {}, |
266 | //传递参数 | 268 | //传递参数 |
267 | propsParam: {}, | 269 | propsParam: {}, |
270 | //表单是否可操作 | ||
271 | ableOperation: true, | ||
268 | rules: {} | 272 | rules: {} |
269 | } | 273 | } |
270 | }, | 274 | }, | ... | ... |
-
Please register or sign in to post a comment