huwhois преди 4 години
родител
ревизия
2f52b70397
променени са 4 файла, в които са добавени 24 реда и са изтрити 19 реда
  1. 2 1
      application/index/controller/Commission.php
  2. 21 16
      application/index/view/commission/input.html
  3. 1 2
      db/.gitignore
  4. BIN
      db/mysqlitedb.db

+ 2 - 1
application/index/controller/Commission.php

@ -101,7 +101,8 @@ class Commission extends Controller
101 101
    public function perbalance()
102 102
    {
103 103
        $company = $this->params['company'];
104
104
        // var_dump($company);
105
        // exit;
105 106
        $sql = "select sum(receive_money - contract_value) as pb from commission where company='$company';" ;
106 107
107 108
        $sqlinitbalance = "select initial_balance from  company where name='$company';";

+ 21 - 16
application/index/view/commission/input.html

@ -124,7 +124,7 @@
124 124
                        <div class="col-md-6">
125 125
                            <div class="form-group">
126 126
                                <label for="name">上期余额</label>
127
                                <input type="number" class="form-control" name="period_balance" id="period_balance" placeholder="上期余额" disabled>
127
                                <input type="number" class="form-control" name="period_balance" id="period_balance" placeholder="上期余额">
128 128
                            </div>
129 129
                        </div>
130 130
                    </div>
@ -132,13 +132,13 @@
132 132
                        <div class="col-md-6">
133 133
                            <div class="form-group">
134 134
                                <label for="name">实收金额</label>
135
                                <input type="number" class="form-control" name="actual_money" id="actual_money" placeholder="实收金额" disabled="true">
135
                                <input type="number" class="form-control" name="actual_money" id="actual_money" placeholder="实收金额">
136 136
                            </div>
137 137
                        </div>
138 138
                        <div class="col-md-6">
139 139
                            <div class="form-group">
140 140
                                <label for="name">本期结余</label>
141
                                <input type="number" class="form-control" name="current_balance" id="current_balance" placeholder="本期结余" disabled="true">
141
                                <input type="number" class="form-control" name="current_balance" id="current_balance" placeholder="本期结余">
142 142
                            </div>
143 143
                        </div>
144 144
                    </div>
@ -169,7 +169,7 @@
169 169
                            <div class="col-md-6">
170 170
                                <div class="form-group">
171 171
                                    <label for="name">合同基准价</label>
172
                                    <input type="number" class="form-control" name="base_value" id="base_value" placeholder="合同基准价" disabled="true">
172
                                    <input type="number" class="form-control" name="base_value" id="base_value" placeholder="合同基准价">
173 173
                                </div>
174 174
                            </div>
175 175
                        </div>
@ -183,7 +183,7 @@
183 183
                            <div class="col-md-6">
184 184
                                <div class="form-group">
185 185
                                    <label for="name">总利润</label>
186
                                    <input type="number" class="form-control" name="total_profit" id="total_profit" placeholder="总利润" disabled="true">
186
                                    <input type="number" class="form-control" name="total_profit" id="total_profit" placeholder="总利润">
187 187
                                </div>
188 188
                            </div>
189 189
                        </div>
@ -207,19 +207,19 @@
207 207
                            <div class="col-md-4">
208 208
                                <div class="form-group">
209 209
                                    <label for="name">价格比例</label>
210
                                    <input type="number" class="form-control" name="price_rate" id="price_rate" placeholder="价格比例" disabled="true">
210
                                    <input type="number" class="form-control" name="price_rate" id="price_rate" placeholder="价格比例">
211 211
                                </div>
212 212
                            </div>
213 213
                            <div class="col-md-4">
214 214
                                <div class="form-group">
215 215
                                    <label for="name">提成比例</label>
216
                                    <input type="number" class="form-control" name="commission_rate" id="commission_rate" placeholder="提成比例" disabled="true">
216
                                    <input type="number" class="form-control" name="commission_rate" id="commission_rate" placeholder="提成比例">
217 217
                                </div>
218 218
                            </div>
219 219
                            <div class="col-md-4">
220 220
                                <div class="form-group">
221 221
                                    <label for="name">提成额</label>
222
                                    <input type="number" class="form-control" name="commission_money" id="commission_money" placeholder="提成额" disabled="true">
222
                                    <input type="number" class="form-control" name="commission_money" id="commission_money" placeholder="提成额">
223 223
                                </div>
224 224
                            </div>
225 225
                        </div>
@ -238,7 +238,6 @@
238 238
                            </div>
239 239
                        </div>
240 240
                    </div>
241
242 241
                    <div class="row">
243 242
                    </div>
244 243
                </form>
@ -386,6 +385,7 @@ function updatePeriodBalance() {
386 385
    $.post('/index/commission/perbalance', {
387 386
        'company': dataForm.company
388 387
    }, function(res) {
388
        console.log(res);
389 389
        if (res.code == 0) {
390 390
            dataForm.period_balance = res.data;
391 391
            $("#period_balance").val(dataForm.period_balance)
@ -422,17 +422,22 @@ $('#conpany_sales_data').change(function(){
422 422
        } else {
423 423
            dataForm.contract_value = Number(data.contract_value);
424 424
        }
425
        $("#contract_no").val(dataForm.contract_no)
426
        $("#goods_category").val(dataForm.goods_category)
427
        $("#goods_type").val(dataForm.goods_type)
428
        $("#amount").val(Number(dataForm.amount))
429
        $("#price").val(Number(dataForm.price))
425
        $("#contract_no").val(dataForm.contract_no);
426
        $("#goods_category").val(dataForm.goods_category);
427
        $("#goods_type").val(dataForm.goods_type);
428
        $("#amount").val(Number(dataForm.amount));
429
        $("#price").val(Number(dataForm.price));
430 430
        if (dataForm.contract_value<0) {
431 431
            $("#contract_value").css('color', 'red');
432 432
        }
433 433
        $("#contract_value").val(dataForm.contract_value);
434
        $("#seller").val(dataForm.seller)
435
        $("#shipping").val(Number(dataForm.shipping))
434
        $("#seller").val(dataForm.seller);
435
        $("#shipping").val(Number(dataForm.shipping));
436
        $("#agency").val(0);
437
        $("#receive_money").val(0);
438
        $("#actual_money").val(0);
439
        $("#current_balance").val(0);
440
        $("#project").val(0);
436 441
    }
437 442
})
438 443

+ 1 - 2
db/.gitignore

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

BIN
db/mysqlitedb.db