|
|
@@ -130,12 +130,21 @@ if q2_result_count > 0: # 有執行項目(無預定完成日期)
|
|
|
contract_time = '無'
|
|
|
|
|
|
print ('contract_time = ' + contract_time) # test
|
|
|
-
|
|
|
+
|
|
|
+ company = r3['company']
|
|
|
if r3['company'] is None:
|
|
|
- r3['company'] = ''
|
|
|
+ company = ''
|
|
|
+
|
|
|
+ sales_man = r3['sales_man']
|
|
|
+ if r3['sales_man'] is None:
|
|
|
+ sales_man = ''
|
|
|
+
|
|
|
+ contract_time = r3['contract_time']
|
|
|
+ if contract_time is None:
|
|
|
+ contract_time = '無'
|
|
|
|
|
|
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><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 + "'>" + company + "</td><td rowspan='" + q3_result_count + "'>" + str(contract_time) + "</td><td rowspan='" + q3_result_count + "'>" + sales_man + "</td><td>" + r3['lv1'] + "_" + r3['lv2'] + "</td><tr>"
|
|
|
|
|
|
idx += 1
|
|
|
else:
|
