|
|
@@ -129,14 +129,14 @@ if q2_result_count > 0: # 有執行項目(無預定完成日期)
|
|
|
r3['contract_time'] = '無'
|
|
|
|
|
|
print ('contract_time = ' + r3['contract_time']) # test
|
|
|
-
|
|
|
- if r3['set_date'] is None:
|
|
|
- r3['set_date'] = '無'
|
|
|
+
|
|
|
+ if r3['company'] is None:
|
|
|
+ r3['company'] = ''
|
|
|
|
|
|
print ('set_date = ' + r3['set_date']) # test
|
|
|
|
|
|
if idx < 1:
|
|
|
- html += "<tr><td rowspan='" + q3_result_count + "'>" + str(count) + "</td><td rowspan='" + q3_result_count + "'><a href='" + url + "' target='_blank'>" + r3['num'] + "</a></td><td rowspan='" + q3_result_count + "'>" + r3['company'] + "</td><td rowspan='" + q3_result_count + "'>" + str(r3['contract_time']) + "</td><td rowspan='" + q3_result_count + "'>" + r3['sales_man'] + "</td><td>" + r3['lv1'] + "_" + r3['lv2'] + "</td><td>" + str(r3['set_date']) + "</td><tr>"
|
|
|
+ html += "<tr><td rowspan='" + q3_result_count + "'>" + str(count) + "</td><td rowspan='" + q3_result_count + "'><a href='" + url + "' target='_blank'>" + r3['num'] + "</a></td><td rowspan='" + q3_result_count + "'>" + r3['company'] + "</td><td rowspan='" + q3_result_count + "'>" + str(r3['contract_time']) + "</td><td rowspan='" + q3_result_count + "'>" + r3['sales_man'] + "</td><td>" + r3['lv1'] + "_" + r3['lv2'] + "</td><tr>"
|
|
|
|
|
|
idx += 1
|
|
|
else:
|
