Merge branch 'test' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-eom into test

src/views/saleManage/saleOrder/components/searchTable.vue

@@ -31,6 +31,13 @@
             type: 'input',
             placeholder: ''
           },
+          {
+            label: '销售类型',
+            value: 'saleType',
+            width: 380,
+            type: 'DictSelection',
+            dictName: '销售类型'
+          },
           {
             label: '库存状态',
             value: 'hasStock',

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

@@ -763,7 +763,7 @@
               item['modelKey'] = val.modelKey;
               item['colorKey'] = val.colorKey;
 
-              item.totalPrice = item.singlePrice * item.measureQuantity;
+              item.totalPrice = (item.singlePrice * item.measureQuantity).toFixed(2);
             }
           });
         });
@@ -868,11 +868,25 @@
           this.$set(this.form.productList[index], 'totalCount', 0);
         }
         if (row.totalCount && row.singlePrice) {
-          console.log(row.totalCount * row.singlePrice);
+          // console.log(row.totalCount * row.singlePrice);
           this.$set(
             this.form.productList[index],
             'totalPrice',
-            row.totalCount * row.singlePrice
+            (row.totalCount * row.singlePrice).toFixed(2)
+          );
+        }
+        // console.log(row.totalCount, row.saleCount);
+        if(+row.totalCount === +row.saleCount) {
+          this.$set(
+            this.form.productList[index],
+            'isException',
+            0
+          );
+        } else {
+          this.$set(
+            this.form.productList[index],
+            'isException',
+            1
           );
         }
       },