lilei 2 anni fa
parent
commit
f7e850d502

+ 5 - 2
src/views/salesManagement/pushOrderManagement/detail.vue

@@ -91,7 +91,7 @@
       </a-card>
     </a-spin>
     <!-- 发货分类打印 -->
-    <sendTypeModal ref="typePrint" :openModal="openModal" @ok="handlePrintOk" @close="openModal=false" />
+    <sendTypeModal ref="typePrint" :hasNoPrint="hasNoPrint" :openModal="openModal" @ok="handlePrintOk" @close="openModal=false" />
     <!-- 导出Excel -->
     <export-excel-modal :openModal="openExcelModal" :itemData="detailData" @ok="handleExcelOk" @close="openExcelModal=false" />
     <!-- 打印 -->
@@ -166,6 +166,9 @@ export default {
     }
   },
   computed: {
+    hasNoPrint () {
+      return this.detailData && (this.detailData.printStatus == 'UNABLE_PRINT' || this.detailData.printStatus == 'CANCEL_PRINT')
+    },
     columns () {
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
@@ -250,7 +253,7 @@ export default {
           billSn: obj.dispatchBillSn,
           billNo: obj.dispatchBillNo,
           printType: taskName + '打印'
-        }, this.detailData.printStatus == 'UNABLE_PRINT' || this.detailData.printStatus == 'CANCEL_PRINT')
+        }, this.hasNoPrint)
     }
   },
   mounted () {

+ 7 - 3
src/views/salesManagement/pushOrderManagement/sendTypeModal.vue

@@ -42,9 +42,9 @@
         </a-form-model-item>
       </a-form-model>
       <div class="btn-cont">
-        <a-button id="pushOrderManagement-print-back" @click="handleCancel" style="margin-left: 15px;">取消</a-button>
-        <a-button id="pushOrderManagement-print-save" @click="handleSave('preview')" style="margin-left: 15px;">打印预览</a-button>
-        <a-button type="primary" id="pushOrderManagement-print-save" @click="handleSave('print')" style="margin-left: 15px;">确定</a-button>
+        <a-button id="pushOrderManagement-print-back" @click="handleCancel">取消</a-button>
+        <a-button type="primary" class="button-info" id="pushOrderManagement-print-save" @click="handleSave('preview')" style="margin-left: 15px;">打印预览</a-button>
+        <a-button type="primary" id="pushOrderManagement-print-save" v-if="!hasNoPrint" @click="handleSave('print')" style="margin-left: 10px;">确定打印</a-button>
       </div>
     </a-spin>
   </a-modal>
@@ -61,6 +61,10 @@ export default {
     outBizSubSn: {
       type: [Number, String],
       default: ''
+    },
+    hasNoPrint: {
+      type: Boolean,
+      default: false
     }
   },
   data () {