Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/xt_pages/stock/detail/stockInDetail.vue

@@ -937,6 +937,7 @@ export default {
         var obj = {index:"合计",total_price:0}
         var total = 0
         console.log("wowowows",this.tableDataList)
+        return
         for(let i=0;i<this.tableDataList.length;i++){
           this.tableDataList[i].index = i + 1
           this.tableDataList[i].good_type_name = this.typeName(this.tableDataList[i].good_type_id)