Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
b74765ce by renchao@pashanhoo.com
Options

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

2 parents 977185a7 e47bf81e
Inline Side-by-side
Showing 6 changed files with 67 additions and 53 deletions
...@@ -22,6 +22,7 @@ const getters = { ...@@ -22,6 +22,7 @@ const getters = {
22 // workflow 22 // workflow
23 isRefresh: state => state.user.isRefresh, 23 isRefresh: state => state.user.isRefresh,
24 workFresh: state => state.user.workFresh, 24 workFresh: state => state.user.workFresh,
25 yjsqOptions: state => state.workflow.yjsqOptions 25 yjsqOptions: state => state.workflow.yjsqOptions,
26 dqhj: state => state.getdqhj.dqhj
26 } 27 }
27 export default getters 28 export default getters
......
1 const state = {
2 dqhj: "",
3 }
4
5 const mutations = {
6 SET_DQHJ: (state, data) => {
7 state.dqhj = data
8 }
9 }
10
11 const actions = {
12 setdqjh ({ commit }, data) {
13 commit('SET_DQHJ', data)
14 }
15 }
16
17 export default {
18 namespaced: true,
19 state,
20 mutations,
21 actions
22 }
...@@ -75,23 +75,17 @@ import { mapGetters } from "vuex"; ...@@ -75,23 +75,17 @@ import { mapGetters } from "vuex";
75 import { getNewDatesh } from "@/utils/util"; 75 import { getNewDatesh } from "@/utils/util";
76 export default { 76 export default {
77 computed: { 77 computed: {
78 ...mapGetters(["userData", "yjsqOptions", "userInfo"]), 78 ...mapGetters(["dqhj", "yjsqOptions", "userInfo"]),
79 }, 79 },
80 data() { 80 data() {
81 return { 81 return {
82 isNoData: false,
83 currentindex: 0, 82 currentindex: 0,
84 bsmSlsq: "",
85 refresh: 10, 83 refresh: 10,
86 viewEdit: false, 84 viewEdit: false,
87 bsmSlsq: this.$route.query.bsmSlsq, 85 bsmSlsq: this.$route.query.bsmSlsq,
88 bestepid: this.$route.query.bestepid, 86 bestepid: this.$route.query.bestepid,
89 propsParam: {}, 87 propsParam: {},
90 tableData: [], 88 tableData: [],
91 falg: false,
92 falg1: false,
93 jdmc: "",
94 indexdqlc: 0,
95 shows: false, 89 shows: false,
96 }; 90 };
97 }, 91 },
...@@ -104,30 +98,44 @@ export default { ...@@ -104,30 +98,44 @@ export default {
104 deep: true, 98 deep: true,
105 immediate: true, 99 immediate: true,
106 }, 100 },
107 }, 101 dqhj: {
108 created() {}, 102 handler(val) {
109 mounted() {
110 this.propsParam = this.$attrs; 103 this.propsParam = this.$attrs;
111 this.viewEdit = this.$parent.currentSelectTab.ableOperation; 104 this.dataset()
105 if(this.$parent.dqhj){
112 this.getShList(); 106 this.getShList();
113
114 switch (this.$parent.dqhj) {
115 case "cs":
116 this.indexdqlc = 0;
117 this.jdmc = "初审";
118 break;
119 case "fs":
120 this.indexdqlc = 1;
121 this.jdmc = "复审";
122 break;
123 case "hd":
124 this.indexdqlc = 2;
125 this.jdmc = "核定";
126 break;
127 } 107 }
128 }, 108 },
109 deep: true,
110 immediate: true,
111 },
112
113 },
114 created() {},
129 methods: { 115 methods: {
130 /** 116 /**
117 * @description: dataset
118 * @param {*} 数据处理
119 * @author: renchao
120 */
121 dataset(){
122 this.viewEdit = this.$parent.currentSelectTab.ableOperation;
123 // switch (this.$parent.dqhj) {
124 // case "cs":
125 // this.indexdqlc = 0;
126 // this.jdmc = "初审";
127 // break;
128 // case "fs":
129 // this.indexdqlc = 1;
130 // this.jdmc = "复审";
131 // break;
132 // case "hd":
133 // this.indexdqlc = 2;
134 // this.jdmc = "核定";
135 // break;
136 // }
137 },
138 /**
131 * @description: getShList 139 * @description: getShList
132 * @param {*} obj 140 * @param {*} obj
133 * @author: renchao 141 * @author: renchao
...@@ -139,9 +147,8 @@ export default { ...@@ -139,9 +147,8 @@ export default {
139 formdata.append("bestepid", this.$route.query.bestepid); 147 formdata.append("bestepid", this.$route.query.bestepid);
140 148
141 getSpyjList(formdata).then((res) => { 149 getSpyjList(formdata).then((res) => {
142 this.$endLoading(); 150
143 if (res.code === 200 && res.result) { 151 if (res.code === 200 && res.result) {
144 this.$nextTick(() => {
145 this.tableData = res.result; 152 this.tableData = res.result;
146 if (this.shows) { 153 if (this.shows) {
147 this.shows = false; 154 this.shows = false;
...@@ -174,17 +181,14 @@ export default { ...@@ -174,17 +181,14 @@ export default {
174 item.show = false; 181 item.show = false;
175 } 182 }
176 }); 183 });
177 }); 184 this.$endLoading();
185
178 } 186 }
187
179 }); 188 });
189
180 }, 190 },
181 /** 191 /**
182 * @description: judgment
183 * @param {*} obj
184 * @author: renchao
185 */
186 judgment(obj) {},
187 /**
188 * @description: onSubmit 192 * @description: onSubmit
189 * @author: renchao 193 * @author: renchao
190 */ 194 */
...@@ -195,7 +199,7 @@ export default { ...@@ -195,7 +199,7 @@ export default {
195 item["czjg"] = "1"; 199 item["czjg"] = "1";
196 }); 200 });
197 var index = this.tableData.findIndex( 201 var index = this.tableData.findIndex(
198 (item) => item.shyj === null||item.shyj === "" 202 (item) => item.shyj ==null||item.shyj ==""
199 ); 203 );
200 if(index==-1){ 204 if(index==-1){
201 this.shows = true; 205 this.shows = true;
......
...@@ -60,6 +60,7 @@ export default { ...@@ -60,6 +60,7 @@ export default {
60 this.leftButtonList = res.result.button; 60 this.leftButtonList = res.result.button;
61 if (res.result.properties && res.result.properties.length) { 61 if (res.result.properties && res.result.properties.length) {
62 this.dqhj = res.result.properties[0].value 62 this.dqhj = res.result.properties[0].value
63 this.$store.dispatch('getdqhj/setdqjh', this.dqhj);
63 } 64 }
64 this.rightButtonList = res.result.operation; 65 this.rightButtonList = res.result.operation;
65 this.slsq = res.result.slsq 66 this.slsq = res.result.slsq
...@@ -220,7 +221,6 @@ export default { ...@@ -220,7 +221,6 @@ export default {
220 record(formdata).then((res) => { 221 record(formdata).then((res) => {
221 if (res.code === 200) { 222 if (res.code === 200) {
222 if (res.result.length === 1) { 223 if (res.result.length === 1) {
223 console.log(res.result, 'res.result');
224 res.result[0].state ? that.$message({ 224 res.result[0].state ? that.$message({
225 message: '登簿成功', 225 message: '登簿成功',
226 type: 'success' 226 type: 'success'
......
...@@ -174,7 +174,6 @@ ...@@ -174,7 +174,6 @@
174 <el-form-item label="共有方式："> 174 <el-form-item label="共有方式：">
175 <el-radio-group 175 <el-radio-group
176 :disabled="!viewEdit" 176 :disabled="!viewEdit"
177 @change="showCZInfo"
178 v-model="ruleForm.sldy.gyfs" 177 v-model="ruleForm.sldy.gyfs"
179 > 178 >
180 <el-radio label="0">单独所有</el-radio> 179 <el-radio label="0">单独所有</el-radio>
...@@ -359,13 +358,7 @@ export default { ...@@ -359,13 +358,7 @@ export default {
359 this.czrOptions = this.ruleForm.qlrList; 358 this.czrOptions = this.ruleForm.qlrList;
360 this.key++; 359 this.key++;
361 }, 360 },
362 // /** 361
363 // * @description: showCZInfo
364 // * @author: renchao
365 // */
366 // showCZInfo() {
367 // console.log(this.ruleForm.slsq.gyfs);
368 // },
369 // 是否持证人变化 362 // 是否持证人变化
370 /** 363 /**
371 * @description: 是否持证人变化 364 * @description: 是否持证人变化
......
...@@ -151,7 +151,6 @@ ...@@ -151,7 +151,6 @@
151 <el-form-item label="共有方式："> 151 <el-form-item label="共有方式：">
152 <el-radio-group 152 <el-radio-group
153 :disabled="!viewEdit" 153 :disabled="!viewEdit"
154 @change="showCZInfo"
155 v-model="ruleForm.sldyList[0].gyfs" 154 v-model="ruleForm.sldyList[0].gyfs"
156 > 155 >
157 <el-radio label="0">单独所有</el-radio> 156 <el-radio label="0">单独所有</el-radio>
...@@ -352,13 +351,8 @@ export default { ...@@ -352,13 +351,8 @@ export default {
352 this.ruleForm.qlrList = _.cloneDeep(val); 351 this.ruleForm.qlrList = _.cloneDeep(val);
353 this.czrOptions = this.ruleForm.qlrList; 352 this.czrOptions = this.ruleForm.qlrList;
354 }, 353 },
355 /** 354
356 * @description: showCZInfo 355
357 * @author: renchao
358 */
359 showCZInfo() {
360 // console.log(this.ruleForm.slsq.gyfs);
361 },
362 // 是否持证人变化 356 // 是否持证人变化
363 /** 357 /**
364 * @description: 是否持证人变化 358 * @description: 是否持证人变化
......