MaiXinRong 5 лет назад
Родитель
Сommit
0e7f72bc2d
2 измененных файлов с 2 добавлено и 19 удалено
  1. 1 19
      app/public/js/ledger.js
  2. 1 0
      app/public/js/ledger_audit.js

+ 1 - 19
app/public/js/ledger.js

@@ -1171,7 +1171,7 @@ $(document).ready(function() {
                 if (!dealBills) {
                     dealBills = new DealBills('#deal-bills-spread', {
                         cols: [
-                            {title: '清单编号', field: 'b_code', hAlign: 0, width: 120, formatter: '@', readOnly: true},
+                            {title: '清单编号', field: 'code', hAlign: 0, width: 120, formatter: '@', readOnly: true},
                             {title: '名称', field: 'name', hAlign: 0, width: 230, formatter: '@', readOnly: true},
                             {title: '单位', field: 'unit', hAlign: 1, width: 50, formatter: '@', readOnly: true},
                             {title: '单价', field: 'unit_price', hAlign: 2, width: 50, readOnly: true},
@@ -1339,7 +1339,6 @@ $(document).ready(function() {
                     formData.append('file', file.files[0]);
                     postDataWithFile(self.url+'/upload-excel', formData, function (data) {
                         self.data = data;
-                        //self.calculateData();
                         SpreadJsObj.loadSheetData(self.spread.getActiveSheet(), 'data', data);
                         $('#upload-deal').modal('hide');
                     }, function () {
@@ -1644,23 +1643,6 @@ $(document).ready(function() {
             });
         }
     });
-    // $('#addAuditor').click(() => {
-    //     const data = {
-    //         auditorId: $('#addAuditor').attr('auditorId'),
-    //     };
-    //     postData('/tender/' + getTenderId() + '/ledger/audit/add', data, (data) => {
-    //         const html = [];
-    //         html.push('<li class="list-group-item" auditorId="'+ data.audit_id +'"><a href="javascript: void(0)" class="text-danger pull-right">移除</a>');
-    //         html.push('<span>');
-    //         html.push(data.audit_order + ' ');
-    //         html.push(data.name + ' ');
-    //         html.push('</span>');
-    //         html.push('<small class="text-muted">');
-    //         html.push(data.role);
-    //         html.push('</small></li>');
-    //         $('#auditors').append(html.join(''));
-    //     });
-    // });
     $('body').on('click', '#auditors li>a', function () {
         const li = $(this).parent();
         const data = {

+ 1 - 0
app/public/js/ledger_audit.js

@@ -156,6 +156,7 @@ $(document).ready(() => {
                         {title: '单位', field: 'unit', width: 50, formatter: '@', readOnly: true},
                         {title: '单价', field: 'unit_price', width: 50, readOnly: true},
                         {title: '数量', field: 'quantity', width: 50, readOnly: true},
+                        {title: '金額', field: 'total_price', width: 50, readOnly: true},
                     ],
                     emptyRows: 0,
                     headRows: 1,