更新工料机内容,删除基价单价后，也默认为0元

web/maintain/bills_lib/html/tezheng.html

@@ -165,6 +165,27 @@
             </div>
         </div>
     </div>
+    <!--弹出提示窗口-->
+    <button id="alertBtn" class="btn btn-primary btn-lg" data-toggle="modal" data-target="#alertDiv" style="display: none"></button>
+    <div class="modal fade" id="alertDiv" data-backdrop="static" style="display: none;" aria-hidden="true">
+        <input type="hidden"  value="123">
+        <div class="modal-dialog" role="document">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h5 class="modal-title">警告</h5>
+                    <button type="button" id="alertCls" class="close" data-dismiss="modal" aria-label="Close">
+                        <span aria-hidden="true">×</span>
+                    </button>
+                </div>
+                <div class="modal-body">
+                    <h5 class="text-danger" id="alertTxt">编号不存在，请重新输入！</h5>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-danger" id="alertCof" data-dismiss="modal">确认</button>
+                </div>
+            </div>
+        </div>
+    </div>
     <!-- JS. -->
     <script src="/lib/spreadjs/sheets/gc.spread.sheets.all.10.0.1.min.js"></script>
     <script>GC.Spread.Sheets.LicenseKey = "559432293813965#A0y3iTOzEDOzkjMyMDN9UTNiojIklkI1pjIEJCLi4TPB9mM5AFNTd4cvZ7SaJUVy3CWKtWYXx4VVhjMpp7dYNGdx2ia9sEVlZGOTh7NRlTUwkWR9wEV4gmbjBDZ4ElR8N7cGdHVvEWVBtCOwIGW0ZmeYVWVr3mI0IyUiwCMzETN8kzNzYTM0IicfJye&Qf35VfiEzRwEkI0IyQiwiIwEjL6ByUKBCZhVmcwNlI0IiTis7W0ICZyBlIsIyNyMzM5ADI5ADNwcTMwIjI0ICdyNkIsIibj9SbvNmL4N7bjRnch56ciojIz5GRiwiI8+Y9sWY9QmZ0Jyp96uL9v6L0wap9biY9qiq95q197Wr9g+89iojIh94Wiqi";</script>

web/maintain/bills_lib/scripts/db_controller.js

@@ -434,8 +434,6 @@ var tools = {
         args.sheet.options.isProtected = true;
         let dataCode =  args.col === 0 ? 'code' : 'content';
         let orgCode =  args.row < arr.length ? arr[args.row].data[dataCode] : '';
-        console.log(`orgC`);
-        console.log(orgCode);
         $('#alertCls').click(function () {
             args.sheet.options.isProtected = false;
             args.sheet.getCell(args.row, args.col).value(orgCode);
@@ -1860,13 +1858,7 @@ var itemsController = {
                 }
                 //处理重复
                 if(isRepeat){
-                    //todo:redirect focus
-                    if(id && newData){
-                        sheet.getCell(args.row, args.col, GC.Spread.Sheets.SheetArea.viewport).value(orgItemData);
-                    }
-                    else {
-                        sheet.getCell(args.row, args.col, GC.Spread.Sheets.SheetArea.viewport).value('');
-                    }
+                    tools.alertOpr(args, sheet, '该项目特征已存在！', controller.tree.selected.items, 'item');
                 }
             }
             else {
@@ -1893,20 +1885,7 @@ var itemsController = {
             });
         }
         else {
-            if(typeof newData === 'number'){
-                sheet.getCell(args.row, args.col).value('');
-            }
-            else {
-                $('#alertBtn').click();
-                sheet.options.isProtected = true;
-                let orgCode =  args.row < controller.tree.selected.items.length ? controller.tree.selected.items[args.row].item.data.code : '';
-                $('#alertCls').click(function () {
-                    sheet.getCell(args.row, args.col).value(orgCode);
-                });
-                $('#alertCof').click(function () {
-                    sheet.getCell(args.row, args.col).value(orgCode);
-                });
-            }
+            tools.alertOpr(args, sheet, '该编号不存在，请重新输入！', controller.tree.selected.items, 'item');
         }
     },
 
@@ -1970,15 +1949,7 @@ var itemsController = {
                 });
             }
             else {
-                $('#alertBtn').click();
-                sheet.options.isProtected = true;
-                let orgCode =  args.row < controller.tree.selected.items.length ? controller.tree.selected.items[args.row].item.data.code : '';
-                $('#alertCls').click(function () {
-                    sheet.getCell(args.row, args.col).value(orgCode);
-                });
-                $('#alertCof').click(function () {
-                    sheet.getCell(args.row, args.col).value(orgCode);
-                });
+                tools.alertOpr(args, sheet, '该编号不存在，请重新输入！', controller.tree.selected.items, 'item');
             }
               /*  if(typeof newData === 'number'){
                     sheet.getCell(args.row, args.col).value(orgItemData);
@@ -2181,17 +2152,10 @@ var totalJobsController = {
                 totalJobsController.createJob(sheet, totalJobs, field, newData, args);
             }
             else if(tagId && !isRepeat && newData !== orgJobData){//update
-                    totalJobsController.updateJob(totalJobs, tagId, field, newData);
+                    totalJobsController.updateJob(totalJobs, tagId, field, newData, args);
             }
             if(isRepeat){
-                console.log(`isRe`);
                 tools.alertTotalOpr(args, '该工作内容已存在！', totalJobs.jobsArr);
-                /*if(tagId && newData){
-                    sheet.getCell(args.row, args.col, GC.Spread.Sheets.SheetArea.viewport).value(orgJobData);
-                }
-                else {
-                    sheet.getCell(args.row, args.col, GC.Spread.Sheets.SheetArea.viewport).value('');
-                }*/
             }
         });
     },
@@ -2225,17 +2189,17 @@ var totalJobsController = {
             }
             else {
                 //编号只能为数字!
-                sheet.getCell(args.row, args.col).value("");
+                tools.alertTotalOpr(args, '编号只能为数字，请重新输入!', totalJobs.jobsArr);
+               // sheet.getCell(args.row, args.col).value("");
             }
         }
     },
 
-    updateJob: function(totalJobs, id, field, newData){
+    updateJob: function(totalJobs, id, field, newData, args){
         if(field === 'code' && typeof newData !== 'number'){
-            //编号只能为数字
+            tools.alertTotalOpr(args, '编号只能为数字，请重新输入!', totalJobs.jobsArr);
         }
         else {
-            console.log(`enterupdate id: ${id}`);
             totalJobs.jobsArr.forEach(function(job){
                 if(job.data.id === id){
                     job.data[field] = newData;
@@ -2266,12 +2230,7 @@ var totalItemsController = {
                     totalItemsController.updateItem(totalItems, tagId, field, newData);
             }
             if(isRepeat){
-                if(tagId && newData){
-                    sheet.getCell(args.row, args.col, GC.Spread.Sheets.SheetArea.viewport).value(orgItemData);
-                }
-                else {
-                    sheet.getCell(args.row, args.col, GC.Spread.Sheets.SheetArea.viewport).value('');
-                }
+                tools.alertTotalOpr(args, '该项目特征已存在！', totalItems.itemsArr);
             }
         });
     },
@@ -2306,16 +2265,14 @@ var totalItemsController = {
                 });
             }
             else {
-                //编号只能为数字
-                sheet.getCell(args.row, args.col).value("");
+                tools.alertTotalOpr(args, '编号只能为数字，请重新输入！', totalItems.itemsArr);
             }
         }
     },
 
-    updateItem: function(totalItems, id, field, newData){
+    updateItem: function(totalItems, id, field, newData, args){
         if(field === 'code' && typeof newData !== 'number'){
-            //编号只能为数字
-            sheet.getCell(args.row, args.col).value('');
+            tools.alertTotalOpr(args, '编号只能为数字，请重新输入！', totalItems.itemsArr);
         }
         else {
             totalItems.itemsArr.forEach(function(item){

web/maintain/ration_repository/js/repository_glj.js

@@ -274,6 +274,7 @@ var pageOprObj = {
         var me = repositoryGljObj, rObj = sheetCommonObj.combineRowData(me.workBook.getSheet(0), me.setting, args.row, me),
             updateArr = [], addArr = [];
         me.editingRowIdx = args.row;
+        rObj.basePrice = rObj.basePrice ? rObj.basePrice : 0;
         if (me.currentEditingGlj["ID"]) {
             rObj["ID"] = me.currentEditingGlj["ID"];
             rObj.gljClass = me.currentEditingGlj.gljClass;
@@ -307,7 +308,6 @@ var pageOprObj = {
                 me.updateRationBasePrcRq(gljTypeObj);
             }
         } else {
-            rObj.basePrice = rObj.basePrice ? rObj.basePrice : 0;
             me.addGljObj = rObj;
             let isCanSav = true;
                 if(!rObj[me.setting.header[0].dataCode] || !rObj[me.setting.header[1].dataCode] || !rObj[me.setting.header[5].dataCode]){