chenrui hace 4 años
padre
commit
8790d50bde

+ 2 - 9
src/views/allocationManagement/chainTransferIn/list.vue

@@ -124,7 +124,6 @@
 
 <script>
 import moment from 'moment'
-import getDate from '@/libs/getDate.js'
 import { STable, VSelect } from '@/components'
 import { allocLinkagePutList, allocLinkagePutAudit } from '@/api/allocLinkagePut'
 import { getTenantList } from '@/api/allocLinkageOut'
@@ -134,10 +133,7 @@ export default {
     return {
       tableHeight: 0,
       advanced: false, // 高级搜索 展开/关闭
-      time: [
-        moment(getDate.getCurrMonthDays().starttime, this.dateFormat),
-        moment(getDate.getCurrMonthDays().endtime, this.dateFormat)
-      ], //  入库时间
+      time: [], //  入库时间
       queryParam: { //  查询条件
         outTenantSn: undefined, //  调出对象
         allocationType: undefined, //  调拨产品类型
@@ -198,10 +194,7 @@ export default {
       this.queryParam.allocationType = undefined
       this.queryParam.state = undefined
       this.queryParam.settleState = undefined
-      this.time = [
-        moment(getDate.getCurrMonthDays().starttime, this.dateFormat),
-        moment(getDate.getCurrMonthDays().endtime, this.dateFormat)
-      ]
+      this.time = []
       this.$refs.table.refresh(true)
     },
     //  详情

+ 5 - 1
src/views/inventoryManagement/inventoryQuery/warehouseDetail.vue

@@ -84,6 +84,10 @@
         :data="loadData"
         :scroll="{ x: 1760 }"
         bordered>
+        <!-- 数量 -->
+        <template slot="qty" slot-scope="text, record">
+          <span :class="record.flowType=='PUT' ? 'green':'red'">{{ record.flowType=='PUT' ? '+':'-' }}{{ record.qty }}</span>
+        </template>
       </s-table>
     </a-card>
   </div>
@@ -121,7 +125,7 @@ export default {
         { title: '单位名称', dataIndex: 'unitName', width: 200, align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
         { title: '仓库', dataIndex: 'warehouseName', width: 140, align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
         { title: '仓位', dataIndex: 'warehouseLocationName', width: 140, align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
-        { title: '数量', dataIndex: 'qty', width: 100, align: 'center' },
+        { title: '数量', scopedSlots: { customRender: 'qty' }, width: 100, align: 'center' },
         { title: '总成本', dataIndex: 'totalCost', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '总售价', dataIndex: 'totalPrice', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
       ],