lilei 4 jaren geleden
bovenliggende
commit
c6d1bd1699

+ 4 - 4
src/views/salesManagement/salesQuery/detail.vue

@@ -40,9 +40,9 @@
       <!-- alert -->
       <a-alert type="info" style="margin-bottom: 15px;" v-if="detailData">
         <div slot="message">
-          总销售数量:<strong>{{ detailData.totalQty || 0 }}</strong>;已取消数量:<strong>{{ detailData.totalCancelQty || 0 }}</strong>;已下推数量:<strong>{{ detailData.totalPushedQty || 0 }}</strong>;待下推数量:<strong>{{ detailData.totalUnpushedQty || 0 }}</strong>;<br/>
-          总售价:<strong>{{ detailData.totalAmount || 0 }}</strong>;总成本:<strong>{{ detailData.totalCost || 0 }}</strong>;总毛利:<strong>{{ detailData.grossProfit || 0 }}</strong>;已取消金额:<strong>{{ detailData.totalCancelAmount || 0 }}</strong>;已下推金额:<strong>{{ detailData.totalPushedAmount || 0 }}</strong>;待下推金额:<strong>{{ detailData.totalUnpushedAmount || 0 }}</strong>;
-        </div>
+          总销售数量:<strong>{{ detailData.totalQty || 0 }}</strong>;已取消数量:<strong>{{ detailData.totalCancelQty || 0 }}</strong>;已下推数量:<strong>{{ detailData.totalPushedQty || 0 }}</strong>;待下推数量:<strong>{{ detailData.totalUnpushedQty || 0 }}</strong>;已发货数量:<strong>{{ detailData.totalDispatchQty || 0 }}</strong>;待发货数量:<strong>{{ detailData.totalUndispatchQty || 0 }}</strong>;<br/>
+          总售价:<strong>{{ detailData.totalAmount || 0 }}</strong>;总成本:<strong>{{ detailData.totalCost || 0 }}</strong>;总毛利:<strong>{{ detailData.grossProfit || 0 }}</strong>;已取消金额:<strong>{{ detailData.totalCancelAmount || 0 }}</strong>;已下推金额:<strong>{{ detailData.totalPushedAmount || 0 }}</strong>;待下推金额:<strong>{{ detailData.totalUnpushedAmount || 0 }};已发货金额:<strong>{{ detailData.totalDispatchAmount || 0 }};待发货金额:<strong>{{ detailData.totalUndispatchAmount || 0 }}</strong>;
+          </strong></strong></div>
       </a-alert>
       <!-- 列表 -->
       <s-table
@@ -138,7 +138,7 @@ export default {
             const productOrigUnit = (data.list[i].productEntity && data.list[i].productEntity.unit) || (data.list[i].dealerProductEntity && data.list[i].dealerProductEntity.unit)
             data.list[i].productCode = productCode || '--'
             data.list[i].productName = productName || '--'
-            data.list[i].productOrigCode = productOrigCode || '--'
+            data.list[i].productOrigCode = productOrigCode == ' ' ? '--' : productOrigCode
             data.list[i].productOrigUnit = productOrigUnit || '--'
           }
           this.disabled = false

+ 3 - 3
src/views/salesManagement/waitDispatch/edit.vue

@@ -183,7 +183,7 @@ export default {
       }
       if (key == 'qty') {
         updateQty({
-          salesBillDetailSn: row.salesBillDetailSn,
+          waitDispatchDetailSn: row.waitDispatchDetailSn,
           qty: row.qty,
           salesBillSn: this.salesBillSn
         }).then(res => {
@@ -217,7 +217,7 @@ export default {
       }
       const obj = []
       _this.selectedRows.map(item => {
-        obj.push(item.salesBillDetailSn)
+        obj.push(item.waitDispatchDetailSn)
       })
 
       this.$confirm({
@@ -247,7 +247,7 @@ export default {
     deleteFun (row, type) {
       const _this = this
       _this.delLoading = true
-      deleteBatch(type == 0 ? [row.salesBillDetailSn] : row).then(res => {
+      deleteBatch(type == 0 ? [row.waitDispatchDetailSn] : row).then(res => {
         if (res.status == 200) {
           _this.resetSearchForm(true)
           _this.$message.success(res.message)