Merge branch 'feat_sale' into dev_03

src/views/financialManage/invoiceManage/components/detailDialog.vue

@@ -439,7 +439,12 @@
         this.form = await invoiceApplyInfoV2API(id);
         // this.$refs.tableInfoRef.setValue(this.form);
         this.$nextTick(() => {
-          this.$refs.tableInfoNewRef && this.$refs.tableInfoNewRef.putValue(this.form);
+          // this.$refs.tableInfoNewRef && this.$refs.tableInfoNewRef.putValue(this.form);
+          if (this.form.sourceType == 99) {
+            this.$refs.tableInfoNoOrderRef?.setValue(this.form);
+          } else {
+            this.$refs.tableInfoNewRef?.putValue(this.form);
+          }
         })
       },
       downloadFile(file) {

src/views/financialManage/invoiceManage/components/tableInfoNew.vue

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