Sfoglia il codice sorgente

散件退货 详情

chenrui 3 anni fa
parent
commit
006fdb237a

+ 7 - 0
src/api/sparePartsRet.js

@@ -92,3 +92,10 @@ export const sparePartsRetSubmit = (params) => {
     method: 'post'
     method: 'post'
   })
   })
 }
 }
+//  散件退货  详情
+export const sparePartsRetDetail = (params) => {
+  return axios({
+    url: `/sparePartsRet/queryBySn/${params.sn}`,
+    method: 'get'
+  })
+}

+ 0 - 11
src/config/router.config.js

@@ -1320,17 +1320,6 @@ export const asyncRouterMap = [
                   hidden: true,
                   hidden: true,
                   permission: 'B_bulkReturnGoodsEdit'
                   permission: 'B_bulkReturnGoodsEdit'
                 }
                 }
-              },
-              {
-                path: 'detail/:id/:sn',
-                name: 'bulkReturnGoodsDetail',
-                component: () => import(/* webpackChunkName: "shop" */ '@/views/bulkManagement/bulkReturnGoods/detail.vue'),
-                meta: {
-                  title: '散件退货单详情',
-                  icon: 'frown',
-                  hidden: true
-                  // permission: 'B_goodsManage_edit'
-                }
               }
               }
             ]
             ]
           }
           }

+ 3 - 3
src/views/bulkManagement/bulkReturnGoods/basicInfoModal.vue

@@ -35,8 +35,8 @@
             <a-radio value="0">否</a-radio>
             <a-radio value="0">否</a-radio>
           </a-radio-group>
           </a-radio-group>
         </a-form-model-item>
         </a-form-model-item>
-        <a-form-model-item label="备注" prop="remarks">
-          <a-textarea id="bulkReturnGoods-basicInfo-remarks" :maxLength="120" v-model="form.remarks" placeholder="请输入备注(最多120个字符)" allowClear />
+        <a-form-model-item label="备注" prop="remark">
+          <a-textarea id="bulkReturnGoods-basicInfo-remark" :maxLength="120" v-model="form.remark" placeholder="请输入备注(最多120个字符)" allowClear />
         </a-form-model-item>
         </a-form-model-item>
       </a-form-model>
       </a-form-model>
       <div class="btn-cont">
       <div class="btn-cont">
@@ -75,7 +75,7 @@ export default {
       form: {
       form: {
         supplierSn: undefined,
         supplierSn: undefined,
         isGrab: '1',
         isGrab: '1',
-        remarks: ''
+        remark: ''
       },
       },
       rules: {
       rules: {
         supplierSn: [ { required: true, message: '请选择供应商', trigger: 'change' } ],
         supplierSn: [ { required: true, message: '请选择供应商', trigger: 'change' } ],

+ 0 - 8
src/views/bulkManagement/bulkReturnGoods/detail.vue

@@ -1,8 +0,0 @@
-<template>
-</template>
-
-<script>
-</script>
-
-<style>
-</style>

+ 183 - 0
src/views/bulkManagement/bulkReturnGoods/detailModal.vue

@@ -0,0 +1,183 @@
+<template>
+  <a-modal
+    centered
+    class="bulkReturnGoodsDetail-modal"
+    :footer="null"
+    :maskClosable="false"
+    title="详情"
+    v-model="isShow"
+    @cancle="isShow = false"
+    :width="960">
+    <a-spin :spinning="spinning" tip="Loading...">
+      <a-card size="small" :bordered="false" class="bulkReturnGoodsDetail-cont">
+        <a-descriptions size="small">
+          <a-descriptions-item label="散件退货单号" :span="3">
+            {{ (basicInfoData&&basicInfoData.sparePartsReturnNo) || '--' }}
+            <div style="display: inline-block;margin-left: 10px;">
+              <a-tag color="red" v-if="basicInfoData&&basicInfoData.stateDictValue">{{ basicInfoData.stateDictValue }}</a-tag>
+              <a-tag color="orange" v-if="basicInfoData&&basicInfoData.settleStateDictValue">{{ basicInfoData.settleStateDictValue }}</a-tag>
+            </div>
+          </a-descriptions-item>
+          <a-descriptions-item label="供应商">{{ (basicInfoData&&basicInfoData.supplierName) || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="是否抓单">{{ (basicInfoData&&basicInfoData.isGrabDictValue) || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="备注">{{ (basicInfoData&&basicInfoData.remark) || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="创建时间">{{ (basicInfoData&&basicInfoData.createDate) || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="审核时间">{{ (basicInfoData&&basicInfoData.auditTime) || '--' }}</a-descriptions-item>
+        </a-descriptions>
+      </a-card>
+      <a-card size="small" :bordered="false" class="bulkReturnGoodsDetail-cont">
+        <!-- 总计 -->
+        <a-alert type="info" style="margin-bottom:10px">
+          <div slot="message">
+            总款数<strong>{{ (productTotal&&(productTotal.purchaseSize || productTotal.purchaseSize==0)) ? productTotal.purchaseSize : '--' }}</strong> ,
+            总数量<strong>{{ (productTotal&&(productTotal.purchaseQty || productTotal.purchaseQty==0)) ? productTotal.purchaseQty : '--' }}</strong> ,
+            总金额<strong>{{ (productTotal&&(productTotal.purchaseCost || productTotal.purchaseCost==0)) ? '¥'+productTotal.purchaseCost : '--' }}</strong>
+          </div>
+        </a-alert>
+        <!-- 列表 -->
+        <s-table
+          class="sTable"
+          ref="table"
+          size="small"
+          :rowKey="(record) => record.id"
+          :columns="columns"
+          :data="loadData"
+          :scroll="{ x: isGrab=='1'?890:910, y: 450 }"
+          bordered>
+        </s-table>
+      </a-card>
+    </a-spin>
+  </a-modal>
+</template>
+
+<script>
+import { STable } from '@/components'
+import { sparePartsRetDetail, sparePartsRetDetailList, sparePartsRetDetailCount } from '@/api/sparePartsRet'
+export default {
+  name: 'BulkReturnGoodsDetailModal',
+  components: { STable },
+  props: {
+    openModal: { //  弹框显示状态
+      type: Boolean,
+      default: false
+    },
+    itemSn: {
+      type: String || Number,
+      default: ''
+    },
+    isGrab: {
+      type: String || Number,
+      default: ''
+    }
+  },
+  data () {
+    return {
+      spinning: false,
+      isShow: this.openModal, //  是否打开弹框
+      // 加载数据方法 必须为 Promise 对象
+      loadData: parameter => {
+        this.disabled = true
+        const params = Object.assign(parameter, { sparePartsReturnSn: this.$route.params.sn })
+        return sparePartsRetDetailList(params).then(res => {
+          this.getDetailCount(params)
+          const data = res.data
+          const no = (data.pageNo - 1) * data.pageSize
+          for (var i = 0; i < data.list.length; i++) {
+            data.list[i].no = no + i + 1
+          }
+          this.disabled = false
+          return data
+        })
+      },
+      basicInfoData: null, //  基本信息
+      productTotal: null
+    }
+  },
+  computed: {
+    columns () {
+      let arr = []
+      if (this.isGrab == '1') { // 抓单
+        arr = [
+          { title: '序号', dataIndex: 'no', width: 50, align: 'center' },
+          { title: '散件入库单号', dataIndex: 'sparePartsPurchaseNo', width: 180, align: 'center', customRender: function (text) { return text || '--' } },
+          { title: '产品编码', dataIndex: 'productCode', width: 180, align: 'center', customRender: function (text) { return text || '--' } },
+          { title: '产品名称', dataIndex: 'productName', align: 'center', customRender: function (text) { return text || '--' } },
+          { title: '单位', dataIndex: 'productUnit', width: 60, align: 'center', customRender: function (text) { return text || '--' } },
+          { title: '退货单价', dataIndex: 'purchaseCost', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+          { title: '退货数量', dataIndex: 'purchaseQty', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+          { title: '退货金额', dataIndex: 'purchaseAmount', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
+        ]
+      } else { // 不抓单
+        arr = [
+          { title: '序号', dataIndex: 'no', width: 50, align: 'center' },
+          { title: '产品编码', dataIndex: 'productCode', width: 180, align: 'center', customRender: function (text) { return text || '--' } },
+          { title: '产品名称', dataIndex: 'productName', align: 'center', customRender: function (text) { return text || '--' } },
+          { title: '仓库', dataIndex: 'warehouseName', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
+          { title: '仓位', dataIndex: 'warehouseLocationName', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
+          { title: '库存数量', dataIndex: 'currentQty', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+          { title: '单位', dataIndex: 'unit', width: 60, align: 'center', customRender: function (text) { return text || '--' } },
+          { title: '退货单价', dataIndex: 'purchaseCost', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+          { title: '退货数量', dataIndex: 'purchaseQty', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
+        ]
+      }
+      return arr
+    }
+  },
+  methods: {
+    // 详情
+    getDetail () {
+      sparePartsRetDetail({ sn: this.itemSn }).then(res => {
+        if (res.status == 200) {
+          this.basicInfoData = res.data || null
+        } else {
+          this.basicInfoData = null
+        }
+      })
+    },
+    // 合计
+    getDetailCount () {
+      sparePartsRetDetailCount({ sparePartsPurchaseSn: this.$route.params.sn }).then(res => {
+        if (res.status == 200) {
+          this.productTotal = res.data
+        } else {
+          this.productTotal = null
+        }
+      })
+    }
+  },
+  watch: {
+    //  父页面传过来的弹框状态
+    openModal (newValue, oldValue) {
+      this.isShow = newValue
+    },
+    //  重定义的弹框状态
+    isShow (newValue, oldValue) {
+      if (!newValue) {
+        this.$emit('close')
+      } else {
+        const _this = this
+        setTimeout(() => (
+          _this.$refs.table.refresh(true)
+        ), 300)
+      }
+    },
+    itemSn (newValue, oldValue) {
+      if (this.isShow && newValue) {
+        this.getDetail()
+      }
+    }
+  }
+}
+</script>
+
+<style lang="less">
+.bulkReturnGoods-basicInfo-modal {
+  .ant-modal-body {
+    padding: 40px 40px 24px;
+  }
+  .btn-cont {
+    text-align: center;
+    margin: 35px 0 10px;
+  }
+}
+</style>

+ 22 - 7
src/views/bulkManagement/bulkReturnGoods/list.vue

@@ -72,6 +72,11 @@
         :data="loadData"
         :data="loadData"
         :scroll="{ x: 1370, y: tableHeight }"
         :scroll="{ x: 1370, y: tableHeight }"
         bordered>
         bordered>
+        <!-- 散件退货单号 -->
+        <template slot="sparePartsReturnNo" slot-scope="text, record">
+          <span style="color: #ed1c24;cursor: pointer;" v-if="$hasPermissions('B_bulkReturnGoodsDetail')" @click="handleDetail(record)">{{ record.sparePartsReturnNo }}</span>
+          <span v-else>{{ record.sparePartsReturnNo }}</span>
+        </template>
         <!-- 操作 -->
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">
         <template slot="action" slot-scope="text, record">
           <a-button
           <a-button
@@ -101,17 +106,20 @@
     </a-spin>
     </a-spin>
     <!-- 选择基本信息弹框 -->
     <!-- 选择基本信息弹框 -->
     <basic-info-modal :openModal="openModal" @ok="handleOk" @close="openModal=false" />
     <basic-info-modal :openModal="openModal" @ok="handleOk" @close="openModal=false" />
+    <!-- 详情 -->
+    <bulkReturnGoods-detail-modal :openModal="openDetailModal" :itemSn="itemSn" :isGrab="isGrab" @close="handleDetailClose" />
   </a-card>
   </a-card>
 </template>
 </template>
 
 
 <script>
 <script>
 import { STable, VSelect } from '@/components'
 import { STable, VSelect } from '@/components'
 import basicInfoModal from './basicInfoModal.vue'
 import basicInfoModal from './basicInfoModal.vue'
+import bulkReturnGoodsDetailModal from './detailModal.vue'
 import rangeDate from '@/views/common/rangeDate.vue'
 import rangeDate from '@/views/common/rangeDate.vue'
 import { supplierAllList } from '@/api/supplier'
 import { supplierAllList } from '@/api/supplier'
 import { sparePartsRetList, sparePartsRetDel, sparePartsRetOutStock } from '@/api/sparePartsRet'
 import { sparePartsRetList, sparePartsRetDel, sparePartsRetOutStock } from '@/api/sparePartsRet'
 export default {
 export default {
-  components: { STable, VSelect, basicInfoModal, rangeDate },
+  components: { STable, VSelect, basicInfoModal, rangeDate, bulkReturnGoodsDetailModal },
   data () {
   data () {
     return {
     return {
       spinning: false,
       spinning: false,
@@ -129,7 +137,7 @@ export default {
       disabled: false, //  查询、重置按钮是否可操作
       disabled: false, //  查询、重置按钮是否可操作
       columns: [
       columns: [
         { title: '序号', dataIndex: 'no', width: 70, align: 'center' },
         { title: '序号', dataIndex: 'no', width: 70, align: 'center' },
-        { title: '散件退货单号', dataIndex: 'sparePartsReturnNo', width: 180, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '散件退货单号', scopedSlots: { customRender: 'sparePartsReturnNo' }, width: 180, align: 'center' },
         { title: '供应商', dataIndex: 'supplierName', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '供应商', dataIndex: 'supplierName', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品款数', dataIndex: 'productTotalCategory', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '产品款数', dataIndex: 'productTotalCategory', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '总数量', dataIndex: 'productTotalQty', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '总数量', dataIndex: 'productTotalQty', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
@@ -144,9 +152,6 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
       loadData: parameter => {
         this.disabled = true
         this.disabled = true
-        if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 275
-        }
         return sparePartsRetList(Object.assign(parameter, this.queryParam)).then(res => {
         return sparePartsRetList(Object.assign(parameter, this.queryParam)).then(res => {
           const data = res.data
           const data = res.data
           const no = (data.pageNo - 1) * data.pageSize
           const no = (data.pageNo - 1) * data.pageSize
@@ -158,7 +163,10 @@ export default {
         })
         })
       },
       },
       supplierList: [], //  供应商列表数据
       supplierList: [], //  供应商列表数据
-      openModal: false // 基本信息弹框是否显示
+      openModal: false, // 基本信息弹框是否显示
+      openDetailModal: false,
+      itemSn: null,
+      isGrab: null
     }
     }
   },
   },
   methods: {
   methods: {
@@ -198,7 +206,9 @@ export default {
     },
     },
     //  详情
     //  详情
     handleDetail (row) {
     handleDetail (row) {
-      this.$router.push({ path: `/bulkManagement/bulkReturnGoods/detail/${row.id}/${row.sparePartsReturnSn}` })
+      this.itemSn = row.sparePartsReturnSn
+      this.isGrab = row.isGrab
+      this.openDetailModal = true
     },
     },
     //  删除
     //  删除
     handleDel (row) {
     handleDel (row) {
@@ -240,6 +250,11 @@ export default {
         }
         }
       })
       })
     },
     },
+    handleDetailClose () {
+      this.itemSn = null
+      this.isGrab = null
+      this.openDetailModal = false
+    },
     // 供应商下拉数据
     // 供应商下拉数据
     getSupplierList () {
     getSupplierList () {
       supplierAllList().then(res => {
       supplierAllList().then(res => {

+ 21 - 21
src/views/bulkManagement/bulkWarehousingOrder/edit.vue

@@ -97,7 +97,7 @@
                 :customRow="handleClickRow"
                 :customRow="handleClickRow"
                 :data="loadData"
                 :data="loadData"
                 :defaultLoadData="false"
                 :defaultLoadData="false"
-                :scroll="{ x: 1600, y: 300 }"
+                :scroll="{ x: 1240, y: 300 }"
                 bordered>
                 bordered>
                 <!-- 成本价 -->
                 <!-- 成本价 -->
                 <template slot="putCost" slot-scope="text, record">
                 <template slot="putCost" slot-scope="text, record">
@@ -172,7 +172,7 @@
                 :rowKey="(record) => record.id"
                 :rowKey="(record) => record.id"
                 :columns="chooseColumns"
                 :columns="chooseColumns"
                 :data="chooseLoadData"
                 :data="chooseLoadData"
-                :scroll="{ x: 1700, y: 300 }"
+                :scroll="{ x: 1320, y: 300 }"
                 bordered>
                 bordered>
                 <!-- 成本价 -->
                 <!-- 成本价 -->
                 <template slot="putCost" slot-scope="text, record">
                 <template slot="putCost" slot-scope="text, record">
@@ -271,16 +271,16 @@ export default {
       disabled: false, //  查询、重置按钮是否可操作
       disabled: false, //  查询、重置按钮是否可操作
       // 表头
       // 表头
       columns: [
       columns: [
-        { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
-        { title: '产品编码', dataIndex: 'code', width: 220, align: 'center', sorter: true, customRender: function (text) { return text || '--' } },
+        { title: '序号', dataIndex: 'no', width: 70, align: 'center' },
+        { title: '产品编码', dataIndex: 'code', width: 180, align: 'center', sorter: true, customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'name', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '产品名称', dataIndex: 'name', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '原厂编码', dataIndex: 'origCode', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品品牌', dataIndex: 'productBrandName', width: 200, align: 'center', sorter: true, customRender: function (text) { return text || '--' } },
-        { title: '单位', dataIndex: 'unit', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '成本价', scopedSlots: { customRender: 'putCost' }, width: 140, align: 'center' },
-        { title: '数量', scopedSlots: { customRender: 'putQty' }, width: 140, align: 'center' },
-        { title: '仓库仓位', scopedSlots: { customRender: 'warehouse' }, width: 200, align: 'center' },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: 100, align: 'center', fixed: 'right' }
+        { title: '原厂编码', dataIndex: 'origCode', width: 180, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品品牌', dataIndex: 'productBrandName', width: 140, align: 'center', sorter: true, customRender: function (text) { return text || '--' } },
+        { title: '单位', dataIndex: 'unit', width: 60, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '成本价', scopedSlots: { customRender: 'putCost' }, width: 100, align: 'center' },
+        { title: '数量', scopedSlots: { customRender: 'putQty' }, width: 100, align: 'center' },
+        { title: '仓库仓位', scopedSlots: { customRender: 'warehouse' }, width: 150, align: 'center' },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: 80, align: 'center', fixed: 'right' }
       ],
       ],
       // 加载数据方法 必须为 Promise 对象
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
       loadData: parameter => {
@@ -308,17 +308,17 @@ export default {
       },
       },
       // 表头
       // 表头
       chooseColumns: [
       chooseColumns: [
-        { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
-        { title: '产品编码', dataIndex: 'productCode', width: 220, align: 'center', customRender: function (text) { return text || '--' }, sorter: true },
+        { title: '序号', dataIndex: 'no', width: 70, align: 'center' },
+        { title: '产品编码', dataIndex: 'productCode', width: 180, align: 'center', customRender: function (text) { return text || '--' }, sorter: true },
         { title: '产品名称', dataIndex: 'productName', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '产品名称', dataIndex: 'productName', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '原厂编码', dataIndex: 'productOrigCode', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品品牌', dataIndex: 'brandName', width: 200, align: 'center', sorter: true, customRender: function (text) { return text || '--' } },
-        { title: '单位', dataIndex: 'productUnit', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '成本价', scopedSlots: { customRender: 'putCost' }, width: 140, align: 'center' },
-        { title: '数量', scopedSlots: { customRender: 'putQty' }, width: 140, align: 'center' },
-        { title: '成本小计', dataIndex: 'costSubtotal', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '仓库仓位', scopedSlots: { customRender: 'warehouse' }, width: 200, align: 'center' },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: 100, align: 'center', fixed: 'right' }
+        { title: '原厂编码', dataIndex: 'productOrigCode', width: 180, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品品牌', dataIndex: 'brandName', width: 140, align: 'center', sorter: true, customRender: function (text) { return text || '--' } },
+        { title: '单位', dataIndex: 'productUnit', width: 60, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '成本价', scopedSlots: { customRender: 'putCost' }, width: 100, align: 'center' },
+        { title: '数量', scopedSlots: { customRender: 'putQty' }, width: 100, align: 'center' },
+        { title: '成本小计', dataIndex: 'costSubtotal', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '仓库仓位', scopedSlots: { customRender: 'warehouse' }, width: 150, align: 'center' },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: 80, align: 'center', fixed: 'right' }
       ],
       ],
       // 加载数据方法 必须为 Promise 对象
       // 加载数据方法 必须为 Promise 对象
       chooseLoadData: parameter => {
       chooseLoadData: parameter => {

+ 10 - 10
src/views/bulkManagement/bulkWarehousingOrder/list.vue

@@ -98,7 +98,7 @@
         :rowKey="(record) => record.id"
         :rowKey="(record) => record.id"
         :columns="columns"
         :columns="columns"
         :data="loadData"
         :data="loadData"
-        :scroll="{ x: 1360, y: tableHeight }"
+        :scroll="{ x: 1120, y: tableHeight }"
         bordered>
         bordered>
         <!-- 散件单号 -->
         <!-- 散件单号 -->
         <template slot="sparePartsPurchaseNo" slot-scope="text, record">
         <template slot="sparePartsPurchaseNo" slot-scope="text, record">
@@ -166,16 +166,16 @@ export default {
       },
       },
       // 表头
       // 表头
       columns: [
       columns: [
-        { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
-        { title: '散件单号', scopedSlots: { customRender: 'sparePartsPurchaseNo' }, width: 220, align: 'center' },
-        { title: '创建时间', dataIndex: 'createDate', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '序号', dataIndex: 'no', width: 70, align: 'center' },
+        { title: '散件单号', scopedSlots: { customRender: 'sparePartsPurchaseNo' }, width: 180, align: 'center' },
+        { title: '创建时间', dataIndex: 'createDate', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '供应商', dataIndex: 'supplierName', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '供应商', dataIndex: 'supplierName', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '产品款数', dataIndex: 'productTotalCategory', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '总数量', dataIndex: 'productTotalQty', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '总金额', dataIndex: 'productTotalCost', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '业务状态', dataIndex: 'stateDictValue', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '财务状态', dataIndex: 'settleStateDictValue', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: 200, align: 'center', fixed: 'right' }
+        { title: '产品款数', dataIndex: 'productTotalCategory', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '总数量', dataIndex: 'productTotalQty', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '总金额', dataIndex: 'productTotalCost', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '业务状态', dataIndex: 'stateDictValue', width: 80, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '财务状态', dataIndex: 'settleStateDictValue', width: 80, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: 150, align: 'center', fixed: 'right' }
       ],
       ],
       // 加载数据方法 必须为 Promise 对象
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
       loadData: parameter => {

+ 8 - 8
src/views/inventoryManagement/inventoryQuery/list.vue

@@ -90,7 +90,7 @@
         :rowKey="(record) => record.id"
         :rowKey="(record) => record.id"
         :columns="columns"
         :columns="columns"
         :data="loadData"
         :data="loadData"
-        :scroll="{ x: 1630, y: tableHeight }"
+        :scroll="{ x: 1340, y: tableHeight }"
         bordered>
         bordered>
         <!-- 产品分类 -->
         <!-- 产品分类 -->
         <template slot="productTypeName" slot-scope="text, record">
         <template slot="productTypeName" slot-scope="text, record">
@@ -164,15 +164,15 @@ export default {
         { name: '库存数量不为0', id: '0' }
         { name: '库存数量不为0', id: '0' }
       ],
       ],
       columns: [
       columns: [
-        { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
-        { title: '产品编码', dataIndex: 'productCode', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '序号', dataIndex: 'no', width: 70, align: 'center' },
+        { title: '产品编码', dataIndex: 'productCode', width: 180, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'productName', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'productName', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
-        { title: '原厂编码', dataIndex: 'productOrigCode', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '原厂编码', dataIndex: 'productOrigCode', width: 180, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品品牌', dataIndex: 'brandName', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品品牌', dataIndex: 'brandName', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品分类', scopedSlots: { customRender: 'productTypeName' }, width: 240, align: 'center' },
-        { title: '现有库存数量(个)', dataIndex: 'currentStockQty', scopedSlots: { customRender: 'currentStockQty' }, width: 165, align: 'center', sorter: true },
-        { title: '现有库存成本(¥)', dataIndex: 'currentStockCost', scopedSlots: { customRender: 'currentStockCost' }, width: 165, align: 'center', sorter: true },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: 200, align: 'center', fixed: 'right' }
+        { title: '产品分类', scopedSlots: { customRender: 'productTypeName' }, width: 140, align: 'center' },
+        { title: '现有库存数量(个)', dataIndex: 'currentStockQty', scopedSlots: { customRender: 'currentStockQty' }, width: 140, align: 'center', sorter: true },
+        { title: '现有库存成本(¥)', dataIndex: 'currentStockCost', scopedSlots: { customRender: 'currentStockCost' }, width: 140, align: 'center', sorter: true },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: 170, align: 'center', fixed: 'right' }
       ],
       ],
       // 加载数据方法 必须为 Promise 对象
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
       loadData: parameter => {