yusheng 11 miesięcy temu
rodzic
commit
6b37e4abe8

+ 4 - 3
src/views/purchasingManage/purchaseOrder/invoice/components/orderListDialog.vue

@@ -1,14 +1,15 @@
 <template>
-  <el-dialog
+  <ele-modal
     title="选择订单"
     custom-class="ele-dialog-form long-dialog-form"
     :visible.sync="visible"
     :before-close="handleClose"
     :close-on-click-modal="false"
-    top="5vh"
     :close-on-press-escape="false"
     append-to-body
     width="70%"
+    :maxable="true"
+    :resizable="true"
   >
     <el-card shadow="never">
       <searchTable @search="reload"></searchTable>
@@ -45,7 +46,7 @@
       >
       <el-button size="small" @click="handleClose">关闭</el-button>
     </div>
-  </el-dialog>
+  </ele-modal>
 </template>
 
 <script>

+ 1 - 0
src/views/saleManage/saleOrder/invoice/components/addInvoiceDialog.vue

@@ -119,6 +119,7 @@
           :entrustedCode="form.entrustedCode"
           ref="inventoryTableref"
           :orderId="form.orderId"
+          :orderIds="form.orderIds"
           @replaceTableChange="replaceTableChange"
           :needProduce="saleOrderValue.needProduce"
           :typeIds="saleOrderValue.typedetailIds"

+ 3 - 2
src/views/saleManage/saleOrder/invoice/components/inventoryTable.vue

@@ -369,6 +369,7 @@
     mixins: [dictMixins, getDynamicsColumns, tabMixins],
     props: {
       orderId: String,
+      orderIds: String,
       needProduce: [String, Number],
       entrustedCode: String,
       pricingWay: [String, Number],
@@ -1183,12 +1184,12 @@
       },
       //选择产品
       handParent() {
-        if (!this.orderId) return this.$message.error('请先选择订单');
+        if (!this.orderId&&!this.orderIds) return this.$message.error('请先选择订单');
         this.$refs.BIZproductListRef.open('', -1);
       },
       // 添加
       handlAdd() {
-        if (!this.orderId) return this.$message.error('请先选择订单');
+        if (!this.orderId&&!this.orderIds) return this.$message.error('请先选择订单');
         this.$refs.productListRef.open(this.form.datasource);
       },
       //库存台账