lilei hace 1 año
padre
commit
51fc50dfb6

+ 1 - 1
src/views/salesManagement/salesQueryNew/comps/activeQueryPart.vue

@@ -163,7 +163,7 @@ export default {
               const productUnit = data.list[i].productUnit || '--'
               const productPackQtyUnit = data.list[i].productPackQtyUnit || '--'
               data.list[i].packQtyV = productPackQty + productUnit + '/' + productPackQtyUnit
-              data.list[i].unitQtyV = data.list[i].unitQty + data.list[i].unitTypeDictValue
+              data.list[i].unitQtyV = data.list[i].unitQty + data.list[i].productUnit
             }
             this.disabled = false
           }

+ 2 - 1
src/views/salesManagement/salesQueryNew/comps/productList.vue

@@ -342,6 +342,7 @@
               for (var i = 0; i < data.list.length; i++) {
                 data.list[i].no = no + i + 1
                 data.list[i].qtyBackups = data.list[i].qty
+                data.list[i].unitQtyV = data.list[i].unitQty + data.list[i].productEntity.unit
               }
               this.disabled = false
               this.dataSource = data.list
@@ -384,7 +385,7 @@
           { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
           { title: '产品编码', dataIndex: 'productEntity.code', scopedSlots: { customRender: 'productCode' }, width: '13%', align: 'center' },
           { title: '产品名称', dataIndex: 'productEntity.name', scopedSlots: { customRender: 'productName' }, width: '20%', align: 'left' },
-          { title: '起订量', dataIndex: 'unitQty', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+          { title: '起订量', dataIndex: 'unitQtyV', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
           { title: '销售数量', scopedSlots: { customRender: 'salesNums' }, width: '8%', align: 'center' },
           { title: '库存', dataIndex: 'stockQty', scopedSlots: { customRender: 'stockQty' }, width: '8%', align: 'center' },
           { title: '出库仓库', scopedSlots: { customRender: 'warehouseBox' }, width: '15%', align: 'center' },

+ 3 - 3
src/views/salesManagement/salesQueryNew/detail.vue

@@ -6,9 +6,9 @@
           <a id="salesEdit-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
           <span style="margin: 0 15px;color: #666;font-weight: bold;">单号:{{ detailData&&detailData.salesBillNo }}</span>
           <span v-if="detailData&&detailData.salesBillNoSource">(原:{{ detailData&&detailData.salesBillNoSource || '--' }})</span>
-          <span style="margin-left:15px;color:#00aaff;cursor:pointer;"  @click="showDetail=!showDetail">
-            <a-icon title="查看信息" type="eye"/> 查看信息
-          </span>
+          <a-button type="link" class="button-default" @click="showDetail=!showDetail">
+            <a-icon :type="showDetail ? 'eye-invisible' : 'eye'"/> {{ showDetail?'隐藏':'查看' }}信息
+          </a-button>
         </template>
         <template slot="extra">
           <a-button

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

@@ -7,9 +7,9 @@
           <a id="salesEdit-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
           <span style="margin: 0 15px;color: #666;font-weight: bold;">单号:{{ detailData&&detailData.salesBillNo }}</span>
           <span v-if="detailData&&detailData.salesBillNoSource">(原:{{ detailData&&detailData.salesBillNoSource || '--' }})</span>
-          <span style="margin-left:15px;color:#00aaff;cursor:pointer;"  @click="showDetail=!showDetail">
-            <a-icon title="查看信息" type="eye"/> 查看信息
-          </span>
+          <a-button type="link" class="button-default" @click="showDetail=!showDetail">
+            <a-icon :type="showDetail ? 'eye-invisible' : 'eye'"/> {{ showDetail?'隐藏':'查看' }}信息
+          </a-button>
         </template>
       </a-page-header>
       <!-- 单据详情 -->