6719902e by renchao@pashanhoo.com

Merge branch 'dev'

2 parents fb6e2ead 531172ac
...@@ -15,57 +15,57 @@ ...@@ -15,57 +15,57 @@
15 <el-form :model="form" v-show="n == 0" label-width="135px" ref="ruleForm"> 15 <el-form :model="form" v-show="n == 0" label-width="135px" ref="ruleForm">
16 <el-row> 16 <el-row>
17 <el-col :span="8"> 17 <el-col :span="8">
18 <el-form-item label="申请分类" v-if="form.ywDetail && form.ywDetail.sqfl"> 18 <el-form-item label="申请分类" v-if="form.sqdjyw">
19 <el-select v-model="form.ywDetail.sqfl" disabled placeholder="请选择" class="width100"> 19 <el-select v-model="form.sqdjyw.sqfl" disabled placeholder="请选择" class="width100">
20 <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"> 20 <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
21 </el-option> 21 </el-option>
22 </el-select> 22 </el-select>
23 </el-form-item> 23 </el-form-item>
24 </el-col> 24 </el-col>
25 <el-col :span="8"> 25 <el-col :span="8">
26 <el-form-item label="登记业务编码" v-if="form.ywDetail && form.ywDetail.djywbm"> 26 <el-form-item label="登记业务编码" v-if="form.sqdjyw">
27 <el-input v-model="form.ywDetail.djywbm" disabled></el-input> 27 <el-input v-model="form.sqdjyw.djywbm" disabled></el-input>
28 </el-form-item> 28 </el-form-item>
29 </el-col> 29 </el-col>
30 <el-col :span="8"> 30 <el-col :span="8">
31 <el-form-item label="登记业务名称" v-if="form.ywDetail && form.ywDetail.djywmc"> 31 <el-form-item label="登记业务名称" v-if="form.sqdjyw">
32 <el-input v-model="form.ywDetail.djywmc" disabled></el-input> 32 <el-input v-model="form.sqdjyw.djywmc" disabled></el-input>
33 </el-form-item> 33 </el-form-item>
34 </el-col> 34 </el-col>
35 </el-row> 35 </el-row>
36 <el-row> 36 <el-row>
37 <el-col :span="8"> 37 <el-col :span="8">
38 <el-form-item label="发起业务单元类型" v-if="form.ywDetail && form.ywDetail.fqywdylx"> 38 <el-form-item label="发起业务单元类型" v-if="form.sqdjyw">
39 <el-select v-model="form.ywDetail.fqywdylx" disabled placeholder="请选择" class="width100"> 39 <el-select v-model="form.sqdjyw.sqywdylx" disabled placeholder="请选择" class="width100">
40 <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"> 40 <el-option v-for="item in sqywdylx" :key="item.dcode" :label="item.dname" :value="item.dcode">
41 </el-option> 41 </el-option>
42 </el-select> 42 </el-select>
43 </el-form-item> 43 </el-form-item>
44 </el-col> 44 </el-col>
45 <el-col :span="8"> 45 <el-col :span="8">
46 <el-form-item label="是否启用" prop="enabled"> 46 <el-form-item label="是否启用" prop="enabled" v-if="form.sqdjyw">
47 <el-radio-group v-model="form.ywDetail.enabled"> 47 <el-radio-group v-model="form.sqdjyw.enabled">
48 <el-radio label="1">启用</el-radio> 48 <el-radio label="1">启用</el-radio>
49 <el-radio label="0">禁用</el-radio> 49 <el-radio label="0">禁用</el-radio>
50 </el-radio-group> 50 </el-radio-group>
51 </el-form-item> 51 </el-form-item>
52 </el-col> 52 </el-col>
53 <el-col :span="8"> 53 <el-col :span="8">
54 <el-form-item label="业务流程ID" prop="flowid"> 54 <el-form-item label="业务流程ID" prop="flowid" v-if="form.sqdjyw">
55 <el-input v-model="form.ywDetail.flowid"></el-input> 55 <el-input v-model="form.sqdjyw.flowid"></el-input>
56 </el-form-item> 56 </el-form-item>
57 </el-col> 57 </el-col>
58 <el-col :span="8"> 58 <el-col :span="24">
59 <el-form-item label="流程参数" prop="flowparams"> 59 <el-form-item label="流程参数" prop="flowparams" v-if="form.sqdjyw">
60 <el-input v-model="form.ywDetail.flowparams"></el-input> 60 <el-input v-model="form.sqdjyw.flowparams"></el-input>
61 </el-form-item> 61 </el-form-item>
62 </el-col> 62 </el-col>
63 </el-row> 63 </el-row>
64 64
65 <el-row> 65 <el-row>
66 <el-col :span="8"> 66 <el-col :span="8">
67 <el-form-item label="登记原因设置" prop="sfqydjyymb"> 67 <el-form-item label="登记原因设置" prop="sfqydjyymb" v-if="form.sqdjyw">
68 <el-radio-group v-model="form.ywDetail.sfqydjyymb"> 68 <el-radio-group v-model="form.sqdjyw.sfqydjyymb">
69 <el-radio label="1">启用</el-radio> 69 <el-radio label="1">启用</el-radio>
70 <el-radio label="0">禁用</el-radio> 70 <el-radio label="0">禁用</el-radio>
71 </el-radio-group> 71 </el-radio-group>
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
73 </el-col> 73 </el-col>
74 <el-col :span="8"> 74 <el-col :span="8">
75 <el-form-item label="登记情形及材料"> 75 <el-form-item label="登记情形及材料">
76 <el-input v-model="form.ywDetail.djqxcl" placeholder="仅支持execl文件导入"></el-input> 76 <el-input v-model="form.fileUrl" placeholder="仅支持execl文件导入"></el-input>
77 </el-form-item> 77 </el-form-item>
78 </el-col> 78 </el-col>
79 <el-col :span="1"> 79 <el-col :span="1">
...@@ -85,8 +85,8 @@ ...@@ -85,8 +85,8 @@
85 </el-row> 85 </el-row>
86 <el-row> 86 <el-row>
87 <el-col :span="24"> 87 <el-col :span="24">
88 <el-form-item label="登记原因模板" prop="djyy"> 88 <el-form-item label="登记原因模板" prop="djyy" v-if="form.sqdjyw">
89 <el-input type="textarea" :rows="4" placeholder="请输入内容" v-model="form.ywDetail.djyy"> 89 <el-input type="textarea" :rows="4" placeholder="请输入内容" v-model="form.sqdjyw.djyy">
90 </el-input> 90 </el-input>
91 </el-form-item> 91 </el-form-item>
92 </el-col> 92 </el-col>
...@@ -102,7 +102,7 @@ ...@@ -102,7 +102,7 @@
102 :pagination="false" :data="form.clxx"> 102 :pagination="false" :data="form.clxx">
103 </lb-table> 103 </lb-table>
104 </el-collapse-item> 104 </el-collapse-item>
105 <el-collapse-item title="刷选权利设置" name="3" v-if="form.ywDetail.sfsxql == '1'"> 105 <el-collapse-item title="刷选权利设置" name="3" v-if="form.sqdjyw && form.sqdjyw.sfsxql == '1'">
106 <div class="dyztsd-title"> 106 <div class="dyztsd-title">
107 <b>请勾选需要查询的权利信息</b> 107 <b>请勾选需要查询的权利信息</b>
108 <div> 108 <div>
...@@ -143,6 +143,7 @@ ...@@ -143,6 +143,7 @@
143 import { upward, down } from "@/utils/operation"; 143 import { upward, down } from "@/utils/operation";
144 import { getDjlxInfo, getSqdjywDetail, saveSqdjyw } from "@/api/sysSqdjyw.js"; 144 import { getDjlxInfo, getSqdjywDetail, saveSqdjyw } from "@/api/sysSqdjyw.js";
145 import { datas, sendThis } from "./sqywDetail"; 145 import { datas, sendThis } from "./sqywDetail";
146 import store from '@/store/index.js'
146 export default { 147 export default {
147 name: "componentDialog", 148 name: "componentDialog",
148 props: { 149 props: {
...@@ -151,21 +152,27 @@ ...@@ -151,21 +152,27 @@
151 default: () => { } 152 default: () => { }
152 } 153 }
153 }, 154 },
155
154 data () { 156 data () {
155 return { 157 return {
156 key: 0, 158 key: 0,
157 tn: 0, 159 tn: 0,
158 n: 0, 160 n: 0,
159 djlxList: [], 161 djlxList: [],
160 options: [], 162 sqywdylx:store.getters.dictData['sqywdylx'],
163 options: [
164 {label:"正常申请",value:"1"},
165 {label:"一并申请",value:"2"},
166 {label:"补录申请",value:"3"}
167 ],
161 imgUploadUrl: uploadUrl(), 168 imgUploadUrl: uploadUrl(),
162 title: "", 169 title: "",
163 activeName: "1", 170 activeName: "1",
164 form: { 171 form: {
165 bsmSqyw: '', 172 // bsmSqyw: '',
166 ywDetail: {}, 173 // ywDetail: {},
167 djqx: [], 174 // djqx: [],
168 clxx: [] 175 // clxx: []
169 }, 176 },
170 djqxCol: datas.djqxCol(), 177 djqxCol: datas.djqxCol(),
171 clxxCol: datas.clxxCol(), 178 clxxCol: datas.clxxCol(),
...@@ -248,13 +255,16 @@ ...@@ -248,13 +255,16 @@
248 let _this = this 255 let _this = this
249 getSqdjywDetail(bsmSqyw).then((res) => { 256 getSqdjywDetail(bsmSqyw).then((res) => {
250 if (res.code === 200) { 257 if (res.code === 200) {
251 _this.form.bsmSqyw = res.result.bsmSqyw 258 _this.form=res.result;
252 _this.form.ywDetail = res.result.ywDetail 259 // _this.form.bsmSqyw = res.result.bsmSqyw;
253 _this.$set(_this.form, 'djqx', res.result.djqx) 260 // _this.form.ywDetail = res.result.ywDetail;
254 _this.$set(_this.form, 'sxql', res.result.sxql) 261 // _this.$set(_this.form, 'djqx', res.result.djqx);
255 _this.$set(_this.form, 'clxx', res.result.clxx) 262 // _this.$set(_this.form, 'sxql', res.result.sxql);
256 _this.$set(_this.form, 'sxzt', res.result.sxzt) 263 // _this.$set(_this.form, 'clxx', res.result.clxx);
257 _this.$set(_this.form, 'ywDetail', res.result.ywDetail) 264 // _this.$set(_this.form, 'sxzt', res.result.sxzt);
265 // _this.$set(_this.form, 'ywDetail', res.result.ywDetail);
266 // _this.$set(_this.form, 'sqdjyw', res.result.sqdjyw);
267 // _this.$set(_this.form, 'parentRule', res.result.parentRule);
258 } else { 268 } else {
259 this.$alert(res.message) 269 this.$alert(res.message)
260 } 270 }
......
...@@ -61,11 +61,11 @@ class data extends filter { ...@@ -61,11 +61,11 @@ class data extends filter {
61 61
62 }, 62 },
63 { 63 {
64 prop: "czsj", 64 prop: "updatetime",
65 label: "最近操作时间" 65 label: "最近操作时间"
66 }, 66 },
67 { 67 {
68 prop: "czr", 68 prop: "updater",
69 label: "最近操作人" 69 label: "最近操作人"
70 }, 70 },
71 71
......
...@@ -94,10 +94,6 @@ ...@@ -94,10 +94,6 @@
94 data: [], 94 data: [],
95 }, 95 },
96 bdcdysz: [], 96 bdcdysz: [],
97 bsmSqyw:
98 this.sqywInfo.nodetype === "djlx"
99 ? this.sqywInfo.bsmSqyw
100 : this.sqywInfo.parentid,
101 }; 97 };
102 }, 98 },
103 mounted () { 99 mounted () {
...@@ -131,12 +127,8 @@ ...@@ -131,12 +127,8 @@
131 if (!this.isJump) { 127 if (!this.isJump) {
132 this.loading = true 128 this.loading = true
133 startBusinessFlow({ 129 startBusinessFlow({
134 bsmSqyw: this.bsmSqyw, 130 bsmSqyw: this.sqywInfo.bsmSqyw,
135 bdcdysz: this.bdcdysz, 131 bdcdysz: this.bdcdysz,
136 djqxbm:
137 this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodecode : "",
138 djqxmc:
139 this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodename : "",
140 }).then((res) => { 132 }).then((res) => {
141 this.loading = false 133 this.loading = false
142 if (res.code == 200) { 134 if (res.code == 200) {
......
...@@ -96,6 +96,7 @@ ...@@ -96,6 +96,7 @@
96 * @author: renchao 96 * @author: renchao
97 */ 97 */
98 queryClick () { 98 queryClick () {
99 console.log("sdfsdf");
99 this.$startLoading(); 100 this.$startLoading();
100 this.queryForm.sqywbm = this.sqywInfo.djywbm; 101 this.queryForm.sqywbm = this.sqywInfo.djywbm;
101 selectDiyaq({ ...this.queryForm, ...this.pageData }).then((res) => { 102 selectDiyaq({ ...this.queryForm, ...this.pageData }).then((res) => {
...@@ -116,12 +117,12 @@ ...@@ -116,12 +117,12 @@
116 this.$message.error("请至少选择一条数据"); 117 this.$message.error("请至少选择一条数据");
117 return; 118 return;
118 } 119 }
119 this.loading = true 120 this.loading = true;
120 startBusinessFlow({ 121 startBusinessFlow({
121 bsmSqyw: this.sqywInfo.parentid, 122 bsmSqyw: this.sqywInfo.bsmSqyw,
122 bdcdysz: this.bdcdysz, 123 bdcdysz: this.bdcdysz,
123 djqxbm: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodecode : "", 124 // djqxbm: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodecode : "",
124 djqxmc: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodename : "", 125 // djqxmc: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodename : "",
125 }).then((res) => { 126 }).then((res) => {
126 this.loading = false 127 this.loading = false
127 if (res.code == 200) { 128 if (res.code == 200) {
......
...@@ -168,10 +168,6 @@ ...@@ -168,10 +168,6 @@
168 data: [], 168 data: [],
169 }, 169 },
170 bdcdysz: [], 170 bdcdysz: [],
171 bsmSqyw:
172 this.sqywInfo.nodetype === "djlx"
173 ? this.sqywInfo.bsmSqyw
174 : this.sqywInfo.parentid,
175 }; 171 };
176 }, 172 },
177 mounted () { 173 mounted () {
...@@ -243,12 +239,10 @@ ...@@ -243,12 +239,10 @@
243 if (!this.isJump) { 239 if (!this.isJump) {
244 this.loading = true 240 this.loading = true
245 startBusinessFlow({ 241 startBusinessFlow({
246 bsmSqyw: this.bsmSqyw, 242 bsmSqyw: this.sqywInfo.bsmSqyw,
247 //sjlx: 'zrz', 243 //sjlx: 'zrz',
248 sjlx: this.activeName, 244 sjlx: this.activeName,
249 bdcdysz: this.bdcdysz, 245 bdcdysz: this.bdcdysz,
250 djqxbm: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodecode : "",
251 djqxmc: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodename : "",
252 }).then((res) => { 246 }).then((res) => {
253 this.loading = false 247 this.loading = false
254 if (res.code == 200) { 248 if (res.code == 200) {
......
...@@ -70,10 +70,6 @@ ...@@ -70,10 +70,6 @@
70 data: [], 70 data: [],
71 }, 71 },
72 bdcdysz: [], 72 bdcdysz: [],
73 bsmSqyw:
74 this.sqywInfo.nodetype === "djlx"
75 ? this.sqywInfo.bsmSqyw
76 : this.sqywInfo.parentid,
77 }; 73 };
78 }, 74 },
79 mounted () { 75 mounted () {
...@@ -107,10 +103,8 @@ ...@@ -107,10 +103,8 @@
107 } 103 }
108 this.loading = true 104 this.loading = true
109 startBusinessFlow({ 105 startBusinessFlow({
110 bsmSqyw: this.bsmSqyw, 106 bsmSqyw: this.sqywInfo.bsmSqyw,
111 bdcdysz: this.bdcdysz, 107 bdcdysz: this.bdcdysz,
112 djqxbm: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodecode : "",
113 djqxmc: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodename : "",
114 }).then((res) => { 108 }).then((res) => {
115 this.loading = false 109 this.loading = false
116 if (res.code == 200) { 110 if (res.code == 200) {
......
...@@ -104,10 +104,8 @@ ...@@ -104,10 +104,8 @@
104 } 104 }
105 this.loading = true 105 this.loading = true
106 startBusinessFlow({ 106 startBusinessFlow({
107 bsmSqyw: this.sqywInfo.parentid, 107 bsmSqyw: this.sqywInfo.bsmSqyw,
108 bdcdysz: this.bdcdysz, 108 bdcdysz: this.bdcdysz,
109 djqxbm: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodecode : "",
110 djqxmc: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodename : "",
111 }).then((res) => { 109 }).then((res) => {
112 this.loading = false 110 this.loading = false
113 if (res.code == 200) { 111 if (res.code == 200) {
......
...@@ -85,11 +85,7 @@ ...@@ -85,11 +85,7 @@
85 columns: datas.columns(), 85 columns: datas.columns(),
86 data: [], 86 data: [],
87 }, 87 },
88 bdcdysz: [], 88 bdcdysz: [],
89 bsmSqyw:
90 this.sqywInfo.nodetype === "djlx"
91 ? this.sqywInfo.bsmSqyw
92 : this.sqywInfo.parentid,
93 }; 89 };
94 }, 90 },
95 mounted () { 91 mounted () {
...@@ -111,7 +107,7 @@ ...@@ -111,7 +107,7 @@
111 */ 107 */
112 queryClick () { 108 queryClick () {
113 this.$startLoading(); 109 this.$startLoading();
114 this.queryForm.bsmSqyw = this.bsmSqyw; 110 this.queryForm.bsmSqyw = this.sqywInfo.bsmSqyw;
115 selectQlxx({ ...this.queryForm, ...this.pageData }).then((res) => { 111 selectQlxx({ ...this.queryForm, ...this.pageData }).then((res) => {
116 this.$endLoading(); 112 this.$endLoading();
117 if (res.code === 200) { 113 if (res.code === 200) {
...@@ -132,10 +128,8 @@ ...@@ -132,10 +128,8 @@
132 } 128 }
133 this.loading = true 129 this.loading = true
134 startBusinessFlow({ 130 startBusinessFlow({
135 bsmSqyw: this.bsmSqyw, 131 bsmSqyw: this.sqywInfo.bsmSqyw,
136 bdcdysz: this.bdcdysz, 132 bdcdysz: this.bdcdysz,
137 djqxbm: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodecode : "",
138 djqxmc: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodename : "",
139 }).then((res) => { 133 }).then((res) => {
140 this.loading = false 134 this.loading = false
141 if (res.code == 200) { 135 if (res.code == 200) {
......
...@@ -111,8 +111,6 @@ ...@@ -111,8 +111,6 @@
111 startBusinessFlow({ 111 startBusinessFlow({
112 bsmSqyw: this.sqywInfo.bsmSqyw, 112 bsmSqyw: this.sqywInfo.bsmSqyw,
113 bdcdysz: this.bdcdysz, 113 bdcdysz: this.bdcdysz,
114 djqxbm: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodecode : "",
115 djqxmc: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodename : "",
116 }).then((res) => { 114 }).then((res) => {
117 this.loading = false 115 this.loading = false
118 if (res.code == 200) { 116 if (res.code == 200) {
......
...@@ -110,8 +110,6 @@ ...@@ -110,8 +110,6 @@
110 startBusinessFlow({ 110 startBusinessFlow({
111 bsmSqyw: this.sqywInfo.bsmSqyw, 111 bsmSqyw: this.sqywInfo.bsmSqyw,
112 bdcdysz: this.bdcdysz, 112 bdcdysz: this.bdcdysz,
113 djqxbm: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodecode : "",
114 djqxmc: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodename : "",
115 }).then((res) => { 113 }).then((res) => {
116 this.loading = false 114 this.loading = false
117 if (res.code == 200) { 115 if (res.code == 200) {
......
...@@ -117,10 +117,8 @@ ...@@ -117,10 +117,8 @@
117 } 117 }
118 this.loading = true 118 this.loading = true
119 startBusinessFlow({ 119 startBusinessFlow({
120 bsmSqyw: this.sqywInfo.parentid, 120 bsmSqyw: this.sqywInfo.bsmSqyw,
121 bdcdysz: this.bdcdysz, 121 bdcdysz: this.bdcdysz,
122 djqxbm: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodecode : "",
123 djqxmc: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodename : "",
124 }).then((res) => { 122 }).then((res) => {
125 this.loading = false 123 this.loading = false
126 if (res.code == 200) { 124 if (res.code == 200) {
......
...@@ -237,10 +237,8 @@ ...@@ -237,10 +237,8 @@
237 submitForm () { 237 submitForm () {
238 this.loading = true 238 this.loading = true
239 startBusinessFlow({ 239 startBusinessFlow({
240 bsmSqyw: this.sqywInfo.parentid, 240 bsmSqyw: this.sqywInfo.bsmSqyw,
241 bdcdysz: this.bdcdysz, 241 bdcdysz: this.bdcdysz,
242 djqxbm: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodecode : "",
243 djqxmc: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodename : "",
244 }).then((res) => { 242 }).then((res) => {
245 this.loading = false 243 this.loading = false
246 if (res.code == 200) { 244 if (res.code == 200) {
......
...@@ -76,10 +76,6 @@ ...@@ -76,10 +76,6 @@
76 data: [], 76 data: [],
77 }, 77 },
78 bdcdysz: [], 78 bdcdysz: [],
79 bsmSqyw:
80 this.sqywInfo.nodetype === "djlx"
81 ? this.sqywInfo.bsmSqyw
82 : this.sqywInfo.parentid,
83 }; 79 };
84 }, 80 },
85 mounted () { 81 mounted () {
...@@ -114,10 +110,8 @@ ...@@ -114,10 +110,8 @@
114 } 110 }
115 this.loading = true 111 this.loading = true
116 startBusinessFlow({ 112 startBusinessFlow({
117 bsmSqyw: this.bsmSqyw, 113 bsmSqyw: this.sqywInfo.bsmSqyw,
118 bdcdysz: this.bdcdysz, 114 bdcdysz: this.bdcdysz,
119 djqxbm: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodecode : "",
120 djqxmc: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodename : "",
121 }).then((res) => { 115 }).then((res) => {
122 this.loading = false 116 this.loading = false
123 if (res.code == 200) { 117 if (res.code == 200) {
......
...@@ -76,10 +76,6 @@ ...@@ -76,10 +76,6 @@
76 data: [], 76 data: [],
77 }, 77 },
78 bdcdysz: [], 78 bdcdysz: [],
79 bsmSqyw:
80 this.sqywInfo.nodetype === "djlx"
81 ? this.sqywInfo.bsmSqyw
82 : this.sqywInfo.parentid,
83 }; 79 };
84 }, 80 },
85 mounted () { 81 mounted () {
......
...@@ -76,10 +76,6 @@ ...@@ -76,10 +76,6 @@
76 data: [], 76 data: [],
77 }, 77 },
78 bdcdysz: [], 78 bdcdysz: [],
79 bsmSqyw:
80 this.sqywInfo.nodetype === "djlx"
81 ? this.sqywInfo.bsmSqyw
82 : this.sqywInfo.parentid,
83 }; 79 };
84 }, 80 },
85 mounted () { 81 mounted () {
...@@ -114,10 +110,8 @@ ...@@ -114,10 +110,8 @@
114 } 110 }
115 this.loading = true 111 this.loading = true
116 startBusinessFlow({ 112 startBusinessFlow({
117 bsmSqyw: this.bsmSqyw, 113 bsmSqyw: this.sqywInfo.bsmSqyw,
118 bdcdysz: this.bdcdysz, 114 bdcdysz: this.bdcdysz,
119 djqxbm: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodecode : "",
120 djqxmc: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodename : "",
121 }).then((res) => { 115 }).then((res) => {
122 this.loading = false 116 this.loading = false
123 if (res.code == 200) { 117 if (res.code == 200) {
......
...@@ -117,10 +117,8 @@ ...@@ -117,10 +117,8 @@
117 } 117 }
118 this.loading = true 118 this.loading = true
119 startBusinessFlow({ 119 startBusinessFlow({
120 bsmSqyw: this.sqywInfo.parentid, 120 bsmSqyw: this.sqywInfo.bsmSqyw,
121 bdcdysz: this.bdcdysz, 121 bdcdysz: this.bdcdysz,
122 djqxbm: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodecode : "",
123 djqxmc: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodename : "",
124 }).then((res) => { 122 }).then((res) => {
125 this.loading = false 123 this.loading = false
126 if (res.code == 200) { 124 if (res.code == 200) {
......
...@@ -110,8 +110,6 @@ ...@@ -110,8 +110,6 @@
110 startTogetherFlow({ 110 startTogetherFlow({
111 bsmSqyw: this.sqywInfo.bsmSqyw, 111 bsmSqyw: this.sqywInfo.bsmSqyw,
112 bdcdysz: this.bdcdysz, 112 bdcdysz: this.bdcdysz,
113 djqxbm: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodecode : "",
114 djqxmc: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodename : "",
115 }).then((res) => { 113 }).then((res) => {
116 this.loading = false 114 this.loading = false
117 if (res.code == 200) { 115 if (res.code == 200) {
......
...@@ -109,8 +109,6 @@ ...@@ -109,8 +109,6 @@
109 startTogetherFlow({ 109 startTogetherFlow({
110 bsmSqyw: this.sqywInfo.bsmSqyw, 110 bsmSqyw: this.sqywInfo.bsmSqyw,
111 bdcdysz: this.bdcdysz, 111 bdcdysz: this.bdcdysz,
112 djqxbm: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodecode : "",
113 djqxmc: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodename : "",
114 }).then((res) => { 112 }).then((res) => {
115 if (res.code == 200) { 113 if (res.code == 200) {
116 this.$message({ 114 this.$message({
......
...@@ -109,9 +109,7 @@ ...@@ -109,9 +109,7 @@
109 this.loading = true 109 this.loading = true
110 startTogetherFlow({ 110 startTogetherFlow({
111 bsmSqyw: this.sqywInfo.bsmSqyw, 111 bsmSqyw: this.sqywInfo.bsmSqyw,
112 bdcdysz: this.bdcdysz, 112 bdcdysz: this.bdcdysz
113 djqxbm: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodecode : "",
114 djqxmc: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodename : "",
115 }).then((res) => { 113 }).then((res) => {
116 this.loading = false 114 this.loading = false
117 if (res.code == 200) { 115 if (res.code == 200) {
......
...@@ -110,8 +110,6 @@ ...@@ -110,8 +110,6 @@
110 startBusinessFlow({ 110 startBusinessFlow({
111 bsmSqyw: this.sqywInfo.bsmSqyw, 111 bsmSqyw: this.sqywInfo.bsmSqyw,
112 bdcdysz: this.bdcdysz, 112 bdcdysz: this.bdcdysz,
113 djqxbm: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodecode : "",
114 djqxmc: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodename : "",
115 }).then((res) => { 113 }).then((res) => {
116 this.loading = false 114 this.loading = false
117 if (res.code == 200) { 115 if (res.code == 200) {
......
...@@ -111,8 +111,6 @@ ...@@ -111,8 +111,6 @@
111 startBusinessFlow({ 111 startBusinessFlow({
112 bsmSqyw: this.sqywInfo.bsmSqyw, 112 bsmSqyw: this.sqywInfo.bsmSqyw,
113 bdcdysz: this.bdcdysz, 113 bdcdysz: this.bdcdysz,
114 djqxbm: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodecode : "",
115 djqxmc: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodename : "",
116 }).then((res) => { 114 }).then((res) => {
117 this.loading = false 115 this.loading = false
118 if (res.code == 200) { 116 if (res.code == 200) {
......
...@@ -112,8 +112,6 @@ ...@@ -112,8 +112,6 @@
112 startBusinessFlow({ 112 startBusinessFlow({
113 bsmSqyw: this.sqywInfo.bsmSqyw, 113 bsmSqyw: this.sqywInfo.bsmSqyw,
114 bdcdysz: this.bdcdysz, 114 bdcdysz: this.bdcdysz,
115 djqxbm: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodecode : "",
116 djqxmc: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodename : "",
117 }).then((res) => { 115 }).then((res) => {
118 this.loading = false 116 this.loading = false
119 if (res.code == 200) { 117 if (res.code == 200) {
......
...@@ -369,7 +369,12 @@ ...@@ -369,7 +369,12 @@
369 * @author: renchao 369 * @author: renchao
370 */ 370 */
371 openDialog () { 371 openDialog () {
372 let title = "申请业务:" + this.selectParam?.djywmc ? this.selectParam?.djywmc : ''; 372 let title = this.selectParam.djywmc;
373 if(this.selectParam.nodetype=="djqx"){
374 title+="("+this.selectParam.nodename+")";
375 }
376 //let title = "申请业务:";
377 //console.log(title);
373 this.$popupDialog(title, "ywbl/ywsq/selectBdc", { 'sqywInfo': this.selectParam }, "90%", true) 378 this.$popupDialog(title, "ywbl/ywsq/selectBdc", { 'sqywInfo': this.selectParam }, "90%", true)
374 }, 379 },
375 /** 380 /**
......
...@@ -37,8 +37,7 @@ ...@@ -37,8 +37,7 @@
37 * @param {*} view 37 * @param {*} view
38 * @author: renchao 38 * @author: renchao
39 */ 39 */
40 loadView (view) { 40 loadView (view) {
41 console.log(view, 'view');
42 return (r) => 41 return (r) =>
43 require.ensure([], () => r(require(`./components/${view}.vue`))); 42 require.ensure([], () => r(require(`./components/${view}.vue`)));
44 }, 43 },
......