Quellcode durchsuchen

fix: 发票审批问题

liujt vor 4 Tagen
Ursprung
Commit
53c055ee9b

+ 20 - 18
src/views/bpm/handleTask/components/financialManage/invoiceManage/components/addOrEditDialog.vue

@@ -307,23 +307,25 @@
           </ele-pro-table>
         <!-- </el-form> -->
       </div>
-    <headerTitle title="关联物品清单信息"></headerTitle>
-    <!-- <table-info
-      v-if="dialogType != 'add' && form.detailList.length"
-      dialogType="view"
-      :form="form"
-      ref="table"
-    ></table-info> -->
-   <table-info-new
-      v-if="form.sourceType != 99"
-      dialogType="view"
-      ref="tableInfoNewRef"
-    ></table-info-new>
-    <table-info
-      v-else
-      dialogType="view"
-      ref="tableInfoNoOrderRef"
-    ></table-info>
+      <div style="margin-top: 20px;">
+        <headerTitle title="关联物品清单信息"></headerTitle>
+        <!-- <table-info
+          v-if="dialogType != 'add' && form.detailList.length"
+          dialogType="view"
+          :form="form"
+          ref="table"
+        ></table-info> -->
+      <table-info-new
+          v-if="form.sourceType != 99"
+          dialogType="view"
+          ref="tableInfoNewRef"
+        ></table-info-new>
+        <table-info
+          v-else
+          dialogType="view"
+          ref="tableInfoNoOrderRef"
+        ></table-info>
+      </div>
   </div>
 </template>
 <script>
@@ -538,7 +540,7 @@
           if (this.form.sourceType == 99) {
             this.$refs.tableInfoNoOrderRef?.setValue(this.form);
           } else {
-            this.$refs.tableInfoRef?.putValue(this.form);
+            this.$refs.tableInfoNewRef?.putValue(this.form);
           }
         })
       },

+ 20 - 18
src/views/bpm/handleTask/components/financialManage/invoiceManage/components/detailDialog.vue

@@ -261,23 +261,25 @@
           </ele-pro-table>
         <!-- </el-form> -->
       </div>
-    <headerTitle title="关联物品清单信息"></headerTitle>
-    <!-- <table-info
-      v-if="dialogType != 'add' && form.detailList.length"
-      dialogType="view"
-      :form="form"
-      ref="table"
-    ></table-info> -->
-   <table-info-new
-      v-if="form.sourceType != 99"
-      dialogType="view"
-      ref="tableInfoNewRef"
-    ></table-info-new>
-    <table-info
-      v-else
-      dialogType="view"
-      ref="tableInfoNoOrderRef"
-    ></table-info>
+      <div style="margin-top: 20px;">
+        <headerTitle title="关联物品清单信息"></headerTitle>
+        <!-- <table-info
+          v-if="dialogType != 'add' && form.detailList.length"
+          dialogType="view"
+          :form="form"
+          ref="table"
+        ></table-info> -->
+      <table-info-new
+          v-if="form.sourceType != 99"
+          dialogType="view"
+          ref="tableInfoNewRef"
+        ></table-info-new>
+        <table-info
+          v-else
+          dialogType="view"
+          ref="tableInfoNoOrderRef"
+        ></table-info>
+      </div>
   </div>
 </template>
 
@@ -418,7 +420,7 @@
           if (this.form.sourceType == 99) {
             this.$refs.tableInfoNoOrderRef?.setValue(this.form);
           } else {
-            this.$refs.tableInfoRef?.putValue(this.form);
+            this.$refs.tableInfoNewRef?.putValue(this.form);
           }
         })
       },

+ 1 - 1
src/views/bpm/handleTask/components/financialManage/invoiceManage/components/tableInfoNew.vue

@@ -124,7 +124,7 @@
           // },
           {
             width: 100,
-            prop: 'sourceOrderNo',
+            prop: 'spOrderNo',
             label: '销售订单编码',
             align: 'center'
           },