组件版本更新，审查意见模块功能完善

src/main/resources/templates/reportinfo/add.html

@@ -541,9 +541,8 @@
                     <div class="layui-form-item">
                         <label class="layui-form-label" style="width: 90px">审查意见</label>
                         <div class="layui-input-inline" style="width: 85%">
-                            <textarea id="xmscyjhssfawb" name="xmscyjhssfawb" class="layui-textarea"
+                            <textarea id="sqdwldscyj1" name="sqdwldscyj1" class="layui-textarea"
                                       style="width: 100%;height: 339px"></textarea>
-                            <label class="layui-form-label" style="color:grey;width: 100%;text-align: left">文本内容，如果包含图片，请下载模板编辑后上传，并清空当前编辑框</label>
                         </div>
                     </div>
                     <div class="layui-form-item">
@@ -560,9 +559,9 @@
                         <button type="button" class="layui-btn layui-btn upload" lay-data="{fileType:'scyjFile'}">
                             <i class="layui-icon layui-icon-export" style="font-size: 10px;"></i>上传附件
                         </button>
-                        <a class="layui-btn layui-btn-primary" th:href="${scyjTemplate}">
-                            <i class="layui-icon layui-icon-export" style="font-size: 10px;"></i>下载模板
-                        </a>
+<!--                        <a class="layui-btn layui-btn-primary" th:href="${scyjTemplate}">-->
+<!--                            <i class="layui-icon layui-icon-export" style="font-size: 10px;"></i>下载模板-->
+<!--                        </a>-->
                         <button class="layui-btn layui-btn layui-btn-danger" lay-filter="delScyj">
                             <i class="layui-icon layui-icon-delete" style="font-size: 10px;"></i>删除
                         </button>
@@ -658,7 +657,7 @@
     </div>
 </div>
 <script th:src="@{/lib/jquery-3.4.1/jquery-3.4.1.min.js}" charset="utf-8"></script>
-<script th:src="@{/lib/layui/layui.js}" charset="utf-8"></script>
+<script th:src="@{/lib/layui-v2.6.3/layui.js}" charset="utf-8"></script>
 <script th:src="@{/lib/coco-message/coco-message.js}" charset="utf-8"></script>
 <script th:src="@{/js/lay-config.js}" charset="utf-8"></script>
 <script th:src="@{/lib/xm-select-v1.2.2/xm-select.js}" charset="utf-8"></script>
@@ -713,9 +712,9 @@
                 cols: [
                     [
                         {type: 'radio'},
-                        {type: 'numbers', align: 'center'},
-                        {field: 'mc', width: '50%', title: '名称'},
-                        {field: 'dwqc', width: '50%', title: '单位全称'}
+                        {type: 'numbers',title:'序号', align: 'center'},
+                        {field: 'mc', width: '40%', title: '名称'},
+                        {field: 'dwqc', width: '40%', title: '单位全称'}
                     ]
                 ]
             },
@@ -1385,8 +1384,6 @@
                     [
                         {type: 'numbers'},
                         {field: 'mc', width: '25%', title: '名称'},
-                        // {field: 'px', width: '6%', title: '排序'},
-                        // {field: 'nf', width: '6%', title: '年份'},
                         {field: 'ysje', width: '12%', title: '预算金额(万元)'},
                         {field: "dw1", width: '15%', title: '陕西电科院(万元)', edit: 'number'},
                         {field: "dw2", width: '15%', title: '拟合作单位1(万元)', edit: 'number'},
@@ -1394,8 +1391,6 @@
                         {field: "dw4", width: '15%', title: '拟合作单位3(万元)', edit: 'number'},
                         {field: "dw5", width: '15%', title: '拟合作单位4(万元)', edit: 'number'},
                         {field: "dw6", width: '15%', title: '拟合作单位5(万元)', edit: 'number'}
-                        // {field: 'hjbm', width: '8%', title: '合计编码'},
-                        // {field: 'bz', width: '15%', title: '备注'}
                     ]
                 ]
             });
@@ -1579,6 +1574,7 @@
 
         // 监听确认按钮（基本信息）
         form.on('submit(saveNormal)', function (data) {
+            console.log(data.field)
             var qsrq = document.getElementById('qs').value;
             var jsrq = document.getElementById('wc').value;
             var sd = new Date(qsrq);
@@ -1610,6 +1606,7 @@
                                 dataType: "json",
                                 success: function (result) {
                                     dataBudget = result;
+                                    console.log(dataBudget)
                                 }
                             });
                             loadTreetable();
@@ -2066,7 +2063,7 @@
                     };
                     dataWB.push(dfWb);
                 }
-                $("#sqdwldscyj1").val(JSON.stringify(dataWB));
+                $("#scyjfj").val(JSON.stringify(dataWB));
 
                 var project = {
                     "id": xmId,
@@ -2076,7 +2073,7 @@
                 }
                 var index = layer.load(0, {shade: 0.1});
                 AjaxUtil.post({
-                    url: AjaxUtil.ctx + "reportinfo/doUpdateFj",
+                    url: AjaxUtil.ctx + "reportinfo/doUpdateScyj",
                     contentType: "application/json",
                     data: JSON.stringify(project),
                     success: function (res) {

src/main/resources/templates/reportinfo/update.html

@@ -599,9 +599,9 @@
                     <div class="layui-form-item">
                         <label class="layui-form-label" style="width: 90px">审查意见</label>
                         <div class="layui-input-inline" style="width: 85%">
-                            <textarea id="xmscyjhssfawb" name="xmscyjhssfawb" class="layui-textarea"
+                            <textarea id="sqdwldscyj1" name="sqdwldscyj1" th:text = "${report.sqdwldscyj1}"class="layui-textarea"
                                       style="width: 100%;height: 339px"></textarea>
-                            <label class="layui-form-label" style="color:grey;width: 100%;text-align: left">文本内容，如果包含图片，请下载模板编辑后上传，并清空当前编辑框</label>
+<!--                            <label class="layui-form-label" style="color:grey;width: 100%;text-align: left">文本内容，如果包含图片，请下载模板编辑后上传，并清空当前编辑框</label>-->
                         </div>
                     </div>
                     <div class="layui-form-item">
@@ -618,9 +618,9 @@
                         <button type="button" class="layui-btn layui-btn upload" lay-data="{fileType:'scyjFile'}">
                             <i class="layui-icon layui-icon-export" style="font-size: 10px;"></i>上传附件
                         </button>
-                        <a class="layui-btn layui-btn-primary" th:href="${scyjTemplate}">
-                            <i class="layui-icon layui-icon-export" style="font-size: 10px;"></i>下载模板
-                        </a>
+<!--                        <a class="layui-btn layui-btn-primary" th:href="${scyjTemplate}">-->
+<!--                            <i class="layui-icon layui-icon-export" style="font-size: 10px;"></i>下载模板-->
+<!--                        </a>-->
                         <button class="layui-btn layui-btn layui-btn-danger" lay-filter="delScyj">
                             <i class="layui-icon layui-icon-delete" style="font-size: 10px;"></i>删除
                         </button>
@@ -733,7 +733,7 @@
     </div>
 </div>
 <script th:src="@{/lib/jquery-3.4.1/jquery-3.4.1.min.js}" charset="utf-8"></script>
-<script th:src="@{/lib/layui/layui.js}" charset="utf-8"></script>
+<script th:src="@{/lib/layui-v2.6.3/layui.js}" charset="utf-8"></script>
 <script th:src="@{/lib/coco-message/coco-message.js}" charset="utf-8"></script>
 <script th:src="@{/js/lay-config.js}" charset="utf-8"></script>
 <script th:src="@{/lib/xm-select-v1.2.2/xm-select.js}" charset="utf-8"></script>
@@ -2108,7 +2108,7 @@
                     };
                     dataWB.push(dfWb);
                 }
-                $("#sqdwldscyj1").val(JSON.stringify(dataWB));
+                $("#scyjfj").val(JSON.stringify(dataWB));
 
                 var project = {
                     "id": xmId,
@@ -2118,7 +2118,7 @@
                 }
                 var index = layer.load(0, {shade: 0.1});
                 AjaxUtil.post({
-                    url: AjaxUtil.ctx + "reportinfo/doUpdateFj",
+                    url: AjaxUtil.ctx + "reportinfo/doUpdateScyj",
                     contentType: "application/json",
                     data: JSON.stringify(project),
                     success: function (res) {

src/main/resources/templates/reportinfo/view.html

@@ -325,7 +325,7 @@
                     <div class="layui-form-item">
                         <label class="layui-form-label" style="width: 90px">审查意见</label>
                         <div class="layui-input-inline" style="width: 85%">
-                            <textarea id="xmscyjhssfawb" name="xmscyjhssfawb" class="layui-textarea"
+                            <textarea id="sqdwldscyj1" name="sqdwldscyj1" th:text = "${report.sqdwldscyj1}" class="layui-textarea"
                                       style="width: 100%;height: 339px"></textarea>
                             <label class="layui-form-label" style="color:grey;width: 100%;text-align: left">文本内容，如果包含图片，请下载模板编辑后上传，并清空当前编辑框</label>
                         </div>
@@ -406,7 +406,7 @@
     </div>
 </div>
 <script th:src="@{/lib/jquery-3.4.1/jquery-3.4.1.min.js}" charset="utf-8"></script>
-<script th:src="@{/lib/layui/layui.js}" charset="utf-8"></script>
+<script th:src="@{/lib/layui-v2.6.3/layui.js}" charset="utf-8"></script>
 <script th:src="@{/lib/coco-message/coco-message.js}" charset="utf-8"></script>
 <script th:src="@{/js/lay-config.js}" charset="utf-8"></script>
 <script th:src="@{/lib/xm-select-v1.2.2/xm-select.js}" charset="utf-8"></script>
@@ -454,6 +454,7 @@
         var currTable_llsjyj = fileTableInit(table, '#currentTableId_LLSJYJ', eval('(' + [[${report.xmdllhsjyj}]] + ')'), 'llsjyjFile');
         var currTable_yjnr = fileTableInit(table, '#currentTableId_YJNR', eval('(' + [[${report.xmyjnrhssfa}]] + ')'), 'yjnrFile');
         var currTable_cddwtj = fileTableInit(table, '#currentTableId_CDDWTJ', eval('(' + [[${report.xmcddwdtj}]] + ')'), 'cddwtjFile');
+        var currTable_scyj = fileTableInit(table, '#currentTableId_SCYJ', eval('(' + [[${report.scyjfj}]] + ')'), 'scyjFile');
         var currTable_fj = fileTableInit(table, '#currentTableId_FJ', eval('(' + [[${report.fj}]] + ')'), 'fjFile');
         var currTable_qmgz = fileTableInit(table, '#currentTableId_QMGZ', eval('(' + [[${report.ygzmwj}]] + ')'), 'gmgzFile');
 
@@ -566,6 +567,10 @@
         table.on('rowDouble(currentTableId_CDDWTJ)', function (obj) {
             window.open(obj.data.Url);
         });
+        //双击（审查意见）
+        table.on('rowDouble(currentTableId_SCYJ)', function (obj) {
+            window.open(obj.data.Url);
+        });
         //双击（附件）
         table.on('rowDouble(currentTableId_FJ)', function (obj) {
             window.open(obj.data.Url);