Skip to content

bdc / bdcdj-web

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

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

2 parents 6ceeae76 27bcb363
Inline Side-by-side
Showing 2 changed files with 11 additions and 17 deletions
...@@ -72,7 +72,9 @@ export default { ...@@ -72,7 +72,9 @@ export default {
72 }, 72 },
73 render: { 73 render: {
74 handler(newValue, oldValue) { 74 handler(newValue, oldValue) {
75 if(newValue){
75 this.loadData(); 76 this.loadData();
77 }
76 }, 78 },
77 }, 79 },
78 immediate: true, 80 immediate: true,
......
...@@ -100,38 +100,30 @@ ...@@ -100,38 +100,30 @@
100 }, 100 },
101 { 101 {
102 prop: "sjsl", 102 prop: "sjsl",
103 label: "份数", 103 label: "收件数量",
104 width: "50", 104 width: "80",
105 render: (h, scope) => { 105 render: (h, scope) => {
106 return ( 106 return (
107 (this.formData.ableOperation && scope.row.isrequired != '1') ? 107 (this.formData.ableOperation && scope.row.isrequired != '1') ?
108 <el-input value={scope.row.sjsl} onInput={(val) => { scope.row.sjsl = val }}></el-input> : <span>{ 108 <el-input value={scope.row.sjsl} onInput={(val) => { scope.row.sjsl = val }}></el-input> : <span>{
109 scope.row.sjsl ? 109 scope.row.sjsl
110 <span>{scope.row.sjsl}</span> : 1
111 }</span> 110 }</span>
112 ) 111 )
113 } 112 }
114 }, 113 },
115 { 114 {
116 prop: "smzt", 115 prop: "smzt",
117 label: "扫描状态", 116 label: "扫描时间",
118 width: "80", 117 width: "80",
119 render: (h, scope) => { 118 render: (h, scope) => {
120 if (scope.row.children && scope.row.children.length > 0) {
121 return (
122 <div>
123 <span>已扫描</span>
124 </div>
125 );
126 } else {
127 return ( 119 return (
128 <div> 120 (this.formData.ableOperation && scope.row.isrequired != '1') ?
129 <span>未扫描</span> 121 <el-input value={scope.row.sjsl} onInput={(val) => { scope.row.sjsl = val }}></el-input> : <span>{
130 </div> 122 scope.row.sjsj
131 ); 123 }</span>
124 )
132 } 125 }
133 }, 126 },
134 },
135 { 127 {
136 label: "扫描页数", 128 label: "扫描页数",
137 width: "80", 129 width: "80",
......