Przeglądaj źródła

Merge branch 'deploy_0804' of jianguan-web/qpls-md-html into master

陈瑞 3 lat temu
rodzic
commit
6a5b01eb23
26 zmienionych plików z 282 dodań i 284 usunięć
  1. 12 0
      src/api/dealerProduct.js
  2. 8 0
      src/api/purchase.js
  3. 6 3
      src/components/MultiTab/MultiTab.vue
  4. 2 2
      src/config/router.config.js
  5. 2 1
      src/libs/JGPrint.js
  6. 10 12
      src/views/allocationManagement/warehouseAllocation/detail.vue
  7. 26 26
      src/views/allocationManagement/warehouseAllocation/edit.vue
  8. 12 12
      src/views/allocationManagement/warehouseAllocation/list.vue
  9. 9 56
      src/views/bulkManagement/bulkWarehousingOrder/edit.vue
  10. 2 2
      src/views/bulkManagement/bulkWarehousingOrder/list.vue
  11. 4 2
      src/views/common/productBrand.js
  12. 5 6
      src/views/financialManagement/companyCollectionPayment/detail.vue
  13. 10 10
      src/views/financialManagement/companyCollectionPayment/list.vue
  14. 10 9
      src/views/financialManagement/companyReceivablePayable/collectionPayment.vue
  15. 6 7
      src/views/financialManagement/companyReceivablePayable/detail.vue
  16. 6 6
      src/views/financialManagement/companyReceivablePayable/list.vue
  17. 8 8
      src/views/financialManagement/expenseManagement/list.vue
  18. 13 13
      src/views/financialManagement/financialCollection/list.vue
  19. 14 14
      src/views/financialManagement/financialPayment/list.vue
  20. 12 12
      src/views/financialManagement/inventoryCheckAudit/list.vue
  21. 11 12
      src/views/financialManagement/warehousingAudit/detail.vue
  22. 17 20
      src/views/financialManagement/warehousingAudit/list.vue
  23. 15 21
      src/views/outboundOrderManagement/outboundOrder/list.vue
  24. 12 11
      src/views/purchasingManagement/purchaseOrder/detail.vue
  25. 34 9
      src/views/purchasingManagement/purchaseOrder/edit.vue
  26. 16 10
      src/views/purchasingManagement/purchaseOrder/list.vue

+ 12 - 0
src/api/dealerProduct.js

@@ -12,6 +12,18 @@ export const dealerProductList = (params) => {
   })
 }
 
+//  散件入库 列表  分页  (自建产品)
+export const bulkProductList = (params) => {
+  const url = `/dealerProduct/queryPageForSparePartsPur/${params.pageNo}/${params.pageSize}`
+  delete params.pageNo
+  delete params.pageSize
+  return axios({
+    url: url,
+    data: params,
+    method: 'post'
+  })
+}
+
 // 新增/编辑 经销商产品
 export const dealerProductSave = params => {
   return axios({

+ 8 - 0
src/api/purchase.js

@@ -179,3 +179,11 @@ export const purchaseExportDetail = params => {
     responseType: 'blob'
   })
 }
+// 采购管理  修改收货地址
+export const purchaseDetailAddress = params => {
+  return axios({
+    url: '/purchase/updateAddress',
+    data: params,
+    method: 'post'
+  })
+}

+ 6 - 3
src/components/MultiTab/MultiTab.vue

@@ -153,6 +153,12 @@ export default {
       console.log(newVal, oldVal)
       // 解决页面地址相同参数不同时打开多个页签问题(例 详情页id或sn不同时)
       const index = this.tabsList.indexOf(newVal.name)
+      // 是否时同一个父级菜单下的页面
+      const mnlen = newVal.matched.length < 3
+      const molen = oldVal.matched.length < 3
+      const hasChildren = newVal.matched[mnlen ? 1 : 2].name == oldVal.matched[molen ? 1 : 2].name
+      // console.log(newVal.matched[mnlen ? 1 : 2].name, oldVal.matched[molen ? 1 : 2].name, hasChildren)
+
       if (index < 0) { // 不存在
         console.log(1, '不存在')
         // 判断是否是新增,编辑,详情页
@@ -162,9 +168,6 @@ export default {
         const oa = oldVal.meta.title.indexOf('详情') >= 0
         const ob = oldVal.meta.title.indexOf('新增') >= 0
         const oc = oldVal.meta.title.indexOf('编辑') >= 0
-        // 是否时同一个父级菜单下的页面
-        const hasChildren = newVal.matched[2].name == oldVal.matched[2].name
-        console.log(newVal.matched[2].name, oldVal.matched[2].name, hasChildren)
         if ((na || nb || nc || oa || ob || oc) && hasChildren) {
           // 替换当前页签
           this.replaceTab(newVal, oldVal)

+ 2 - 2
src/config/router.config.js

@@ -1224,7 +1224,7 @@ export const asyncRouterMap = [
                 }
               },
               {
-                path: 'add/:id/:sn',
+                path: 'add/:id/:sn/:supplierSn',
                 name: 'bulkWarehousingOrderAdd',
                 component: () => import(/* webpackChunkName: "bulkManagement" */ '@/views/bulkManagement/bulkWarehousingOrder/edit.vue'),
                 meta: {
@@ -1235,7 +1235,7 @@ export const asyncRouterMap = [
                 }
               },
               {
-                path: 'edit/:id/:sn',
+                path: 'edit/:id/:sn/:supplierSn',
                 name: 'bulkWarehousingOrderEdit',
                 component: () => import(/* webpackChunkName: "bulkManagement" */ '@/views/bulkManagement/bulkWarehousingOrder/edit.vue'),
                 meta: {

+ 2 - 1
src/libs/JGPrint.js

@@ -25,9 +25,10 @@ export const JGPrint = function (data, type, printerType) {
     }
     LODOP.SET_SHOW_MODE('HIDE_PAPER_BOARD', 1) //  隐藏底图上有模拟走纸板的条纹线
     LODOP.SET_PRINT_MODE("POS_BASEON_PAPER",true) // 可使输出以纸张边缘为基点
+    LODOP.ADD_PRINT_HTM('0', '0', 'RightMargin:0cm', 'BottomMargin:0cm', data)
     LODOP.SET_PRINT_PAGESIZE(3, 2090, 45, '') // 这里3表示纵向打印且纸高“按内容的高度”;2140表示纸宽214.0mm;60表示页底空白6.0mm
     // LODOP.SET_PRINT_PAGESIZE(1, 2090, 1000, '')
-    LODOP.ADD_PRINT_HTM('0', '0', '595pt', 1000, data)
+    // LODOP.ADD_PRINT_HTM('0', '0', '595pt', 1000, data)
     if (type == 'preview') {
       LODOP.PREVIEW()
     }

+ 10 - 12
src/views/allocationManagement/warehouseAllocation/detail.vue

@@ -47,7 +47,6 @@
         :rowKey="(record) => record.id"
         :columns="columns"
         :data="loadData"
-        :scroll="{ x: 1335 }"
         bordered>
         <!-- 产品类别 -->
         <template slot="productType" slot-scope="text, record">
@@ -68,7 +67,6 @@
 </template>
 
 <script>
-import moment from 'moment'
 import { STable, VSelect } from '@/components'
 import { allocWarehouseDetailSn, allocWarehouseDetailCount, allocWarehouseDetailList } from '@/api/allocWarehouse.js'
 export default {
@@ -89,16 +87,16 @@ export default {
       productTotal: null,
       // 表头
       columns: [
-        { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
-        { title: '产品编码', dataIndex: 'productCode', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'productName', width: 200, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '原厂编码', dataIndex: 'productOrigCode', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '类别', scopedSlots: { customRender: 'productType' }, width: 160, align: 'center' },
-        { title: '数量', dataIndex: 'allocationQty', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '单位', dataIndex: 'productUnit', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '成本小计(¥)', scopedSlots: { customRender: 'totalCost' }, width: 135, align: 'center' },
-        { title: '调出仓位', dataIndex: 'outWarehouseLocationName', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '调入仓位', dataIndex: 'putWarehouseLocationName', width: 140, align: 'center', customRender: function (text) { return text || '--' } }
+        { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
+        { title: '产品编码', dataIndex: 'productCode', width: '14%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'productName', width: '14%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '原厂编码', dataIndex: 'productOrigCode', width: '14%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '类别', scopedSlots: { customRender: 'productType' }, width: '14%', align: 'center' },
+        { title: '数量', dataIndex: 'allocationQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '单位', dataIndex: 'productUnit', width: '4%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '成本小计(¥)', scopedSlots: { customRender: 'totalCost' }, width: '8%', align: 'center' },
+        { title: '调出仓位', dataIndex: 'outWarehouseLocationName', width: '11%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '调入仓位', dataIndex: 'putWarehouseLocationName', width: '11%', align: 'center', customRender: function (text) { return text || '--' } }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {

+ 26 - 26
src/views/allocationManagement/warehouseAllocation/edit.vue

@@ -90,7 +90,7 @@
               :customRow="handleClickRow"
               :data="loadData"
               :defaultLoadData="false"
-              :scroll="{ x: 1330, y: 300 }"
+              :scroll="{ y: 300 }"
               bordered>
               <!-- 产品分类 -->
               <template slot="productType" slot-scope="text, record">
@@ -175,7 +175,7 @@
               :columns="chooseColumns"
               :data="chooseLoadData"
               :defaultLoadData="false"
-              :scroll="{ x: 1130, y: 300 }"
+              :scroll="{ y: 300 }"
               bordered>
               <!-- 产品分类 -->
               <template slot="productType" slot-scope="text, record">
@@ -265,19 +265,19 @@ export default {
       warehouseOutLocData: [], //  调出仓位  下拉数据
       // 表头
       columns: [
-        { title: '序号', dataIndex: 'no', width: 70, align: 'center' },
-        { title: '产品编码', dataIndex: 'productCode', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'productName', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '原厂编码', dataIndex: 'productOrigCode', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '品牌', dataIndex: 'brandName', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '分类', scopedSlots: { customRender: 'productType' }, width: 100, align: 'center', ellipsis: true },
-        { title: '调出仓位', dataIndex: 'warehouseLocationName', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '调入仓位', scopedSlots: { customRender: 'putWarehouseLocationSn' }, width: 100, align: 'center' },
-        { title: '调出数量', scopedSlots: { customRender: 'outQty' }, width: 100, align: 'center' },
-        { title: '可用库存数', dataIndex: 'currentQty', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '冻结库存数', dataIndex: 'freezeQty', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '单位', dataIndex: 'unit', width: 60, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: 80, align: 'center', fixed: 'right' }
+        { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
+        { title: '产品编码', dataIndex: 'productCode', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'productName', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '原厂编码', dataIndex: 'productOrigCode', width: '11%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '品牌', dataIndex: 'brandName', width: '9%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '分类', scopedSlots: { customRender: 'productType' }, width: '9%', align: 'center' },
+        { title: '调出仓位', dataIndex: 'warehouseLocationName', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '调入仓位', scopedSlots: { customRender: 'putWarehouseLocationSn' }, width: '8%', align: 'center' },
+        { title: '调出数量', scopedSlots: { customRender: 'outQty' }, width: '7%', align: 'center' },
+        { title: '可用库存数', dataIndex: 'currentQty', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '冻结库存数', dataIndex: 'freezeQty', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '单位', dataIndex: 'unit', width: '4%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: '6%', align: 'center' }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
@@ -297,17 +297,17 @@ export default {
       },
       // 表头
       chooseColumns: [
-        { title: '序号', dataIndex: 'no', width: 70, align: 'center' },
-        { title: '产品编码', dataIndex: 'productCode', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'productName', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '原厂编码', dataIndex: 'productOrigCode', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '品牌', dataIndex: 'brandName', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '分类', scopedSlots: { customRender: 'productType' }, width: 100, align: 'center' },
-        { title: '调出仓位', dataIndex: 'outWarehouseLocationName', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '调入仓位', scopedSlots: { customRender: 'putWarehouseLocationSn' }, width: 100, align: 'center' },
-        { title: '调出数量', scopedSlots: { customRender: 'outQty' }, width: 100, align: 'center' },
-        { title: '单位', dataIndex: 'productUnit', width: 60, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: 80, align: 'center', fixed: 'right' }
+        { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
+        { title: '产品编码', dataIndex: 'productCode', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'productName', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '原厂编码', dataIndex: 'productOrigCode', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '品牌', dataIndex: 'brandName', width: '9%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '分类', scopedSlots: { customRender: 'productType' }, width: '9%', align: 'center' },
+        { title: '调出仓位', dataIndex: 'outWarehouseLocationName', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '调入仓位', scopedSlots: { customRender: 'putWarehouseLocationSn' }, width: '8%', align: 'center' },
+        { title: '调出数量', scopedSlots: { customRender: 'outQty' }, width: '8%', align: 'center' },
+        { title: '单位', dataIndex: 'productUnit', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: '6%', align: 'center' }
       ],
       // 加载数据方法 必须为 Promise 对象
       chooseLoadData: parameter => {

+ 12 - 12
src/views/allocationManagement/warehouseAllocation/list.vue

@@ -60,7 +60,7 @@
         :rowKey="record => record.id"
         :columns="columns"
         :data="loadData"
-        :scroll="{ x: 1260, y: tableHeight }"
+        :scroll="{ y: tableHeight }"
         :defaultLoadData="false"
         bordered>
         <!-- 单号 -->
@@ -129,17 +129,17 @@ export default {
       },
       disabled: false, //  查询、重置按钮是否可操作
       columns: [
-        { title: '序号', dataIndex: 'no', width: 70, align: 'center' },
-        { title: '创建时间', dataIndex: 'createDate', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '单号', scopedSlots: { customRender: 'allocationWarehouseNo' }, width: 140, align: 'center' },
-        { title: '调出仓库', dataIndex: 'outWarehouseName', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '调入仓库', dataIndex: 'putWarehouseName', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { 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: 'auditTime', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '业务状态', dataIndex: 'stateDictValue', width: 80, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: 150, align: 'center', fixed: 'right' }
+        { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
+        { title: '创建时间', dataIndex: 'createDate', width: '11%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '单号', scopedSlots: { customRender: 'allocationWarehouseNo' }, width: '15%', align: 'center' },
+        { title: '调出仓库', dataIndex: 'outWarehouseName', width: '11%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '调入仓库', dataIndex: 'putWarehouseName', width: '11%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '总款数', dataIndex: 'productTotalCategory', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '总数量', dataIndex: 'productTotalQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '总成本', dataIndex: 'productTotalCost', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '审核时间', dataIndex: 'auditTime', width: '11%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '业务状态', dataIndex: 'stateDictValue', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: '12%', align: 'center' }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {

+ 9 - 56
src/views/bulkManagement/bulkWarehousingOrder/edit.vue

@@ -48,30 +48,12 @@
                     </a-col>
                     <a-col :md="6" :sm="24">
                       <a-form-item label="产品品牌">
-                        <a-select
-                          placeholder="请选择产品品牌"
-                          id="bulkWarehousingOrderEdit-productBrandSn"
-                          allowClear
-                          v-model="queryParam.productBrandSn"
-                          :showSearch="true"
-                          option-filter-prop="children"
-                          :filter-option="filterOption">
-                          <a-select-option v-for="item in productBrandList" :key="item.brandSn" :value="item.brandSn">{{ item.brandName }}</a-select-option>
-                        </a-select>
+                        <ProductBrand id="bulkWarehousingOrderEdit-productBrandSn" v-model="queryParam.productBrandSn"></ProductBrand>
                       </a-form-item>
                     </a-col>
                     <a-col :md="6" :sm="24">
                       <a-form-item label="产品分类">
-                        <a-cascader
-                          @change="changeProductType"
-                          change-on-select
-                          v-model="productType"
-                          expand-trigger="hover"
-                          :options="productTypeList"
-                          :fieldNames="{ label: 'productTypeName', value: 'productTypeSn', children: 'children' }"
-                          id="productInfoList-productType"
-                          placeholder="请选择产品分类"
-                          allowClear />
+                        <ProductType id="productInfoList-productType" @change="changeProductType" v-model="productType"></ProductType>
                       </a-form-item>
                     </a-col>
                     <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
@@ -237,15 +219,15 @@
 import { STable, VSelect } from '@/components'
 import basicInfoModal from './basicInfoModal.vue'
 import { getOperationalPrecision } from '@/libs/tools.js'
-import { dealerProductBrandQuery } from '@/api/dealerProductBrand'
-import { dealerProductTypeList } from '@/api/dealerProductType'
 import { sparePartsPurDetail, sparePartsPurDetailList, sparePartsPurDetailCount, sparePartsPurDetailSave, sparePartsPurDetailDel, sparePartsPurSubmit, sparePartsPurDetailPrint } from '@/api/sparePartsPur'
-import { dealerProductList } from '@/api/dealerProduct'
+import { bulkProductList } from '@/api/dealerProduct'
 import { warehouseCascadeList } from '@/api/warehouse'
+import ProductType from '../../common/productType.js'
+import ProductBrand from '../../common/productBrand.js'
 import Print from '@/views/common/print.vue'
 import { hdPrint } from '@/libs/JGPrint'
 export default {
-  components: { STable, VSelect, basicInfoModal, Print },
+  components: { STable, VSelect, basicInfoModal, Print, ProductType, ProductBrand },
   data () {
     return {
       spinning: false,
@@ -258,8 +240,6 @@ export default {
         productTypeSn2: undefined,
         productTypeSn3: undefined
       },
-      productBrandList: [], //  产品品牌  下拉数据
-      productTypeList: [], //  产品分类  下拉数据
       productType: [],
       warehouseCascadeData: [], //  仓库仓位
       disabled: false, //  查询、重置按钮是否可操作
@@ -280,13 +260,14 @@ export default {
       loadData: parameter => {
         this.disabled = true
         parameter.sortAlias = 'dp'
-        const params = Object.assign(parameter, this.queryParam)
+        const params = Object.assign(parameter, this.queryParam, { supplierSn: this.$route.params.supplierSn })
         params.enabledFlag = 1
-        return dealerProductList(params).then(res => {
+        return bulkProductList(params).then(res => {
           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
+            data.list[i].putCost = data.list[i].purchasePrice || ''
             if (this.defaultWarehouseCascade.length > 0) {
               data.list[i].warehouseCascade = this.defaultWarehouseCascade
               data.list[i].warehouseSn = this.defaultWarehouseCascade[0]
@@ -599,37 +580,9 @@ export default {
         }
       })
     },
-    //  产品品牌  列表
-    getProductBrand () {
-      // sysFlag传0,表示只查自建产品
-      dealerProductBrandQuery({}).then(res => {
-        if (res.status == 200) {
-          this.productBrandList = res.data
-        } else {
-          this.productBrandList = []
-        }
-      })
-    },
-    //  产品分类  列表
-    getProductType () {
-      dealerProductTypeList({}).then(res => {
-        if (res.status == 200) {
-          this.productTypeList = res.data
-        } else {
-          this.productTypeList = []
-        }
-      })
-    },
-    filterOption (input, option) {
-      return (
-        option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
-      )
-    },
     initPage () {
       this.getWarehouseCascade()
       this.getDetail()
-      this.getProductBrand()
-      this.getProductType()
       this.resetSearchForm()
       this.$refs.chooseTable.refresh(true)
       this.openModal = false

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

@@ -221,11 +221,11 @@ export default {
     },
     //  基本信息  保存
     handleOk (row) {
-      this.$router.push({ path: `/bulkManagement/bulkWarehousingOrder/add/${row.id}/${row.sparePartsPurchaseSn}` })
+      this.$router.push({ path: `/bulkManagement/bulkWarehousingOrder/add/${row.id}/${row.sparePartsPurchaseSn}/${row.supplierSn}` })
     },
     //  编辑
     handleEdit (row) {
-      this.$router.push({ path: `/bulkManagement/bulkWarehousingOrder/edit/${row.id}/${row.sparePartsPurchaseSn}` })
+      this.$router.push({ path: `/bulkManagement/bulkWarehousingOrder/edit/${row.id}/${row.sparePartsPurchaseSn}/${row.supplierSn}` })
     },
     //  详情
     handleDetail (row) {

+ 4 - 2
src/views/common/productBrand.js

@@ -11,7 +11,7 @@ const ProductBrand = {
         option-filter-prop="children"
         :dropdownMatchSelectWidth="false"
         :filter-option="filterOption">
-        <a-select-option v-for="item in productBrandList" :key="item.brandSn" :value="item.brandSn">{{ item.brandName }}</a-select-option>
+        <a-select-option v-for="item in productBrandList" :pinyin="item.pinyin" :key="item.brandSn" :value="item.brandSn">{{ item.brandName }}</a-select-option>
       </a-select>
     `,
   props: {
@@ -44,8 +44,10 @@ const ProductBrand = {
   },
   methods: {
     filterOption (input, option) {
+      console.log(input, option.data.attrs.pinyin)
       return (
-        option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+        option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0 || 
+        option.data.attrs.pinyin.toLowerCase().indexOf(input.toLowerCase()) >= 0
       )
     },
     handleChange(value) {

+ 5 - 6
src/views/financialManagement/companyCollectionPayment/detail.vue

@@ -45,7 +45,6 @@
             :rowKey="(record) => record.id"
             :columns="columns"
             :data="loadData"
-            :scroll="{ x: 640 }"
             :defaultLoadData="false"
             bordered>
           </s-table>
@@ -64,11 +63,11 @@ export default {
     return {
       // 表头
       columns: [
-        { title: '序号', dataIndex: 'no', align: 'center', width: 80 },
-        { title: '单据号', dataIndex: 'bizNo', align: 'center', width: 220, customRender: function (text) { return text || '--' } },
-        { title: '类型', dataIndex: 'bizTypeDictValue', align: 'center', width: 140, customRender: function (text) { return text || '--' } },
-        { title: '金额', dataIndex: 'totalAmount', align: 'center', width: 100, customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '结算金额', dataIndex: 'settleAmount', align: 'center', width: 100, customRender: function (text) { return ((text || text == 0) ? text : '--') } }
+        { title: '序号', dataIndex: 'no', align: 'center', width: '10%' },
+        { title: '单据号', dataIndex: 'bizNo', align: 'center', width: '25%', customRender: function (text) { return text || '--' } },
+        { title: '类型', dataIndex: 'bizTypeDictValue', align: 'center', width: '25%', customRender: function (text) { return text || '--' } },
+        { title: '金额', dataIndex: 'totalAmount', align: 'center', width: '20%', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '结算金额', dataIndex: 'settleAmount', align: 'center', width: '20%', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {

+ 10 - 10
src/views/financialManagement/companyCollectionPayment/list.vue

@@ -82,7 +82,7 @@
       :rowKey="(record) => record.id"
       :columns="columns"
       :data="loadData"
-      :scroll="{ x: 1340, y: tableHeight }"
+      :scroll="{ y: tableHeight }"
       :defaultLoadData="false"
       bordered>
       <!-- 结算单号 -->
@@ -117,15 +117,15 @@ export default {
       },
       // 表头
       columns: [
-        { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
-        { title: '单位名称', dataIndex: 'settleClientName', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '单位类型', dataIndex: 'settleClientTypeDictValue', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '结算类型', dataIndex: 'settleTypeDictValue', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '结算单号', scopedSlots: { customRender: 'unitSettleNo' }, width: 220, align: 'center' },
-        { title: '结算金额', dataIndex: 'realSettleAmount', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '结算时间', dataIndex: 'createDate', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '操作人', dataIndex: 'operateName', width: 140, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '结算方式', dataIndex: 'settleStyleName', width: 140, align: 'center', customRender: function (text) { return text || '--' } }
+        { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
+        { title: '单位名称', dataIndex: 'settleClientName', width: '17%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '单位类型', dataIndex: 'settleClientTypeDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '结算类型', dataIndex: 'settleTypeDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '结算单号', scopedSlots: { customRender: 'unitSettleNo' }, width: '17%', align: 'center' },
+        { title: '结算金额', dataIndex: 'realSettleAmount', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '结算时间', dataIndex: 'createDate', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '操作人', dataIndex: 'operateName', width: '14%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '结算方式', dataIndex: 'settleStyleName', width: '12%', align: 'center', customRender: function (text) { return text || '--' } }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {

+ 10 - 9
src/views/financialManagement/companyReceivablePayable/collectionPayment.vue

@@ -33,7 +33,7 @@
               :rowKey="(record) => record.id"
               :columns="chooseColumns"
               :dataSource="chooseLoadData"
-              :scroll="{ x: 1040, y: 300 }"
+              :scroll="{ y: 300 }"
               :loading="loading"
               :locale="{emptyText: '请先选择单据'}"
               :pagination="false"
@@ -50,6 +50,7 @@
                   :precision="2"
                   :min="record.unsettleAmount<0 ? record.unsettleAmount : 0.01"
                   :max="record.unsettleAmount<0 ? -0.01 : record.unsettleAmount"
+                  size="small"
                   placeholder="请输入"
                   style="width: 100%;" />
               </template>
@@ -162,14 +163,14 @@ export default {
       },
       // 表头
       chooseColumns: [
-        { title: '序号', scopedSlots: { customRender: 'no' }, width: 80, align: 'center' },
-        { title: '单据号', dataIndex: 'bizNo', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '单据类型', dataIndex: 'bizTypeDictValue', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '审核时间', dataIndex: 'auditTime', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '金额', dataIndex: 'totalAmount', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '余额', dataIndex: 'unsettleAmount', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '本次结算金额', scopedSlots: { customRender: 'settleAmount' }, width: 140, align: 'center' },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: 100, align: 'center', fixed: 'right' }
+        { title: '序号', scopedSlots: { customRender: 'no' }, width: '5%', align: 'center' },
+        { title: '单据号', dataIndex: 'bizNo', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '单据类型', dataIndex: 'bizTypeDictValue', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '审核时间', dataIndex: 'auditTime', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '金额', dataIndex: 'totalAmount', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '余额', dataIndex: 'unsettleAmount', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '本次结算金额', scopedSlots: { customRender: 'settleAmount' }, width: '15%', align: 'center' },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
       ],
       chooseLoadData: [],
       settleStyleList: [], //  结算方式

+ 6 - 7
src/views/financialManagement/companyReceivablePayable/detail.vue

@@ -54,7 +54,6 @@
         :rowKey="(record) => record.id"
         :columns="columns"
         :data="loadData"
-        :scroll="{ x: 800 }"
         :defaultLoadData="false"
         bordered>
         <!-- 采购数量 -->
@@ -89,12 +88,12 @@ export default {
       exportLoading: false, // 导出loading
       // 表头
       columns: [
-        { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
-        { title: '单据号', dataIndex: 'bizNo', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '类型', dataIndex: 'bizTypeDictValue', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '审核时间', dataIndex: 'auditTime', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '金额', dataIndex: 'totalAmount', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '余额', dataIndex: 'unsettleAmount', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
+        { title: '序号', dataIndex: 'no', width: '6%', align: 'center' },
+        { title: '单据号', dataIndex: 'bizNo', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '类型', dataIndex: 'bizTypeDictValue', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '审核时间', dataIndex: 'auditTime', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '金额', dataIndex: 'totalAmount', width: '17%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '余额', dataIndex: 'unsettleAmount', width: '17%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {

+ 6 - 6
src/views/financialManagement/companyReceivablePayable/list.vue

@@ -87,12 +87,12 @@ export default {
       },
       // 表头
       columns: [
-        { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
-        { title: '单位名称', dataIndex: 'settleClientName', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '单位类型', dataIndex: 'settleClientTypeDictValue', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '应收金额', dataIndex: 'unSettleAmountReceipt', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '应付金额', dataIndex: 'unSettleAmountPay', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: 200, align: 'center' }
+        { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
+        { title: '单位名称', dataIndex: 'settleClientName', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '单位类型', dataIndex: 'settleClientTypeDictValue', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '应收金额', dataIndex: 'unSettleAmountReceipt', width: '20%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '应付金额', dataIndex: 'unSettleAmountPay', width: '20%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: '15%', align: 'center' }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {

+ 8 - 8
src/views/financialManagement/expenseManagement/list.vue

@@ -75,7 +75,7 @@
         :rowKey="(record) => record.id"
         :columns="columns"
         :data="loadData"
-        :scroll="{ x: 1120, y: tableHeight }"
+        :scroll="{ y: tableHeight }"
         :defaultLoadData="false"
         bordered>
         <!-- 费用类别 -->
@@ -152,13 +152,13 @@ export default {
       },
       // 表头
       columns: [
-        { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
-        { title: '费用单号', dataIndex: 'accountExpensesNo', width: 250, align: 'center', scopedSlots: { customRender: 'accountExpensesNo' } },
-        { title: '创建时间', dataIndex: 'createDate', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '费用类型', align: 'center', scopedSlots: { customRender: 'expensesType' } },
-        { title: '金额', dataIndex: 'settleAmount', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? ('¥' + text) : '--') } },
-        { title: '单据状态', dataIndex: 'stateDictValue', width: 110, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: 200, align: 'center', fixed: 'right' }
+        { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
+        { title: '费用单号', dataIndex: 'accountExpensesNo', width: '20%', align: 'center', scopedSlots: { customRender: 'accountExpensesNo' } },
+        { title: '创建时间', dataIndex: 'createDate', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '费用类型', scopedSlots: { customRender: 'expensesType' }, width: '20%', align: 'center' },
+        { title: '金额', dataIndex: 'settleAmount', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? ('¥' + text) : '--') } },
+        { title: '单据状态', dataIndex: 'stateDictValue', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: '15%', align: 'center' }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {

+ 13 - 13
src/views/financialManagement/financialCollection/list.vue

@@ -85,7 +85,7 @@
         :rowKey="record => record.id"
         :columns="columns"
         :data="loadData"
-        :scroll="{ x: 1660, y: tableHeight }"
+        :scroll="{ y: tableHeight }"
         :defaultLoadData="false"
         bordered
       >
@@ -149,18 +149,18 @@ export default {
       },
       // 表头
       columns: [
-        { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
-        { title: '收款单号', dataIndex: 'settleNo', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '关联单号', dataIndex: 'bizNo', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '商户名称', dataIndex: 'settleClientName', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '应收金额', dataIndex: 'totalAmount', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? ('¥' + text) : '--') } },
-        { title: '已收金额', dataIndex: 'settledAmount', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? ('¥' + text) : '--') } },
-        { title: '待收金额', dataIndex: 'unsettleAmount', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? ('¥' + text) : '--') } },
-        { title: '收款类型', dataIndex: 'bizName', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '收款方式', dataIndex: 'settleStyleName', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '审核时间', dataIndex: 'auditTime', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '收款时间', dataIndex: 'settleTime', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: 100, align: 'center', fixed: 'right' }
+        { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
+        { title: '收款单号', dataIndex: 'settleNo', width: '16%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '关联单号', dataIndex: 'bizNo', width: '16%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '商户名称', dataIndex: 'settleClientName', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '应收金额', dataIndex: 'totalAmount', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? ('¥' + text) : '--') } },
+        { title: '已收金额', dataIndex: 'settledAmount', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? ('¥' + text) : '--') } },
+        { title: '待收金额', dataIndex: 'unsettleAmount', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? ('¥' + text) : '--') } },
+        { title: '收款类型', dataIndex: 'bizName', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '收款方式', dataIndex: 'settleStyleName', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '审核时间', dataIndex: 'auditTime', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '收款时间', dataIndex: 'settleTime', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: '5%', align: 'center' }
       ],
       selectedRowKeys: [], // Check here to configure the default column
       loading: false,

+ 14 - 14
src/views/financialManagement/financialPayment/list.vue

@@ -2,7 +2,7 @@
   <a-card size="small" :bordered="false" class="finacialPay-wrap">
     <a-spin :spinning="spinning" tip="Loading...">
       <!-- 标签页 -->
-      <a-tabs type="card" default-active-key="0" @change="handleTabChange" class="finacialPay-tabs">
+      <a-tabs type="card" size="small" default-active-key="0" @change="handleTabChange" class="finacialPay-tabs">
         <a-tab-pane v-for="item in tabPaneData" :key="item.bizType">
           <span slot="tab">{{ item.bizName }}({{ item.countNum }})</span>
         </a-tab-pane>
@@ -84,7 +84,7 @@
         :rowKey="record => record.id"
         :columns="columns"
         :data="loadData"
-        :scroll="{ x: 1660, y: tableHeight }"
+        :scroll="{ y: tableHeight }"
         :defaultLoadData="false"
         bordered
       >
@@ -148,18 +148,18 @@ export default {
       },
       // 表头
       columns: [
-        { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
-        { title: '付款单号', dataIndex: 'settleNo', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '关联单号', dataIndex: 'bizNo', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '商户名称', dataIndex: 'settleClientName', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '应付金额', dataIndex: 'totalAmount', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? ('¥' + text) : '--') } },
-        { title: '已付金额', dataIndex: 'settledAmount', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? ('¥' + text) : '--') } },
-        { title: '待付金额', dataIndex: 'unsettleAmount', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? ('¥' + text) : '--') } },
-        { title: '付款类型', dataIndex: 'bizName', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '付款方式', dataIndex: 'settleStyleName', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '审核时间', dataIndex: 'auditTime', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '付款时间', dataIndex: 'settleTime', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: 100, align: 'center', fixed: 'right' }
+        { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
+        { title: '付款单号', dataIndex: 'settleNo', width: '14%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '关联单号', dataIndex: 'bizNo', width: '14%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '商户名称', dataIndex: 'settleClientName', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '应付金额', dataIndex: 'totalAmount', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? ('¥' + text) : '--') } },
+        { title: '已付金额', dataIndex: 'settledAmount', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? ('¥' + text) : '--') } },
+        { title: '待付金额', dataIndex: 'unsettleAmount', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? ('¥' + text) : '--') } },
+        { title: '付款类型', dataIndex: 'bizName', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '付款方式', dataIndex: 'settleStyleName', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '审核时间', dataIndex: 'auditTime', width: '11%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '付款时间', dataIndex: 'settleTime', width: '11%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: '5%', align: 'center' }
       ],
       selectedRowKeys: [], // Check here to configure the default column
       loading: false,

+ 12 - 12
src/views/financialManagement/inventoryCheckAudit/list.vue

@@ -33,7 +33,7 @@
         :rowKey="(record) => record.id"
         :columns="columns"
         :data="loadData"
-        :scroll="{ x: 1150, y: tableHeight }"
+        :scroll="{ y: tableHeight }"
         :defaultLoadData="false"
         bordered>
         <!-- 单号 -->
@@ -90,17 +90,17 @@ export default {
       },
       // 表头
       columns: [
-        { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
-        { title: '盘点单号', scopedSlots: { customRender: 'checkWarehouseNo' }, align: 'center' },
-        { title: '总款数', dataIndex: 'productTotalCategory', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '总数量', dataIndex: 'totalStockQty', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '总成本', dataIndex: 'totalStockCost', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '盘盈数量', dataIndex: 'totalProfitQty', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '盘亏数量', scopedSlots: { customRender: 'totalLossQty' }, width: 80, align: 'center' },
-        { title: '盘点完成时间', dataIndex: 'checkTime', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '财务审核时间', dataIndex: 'financeAuditTime', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '财务审核状态', dataIndex: 'stateDictValue', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: 110, align: 'center', fixed: 'right' }
+        { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
+        { title: '盘点单号', scopedSlots: { customRender: 'checkWarehouseNo' }, width: '17%', align: 'center' },
+        { title: '总款数', dataIndex: 'productTotalCategory', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '总数量', dataIndex: 'totalStockQty', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '总成本', dataIndex: 'totalStockCost', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '盘盈数量', dataIndex: 'totalProfitQty', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '盘亏数量', scopedSlots: { customRender: 'totalLossQty' }, width: '7%', align: 'center' },
+        { title: '盘点完成时间', dataIndex: 'checkTime', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '财务审核时间', dataIndex: 'financeAuditTime', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '财务审核状态', dataIndex: 'stateDictValue', width: '9%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: '11%', align: 'center' }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {

+ 11 - 12
src/views/financialManagement/warehousingAudit/detail.vue

@@ -44,7 +44,6 @@
               :rowKey="(record) => record.id"
               :columns="columns"
               :data="loadData"
-              :scroll="{ x: 1520 }"
               :defaultLoadData="false"
               bordered>
             </s-table>
@@ -67,17 +66,17 @@ export default {
       spinning: false,
       // 表头
       columns: [
-        { title: '序号', dataIndex: 'no', width: 80, align: 'center', fixed: 'left' },
-        { title: '产品编码', dataIndex: 'dealerProductEntity.code', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'dealerProductEntity.name', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '原厂编码', dataIndex: 'dealerProductEntity.origCode', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '采购数量', dataIndex: 'qty', width: 110, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '入库数量', dataIndex: 'putQty', width: 110, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '成本价', dataIndex: 'discountedPrice', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '单位', dataIndex: 'dealerProductEntity.unit', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '入库小计', dataIndex: 'discountedAmount', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '仓库', dataIndex: 'warehouseEntity.name', width: 140, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '仓位', dataIndex: 'warehouseLocationEntity.name', width: 140, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true }
+        { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
+        { title: '产品编码', dataIndex: 'dealerProductEntity.code', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'dealerProductEntity.name', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '原厂编码', dataIndex: 'dealerProductEntity.origCode', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '采购数量', dataIndex: 'qty', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '入库数量', dataIndex: 'putQty', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '成本价', dataIndex: 'discountedPrice', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '单位', dataIndex: 'dealerProductEntity.unit', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '入库小计', dataIndex: 'discountedAmount', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '仓库', dataIndex: 'warehouseEntity.name', width: '9%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '仓位', dataIndex: 'warehouseLocationEntity.name', width: '9%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {

+ 17 - 20
src/views/financialManagement/warehousingAudit/list.vue

@@ -62,7 +62,7 @@
         :rowKey="(record) => record.id"
         :columns="columns"
         :data="loadData"
-        :scroll="{ x: 1420, y: tableHeight }"
+        :scroll="{ y: tableHeight }"
         :defaultLoadData="false"
         bordered>
         <!-- 采购入库单号 -->
@@ -121,16 +121,16 @@ export default {
       },
       // 表头
       columns: [
-        { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
-        { title: '采购单号', dataIndex: 'purchaseBillNo', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '采购入库单号', scopedSlots: { customRender: 'receivingBillNo' }, width: 220, align: 'center' },
-        { title: '总款数', dataIndex: 'totalPutCategory', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '入库总数量', dataIndex: 'totalPutQty', width: 110, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '入库总成本', dataIndex: 'totalPutAmount', width: 110, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '签收入库时间', dataIndex: 'stockPutTime', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '财务入库审核时间', dataIndex: 'auditTime', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '财务审核状态', dataIndex: 'auditStateDictValue', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: 140, align: 'center', fixed: 'right' }
+        { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
+        { title: '采购单号', dataIndex: 'purchaseBillNo', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '采购入库单号', scopedSlots: { customRender: 'receivingBillNo' }, width: '15%', align: 'center' },
+        { title: '总款数', dataIndex: 'totalPutCategory', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '入库总数量', dataIndex: 'totalPutQty', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '入库总成本', dataIndex: 'totalPutAmount', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '签收入库时间', dataIndex: 'stockPutTime', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '财务入库审核时间', dataIndex: 'auditTime', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '财务审核状态', dataIndex: 'auditStateDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
@@ -244,15 +244,12 @@ export default {
 </script>
 <style lang="less">
   .warehousingAuditList-wrap{
-    .sTable{
-      margin-top: 15px;
+    .active{
+      color: #ed1c24;
+      cursor: pointer;
+    }
+    .common{
+      color: rgba(0, 0, 0, 0.65);
     }
-	.active{
-		color: #ed1c24;
-		cursor: pointer;
-	}
-	.common{
-		color: rgba(0, 0, 0, 0.65);
-	}
   }
 </style>

+ 15 - 21
src/views/outboundOrderManagement/outboundOrder/list.vue

@@ -5,17 +5,17 @@
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
           <a-row :gutter="15">
-            <a-col :md="6" :sm="24">
+            <a-col :xl="6" :lg="6" :md="12" :sm="24">
               <a-form-item label="审核时间">
                 <rangeDate ref="rangeDate" @change="dateChange" />
               </a-form-item>
             </a-col>
-            <a-col :md="6" :sm="24">
+            <a-col :xl="6" :lg="6" :md="12" :sm="24">
               <a-form-item label="单位名称">
                 <a-input id="outboundOrderList-demanderName" v-model="queryParam.demanderName" placeholder="请输入单位名称" allowClear />
               </a-form-item>
             </a-col>
-            <a-col :md="6" :sm="24">
+            <a-col :xl="4" :lg="6" :md="6" :sm="8">
               <a-form-item label="出库类型">
                 <v-select
                   v-model="queryParam.outBizType"
@@ -27,26 +27,20 @@
                   allowClear></v-select>
               </a-form-item>
             </a-col>
-            <template v-if="advanced">
-              <a-col :md="6" :sm="24">
-                <a-form-item label="单据状态">
-                  <v-select
-                    v-model="queryParam.state"
-                    ref="state"
-                    id="outboundOrderList-state"
-                    code="OUT_STATE"
-                    placeholder="请选择单据状态"
-                    allowClear></v-select>
-                </a-form-item>
-              </a-col>
-            </template>
-            <a-col :md="6" :sm="24">
+            <a-col :xl="4" :lg="6" :md="6" :sm="8">
+              <a-form-item label="单据状态">
+                <v-select
+                  v-model="queryParam.state"
+                  ref="state"
+                  id="outboundOrderList-state"
+                  code="OUT_STATE"
+                  placeholder="请选择单据状态"
+                  allowClear></v-select>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="4" :lg="6" :md="6" :sm="8">
               <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="outboundOrderList-refresh" style="margin-bottom: 10px;">查询</a-button>
               <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="outboundOrderList-reset">重置</a-button>
-              <a @click="advanced=!advanced" style="margin-left: 8px">
-                {{ advanced ? '收起' : '展开' }}
-                <a-icon :type="advanced ? 'up' : 'down'"/>
-              </a>
             </a-col>
           </a-row>
         </a-form>

+ 12 - 11
src/views/purchasingManagement/purchaseOrder/detail.vue

@@ -12,14 +12,14 @@
         <!-- 操作区,位于 title 行的行尾 -->
         <template slot="extra">
           <Print v-if="$hasPermissions('B_purchasePrint')" :disabled="localDataSource.length==0" @handlePrint="handlePrint"></Print>
-          <!-- <a-button
+          <a-button
             key="1"
-            v-if="$hasPermissions('B_purchaseExportProduct') && (detail&&detail.billStatus=='FINISH')"
+            v-if="$hasPermissions('B_purchaseExportProduct') && (detail&&(detail.billStatus=='WAIT_PUT_WAREHOUSE' || detail.billStatus=='WAIT_PUT_WAREHOUSE_AUDIT' || detail.billStatus=='FINISH'))"
             type="primary"
             class="button-info"
             id="purchaseOrderDetail-export-btn"
             :disabled="localDataSource.length==0"
-            @click="handleExportProduct()">导出产品</a-button> -->
+            @click="handleExportProduct()">导出审核订单产品</a-button>
         </template>
       </a-page-header>
       <!-- 基础信息 -->
@@ -151,16 +151,17 @@ export default {
       spinning: false,
       // 表头
       columns: [
-        { title: '序号', dataIndex: 'no', width: '6%', align: 'center' },
-        { title: '产品编码', dataIndex: 'dealerProductEntity.code', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
+        { title: '产品编码', dataIndex: 'dealerProductEntity.code', width: '16%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'dealerProductEntity.name', width: '16%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '原厂编码', dataIndex: 'dealerProductEntity.origCode', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '单位', dataIndex: 'dealerProductEntity.unit', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '采购单价', dataIndex: 'discountedPrice', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '采购金额', dataIndex: 'discountedAmount', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '采购数量', dataIndex: 'qty', width: '8%', align: 'center', scopedSlots: { customRender: 'origqty' } },
-        { title: '审核订单数量', dataIndex: 'authQty', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '缺货数量', dataIndex: 'cancelQty', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
+        { title: '单位', dataIndex: 'dealerProductEntity.unit', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '采购单价', dataIndex: 'discountedPrice', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '采购金额', dataIndex: 'discountedAmount', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '采购数量', dataIndex: 'qty', width: '7%', align: 'center', scopedSlots: { customRender: 'origqty' } },
+        { title: '审核订单金额', dataIndex: 'authAmount', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '审核订单数量', dataIndex: 'authQty', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '缺货数量', dataIndex: 'cancelQty', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {

+ 34 - 9
src/views/purchasingManagement/purchaseOrder/edit.vue

@@ -29,8 +29,9 @@
                   {{ detail&&detail.shippingAddressCityName || '' }}
                   {{ detail&&detail.shippingAddressCountyName || '' }}
                   {{ detail&&detail.shippingAddress || '' }}
+                  <a-button type="link" @click="openAddrModal=true">更换地址 >></a-button>
                 </div>
-                <span v-else>--</span>
+                <p v-else><a-button type="link" @click="openAddrModal=true">选择地址 >></a-button></p>
               </a-descriptions-item>
             </a-descriptions>
           </a-collapse-panel>
@@ -232,6 +233,8 @@
     <importGuideModal :openModal="openGuideModal" :params="{purchaseBillSn: $route.params.sn}" @close="openGuideModal=false" @ok="hanldeOk" />
     <!-- 上次缺货 -->
     <outStockModal :openModal="openOutStockModal" :paramsData="paramsData" @close="openOutStockModal=false" @ok="hanldeOkOutStock" />
+    <!-- 选择地址 -->
+    <choose-address-modal :openModal="openAddrModal" @ok="handleAddrOk" @close="openAddrModal=false" />
   </div>
 </template>
 
@@ -239,16 +242,17 @@
 import { STable, VSelect } from '@/components'
 import ImportGuideModal from './importGuideModal.vue'
 import outStockModal from './outStockModal.vue'
+import chooseAddressModal from './receivingAddress/chooseAddressModal.vue'
 import ProductType from '../../common/productType.js'
 import ProductBrand from '../../common/productBrand.js'
-import { purchaseDetailBySn, purchaseWriteSubmit, purchaseDetailPrint, purchaseDetailBatchInsert, purchaseDetailExport } from '@/api/purchase'
+import { purchaseDetailBySn, purchaseWriteSubmit, purchaseDetailPrint, purchaseDetailBatchInsert, purchaseDetailExport, purchaseDetailAddress } from '@/api/purchase'
 import { purchaseDetailList, purchaseDetailSave, purchaseDetailDel, purchaseDetailCount, purchaseDetailCancelList } from '@/api/purchaseDetail'
 import { productListPurchase } from '@/api/product'
 import defImg from '@/assets/def_img@2x.png'
 import Print from '@/views/common/print.vue'
 import { hdPrint } from '@/libs/JGPrint'
 export default {
-  components: { STable, VSelect, ProductType, ProductBrand, ImportGuideModal, outStockModal, Print },
+  components: { STable, VSelect, ProductType, ProductBrand, ImportGuideModal, outStockModal, Print, chooseAddressModal },
   data () {
     return {
       spinning: false,
@@ -272,12 +276,14 @@ export default {
       columns: [
         { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
         { title: '产品编码', scopedSlots: { customRender: 'code' }, width: '15%', align: 'center', sorter: true },
-        { title: '产品名称', dataIndex: 'name', width: '20%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '产品名称', dataIndex: 'name', width: '23%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '原厂编码', dataIndex: 'origCode', width: '14%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '箱/单位', dataIndex: 'unit', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '采购单价', dataIndex: 'purchasePrice', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '采购数量', dataIndex: 'qty', scopedSlots: { customRender: 'storageQuantity' }, width: '10%', align: 'center' },
-        { title: '产品图片', scopedSlots: { customRender: 'imageUrl' }, width: '8%', align: 'center' },
+        { title: '箱/单位', dataIndex: 'unit', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '采购单价', dataIndex: 'purchasePrice', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? ('¥' + text) : '--') } },
+        { title: '终端会员价', dataIndex: 'terminalPrice', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? ('¥' + text) : '--') } },
+        { title: '车主零售价', dataIndex: 'carOwnersPrice', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? ('¥' + text) : '--') } },
+        { title: '采购数量', dataIndex: 'qty', scopedSlots: { customRender: 'storageQuantity' }, width: '6%', align: 'center' },
+        { title: '产品图片', scopedSlots: { customRender: 'imageUrl' }, width: '6%', align: 'center' },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '8%', align: 'center' }
       ],
       // 加载数据方法 必须为 Promise 对象
@@ -334,7 +340,8 @@ export default {
       localDataSource: [],
       openGuideModal: false, //  导入产品引导
       openOutStockModal: false,
-      paramsData: null
+      paramsData: null,
+      openAddrModal: false // 选择地址弹框是否显示
     }
   },
   methods: {
@@ -491,6 +498,24 @@ export default {
         }
       })
     },
+    //  地址保存
+    handleAddrOk (data) {
+      const params = {
+        purchaseBillSn: this.$route.params.sn,
+        shippingAddressProvinceName: data.provinceName,
+        shippingAddressCityName: data.cityName,
+        shippingAddressCountyName: data.countyName,
+        shippingAddress: data.addr,
+        consigneeName: data.consigneeName,
+        consigneeTel: data.consigneeTel
+      }
+      purchaseDetailAddress(params).then(res => {
+        if (res.status == 200) {
+          this.openAddrModal = false
+          this.getOrderDetail()
+        }
+      })
+    },
     // 查看产品
     handlePicDetail (row) {
       this.$router.push({ name: 'viewProduct', params: { sn: row.productSn } })

+ 16 - 10
src/views/purchasingManagement/purchaseOrder/list.vue

@@ -105,6 +105,10 @@
           <span style="color: #ed1c24;cursor: pointer;" v-if="$hasPermissions('B_purchaseDetail')" @click="handleDetail(record)">{{ record.purchaseBillNo }}</span>
           <span v-else>{{ record.purchaseBillNo }}</span>
         </template>
+        <!-- 财务状态 -->
+        <template slot="financialStatus" slot-scope="text, record">
+          <span>{{ record.billStatus=='FINISH'&&record.financialStatusDictValue ? record.financialStatusDictValue : '--' }}</span>
+        </template>
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">
           <a-button
@@ -172,16 +176,18 @@ export default {
       // 表头
       columns: [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
-        { title: '采购单号', scopedSlots: { customRender: 'purchaseBillNo' }, width: '16%', align: 'center' },
-        { title: '创建时间', dataIndex: 'createDate', width: '13%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '供应商', dataIndex: 'purchaseTargetName', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '产品款数', dataIndex: 'totalCategory', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '采购数量', dataIndex: 'totalQty', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '缺货数量', dataIndex: 'totalCancelQty', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '采购金额', dataIndex: 'discountedAmount', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '业务状态', dataIndex: 'billStatusDictValue', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '财务状态', dataIndex: 'financialStatusDictValue', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
+        { title: '采购单号', scopedSlots: { customRender: 'purchaseBillNo' }, width: '14%', align: 'center' },
+        { title: '创建时间', dataIndex: 'createDate', width: '11%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '供应商', dataIndex: 'purchaseTargetName', width: '14%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '产品款数', dataIndex: 'totalCategory', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '采购数量', dataIndex: 'totalQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '采购金额', dataIndex: 'discountedAmount', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '审核数量', dataIndex: 'totalAuthQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '审核金额', dataIndex: 'totalAuthAmount', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '缺货数量', dataIndex: 'totalCancelQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '业务状态', dataIndex: 'billStatusDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '财务状态', dataIndex: 'financialStatusDictValue', scopedSlots: { customRender: 'financialStatus' }, width: '6%', align: 'center' },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: '9%', align: 'center' }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {