Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev-ly

src/main/webapp/HG/YX/HGYX001.js

@@ -16,6 +16,8 @@ $(function () {
                     if (!isBlank(item.id)){
                         template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" '
                             + 'onclick="showDetail(' + item.id + ')"  >发货详情</a>';
+                        template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" ' +
+                            'onclick="showUploadFile(' + item.id + ')" >附件详情</a>';
                         /*if (auditStatus == 0) {
                             template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" ' +
                                 'onclick="updateStatus(' + item.id + ',1)" >审核</a>';
@@ -335,6 +337,21 @@ function commit() {
 
 }
 
+/**
+ * 显示附件清单
+ *
+ * @param id
+ */
+function showUploadFile(id) {
+    JSColorbox.open({
+        href: "HGSB099?methodName=initLoad&inqu_status-0-matId="+id+"&inqu_status-0-bizType=YX001",
+        title: "<div style='text-align: center;'>附件详情</div>",
+        width: "70%",
+        height: "50%",
+        //callbackName: uploadFileCallback
+    });
+}
+
 function windowCallback(ei) {
     if (ei.getStatus() >= 0) {
         // 刷新列表
@@ -342,4 +359,4 @@ function windowCallback(ei) {
         // 关闭弹窗
         JSColorbox.close();
     }
-}
\ No newline at end of file
+}

src/main/webapp/HG/YX/HGYX001.jsp

@@ -44,7 +44,7 @@
     <EF:EFRegion id="result" title="明细信息">
         <EF:EFGrid blockId="result" autoDraw="override" isFloat="true" checkMode="row" copyToAdd="false">
             <EF:EFColumn ename="id" cname="内码" hidden="true"/>
-            <EF:EFColumn ename="operator" cname="操作" locked="true" enable="false" width="120" align="center"/>
+            <EF:EFColumn ename="operator" cname="操作" locked="true" enable="false" width="140" align="center"/>
             <EF:EFComboColumn ename="companyCode" enable="true" cname="公司名称" width="110" align="center"
                               filter="contains" readonly="true" required="true">
                 <EF:EFOptions blockId="companyBox_block_id" valueField="valueField" textField="textField"/>

src/main/webapp/HG/YX/HGYX002.js

@@ -16,6 +16,8 @@ $(function () {
                     if (!isBlank(item.id)){
                         template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" '
                             + 'onclick="showDetail(' + item.id + ')"  >退货详情</a>';
+                        template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" ' +
+                            'onclick="showUploadFile(' + item.id + ')" >附件详情</a>';
                         /*if (auditStatus == 0) {
                             template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" ' +
                                 'onclick="updateStatus(' + item.id + ',1)" >审核</a>';
@@ -212,4 +214,18 @@ function windowCallback(ei) {
         // 关闭弹窗
         JSColorbox.close();
     }
-}
\ No newline at end of file
+}
+/**
+ * 显示附件清单
+ *
+ * @param id
+ */
+function showUploadFile(id) {
+    JSColorbox.open({
+        href: "HGSB099?methodName=initLoad&inqu_status-0-matId="+id+"&inqu_status-0-bizType=YX002",
+        title: "<div style='text-align: center;'>附件详情</div>",
+        width: "70%",
+        height: "50%",
+        //callbackName: uploadFileCallback
+    });
+}

src/main/webapp/HG/YX/HGYX002.jsp

@@ -31,7 +31,7 @@
     <EF:EFRegion id="result" title="明细信息">
         <EF:EFGrid blockId="result" autoDraw="override" isFloat="true" checkMode="row" copyToAdd="false">
             <EF:EFColumn ename="id" cname="内码" hidden="true"/>
-            <EF:EFColumn ename="operator" cname="操作" locked="true" enable="false" width="120" align="center"/>
+            <EF:EFColumn ename="operator" cname="操作" locked="true" enable="false" width="140" align="center"/>
             <EF:EFComboColumn ename="projCode" enable="true" cname="项目名称" width="110" align="center"
                               filter="contains" readonly="true" required="true">
                 <EF:EFOptions blockId="proj_record_block_id" valueField="valueField" textField="textField"/>