9864c025 by zhangmeng

看板

1 parent a3e9d62c
...@@ -133,14 +133,14 @@ async function handelGetYS006() { ...@@ -133,14 +133,14 @@ async function handelGetYS006() {
133 set1.value = [] 133 set1.value = []
134 set2.value = [] 134 set2.value = []
135 set3.value = [] 135 set3.value = []
136 s1.value = new Array(12).fill(0) 136 s1.value = [...new Array(12).fill(0)]
137 s2.value = new Array(12).fill(0) 137 s2.value = [...new Array(12).fill(0)]
138 s3.value = new Array(12).fill(0) 138 s3.value = [...new Array(12).fill(0)]
139 s4.value = new Array(12).fill(0) 139 s4.value = [...new Array(12).fill(0)]
140 140
141 h1.value = new Array(12).fill(0); // 初始化 12 个月,默认值 0 141 h1.value = [...new Array(12).fill(0)]// 初始化 12 个月,默认值 0
142 h2.value = new Array(12).fill(0); // 初始化 12 个月,默认值 0 142 h2.value = [...new Array(12).fill(0)] // 初始化 12 个月,默认值 0
143 h3.value = new Array(12).fill(JSON.stringify({value: 0, info: ''})); // 初始化 12 个月,默认值 0 143 h3.value = [...new Array(12).fill({value: 0, info: ''})] // 初始化 12 个月,默认值 0
144 // h3.value = new Array(12).fill(0); // 初始化 12 个月,默认值 0 144 // h3.value = new Array(12).fill(0); // 初始化 12 个月,默认值 0
145 type2.value = [] 145 type2.value = []
146 for (const v1 of list.value) { 146 for (const v1 of list.value) {
...@@ -168,10 +168,10 @@ async function handelGetYS006() { ...@@ -168,10 +168,10 @@ async function handelGetYS006() {
168 const i = v2.MONTH - 1; // 转为 0~11 的索引 168 const i = v2.MONTH - 1; // 转为 0~11 的索引
169 h1.value[i] += v2.YSDSK / 10000 || 0; 169 h1.value[i] += v2.YSDSK / 10000 || 0;
170 h2.value[i] += v2.SFDDQ / 10000 || 0; 170 h2.value[i] += v2.SFDDQ / 10000 || 0;
171 let obj = JSON.parse(h3.value[i]) 171 let obj = {...h3.value[i]}
172 obj.value += v2.HTDQ / 10000 || 0; 172 obj.value += v2.HTDQ / 10000 || 0;
173 obj.info += v2.YSWELLINFO; 173 obj.info += v2.YSWELLINFO;
174 h3.value[i] = JSON.stringify(obj) 174 h3.value[i] = {...obj}
175 s1.value[i] += v2.INCOME / 10000 || 0; 175 s1.value[i] += v2.INCOME / 10000 || 0;
176 s2.value[i] += v2.LASTINCOME / 10000 || 0; 176 s2.value[i] += v2.LASTINCOME / 10000 || 0;
177 s3.value[i] += v2.LASTYSBALANCE / 10000 || 0; 177 s3.value[i] += v2.LASTYSBALANCE / 10000 || 0;
...@@ -187,7 +187,7 @@ async function handelGetYS006() { ...@@ -187,7 +187,7 @@ async function handelGetYS006() {
187 type1.value.includes('2') ? s3.value : [], 187 type1.value.includes('2') ? s3.value : [],
188 type1.value.includes('2') ? s4.value : [] 188 type1.value.includes('2') ? s4.value : []
189 ) 189 )
190 h3.value = h3.value.map((item) => JSON.parse(item)) 190 // h3.value = h3.value.map((item) => JSON.parse(item))
191 setC(h1.value, h2.value, h3.value) 191 setC(h1.value, h2.value, h3.value)
192 } 192 }
193 193
...@@ -201,7 +201,12 @@ function handelSelect1() { ...@@ -201,7 +201,12 @@ function handelSelect1() {
201 } 201 }
202 202
203 function handelSelect2() { 203 function handelSelect2() {
204 s1.value = [...new Array(12).fill(0)]
205 s2.value = [...new Array(12).fill(0)]
206 s3.value = [...new Array(12).fill(0)]
207 s4.value = [...new Array(12).fill(0)]
204 let arr = type2.value.map(val => list.value.find(item => item.BASEJC === val)) 208 let arr = type2.value.map(val => list.value.find(item => item.BASEJC === val))
209
205 for (const v1 of arr) { 210 for (const v1 of arr) {
206 for (const v2 of v1.list) { 211 for (const v2 of v1.list) {
207 const i2 = v2.MONTH - 1; // 转为 0~11 的索引 212 const i2 = v2.MONTH - 1; // 转为 0~11 的索引
...@@ -221,35 +226,34 @@ function handelSelect2() { ...@@ -221,35 +226,34 @@ function handelSelect2() {
221 } 226 }
222 227
223 function handelSelect3() { 228 function handelSelect3() {
224 h1.value = [] 229 h1.value = [...new Array(12).fill(0)] // 初始化 12 个月,默认值 0
225 h2.value = [] 230 h2.value = [...new Array(12).fill(0)] // 初始化 12 个月,默认值 0
226 h3.value = [] 231 h3.value = [...new Array(12).fill({value: 0, info: ''})] // 初始化 12 个月,默认值 0
227 if (type3.value == '0') { 232 if (type3.value == '0') {
228 // h1.value.push(val.YSDSK)//应待收款 233 // h1.value.push(val.YSDSK)//应待收款
229 // h2.value.push(val.SFDDQ)//收费单待签 234 // h2.value.push(val.SFDDQ)//收费单待签
230 // h3.value.push(val.HTDQ)//合同待签 235 // h3.value.push(val.HTDQ)//合同待签
231 h1.value = new Array(12).fill(0); // 初始化 12 个月,默认值 0
232 h2.value = new Array(12).fill(0); // 初始化 12 个月,默认值 0
233 h3.value = new Array(12).fill(JSON.stringify({value: 0, info: ''})); // 初始化 12 个月,默认值 0
234
235 for (const department of list.value) { 236 for (const department of list.value) {
236 for (const monthData of department.list) { 237 for (const monthData of department.list) {
237 const i = monthData.MONTH - 1; // 转为 0~11 的索引 238 const i = monthData.MONTH - 1; // 转为 0~11 的索引
238 h1.value[i] += monthData.YSDSK / 10000 || 0; 239 h1.value[i] += monthData.YSDSK / 10000 || 0;
239 h2.value[i] += monthData.SFDDQ / 10000 || 0; 240 h2.value[i] += monthData.SFDDQ / 10000 || 0;
240 let obj = JSON.parse(h3.value[i]) 241 let obj = {...h3.value[i]}
241 obj.value += monthData.HTDQ / 10000 || 0; 242 obj.value += monthData.HTDQ / 10000 || 0;
242 obj.info += monthData.YSWELLINFO; 243 obj.info += monthData.YSWELLINFO;
243 h3.value[i] = JSON.stringify(obj) 244 h3.value[i] = {...obj}
244 } 245 }
245 } 246 }
246 h3.value = h3.value.map((item) => JSON.parse(item)) 247 // h3.value = h3.value.map((item) => JSON.parse(item))
247 } else { 248 } else {
248 // 找到对应的数据 249 // 找到对应的数据
250 h3.value = []
251 h2.value = []
252 h1.value = []
249 let obj = list.value.find(item => item.BASEJC === type3.value) 253 let obj = list.value.find(item => item.BASEJC === type3.value)
250 for (const val of obj.list) { 254 for (const val of obj.list) {
251 h1.value.push(val.YSDSK / 1000 || 0)//应待收款 255 h1.value.push(val.YSDSK / 10000 || 0)//应待收款
252 h2.value.push(val.SFDDQ / 1000 || 0)//收费单待签 256 h2.value.push(val.SFDDQ / 10000 || 0)//收费单待签
253 h3.value.push({ 257 h3.value.push({
254 value: val.HTDQ / 10000 || 0, 258 value: val.HTDQ / 10000 || 0,
255 info: val.YSWELLINFO 259 info: val.YSWELLINFO
......
...@@ -320,7 +320,7 @@ async function handelGetYS007() { ...@@ -320,7 +320,7 @@ async function handelGetYS007() {
320 320
321 321
322 const firstAbove = list7Y.value.find(v => v.name >= BC.value); 322 const firstAbove = list7Y.value.find(v => v.name >= BC.value);
323 setA(list7Y.value, arr1, arr2, arr3, firstAbove.value, BC.value) 323 setA(list7Y.value, arr1, arr2, arr3, firstAbove?.value, BC.value)
324 324
325 } 325 }
326 326
...@@ -352,7 +352,7 @@ function handelSelect7() { ...@@ -352,7 +352,7 @@ function handelSelect7() {
352 const firstAbove = list7Y.value.find(v => v.name >= BC.value); 352 const firstAbove = list7Y.value.find(v => v.name >= BC.value);
353 353
354 354
355 setA(list7Y.value, arr1, arr2, arr3, firstAbove.value, BC.value) 355 setA(list7Y.value, arr1, arr2, arr3, firstAbove?.value, BC.value)
356 } 356 }
357 357
358 async function handelGetYS008() { 358 async function handelGetYS008() {
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!