Merge branch 'dev' of http://192.168.1.41:3000/maixinrong/Calculation into dev

app/public/js/change_information.js

@@ -1516,11 +1516,11 @@ $(document).ready(() => {
                 for (let iCol = 0; iCol < range.colCount; iCol++) {
                     const curCol = range.col + iCol;
                     let colSetting = info.sheet.zh_setting.cols[curCol];
-                    if ((needColAdd && curCol > 2) || (needCopyIgnore && curCol === 2)) { // 要判断是否已隐藏了变更详情，是则变更详情后面的curCol要+1
-                        const newCurCol = curCol + 1;
-                        needColAdd = true;
-                        colSetting = info.sheet.zh_setting.cols[newCurCol];
-                    }
+                    // if ((needColAdd && curCol > 2) || (needCopyIgnore && curCol === 2)) { // 要判断是否已隐藏了变更详情，是则变更详情后面的curCol要+1
+                    //     const newCurCol = curCol + 1;
+                    //     needColAdd = true;
+                    //     colSetting = info.sheet.zh_setting.cols[newCurCol];
+                    // }
                     if (!colSetting) continue;
 
                     let validText = info.sheet.getText(curRow, curCol);
@@ -2194,11 +2194,11 @@ $(document).ready(() => {
                 for (let iCol = 0; iCol < range.colCount; iCol++) {
                     const curCol = range.col + iCol;
                     let colSetting = info.sheet.zh_setting.cols[curCol];
-                    if ((needColAdd && curCol > 2) || (needCopyIgnore && curCol === 2)) { // 要判断是否已隐藏了变更详情，是则变更详情后面的curCol要+1
-                        const newCurCol = curCol + 1;
-                        needColAdd = true;
-                        colSetting = info.sheet.zh_setting.cols[newCurCol];
-                    }
+                    // if ((needColAdd && curCol > 2) || (needCopyIgnore && curCol === 2)) { // 要判断是否已隐藏了变更详情，是则变更详情后面的curCol要+1
+                    //     const newCurCol = curCol + 1;
+                    //     needColAdd = true;
+                    //     colSetting = info.sheet.zh_setting.cols[newCurCol];
+                    // }
                     if (!colSetting) continue;
 
                     let validText = info.sheet.getText(curRow, curCol);
@@ -4181,11 +4181,11 @@ $(document).ready(() => {
                 for (let iCol = 0; iCol < range.colCount; iCol++) {
                     const curCol = range.col + iCol;
                     let colSetting = info.sheet.zh_setting.cols[curCol];
-                    if ((needColAdd && curCol > 2) || (needCopyIgnore && curCol === 2)) { // 要判断是否已隐藏了变更详情，是则变更详情后面的curCol要+1
-                        const newCurCol = curCol + 1;
-                        needColAdd = true;
-                        colSetting = info.sheet.zh_setting.cols[newCurCol];
-                    }
+                    // if ((needColAdd && curCol > 2) || (needCopyIgnore && curCol === 2)) { // 要判断是否已隐藏了变更详情，是则变更详情后面的curCol要+1
+                    //     const newCurCol = curCol + 1;
+                    //     needColAdd = true;
+                    //     colSetting = info.sheet.zh_setting.cols[newCurCol];
+                    // }
                     if (!colSetting) continue;
 
                     let validText = info.sheet.getText(curRow, curCol);

app/view/profile/netcasign.ejs

@@ -54,7 +54,7 @@
                                 <div class="form-group show-upload" style="display: none">
                                     <label>上传签名图</label>
                                     <input type="file" class="form-control-file" id="netcasign-upload">
-                                    <small class="form-text text-danger">建议签名图片大小为160x160px，四边满版裁切、无留白，格式PNG透明背景（适用于报表打印，签章直径为4.2厘米的情况）</small>
+                                    <small class="form-text text-danger">图片大小为600x300，格式PNG透明背景。</small>
                                 </div>
                                 <div class="form-group show-qrcode">
                                     <label>在线手写签名</label>

app/view/profile/sign.ejs

@@ -32,7 +32,7 @@
                             <div class="form-group show-upload" style="display: none">
                                 <label>上传签名图</label>
                                 <input type="file" class="form-control-file" id="sign-upload">
-                                <small class="form-text text-danger">建议签名图片大小为160x160px，四边满版裁切、无留白，格式PNG透明背景（适用于报表打印，签章直径为4.2厘米的情况）</small>
+                                <small class="form-text text-danger">图片大小为600x300，格式PNG透明背景。</small>
                             </div>
                             <div class="form-group show-qrcode">
                                 <label>在线手写签名</label>