Skip to content

bdc / bdcdj-web

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

Merge branch 'dev'

2 parents 6ad279ff dd9c3579
Inline Side-by-side
Showing 2 changed files with 17 additions and 10 deletions
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
25 <el-col :span="24"> 25 <el-col :span="24">
26 <el-form-item label-width="0" class="opinion_item"> 26 <el-form-item label-width="0" class="opinion_item">
27 <el-input 27 <el-input
28 :disabled="!ableOperation" 28 :disabled="!ableOperation&&item.show"
29 type="textarea" 29 type="textarea"
30 :rows="4" 30 :rows="4"
31 class="opinion" 31 class="opinion"
...@@ -150,16 +150,20 @@ export default { ...@@ -150,16 +150,20 @@ export default {
150 this.$endLoading(); 150 this.$endLoading();
151 if (res.code === 200 && res.result) { 151 if (res.code === 200 && res.result) {
152 this.tableData = res.result; 152 this.tableData = res.result;
153 if (this.tableData.length == 0) { 153 if (this.tableData.length == 0&&this.jdmc=="初审") {
154 console.log(0); 154 console.log(0);
155 this.tableData.push({ jdmc: "初审" }); 155 this.tableData.push({ jdmc: "初审" });
156 }else if(this.tableData[this.tableData.length-1].jdmc=="初审") { 156 }else if(this.tableData[this.tableData.length-1].jdmc=="初审"&&this.jdmc=="复审") {
157 console.log(1); 157 console.log(1);
158 this.tableData.push({ jdmc: "复审" }); 158 this.tableData.push({ jdmc: "复审" });
159 }else if(this.tableData[this.tableData.length-1].jdmc=="复审") { 159 }else if(this.tableData[this.tableData.length-1].jdmc=="复审"&&this.jdmc=="核定") {
160 console.log(2); 160 console.log(2);
161 this.tableData.push({ jdmc: "核定" }); 161 this.tableData.push({ jdmc: "核定" });
162 } 162 }
163
164 if(this.$parent.dqhj=="cs"){
165 this.tableData[0].show=false
166 }
163 console.log("this.tableData", this.tableData); 167 console.log("this.tableData", this.tableData);
164 } 168 }
165 }); 169 });
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
25 <el-col :span="24"> 25 <el-col :span="24">
26 <el-form-item label-width="0" class="opinion_item"> 26 <el-form-item label-width="0" class="opinion_item">
27 <el-input 27 <el-input
28 :disabled="!ableOperation" 28 :disabled="!ableOperation&&item.show"
29 type="textarea" 29 type="textarea"
30 :rows="4" 30 :rows="4"
31 class="opinion" 31 class="opinion"
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
54 <el-form-item class="sjxzq" label="审核时间"> 54 <el-form-item class="sjxzq" label="审核时间">
55 <el-date-picker 55 <el-date-picker
56 :disabled="!ableOperation" 56 :disabled="!ableOperation"
57 v-model="item.shjssj" 57 v-model="item.shkssj"
58 type="date" 58 type="date"
59 placeholder="选择日期" 59 placeholder="选择日期"
60 value-format="yyyy-MM-dd HH:mm:ss" 60 value-format="yyyy-MM-dd HH:mm:ss"
...@@ -112,7 +112,7 @@ export default { ...@@ -112,7 +112,7 @@ export default {
112 created() {}, 112 created() {},
113 mounted() { 113 mounted() {
114 this.propsParam = this.$attrs; 114 this.propsParam = this.$attrs;
115 console.log("this.$parent.dqhj", this.$parent.dqhj); 115 console.log("this.$parent.dqhj111111111111111", this.$parent.dqhj);
116 this.ableOperation = this.$parent.currentSelectTab.ableOperation; 116 this.ableOperation = this.$parent.currentSelectTab.ableOperation;
117 // this.ableOperation = this.$parent.ableOperation; 117 // this.ableOperation = this.$parent.ableOperation;
118 this.getShList(); 118 this.getShList();
...@@ -151,6 +151,7 @@ export default { ...@@ -151,6 +151,7 @@ export default {
151 if (res.code === 200 && res.result) { 151 if (res.code === 200 && res.result) {
152 this.tableData = res.result; 152 this.tableData = res.result;
153 if (this.tableData.length == 0) { 153 if (this.tableData.length == 0) {
154 console.log(0);
154 this.tableData.push({ jdmc: "初审" }); 155 this.tableData.push({ jdmc: "初审" });
155 } 156 }
156 console.log("this.tableData", this.tableData); 157 console.log("this.tableData", this.tableData);
...@@ -170,13 +171,15 @@ export default { ...@@ -170,13 +171,15 @@ export default {
170 onSubmit() { 171 onSubmit() {
171 this.tableData.forEach((item, index) => { 172 this.tableData.forEach((item, index) => {
172 item["bsmBusiness"] = this.propsParam.bsmBusiness; 173 item["bsmBusiness"] = this.propsParam.bsmBusiness;
173 item["bestepid"] = this.$route.query.bestepid; 174 item["stepid"] = this.$route.query.bestepid;
174 item["shryxm"] = this.userInfo.name; 175 item["shryxm"] = this.userInfo.name;
175 item["userid"] = this.userInfo.id; 176 item["userid"] = this.userInfo.id;
176 item["shjssj"] = item.shkssj; 177 item["shjssj"] = item.shkssj;
177 item["czjg"] = "1"; 178 item["czjg"] = "1";
178 item["jddm"] = this.$parent.dqhj; 179 item["jddm"] = "cs"
179 item["jdmc"] = this.jdmc; 180 item["jdmc"] = "初审"
181 item["sxh"] = "1"
182
180 183
181 }); 184 });
182 console.log("this.tableData", this.tableData); 185 console.log("this.tableData", this.tableData);
......