From 1e3533720b43867bbb87352d2ecefcf97335ff87 Mon Sep 17 00:00:00 2001
From: yulingwei <2436953959@qq.com>
Date: Fri, 6 Mar 2020 14:46:47 +0800
Subject: [PATCH] utp

---
 .../Controller/WorkOrderController.class.php  |  4 ++-
 Application/Admin/View/WorkOrder/list.html    |  4 +--
 Application/Admin/View/WorkOrder/modify.html  | 31 +++++++++----------
 .../Admin/View/WorkOrder/resourceApply.html   | 21 +++++--------
 Application/Admin/View/WorkOrder/store.html   | 21 +++++--------
 ThinkPHP/Library/Think/ShardUpload.class.php  |  2 +-
 6 files changed, 36 insertions(+), 47 deletions(-)

diff --git a/Application/Admin/Controller/WorkOrderController.class.php b/Application/Admin/Controller/WorkOrderController.class.php
index 543866d9d..2c308c6b0 100644
--- a/Application/Admin/Controller/WorkOrderController.class.php
+++ b/Application/Admin/Controller/WorkOrderController.class.php
@@ -55,7 +55,7 @@ class WorkOrderController extends ThinkController
         
         if ($list) {
             foreach ($list as &$item) {
-                $item['status'] = $this->getOrderStatus($item['status']);
+                $item['status_desc'] = $this->getOrderStatus($item['status']);
             }
         }
         $page = set_pagination($count, $row);
@@ -129,6 +129,8 @@ class WorkOrderController extends ThinkController
                     if (empty('handler_id')) {
                         $this->error('请选择处理人');
                     }
+                    $user = M('user', 'tab_')->where(['account'=>I('user_account')])->find();
+                    if (empty($user)) $this->error("账号不存在");
                     $data['attachment_url'] = I('attachment_url', '');
                     $data['user_account'] = I('user_account');
                     $data['role_name'] = I('role_name');
diff --git a/Application/Admin/View/WorkOrder/list.html b/Application/Admin/View/WorkOrder/list.html
index 67172e616..38f98504a 100644
--- a/Application/Admin/View/WorkOrder/list.html
+++ b/Application/Admin/View/WorkOrder/list.html
@@ -167,7 +167,7 @@
                             <td>{$data.game_name}</td>
                             <td>{$data.server_name}</td>
                             <td><?php echo $data['type'] == 1 ? "资源" : "反馈";?></td>
-                            <td>{$data.status}</td>
+                            <td>{$data.status_desc}</td>
                             <td>{$data.user_account}</td>
                             <td>{:get_admin_nickname($data['creator_id'])}</td>
                             <td>{$data.created_time|date='Y-m-d H:i:s',###}</td>
@@ -177,7 +177,7 @@
                                 <a href="{:U('workOrder/modify',array('id'=>$data['id']))}">编辑 </a>
                                 <?php if ($data['type'] == 1):?><a href="{:U('workOrder/resourceApply',array('id'=>$data['id']))}">申请 </a><?php endif;?>
                                 <?php if ($data['type'] == 2):?><a href="{:U('workOrder/feedbackProcessLogStore',array('id'=>$data['id']))}">更新 </a><?php endif;?>
-                                <a class="ajax-get" href="{:U('workOrder/finish',array('id'=>$data['id']))}">完成 </a>
+                                <?php if ($data['status'] != 1):?><a class="ajax-get" href="{:U('workOrder/finish',array('id'=>$data['id']))}">完成</a><?php endif;?>
                                 <a href="{:U('workOrder/evaluate',array('id'=>$data['id']))}">评价 </a>
                                 <a class="ajax-get confirm" href="{:U('workOrder/delete',array('ids'=>$data['id']))}">删除 </a>
                             </td>
diff --git a/Application/Admin/View/WorkOrder/modify.html b/Application/Admin/View/WorkOrder/modify.html
index 9a690351f..89ec5dc6a 100644
--- a/Application/Admin/View/WorkOrder/modify.html
+++ b/Application/Admin/View/WorkOrder/modify.html
@@ -99,7 +99,7 @@
                                 <if condition="$data['server_name'] neq ''"><option  value="{$data['server_name']}">{$data['server_name']}</option></if>
                             </select>
                         </div>
-                        <?php if (!empty($data['attachment_url'])):?>
+                        <?php if (!empty($data['attachment_url']) || $data['type'] == 2):?>
                         <div class="input-list">
                             <div id="uploader" class="wu-example">
                                 <div class="btns">
@@ -107,9 +107,11 @@
                                 </div>
                                 <!--用来存放文件信息-->
                                 <div id="thelist" class="uploader-list">
+                                    <?php if (!empty($data['attachment_url'])):?>
                                     <div id="beforeupload" class="item">
                                         <h4 class="info">已有附件<a href="javascript:;" class="jsdelzip table_click" style="float:none;display:inline-block;margin-left:10px;" onclick="$('#file_url').val('');$(this).parents('#beforeupload').remove()">删除</a><a href="{$data.attachment_url}" target="_blank" style="float:none;display:inline-block;margin-left:10px;">下载</a></h4>
                                     </div>
+                                    <?php endif;?>
                                 </div>
                                 <input type="hidden" id="file_url"  name="attachment_url"  value="{$data['attachment_url']}"/>
                             </div>
@@ -319,7 +321,7 @@
         }, {
             beforeSendFile: function(file){
                 //秒传验证
-                if (file['source']['ext'] === 'zip' || file['source']['ext'] === 'rar') {
+                if (true) {
                     var task = new $.Deferred();
                     var start = new Date().getTime();
                     (new WebUploader.Uploader()).md5File(file, 0, 10*1024*1024).progress(function(percentage){
@@ -357,7 +359,7 @@
             }
             , beforeSend: function(block){
                 //分片验证是否已传过，用于断点续传
-                if (block['file']['source']['ext'] === 'zip' || block['file']['source']['ext'] === 'rar') {
+                if (true) {
                     var task = new $.Deferred();
                     $.ajax({
                         type: "POST"
@@ -384,7 +386,7 @@
                 }
             }
             , afterSendFile: function(file){
-                if (file['source']['ext'] === 'zip' || file['source']['ext'] === 'rar') {
+                if (true) {
                     var chunksTotal = 0;
                     if((chunksTotal = Math.ceil(file.size/chunkSize)) > 1){
                         //合并请求
@@ -431,11 +433,6 @@
             pick: {id:'#picker'},
             //dnd: "#theList",
             paste: document.body,
-            accept: {
-                title: '压缩包',
-                extensions: 'rar,zip',
-                mimeTypes: '.rar,.zip',
-            },
             // 不压缩image, 默认如果是jpeg，文件上传前会压缩一把再上传！
             resize: false,
             disableGlobalDnd: true,
@@ -450,14 +447,14 @@
         });
 
         uploaderFile.on('beforeFileQueued',function(file){
-            var mycars=new Array("zip","rar","tar","jar");
-            if($.inArray(file.ext,mycars) == -1){
-                updateAlert('上传文件非法','tip_error');
-                setTimeout(function(){
-                    $('#tip').find('.tipclose').click();
-                },1500);
-                return false;
-            }
+            // var mycars=new Array("zip","rar","tar","jar");
+            // if($.inArray(file.ext,mycars) == -1){
+            //     updateAlert('上传文件非法','tip_error');
+            //     setTimeout(function(){
+            //         $('#tip').find('.tipclose').click();
+            //     },1500);
+            //     return false;
+            // }
             if ($('#file_url').val()) {
                 layer.msg('请先删除原文件后，再上传');
                 return false;
diff --git a/Application/Admin/View/WorkOrder/resourceApply.html b/Application/Admin/View/WorkOrder/resourceApply.html
index 703795090..af7902ccb 100644
--- a/Application/Admin/View/WorkOrder/resourceApply.html
+++ b/Application/Admin/View/WorkOrder/resourceApply.html
@@ -278,11 +278,6 @@
             pick: {id:'#picker'},
             //dnd: "#theList",
             paste: document.body,
-            accept: {
-                title: '压缩包',
-                extensions: 'rar,zip',
-                mimeTypes: '.rar,.zip',
-            },
             // 不压缩image, 默认如果是jpeg，文件上传前会压缩一把再上传！
             resize: false,
             disableGlobalDnd: true,
@@ -297,14 +292,14 @@
         });
 
         uploaderFile.on('beforeFileQueued',function(file){
-            var mycars=new Array("zip","rar","tar","jar");
-            if($.inArray(file.ext,mycars) == -1){
-                updateAlert('上传文件非法','tip_error');
-                setTimeout(function(){
-                    $('#tip').find('.tipclose').click();
-                },1500);
-                return false;
-            }
+            // var mycars=new Array("zip","rar","tar","jar");
+            // if($.inArray(file.ext,mycars) == -1){
+            //     updateAlert('上传文件非法','tip_error');
+            //     setTimeout(function(){
+            //         $('#tip').find('.tipclose').click();
+            //     },1500);
+            //     return false;
+            // }
             if ($('#file_url').val()) {
                 layer.msg('请先删除原文件后，再上传');
                 return false;
diff --git a/Application/Admin/View/WorkOrder/store.html b/Application/Admin/View/WorkOrder/store.html
index 67c783cfe..0eeae62c5 100644
--- a/Application/Admin/View/WorkOrder/store.html
+++ b/Application/Admin/View/WorkOrder/store.html
@@ -433,11 +433,6 @@
             pick: {id:'#picker'},
             //dnd: "#theList",
             paste: document.body,
-            accept: {
-                title: '压缩包',
-                extensions: 'rar,zip',
-                mimeTypes: '.rar,.zip',
-            },
             // 不压缩image, 默认如果是jpeg，文件上传前会压缩一把再上传！
             resize: false,
             disableGlobalDnd: true,
@@ -452,14 +447,14 @@
         });
 
         uploaderFile.on('beforeFileQueued',function(file){
-            var mycars=new Array("zip","rar","tar","jar");
-            if($.inArray(file.ext,mycars) == -1){
-                updateAlert('上传文件非法','tip_error');
-                setTimeout(function(){
-                    $('#tip').find('.tipclose').click();
-                },1500);
-                return false;
-            }
+            // var mycars=new Array("zip","rar","tar","jar");
+            // if($.inArray(file.ext,mycars) == -1){
+            //     updateAlert('上传文件非法','tip_error');
+            //     setTimeout(function(){
+            //         $('#tip').find('.tipclose').click();
+            //     },1500);
+            //     return false;
+            // }
             //$.each(mycars,function(index,value){});
         })
         // 当有文件被添加进队列的时候
diff --git a/ThinkPHP/Library/Think/ShardUpload.class.php b/ThinkPHP/Library/Think/ShardUpload.class.php
index ac07464aa..83b36f4e7 100644
--- a/ThinkPHP/Library/Think/ShardUpload.class.php
+++ b/ThinkPHP/Library/Think/ShardUpload.class.php
@@ -13,7 +13,7 @@ class ShardUpload extends Controller{
     //要配置的内容
     private $path = "./Uploads/SourcePack";
     private $iospath = "./Uploads/GamePack";
-    private $allowtype =array('apk','ipa','zip','rar','7z','mobileprovision','mp4','gif');
+    private $allowtype =array('apk','ipa','zip','rar','7z','mobileprovision','mp4','gif', 'xlsx', 'txt', 'doc', 'docx', 'xls', 'csv', 'pdf');
     private $iosallowtype =array('ipa');
     private $maxsize = 99999999;
     private $israndname = true;