Browse Source

送货单订单日期修改为出库日期

xiaosonghong 2 ngày trước cách đây
mục cha
commit
bc11958ee5

+ 10 - 5
src/views/SIDEWMS/components/oYeRealTimeInventory.vue

@@ -157,7 +157,7 @@
               >客户:</span
             >
             <span style="color: #000000;font-size: 16px;font-weight: 500;">{{
-              selectedRowData.consigneeName
+              updateInsertForm.consigneeName
             }}</span>
           </el-form-item>
           <el-form-item prop="saleArea">
@@ -183,11 +183,11 @@
               >物资信息:</span
             >
             <span style="color: #000000;font-size: 16px;font-weight: 500;"
-              >{{ selectedRowData.materialName }}-{{
-                selectedRowData.materialSpe
-              }}-{{ selectedRowData.materialModel }};</span
+              >{{ updateInsertForm.materialName }}-{{
+                updateInsertForm.materialSpe
+              }}-{{ updateInsertForm.materialModel }};</span
             ><span style="color:red;font-size: 16px;font-weight: 500;"
-              >物资单重为{{ selectedRowData.singleWeight }}t</span
+              >物资单重为{{ updateInsertForm.singleWeight }}t</span
             >
           </el-form-item>
           <el-form-item prop="materialNumber">
@@ -1045,6 +1045,11 @@ export default {
               })
               this.updateInsertVisible = false
               this.getRequestUrl()
+            } else {
+              this.$message({
+                type: 'error',
+                message: res.data.data
+              })
             }
           })
       })

+ 2 - 2
src/views/index/components/printReceipt1.vue

@@ -55,7 +55,7 @@
               <th style="width: 17.5%; text-align: center">规格型号</th>
               <th style="width: 5%">件数</th>
               <th style="width: 6%">重量</th>
-              <th style="width: 20%" v-if="orderTimeFlag != null">订单日期</th>
+              <th style="width: 20%" v-if="orderTimeFlag != null">出库日期</th>
               <th style="width: 20%" v-else>过磅时间</th>
               <th style="width: 24%">摘要</th>
               <!--              <th style="width: 21%">订单日期</th>-->
@@ -70,7 +70,7 @@
               <td>{{ item.materialSpe }}{{ item.materialModel }}</td>
               <td>{{ item.materialNumber }}</td>
               <td>{{ item.materialWeight }}</td>
-              <td v-if="orderTimeFlag != null">{{ item.orderDate }}</td>
+              <td v-if="orderTimeFlag != null">{{ item.inboundOutDate }}</td>
               <td v-else>{{ item.netWeightTime }}</td>
               <td>{{ item.saleRemark }}</td>
               <!--              <td>{{ item.makeDate }}</td>-->