Merge branch 'dev' into test

src/views/saleManage/saleOrder/invoice/components/addInvoiceDialog.vue

@@ -113,6 +113,9 @@
               dictName="送货方式"
               clearable
               v-model="form.deliveryTypeId"
+              filterable
+              allow-create
+              default-first-option
               style="width: 100%"
             >
             </DictSelection>
@@ -350,6 +353,9 @@
         }, {
           label: '不签回单',
           value: 2
+        }, {
+          label: '带签收单',
+          value: 3
         }],
       };
     },

src/views/saleManage/saleOrder/invoice/components/inventoryTable.vue

@@ -1289,10 +1289,10 @@
         let indexS = [];
         data.forEach((item, index) => {
           if (item.modelKey) {
-            item.modelKey = item.modelKey.toString();
+            this.$set(data[index], 'modelKey', item.modelKey.split(','));
           }
           if (item.colorKey) {
-            item.colorKey = item.colorKey.toString();
+            this.$set(data[index], 'colorKey', item.colorKey.split(','));
           }
           item.receiveTotalWeight = item.receiveTotalWeight || 0;