huwhois 4 jaren geleden
bovenliggende
commit
1846dff482
4 gewijzigde bestanden met toevoegingen van 4 en 2 verwijderingen
  1. 1 0
      application/index/model/Sales.php
  2. 1 1
      application/index/view/commission/input.html
  3. 2 1
      db/.gitignore
  4. BIN
      db/mysqlitedb.db

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

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

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

366
            option.contract_value = row[11];
366
            option.contract_value = row[11];
367
            option.seller = row[13];
367
            option.seller = row[13];
368
            option.shipping = row[15];
368
            option.shipping = row[15];
369
            option.former_id = row[0];
369
            option.former_id = row[16];
370
            conpanySalesData[key] = option;
370
            conpanySalesData[key] = option;
371
            if (option.former_id == former_id) {
371
            if (option.former_id == former_id) {
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>';
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
*.xls
1
*.xls
2
*.xlsx
2
*.xlsx
3
*.db

BIN
db/mysqlitedb.db