Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
b46d5001 by xiaomiao
Options

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

2 parents a324ec9f 349da580
Inline Side-by-side
Showing 20 changed files with 69 additions and 31 deletions
...@@ -127,6 +127,7 @@ ...@@ -127,6 +127,7 @@
127 // 单选 127 // 单选
128 singleElection (row) { 128 singleElection (row) {
129 this.selected = this.data.indexOf(row); 129 this.selected = this.data.indexOf(row);
130 this.$emit('row-click', val)
130 }, 131 },
131 132
132 tableRowClassName ({ row, rowIndex }) { 133 tableRowClassName ({ row, rowIndex }) {
......
...@@ -130,8 +130,8 @@ ...@@ -130,8 +130,8 @@
130 130
131 .ls-title { 131 .ls-title {
132 padding: 16px; 132 padding: 16px;
133 color: #ffffff; 133 color: #4a4e56;
134 background: linear-gradient(3deg, #409eff, #a7cbee); 134 // background: linear-gradient(3deg, #edf0f7, #f4f5f6);
135 font-size: 16px; 135 font-size: 16px;
136 } 136 }
137 137
...@@ -167,7 +167,7 @@ ...@@ -167,7 +167,7 @@
167 right: 26px; 167 right: 26px;
168 font-size: 24px; 168 font-size: 24px;
169 cursor: pointer; 169 cursor: pointer;
170 color: #409eff; 170 color: #4a4e56;
171 } 171 }
172 172
173 /deep/.el-loading-mask { 173 /deep/.el-loading-mask {
......
1 <!--
2 * @Description:
3 * @Autor: renchao
4 * @LastEditTime: 2023-07-12 16:33:18
5 -->
6 <template>
7 <div class='dblistDialog'>
8 <el-table
9 v-if="formData.result"
10 :data="formData.result"
11 height="200">
12 <el-table-column
13 prop="ywh"
14 width="110"
15 label="业务号">
16 </el-table-column>
17 <el-table-column
18 prop="msg"
19 label="详细信息">
20 </el-table-column>
21 </el-table>
22 </div>
23 </template>
24 <script>
25 export default {
26 props: {
27 formData: {
28 type: Object,
29 default: {}
30 }
31 }
32 }
33 </script>
34 <style scoped lang='scss'>
35 @import "~@/styles/public.scss";
36 </style>
...\ No newline at end of file ...\ No newline at end of file
1 /* 1 /*
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-12 14:23:25 4 * @LastEditTime: 2023-07-12 16:37:53
5 */ 5 */
6 import { getWorkFlowImage } from "@/api/workflow/jsydsyqFlow.js"; 6 import { getWorkFlowImage } from "@/api/workflow/jsydsyqFlow.js";
7 import { getPrintTemplateByCode } from "@/api/system"; 7 import { getPrintTemplateByCode } from "@/api/system";
...@@ -16,8 +16,8 @@ import { ...@@ -16,8 +16,8 @@ import {
16 getNextLinkInfo, 16 getNextLinkInfo,
17 } from "@/api/fqsq.js"; 17 } from "@/api/fqsq.js";
18 import { mapGetters } from 'vuex' 18 import { mapGetters } from 'vuex'
19 import { log } from "bpmn-js-token-simulation";
20 import { getZrzbsm } from "@/api/lpb"; 19 import { getZrzbsm } from "@/api/lpb";
20 import { ywPopupDialog } from "@/utils/popup.js";
21 export default { 21 export default {
22 data () { 22 data () {
23 return { 23 return {
...@@ -115,7 +115,6 @@ export default { ...@@ -115,7 +115,6 @@ export default {
115 getPrintTemplateByCode({ tmpno: 'dysqs' }).then(res => { 115 getPrintTemplateByCode({ tmpno: 'dysqs' }).then(res => {
116 if (res.code == 200) { 116 if (res.code == 200) {
117 getPrintApplicationInfo(this.currentSelectProps).then(infoRes => { 117 getPrintApplicationInfo(this.currentSelectProps).then(infoRes => {
118 console.log(infoRes, 'infoRes');
119 if (infoRes.code == 200) { 118 if (infoRes.code == 200) {
120 //打开模板设计 119 //打开模板设计
121 let LODOP = getLodop(document.getElementById('LODOP_OB'), document.getElementById('LODOP_EM')); 120 let LODOP = getLodop(document.getElementById('LODOP_OB'), document.getElementById('LODOP_EM'));
...@@ -193,7 +192,7 @@ export default { ...@@ -193,7 +192,7 @@ export default {
193 formdata.append("bsmSlsq", this.bsmSlsq); 192 formdata.append("bsmSlsq", this.bsmSlsq);
194 formdata.append("bestepid", this.bestepid); 193 formdata.append("bestepid", this.bestepid);
195 this.$confirm("请确认是否登簿", "提示", { 194 this.$confirm("请确认是否登簿", "提示", {
196 iconClass: "el-icon-question", //自定义图标样式 195 iconClass: "el-icon-info", //自定义图标样式
197 confirmButtonText: "确认", //确认按钮文字更换 196 confirmButtonText: "确认", //确认按钮文字更换
198 cancelButtonText: "取消", //取消按钮文字更换 197 cancelButtonText: "取消", //取消按钮文字更换
199 showClose: true, //是否显示右上角关闭按钮 198 showClose: true, //是否显示右上角关闭按钮
...@@ -202,18 +201,20 @@ export default { ...@@ -202,18 +201,20 @@ export default {
202 record(formdata).then((res) => { 201 record(formdata).then((res) => {
203 if (res.code === 200) { 202 if (res.code === 200) {
204 if (res.result.length === 1) { 203 if (res.result.length === 1) {
205 res.result[0].state ? that.$alert("登簿成功!") : that.$alert(res.result[0].msg);; 204 console.log(res.result, 'res.result');
205 res.result[0].state ? that.$message({
206 message: '登簿成功',
207 type: 'success'
208 }) : ywPopupDialog("登簿错误明细", "workflow/components/dialog/dblist", { result: res.result }, '30%')
206 } 209 }
207 else { 210 else {
208 that.$alert('<div>' + res.result[0].ywh + ',' + res.result[0].msg + '</div>', '登簿明细', { 211 ywPopupDialog("登簿错误明细", "workflow/components/dialog/dblist", { result: res.result }, '30%')
209 dangerouslyUseHTMLString: true
210 });
211 } 212 }
212 } else { 213 } else {
213 that.$alert(res.message); 214 that.$message.error(res.message)
214 } 215 }
215 }); 216 })
216 }); 217 })
217 break; 218 break;
218 case "rm": 219 case "rm":
219 this.del() 220 this.del()
......
...@@ -139,7 +139,7 @@ ...@@ -139,7 +139,7 @@
139 this.$popupCacel() 139 this.$popupCacel()
140 140
141 } else { 141 } else {
142 ywPopupDialog("状态", "components/ywdialog", { message: res.message, result: res.result }, '36%') 142 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
143 } 143 }
144 }) 144 })
145 } else { 145 } else {
......
...@@ -120,7 +120,7 @@ ...@@ -120,7 +120,7 @@
120 } 120 }
121 this.$popupCacel() 121 this.$popupCacel()
122 } else { 122 } else {
123 ywPopupDialog("状态", "components/ywdialog", { message: res.message, result: res.result }, '36%') 123 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
124 } 124 }
125 }) 125 })
126 }, 126 },
......
...@@ -242,7 +242,7 @@ ...@@ -242,7 +242,7 @@
242 } 242 }
243 this.$popupCacel() 243 this.$popupCacel()
244 } else { 244 } else {
245 ywPopupDialog("状态", "components/ywdialog", { message: res.message, result: res.result }, '36%') 245 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
246 } 246 }
247 }) 247 })
248 } else { 248 } else {
...@@ -259,7 +259,7 @@ ...@@ -259,7 +259,7 @@
259 store.dispatch('user/refreshPage', true); 259 store.dispatch('user/refreshPage', true);
260 this.$popupCacel() 260 this.$popupCacel()
261 } else { 261 } else {
262 ywPopupDialog("状态", "components/ywdialog", { message: res.message, result: res.result }, '36%') 262 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
263 } 263 }
264 }) 264 })
265 } 265 }
......
...@@ -109,7 +109,7 @@ ...@@ -109,7 +109,7 @@
109 } 109 }
110 this.$popupCacel() 110 this.$popupCacel()
111 } else { 111 } else {
112 ywPopupDialog("状态", "components/ywdialog", { message: res.message, result: res.result }, '36%') 112 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
113 } 113 }
114 }) 114 })
115 }, 115 },
......
...@@ -106,7 +106,7 @@ ...@@ -106,7 +106,7 @@
106 } 106 }
107 this.$popupCacel() 107 this.$popupCacel()
108 } else { 108 } else {
109 ywPopupDialog("状态", "components/ywdialog", { message: res.message, result: res.result }, '36%') 109 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
110 } 110 }
111 }) 111 })
112 }, 112 },
......
...@@ -134,7 +134,7 @@ ...@@ -134,7 +134,7 @@
134 } 134 }
135 this.$popupCacel() 135 this.$popupCacel()
136 } else { 136 } else {
137 ywPopupDialog("状态", "components/ywdialog", { message: res.message, result: res.result }, '36%') 137 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
138 } 138 }
139 }) 139 })
140 }, 140 },
......
...@@ -162,7 +162,7 @@ ...@@ -162,7 +162,7 @@
162 } 162 }
163 this.$popupCacel() 163 this.$popupCacel()
164 } else { 164 } else {
165 ywPopupDialog("状态", "components/ywdialog", { message: res.message, result: res.result }, '36%') 165 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
166 } 166 }
167 }) 167 })
168 }, 168 },
......
...@@ -111,7 +111,7 @@ ...@@ -111,7 +111,7 @@
111 } 111 }
112 this.$popupCacel() 112 this.$popupCacel()
113 } else { 113 } else {
114 ywPopupDialog("状态", "components/ywdialog", { message: res.message, result: res.result }, '36%') 114 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
115 } 115 }
116 }) 116 })
117 }, 117 },
......
...@@ -111,7 +111,7 @@ ...@@ -111,7 +111,7 @@
111 } 111 }
112 this.$popupCacel() 112 this.$popupCacel()
113 } else { 113 } else {
114 ywPopupDialog("状态", "components/ywdialog", { message: res.message, result: res.result }, '36%') 114 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
115 } 115 }
116 }) 116 })
117 }, 117 },
......
...@@ -119,7 +119,7 @@ ...@@ -119,7 +119,7 @@
119 } 119 }
120 this.$popupCacel() 120 this.$popupCacel()
121 } else { 121 } else {
122 ywPopupDialog("状态", "components/ywdialog", { message: res.message, result: res.result }, '36%') 122 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
123 } 123 }
124 }) 124 })
125 }, 125 },
......
...@@ -247,7 +247,7 @@ ...@@ -247,7 +247,7 @@
247 } 247 }
248 this.$popupCacel() 248 this.$popupCacel()
249 } else { 249 } else {
250 ywPopupDialog("状态", "components/ywdialog", { message: res.message, result: res.result }, '36%') 250 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
251 } 251 }
252 }) 252 })
253 }, 253 },
......
...@@ -116,7 +116,7 @@ ...@@ -116,7 +116,7 @@
116 } 116 }
117 this.$popupCacel() 117 this.$popupCacel()
118 } else { 118 } else {
119 ywPopupDialog("状态", "components/ywdialog", { message: res.message, result: res.result }, '36%') 119 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
120 } 120 }
121 }) 121 })
122 }, 122 },
......
...@@ -119,7 +119,7 @@ ...@@ -119,7 +119,7 @@
119 } 119 }
120 this.$popupCacel() 120 this.$popupCacel()
121 } else { 121 } else {
122 ywPopupDialog("状态", "components/ywdialog", { message: res.message, result: res.result }, '36%') 122 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
123 } 123 }
124 }) 124 })
125 }, 125 },
......
...@@ -111,7 +111,7 @@ ...@@ -111,7 +111,7 @@
111 this.$popupCacel() 111 this.$popupCacel()
112 } 112 }
113 } else { 113 } else {
114 ywPopupDialog("状态", "components/ywdialog", { message: res.message, result: res.result }, '36%') 114 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
115 } 115 }
116 }) 116 })
117 }, 117 },
......
...@@ -111,7 +111,7 @@ ...@@ -111,7 +111,7 @@
111 } 111 }
112 this.$popupCacel() 112 this.$popupCacel()
113 } else { 113 } else {
114 ywPopupDialog("状态", "components/ywdialog", { message: res.message, result: res.result }, '36%') 114 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
115 } 115 }
116 }) 116 })
117 }, 117 },
......
...@@ -112,7 +112,7 @@ ...@@ -112,7 +112,7 @@
112 } 112 }
113 this.$popupCacel() 113 this.$popupCacel()
114 } else { 114 } else {
115 ywPopupDialog("状态", "components/ywdialog", { message: res.message, result: res.result }, '36%') 115 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
116 } 116 }
117 }) 117 })
118 }, 118 },
......