Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
1f8226f9 by 蔡俊立
Options

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

2 parents a32e5e4b feddca71
Inline Side-by-side
Showing 5 changed files with 26 additions and 74 deletions
...@@ -190,6 +190,7 @@ export default { ...@@ -190,6 +190,7 @@ export default {
190 sfggcl: '1' 190 sfggcl: '1'
191 } 191 }
192 ) 192 )
193 this.key++
193 }, 194 },
194 handleSelectGgcl (item) { 195 handleSelectGgcl (item) {
195 if (item.sfggcl == '1') { 196 if (item.sfggcl == '1') {
......
...@@ -72,13 +72,8 @@ export default { ...@@ -72,13 +72,8 @@ export default {
72 render: (h, scope) => { 72 render: (h, scope) => {
73 return ( 73 return (
74 <div> 74 <div>
75 <el-input placeholder="登记情形编码" v-show={scope.row.nodecodeShow} v-fo class={{ repeat: scope.row.repeat }} disabled={scope.row.sftsdjqx == '1'} 75 <el-input placeholder="登记情形编码" class={{ repeat: scope.row.repeat }} disabled={scope.row.sftsdjqx == '1'}
76 value={scope.row[scope.column.property]} onFocus={() => { this.itemShowFalse(); scope.row.nodecodeShow = true; }} 76 value={scope.row[scope.column.property]}
77 onInput={(val) => { scope.row[scope.column.property] = val }} onBlur={() => { this.nodecodeBlur(scope.$index, scope.row) }} maxlength="8">
78 </el-input>
79
80 <el-input placeholder="登记情形编码" v-show={!scope.row.nodecodeShow} class={{ repeat: scope.row.repeat }} disabled={scope.row.sftsdjqx == '1'}
81 value={scope.row[scope.column.property]} onFocus={() => { this.itemShowFalse(); scope.row.nodecodeShow = true; }}
82 onInput={(val) => { scope.row[scope.column.property] = val }} onBlur={() => { this.nodecodeBlur(scope.$index, scope.row) }} maxlength="8"> 77 onInput={(val) => { scope.row[scope.column.property] = val }} onBlur={() => { this.nodecodeBlur(scope.$index, scope.row) }} maxlength="8">
83 </el-input> 78 </el-input>
84 </div> 79 </div>
...@@ -91,11 +86,8 @@ export default { ...@@ -91,11 +86,8 @@ export default {
91 render: (h, scope) => { 86 render: (h, scope) => {
92 return ( 87 return (
93 <div> 88 <div>
94 <el-input placeholder="登记情形名称" v-show={scope.row.nodenameShow} v-fo disabled={scope.row.sftsdjqx == '1'} value={scope.row[scope.column.property]} 89 <el-input placeholder="登记情形名称" disabled={scope.row.sftsdjqx == '1'}
95 onInput={(val) => { scope.row[scope.column.property] = val }} 90 value={scope.row[scope.column.property]}
96 onFocus={() => { this.itemShowFalse(); scope.row.nodenameShow = true; }}></el-input>
97 <el-input placeholder="登记情形名称" v-show={!scope.row.nodenameShow} disabled={scope.row.sftsdjqx == '1'}
98 onFocus={() => { this.itemShowFalse(); scope.row.nodenameShow = true; }} value={scope.row[scope.column.property]}
99 onInput={(val) => { scope.row[scope.column.property] = val }}></el-input> 91 onInput={(val) => { scope.row[scope.column.property] = val }}></el-input>
100 </div> 92 </div>
101 ) 93 )
...@@ -119,12 +111,8 @@ export default { ...@@ -119,12 +111,8 @@ export default {
119 render: (h, scope) => { 111 render: (h, scope) => {
120 return ( 112 return (
121 <div> 113 <div>
122 <el-input placeholder="登记原因模板" v-show={scope.row.djyyShow} v-fo disabled={scope.row.sftsdjqx == '1'} value={scope.row[scope.column.property]} 114 <el-input placeholder="登记原因模板" disabled={scope.row.sftsdjqx == '1'} value={scope.row[scope.column.property]}
123 onInput={(val) => { scope.row[scope.column.property] = val }} 115 onInput={(val) => { scope.row[scope.column.property] = val }}></el-input>
124 onFocus={() => { this.itemShowFalse(); scope.row.djyyShow = true; }}></el-input>
125 <el-input placeholder="登记原因模板" v-show={!scope.row.djyyShow} v-fo disabled={scope.row.sftsdjqx == '1'} value={scope.row[scope.column.property]}
126 onInput={(val) => { scope.row[scope.column.property] = val }}
127 onFocus={() => { this.itemShowFalse(); scope.row.djyyShow = true; }}></el-input>
128 </div> 116 </div>
129 117
130 ) 118 )
...@@ -193,60 +181,25 @@ export default { ...@@ -193,60 +181,25 @@ export default {
193 // 添加索引 181 // 添加索引
194 addIndexes (data = this.tableData, isAdd = true) { 182 addIndexes (data = this.tableData, isAdd = true) {
195 data.forEach((item, index) => { 183 data.forEach((item, index) => {
196 if (index == 0) {
197 item.nodecodeShow = true
198 item.nodenameShow = false
199 item.djyyShow = false
200 } else {
201 item.nodecodeShow = false
202 item.nodenameShow = false
203 item.djyyShow = false
204 }
205 if (isAdd) { 184 if (isAdd) {
206 item.index = index + 1 185 item.index = index + 1
207 } 186 }
208 }) 187 })
209 }, 188 },
210 itemShowFalse () {
211 this.tableData.length > 0 && this.tableData.forEach((item, index) => {
212 item.nodecodeShow = true
213 item.nodenameShow = false
214 item.djyyShow = false
215 })
216 },
217 handleAdd () { 189 handleAdd () {
218 this.$nextTick(() => { 190 this.$nextTick(() => {
219 let container = this.$el.querySelector('.el-table__body-wrapper'); 191 let container = this.$el.querySelector('.el-table__body-wrapper');
220 container.scrollTop = container.scrollHeight; 192 container.scrollTop = container.scrollHeight;
221 }) 193 })
222 if (this.djqx.length > 0) { 194 this.tableData.push(
223 let code = this.tableData.slice(-1)[0].nodecode 195 {
224 let codeQ = code.slice(0, 6) 196 nodecode: '',
225 let len = '' 197 nodename: '',
226 if (this.tableData.length + 1 < 9) { 198 enabled: '1',
227 len = 0 + String(this.tableData.length + 1) 199 djyy: '',
228 } else { 200 sfqydjyymb: '0'
229 len = this.tableData.length + 1
230 } 201 }
231 this.tableData.push( 202 )
232 {
233 nodecode: codeQ + len,
234 nodename: '',
235 enabled: '1',
236 djyy: '',
237 sfqydjyymb: '0'
238 }
239 )
240 } else {
241 this.tableData.push(
242 {
243 nodename: '',
244 enabled: '1',
245 djyy: '',
246 sfqydjyymb: '0'
247 }
248 )
249 }
250 this.addIndexes() 203 this.addIndexes()
251 this.key++ 204 this.key++
252 }, 205 },
......
...@@ -240,13 +240,13 @@ export default { ...@@ -240,13 +240,13 @@ export default {
240 this.getSqdjywDetail(obj.bsmSqyw) 240 this.getSqdjywDetail(obj.bsmSqyw)
241 }, 241 },
242 getDjqxValue (val) { 242 getDjqxValue (val) {
243 if (_.isEqual(val.djqx, this.subData.djqx)) { 243 if (!_.isEqual(val.djqx, this.subData.djqx)) {
244 this.subData.djqx = val.djqx 244 this.subData.djqx = val.djqx
245 this.btnDisabled = val.btnDisabled 245 this.btnDisabled = val.btnDisabled
246 } 246 }
247 }, 247 },
248 getClgzValue (val) { 248 getClgzValue (val) {
249 if (_.isEqual(val, this.subData.clxx)) { 249 if (!_.isEqual(val, this.subData.clxx)) {
250 this.subData.clxx = val 250 this.subData.clxx = val
251 } 251 }
252 }, 252 },
......
...@@ -270,7 +270,7 @@ export default { ...@@ -270,7 +270,7 @@ export default {
270 @include flex; 270 @include flex;
271 width: 100%; 271 width: 100%;
272 height: 80px; 272 height: 80px;
273 background-color: #10CCB8; 273 background-color: #3498DB;
274 color: #ffffff; 274 color: #ffffff;
275 justify-content: space-between; 275 justify-content: space-between;
276 padding-left: 15px; 276 padding-left: 15px;
...@@ -294,11 +294,11 @@ export default { ...@@ -294,11 +294,11 @@ export default {
294 li:hover { 294 li:hover {
295 border: 1px solid #ffffff; 295 border: 1px solid #ffffff;
296 border-radius: 5px; 296 border-radius: 5px;
297 color: $light-blue ; 297 //color: $light-blue ;
298 298
299 299
300 .svg-icon { 300 .svg-icon {
301 color: $light-blue ; 301 //color: $light-blue ;
302 } 302 }
303 } 303 }
304 } 304 }
......
...@@ -4,13 +4,13 @@ ...@@ -4,13 +4,13 @@
4 </dialogBox> 4 </dialogBox>
5 </template> 5 </template>
6 <script> 6 <script>
7 import {queueDjywmc} from './fqsqdata.js'; 7 import { queueDjywmc } from './fqsqdata.js';
8 export default { 8 export default {
9 props: { 9 props: {
10 value: { type: Boolean, default: true }, 10 value: { type: Boolean, default: true },
11 bsmSqyw: { type: String, default: '' }, 11 bsmSqyw: { type: String, default: '' },
12 djywbm: { type: String, default: '' }, 12 djywbm: { type: String, default: '' },
13 djqxObj:{type: Object, default: ''} 13 djqxObj: { type: Object, default: '' }
14 }, 14 },
15 data () { 15 data () {
16 return { 16 return {
...@@ -23,27 +23,25 @@ export default { ...@@ -23,27 +23,25 @@ export default {
23 this.myValue = val 23 this.myValue = val
24 }, 24 },
25 djywbm (val) { 25 djywbm (val) {
26 //let itemObj = { 'A03100': 'scdj','A37100': 'scdy','B39800':'cfdj', default: 'scdj' }; 26 let dd = queueDjywmc(val);
27 // this.editItem = this.loadView(itemObj[val]);
28 let dd=queueDjywmc(val);
29 this.editItem = this.loadView(dd); 27 this.editItem = this.loadView(dd);
30 }, 28 },
31 }, 29 },
32 methods: { 30 methods: {
33 loadView (view) { 31 loadView (view) {
34 console.log(view); 32 console.log(view);
35 return r => require.ensure([], () => r(require(`../${view}.vue`))) 33 return r => require.ensure([], () => r(require(`../${view}.vue`)))
36 }, 34 },
37 closeDialog () { 35 closeDialog () {
38 this.$emit("input", false); 36 this.$emit("input", false);
39 } 37 }
40 38 }
41 },
42 }; 39 };
43 </script> 40 </script>
44 <style scoped lang="scss"> 41 <style scoped lang="scss">
45 @import "~@/styles/mixin.scss"; 42 @import "~@/styles/mixin.scss";
46 @import "~@/styles/public.scss"; 43 @import "~@/styles/public.scss";
44
47 /deep/.submit_button { 45 /deep/.submit_button {
48 text-align: center; 46 text-align: center;
49 padding: 10px; 47 padding: 10px;
......