Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web
Showing
6 changed files
with
134 additions
and
225 deletions
... | @@ -213,38 +213,6 @@ import InformationTable from "./InformationTable"; | ... | @@ -213,38 +213,6 @@ import InformationTable from "./InformationTable"; |
213 | import { Init, fristReg } from "@/api/cfdjFlow.js"; | 213 | import { Init, fristReg } from "@/api/cfdjFlow.js"; |
214 | import { mapGetters } from "vuex"; | 214 | import { mapGetters } from "vuex"; |
215 | export default { | 215 | export default { |
216 | created() { | ||
217 | console.log(1111111111111111); | ||
218 | var bsmSldy = this.$parent._data.unitData[0].bsmSldy; | ||
219 | var formdata = new FormData(); | ||
220 | formdata.append("bsmSldy", bsmSldy); | ||
221 | Init(formdata).then((res) => { | ||
222 | if (res.code === 200 && res.result) { | ||
223 | this.ruleForm = { | ||
224 | ...res.result, | ||
225 | ...res.result.qlxxdatas, | ||
226 | ...res.result.djQlxxCfdjDo, | ||
227 | }; | ||
228 | } | ||
229 | }); | ||
230 | }, | ||
231 | watch: { | ||
232 | |||
233 | }, | ||
234 | components: { InformationTable }, | ||
235 | props: { | ||
236 | flag: { | ||
237 | type: Boolean, | ||
238 | default: false, | ||
239 | }, | ||
240 | fetch: { | ||
241 | type: Boolean, | ||
242 | default: false, | ||
243 | }, | ||
244 | }, | ||
245 | computed: { | ||
246 | ...mapGetters(["dictData"]), | ||
247 | }, | ||
248 | data() { | 216 | data() { |
249 | return { | 217 | return { |
250 | disabled: true, | 218 | disabled: true, |
... | @@ -279,8 +247,43 @@ export default { | ... | @@ -279,8 +247,43 @@ export default { |
279 | czr: "", | 247 | czr: "", |
280 | }, | 248 | }, |
281 | rules: {}, | 249 | rules: {}, |
250 | //传递参数 | ||
251 | propsParam: {}, | ||
282 | }; | 252 | }; |
283 | }, | 253 | }, |
254 | created() { | ||
255 | // console.log(1111111111111111); | ||
256 | this.propsParam = this.$attrs; | ||
257 | var formdata = new FormData(); | ||
258 | formdata.append("bsmSldy", this.propsParam.bsmSldy); | ||
259 | Init(formdata).then((res) => { | ||
260 | if (res.code === 200 && res.result) { | ||
261 | this.ruleForm = { | ||
262 | ...res.result, | ||
263 | ...res.result.qlxxdatas, | ||
264 | ...res.result.djQlxxCfdjDo, | ||
265 | }; | ||
266 | } | ||
267 | }); | ||
268 | }, | ||
269 | watch: { | ||
270 | |||
271 | }, | ||
272 | components: { InformationTable }, | ||
273 | props: { | ||
274 | flag: { | ||
275 | type: Boolean, | ||
276 | default: false, | ||
277 | }, | ||
278 | fetch: { | ||
279 | type: Boolean, | ||
280 | default: false, | ||
281 | }, | ||
282 | }, | ||
283 | computed: { | ||
284 | ...mapGetters(["dictData"]), | ||
285 | }, | ||
286 | |||
284 | methods: { | 287 | methods: { |
285 | list(bsmSldy) { | 288 | list(bsmSldy) { |
286 | var formdata = new FormData(); | 289 | var formdata = new FormData(); | ... | ... |
src/views/ywbl/fqsq/flowform.js
0 → 100644
1 | //流程环节操作按钮 | ||
2 | export function getForm(tabName) { | ||
3 | let form; | ||
4 | switch (tabName) { | ||
5 | case "slxx": | ||
6 | form = require("@/views/ywbl/fqsq/components/slxx.vue"); | ||
7 | break; | ||
8 | case "slxxCfdj": | ||
9 | form = require("@/views/ywbl/fqsq/components/slxxCfdj.vue"); | ||
10 | break; | ||
11 | case "clxx": | ||
12 | form = require("@/views/ywbl/fqsq/components/clxx.vue"); | ||
13 | break; | ||
14 | case "spyj": | ||
15 | form = require("@/views/ywbl/fqsq/components/spyj.vue"); | ||
16 | break; | ||
17 | case "zdjbxx": | ||
18 | form = require("@/views/zhcx/djbcx/components/zdxx.vue"); | ||
19 | break; | ||
20 | case "qlxx": | ||
21 | form = require("@/views/zhcx/djbcx/components/jsydsyq.vue"); | ||
22 | break; | ||
23 | case "szxx": | ||
24 | form = require("@/views/ywbl/fqsq/components/szxx.vue"); | ||
25 | break; | ||
26 | case "fzxx": | ||
27 | form = require("@/views/ywbl/fqsq/components/fzxx.vue"); | ||
28 | break; | ||
29 | } | ||
30 | |||
31 | return (r) => require.ensure([], () => r(form)); | ||
32 | } | ||
... | \ No newline at end of file | ... | \ No newline at end of file |
src/views/ywbl/fqsq/workFrame.js
deleted
100644 → 0
1 | |||
2 | // 时间戳转化 | ||
3 | // export default { | ||
4 | // timestampToTime(timestamp) { | ||
5 | // let strDate; | ||
6 | // var date = new Date(timestamp); //时间戳为10位需*1000,时间戳为13位的话不需乘1000 | ||
7 | // var Y = date.getFullYear() + '-'; | ||
8 | // var M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-'; | ||
9 | // var D = (date.getDate() < 10 ? '0' + date.getDate() : date.getDate()) + ' '; | ||
10 | // var h = (date.getHours() < 10 ? '0' + date.getHours() : date.getHours()) + ':'; | ||
11 | // var m = (date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()); | ||
12 | // strDate = Y + M + D + h + m; | ||
13 | // return strDate; | ||
14 | // }, | ||
15 | // } | ||
16 | |||
17 | |||
18 | //流程环节操作按钮 | ||
19 | export function operation(index, item) { | ||
20 | let that = this; | ||
21 | switch (item.value) { | ||
22 | case "zsyl": | ||
23 | this.zsylFlag = true; | ||
24 | break; | ||
25 | case "clfp": | ||
26 | this.key++; | ||
27 | this.issplitScreen = !this.issplitScreen; | ||
28 | this.flag = !this.flag; | ||
29 | if (this.issplitScreen) { | ||
30 | this.tabList.splice(1, 1); | ||
31 | } else { | ||
32 | this.tabList = [...this.tabList1]; | ||
33 | } | ||
34 | break; | ||
35 | case "th": | ||
36 | this.thflag = true; | ||
37 | this.$nextTick(() => { | ||
38 | this.$refs.thdialogRef.tablelistFn(); | ||
39 | }); | ||
40 | break; | ||
41 | case "zc": | ||
42 | this.zcDialog = true; | ||
43 | this.$refs.zcDialogRef.tablelistFn(); | ||
44 | break; | ||
45 | case "tc": | ||
46 | window.close(); | ||
47 | break; | ||
48 | case "db": | ||
49 | var formdata = new FormData(); | ||
50 | formdata.append("bsmSlsq", this.bsmSlsq); | ||
51 | formdata.append("bestepid", this.bestepid); | ||
52 | // comMsg; | ||
53 | this.$confirm("请确认是否登簿", "提示", { | ||
54 | iconClass: "el-icon-question", //自定义图标样式 | ||
55 | confirmButtonText: "确认", //确认按钮文字更换 | ||
56 | cancelButtonText: "取消", //取消按钮文字更换 | ||
57 | showClose: true, //是否显示右上角关闭按钮 | ||
58 | type: "warning", //提示类型 success/info/warning/error | ||
59 | }).then(function () { | ||
60 | record(formdata).then((res) => { | ||
61 | if (res.code === 200 || res.code === 2002) { | ||
62 | that.$alert(res.message); | ||
63 | } | ||
64 | }); | ||
65 | }); | ||
66 | break; | ||
67 | } | ||
68 | } | ||
69 | |||
70 | export function loadBdcdylist(that) { | ||
71 | var formdata = new FormData(); | ||
72 | formdata.append("bsmSlsq", that.bsmSlsq); | ||
73 | formdata.append("bestepid", that.bestepid); | ||
74 | leftMenu(formdata).then((res) => { | ||
75 | if (res.code === 200) { | ||
76 | that.unitData = res.result; | ||
77 | that.currentSelectProps = res.result[0]; | ||
78 | //debugger; | ||
79 | //this.$alert(res.result[0].bsmSldy); | ||
80 | // setTimeout(() => { | ||
81 | // that.$refs.slxx?.[0].list(that.unitData?.[0]?.bsmSldy); | ||
82 | // this.bsmBusiness = that.unitData?.[0]?.bsmBusiness; | ||
83 | // }, 300); | ||
84 | } | ||
85 | }); | ||
86 | } | ||
... | \ No newline at end of file | ... | \ No newline at end of file |
... | @@ -30,15 +30,7 @@ | ... | @@ -30,15 +30,7 @@ |
30 | <!-- 左侧菜单栏 --> | 30 | <!-- 左侧菜单栏 --> |
31 | <div id="leftmenu"> | 31 | <div id="leftmenu"> |
32 | <div class="title">申请单元列表({{ unitData.length }})</div> | 32 | <div class="title">申请单元列表({{ unitData.length }})</div> |
33 | <!-- <ul> | 33 | <el-menu default-active="0" @select="unitClick"> |
34 | <div v-for="(item, index) in unitData" :key="index"> | ||
35 | <li @click="unitClick(item)"> | ||
36 | <p>{{ item.bdcdyh }}</p> | ||
37 | <p>{{ item.zl }}</p> | ||
38 | </li> | ||
39 | </div> | ||
40 | </ul> --> | ||
41 | <el-menu default-active="0" @select="selectItems"> | ||
42 | <el-menu-item | 34 | <el-menu-item |
43 | v-for="(item, index) in unitData" | 35 | v-for="(item, index) in unitData" |
44 | :index="index.toString()" | 36 | :index="index.toString()" |
... | @@ -50,7 +42,9 @@ | ... | @@ -50,7 +42,9 @@ |
50 | </i> | 42 | </i> |
51 | </el-menu-item> | 43 | </el-menu-item> |
52 | </el-menu> | 44 | </el-menu> |
53 | 45 | </div> | |
46 | <div v-if="splitScreen" class="splitScreen-con"> | ||
47 | <component :is="clxxForm" v-bind="currentSelectProps" :key="fresh" /> | ||
54 | </div> | 48 | </div> |
55 | <!-- 表单内容区域 --> | 49 | <!-- 表单内容区域 --> |
56 | <div id="rightContainer"> | 50 | <div id="rightContainer"> |
... | @@ -70,9 +64,6 @@ | ... | @@ -70,9 +64,6 @@ |
70 | v-bind="currentSelectProps" | 64 | v-bind="currentSelectProps" |
71 | /> | 65 | /> |
72 | </div> | 66 | </div> |
73 | <!-- <div style="width: 100%"> | ||
74 | |||
75 | </div> --> | ||
76 | </div> | 67 | </div> |
77 | </div> | 68 | </div> |
78 | </div> | 69 | </div> |
... | @@ -85,58 +76,53 @@ | ... | @@ -85,58 +76,53 @@ |
85 | 76 | ||
86 | <script> | 77 | <script> |
87 | import { leftMenu, stepExpandInfo, record } from "@/api/fqsq.js"; | 78 | import { leftMenu, stepExpandInfo, record } from "@/api/fqsq.js"; |
79 | import { getForm } from "./flowform.js"; | ||
88 | export default { | 80 | export default { |
89 | components: { | 81 | components: { |
90 | //注册表单组件,后期改为路由模式 | 82 | //注册表单组件,后期改为路由模式 |
91 | slxx: () => import("./components/slxx.vue"), | 83 | // slxx: () => import("@/views/ywbl/fqsq/components/slxx.vue"), |
92 | clxx: () => import("./components/clxx.vue"), | 84 | // clxx: () => import("./components/clxx.vue"), |
93 | spyj: () => import("./components/spyj.vue"), | 85 | // spyj: () => import("./components/spyj.vue"), |
94 | zdjbxx: () => import("../../zhcx/djbcx/components/zdxx.vue"), | 86 | // zdjbxx: () => import("../../zhcx/djbcx/components/zdxx.vue"), |
95 | qlxx: () => import("../../zhcx/djbcx/components/jsydsyq.vue"), | 87 | // qlxx: () => import("../../zhcx/djbcx/components/jsydsyq.vue"), |
96 | }, | 88 | }, |
97 | data() { | 89 | data() { |
98 | return { | 90 | return { |
99 | //受理申请标识码 | 91 | //受理申请标识码 |
100 | bsmSlsq: "", | 92 | bsmSlsq: this.$route.query.bsmSlsq, |
101 | //当前流程所在环节 | 93 | //当前流程所在环节 |
102 | bestepid: "", | 94 | bestepid: this.$route.query.bestepid, |
103 | //顶部左侧按钮集合 | 95 | //顶部左侧按钮集合 |
104 | leftButtonList: [], | 96 | leftButtonList: [], |
105 | //顶部右侧按钮集合 | 97 | //顶部右侧按钮集合 |
106 | rightButtonList: [], | 98 | rightButtonList: [], |
107 | //左侧菜单数据集合 | 99 | //左侧菜单数据集合 |
108 | unitData: [], | 100 | unitData: [], |
109 | //设置那个表单选中 | 101 | //设置那个表单选中 |
110 | tabName: "", | 102 | tabName: "", |
111 | //表单集合 | 103 | //表单集合 |
112 | tabList: [], | 104 | tabList: [], |
113 | //选择加载哪一个组件 | 105 | //选择加载哪一个组件 |
114 | componentTag: "", | 106 | componentTag: "", |
115 | //设置表单组件是否刷选值 | 107 | //设置表单组件是否刷选值 |
116 | fresh: 0, | 108 | fresh: 0, |
117 | //设置表单传递数据 | 109 | //设置表单传递数据 |
118 | currentSelectProps: {}, | 110 | currentSelectProps: {}, |
111 | //是否开启材料分屏 | ||
112 | splitScreen: false, | ||
113 | //材料分屏表单 | ||
114 | clxxForm: "", | ||
115 | //材料信息选择卡索引 | ||
116 | clxxIndex: "", | ||
117 | //材料信息选项卡对象 | ||
118 | clxxTab: {}, | ||
119 | }; | 119 | }; |
120 | }, | 120 | }, |
121 | mounted() { | 121 | mounted() { |
122 | this.bsmSlsq = this.$route.query.bsmSlsq; | ||
123 | this.bestepid = this.$route.query.bestepid; | ||
124 | this.loadBdcdylist(); | 122 | this.loadBdcdylist(); |
125 | this.flowInitParam(); | 123 | this.flowInitParam(); |
126 | }, | 124 | }, |
127 | methods: { | 125 | methods: { |
128 | selectItems(index) { | ||
129 | //this.$alert(this.unitData[index].bsmSldy); | ||
130 | //this.$store.state.adminleftnavnum = index; | ||
131 | |||
132 | if (this.currentSelectProps.bsmSldy != this.unitData[index].bsmSldy) { | ||
133 | this.currentSelectProps = this.unitData[index]; | ||
134 | this.fresh += 1; | ||
135 | } | ||
136 | |||
137 | |||
138 | //按钮选中之后设置当前的index为store里的值。 | ||
139 | }, | ||
140 | //加载流程初始参数 | 126 | //加载流程初始参数 |
141 | flowInitParam() { | 127 | flowInitParam() { |
142 | var formdata = new FormData(); | 128 | var formdata = new FormData(); |
... | @@ -149,8 +135,16 @@ export default { | ... | @@ -149,8 +135,16 @@ export default { |
149 | this.tabList = res.result.form; | 135 | this.tabList = res.result.form; |
150 | //默认选择第一个选项卡内容 | 136 | //默认选择第一个选项卡内容 |
151 | this.tabName = res.result.form[0].value; | 137 | this.tabName = res.result.form[0].value; |
138 | let that = this; | ||
139 | this.tabList.forEach(function (item, index) { | ||
140 | if (item.value == "clxx") { | ||
141 | that.clxxIndex = index; | ||
142 | that.clxxForm = getForm(item.value); | ||
143 | that.clxxTab = item; | ||
144 | } | ||
145 | }); | ||
152 | //默认加载第一个选项卡的组件内容 | 146 | //默认加载第一个选项卡的组件内容 |
153 | this.componentTag = res.result.form[0].value; | 147 | this.getFromRouter(res.result.form[0].value); |
154 | } | 148 | } |
155 | }); | 149 | }); |
156 | }, | 150 | }, |
... | @@ -162,13 +156,17 @@ export default { | ... | @@ -162,13 +156,17 @@ export default { |
162 | this.zsylFlag = true; | 156 | this.zsylFlag = true; |
163 | break; | 157 | break; |
164 | case "clfp": | 158 | case "clfp": |
165 | this.key++; | 159 | this.splitScreen = this.splitScreen ? false : true; |
166 | this.issplitScreen = !this.issplitScreen; | 160 | //this.$alert(this.tabName); |
167 | this.flag = !this.flag; | 161 | if (this.splitScreen) { |
168 | if (this.issplitScreen) { | 162 | //如果当前选项卡为材料信息内容,递减到上一个选项卡内容 |
169 | this.tabList.splice(1, 1); | 163 | if (this.tabName == this.clxxTab.value) { |
164 | this.tabName = this.tabList[this.clxxIndex - 1].value; | ||
165 | this.getFromRouter(this.tabList[this.clxxIndex - 1].value); | ||
166 | } | ||
167 | this.tabList.splice(this.clxxIndex, 1); | ||
170 | } else { | 168 | } else { |
171 | this.tabList = [...this.tabList1]; | 169 | this.tabList.splice(this.clxxIndex, 1, this.clxxTab); |
172 | } | 170 | } |
173 | break; | 171 | break; |
174 | case "th": | 172 | case "th": |
... | @@ -205,6 +203,7 @@ export default { | ... | @@ -205,6 +203,7 @@ export default { |
205 | break; | 203 | break; |
206 | } | 204 | } |
207 | }, | 205 | }, |
206 | //读取申请单元信息 | ||
208 | loadBdcdylist() { | 207 | loadBdcdylist() { |
209 | var formdata = new FormData(); | 208 | var formdata = new FormData(); |
210 | formdata.append("bsmSlsq", this.bsmSlsq); | 209 | formdata.append("bsmSlsq", this.bsmSlsq); |
... | @@ -212,65 +211,25 @@ export default { | ... | @@ -212,65 +211,25 @@ export default { |
212 | leftMenu(formdata).then((res) => { | 211 | leftMenu(formdata).then((res) => { |
213 | if (res.code === 200) { | 212 | if (res.code === 200) { |
214 | this.unitData = res.result; | 213 | this.unitData = res.result; |
215 | // this.unitData.push({ | ||
216 | // bsmSldy: "edd5ffc12c8dcc237ad06447618dcddc", | ||
217 | // bsmBusiness: "ee5187fa978c9002c3a2991ae5d70482", | ||
218 | // bsmSsql: null, | ||
219 | // ybdcqzsh: null, | ||
220 | // bdcdyid: "dded1d6615be4fbf02de75c93bb5084e", | ||
221 | // bdcdyh: "610102123666GB10165W00000000", | ||
222 | // bdcdylx: null, | ||
223 | // xmmc: null, | ||
224 | // jzwmc: null, | ||
225 | // fh: null, | ||
226 | // zl: "陕西省新城区大庆路1号村", | ||
227 | // bglx: "0", | ||
228 | // wqhtid: null, | ||
229 | // wqhtbh: null, | ||
230 | // htlx: null, | ||
231 | // wqsj: null, | ||
232 | // ydybh: null, | ||
233 | // djyy: "GYJSY2222D", | ||
234 | // qllx: "A03", | ||
235 | // djlx: "200", | ||
236 | // sqzsbs: null, | ||
237 | // gyfs: null, | ||
238 | // sqfbcz: null, | ||
239 | // sfxysczs: null, | ||
240 | // sfxyffzs: null, | ||
241 | // issave: null, | ||
242 | // taskId: null, | ||
243 | // }); | ||
244 | // this.unitData.push(res.result[0]); | ||
245 | // this.unitData.push(res.result[0]); | ||
246 | this.currentSelectProps = res.result[0]; | 214 | this.currentSelectProps = res.result[0]; |
247 | //debugger; | ||
248 | //this.$alert(res.result[0].bsmSldy); | ||
249 | // setTimeout(() => { | ||
250 | // that.$refs.slxx?.[0].list(that.unitData?.[0]?.bsmSldy); | ||
251 | // this.bsmBusiness = that.unitData?.[0]?.bsmBusiness; | ||
252 | // }, 300); | ||
253 | } | 215 | } |
254 | }); | 216 | }); |
255 | }, | 217 | }, |
256 | // 左侧列表点击调用接口 | 218 | //申请单元点击事件 |
257 | unitClick(item) { | 219 | unitClick(index) { |
258 | // this.bsmBusiness = item.bsmBusiness | 220 | if (this.currentSelectProps.bsmSldy != this.unitData[index].bsmSldy) { |
259 | // var activeTabName = this.activeName | 221 | this.currentSelectProps = this.unitData[index]; |
260 | // if(activeTabName == 'slxx'){ | 222 | this.fresh += 1; |
261 | // //受理信息页面接口调取 | 223 | } |
262 | // this.$nextTick(() => { | ||
263 | // this.$refs.slxx[0].list(item.bsmSldy) | ||
264 | // }) | ||
265 | // }else if(activeTabName == 'spyj'){ | ||
266 | // //审批页面接口调取 | ||
267 | // this.$nextTick(() => { | ||
268 | // this.$refs.spyj[0].list(this.bsmBusiness,this.queryForm.bestepid) | ||
269 | // }) | ||
270 | // } | ||
271 | }, | 224 | }, |
225 | //表单选项卡事件 | ||
272 | tabClick(tab, event) { | 226 | tabClick(tab, event) { |
273 | this.componentTag = tab.name; | 227 | //this.$alert(tab.name); |
228 | this.getFromRouter(tab.name); | ||
229 | }, | ||
230 | //切换选项卡内容组件 | ||
231 | getFromRouter(tabname) { | ||
232 | this.componentTag = getForm(tabname); | ||
274 | }, | 233 | }, |
275 | }, | 234 | }, |
276 | }; | 235 | }; | ... | ... |
... | @@ -16,7 +16,7 @@ | ... | @@ -16,7 +16,7 @@ |
16 | </div> | 16 | </div> |
17 | <div class="xxTableBox"> | 17 | <div class="xxTableBox"> |
18 | <table class="xxTable"> | 18 | <table class="xxTable"> |
19 | <tr v-for="item in columns" :key="item"> | 19 | <tr v-for="(item, colindex) in columns" :key="colindex"> |
20 | <td> | 20 | <td> |
21 | {{ item.label }} | 21 | {{ item.label }} |
22 | </td> | 22 | </td> |
... | @@ -38,7 +38,7 @@ | ... | @@ -38,7 +38,7 @@ |
38 | 38 | ||
39 | <span v-else> {{ row[item.prop] }}</span> | 39 | <span v-else> {{ row[item.prop] }}</span> |
40 | </td> | 40 | </td> |
41 | <td v-for="count in emptycolNum" :key="count"></td> | 41 | <td v-for="count in emptycolNum" :key="~count"></td> |
42 | </tr> | 42 | </tr> |
43 | </table> | 43 | </table> |
44 | </div> | 44 | </div> |
... | @@ -80,9 +80,9 @@ export default { | ... | @@ -80,9 +80,9 @@ export default { |
80 | }, | 80 | }, |
81 | created() { | 81 | created() { |
82 | this.propsParam = this.$attrs; | 82 | this.propsParam = this.$attrs; |
83 | //debugger; | ||
84 | this.columns = datas.columns(); | 83 | this.columns = datas.columns(); |
85 | this.loadData(); | 84 | this.loadData(); |
85 | // this.$alert(datas.columns()); | ||
86 | }, | 86 | }, |
87 | methods: { | 87 | methods: { |
88 | loadData() { | 88 | loadData() { | ... | ... |
-
Please register or sign in to post a comment