Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
a6a815fd by tianhaohao@pashanhoo.com
Options

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

2 parents 50ff4b6e 692e4005
Inline Side-by-side
Showing 32 changed files with 179 additions and 79 deletions
1 // 封装axios请求
2 import axios from "axios";
3 // 创建axios的对象
4 const instance = axios.create({
5 baseURL: "http://192.168.2.235/management/rest/users",
6 })
7
8
9
10 export const getusername = (data) => instance({
11
12 url: '', // 请求地址
13 method: 'get',
14 params:{
15 queryOptions: {
16 conditionGroup: {
17 conditions: [
18 {
19 property: "loginName",
20 value:data,
21 operator: "IN",
22 },
23 ],
24 queryRelation: "AND",
25 },
26 orderBys:[{"property":"sort","direction":"desc"}]
27 },
28 },
29
30 })
1 <!-- 1 <!--
2 * @Description: workFrame左侧菜单列表-普通 2 * @Description: workFrame左侧菜单列表-普通
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-05-24 16:02:39 4 * @LastEditTime: 2023-05-25 10:42:50
5 --> 5 -->
6 <template> 6 <template>
7 <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }"> 7 <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }">
...@@ -72,9 +72,9 @@ ...@@ -72,9 +72,9 @@
72 watch: { 72 watch: {
73 isRefresh: { 73 isRefresh: {
74 handler (newVal, oldVal) { 74 handler (newVal, oldVal) {
75 console.log(newVal, 'newVal');
76 if (newVal) this.loadBdcdylist() 75 if (newVal) this.loadBdcdylist()
77 } 76 },
77 immediate: true
78 } 78 }
79 }, 79 },
80 methods: { 80 methods: {
......
1 <!-- 1 <!--
2 * @Description: workFrame左侧菜单列表-分割 2 * @Description: workFrame左侧菜单列表-分割
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-05-24 15:48:34 4 * @LastEditTime: 2023-05-25 10:18:02
5 --> 5 -->
6 <template> 6 <template>
7 <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }"> 7 <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }">
...@@ -90,7 +90,8 @@ ...@@ -90,7 +90,8 @@
90 isRefresh: { 90 isRefresh: {
91 handler (newVal, oldVal) { 91 handler (newVal, oldVal) {
92 if (newVal) this.loadBdcdylist() 92 if (newVal) this.loadBdcdylist()
93 } 93 },
94 immediate: true
94 } 95 }
95 }, 96 },
96 methods: { 97 methods: {
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-05-17 10:41:15 4 * @LastEditTime: 2023-05-17 10:41:15
5 --> 5 -->
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
64 </template> 64 </template>
65 </el-table-column> 65 </el-table-column>
66 <el-table-column label="环节名称" prop="taskName" minWidth="100" align="center" /> 66 <el-table-column label="环节名称" prop="taskName" minWidth="100" align="center" />
67 <el-table-column label="办理人" prop="assigneeName" minWidth="120" align="center" /> 67 <el-table-column label="办理人" prop="agent" minWidth="120" align="center" />
68 <el-table-column label="处理时间" prop="createTime" width="160" align="center" /> 68 <el-table-column label="处理时间" prop="createTime" width="160" align="center" />
69 <el-table-column label="办结时间" prop="finishTime" width="160" align="center" /> 69 <el-table-column label="办结时间" prop="finishTime" width="160" align="center" />
70 <el-table-column label="操作方式" align="center"> 70 <el-table-column label="操作方式" align="center">
...@@ -76,6 +76,7 @@ ...@@ -76,6 +76,7 @@
76 <script> 76 <script>
77 import '@/styles/package/theme/index.scss' 77 import '@/styles/package/theme/index.scss'
78 import BpmnViewer from 'bpmn-js/lib/Viewer' 78 import BpmnViewer from 'bpmn-js/lib/Viewer'
79 import { getusername } from "@/api/getusername.js";
79 import MoveCanvasModule from 'diagram-js/lib/navigation/movecanvas' 80 import MoveCanvasModule from 'diagram-js/lib/navigation/movecanvas'
80 export default { 81 export default {
81 props: { 82 props: {
...@@ -96,6 +97,7 @@ ...@@ -96,6 +97,7 @@
96 // 当前任务id 97 // 当前任务id
97 selectTaskId: undefined, 98 selectTaskId: undefined,
98 // 任务节点审批记录 99 // 任务节点审批记录
100 taskList:[],
99 taskCommentList: [], 101 taskCommentList: [],
100 // 已完成任务悬浮延迟Timer 102 // 已完成任务悬浮延迟Timer
101 hoverTimer: null, 103 hoverTimer: null,
...@@ -105,9 +107,13 @@ ...@@ -105,9 +107,13 @@
105 } 107 }
106 }, 108 },
107 created () { 109 created () {
110
108 this.$nextTick(() => { 111 this.$nextTick(() => {
112 // 获取流程记录
113 this.getCommentList()
114 this.setProcessStatus(this.formData.finishedInfo);
109 this.importXML(this.formData.xml) 115 this.importXML(this.formData.xml)
110 this.setProcessStatus(this.formData.finishedInfo); 116
111 }) 117 })
112 }, 118 },
113 destroyed () { 119 destroyed () {
...@@ -170,20 +176,20 @@ ...@@ -170,20 +176,20 @@
170 this.selectValue = element.id 176 this.selectValue = element.id
171 this.dlgTitle = element.businessObject ? element.businessObject.name : undefined 177 this.dlgTitle = element.businessObject ? element.businessObject.name : undefined
172 // 计算当前悬浮任务审批记录，如果记录为空不显示弹窗 178 // 计算当前悬浮任务审批记录，如果记录为空不显示弹窗
173 this.taskCommentList = (this.formData.allCommentList || []).filter(item => { 179 this.taskCommentList = (this.taskList || []).filter(item => {
174 return item.taskDefKey === this.selectTaskId 180 return item.taskDefKey === this.selectTaskId
175 }) 181 })
176 if (this.selectTaskId.length > 3) { 182 if (this.selectTaskId.length > 3) {
177 this.taskCommentList = this.formData.allCommentList; 183 this.taskCommentList = this.taskList;
178 } 184 }
179 }, 185 },
180 // 下拉列表切换 186 // 下拉列表切换
181 handleSelect (val) { 187 handleSelect (val) {
182 this.taskCommentList = (this.formData.allCommentList || []).filter(item => { 188 this.taskCommentList = (this.taskList || []).filter(item => {
183 return item.taskDefKey === val 189 return item.taskDefKey === val
184 }) 190 })
185 if (val.length > 3) { 191 if (val.length > 3) {
186 this.taskCommentList = this.formData.allCommentList; 192 this.taskCommentList = this.taskList;
187 } 193 }
188 }, 194 },
189 // 显示流程图 195 // 显示流程图
...@@ -230,9 +236,39 @@ ...@@ -230,9 +236,39 @@
230 } 236 }
231 } 237 }
232 }, 238 },
239 // 获取流程记录
240 getCommentList() {
241 this.formData.allCommentList.forEach(async (item,index) => {
242 var arr=item.assigneeName.split(",");
243 // 获取用户名
244 let res = await getusername(arr)
245 if(res){
246 let str=""
247 res.data.content.forEach((el,i) => {
248 if(str==""){
249 str=el.name;
250 }else{
251 str += ","+el.name;
252
253 }
254 this.formData.allCommentList[index].agent=str
255 })
256 }
257
258 })
259 setTimeout(() => {
260 this.taskList =this.formData.allCommentList;
261 // 处理数据之后赋值
262 this.taskCommentList=this.taskList
263 }, 100)
264 // this.$nextTick(() => {
265 // this.taskList =this.formData.allCommentList;
266 // this.taskCommentList=this.taskList
267 // })
268 },
269
233 // 设置流程图元素状态 270 // 设置流程图元素状态
234 setProcessStatus (processNodeInfo) { 271 setProcessStatus (processNodeInfo) {
235 this.taskCommentList = this.formData.allCommentList;
236 this.processNodeInfo = processNodeInfo 272 this.processNodeInfo = processNodeInfo
237 if (this.isLoading || this.processNodeInfo == null || this.bpmnViewer == null) return 273 if (this.isLoading || this.processNodeInfo == null || this.bpmnViewer == null) return
238 const { finishedTaskSet, rejectedTaskSet, unfinishedTaskSet, finishedSequenceFlowSet } = this.processNodeInfo 274 const { finishedTaskSet, rejectedTaskSet, unfinishedTaskSet, finishedSequenceFlowSet } = this.processNodeInfo
...@@ -268,6 +304,7 @@ ...@@ -268,6 +304,7 @@
268 } 304 }
269 }) 305 })
270 } 306 }
307
271 } 308 }
272 } 309 }
273 } 310 }
......
...@@ -35,17 +35,6 @@ export default { ...@@ -35,17 +35,6 @@ export default {
35 slsq: {} 35 slsq: {}
36 } 36 }
37 }, 37 },
38 computed: {
39 ...mapGetters(['isRefresh'])
40 },
41 watch: {
42 isRefresh: {
43 handler (newVal, oldVal) {
44 if (newVal) this.loadBdcdylist()
45 },
46 immediate: true
47 }
48 },
49 mounted () { 38 mounted () {
50 this.flowInitParam(); 39 this.flowInitParam();
51 }, 40 },
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-05-24 17:11:21 4 * @LastEditTime: 2023-05-25 08:51:13
5 --> 5 -->
6 <template> 6 <template>
7 <!-- 受理信息 --> 7 <!-- 受理信息 -->
...@@ -238,7 +238,7 @@ ...@@ -238,7 +238,7 @@
238 </el-row> 238 </el-row>
239 239
240 </div> 240 </div>
241 <el-row class="btn" v-if="!$route.query.viewtype && propsParam.issave=='0'"> 241 <el-row class="btn" v-if="!$route.query.viewtype && ableOperation">
242 <el-form-item> 242 <el-form-item>
243 <el-button type="primary" @click="onSubmitClick()">保存</el-button> 243 <el-button type="primary" @click="onSubmitClick()">保存</el-button>
244 </el-form-item> 244 </el-form-item>
...@@ -252,6 +252,7 @@ ...@@ -252,6 +252,7 @@
252 import { mapGetters } from "vuex"; 252 import { mapGetters } from "vuex";
253 export default { 253 export default {
254 mounted () { 254 mounted () {
255 this.ableOperation = this.$parent.currentSelectTab.ableOperation
255 this.propsParam = this.$attrs; 256 this.propsParam = this.$attrs;
256 var formdata = new FormData(); 257 var formdata = new FormData();
257 this.$startLoading(); 258 this.$startLoading();
...@@ -272,6 +273,8 @@ ...@@ -272,6 +273,8 @@
272 }, 273 },
273 data () { 274 data () {
274 return { 275 return {
276 //表单是否可操作
277 ableOperation: true,
275 disabled: true, 278 disabled: true,
276 czrOptions: [], 279 czrOptions: [],
277 ruleForm: { 280 ruleForm: {
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-05-24 17:12:40 4 * @LastEditTime: 2023-05-25 08:56:17
5 --> 5 -->
6 <template> 6 <template>
7 <!-- 受理信息 --> 7 <!-- 受理信息 -->
...@@ -234,7 +234,7 @@ ...@@ -234,7 +234,7 @@
234 </el-row> 234 </el-row>
235 235
236 </div> 236 </div>
237 <el-row class="btn" v-if="!$route.query.viewtype && propsParam.issave=='0'"> 237 <el-row class="btn" v-if="!$route.query.viewtype && ableOperation">
238 <el-form-item> 238 <el-form-item>
239 <el-button type="primary" @click="onSubmitClick()">保存</el-button> 239 <el-button type="primary" @click="onSubmitClick()">保存</el-button>
240 </el-form-item> 240 </el-form-item>
...@@ -248,6 +248,7 @@ ...@@ -248,6 +248,7 @@
248 import { mapGetters } from "vuex"; 248 import { mapGetters } from "vuex";
249 export default { 249 export default {
250 mounted () { 250 mounted () {
251 this.ableOperation = this.$parent.currentSelectTab.ableOperation
251 this.propsParam = this.$attrs; 252 this.propsParam = this.$attrs;
252 var formdata = new FormData(); 253 var formdata = new FormData();
253 this.$startLoading(); 254 this.$startLoading();
...@@ -268,6 +269,8 @@ ...@@ -268,6 +269,8 @@
268 }, 269 },
269 data () { 270 data () {
270 return { 271 return {
272 //表单是否可操作
273 ableOperation: true,
271 disabled: true, 274 disabled: true,
272 czrOptions: [], 275 czrOptions: [],
273 ruleForm: { 276 ruleForm: {
......
1 <!-- 1 <!--
2 * @Description: 受理信息 2 * @Description: 受理信息
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-05-24 17:07:59 4 * @LastEditTime: 2023-05-25 08:41:40
5 --> 5 -->
6 <template> 6 <template>
7 <div class="slxx"> 7 <div class="slxx">
...@@ -197,7 +197,7 @@ ...@@ -197,7 +197,7 @@
197 </el-col> 197 </el-col>
198 </el-row> 198 </el-row>
199 </div> 199 </div>
200 <el-row class="btn" v-if="!$route.query.viewtype && propsParam.issave=='0'"> 200 <el-row class="btn" v-if="!$route.query.viewtype && ableOperation">
201 <el-form-item> 201 <el-form-item>
202 <el-button type="primary" @click="onSubmit">保存</el-button> 202 <el-button type="primary" @click="onSubmit">保存</el-button>
203 </el-form-item> 203 </el-form-item>
...@@ -211,6 +211,7 @@ ...@@ -211,6 +211,7 @@
211 import { mapGetters } from "vuex"; 211 import { mapGetters } from "vuex";
212 export default { 212 export default {
213 created () { 213 created () {
214 this.ableOperation = this.$parent.currentSelectTab.ableOperation
214 this.propsParam = this.$attrs; 215 this.propsParam = this.$attrs;
215 var formdata = new FormData(); 216 var formdata = new FormData();
216 formdata.append("bsmSldy", this.propsParam.bsmSldy); 217 formdata.append("bsmSldy", this.propsParam.bsmSldy);
...@@ -236,8 +237,10 @@ ...@@ -236,8 +237,10 @@
236 ruleForm: {}, 237 ruleForm: {},
237 //传递参数 238 //传递参数
238 propsParam: this.$attrs, 239 propsParam: this.$attrs,
239 rules: {}, 240 //表单是否可操作
240 }; 241 ableOperation: true,
242 rules: {}
243 }
241 }, 244 },
242 methods: { 245 methods: {
243 // 更新权利人信息 246 // 更新权利人信息
......
1 <!-- 1 <!--
2 * @Description: 受理信息 2 * @Description: 受理信息
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-05-24 17:08:05 4 * @LastEditTime: 2023-05-25 08:41:33
5 --> 5 -->
6 <template> 6 <template>
7 <div class="slxx"> 7 <div class="slxx">
...@@ -181,7 +181,7 @@ ...@@ -181,7 +181,7 @@
181 </el-col> 181 </el-col>
182 </el-row> 182 </el-row>
183 </div> 183 </div>
184 <el-row class="btn" v-if="!$route.query.viewtype && propsParam.issave=='0'"> 184 <el-row class="btn" v-if="!$route.query.viewtype && ableOperation">
185 <el-form-item> 185 <el-form-item>
186 <el-button type="primary" @click="onSubmit">保存</el-button> 186 <el-button type="primary" @click="onSubmit">保存</el-button>
187 </el-form-item> 187 </el-form-item>
...@@ -195,6 +195,7 @@ ...@@ -195,6 +195,7 @@
195 import { mapGetters } from "vuex"; 195 import { mapGetters } from "vuex";
196 export default { 196 export default {
197 async created () { 197 async created () {
198 this.ableOperation = this.$parent.currentSelectTab.ableOperation
198 this.propsParam = this.$attrs; 199 this.propsParam = this.$attrs;
199 var formdata = new FormData(); 200 var formdata = new FormData();
200 formdata.append("bsmSldy", this.propsParam.bsmSldy); 201 formdata.append("bsmSldy", this.propsParam.bsmSldy);
...@@ -216,6 +217,8 @@ ...@@ -216,6 +217,8 @@
216 }, 217 },
217 data () { 218 data () {
218 return { 219 return {
220 //表单是否可操作
221 ableOperation: true,
219 disabled: true, 222 disabled: true,
220 tdytOption: [], 223 tdytOption: [],
221 czrOptions: [], 224 czrOptions: [],
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-05-17 10:45:21 4 * @LastEditTime: 2023-05-25 08:58:04
5 --> 5 -->
6 <template> 6 <template>
7 <!-- 受理信息 --> 7 <!-- 受理信息 -->
...@@ -169,7 +169,7 @@ ...@@ -169,7 +169,7 @@
169 </el-col> 169 </el-col>
170 </el-row> 170 </el-row>
171 </div> 171 </div>
172 <el-row class="btn" v-if="!$route.query.viewtype"> 172 <el-row class="btn" v-if="!$route.query.viewtype && ableOperation">
173 <el-form-item> 173 <el-form-item>
174 <el-button type="primary" @click="onSubmit">保存</el-button> 174 <el-button type="primary" @click="onSubmit">保存</el-button>
175 </el-form-item> 175 </el-form-item>
...@@ -183,6 +183,7 @@ ...@@ -183,6 +183,7 @@
183 import { mapGetters } from "vuex"; 183 import { mapGetters } from "vuex";
184 export default { 184 export default {
185 async created () { 185 async created () {
186 this.ableOperation = this.$parent.currentSelectTab.ableOperation
186 this.propsParam = this.$attrs; 187 this.propsParam = this.$attrs;
187 var formdata = new FormData(); 188 var formdata = new FormData();
188 formdata.append("bsmSldy", this.propsParam.bsmSldy); 189 formdata.append("bsmSldy", this.propsParam.bsmSldy);
...@@ -203,6 +204,8 @@ ...@@ -203,6 +204,8 @@
203 }, 204 },
204 data () { 205 data () {
205 return { 206 return {
207 //表单是否可操作
208 ableOperation: true,
206 disabled: true, 209 disabled: true,
207 tdytOption: [], 210 tdytOption: [],
208 czrOptions: [], 211 czrOptions: [],
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-05-24 14:33:47 4 * @LastEditTime: 2023-05-25 08:59:02
5 --> 5 -->
6 <template> 6 <template>
7 <!-- 受理信息 --> 7 <!-- 受理信息 -->
...@@ -183,7 +183,7 @@ ...@@ -183,7 +183,7 @@
183 </el-col> 183 </el-col>
184 </el-row> 184 </el-row>
185 </div> 185 </div>
186 <el-row class="btn" v-if="!$route.query.viewtype && propsParam.issave=='0'"> 186 <el-row class="btn" v-if="!$route.query.viewtype && ableOperation">
187 <el-form-item> 187 <el-form-item>
188 <el-button type="primary" @click="onSubmit">保存</el-button> 188 <el-button type="primary" @click="onSubmit">保存</el-button>
189 </el-form-item> 189 </el-form-item>
...@@ -197,6 +197,7 @@ ...@@ -197,6 +197,7 @@
197 import qlrCommonTable from "@/views/workflow/components/qlrCommonTable" 197 import qlrCommonTable from "@/views/workflow/components/qlrCommonTable"
198 export default { 198 export default {
199 mounted () { 199 mounted () {
200 this.ableOperation = this.$parent.currentSelectTab.ableOperation
200 this.propsParam = this.$attrs; 201 this.propsParam = this.$attrs;
201 var formdata = new FormData(); 202 var formdata = new FormData();
202 let that = this 203 let that = this
...@@ -218,6 +219,8 @@ ...@@ -218,6 +219,8 @@
218 }, 219 },
219 data () { 220 data () {
220 return { 221 return {
222 //表单是否可操作
223 ableOperation: true,
221 key: 0, 224 key: 0,
222 isShow: false, 225 isShow: false,
223 disabled: true, 226 disabled: true,
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-05-24 15:09:45 4 * @LastEditTime: 2023-05-25 08:59:49
5 --> 5 -->
6 <template> 6 <template>
7 <!-- 受理信息 --> 7 <!-- 受理信息 -->
...@@ -178,7 +178,7 @@ ...@@ -178,7 +178,7 @@
178 </el-col> 178 </el-col>
179 </el-row> 179 </el-row>
180 </div> 180 </div>
181 <el-row class="btn" v-if="!$route.query.viewtype=='1' && propsParam.issave=='0'"> 181 <el-row class="btn" v-if="!$route.query.viewtype=='1' && ableOperation">
182 <el-form-item> 182 <el-form-item>
183 <el-button type="primary" @click="onSubmit">保存</el-button> 183 <el-button type="primary" @click="onSubmit">保存</el-button>
184 </el-form-item> 184 </el-form-item>
...@@ -192,6 +192,7 @@ ...@@ -192,6 +192,7 @@
192 import { Init, saveData } from "@/api/workflow/jsydsyqFlow.js"; 192 import { Init, saveData } from "@/api/workflow/jsydsyqFlow.js";
193 export default { 193 export default {
194 mounted () { 194 mounted () {
195 this.ableOperation = this.$parent.currentSelectTab.ableOperation
195 this.propsParam = this.$attrs; 196 this.propsParam = this.$attrs;
196 var formdata = new FormData(); 197 var formdata = new FormData();
197 this.$startLoading(); 198 this.$startLoading();
...@@ -210,6 +211,8 @@ ...@@ -210,6 +211,8 @@
210 }, 211 },
211 data () { 212 data () {
212 return { 213 return {
214 //表单是否可操作
215 ableOperation: true,
213 disabled: true, 216 disabled: true,
214 czrOptions: [], 217 czrOptions: [],
215 ruleForm: { 218 ruleForm: {
......
...@@ -223,7 +223,7 @@ ...@@ -223,7 +223,7 @@
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 && ableOperation && propsParam.issave=='0'"> 226 <el-row class="btn" v-if="!$route.query.viewtype && ableOperation">
227 <el-form-item> 227 <el-form-item>
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>
...@@ -258,9 +258,6 @@ ...@@ -258,9 +258,6 @@
258 computed: { 258 computed: {
259 ...mapGetters(["dictData", "flag"]) 259 ...mapGetters(["dictData", "flag"])
260 }, 260 },
261 watch: {
262
263 },
264 data () { 261 data () {
265 return { 262 return {
266 disabled: true, 263 disabled: true,
......
...@@ -229,7 +229,7 @@ ...@@ -229,7 +229,7 @@
229 </el-col> 229 </el-col>
230 </el-row> 230 </el-row>
231 </div> 231 </div>
232 <el-row class="btn" v-if="!$route.query.viewtype && propsParam.issave=='0'"> 232 <el-row class="btn" v-if="!$route.query.viewtype && ableOperation">
233 <el-form-item> 233 <el-form-item>
234 <el-button type="primary" @click="onSubmit">保存</el-button> 234 <el-button type="primary" @click="onSubmit">保存</el-button>
235 </el-form-item> 235 </el-form-item>
...@@ -244,6 +244,7 @@ ...@@ -244,6 +244,7 @@
244 import JtcyTable from "@/views/workflow/components/JtcyTable" 244 import JtcyTable from "@/views/workflow/components/JtcyTable"
245 export default { 245 export default {
246 mounted () { 246 mounted () {
247 this.ableOperation = this.$parent.currentSelectTab.ableOperation
247 this.propsParam = this.$attrs; 248 this.propsParam = this.$attrs;
248 var formdata = new FormData(); 249 var formdata = new FormData();
249 this.$startLoading(); 250 this.$startLoading();
...@@ -263,11 +264,10 @@ ...@@ -263,11 +264,10 @@
263 computed: { 264 computed: {
264 ...mapGetters(["dictData", "flag"]) 265 ...mapGetters(["dictData", "flag"])
265 }, 266 },
266 watch: {
267
268 },
269 data () { 267 data () {
270 return { 268 return {
269 //表单是否可操作
270 ableOperation: true,
271 disabled: true, 271 disabled: true,
272 czrOptions: [], 272 czrOptions: [],
273 ruleForm: {}, 273 ruleForm: {},
......
...@@ -164,7 +164,7 @@ ...@@ -164,7 +164,7 @@
164 </el-col> 164 </el-col>
165 </el-row> 165 </el-row>
166 </div> 166 </div>
167 <el-row class="btn" v-if="!$route.query.viewtype && propsParam.issave=='0'"> 167 <el-row class="btn" v-if="!$route.query.viewtype && ableOperation">
168 <el-form-item> 168 <el-form-item>
169 <el-button type="primary" @click="onSubmit">保存</el-button> 169 <el-button type="primary" @click="onSubmit">保存</el-button>
170 </el-form-item> 170 </el-form-item>
...@@ -178,6 +178,7 @@ ...@@ -178,6 +178,7 @@
178 import { mapGetters } from "vuex"; 178 import { mapGetters } from "vuex";
179 export default { 179 export default {
180 mounted () { 180 mounted () {
181 this.ableOperation = this.$parent.currentSelectTab.ableOperation
181 this.$startLoading(); 182 this.$startLoading();
182 var formdata = new FormData(); 183 var formdata = new FormData();
183 formdata.append("bsmSldy", this.propsParam.bsmSldy); 184 formdata.append("bsmSldy", this.propsParam.bsmSldy);
...@@ -196,6 +197,8 @@ ...@@ -196,6 +197,8 @@
196 }, 197 },
197 data () { 198 data () {
198 return { 199 return {
200 //表单是否可操作
201 ableOperation: true,
199 disabled: true, 202 disabled: true,
200 tdytOption: [], 203 tdytOption: [],
201 czrOptions: [], 204 czrOptions: [],
......
...@@ -167,7 +167,7 @@ ...@@ -167,7 +167,7 @@
167 </el-col> 167 </el-col>
168 </el-row> 168 </el-row>
169 </div> 169 </div>
170 <el-row class="btn" v-if="!$route.query.viewtype && propsParam.issave=='0'"> 170 <el-row class="btn" v-if="!$route.query.viewtype && ableOperation">
171 <el-form-item> 171 <el-form-item>
172 <el-button type="primary" @click="onSubmit">保存</el-button> 172 <el-button type="primary" @click="onSubmit">保存</el-button>
173 </el-form-item> 173 </el-form-item>
...@@ -181,6 +181,7 @@ ...@@ -181,6 +181,7 @@
181 import { mapGetters } from "vuex"; 181 import { mapGetters } from "vuex";
182 export default { 182 export default {
183 mounted () { 183 mounted () {
184 this.ableOperation = this.$parent.currentSelectTab.ableOperation
184 this.propsParam = this.$attrs; 185 this.propsParam = this.$attrs;
185 var formdata = new FormData(); 186 var formdata = new FormData();
186 this.$startLoading(); 187 this.$startLoading();
...@@ -199,6 +200,8 @@ ...@@ -199,6 +200,8 @@
199 }, 200 },
200 data () { 201 data () {
201 return { 202 return {
203 //表单是否可操作
204 ableOperation: true,
202 disabled: true, 205 disabled: true,
203 tdytOption: [], 206 tdytOption: [],
204 czrOptions: [], 207 czrOptions: [],
......
...@@ -171,7 +171,7 @@ ...@@ -171,7 +171,7 @@
171 </el-col> 171 </el-col>
172 </el-row> 172 </el-row>
173 </div> 173 </div>
174 <el-row class="btn" v-if="!$route.query.viewtype && propsParam.issave=='0'"> 174 <el-row class="btn" v-if="!$route.query.viewtype && ableOperation">
175 <el-form-item> 175 <el-form-item>
176 <el-button type="primary" @click="onSubmit">保存</el-button> 176 <el-button type="primary" @click="onSubmit">保存</el-button>
177 </el-form-item> 177 </el-form-item>
...@@ -185,6 +185,7 @@ ...@@ -185,6 +185,7 @@
185 import { mapGetters } from "vuex"; 185 import { mapGetters } from "vuex";
186 export default { 186 export default {
187 created () { 187 created () {
188 this.ableOperation = this.$parent.currentSelectTab.ableOperation
188 this.propsParam = this.$attrs; 189 this.propsParam = this.$attrs;
189 var formdata = new FormData(); 190 var formdata = new FormData();
190 let that = this 191 let that = this
...@@ -207,6 +208,8 @@ ...@@ -207,6 +208,8 @@
207 }, 208 },
208 data () { 209 data () {
209 return { 210 return {
211 //表单是否可操作
212 ableOperation: true,
210 loading: false, 213 loading: false,
211 disabled: true, 214 disabled: true,
212 tdytOption: [], 215 tdytOption: [],
......
...@@ -235,7 +235,7 @@ ...@@ -235,7 +235,7 @@
235 </el-row> 235 </el-row>
236 236
237 </div> 237 </div>
238 <el-row class="btn" v-if="!$route.query.viewtype && propsParam.issave=='0'"> 238 <el-row class="btn" v-if="!$route.query.viewtype && ableOperation">
239 <el-form-item> 239 <el-form-item>
240 <el-button type="primary" @click="onSubmitClick()">保存</el-button> 240 <el-button type="primary" @click="onSubmitClick()">保存</el-button>
241 </el-form-item> 241 </el-form-item>
...@@ -249,6 +249,7 @@ ...@@ -249,6 +249,7 @@
249 import { mapGetters } from "vuex"; 249 import { mapGetters } from "vuex";
250 export default { 250 export default {
251 mounted () { 251 mounted () {
252 this.ableOperation = this.$parent.currentSelectTab.ableOperation
252 this.propsParam = this.$attrs; 253 this.propsParam = this.$attrs;
253 var formdata = new FormData(); 254 var formdata = new FormData();
254 this.$startLoading(); 255 this.$startLoading();
...@@ -269,6 +270,8 @@ ...@@ -269,6 +270,8 @@
269 }, 270 },
270 data () { 271 data () {
271 return { 272 return {
273 //表单是否可操作
274 ableOperation: true,
272 disabled: true, 275 disabled: true,
273 czrOptions: [], 276 czrOptions: [],
274 ruleForm: { 277 ruleForm: {
......
...@@ -129,6 +129,7 @@ ...@@ -129,6 +129,7 @@
129 } else { 129 } else {
130 this.$message.error(res.message); 130 this.$message.error(res.message);
131 } 131 }
132 this.$popupCacel()
132 }) 133 })
133 } 134 }
134 }, 135 },
......
...@@ -120,7 +120,8 @@ ...@@ -120,7 +120,8 @@
120 } else { 120 } else {
121 this.$message.error(res.message); 121 this.$message.error(res.message);
122 } 122 }
123 }); 123 this.$popupCacel()
124 })
124 }, 125 },
125 handleSelectionChange (val) { 126 handleSelectionChange (val) {
126 val.forEach((item, index) => { 127 val.forEach((item, index) => {
......
...@@ -256,6 +256,7 @@ ...@@ -256,6 +256,7 @@
256 } 256 }
257 }) 257 })
258 } 258 }
259 this.$popupCacel()
259 }, 260 },
260 handleSelectionChange (val) { 261 handleSelectionChange (val) {
261 val.forEach((item, index) => { 262 val.forEach((item, index) => {
......
...@@ -109,6 +109,7 @@ ...@@ -109,6 +109,7 @@
109 } else { 109 } else {
110 this.$message.error(res.message); 110 this.$message.error(res.message);
111 } 111 }
112 this.$popupCacel()
112 }) 113 })
113 }, 114 },
114 handleSelectionChange (val) { 115 handleSelectionChange (val) {
......
...@@ -106,6 +106,7 @@ ...@@ -106,6 +106,7 @@
106 } else { 106 } else {
107 this.$message.error(res.message); 107 this.$message.error(res.message);
108 } 108 }
109 this.$popupCacel()
109 }) 110 })
110 }, 111 },
111 handleSelectionChange (val) { 112 handleSelectionChange (val) {
......
...@@ -134,7 +134,8 @@ ...@@ -134,7 +134,8 @@
134 } else { 134 } else {
135 this.$alert(res.message); 135 this.$alert(res.message);
136 } 136 }
137 }); 137 this.$popupCacel()
138 })
138 }, 139 },
139 handleSelectionChange (val) { 140 handleSelectionChange (val) {
140 val.forEach((item, index) => { 141 val.forEach((item, index) => {
......
...@@ -111,7 +111,8 @@ ...@@ -111,7 +111,8 @@
111 } else { 111 } else {
112 this.$message.error(res.message); 112 this.$message.error(res.message);
113 } 113 }
114 }); 114 this.$popupCacel()
115 })
115 }, 116 },
116 handleSelectionChange (val) { 117 handleSelectionChange (val) {
117 val.forEach((item, index) => { 118 val.forEach((item, index) => {
......
...@@ -106,13 +106,13 @@ ...@@ -106,13 +106,13 @@
106 if (!this.isJump) { 106 if (!this.isJump) {
107 this.jump(res.result, this.sqywInfo.djywbm); 107 this.jump(res.result, this.sqywInfo.djywbm);
108 } else { 108 } else {
109 this.$popupCacel()
110 store.dispatch('user/refreshPage', true); 109 store.dispatch('user/refreshPage', true);
111 } 110 }
112 } else { 111 } else {
113 this.$message.error(res.message); 112 this.$message.error(res.message);
114 } 113 }
115 }); 114 this.$popupCacel()
115 })
116 }, 116 },
117 handleSelectionChange (val) { 117 handleSelectionChange (val) {
118 val.forEach((item, index) => { 118 val.forEach((item, index) => {
......
...@@ -119,7 +119,8 @@ ...@@ -119,7 +119,8 @@
119 } else { 119 } else {
120 this.$message.error(res.message); 120 this.$message.error(res.message);
121 } 121 }
122 }); 122 this.$popupCacel()
123 })
123 }, 124 },
124 handleSelectionChange (val) { 125 handleSelectionChange (val) {
125 val.forEach((item, index) => { 126 val.forEach((item, index) => {
......
...@@ -157,6 +157,7 @@ ...@@ -157,6 +157,7 @@
157 } else { 157 } else {
158 this.$message.error(res.message) 158 this.$message.error(res.message)
159 } 159 }
160 this.$popupCacel()
160 }) 161 })
161 }, 162 },
162 openBook (row) { 163 openBook (row) {
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
27 </div> 27 </div>
28 <!-- 表格 --> 28 <!-- 表格 -->
29 <div class="from-clues-content loadingtext"> 29 <div class="from-clues-content loadingtext">
30 <lb-table ref="table" @row-click="handleRowClick" :page-size="pageData.pageSize" :calcHeight="300" 30 <lb-table ref="table" @row-click="handleRowClick" :page-size="pageData.pageSize" :calcHeight="300"
31 :current-page.sync="pageData.currentPage" :total="tableData.total" @size-change="handleSizeChange" 31 :current-page.sync="pageData.currentPage" :total="tableData.total" @size-change="handleSizeChange"
32 @p-current-change="handleCurrentChange" @selection-change="handleSelectionChange" :column="tableData.columns" 32 @p-current-change="handleCurrentChange" @selection-change="handleSelectionChange" :column="tableData.columns"
33 :data="tableData.data"> 33 :data="tableData.data">
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
46 import { defaultParameters } from "../javascript/publicDefaultPar.js"; 46 import { defaultParameters } from "../javascript/publicDefaultPar.js";
47 import table from "@/utils/mixin/table"; 47 import table from "@/utils/mixin/table";
48 import jump from "./mixin/jump"; 48 import jump from "./mixin/jump";
49 import { startBusinessFlow, selectZdjbxx} from "@/api/ywbl.js"; 49 import { startBusinessFlow, selectZdjbxx } from "@/api/ywbl.js";
50 export default { 50 export default {
51 mixins: [table, jump], 51 mixins: [table, jump],
52 props: { 52 props: {
...@@ -56,12 +56,12 @@ ...@@ -56,12 +56,12 @@
56 data () { 56 data () {
57 return { 57 return {
58 queryForm: defaultParameters.defaultParameters(), 58 queryForm: defaultParameters.defaultParameters(),
59 tableData: { 59 tableData: {
60 total: 0, 60 total: 0,
61 columns: datas.columns(), 61 columns: datas.columns(),
62 data: [], 62 data: [],
63 }, 63 },
64 radioVal: "", 64 radioVal: "",
65 bdcdysz: [], 65 bdcdysz: [],
66 bsmSqyw: 66 bsmSqyw:
67 this.sqywInfo.nodetype === "djlx" 67 this.sqywInfo.nodetype === "djlx"
...@@ -82,19 +82,19 @@ ...@@ -82,19 +82,19 @@
82 let { total, records } = res.result; 82 let { total, records } = res.result;
83 this.tableData.total = total; 83 this.tableData.total = total;
84 this.tableData.data = records; 84 this.tableData.data = records;
85 // this.tableData.columns.splice(0, 1,{ 85 // this.tableData.columns.splice(0, 1,{
86 // label: '选择', 86 // label: '选择',
87 // width: '50px', 87 // width: '50px',
88 // render: (h, scope) => { 88 // render: (h, scope) => {
89 // return ( 89 // return (
90 // <div class="orgColumn"> 90 // <div class="orgColumn">
91 // <el-radio v-model={this.radioVal} label={scope.row.bdcdyh}> 91 // <el-radio v-model={this.radioVal} label={scope.row.bdcdyh}>
92 // &ensp; 92 // &ensp;
93 // </el-radio> 93 // </el-radio>
94 // </div> 94 // </div>
95 // ) 95 // )
96 // } 96 // }
97 // }) 97 // })
98 } 98 }
99 }); 99 });
100 }, 100 },
...@@ -124,7 +124,8 @@ ...@@ -124,7 +124,8 @@
124 } else { 124 } else {
125 this.$alert(res.message); 125 this.$alert(res.message);
126 } 126 }
127 }); 127 this.$popupCacel()
128 })
128 }, 129 },
129 handleSelectionChange (val) { 130 handleSelectionChange (val) {
130 this.bdcdysz = val; 131 this.bdcdysz = val;
......
...@@ -111,7 +111,8 @@ ...@@ -111,7 +111,8 @@
111 } else { 111 } else {
112 this.$message.error(res.message); 112 this.$message.error(res.message);
113 } 113 }
114 }); 114 this.$popupCacel()
115 })
115 }, 116 },
116 handleSelectionChange (val) { 117 handleSelectionChange (val) {
117 val.forEach((item, index) => { 118 val.forEach((item, index) => {
......
...@@ -111,7 +111,8 @@ ...@@ -111,7 +111,8 @@
111 } else { 111 } else {
112 this.$message.error(res.message); 112 this.$message.error(res.message);
113 } 113 }
114 }); 114 this.$popupCacel()
115 })
115 }, 116 },
116 handleSelectionChange (val) { 117 handleSelectionChange (val) {
117 val.forEach((item, index) => { 118 val.forEach((item, index) => {
......
...@@ -111,7 +111,8 @@ ...@@ -111,7 +111,8 @@
111 } else { 111 } else {
112 this.$message.error(res.message); 112 this.$message.error(res.message);
113 } 113 }
114 }); 114 this.$popupCacel()
115 })
115 }, 116 },
116 handleSelectionChange (val) { 117 handleSelectionChange (val) {
117 val.forEach((item, index) => { 118 val.forEach((item, index) => {
......