优化采购申请purchaseApply-manage

WebService/src/main/resources/components/purchaseApplyPackage/purchaseApply-manage/purchaseApplyManage.html

@@ -73,23 +73,18 @@
                         </thead>
                         <tbody>
                         <tr v-for="purchaseApply in purchaseApplyManageInfo.purchaseApplys">
-                            <td class="text-center">{{purchaseApply.state}}</td>
-                            <td class="text-center">{{purchaseApply.entryPerson}}</td>
+                            <td class="text-center">{{purchaseApply.stateName}}</td>
+                            <td class="text-center">{{purchaseApply.userName}}</td>
                             <td class="text-center">{{purchaseApply.createTime}}</td>
                             <td class="text-center">{{purchaseApply.resourceNames}}</td>
                             <td class="text-center">{{purchaseApply.totalPrice}}</td>
                             <td class="text-center">
                                 <div class="btn-group">
                                     <button class="btn-white btn btn-xs"
-                                            v-on:click="_openEditPurchaseApplyModel(purchaseApply)">查看
+                                            v-on:click="_openDetailPurchaseApplyModel(purchaseApply)">查看
                                     </button>
                                 </div>
-<!--                                <div class="btn-group">-->
-<!--                                    <button class="btn-white btn btn-xs"-->
-<!--                                            v-on:click="_openEditPurchaseApplyModel(purchaseApply)">修改-->
-<!--                                    </button>-->
-<!--                                </div>-->
-                                <div class="btn-group">
+                                <div class="btn-group" v-if="purchaseApply.state == '1000'">
                                     <button class="btn-white btn btn-xs"
                                             v-on:click="_openDeletePurchaseApplyModel(purchaseApply)">取消
                                     </button>

WebService/src/main/resources/components/purchaseApplyPackage/purchaseApply-manage/purchaseApplyManage.js

@@ -21,9 +21,6 @@
         },
         _initMethod:function(){
             vc.component._listPurchaseApplys(DEFAULT_PAGE, DEFAULT_ROWS);
-            // vc.getDict('purchase_apply',"state",function(_data){
-            //     vc.component.purchaseApplyManageInfo.states = _data;
-            // });
         },
         _initEvent:function(){
             
@@ -62,16 +59,10 @@
                            );
             },
             _openAddPurchaseApplyModal:function(){
-                //vc.emit('addPurchaseApply','openAddPurchaseApplyModal',{});
                 vc.jumpToPage("/flow/addPurchaseApplyStepFlow");
             },
-            // _openAddComplaintModal: function () {
-            //     //vc.emit('addComplaint', 'openAddComplaintModal', {});
-            //     vc.jumpToPage("/flow/addComplaintStepFlow")
-            // },
-            _openEditPurchaseApplyModel:function(_purchaseApply){
-                //vc.emit('editPurchaseApply','openEditPurchaseApplyModal',_purchaseApply);
-                vc.jumpToPage("/flow/purchaseApplyDetailFlow");
+            _openDetailPurchaseApplyModel:function(_purchaseApply){
+                vc.jumpToPage("/flow/purchaseApplyDetailFlow?applyOrderId="+_purchaseApply.applyOrderId);
             },
             _openDeletePurchaseApplyModel:function(_purchaseApply){
                 vc.emit('deletePurchaseApply','openDeletePurchaseApplyModal',_purchaseApply);