Merge remote-tracking branch 'remotes/origin/dev' into uat

app/public/js/material_exponent.js

@@ -234,6 +234,8 @@ $(document).ready(() => {
             }
         },
         deletePress: function (sheet) {
+            if (!sheet.zh_setting || readOnly || sheet.zh_setting.readOnly) return;
+            // materialExponentBase.isUsed(select)
             if (sheet.zh_setting && sheet.zh_data) {
                 const sel = sheet.getSelections()[0];
                 if (!sel) return;
@@ -246,6 +248,7 @@ $(document).ready(() => {
                     for (let iCol = 0; iCol < sel.colCount; iCol++) {
                         const curCol = sel.col + iCol;
                         const colSetting = sheet.zh_setting.cols[curCol];
+                        if(colSetting.readOnly(exData)) continue;
                         if (!colSetting) continue;
                         const orgValue = sortData[iRow][colSetting.field];
                         if(orgValue === null) {
@@ -273,7 +276,6 @@ $(document).ready(() => {
                     SpreadJsObj.reLoadSheetData(sheet);
                     return;
                 }
-                // console.log(data);
                 // 更新至服务器
                 postData(window.location.pathname + '/save', { type:'paste', updateData: data }, function (result) {
                     materialExponentData = result.info;

app/service/tender_info.js

@@ -346,7 +346,8 @@ module.exports = app => {
             if (!info) {
                 return false;
             }
-            const shenpiInfo = !info.shenpi || info.shenpi === null || info.shenpi === '' ? defaultInfo.shenpi : JSON.parse(info.shenpi);
+            const defaultShenpiInfo = JSON.parse(JSON.stringify(defaultInfo.shenpi));
+            const shenpiInfo = !info.shenpi || info.shenpi === null || info.shenpi === '' ? defaultShenpiInfo : JSON.parse(info.shenpi);
             return shenpiInfo;
         }
     }

app/view/tender/shenpi.ejs

@@ -102,9 +102,9 @@
                                                         <button class="btn btn-outline-primary btn-sm dropdown-toggle" type="button" id="<%- sp.code %>_dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                                                             选择审批人
                                                         </button>
-                                                        <div class="dropdown-menu dropdown-menu-right" aria-labelledby="<%- sp.code %>_dropdownMenuButton" style="width:220px">
+                                                        <div class="dropdown-menu dropdown-menu-right" id="<%- sp.code %>_dropdownMenu" aria-labelledby="<%- sp.code %>_dropdownMenuButton" style="width:220px">
                                                             <div class="mb-2 p-2"><input class="form-control form-control-sm gr-search"
-                                                                                         placeholder="姓名/手机 检索" autocomplete="off"></div>
+                                                                                         placeholder="姓名/手机 检索" autocomplete="off" data-code="<%- sp.code %>"></div>
                                                             <dl class="list-unstyled book-list">
                                                                 <% accountGroup.forEach((group, idx) => { %>
                                                                 <dt><a href="javascript: void(0);" class="acc-btn" data-groupid="<%- idx %>" data-type="hide"><i class="fa fa-plus-square"></i></a> <%- group.groupName %></dt>
@@ -153,6 +153,7 @@
     const category = JSON.parse('<%- JSON.stringify(categoryData) %>');
 </script>
 <script src="/public/js/shenpi.js"></script>
+<!--<script src="/public/js/tender_showhide.js"></script>-->
 <script>
     $.subMenu({
         menu: '#sub-menu', miniMenu: '#sub-mini-menu', miniMenuList: '#mini-menu-list',