沟通补正BUG修改

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

@@ -37,6 +37,14 @@
                          <!--   <div class="layui-col-lg12">
                                 <blockquote class="layui-elem-quote">订单信息</blockquote>
                             </div>-->
+                            <div class="layui-col-lg6">
+                                <div class="layui-form-item">
+                                    <label class="layui-form-label">订单编号</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" id="orderId" readonly name="orderId" class="layui-input" value="" placeholder="" lay-verify="required">
+                                    </div>
+                                </div>
+                            </div>
                             <div class="layui-col-lg6">
                                 <div class="layui-form-item">
                                     <label class="layui-form-label">订单金额</label>
@@ -77,7 +85,7 @@
                                     </div>
                                 </div>
                             </div>
-                            <div class="layui-col-lg6">
+                           <!-- <div class="layui-col-lg6">
                                 <div class="layui-form-item">
                                     <label class="layui-form-label">评价时间</label>
                                     <div class="layui-input-block">
@@ -100,7 +108,7 @@
                                         <input type="text" id="evaluateRemark" readonly name="evaluateRemark" class="layui-input" value="" placeholder=""  maxlength="500">
                                     </div>
                                 </div>
-                            </div>
+                            </div>-->
                         </div>
                     </div>
                     <div class="layui-tab-item">
@@ -126,19 +134,20 @@
                                             </div>
                                         </div>
                                     </div>
-                                    <div class="layui-col-lg6">
+
+                                    <div class="layui-col-lg12">
                                         <div class="layui-form-item">
-                                            <label class="layui-form-label">软著简称</label>
+                                            <label class="layui-form-label">软著证号</label>
                                             <div class="layui-input-block">
-                                                <input type="text" id="goodsSubName" readonly name="goodsSubName" class="layui-input" value="" maxlength="100">
+                                                <input type="text" id="goodsNumber" readonly name="goodsNumber" class="layui-input" value="" maxlength="100">
                                             </div>
                                         </div>
                                     </div>
                                     <div class="layui-col-lg6">
                                         <div class="layui-form-item">
-                                            <label class="layui-form-label">软著证号</label>
+                                            <label class="layui-form-label">软著简称</label>
                                             <div class="layui-input-block">
-                                                <input type="text" id="goodsNumber" readonly name="goodsNumber" class="layui-input" value="" maxlength="100">
+                                                <input type="text" id="goodsSubName" readonly name="goodsSubName" class="layui-input" value="" maxlength="100">
                                             </div>
                                         </div>
                                     </div>
@@ -150,7 +159,7 @@
                                             </div>
                                         </div>
                                     </div>
-                                    <div class="layui-col-lg6">
+                                 <!--   <div class="layui-col-lg6">
                                         <div class="layui-form-item">
                                             <label class="layui-form-label">取得时间</label>
                                             <div class="layui-input-block">
@@ -173,7 +182,7 @@
                                                 <input type="text" id="goodsGetType" readonly style="cursor: pointer" name="goodsGetType" class="layui-input" value="" maxlength="50">
                                             </div>
                                         </div>
-                                    </div>
+                                    </div>-->
                                     <div class="layui-col-lg6">
                                         <div class="layui-form-item">
                                             <label class="layui-form-label">售卖价格</label>
@@ -194,7 +203,7 @@
                                         <div class="layui-form-item layui-form-text">
                                             <label class="layui-form-label">软著详情</label>
                                             <div class="layui-input-block">
-                                                <textarea id="goodsDescription" readonly name="goodsDescription" class="layui-textarea"></textarea>
+                                                <textarea style="min-height: 153px;" id="goodsDescription" readonly name="goodsDescription" class="layui-textarea"></textarea>
                                             </div>
                                         </div>
                                     </div>
@@ -321,7 +330,7 @@
                             <div class="layui-col-lg3" >
                                 <span>.</span>
                             </div>
-                            <div class="layui-col-lg6" style="border: 1px solid #C9C9C9;" id="producePhotoSpanDIV">
+      <!--                      <div class="layui-col-lg6" style="border: 1px solid #C9C9C9;" id="producePhotoSpanDIV">
                                 <div class="layui-form-item" style="text-align: center;padding-top: 20px;">
                                     <img id="producePhotoImage" src="assets/images/ruanzhu.jpg" style="height:340px;width:240px;" title="">
                                     <input type="hidden" id="producePhoto" name="producePhoto" >
@@ -331,6 +340,44 @@
                                         <i class="fa fa-download">下载</i>
                                     </span>
                                 </div>
+                            </div>-->
+                            <div class="layui-col-lg6 layui-col-xs6" style="border: 1px solid #C9C9C9;margin-top: 65px;">
+                                <input type="hidden" id="producePhoto" name="producePhoto">
+                                <div class="layui-btn-container" id="producePhotoFileBox" style="height:399px;width:240px;"></div>
+                                <script id="producePhotoFileDownload" type="text/html">
+                                    {{# var fileName = 'producePhoto'; }}
+                                    {{# if(d[fileName] != '') { }}
+                                    {{#    var files = d[fileName];}}
+                                    {{#    for(var i = 0, item = files[i]; item = files[i++];) { }}
+                                    <span class="layui-btn-group" style="padding-top: 141px; padding-left: 307px;">
+                                <div class="upload-file-box">
+                                    <a class="upload-file-a" onclick="window.open('route/file/download/true/{{item.fileId}}')" href="javascript:void(0)" title="{{item.fileName}} - 点击下载">
+                                        {{# if(item.fileType == 'doc' || item.fileType == 'docx') { }}
+                                        <img src="assets/images/filetype/word.png"/>
+                                        {{# } else if(item.fileType == 'xls' || item.fileType == 'xlsx') { }}
+                                        <img src="assets/images/filetype/excel.png"/>
+                                        {{# } else if(item.fileType == 'ppt' || item.fileType == 'pptx') { }}
+                                        <img src="assets/images/filetype/ppt.png"/>
+                                        {{# } else if(item.fileType == 'apk') { }}
+                                        <img src="assets/images/filetype/apk.png"/>
+                                        {{# } else if(item.fileType == 'pdf') { }}
+                                        <img src="assets/images/filetype/pdf.png"/>
+                                        {{# } else if(item.fileType == 'rar') { }}
+                                        <img src="assets/images/filetype/rar.png"/>
+                                        {{# } else if(item.fileType == 'zip') { }}
+                                        <img src="assets/images/filetype/zip.png"/>
+                                        {{# } else if(item.fileType == 'txt') { }}
+                                        <img src="assets/images/filetype/txt.png"/>
+                                        {{# } else { }}
+                                        <img src="assets/images/filetype/file.png"/>
+                                        {{# } }}
+                                    </a>
+                                    <span class="upload-file-title">{{item.fileName}}</span>
+                                </div>
+                            </span>
+                                    {{#    } }}
+                                    {{# } }}
+                                </script>
                             </div>
                         </div>
                     </div>
@@ -420,6 +467,13 @@
         $("#producePhotoImage").height(window.innerHeight-240);
         $("#producePhotoImage").width(window.innerHeight-340);
 
+        
+        function initProducePhoto() {
+            var files = $('#producePhoto').val();
+            initFileList('producePhoto', files, function (fileName) {
+            });
+        }
+
         var wangEditor = window.wangEditor;
         var wangEditorObj = {};
         var viewerObj = {};
@@ -525,12 +579,13 @@
                     title: false, //不需要文件标题
                 });
                 if (data.producePhoto) {
-                    $("#producePhotoImage").attr("src", "route/file/download/false/" + data.producePhoto);
+                  /*  $("#producePhotoImage").attr("src", "route/file/download/false/" + data.producePhoto);
                     new Viewer(document.getElementById("producePhotoSpanDIV"), {
                         url: "route/file/download/false/" + data.producePhoto,
                         fullscreen: false, // 不需要全屏
                         title: false, //不需要文件标题
-                    });
+                    });*/
+                    initProducePhoto();
                 }
                 var dataSellData = {};
                 for(var i in data.sellUserDTO) {

src/main/resources/templates/order/upload.html

@@ -24,13 +24,61 @@
             <form class="layui-form layui-form-pane" lay-filter="dataForm">
                 <blockquote class="layui-elem-quote">著作权商品信息</blockquote>
                 <div class=" layui-row " style="height: 336px">
-                    <div class="layui-col-lg6 layui-col-xs6" style="border: 1px solid #C9C9C9;" id="basicsLogoSpanDIV">
+              <!--      <div class="layui-col-lg6 layui-col-xs6" style="border: 1px solid #C9C9C9;" id="basicsLogoSpanDIV">
                         <div class="layui-form-item" style="text-align: center;padding-top: 20px;">
                             <img id="logoImage" src="assets/images/ruanzhu.jpg" style="height:340px;width:240px;" title="">
                             <input type="hidden" id="goodsPhoto" name="goodsPhoto" >
                             </br>
                             <span style="white-space: nowrap; font-size: 11px;color: blue" id="basicsLogoSpan">点击图片 - 上传过户后新的的软著电子版</span>
                         </div>
+                    </div>-->
+                    <div class="layui-col-lg6 layui-col-xs6" style="border: 1px solid #C9C9C9;" id="basicsLogoSpanDIV" >
+                        <input type="hidden" id="correctionFiles" name="correctionFiles">
+                        <div class="layui-btn-container" id="correctionFilesFileBox" style="height:399px;width:240px;"></div>
+                        <script id="correctionFilesFileDownload" type="text/html">
+                            {{# var fileName = 'correctionFiles'; }}
+                            {{# if(d[fileName] != '') { }}
+                            {{#    var files = d[fileName];}}
+                            {{#    for(var i = 0, item = files[i]; item = files[i++];) { }}
+                            <span class="layui-btn-group" style="padding-top: 141px; padding-left: 229px;">
+                                <div class="upload-file-box">
+                                    <a class="upload-file-a" onclick="window.open('route/file/download/true/{{item.fileId}}')" href="javascript:void(0)" title="{{item.fileName}} - 点击下载">
+                                        {{# if(item.fileType == 'doc' || item.fileType == 'docx') { }}
+                                        <img src="assets/images/filetype/word.png"/>
+                                        {{# } else if(item.fileType == 'xls' || item.fileType == 'xlsx') { }}
+                                        <img src="assets/images/filetype/excel.png"/>
+                                        {{# } else if(item.fileType == 'ppt' || item.fileType == 'pptx') { }}
+                                        <img src="assets/images/filetype/ppt.png"/>
+                                        {{# } else if(item.fileType == 'apk') { }}
+                                        <img src="assets/images/filetype/apk.png"/>
+                                        {{# } else if(item.fileType == 'pdf') { }}
+                                        <img src="assets/images/filetype/pdf.png"/>
+                                        {{# } else if(item.fileType == 'rar') { }}
+                                        <img src="assets/images/filetype/rar.png"/>
+                                        {{# } else if(item.fileType == 'zip') { }}
+                                        <img src="assets/images/filetype/zip.png"/>
+                                        {{# } else if(item.fileType == 'txt') { }}
+                                        <img src="assets/images/filetype/txt.png"/>
+                                        {{# } else { }}
+                                        <img src="assets/images/filetype/file.png"/>
+                                        {{# } }}
+                                    </a>
+                                    <span class="upload-file-title">{{item.fileName}}</span>
+                                    <a class="layui-btn layui-btn-xs layui-btn-danger text-danger remove-image" href="javascript:void(0);" style="position: absolute;top: 0px;right: 0px;" lay-form-button data-id="{{item.fileId}}" data-name="{{fileName}}" lay-filter="correctionFilesRemoveFile">
+                                        <i class="fa fa-trash-o"></i>
+                                    </a>
+                                </div>
+                            </span>
+                            {{#    } }}
+                            {{# } }}
+                            {{# if(d[fileName].length < 1) { }}
+                            <div class="upload-file-box" style="width: auto; height: auto; padding: 5px; top: 117px;left: 89%;">
+                                <a href="javascript:void(0);" lay-form-button data-explain="资料附件" data-name="correctionFiles" lay-filter="correctionFilesUploadFile">
+                                    <i class="fa fa-plus-square-o" style="font-size: 170px;"></i>
+                                </a>
+                            </div>
+                            {{# } }}
+                        </script>
                     </div>
                     <div class="layui-col-lg6 layui-col-xs6">
                         <div class=" layui-row " style="height: 340px">
@@ -146,6 +194,86 @@
         var laydate = layui.laydate;
         var orderId = top.restAjax.params(window.location.href).orderId;
 
+        function refreshDownloadTemplet(fileName, file) {
+            var dataRander = {};
+            dataRander[fileName] = file;
+
+            laytpl(document.getElementById(fileName +'FileDownload').innerHTML).render(dataRander, function(html) {
+                document.getElementById(fileName +'FileBox').innerHTML = html;
+            });
+        }
+
+        // 初始化文件列表
+        function initFileList(fileName, ids, callback) {
+            var dataForm = {};
+            dataForm[fileName] = ids;
+            form.val('dataForm', dataForm);
+
+            if(!ids) {
+                refreshDownloadTemplet(fileName, []);
+                if(callback) {
+                    callback(fileName, []);
+                }
+                return;
+            }
+
+            top.restAjax.get(top.restAjax.path('api/file/list', []), {
+                ids: ids
+            }, null, function(code, data) {
+                refreshDownloadTemplet(fileName, data);
+                if(callback) {
+                    callback(fileName, data);
+                }
+            }, function(code, data) {
+                top.dialog.msg(data.msg);
+            });
+        }
+
+        function initCorrectionFilesUploadFile() {
+            var files = $('#correctionFiles').val();
+            initFileList('correctionFiles', files, function(fileName) {
+            });
+            form.on('button(correctionFilesUploadFile)', function(obj) {
+                var name = this.dataset.name;
+                var explain = this.dataset.explain;
+                top.dialog.file({
+                    type: 'file',
+                    title: '上传'+ explain,
+                    width: '400px',
+                    height: '420px',
+                    maxFileCount: '1',
+                    onClose: function() {
+                        var uploadFileArray = top.dialog.dialogData.uploadFileArray;
+                        if(typeof(uploadFileArray) != 'undefined' && uploadFileArray.length > 0) {
+                            var files = $('#'+ name).val();
+                            for(var j = 0, file = uploadFileArray[j]; file = uploadFileArray[j++];) {
+                                if(files.length > 0) {
+                                    files += ',';
+                                }
+                                files += file.data;
+                            }
+                            initFileList(name, files, function(fileName) {
+                            });
+                        }
+                    }
+                });
+            });
+            form.on('button(correctionFilesRemoveFile)', function(obj) {
+                var name = this.dataset.name;
+                var id = this.dataset.id;
+                var files = $('#'+ name).val().replace(id, '');
+                files = files.replace(/\,+/g, ',');
+                if(files.charAt(0) == ',') {
+                    files = files.substring(1);
+                }
+                if(files.charAt(files.length - 1) == ',') {
+                    files = files.substring(0, files.length - 1);
+                }
+                initFileList(name, files, function(fileName) {
+                });
+            });
+        }
+
         $("#openXieYi").click(function() {
             top.layer.open({
                 type: 2,
@@ -198,6 +326,7 @@
                 form.val('dataForm', dataFormData);
                 form.render(null, 'dataForm');
                 $('#logoImage').attr('src', 'route/file/download/false/' + data.goodsPhoto);
+                initCorrectionFilesUploadFile();
             }, function(code, data) {
                 top.dialog.msg(data.msg);
             }, function() {
@@ -213,11 +342,11 @@
             top.dialog.confirm(top.dataMessage.commit, function(index) {
                 top.dialog.close(index);
                 var loadLayerIndex;
-                if( $("#goodsPhoto").val().length < 0) {
+                if( $("#correctionFiles").val().length < 0) {
                     layer.msg("请上传过户后新的软著电子版")
                     return;
                 }
-                top.restAjax.put(top.restAjax.path('api/order/save-result/' + orderId + '/' + $("#goodsPhoto").val(), []), {}, null, function(code, data) {
+                top.restAjax.put(top.restAjax.path('api/order/save-result/' + orderId + '/' + $("#correctionFiles").val(), []), {}, null, function(code, data) {
                     var layerIndex = top.dialog.msg(top.dataMessage.commitSuccess, {
                         time: 0,
                         btn: [top.dataMessage.button.yes],