Merge remote-tracking branch 'origin/master'

src/views/inout/DialogCheck.vue

@@ -243,7 +243,7 @@ export default {
   },
   methods: {
     submitUpload() {
-      updateOrderDetailBiz(this.inputQuery).then((res) =>{
+      updateById(this.inputQuery).then((res) =>{
           if(res.code==20000){
             this.$message({
               type: "success",

src/views/inout/InvoiceRegistration.vue

@@ -176,6 +176,8 @@
             <span>{{ fromTypeMap[scope.row.fromType] }}</span>
           </template>
         </el-table-column>
+        <el-table-column label="总金额" prop="allAmount" width="120">
+        </el-table-column>
         <el-table-column label="单据状态" prop="status" width="100">
           <template slot-scope="scope">
             <el-tag :type="statusFilterType(scope.row.status)">{{
@@ -266,13 +268,13 @@
             width="100"
           ></el-table-column>
           <el-table-column
-            label="扫码数量"
+            label="价格"
-            prop="scanCount"
+            prop="price"
             width="100"
           ></el-table-column>
           <el-table-column
-            label="价格"
+            label="金额"
-            prop="price"
+            prop="amount"
             width="100"
           ></el-table-column>
 
@@ -300,6 +302,11 @@
             prop="certCode"
             show-overflow-tooltip
           ></el-table-column>
+          <el-table-column
+            label="扫码数量"
+            prop="scanCount"
+            width="100"
+          ></el-table-column>
           <!--<el-table-column label="操作" width="160" fixed="right">-->
           <!--  <template slot-scope="scope">-->