lilei 2 سال پیش
والد
کامیت
dcdb84e6e6

+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
-  "version": 1677461372729
+  "version": 1677462591889
 }

+ 9 - 9
src/views/common/printPanel.vue

@@ -13,9 +13,9 @@
                 <div style="padding:10px;">
                     <a-button 
                     key="3" 
-                    size="small"
                     id="print-preview-btn" 
-                    type="info"
+                    type="primary"
+                    ghost
                     :loading="$store.state.app.printLoading" 
                     :disabled="disabled" 
                     @click="handlePrint('preview')">
@@ -23,7 +23,6 @@
                     </a-button>
                     <a-button
                         key="2"
-                        size="small"
                         type="primary"
                         style="margin-left: 10px;margin-right: 10px;"
                         id="print-print-btn"
@@ -32,18 +31,19 @@
                         @click="handlePrint('print')">
                         {{ $store.state.app.printLoading?'打印中...':'快捷打印' }}
                     </a-button>
-                    <a-divider type="vertical" />
-                    <a-button
+                </div>
+                <a-divider style="margin:5px 0;" v-if="showExport"/>
+                <div style="padding:10px;" v-if="showExport">
+                  <a-button
                         key="1"
-                        size="small"
                         type="primary"
-                        :loading="$store.state.app.printLoading"
                         class="button-warning"
+                        :loading="$store.state.app.printLoading"
                         id="print-export-btn"
-                        v-if="showExport"
+                        style="margin-left:0;"
                         :disabled="disabled"
                         @click="handlePrint('export')">导出Excel</a-button>
-                    <slot name="extendButtons"></slot>         
+                    <slot name="extendButtons"></slot>  
                 </div>
             </template>
             <a-button type="link" class="button-default"><a-icon type="printer" /> 打印导出 </a-button>

+ 0 - 1
src/views/purchasingManagement/purchaseOrderNew/detail.vue

@@ -21,7 +21,6 @@
           <PrintPanel position="bottomRight" v-if="$hasPermissions('B_purchasePrint')" :disabled="localDataSource.length==0" @handlePrint="handlePrint">
             <a-button
             slot="extendButtons"
-            size="small"
             key="1"
             v-if="$hasPermissions('B_purchaseExportProduct') && (detail&&(detail.billStatus=='AUDIT_PASS' || detail.billStatus=='CANCEL' || detail.billStatus=='WAIT_PUT_WAREHOUSE' || detail.billStatus=='WAIT_PUT_WAREHOUSE_AUDIT' || detail.billStatus=='FINISH'))"
             type="primary"

+ 1 - 0
src/views/purchasingManagement/purchaseOrderNew/edit.vue

@@ -147,6 +147,7 @@
             :loading="subLoading"
             @click="handleSubmit"
             style="padding: 0 60px;">提交</a-button>
+            <!-- <a-button id="purchaseNewOrderEdit-back-btn" type="link" @click="handleBack" class="button-default"> <a-icon type="rollback" /> 返回列表</a-button> -->
         </div>
       </div>
     </div>