Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
b04473a6 by jiaozeping@pashanhoo.com
Options

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

2 parents 3327a73c d9c7bff7
Inline Side-by-side
Showing 10 changed files with 174 additions and 106 deletions
...@@ -41,7 +41,7 @@ export function selectBdcdy (data) { ...@@ -41,7 +41,7 @@ export function selectBdcdy (data) {
41 // 待办箱列表查询接口 41 // 待办箱列表查询接口
42 export function searchTaskToDo (data) { 42 export function searchTaskToDo (data) {
43 return request({ 43 return request({
44 url: '/business/todoBox/searchTaskToDo', 44 url: '/workBox/search/searchTaskToDo',
45 method: 'post', 45 method: 'post',
46 data 46 data
47 }) 47 })
......
...@@ -57,7 +57,7 @@ export function getDetail(qlbsm) { ...@@ -57,7 +57,7 @@ export function getDetail(qlbsm) {
57 // 进度查询列表 57 // 进度查询列表
58 export function getJdcxBysearch (data) { 58 export function getJdcxBysearch (data) {
59 return request({ 59 return request({
60 url: 'zhcx/jdcx/getJdcxBysearch', 60 url: '/zhcx/search/getJdcxBysearch',
61 method: 'post', 61 method: 'post',
62 data 62 data
63 }) 63 })
......
...@@ -6,12 +6,12 @@ ...@@ -6,12 +6,12 @@
6 <el-row :gutter="20"> 6 <el-row :gutter="20">
7 <el-col :span="6"> 7 <el-col :span="6">
8 <el-form-item label="字典类型编码"> 8 <el-form-item label="字典类型编码">
9 {{ ruleForm.dcode }} 9 {{ ruleForm.dcode }}
10 </el-form-item> 10 </el-form-item>
11 </el-col> 11 </el-col>
12 <el-col :span="6"> 12 <el-col :span="6">
13 <el-form-item label="字典类型名称"> 13 <el-form-item label="字典类型名称">
14 {{ ruleForm.dname }} 14 {{ ruleForm.dname }}
15 </el-form-item> 15 </el-form-item>
16 </el-col> 16 </el-col>
17 </el-row> 17 </el-row>
...@@ -103,7 +103,7 @@ export default { ...@@ -103,7 +103,7 @@ export default {
103 label: '是否禁用', 103 label: '是否禁用',
104 render: (h, scope) => { 104 render: (h, scope) => {
105 return ( 105 return (
106 <el-radio-group v-model={scope.row.isenable}> 106 <el-radio-group disabled={this.details.isenable == 2} v-model={scope.row.isenable}>
107 <el-radio label="1">启用</el-radio> 107 <el-radio label="1">启用</el-radio>
108 <el-radio label="0">禁用</el-radio> 108 <el-radio label="0">禁用</el-radio>
109 </el-radio-group> 109 </el-radio-group>
...@@ -181,7 +181,7 @@ export default { ...@@ -181,7 +181,7 @@ export default {
181 handler: function (newValue) { 181 handler: function (newValue) {
182 this.tableData = judgeSort(_.cloneDeep(newValue.dataList)) 182 this.tableData = judgeSort(_.cloneDeep(newValue.dataList))
183 if (newValue.isenable == 2) { 183 if (newValue.isenable == 2) {
184 this.column = this.columns.slice(0, 3) 184 this.column = this.columns.slice(0, 6)
185 } else { 185 } else {
186 this.column = this.columns 186 this.column = this.columns
187 } 187 }
......
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
2 功能：登记情形设定 2 功能：登记情形设定
3 --> 3 -->
4 <template> 4 <template>
5 <div class='该组件名称'> 5 <div>
6 <el-form :model="ruleForm" :rules="rules"> 6 <el-form :model="ruleForm">
7 <el-row> 7 <el-row>
8 <el-col :span="5"> 8 <el-col :span="5">
9 <el-form-item label="登记业务编码"> 9 <el-form-item label="登记业务编码">
...@@ -23,34 +23,25 @@ ...@@ -23,34 +23,25 @@
23 </div> 23 </div>
24 </template> 24 </template>
25 <script> 25 <script>
26 import { upward, down } from '@/utils/operation' 26 import { mapGetters } from 'vuex'
27 import { judgeSort, realMove, findParents } from '@/utils/operation'
27 export default { 28 export default {
28 props: { 29 props: {
29 ruleForm: { 30 ruleForm: {
30 type: Object, default: {} 31 type: Object, default: {}
32 },
33 subData: {
34 type: Object, default: () => {
35 return {}
36 }
31 } 37 }
32 }, 38 },
39 computed: {
40 ...mapGetters(['dictData'])
41 },
33 data () { 42 data () {
34 return { 43 return {
35 key: 0, 44 key: 0,
36 cllxOptions: [
37 {
38 name: '买卖',
39 value: '1'
40 },
41 {
42 name: '买卖继承',
43 value: '2'
44 }
45 ],
46 rules: {
47 djywbm: [
48 { required: true, message: '登记业务编码', trigger: 'blur' },
49 ],
50 djywmc: [
51 { required: true, message: '登记业务名称', trigger: 'blur' },
52 ],
53 },
54 column: [ 45 column: [
55 { 46 {
56 width: '60', 47 width: '60',
...@@ -69,23 +60,14 @@ export default { ...@@ -69,23 +60,14 @@ export default {
69 type: 'index' 60 type: 'index'
70 }, 61 },
71 { 62 {
72 prop: 'sfbx', 63 label: '是否必填',
73 label: '是否必须', 64 width: '100',
74 width: '80',
75 render: (h, scope) => {
76 return (
77 <el-input value={scope.row[scope.column.property]}
78 onInput={(val) => { scope.row[scope.column.property] = val }}></el-input>
79 )
80 }
81 },
82 {
83 prop: 'djqx',
84 label: '登记情形',
85 render: (h, scope) => { 65 render: (h, scope) => {
86 return ( 66 return (
87 <el-input placeholder="登记情形" value={scope.row[scope.column.property]} 67 <el-radio-group v-model={scope.row.isrequired} onChange={(val) => { scope.row[scope.column.property] = val }}>
88 onInput={(val) => { scope.row[scope.column.property] = val }}></el-input> 68 <el-radio label={'1'}>是</el-radio>
69 <el-radio label={'0'}>否</el-radio>
70 </el-radio-group>
89 ) 71 )
90 } 72 }
91 }, 73 },
...@@ -115,11 +97,42 @@ export default { ...@@ -115,11 +97,42 @@ export default {
115 render: (h, scope) => { 97 render: (h, scope) => {
116 return ( 98 return (
117 <el-select value={scope.row[scope.column.property]} 99 <el-select value={scope.row[scope.column.property]}
118 onChange={(val) => { scope.row[scope.column.property] = val }}> 100 onChange={(val) => { scope.row[scope.column.property] = val }} clearable>
101 {
102 this.dictData['A40'].map(option => {
103 return (
104 <el-option label={option.dname} value={option.dcode}></el-option>
105 )
106 })
107 }
108 </el-select>
109 )
110 }
111 },
112 {
113 label: '是否公共材料',
114 width: '100',
115 render: (h, scope) => {
116 return (
117 <el-radio-group v-model={scope.row.sfggcl} onChange={(val) => { scope.row[scope.column.property] = val; this.handleSelectGgcl(scope.row) }}>
118 <el-radio label={'1'}>是</el-radio>
119 <el-radio label={'0'}>否</el-radio>
120 </el-radio-group>
121 )
122 }
123 },
124 {
125 prop: 'djqxbm',
126 label: '登记情形',
127 width: '180',
128 render: (h, scope) => {
129 return (
130 <el-select disabled={scope.row.sfggcl == '1'} value={scope.row[scope.column.property]}
131 onChange={(val) => { scope.row[scope.column.property] = val }} clearable>
119 { 132 {
120 this.cllxOptions.map(option => { 133 this.subData['djqx'].map(option => {
121 return ( 134 return (
122 <el-option label={option.name} value={option.value}></el-option> 135 <el-option label={option.nodename} value={option.nodecode}></el-option>
123 ) 136 )
124 }) 137 })
125 } 138 }
...@@ -133,22 +146,14 @@ export default { ...@@ -133,22 +146,14 @@ export default {
133 render: (h, scope) => { 146 render: (h, scope) => {
134 return ( 147 return (
135 <div> 148 <div>
136 <i class="el-icon-top pointer move" disabled={scope.$index == 0} onClick={() => { this.moveUpward(scope.$index, scope.row) }}></i> 149 <el-button type='text' disabled={scope.row.isTop} onClick={() => { this.moveUpward(scope.$index, scope.row) }}>上移</el-button>
137 <i class="el-icon-bottom pointer move" disabled={(scope.$index + 1) == this.tableData.length} onClick={() => { this.moveDown(scope.$index, scope.row) }}></i> 150 <el-button type='text' disabled={scope.row.isBottom} onClick={() => { this.moveDown(scope.$index, scope.row) }}>下移</el-button >
138 </div> 151 </div>
139 ) 152 )
140 } 153 }
141 } 154 }
142 ], 155 ],
143 tableData: [ 156 tableData: []
144 {
145 sfbx: '',
146 djqx: '',
147 clbm: '',
148 clmc: '',
149 cllx: ''
150 }
151 ]
152 } 157 }
153 }, 158 },
154 watch: { 159 watch: {
...@@ -157,33 +162,49 @@ export default { ...@@ -157,33 +162,49 @@ export default {
157 this.$emit('updateValue', newValue) 162 this.$emit('updateValue', newValue)
158 }, 163 },
159 deep: true 164 deep: true
160 } 165 },
166 subData: {
167 handler: function (newValue) {
168 this.tableData = judgeSort(newValue.clxx)
169 },
170 deep: true
171 },
161 }, 172 },
162 methods: { 173 methods: {
163 handleAdd () { 174 handleAdd () {
164 this.tableData.push( 175 this.tableData.push(
165 { 176 {
166 sfbx: '', 177 isrequired: '1',
167 djqx: '', 178 djqxbm: '',
168 clbm: '', 179 clbm: '',
169 clmc: '', 180 clmc: '',
170 cllx: '' 181 cllx: '',
182 sfggcl: '1'
171 } 183 }
172 ) 184 )
173 this.key++ 185 this.key++
174 }, 186 },
187 handleSelectGgcl (item) {
188 if (item.sfggcl == '1') {
189 item.djqxbm = ''
190 }
191 },
175 handleMinus (index, row) { 192 handleMinus (index, row) {
176 this.tableData.splice(index, 1) 193 this.tableData.splice(index, 1)
177 }, 194 },
178 // 上移下移 195 // 上移下移
179 moveUpward (index, row) { 196 moveUpward (index, row) {
180 upward(index, this.tableData) 197 realMove(row.bsmClxx, 'UP', this.tableData)
181 this.key++ 198 this.key++
199 let id = findParents(this.tableData, row.bsmClxx)
200 this.keyList = id
182 }, 201 },
183 moveDown (index, row) { 202 moveDown (index, row) {
184 down(index, this.tableData) 203 realMove(row.bsmClxx, 'DOWN', this.tableData)
185 this.key++ 204 this.key++
186 }, 205 let id = findParents(this.tableData, row.bsmClxx)
206 this.keyList = id
207 }
187 } 208 }
188 } 209 }
189 </script> 210 </script>
......
...@@ -2,17 +2,17 @@ ...@@ -2,17 +2,17 @@
2 功能：登记情形设定 2 功能：登记情形设定
3 --> 3 -->
4 <template> 4 <template>
5 <div class='该组件名称'> 5 <div class='djqxsd'>
6 <el-form :model="ruleForm"> 6 <el-form :model="ruleForm">
7 <el-row> 7 <el-row>
8 <el-col :span="5"> 8 <el-col :span="5">
9 <el-form-item label="登记业务编码"> 9 <el-form-item label="登记业务编码">
10 {{ ruleForm.djywbm }} 10 {{ ruleForm.djywbm }}
11 </el-form-item> 11 </el-form-item>
12 </el-col> 12 </el-col>
13 <el-col :span="12"> 13 <el-col :span="12">
14 <el-form-item label="登记业务名称"> 14 <el-form-item label="登记业务名称">
15 {{ ruleForm.djywmc }} 15 {{ ruleForm.djywmc }}
16 </el-form-item> 16 </el-form-item>
17 </el-col> 17 </el-col>
18 </el-row> 18 </el-row>
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
23 </div> 23 </div>
24 </template> 24 </template>
25 <script> 25 <script>
26 import { upward, down } from '@/utils/operation' 26 import { judgeSort, realMove, findParents } from '@/utils/operation'
27 export default { 27 export default {
28 props: { 28 props: {
29 djqxList: { 29 djqxList: {
...@@ -67,12 +67,12 @@ export default { ...@@ -67,12 +67,12 @@ export default {
67 }, 67 },
68 { 68 {
69 prop: 'nodecode', 69 prop: 'nodecode',
70 width: '100', 70 width: '105',
71 label: '登记情形编码', 71 label: '登记情形编码',
72 render: (h, scope) => { 72 render: (h, scope) => {
73 return ( 73 return (
74 <el-input placeholder="登记情形编码" disabled={scope.row.sftsdjqx == '1'} value={scope.row[scope.column.property]} 74 <el-input placeholder="登记情形编码" class={{ repeat: scope.row.repeat }} disabled={scope.row.sftsdjqx == '1'} value={scope.row[scope.column.property]}
75 onInput={(val) => { scope.row[scope.column.property] = val }}></el-input> 75 onInput={(val) => { scope.row[scope.column.property] = val }} onBlur={() => { this.nodecodeBlur(scope.$index, scope.row) }} maxlength="8"></el-input>
76 ) 76 )
77 } 77 }
78 }, 78 },
...@@ -122,12 +122,12 @@ export default { ...@@ -122,12 +122,12 @@ export default {
122 }, 122 },
123 { 123 {
124 label: '移动', 124 label: '移动',
125 width: '80', 125 width: '100',
126 render: (h, scope) => { 126 render: (h, scope) => {
127 return ( 127 return (
128 <div> 128 <div>
129 <i class="el-icon-top pointer move" disabled={scope.$index == 0} onClick={() => { this.moveUpward(scope.$index, scope.row) }}></i> 129 <el-button type='text' disabled={scope.row.isTop} onClick={() => { this.moveUpward(scope.$index, scope.row) }}>上移</el-button>
130 <i class="el-icon-bottom pointer move" disabled={(scope.$index + 1) == this.tableData.length} onClick={() => { this.moveDown(scope.$index, scope.row) }}></i> 130 <el-button type='text' disabled={scope.row.isBottom} onClick={() => { this.moveDown(scope.$index, scope.row) }}>下移</el-button >
131 </div> 131 </div>
132 ) 132 )
133 } 133 }
...@@ -139,7 +139,7 @@ export default { ...@@ -139,7 +139,7 @@ export default {
139 watch: { 139 watch: {
140 djqxList: { 140 djqxList: {
141 handler: function (newValue) { 141 handler: function (newValue) {
142 this.tableData = newValue 142 this.tableData = judgeSort(newValue)
143 }, 143 },
144 deep: true, 144 deep: true,
145 immediate: true 145 immediate: true
...@@ -153,13 +153,22 @@ export default { ...@@ -153,13 +153,22 @@ export default {
153 }, 153 },
154 methods: { 154 methods: {
155 handleAdd () { 155 handleAdd () {
156 let code = this.tableData.slice(-1)[0].nodecode
157 let codeQ = code.slice(0, 6)
158 let len = ''
159 if (this.tableData.length + 1 < 9) {
160 len = 0 + String(this.tableData.length + 1)
161 } else {
162 len = this.tableData.length + 1
163 }
164
156 this.tableData.push( 165 this.tableData.push(
157 { 166 {
158 nodecode: '', 167 nodecode: codeQ + len,
159 nodename: '', 168 nodename: '',
160 enabled: '1', 169 enabled: '1',
161 djyy: '', 170 djyy: '',
162 sfqydjyymb: '1' 171 sfqydjyymb: '0'
163 } 172 }
164 ) 173 )
165 this.key++ 174 this.key++
...@@ -167,20 +176,38 @@ export default { ...@@ -167,20 +176,38 @@ export default {
167 handleMinus (index, row) { 176 handleMinus (index, row) {
168 this.tableData.splice(index, 1) 177 this.tableData.splice(index, 1)
169 }, 178 },
179 nodecodeBlur (index, row) {
180 let list = _.cloneDeep(this.tableData).filter(item => item.bsmSqyw != row.bsmSqyw)
181 let arr = list.map(item => item.nodecode)
182 if (arr.includes(row.nodecode)) {
183 this.$set(row, 'repeat', true)
184 this.$message.error('登记情形编码不能重复');
185 } else {
186 this.$set(row, 'repeat', false)
187 }
188 },
170 // 上移下移 189 // 上移下移
171 moveUpward (index, row) { 190 moveUpward (index, row) {
172 upward(index, this.tableData) 191 realMove(row.bsmDict, 'UP', this.tableData)
173 this.key++ 192 this.key++
193 let id = findParents(this.tableData, row.bsmDict)
194 this.keyList = id
174 }, 195 },
175 moveDown (index, row) { 196 moveDown (index, row) {
176 down(index, this.tableData) 197 realMove(row.bsmDict, 'DOWN', this.tableData)
177 this.key++ 198 this.key++
178 }, 199 let id = findParents(this.tableData, row.bsmDict)
200 this.keyList = id
201 }
179 } 202 }
180 } 203 }
181 </script> 204 </script>
182 <style scoped lang='scss'> 205 <style lang='scss'>
183 /deep/.el-radio { 206 .djqxsd {
184 margin-right: 5px; 207 .repeat {
208 .el-input__inner {
209 border-color: red !important;
210 }
211 }
185 } 212 }
186 </style> 213 </style>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -3,14 +3,14 @@ ...@@ -3,14 +3,14 @@
3 <ul class="edit-title-list" v-if="titleList.length > 0"> 3 <ul class="edit-title-list" v-if="titleList.length > 0">
4 <li v-for="(item, index) in titleList" @click="handleTitleSelct(item, index)" :key="index" 4 <li v-for="(item, index) in titleList" @click="handleTitleSelct(item, index)" :key="index"
5 :class="{ active: index == tn }">{{ 5 :class="{ active: index == tn }">{{
6 item.nodename 6 item.nodename
7 }}</li> 7 }}</li>
8 </ul> 8 </ul>
9 <div class="sqywgz-edit"> 9 <div class="sqywgz-edit">
10 <ul class="sqywgz-edit-left"> 10 <ul class="sqywgz-edit-left">
11 <li v-for="(item, index) in leftList" :key="index" :class="{ active: index == n }" @click="hanldeItem(index)">{{ 11 <li v-for="(item, index) in leftList" :key="index" :class="{ active: index == n }" @click="hanldeItem(index)">{{
12 item.name 12 item.name
13 }}</li> 13 }}</li>
14 </ul> 14 </ul>
15 <div class="sqywgz-edit-right"> 15 <div class="sqywgz-edit-right">
16 <el-form :model="ruleForm" v-show="n == 0" :rules="rules" label-width="135px" ref="ruleForm"> 16 <el-form :model="ruleForm" v-show="n == 0" :rules="rules" label-width="135px" ref="ruleForm">
...@@ -114,7 +114,7 @@ ...@@ -114,7 +114,7 @@
114 </el-row> 114 </el-row>
115 </el-form> 115 </el-form>
116 <djqxsd v-show="n == 1" :djqxList="subData.djqx" :ruleForm="ruleForm" @updateValue="getDjqxValue" /> 116 <djqxsd v-show="n == 1" :djqxList="subData.djqx" :ruleForm="ruleForm" @updateValue="getDjqxValue" />
117 <clgzsd v-show="n == 2" :ruleForm="ruleForm" @updateValue="getClValue" /> 117 <clgzsd v-show="n == 2" :ruleForm="ruleForm" :subData="subData" @updateValue="getClValue" />
118 <dyztsd :ruleForm="ruleForm" :subData="subData" v-show="n == 3" @updateValue="getDyztsdValue" /> 118 <dyztsd :ruleForm="ruleForm" :subData="subData" v-show="n == 3" @updateValue="getDyztsdValue" />
119 </div> 119 </div>
120 </div> 120 </div>
...@@ -231,7 +231,7 @@ export default { ...@@ -231,7 +231,7 @@ export default {
231 this.subData.djqx = val 231 this.subData.djqx = val
232 }, 232 },
233 getClValue (val) { 233 getClValue (val) {
234 console.log(val); 234 this.subData.clxx = val
235 }, 235 },
236 // 单元状态设定 236 // 单元状态设定
237 getDyztsdValue (val) { 237 getDyztsdValue (val) {
...@@ -293,6 +293,14 @@ export default { ...@@ -293,6 +293,14 @@ export default {
293 <style scoped lang="scss"> 293 <style scoped lang="scss">
294 @import "~@/styles/mixin.scss"; 294 @import "~@/styles/mixin.scss";
295 295
296 /deep/.el-radio {
297 margin-right: 8px;
298 }
299
300 /deep/.el-radio__label {
301 padding-left: 2px;
302 }
303
296 .active { 304 .active {
297 background: $light-blue !important; 305 background: $light-blue !important;
298 color: #fff; 306 color: #fff;
......
...@@ -16,7 +16,7 @@ class data extends filter { ...@@ -16,7 +16,7 @@ class data extends filter {
16 width: '50' 16 width: '50'
17 }, 17 },
18 { 18 {
19 prop: "ywly", 19 prop: "ywlymc",
20 label: "业务来源", 20 label: "业务来源",
21 }, 21 },
22 { 22 {
...@@ -26,7 +26,7 @@ class data extends filter { ...@@ -26,7 +26,7 @@ class data extends filter {
26 case '1': 26 case '1':
27 return <span>进行中</span> 27 return <span>进行中</span>
28 case '2': 28 case '2':
29 return <span>进行中</span> 29 return <span>已结束</span>
30 case '3': 30 case '3':
31 return <span>进行中</span> 31 return <span>进行中</span>
32 } 32 }
......
...@@ -5,12 +5,12 @@ ...@@ -5,12 +5,12 @@
5 <!-- 表单部分 --> 5 <!-- 表单部分 -->
6 <div class="from-clues-header"> 6 <div class="from-clues-header">
7 <el-form ref="queryForm" label-width="120px"> 7 <el-form ref="queryForm" label-width="120px">
8 <div v-for='(item,index) in tableData' :key='item.bdcdyid'> 8 <div>
9 <el-form-item label="不动产单元号:"> 9 <!-- <el-form-item label="不动产单元号:">
10 <p>{{item.bdcdyh}}</p> 10 <p>{{item.bdcdyh}}</p>
11 </el-form-item> 11 </el-form-item> -->
12 <lb-table :column="columns" border :heightNum="390" :pagination="false" heightNumSetting 12 <lb-table :column="columns" border :heightNum="390" :pagination="false" heightNumSetting
13 :data="item.nodeList"> 13 :data="tableData">
14 </lb-table> 14 </lb-table>
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>
...@@ -29,7 +29,9 @@ export default { ...@@ -29,7 +29,9 @@ export default {
29 }, 29 },
30 props: { 30 props: {
31 value: { type: Boolean, default: false }, 31 value: { type: Boolean, default: false },
32 queryForm:{type:Object} 32 queryForm:{type:Object},
33 taskId:{type:String},
34 bsmBusiness:{type:String}
33 }, 35 },
34 data () { 36 data () {
35 const columns=[ 37 const columns=[
...@@ -56,11 +58,11 @@ export default { ...@@ -56,11 +58,11 @@ export default {
56 }, 58 },
57 }, 59 },
58 { 60 {
59 prop: "fromstepname", 61 prop: "activityName",
60 label: "退回环节名称", 62 label: "退回环节名称",
61 }, 63 },
62 { 64 {
63 prop: "username", 65 prop: "assignee",
64 label: "办理人", 66 label: "办理人",
65 }, 67 },
66 68
...@@ -75,6 +77,8 @@ export default { ...@@ -75,6 +77,8 @@ export default {
75 bsmSlsq:"", 77 bsmSlsq:"",
76 backNodeList:[], 78 backNodeList:[],
77 }, 79 },
80 sumbitList:{},
81 taskid:"",
78 } 82 }
79 }, 83 },
80 mounted(){ 84 mounted(){
...@@ -84,7 +88,7 @@ export default { ...@@ -84,7 +88,7 @@ export default {
84 }, 88 },
85 methods: { 89 methods: {
86 tablelistFn(){ 90 tablelistFn(){
87 getTaskBackNode(this.queryForm).then(res => { 91 getTaskBackNode({taskId:this.taskId}).then(res => {
88 if (res.code === 200) { 92 if (res.code === 200) {
89 this.tableData = res.result 93 this.tableData = res.result
90 } 94 }
...@@ -92,21 +96,22 @@ export default { ...@@ -92,21 +96,22 @@ export default {
92 }, 96 },
93 radioClick(scope){ 97 radioClick(scope){
94 this.taskid = scope.taskid 98 this.taskid = scope.taskid
95 99 this.sumbitList = scope
100
96 }, 101 },
97 submitForm () { 102 submitForm () {
98 if(this.taskid==undefined){ 103 if(this.taskid==undefined){
99 this.$message.error('请至少选择一条数据'); 104 this.$message.error('请至少选择一条数据');
100 return 105 return
101 } 106 }
102 this.list.backNodeList = this.tableData.map((item,index)=>{ 107 this.list.backNodeList.push({
103 return { 108 id:this.taskId,
104 id:item.id,
105 taskid:this.taskid, 109 taskid:this.taskid,
106 processInstanceId:item.processInstanceId, 110 processInstanceId:this.sumbitList.processInstanceId,
111 bsmBusiness:this.bsmBusiness,
107 outstepopinion:this.outstepopinion 112 outstepopinion:this.outstepopinion
108 } 113 })
109 }) 114 console.log(this.list,44)
110 sendBackTask(this.list).then(res => { 115 sendBackTask(this.list).then(res => {
111 console.log(res,11) 116 console.log(res,11)
112 if (res.code === 200) { 117 if (res.code === 200) {
...@@ -114,6 +119,8 @@ export default { ...@@ -114,6 +119,8 @@ export default {
114 window.open("about:blank", "_self"); 119 window.open("about:blank", "_self");
115 window.close(); 120 window.close();
116 this.$emit('input', false) 121 this.$emit('input', false)
122 }else{
123 this.$message.error(res.message)
117 } 124 }
118 }) 125 })
119 }, 126 },
......
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
50 </div> 50 </div>
51 </div> 51 </div>
52 <zc v-model="zcDialog" :queryForm='queryForm' /> 52 <zc v-model="zcDialog" :queryForm='queryForm' />
53 <thDialog ref='thdialogRef' v-model="thflag" :queryForm='queryForm' /> 53 <thDialog ref='thdialogRef' v-model="thflag" :taskId='taskId' :bsmBusiness='bsmBusiness' :queryForm='queryForm' />
54 </div> 54 </div>
55 </template> 55 </template>
56 <script> 56 <script>
...@@ -139,6 +139,7 @@ export default { ...@@ -139,6 +139,7 @@ export default {
139 editItem: '', 139 editItem: '',
140 issplitScreen: false, 140 issplitScreen: false,
141 unitData: [], 141 unitData: [],
142 taskId:"",
142 }; 143 };
143 }, 144 },
144 watch: { 145 watch: {
...@@ -173,12 +174,16 @@ export default { ...@@ -173,12 +174,16 @@ export default {
173 this.unitData = res.result 174 this.unitData = res.result
174 setTimeout(() => { 175 setTimeout(() => {
175 that.$refs.slxx[0].list(that.unitData[0].bsmSldy) 176 that.$refs.slxx[0].list(that.unitData[0].bsmSldy)
177 this.taskId = that.unitData[0].taskId
178 this.bsmBusiness = that.unitData[0].bsmBusiness
176 }, 300); 179 }, 300);
177 } 180 }
178 }) 181 })
179 }, 182 },
180 // 左侧列表点击调用接口 183 // 左侧列表点击调用接口
181 unitClick (item) { 184 unitClick (item) {
185 this.taskId = item.taskId
186 this.bsmBusiness = item.bsmBusiness
182 this.$nextTick(() => { 187 this.$nextTick(() => {
183 this.$refs.slxx[0].list(item.bsmSldy) 188 this.$refs.slxx[0].list(item.bsmSldy)
184 }) 189 })
......
...@@ -26,7 +26,7 @@ class data extends filter { ...@@ -26,7 +26,7 @@ class data extends filter {
26 case '1': 26 case '1':
27 return <span>进行中</span> 27 return <span>进行中</span>
28 case '2': 28 case '2':
29 return <span>进行中</span> 29 return <span>已结束</span>
30 case '3': 30 case '3':
31 return <span>进行中</span> 31 return <span>进行中</span>
32 } 32 }
......