Browse Source

代采明细提交保存页面刷新,复制订单按钮移到页面顶部,防止客户点错

hejq 8 years ago
parent
commit
a18e54bc69

+ 2 - 0
src/main/webapp/resources/js/index/app.js

@@ -17439,6 +17439,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                         if (data.id) {
                         if (data.id) {
                             toaster.pop('success', '提示', '保存成功');
                             toaster.pop('success', '提示', '保存成功');
                             loadData();
                             loadData();
+                            window.location.reload();
                         }
                         }
                         if (data.error) {
                         if (data.error) {
                             toaster.pop('error', '提示', '保存失败');
                             toaster.pop('error', '提示', '保存失败');
@@ -17469,6 +17470,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                     if (data.id) {
                     if (data.id) {
                         toaster.pop('success', '提示', '提交成功');
                         toaster.pop('success', '提示', '提交成功');
                         window.location.hash = "#/purc/deputy/" + data.id;
                         window.location.hash = "#/purc/deputy/" + data.id;
+                        window.location.reload();
                     }
                     }
                     if (data.error) {
                     if (data.error) {
                         toaster.pop('error', '提示', '保存失败');
                         toaster.pop('error', '提示', '保存失败');

+ 3 - 2
src/main/webapp/resources/tpl/index/purc/deputyOrder_detail.html

@@ -150,7 +150,9 @@
     <div class=" purchase">
     <div class=" purchase">
         <form class="width100" name="order" autocomplete="off">
         <form class="width100" name="order" autocomplete="off">
            <!-- <div class="com_title">服务>采购模块><font>>代采订单</font></div>-->
            <!-- <div class="com_title">服务>采购模块><font>>代采订单</font></div>-->
-            <div class="com_head"><span>代采订单</span></div>
+            <div class="com_head"><span>代采订单</span>
+                <a class="pull-right" ng-click="copyorder(deOrder.id)" title="复制生成一张新的订单,除了采购单号和合同编号不同,其他信息基本相同"><i class="fa fa-copy"></i> 复制订单</a>
+            </div>
             <div class="purchase_form">
             <div class="purchase_form">
                 <!--基本信息-->
                 <!--基本信息-->
                 <div class="com_title01"><span>基本信息</span></div>
                 <div class="com_title01"><span>基本信息</span></div>
@@ -568,7 +570,6 @@
                 <div class="save" >
                 <div class="save" >
                 	<span ng-if="deOrder.entrystatus == '保存'"><button ng-click="submit()" ng-disabled="isSubmit">提交</button></span>
                 	<span ng-if="deOrder.entrystatus == '保存'"><button ng-click="submit()" ng-disabled="isSubmit">提交</button></span>
                 	<span ng-if="deOrder.entrystatus == '保存'"><button ng-click="save()" ng-disabled="isSave">保存</button></span>
                 	<span ng-if="deOrder.entrystatus == '保存'"><button ng-click="save()" ng-disabled="isSave">保存</button></span>
-                	<button ng-click="copyorder(deOrder.id)" title="复制生成一张新的订单,除了采购单号和合同编号不同,其他信息基本相同">复制订单</button>
                 	<span ng-if="deOrder.entrystatus == '保存'"><button ng-click="clear(deOrder.id)">删除</button></span>
                 	<span ng-if="deOrder.entrystatus == '保存'"><button ng-click="clear(deOrder.id)">删除</button></span>
                 </div>
                 </div>
             </div>
             </div>