huwhois 4 years ago
parent
commit
1846dff482

+ 1 - 0
application/index/model/Sales.php

@ -80,6 +80,7 @@ class Sales
80 80
                // $value = $curSheet->getCell($key)->getValue();  // 含公式
81 81
                $row[] = trim($curSheet->getCell($key)->getFormattedValue()); // 公式计算后的值
82 82
            }
83
            array_push($row, $k);
83 84
            $data[] = $row;
84 85
        }
85 86
        $this->salesData = $data;

+ 1 - 1
application/index/view/commission/input.html

@ -366,7 +366,7 @@ function getContractNoByCompany(company, former_id=0) {
366 366
            option.contract_value = row[11];
367 367
            option.seller = row[13];
368 368
            option.shipping = row[15];
369
            option.former_id = row[0];
369
            option.former_id = row[16];
370 370
            conpanySalesData[key] = option;
371 371
            if (option.former_id == former_id) {
372 372
                str += '<option value="' + key + '" selected>'+ option.former_id +','+ option.contract_no +','+option.goods_category+','+ option.goods_type+','+ option.amount+','+ option.price+','+ option.contract_value+'</option>';

+ 2 - 1
db/.gitignore

@ -1,2 +1,3 @@
1 1
*.xls
2
*.xlsx
2
*.xlsx
3
*.db

BIN
db/mysqlitedb.db