Quellcode durchsuchen

【修改】bug

莫绍宝 vor 3 Jahren
Ursprung
Commit
b368a35970

+ 1 - 1
src/components/Common/print-common.vue

@@ -42,7 +42,7 @@
           <div v-for="(it, idx) in item.invoicePickBeans" :key="idx">
             <el-row :gutter="20">
               <el-col :span="2">{{ it.salesId }}</el-col>
-              <el-col :span="2">{{ it.id ? item.id : '' }}</el-col>
+              <el-col :span="2">{{ it.invoiceId }}</el-col>
               <el-col :span="2">{{ it.id ? dateToDayFilter(item.orderTime) : '' }}</el-col>
               <el-col :span="2">{{ it.mainOrderId }}</el-col>
               <el-col :span="2">{{ it.refEnginRecordNo }}</el-col>

+ 2 - 2
src/views/supply/reserve/components/reserve_form.vue

@@ -117,7 +117,7 @@
         <el-table-column align="center" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="规格型号" prop="specification" min-width="200" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="原预留数量" prop="oldNum" min-width="100" show-overflow-tooltip></el-table-column>
+        <!-- <el-table-column align="center" label="原预留数量" prop="oldNum" min-width="100" show-overflow-tooltip></el-table-column> -->
         <el-table-column align="center" label="预留数量" prop="reservedNum" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-input v-model="scope.row.reservedNum" size="small"></el-input>
@@ -237,7 +237,7 @@
               {{scope.row.orderType | orderTypeFilter}}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="订单号" prop="orderId" min-width="180" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="订单号" prop="mainOrderId" min-width="180" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="销售类型" prop="saleTypeName" min-width="100" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="物料编码" prop="materialCode" min-width="120" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="产品编码" prop="materialOldNumber" min-width="120" show-overflow-tooltip></el-table-column>

+ 1 - 1
src/views/supply/retail/components/retail_examine.vue

@@ -77,7 +77,7 @@
         <el-table-column align="right" label="数量" prop="refundableQty" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="right" label="订单金额" prop="totalAmount" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
-            {{ scope.row.price | numToFixed }}
+            {{ scope.row.totalAmount | numToFixed }}
           </template>
         </el-table-column>
         <el-table-column align="center" label="返利类型" prop="customerWalletName2" min-width="140" show-overflow-tooltip></el-table-column>