chenrui 4 gadi atpakaļ
vecāks
revīzija
32b0d4b586
35 mainītis faili ar 949 papildinājumiem un 1075 dzēšanām
  1. 8 0
      src/api/salesReturn.js
  2. 2 2
      src/api/sparePartsPur.js
  3. 2 2
      src/api/sparePartsRet.js
  4. 0 11
      src/config/router.config.js
  5. 4 4
      src/views/allocationManagement/chainTransferIn/detail.vue
  6. 4 4
      src/views/allocationManagement/chainTransferOut/detail.vue
  7. 5 5
      src/views/allocationManagement/storeTransferOut/detail.vue
  8. 27 32
      src/views/allocationManagement/warehouseAllocation/detail.vue
  9. 18 24
      src/views/bulkManagement/bulkReturnGoods/list.vue
  10. 65 64
      src/views/bulkManagement/bulkWarehousingOrder/detail.vue
  11. 79 41
      src/views/bulkManagement/bulkWarehousingOrder/list.vue
  12. 0 164
      src/views/bulkManagement/bulkWarehousingOrder/warehousing.vue
  13. 14 21
      src/views/customerManagement/customerInfo/list.vue
  14. 11 10
      src/views/financialManagement/companyCollectionPayment/list.vue
  15. 96 90
      src/views/financialManagement/companyReceivablePayable/detail.vue
  16. 20 18
      src/views/financialManagement/companyReceivablePayable/list.vue
  17. 35 28
      src/views/financialManagement/expenseManagement/list.vue
  18. 11 9
      src/views/financialManagement/financialCollection/list.vue
  19. 26 24
      src/views/financialManagement/financialPayment/list.vue
  20. 58 56
      src/views/financialManagement/inventoryReview/detail.vue
  21. 16 12
      src/views/financialManagement/inventoryReview/list.vue
  22. 21 20
      src/views/financialManagement/ledgerRecord/list.vue
  23. 69 63
      src/views/financialManagement/warehousingAudit/detail.vue
  24. 29 25
      src/views/financialManagement/warehousingAudit/list.vue
  25. 19 18
      src/views/financialManagement/withdrawalManagement/list.vue
  26. 93 125
      src/views/inventoryManagement/inventoryChecking/detail.vue
  27. 2 2
      src/views/inventoryManagement/inventoryChecking/list.vue
  28. 2 1
      src/views/inventoryManagement/satelliteWarehouseInventory/list.vue
  29. 1 11
      src/views/productManagement/productInfo/list.vue
  30. 1 1
      src/views/salesManagement/outboundOrder/detail.vue
  31. 17 14
      src/views/salesManagement/salesReturn/detail.vue
  32. 26 10
      src/views/salesManagement/salesReturn/list.vue
  33. 2 2
      src/views/salesManagement/urgentItemsOffset/detail.vue
  34. 146 133
      src/views/supplierManagement/supplierInfo/edit.vue
  35. 20 29
      src/views/supplierManagement/supplierInfo/list.vue

+ 8 - 0
src/api/salesReturn.js

@@ -11,6 +11,14 @@ export const salesReturnList = (params) => {
     method: 'post'
   })
 }
+//  销售退货 详情
+export const salesReturnDetail = (params) => {
+  return axios({
+    url: `/salesReturn/findById/${params.id}`,
+    data: params,
+    method: 'get'
+  })
+}
 //  销售退货 导出
 export const salesReturnExport = (params) => {
   return axios({

+ 2 - 2
src/api/sparePartsPur.js

@@ -2,7 +2,7 @@ import { axios } from '@/utils/request'
 
 //  散件采购(入库)列表  分页
 export const sparePartsPurList = (params) => {
-  const url = `/sparePartsPur/findPage/${params.pageNo}/${params.pageSize}`
+  const url = `/sparePartsPur/queryPage/${params.pageNo}/${params.pageSize}`
   delete params.pageNo
   delete params.pageSize
   return axios({
@@ -13,7 +13,7 @@ export const sparePartsPurList = (params) => {
 }
 //  散件采购(入库)详情列表  分页
 export const sparePartsPurDetailList = (params) => {
-  const url = `/sparePartsPur/findDetailPage/${params.pageNo}/${params.pageSize}`
+  const url = `/sparePartsPur/queryDetailPage/${params.pageNo}/${params.pageSize}`
   delete params.pageNo
   delete params.pageSize
   return axios({

+ 2 - 2
src/api/sparePartsRet.js

@@ -2,7 +2,7 @@ import { axios } from '@/utils/request'
 
 //  散件退货列表  分页
 export const sparePartsRetList = (params) => {
-  const url = `/sparePartsRet/findPage/${params.pageNo}/${params.pageSize}`
+  const url = `/sparePartsRet/queryPage/${params.pageNo}/${params.pageSize}`
   delete params.pageNo
   delete params.pageSize
   return axios({
@@ -13,7 +13,7 @@ export const sparePartsRetList = (params) => {
 }
 //  散件退货详情列表  分页
 export const sparePartsRetDetailList = (params) => {
-  const url = `/sparePartsRet/findDetailPage/${params.pageNo}/${params.pageSize}`
+  const url = `/sparePartsRet/queryDetailPage/${params.pageNo}/${params.pageSize}`
   delete params.pageNo
   delete params.pageSize
   return axios({

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

@@ -1223,17 +1223,6 @@ export const asyncRouterMap = [
                   hidden: true
                   // permission: 'B_goodsManage_edit'
                 }
-              },
-              {
-                path: 'warehousing/:id',
-                name: 'bulkWarehousingOrderWarehousing',
-                component: () => import(/* webpackChunkName: "shop" */ '@/views/bulkManagement/bulkWarehousingOrder/warehousing.vue'),
-                meta: {
-                  title: '入库',
-                  icon: 'gold',
-                  hidden: true
-                  // permission: 'B_goodsManage_edit'
-                }
               }
             ]
           },

+ 4 - 4
src/views/allocationManagement/chainTransferIn/detail.vue

@@ -11,11 +11,11 @@
         <a-button key="1" type="primary" id="chainTransferInDetail-print-btn">快速打印</a-button>
       </template>
     </a-page-header>
-    <!-- 总计 -->
-    <a-alert type="info" showIcon style="margin-bottom:15px">
-      <div slot="message">审核状态: <strong>支持市级</strong>,完结状态: <strong>支持市级</strong>,调出对象: <strong>支持市级</strong>,调入单号: <strong>2121212</strong>,总成本:¥<strong>6.33</strong>,总数量: <strong>6</strong> </div>
-    </a-alert>
     <a-card size="small" :bordered="false" class="chainTransferInDetail-cont">
+      <!-- 总计 -->
+      <a-alert type="info" showIcon style="margin-bottom:15px">
+        <div slot="message">审核状态: <strong>支持市级</strong>,完结状态: <strong>支持市级</strong>,调出对象: <strong>支持市级</strong>,调入单号: <strong>2121212</strong>,总成本:¥<strong>6.33</strong>,总数量: <strong>6</strong> </div>
+      </a-alert>
       <!-- 列表 -->
       <s-table
         class="sTable"

+ 4 - 4
src/views/allocationManagement/chainTransferOut/detail.vue

@@ -11,11 +11,11 @@
         <a-button key="1" type="primary" id="chainTransferOutDetail-print-btn">快速打印</a-button>
       </template>
     </a-page-header>
-    <!-- 总计 -->
-    <a-alert type="info" showIcon style="margin-bottom:15px">
-      <div slot="message">审核状态: <strong>支持市级</strong>,完结状态: <strong>支持市级</strong>,调出对象: <strong>支持市级</strong>,调入单号: <strong>2121212</strong>,总成本:¥<strong>6.33</strong>,总数量: <strong>6</strong> </div>
-    </a-alert>
     <a-card size="small" :bordered="false" class="chainTransferOutDetail-cont">
+      <!-- 总计 -->
+      <a-alert type="info" showIcon style="margin-bottom:15px">
+        <div slot="message">审核状态: <strong>支持市级</strong>,完结状态: <strong>支持市级</strong>,调出对象: <strong>支持市级</strong>,调入单号: <strong>2121212</strong>,总成本:¥<strong>6.33</strong>,总数量: <strong>6</strong> </div>
+      </a-alert>
       <!-- 列表 -->
       <s-table
         class="sTable"

+ 5 - 5
src/views/allocationManagement/storeTransferOut/detail.vue

@@ -21,11 +21,11 @@
         <a-descriptions-item label="备注">箭冠营销中心</a-descriptions-item>
       </a-descriptions>
     </a-card>
-    <!-- 总计 -->
-    <a-alert type="info" showIcon style="margin-bottom:15px">
-      <div slot="message">总款数:<strong>1</strong>,总数量:<strong>1</strong>,总成本(¥):<strong>240</strong></div>
-    </a-alert>
     <a-card size="small" :bordered="false" class="storeTransferOutDetail-cont">
+      <!-- 总计 -->
+      <a-alert type="info" showIcon style="margin-bottom:15px">
+        <div slot="message">总款数:<strong>1</strong>;总数量:<strong>1</strong>;总成本(¥):<strong>240</strong></div>
+      </a-alert>
       <!-- 列表 -->
       <s-table
         class="sTable"
@@ -34,7 +34,7 @@
         :rowKey="(record) => record.id"
         :columns="columns"
         :data="loadData"
-        :scroll="{ x: 1200 }"
+        :scroll="{ x: 955 }"
         bordered>
         <!-- 成本小计 -->
         <template slot="totalCost" slot-scope="text, record">

+ 27 - 32
src/views/allocationManagement/warehouseAllocation/detail.vue

@@ -28,40 +28,35 @@
         </a-collapse-panel>
       </a-collapse>
     </a-card>
-    <!-- 详情 -->
     <a-card size="small" :bordered="false" class="warehouseAllocationDetail-cont">
-      <a-collapse :activeKey="['1']">
-        <a-collapse-panel key="1" header="详情">
-          <!-- 总计 -->
-          <a-alert type="info" showIcon style="margin-bottom:15px">
-            <div slot="message">总款数: <strong>6</strong> ,总数量: <strong>6</strong> ,总成本:¥<strong>6.33</strong></div>
-          </a-alert>
-          <!-- 列表 -->
-          <s-table
-            class="sTable"
-            ref="table"
-            size="default"
-            :rowKey="(record) => record.id"
-            :columns="columns"
-            :data="loadData"
-            :scroll="{ x: 1335 }"
-            bordered>
-            <!-- 产品类别 -->
-            <template slot="productType" slot-scope="text, record">
-              <a-tooltip placement="top">
-                <template slot="title">
-                  <span>{{ record.productTypeName }}</span>
-                </template>
-                {{ record.productTypeName3 }}
-              </a-tooltip>
-            </template>
-            <!-- 成本小计 -->
-            <template slot="totalCost" slot-scope="text, record">
-              <span>{{ (record.allocationCost * record.allocationQty) || 0 }}</span>
+      <!-- 总计 -->
+      <a-alert type="info" showIcon style="margin-bottom:15px">
+        <div slot="message">总款数: <strong>6</strong> ,总数量: <strong>6</strong> ,总成本:¥<strong>6.33</strong></div>
+      </a-alert>
+      <!-- 列表 -->
+      <s-table
+        class="sTable"
+        ref="table"
+        size="default"
+        :rowKey="(record) => record.id"
+        :columns="columns"
+        :data="loadData"
+        :scroll="{ x: 1335 }"
+        bordered>
+        <!-- 产品类别 -->
+        <template slot="productType" slot-scope="text, record">
+          <a-tooltip placement="top">
+            <template slot="title">
+              <span>{{ record.productTypeName }}</span>
             </template>
-          </s-table>
-        </a-collapse-panel>
-      </a-collapse>
+            {{ record.productTypeName3 }}
+          </a-tooltip>
+        </template>
+        <!-- 成本小计 -->
+        <template slot="totalCost" slot-scope="text, record">
+          <span>{{ (record.allocationCost * record.allocationQty) || 0 }}</span>
+        </template>
+      </s-table>
     </a-card>
   </div>
 </template>

+ 18 - 24
src/views/bulkManagement/bulkReturnGoods/list.vue

@@ -66,6 +66,7 @@
       :rowKey="(record) => record.id"
       :columns="columns"
       :data="loadData"
+      :scroll="{ x: 1310 }"
       bordered>
       <!-- 是否转销售单 -->
       <template slot="invenstoryNum" slot-scope="text, record">
@@ -73,10 +74,13 @@
       </template>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
-        <a-button size="small" type="primary" @click="handleEdit(record)" id="bulkReturnGoodsList-edit-btn">编辑</a-button>
-        <a-button size="small" @click="handleDetail(record)" id="bulkReturnGoodsList-detail-btn" style="margin: 0 0 10px 8px">详情</a-button>
-        <a-button size="small" @click="handleAdopt(record)" id="bulkReturnGoodsList-isAdopt-btn" style="margin: 0 0 10px 8px">{{ record.adopt == 0 ? '通过' : '不通过' }}</a-button>
-        <a-button size="small" type="danger" @click="handleDel(record)" id="bulkReturnGoodsList-del-btn" style="margin: 0 0 0 8px">删除</a-button>
+        <a-button size="small" type="link" @click="handleEdit(record)" id="bulkReturnGoodsList-edit-btn">编辑</a-button>
+        <a-divider type="vertical" style="margin: 0;" />
+        <a-button size="small" type="link" @click="handleDetail(record)" id="bulkReturnGoodsList-detail-btn">详情</a-button>
+        <a-divider type="vertical" style="margin: 0;" />
+        <a-button size="small" type="link" @click="handleAdopt(record)" id="bulkReturnGoodsList-isAdopt-btn">{{ record.adopt == 0 ? '通过' : '不通过' }}</a-button>
+        <a-divider type="vertical" style="margin: 0;" />
+        <a-button size="small" type="link" @click="handleDel(record)" id="bulkReturnGoodsList-del-btn">删除</a-button>
       </template>
     </s-table>
     <!-- 选择基本信息弹框 -->
@@ -104,16 +108,16 @@ export default {
       dateFormat: 'YYYY-MM-DD',
       time: [], //  创建时间
       columns: [
-        { title: '序号', dataIndex: 'no', width: 70, align: 'center' },
-        { title: '散件退货单号', dataIndex: 'sparePartsReturnNo', width: 180, align: 'center' },
-        { title: '创建时间', dataIndex: 'createDate', width: 180, align: 'center' },
-        { title: '供应商', dataIndex: 'supplierName', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品款数', dataIndex: 'productTotalCategory', width: 200, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '总数量', dataIndex: 'productTotalQty', width: 200, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '总金额', dataIndex: 'productTotalCost', width: 180, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '单据状态', dataIndex: 'state', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '结算状态', dataIndex: 'settleState', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: 240, align: 'center' }
+        { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
+        { title: '散件退货单号', dataIndex: 'sparePartsReturnNo', width: 140, align: 'center' },
+        { title: '创建时间', dataIndex: 'createDate', width: 160, align: 'center' },
+        { title: '供应商', dataIndex: 'supplierName', align: 'center', customRender: function (text) { return text || '--' } },
+        { 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: 'state', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '结算状态', dataIndex: 'settleState', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: 230, align: 'center', fixed: 'right' }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
@@ -222,13 +226,3 @@ export default {
   }
 }
 </script>
-
-<style lang="less">
-  .bulkReturnGoodsList-wrap{
-    .sTable{
-      table{
-        width: auto;
-      }
-    }
-  }
-</style>

+ 65 - 64
src/views/bulkManagement/bulkWarehousingOrder/detail.vue

@@ -48,14 +48,15 @@
             :rowKey="(record) => record.id"
             :columns="columns"
             :data="loadData"
+            :scroll="{ x: 1060 }"
             bordered>
             <!-- 采购数量 -->
             <template slot="purchaseNum" slot-scope="text, record">
-              <span>{{record.purchaseNum}}</span>
+              <span>{{ record.purchaseNum }}</span>
             </template>
             <!-- 缺货数量 -->
             <template slot="outOfStockNum" slot-scope="text, record">
-              <span>{{record.outOfStockNum}}</span>
+              <span>{{ record.outOfStockNum }}</span>
             </template>
           </s-table>
         </a-collapse-panel>
@@ -66,15 +67,15 @@
       <a-collapse :activeKey="['1']">
         <a-collapse-panel key="1" header="单据记录">
           <a-timeline class="timeline-box">
-              <a-timeline-item>2021-02-01 15:22:38   王凯   审核通过</a-timeline-item>
-              <a-timeline-item>
-                <p>2021-02-01 15:22:38   王凯   审核通过</p>
-                <p class="auxiliary-txt">产品编号JA-11076P的采购数量,由【10】修改为【5】</p>
-                <p class="auxiliary-txt">产品编号JA-11076P的采购数量,由【10】修改为【5】</p>
-              </a-timeline-item>
-              <a-timeline-item>Technical testing 2015-09-01</a-timeline-item>
-              <a-timeline-item>Network problems being solved 2015-09-01</a-timeline-item>
-            </a-timeline>
+            <a-timeline-item>2021-02-01 15:22:38   王凯   审核通过</a-timeline-item>
+            <a-timeline-item>
+              <p>2021-02-01 15:22:38   王凯   审核通过</p>
+              <p class="auxiliary-txt">产品编号JA-11076P的采购数量,由【10】修改为【5】</p>
+              <p class="auxiliary-txt">产品编号JA-11076P的采购数量,由【10】修改为【5】</p>
+            </a-timeline-item>
+            <a-timeline-item>Technical testing 2015-09-01</a-timeline-item>
+            <a-timeline-item>Network problems being solved 2015-09-01</a-timeline-item>
+          </a-timeline>
         </a-collapse-panel>
       </a-collapse>
     </a-card>
@@ -82,62 +83,62 @@
 </template>
 
 <script>
-  import { STable, VSelect } from '@/components'
-  export default{
-    components: { STable, VSelect },
-    data(){
-      return{
-        // 表头
-        columns: [
-          { title: '序号', dataIndex: 'no', align: 'center' },
-          { title: '产品编码', dataIndex: 'creatDate', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '产品名称', dataIndex: 'custName', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '原厂编码', dataIndex: 'totalP', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '采购单价', dataIndex: 'totalNums', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-          { title: '采购数量', scopedSlots: { customRender: 'purchaseNum' }, align: 'center' },
-          { title: '缺货数量', scopedSlots: { customRender: 'outOfStockNum' }, align: 'center' },
-          { title: '单位', dataIndex: 'mementPay', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '采购金额', dataIndex: 'shDate', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        ],
-        // 加载数据方法 必须为 Promise 对象
-        loadData: parameter => {
-          this.disabled = true
-          // return customerBundleDelayList( Object.assign(parameter, this.queryParam) ).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
-          //   }
-          //   this.disabled = false
-          //   return data
-          // })
-          const _this = this
-          return new Promise(function(resolve, reject){
-            const data = {
-              pageNo: 1,
-              pageSize: 10,
-              list: [
-                { id: '1', purchaseNo: 'jgqp11111111111', creatDate: '产品1', custName: 'jgqp111123545', totalP: '箭冠品牌', totalNums: '产品分类1', totalPrice: '5', payType: '122' }
-              ],
-              count: 10
-            }
-            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
-            resolve(data)
-          })
-        },
+import { STable, VSelect } from '@/components'
+export default {
+  components: { STable, VSelect },
+  data () {
+    return {
+      // 表头
+      columns: [
+        { title: '序号', dataIndex: 'no', width: 80, align: 'center', fixed: 'left' },
+        { title: '产品编码', dataIndex: 'creatDate', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'custName', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '原厂编码', dataIndex: 'totalP', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '采购单价', dataIndex: 'totalNums', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '采购数量', scopedSlots: { customRender: 'purchaseNum' }, width: 100, align: 'center' },
+        { title: '缺货数量', scopedSlots: { customRender: 'outOfStockNum' }, width: 100, align: 'center' },
+        { title: '单位', dataIndex: 'mementPay', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '采购金额', dataIndex: 'shDate', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
+      ],
+      // 加载数据方法 必须为 Promise 对象
+      loadData: parameter => {
+        this.disabled = true
+        // return customerBundleDelayList( Object.assign(parameter, this.queryParam) ).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
+        //   }
+        //   this.disabled = false
+        //   return data
+        // })
+        const _this = this
+        return new Promise(function (resolve, reject) {
+          const data = {
+            pageNo: 1,
+            pageSize: 10,
+            list: [
+              { id: '1', purchaseNo: 'jgqp11111111111', creatDate: '产品1', custName: 'jgqp111123545', totalP: '箭冠品牌', totalNums: '产品分类1', totalPrice: '5', payType: '122' }
+            ],
+            count: 10
+          }
+          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
+          resolve(data)
+        })
       }
-    },
-    methods: {
-      //  返回列表
-      handleBack(){
-        this.$router.push({ path: '/bulkManagement/bulkWarehousingOrder/list'})
-      },
+    }
+  },
+  methods: {
+    //  返回列表
+    handleBack () {
+      this.$router.push({ path: '/bulkManagement/bulkWarehousingOrder/list' })
     }
   }
+}
 </script>
 
 <style lang="less">

+ 79 - 41
src/views/bulkManagement/bulkWarehousingOrder/list.vue

@@ -16,9 +16,16 @@
           </a-col>
           <a-col :md="6" :sm="24">
             <a-form-item label="供应商" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
-            	<a-select id="bulkWarehousingOrderList-supplierName" placeholder="请选择供应商" allowClear v-model="queryParam.supplierName" :showSearch="true" option-filter-prop="children" :filter-option="filterOption">
-            		<a-select-option v-for="item in supplierList" :key="item.salesChannelNo" :value="item.salesChannelNo">{{ item.salesChannelName }}</a-select-option>
-            	</a-select>
+              <a-select
+                id="bulkWarehousingOrderList-supplierName"
+                placeholder="请选择供应商"
+                allowClear
+                v-model="queryParam.supplierName"
+                :showSearch="true"
+                option-filter-prop="children"
+                :filter-option="filterOption">
+                <a-select-option v-for="item in supplierList" :key="item.salesChannelNo" :value="item.salesChannelNo">{{ item.salesChannelName }}</a-select-option>
+              </a-select>
             </a-form-item>
           </a-col>
           <template v-if="advanced">
@@ -46,10 +53,17 @@
             </a-col>
           </template>
           <a-col :md="6" :sm="24">
-            <span class="table-page-search-submitButtons">
-              <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="bulkWarehousingOrderList-refresh">查询</a-button>
-              <a-button style="margin-left: 8px" @click="resetSearchForm()" :disabled="disabled" id="bulkWarehousingOrderList-reset">重置</a-button>
-              <a-button style="margin-left: 8px" type="danger" @click="handleExport" :disabled="disabled" :loading="exportLoading" id="bulkWarehousingOrderList-export">导出</a-button>
+            <span class="table-page-search-submitButtons" style="margin-top: 3px;">
+              <a-button size="small" type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="bulkWarehousingOrderList-refresh">查询</a-button>
+              <a-button size="small" style="margin-left: 8px" @click="resetSearchForm()" :disabled="disabled" id="bulkWarehousingOrderList-reset">重置</a-button>
+              <a-button
+                size="small"
+                style="margin-left: 8px"
+                type="danger"
+                @click="handleExport"
+                :disabled="disabled"
+                :loading="exportLoading"
+                id="bulkWarehousingOrderList-export">导出</a-button>
               <a @click="advanced=!advanced" style="margin-left: 8px">
                 {{ advanced ? '收起' : '展开' }}
                 <a-icon :type="advanced ? 'up' : 'down'"/>
@@ -75,21 +89,25 @@
       :rowKey="(record) => record.id"
       :columns="columns"
       :data="loadData"
+      :scroll="{ x: 1320 }"
       bordered>
       <!-- 散件单号 -->
       <template slot="sparePartsPurchaseNo" slot-scope="text, record">
-        <span style="color: #ed1c24;cursor: pointer;" @click="handleDetail(record)">{{record.sparePartsPurchaseNo}}</span>
+        <span style="color: #ed1c24;cursor: pointer;" @click="handleDetail(record)">{{ record.sparePartsPurchaseNo }}</span>
       </template>
       <!-- 状态 -->
       <template slot="state" slot-scope="text, record">
-        <span>{{record.state == 1 ? '已启用' : '已禁用'}}</span>
+        <span>{{ record.state == 1 ? '已启用' : '已禁用' }}</span>
       </template>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
-        <a-button size="small" type="primary" @click="handleEdit(record)" id="bulkWarehousingOrderList-edit-btn">编辑</a-button>
-        <a-button size="small" type="dashed" @click="handleDetail(record)" id="bulkWarehousingOrderList-detail-btn" style="margin: 0 0 10px 8px">详情</a-button>
-        <a-button size="small" type="primary" @click="handleWarehouse(record)" id="bulkWarehousingOrderList-warehouse-btn" style="margin: 0 0 10px 8px">入库</a-button>
-        <a-button size="small" type="danger" @click="handleDel(record)" id="bulkWarehousingOrderList-del-btn" style="margin: 0 0 0 8px">删除</a-button>
+        <a-button size="small" type="link" @click="handleEdit(record)" id="bulkWarehousingOrderList-edit-btn">编辑</a-button>
+        <a-divider type="vertical" style="margin: 0;" />
+        <a-button size="small" type="link" @click="handleDetail(record)" id="bulkWarehousingOrderList-detail-btn">详情</a-button>
+        <a-divider type="vertical" style="margin: 0;" />
+        <a-button size="small" type="link" @click="handleWarehouse(record)" id="bulkWarehousingOrderList-warehouse-btn">入库</a-button>
+        <a-divider type="vertical" style="margin: 0;" />
+        <a-button size="small" type="link" @click="handleDel(record)" id="bulkWarehousingOrderList-del-btn">删除</a-button>
       </template>
     </s-table>
     <!-- 选择基本信息弹框 -->
@@ -106,36 +124,37 @@ export default {
   components: { STable, VSelect, basicInfoModal },
   data () {
     return {
-      advanced: false,  // 高级搜索 展开/关闭
+      advanced: false, // 高级搜索 展开/关闭
       disabled: false, //  查询、重置按钮是否可操作
       exportLoading: false, // 导出loading
       openModal: false, // 基本信息弹框是否显示
-      supplierList:[],  //  供应商列表数据
-      creatDate: undefined,  //  创建时间
+      supplierList: [], //  供应商列表数据
+      creatDate: undefined, //  创建时间
       // 查询参数
       queryParam: {
-        sparePartsPurchaseNo: '',  //  散件单号
-        supplierName: undefined,  //  供应商
-        state: undefined,  //  单据状态
-        settleState: undefined,  //  结算状态
+        sparePartsPurchaseNo: '', //  散件单号
+        supplierName: undefined, //  供应商
+        state: undefined, //  单据状态
+        settleState: undefined //  结算状态
       },
       // 表头
       columns: [
-        { title: '散件单号', scopedSlots: { customRender: 'sparePartsPurchaseNo' }, align: 'center' },
-        { title: '创建时间', dataIndex: 'createDate', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '供应商', dataIndex: 'supplierName', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品款数', dataIndex: 'productTotalCategory', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '总数量', dataIndex: 'productTotalQty', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '总金额', dataIndex: 'productTotalCost', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '单据状态', dataIndex: 'state', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '结算状态', dataIndex: 'settleState', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: 270, align: 'center' }
+        { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
+        { title: '散件单号', dataIndex: 'salesBillNo', width: 140, align: 'center' },
+        { title: '创建时间', dataIndex: 'createDate', width: 160, align: 'center' },
+        { title: '供应商', dataIndex: 'buyerName', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '产品款数', dataIndex: 'totalCategory', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '总数量', dataIndex: 'totalQty', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '总金额', dataIndex: 'totalAmount', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '业务状态', scopedSlots: { customRender: 'auditStatus' }, width: 110, align: 'center' },
+        { title: '财务状态', scopedSlots: { customRender: 'financialStatus' }, width: 110, align: 'center' },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: 220, align: 'center', fixed: 'right' }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
         this.queryParam = {}
-        return sparePartsPurList( Object.assign(parameter, this.queryParam) ).then(res => {
+        return sparePartsPurList(Object.assign(parameter, this.queryParam)).then(res => {
           const data = res.data
           const no = (data.pageNo - 1) * data.pageSize
           for (var i = 0; i < data.list.length; i++) {
@@ -144,32 +163,51 @@ export default {
           this.disabled = false
           return data
         })
-      },
+      }
     }
   },
   methods: {
     //  新增
-    handleAdd(){
+    handleAdd () {
       this.openModal = true
     },
     //  基本信息  保存
-    handleOk(){
+    handleOk () {
       this.$router.push({ path: `/bulkManagement/bulkWarehousingOrder/add` })
     },
     //  编辑
     handleEdit (row) {
-      this.$router.push({ path: `/bulkManagement/bulkWarehousingOrder/edit/${row.id}`})
+      this.$router.push({ path: `/bulkManagement/bulkWarehousingOrder/edit/${row.id}` })
     },
     //  详情
-    handleDetail(row){
-      this.$router.push({ path: `/bulkManagement/bulkWarehousingOrder/detail/${row.id}`})
+    handleDetail (row) {
+      console.log(12112)
+      this.$router.push({ path: `/bulkManagement/bulkWarehousingOrder/detail/${row.id}` })
     },
     //  入库
-    handleWarehouse(row){
-      this.$router.push({ path: `/bulkManagement/bulkWarehousingOrder/warehousing/${row.id}`})
+    handleWarehouse (row) {
+      const _this = this
+      this.$confirm({
+        title: '提示',
+        content: '确定是否入库?',
+        okText: '确定',
+        cancelText: '取消',
+        centered: true,
+        onOk () {
+          // delectRolePower({
+          //   id: row.id
+          // }).then(res => {
+          //   console.log(res, 'res1111')
+          //   if (res.status == 200) {
+          //     _this.$message.success(res.message)
+          //     _this.$refs.table.refresh()
+          //   }
+          // })
+        }
+      })
     },
     //  删除
-    handleDel(row){
+    handleDel (row) {
       const _this = this
       this.$confirm({
         title: '提示',
@@ -199,7 +237,7 @@ export default {
       this.creatDate = undefined
       this.$refs.table.refresh(true)
     },
-    filterOption(input, option) {
+    filterOption (input, option) {
     	return (
     		option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
     	)
@@ -246,4 +284,4 @@ export default {
       margin-top: 15px;
     }
   }
-</style>
+</style>

+ 0 - 164
src/views/bulkManagement/bulkWarehousingOrder/warehousing.vue

@@ -1,164 +0,0 @@
-<template>
-  <div class="bulkWarehousingOrderWarehousing-wrap">
-    <a-page-header :ghost="false" @back="handleBack" >
-      <!-- 自定义的二级文字标题 -->
-      <template slot="subTitle">
-        <a id="bulkWarehousingOrderWarehousing-back-btn" href="javascript:;" @click="handleBack">返回列表</a>
-      </template>
-    </a-page-header>
-    <!-- 内容 -->
-    <a-page-header title="单号:CG2021010100001" ></a-page-header>
-    <a-card size="small" :bordered="false" class="bulkWarehousingOrderWarehousing-cont">
-      <!-- 搜索条件 -->
-      <div 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-form-item label="关键词">
-                <a-input id="bulkWarehousingOrderWarehousing-bundleName" v-model.trim="queryParam.bundleName" allowClear placeholder="产品名称/产品编码/原厂编码"/>
-              </a-form-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="产品品牌">
-                <a-select placeholder="请选择" id="bulkWarehousingOrderWarehousing-state" allowClear v-model="queryParam.dataSourceNo" :showSearch="true" option-filter-prop="children" :filter-option="filterOption">
-                  <a-select-option v-for="item in brandData" :key="item.salesChannelNo" :value="item.salesChannelNo">{{ item.salesChannelName }}</a-select-option>
-                </a-select>
-              </a-form-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="产品类别">
-                <a-cascader :options="typeData" id="bulkWarehousingOrderWarehousing-state" placeholder="请选择产品类别" allowClear v-model="queryParam.brand" />
-              </a-form-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-button style="margin-bottom: 18px;" type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="bulkWarehousingOrderWarehousing-refresh">查询</a-button>
-              <a-button style="margin: 0 0 18px 8px" @click="resetSearchForm" :disabled="disabled" id="bulkWarehousingOrderWarehousing-reset">重置</a-button>
-            </a-col>
-          </a-row>
-        </a-form>
-      </div>
-      <!-- 总计 -->
-      <a-alert type="info" showIcon style="margin-bottom:15px">
-        <div slot="message">产品款数 <strong>6</strong> ,采购数量合计 <strong>6</strong> ,采购金额合计¥<strong>6.33</strong></div>
-      </a-alert>
-      <!-- 列表 -->
-      <s-table
-        class="sTable"
-        ref="table"
-        size="default"
-        :rowKey="(record) => record.id"
-        :columns="columns"
-        :data="loadData"
-        bordered>
-        <!-- 入库数量 -->
-        <template slot="storageQuantity" slot-scope="text, record">
-          <span>{{record.storageQuantity}}</span>
-          <a-input-number
-            id="bulkWarehousingOrderWarehousing-storageQuantity"
-            :value="record.storageQuantity"
-            :precision="0"
-            :min="0"
-            :max="999999"
-            placeholder="请输入" />
-        </template>
-        <!-- 仓库仓位 -->
-        <template slot="warehousePosition" slot-scope="text, record">
-          <a-cascader :options="typeData" id="bulkWarehousingOrderWarehousing-state" placeholder="请选择" allowClear v-model="record.brand" />
-        </template>
-      </s-table>
-    </a-card>
-    <a-affix :offset-bottom="0">
-      <div style="text-align: center;width: 100%;background-color: #fff;padding: 30px 0;box-shadow: 0 0 20px #dcdee2;">
-        <a-button type="primary" id="bulkWarehousingOrderWarehousing-warehousing" size="large" @click="handleWarehousing" style="padding: 0 60px;">确认入库</a-button>
-      </div>
-    </a-affix>
-  </div>
-</template>
-
-<script>
-  import { STable, VSelect } from '@/components'
-  export default{
-    components: { STable, VSelect },
-    data(){
-      return{
-        queryParam: {
-          
-        },
-        brandData: [],  //  产品品牌  下拉数据
-        typeData: [],  //  产品类别  下拉数据
-        disabled: false, //  查询、重置按钮是否可操作
-        // 表头
-        columns: [
-          { title: '序号', dataIndex: 'no', align: 'center' },
-          { title: '产品编码', dataIndex: 'creatDate', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '产品名称', dataIndex: 'custName', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '原厂编码', dataIndex: 'totalP', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '采购单价', dataIndex: 'totalNums', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-          { title: '采购数量', scopedSlots: { customRender: 'purchaseNum' }, align: 'center' },
-          { title: '缺货数量', scopedSlots: { customRender: 'outOfStockNum' }, align: 'center' },
-          { title: '单位', dataIndex: 'mementPay', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '采购金额', dataIndex: 'shDate', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-          { title: '入库数量', scopedSlots: { customRender: 'storageQuantity' }, align: 'center' },
-          { title: '仓库仓位', scopedSlots: { customRender: 'warehousePosition' }, align: 'center' },
-        ],
-        // 加载数据方法 必须为 Promise 对象
-        loadData: parameter => {
-          this.disabled = true
-          // return customerBundleDelayList( Object.assign(parameter, this.queryParam) ).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
-          //   }
-          //   this.disabled = false
-          //   return data
-          // })
-          const _this = this
-          return new Promise(function(resolve, reject){
-            const data = {
-              pageNo: 1,
-              pageSize: 10,
-              list: [
-                { id: '1', purchaseNo: 'jgqp11111111111', creatDate: '产品1', custName: 'jgqp111123545', totalP: '箭冠品牌', totalNums: '产品分类1', totalPrice: '5', payType: '122' }
-              ],
-              count: 10
-            }
-            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
-            resolve(data)
-          })
-        },
-      }
-    },
-    methods: {
-      //  重置
-      resetSearchForm () {
-        this.queryParam.orderBundleNo = ''
-        this.queryParam.orderBundle.custMobile = ''
-        this.queryParam.bundleName = ''
-        this.queryParam.itemName = ''
-        this.oldTime = undefined
-        this.newTime = undefined
-        this.$refs.table.refresh(true)
-      },
-      //  确认入库
-      handleWarehousing(){
-        
-      },
-      //  返回列表
-      handleBack(){
-        this.$router.push({ path: '/purchasingManagement/purchaseOrder/list'})
-      },
-      filterOption(input, option) {
-      	return (
-      		option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
-      	)
-      },
-    }
-  }
-</script>
-
-<style lang="less"></style>

+ 14 - 21
src/views/customerManagement/customerInfo/list.vue

@@ -113,12 +113,15 @@
       :rowKey="(record) => record.id"
       :columns="columns"
       :data="loadData"
+      :scroll="{ x: 1100 }"
       bordered>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
-        <a-button size="small" type="primary" @click="handleEdit(record)" id="customerManagementList-edit-btn" style="margin: 0 0 10px 0;">编辑</a-button>
-        <a-button size="small" @click="handleDetail(record)" id="customerManagementList-detail-btn" style="margin: 0 0 10px 8px;">详情</a-button>
-        <a-button size="small" type="danger" @click="handleDel(record)" id="customerManagementList-del-btn" style="margin: 0 0 0 8px;">删除</a-button>
+        <a-button size="small" type="link" @click="handleEdit(record)" id="customerManagementList-edit-btn">编辑</a-button>
+        <a-divider type="vertical" style="margin: 0;" />
+        <a-button size="small" type="link" @click="handleDetail(record)" id="customerManagementList-detail-btn">详情</a-button>
+        <a-divider type="vertical" style="margin: 0;" />
+        <a-button size="small" type="link" @click="handleDel(record)" id="customerManagementList-del-btn">删除</a-button>
       </template>
     </s-table>
     <!-- 客户详情 -->
@@ -153,14 +156,14 @@ export default {
       creatTime: [], //  创建时间
       lastSaleTime: [], //  最后销售时间
       columns: [
-        { title: '序号', dataIndex: 'no', width: 70, align: 'center' },
-        { title: '创建时间', dataIndex: 'createDate', width: 140, align: 'center' },
-        { title: '客户名称', dataIndex: 'customerName', width: 70, align: 'center', ellipsis: true },
-        { title: '联系人', dataIndex: 'contactName', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '联系电话', dataIndex: 'contactTel', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '最后销售时间', dataIndex: 'lastSaleTime', width: 180, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '是否卫星仓', dataIndex: 'satelliteFlag', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: 270, align: 'center' }
+        { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
+        { title: '创建时间', dataIndex: 'createDate', width: 160, align: 'center' },
+        { title: '客户名称', dataIndex: 'buyerName', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '联系人', dataIndex: 'contactName', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '联系电话', dataIndex: 'contactTel', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '最后销售时间', dataIndex: 'lastSaleTime', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '是否卫星仓', dataIndex: 'satelliteFlag', width: 110, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: 170, align: 'center', fixed: 'right' }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
@@ -329,13 +332,3 @@ export default {
   }
 }
 </script>
-
-<style lang="less">
-  .customerManagementList-wrap{
-    .sTable{
-      table{
-        width: auto;
-      }
-    }
-  }
-</style>

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

@@ -79,6 +79,7 @@
       :rowKey="(record) => record.id"
       :columns="columns"
       :data="loadData"
+      :scroll="{ x: 1180 }"
       bordered>
       <!-- 结算单号 -->
       <template slot="purchaseNo" slot-scope="text, record">
@@ -90,7 +91,7 @@
       </template>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
-        <a-button size="small" type="dashed" @click="handleDetail(record)" id="companyCollectionPaymentList-detail-btn">详情</a-button>
+        <a-button size="small" type="link" @click="handleDetail(record)" id="companyCollectionPaymentList-detail-btn">详情</a-button>
       </template>
     </s-table>
   </a-card>
@@ -109,16 +110,16 @@ export default {
       queryParam: {},
       // 表头
       columns: [
-        { title: '序号', dataIndex: 'no', align: 'center' },
+        { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
         { title: '单位名称', dataIndex: 'name', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '单位类型', dataIndex: 'pssayType', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '结算类型', dataIndex: 'paddyType', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '结算单号', scopedSlots: { customRender: 'purchaseNo' }, align: 'center' },
-        { title: '结算金额', dataIndex: 'totalP', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '结算时间', dataIndex: 'creatDate', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '操作人', dataIndex: 'payType', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '结算方式', scopedSlots: { customRender: 'sss' }, width: 270, align: 'center' },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: 160, align: 'center' }
+        { title: '单位类型', dataIndex: 'pssayType', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '结算类型', dataIndex: 'paddyType', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '结算单号', scopedSlots: { customRender: 'purchaseNo' }, width: 140, align: 'center' },
+        { title: '结算金额', dataIndex: 'totalP', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '结算时间', dataIndex: 'creatDate', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '操作人', dataIndex: 'payType', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '结算方式', scopedSlots: { customRender: 'sss' }, width: 100, align: 'center' },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: 100, align: 'center', fixed: 'right' }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {

+ 96 - 90
src/views/financialManagement/companyReceivablePayable/detail.vue

@@ -32,7 +32,13 @@
               <span class="table-page-search-submitButtons">
                 <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="companyReceivablePayableDetail-refresh">查询</a-button>
                 <a-button style="margin-left: 8px" @click="resetSearchForm()" :disabled="disabled" id="companyReceivablePayableDetail-reset">重置</a-button>
-                <a-button type="danger" style="margin-left: 8px" @click="handleExport" :disabled="disabled" :loading="exportLoading" id="companyReceivablePayableDetail-export-btn">导出</a-button>
+                <a-button
+                  type="danger"
+                  style="margin-left: 8px"
+                  @click="handleExport"
+                  :disabled="disabled"
+                  :loading="exportLoading"
+                  id="companyReceivablePayableDetail-export-btn">导出</a-button>
               </span>
             </a-col>
           </a-row>
@@ -53,11 +59,11 @@
         bordered>
         <!-- 采购数量 -->
         <template slot="purchaseNum" slot-scope="text, record">
-          <span>{{record.purchaseNum}}</span>
+          <span>{{ record.purchaseNum }}</span>
         </template>
         <!-- 缺货数量 -->
         <template slot="outOfStockNum" slot-scope="text, record">
-          <span>{{record.outOfStockNum}}</span>
+          <span>{{ record.outOfStockNum }}</span>
         </template>
       </s-table>
     </a-card>
@@ -65,98 +71,98 @@
 </template>
 
 <script>
-  import { STable, VSelect } from '@/components'
-  export default{
-    components: { STable, VSelect },
-    data(){
-      return{
-        disabled: false, //  查询、重置按钮是否可操作
-        // 查询参数
-        queryParam: {},
-        exportLoading: false, // 导出loading
-        // 表头
-        columns: [
-          { title: '序号', dataIndex: 'no', align: 'center' },
-          { title: '单据号', dataIndex: 'creatDate', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '类型', dataIndex: 'custName', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '审核时间', dataIndex: 'totalP', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '金额', scopedSlots: { customRender: 'purchaseNum' }, align: 'center' },
-          { title: '余额', scopedSlots: { customRender: 'purchasesNum' }, align: 'center' },
-        ],
-        // 加载数据方法 必须为 Promise 对象
-        loadData: parameter => {
-          this.disabled = true
-          // return customerBundleDelayList( Object.assign(parameter, this.queryParam) ).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
-          //   }
-          //   this.disabled = false
-          //   return data
-          // })
-          const _this = this
-          return new Promise(function(resolve, reject){
-            const data = {
-              pageNo: 1,
-              pageSize: 10,
-              list: [
-                { id: '1', purchaseNo: 'jgqp11111111111', creatDate: '产品1', custName: 'jgqp111123545', totalP: '箭冠品牌', totalNums: '产品分类1', totalPrice: '5', payType: '122' }
-              ],
-              count: 10
-            }
-            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
-            resolve(data)
-          })
-        },
+import { STable, VSelect } from '@/components'
+export default {
+  components: { STable, VSelect },
+  data () {
+    return {
+      disabled: false, //  查询、重置按钮是否可操作
+      // 查询参数
+      queryParam: {},
+      exportLoading: false, // 导出loading
+      // 表头
+      columns: [
+        { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
+        { title: '单据号', dataIndex: 'creatDate', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '类型', dataIndex: 'custName', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '审核时间', dataIndex: 'totalP', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '金额', scopedSlots: { customRender: 'purchaseNum' }, align: 'center' },
+        { title: '余额', scopedSlots: { customRender: 'purchasesNum' }, align: 'center' }
+      ],
+      // 加载数据方法 必须为 Promise 对象
+      loadData: parameter => {
+        this.disabled = true
+        // return customerBundleDelayList( Object.assign(parameter, this.queryParam) ).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
+        //   }
+        //   this.disabled = false
+        //   return data
+        // })
+        const _this = this
+        return new Promise(function (resolve, reject) {
+          const data = {
+            pageNo: 1,
+            pageSize: 10,
+            list: [
+              { id: '1', purchaseNo: 'jgqp11111111111', creatDate: '产品1', custName: 'jgqp111123545', totalP: '箭冠品牌', totalNums: '产品分类1', totalPrice: '5', payType: '122' }
+            ],
+            count: 10
+          }
+          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
+          resolve(data)
+        })
       }
+    }
+  },
+  methods: {
+    //  返回列表
+    handleBack () {
+      this.$router.push({ path: '/financialManagement/companyReceivablePayable/list' })
     },
-    methods: {
-      //  返回列表
-      handleBack(){
-        this.$router.push({ path: '/financialManagement/companyReceivablePayable/list'})
-      },
-      //  导出
-      handleExport () {
-        const params = this.queryParam
-        if (this.oldTime && this.oldTime.length > 0) {
-          params.beginOldExpiryDate = moment(this.oldTime[0]).format('YYYY-MM-DD')
-          params.endOldExpirydDate = moment(this.oldTime[1]).format('YYYY-MM-DD')
-        } else {
-          params.beginOldExpiryDate = ''
-          params.endOldExpirydDate = ''
-        }
-        if (this.newTime && this.newTime.length > 0) {
-          params.beginDate = moment(this.newTime[0]).format('YYYY-MM-DD')
-          params.endDate = moment(this.newTime[1]).format('YYYY-MM-DD')
-        } else {
-          params.beginDate = ''
-          params.endDate = ''
-        }
-        this.exportLoading = true
-        customerBundleExportDelay(params).then(res => {
-          this.exportLoading = false
-          this.download(res)
-        })
-      },
-      download (data) {
-        if (!data) { return }
-        const url = window.URL.createObjectURL(new Blob([data]))
-        const link = document.createElement('a')
-        link.style.display = 'none'
-        link.href = url
-        const a = moment().format('YYYYMMDDHHmmss')
-        const fname = '仓库调拨' + a
-        link.setAttribute('download', fname + '.xlsx')
-        document.body.appendChild(link)
-        link.click()
+    //  导出
+    handleExport () {
+      const params = this.queryParam
+      if (this.oldTime && this.oldTime.length > 0) {
+        params.beginOldExpiryDate = moment(this.oldTime[0]).format('YYYY-MM-DD')
+        params.endOldExpirydDate = moment(this.oldTime[1]).format('YYYY-MM-DD')
+      } else {
+        params.beginOldExpiryDate = ''
+        params.endOldExpirydDate = ''
       }
+      if (this.newTime && this.newTime.length > 0) {
+        params.beginDate = moment(this.newTime[0]).format('YYYY-MM-DD')
+        params.endDate = moment(this.newTime[1]).format('YYYY-MM-DD')
+      } else {
+        params.beginDate = ''
+        params.endDate = ''
+      }
+      this.exportLoading = true
+      customerBundleExportDelay(params).then(res => {
+        this.exportLoading = false
+        this.download(res)
+      })
+    },
+    download (data) {
+      if (!data) { return }
+      const url = window.URL.createObjectURL(new Blob([data]))
+      const link = document.createElement('a')
+      link.style.display = 'none'
+      link.href = url
+      const a = moment().format('YYYYMMDDHHmmss')
+      const fname = '仓库调拨' + a
+      link.setAttribute('download', fname + '.xlsx')
+      document.body.appendChild(link)
+      link.click()
     }
   }
+}
 </script>
 
 <style lang="less">

+ 20 - 18
src/views/financialManagement/companyReceivablePayable/list.vue

@@ -44,9 +44,11 @@
       bordered>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
-        <a-button size="small" type="primary" @click="handleCollection(record)" id="companyReceivablePayableList-collection-btn">收款</a-button>
-        <a-button size="small" @click="handlePayment(record)" id="companyReceivablePayableList-payment-btn" style="margin: 0 0 10px 8px">付款</a-button>
-        <a-button size="small" type="dashed" @click="handleDetail(record)" id="companyReceivablePayableList-detail-btn" style="margin: 0 0 10px 8px">详情</a-button>
+        <a-button size="small" type="link" @click="handleCollection(record)" id="companyReceivablePayableList-collection-btn">收款</a-button>
+        <a-divider type="vertical" style="margin: 0;" />
+        <a-button size="small" type="link" @click="handlePayment(record)" id="companyReceivablePayableList-payment-btn">付款</a-button>
+        <a-divider type="vertical" style="margin: 0;" />
+        <a-button size="small" type="link" @click="handleDetail(record)" id="companyReceivablePayableList-detail-btn">详情</a-button>
       </template>
     </s-table>
   </a-card>
@@ -64,12 +66,12 @@ export default {
       queryParam: {},
       // 表头
       columns: [
-        { title: '序号', dataIndex: 'no', align: 'center' },
+        { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
         { title: '单位名称', dataIndex: 'name', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '单位类型', dataIndex: 'pssayType', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '应收金额', dataIndex: 'totalP', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '应付金额', dataIndex: 'tostalP', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: 270, align: 'center' }
+        { title: '应收金额', dataIndex: 'totalP', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '应付金额', dataIndex: 'tostalP', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: 180, align: 'center' }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
@@ -84,7 +86,7 @@ export default {
         //   return data
         // })
         const _this = this
-        return new Promise(function(resolve, reject){
+        return new Promise(function (resolve, reject) {
           const data = {
             pageNo: 1,
             pageSize: 10,
@@ -100,24 +102,24 @@ export default {
           _this.disabled = false
           resolve(data)
         })
-      },
+      }
     }
   },
   methods: {
     //  详情
-    handleDetail(row){
-      this.$router.push({ path: `/financialManagement/companyReceivablePayable/detail/${row.id}`})
+    handleDetail (row) {
+      this.$router.push({ path: `/financialManagement/companyReceivablePayable/detail/${row.id}` })
     },
     //  收款
-    handleCollection(row){
-      this.$router.push({ path: `/financialManagement/companyReceivablePayable/receipt/${row.id}`})
+    handleCollection (row) {
+      this.$router.push({ path: `/financialManagement/companyReceivablePayable/receipt/${row.id}` })
     },
     //  付款
-    handlePayment(row){
-      this.$router.push({ path: `/financialManagement/companyReceivablePayable/paymentSlip/${row.id}`})
+    handlePayment (row) {
+      this.$router.push({ path: `/financialManagement/companyReceivablePayable/paymentSlip/${row.id}` })
     },
     //  重置
-    resetSearchForm () {  
+    resetSearchForm () {
       this.queryParam.orderBundleNo = ''
       this.queryParam.orderBundle.custMobile = ''
       this.queryParam.bundleName = ''
@@ -125,7 +127,7 @@ export default {
       this.oldTime = undefined
       this.newTime = undefined
       this.$refs.table.refresh(true)
-    },
+    }
   }
 }
 </script>
@@ -135,4 +137,4 @@ export default {
       margin-top: 15px;
     }
   }
-</style>
+</style>

+ 35 - 28
src/views/financialManagement/expenseManagement/list.vue

@@ -78,27 +78,33 @@
       :rowKey="(record) => record.id"
       :columns="columns"
       :data="loadData"
+      :scroll="{ x: 1120 }"
       bordered>
       <!-- 采购单号 -->
       <template slot="purchaseNo" slot-scope="text, record">
-        <span style="color: #ed1c24;cursor: pointer;">{{record.purchaseNo}}</span>
+        <span style="color: #ed1c24;cursor: pointer;">{{ record.purchaseNo }}</span>
       </template>
       <!-- 采购入库单号 -->
       <template slot="purchaseNos" slot-scope="text, record">
-        <span style="color: #ed1c24;cursor: pointer;">{{record.purchaseNo}}</span>
+        <span style="color: #ed1c24;cursor: pointer;">{{ record.purchaseNo }}</span>
       </template>
       <!-- 状态 -->
       <template slot="state" slot-scope="text, record">
-        <span>{{record.state == 1 ? '已启用' : '已禁用'}}</span>
+        <span>{{ record.state == 1 ? '已启用' : '已禁用' }}</span>
       </template>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
-        <a-button size="small" type="primary" @click="handleExamine(record, 1)" id="expenseManagement-adopt-btn">通过</a-button>
-        <a-button size="small" @click="handleExamine(record, 2)" id="expenseManagement-unadopt-btn" style="margin: 0 0 10px 8px">不通过</a-button>
-        <a-button size="small" type="primary" @click="handleEdit(record)" id="expenseManagement-edit-btn" style="margin: 0 0 10px 8px">编辑</a-button>
-        <a-button size="small" type="primary" @click="handleSubmit(record)" id="expenseManagement-submit-btn" style="margin: 0 0 10px 8px">提交</a-button>
-        <a-button size="small" type="dashed" @click="handleDetail(record)" id="expenseManagement-detail-btn" style="margin: 0 0 10px 8px">详情</a-button>
-        <a-button size="small" type="danger" @click="handleDel(record)" id="expenseManagement-del-btn" style="margin: 0 0 0 8px">删除</a-button>
+        <a-button size="small" type="link" @click="handleExamine(record, 1)" id="expenseManagement-adopt-btn">通过</a-button>
+        <a-divider type="vertical" style="margin: 0;" />
+        <a-button size="small" type="link" @click="handleExamine(record, 2)" id="expenseManagement-unadopt-btn">不通过</a-button>
+        <a-divider type="vertical" style="margin: 0;" />
+        <a-button size="small" type="link" @click="handleEdit(record)" id="expenseManagement-edit-btn">编辑</a-button>
+        <a-divider type="vertical" style="margin: 0;" />
+        <a-button size="small" type="link" @click="handleSubmit(record)" id="expenseManagement-submit-btn">提交</a-button>
+        <a-divider type="vertical" style="margin: 0;" />
+        <a-button size="small" type="link" @click="handleDetail(record)" id="expenseManagement-detail-btn">详情</a-button>
+        <a-divider type="vertical" style="margin: 0;" />
+        <a-button size="small" type="link" @click="handleDel(record)" id="expenseManagement-del-btn">删除</a-button>
       </template>
     </s-table>
     <!-- 详情 -->
@@ -115,18 +121,19 @@ export default {
   data () {
     return {
       disabled: false, //  查询、重置按钮是否可操作
-      advanced: false,  //  高级搜索 展开/关闭
+      advanced: false, //  高级搜索 展开/关闭
       // 查询参数
       queryParam: {},
       // 表头
       columns: [
-        { title: '费用单号', scopedSlots: { customRender: 'purchaseNo' }, align: 'center' },
-        { title: '创建时间', dataIndex: 'creatDates', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '费用类型', dataIndex: 'creatDate', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '金额', dataIndex: 'totalPrice', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '单据状态', dataIndex: 'totalP', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '结算状态', dataIndex: 'totalNums', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: 270, align: 'center' }
+        { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
+        { title: '费用单号', scopedSlots: { customRender: 'purchaseNo' }, width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '创建时间', dataIndex: 'creatDate', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '费用类型', dataIndex: 'name', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '金额', dataIndex: 'totalAmount', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '单据状态', scopedSlots: { customRender: 'auditStatus' }, width: 110, align: 'center' },
+        { title: '结算状态', scopedSlots: { customRender: 'financialStatus' }, width: 110, align: 'center' },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: 320, align: 'center', fixed: 'right' }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
@@ -141,7 +148,7 @@ export default {
         //   return data
         // })
         const _this = this
-        return new Promise(function(resolve, reject){
+        return new Promise(function (resolve, reject) {
           const data = {
             pageNo: 1,
             pageSize: 10,
@@ -158,17 +165,17 @@ export default {
           resolve(data)
         })
       },
-      openModal: false,  //  查看详情  弹框
-      itemId: '',  //  当前id
+      openModal: false, //  查看详情  弹框
+      itemId: '' //  当前id
     }
   },
   methods: {
     //  新增/编辑
-    handleEdit(row){
-      this.$router.push({ path: `/financialManagement/expenseManagement/add`})
+    handleEdit (row) {
+      this.$router.push({ path: `/financialManagement/expenseManagement/add` })
     },
     //  提交
-    handleSubmit(row){
+    handleSubmit (row) {
       const _this = this
       _this.itemId = item.id
       _this.$confirm({
@@ -186,17 +193,17 @@ export default {
       })
     },
     //  详情
-    handleDetail(row){
+    handleDetail (row) {
       this.itemId = row.id
       this.openModal = true
       // this.$router.push({ path: `/financialManagement/expenseManagement/detail/${row.id}`})
     },
     //  审核
-    handleExamine(row, type){
+    handleExamine (row, type) {
       const _this = this
       this.$confirm({
         title: '提示',
-        content: '操作后不可恢复,确定要进行'+ (type==1 ? ' 通过 ' : ' 不通过 ') +'操作吗?',
+        content: '操作后不可恢复,确定要进行' + (type == 1 ? ' 通过 ' : ' 不通过 ') + '操作吗?',
         okText: '确定',
         cancelText: '取消',
         centered: true,
@@ -240,7 +247,7 @@ export default {
       this.oldTime = undefined
       this.newTime = undefined
       this.$refs.table.refresh(true)
-    },
+    }
   }
 }
 </script>
@@ -250,4 +257,4 @@ export default {
       margin-top: 15px;
     }
   }
-</style>
+</style>

+ 11 - 9
src/views/financialManagement/financialCollection/list.vue

@@ -77,6 +77,7 @@
       :rowKey="(record) => record.id"
       :columns="columns"
       :data="loadData"
+      :scroll="{ x: 1290 }"
       bordered>
       <!-- 结算单号 -->
       <template slot="purchaseNo" slot-scope="text, record">
@@ -88,7 +89,7 @@
       </template>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
-        <a-button size="small" type="dashed" @click="handleVoucher(record)" id="financialCollectionList-voucher-btn">凭证</a-button>
+        <a-button size="small" type="link" @click="handleVoucher(record)" id="financialCollectionList-voucher-btn">凭证</a-button>
       </template>
     </s-table>
   </a-card>
@@ -107,15 +108,16 @@ export default {
       queryParam: {},
       // 表头
       columns: [
-        { title: '收款单号', dataIndex: 'no', align: 'center' },
-        { title: '关联单号', dataIndex: 'name', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
+        { title: '收款单号', dataIndex: 'nos', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '关联单号', dataIndex: 'name', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '商户名称', dataIndex: 'pssayType', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '收款金额', dataIndex: 'paddyType', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '收款类型', scopedSlots: { customRender: 'purchaseNo' }, align: 'center' },
-        { title: '收款方式', dataIndex: 'totalP', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '审核时间', dataIndex: 'payType', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '收款时间', dataIndex: 'creatDate', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: 160, align: 'center' }
+        { title: '收款金额', dataIndex: 'paddyType', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '收款类型', scopedSlots: { customRender: 'purchaseNo' }, width: 100, align: 'center' },
+        { title: '收款方式', dataIndex: 'totalP', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '审核时间', dataIndex: 'payType', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '收款时间', dataIndex: 'creatDate', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: 100, align: 'center', fixed: 'right' }
       ],
       selectedRowKeys: [], // Check here to configure the default column
       loading: false,

+ 26 - 24
src/views/financialManagement/financialPayment/list.vue

@@ -77,18 +77,19 @@
       :rowKey="(record) => record.id"
       :columns="columns"
       :data="loadData"
+      :scroll="{ x: 1280 }"
       bordered>
       <!-- 结算单号 -->
       <template slot="purchaseNo" slot-scope="text, record">
-        <span style="color: #ed1c24;cursor: pointer;" @click="handleDetail(record)">{{record.purchaseNo}}</span>
+        <span style="color: #ed1c24;cursor: pointer;" @click="handleDetail(record)">{{ record.purchaseNo }}</span>
       </template>
       <!-- 结算方式 -->
       <template slot="sss" slot-scope="text, record">
-        <span>{{record.state == 1 ? '现金' : '微信'}}</span>
+        <span>{{ record.state == 1 ? '现金' : '微信' }}</span>
       </template>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
-        <a-button size="small" type="dashed" @click="handleVoucher(record)" id="financialPaymentList-voucher-btn">凭证</a-button>
+        <a-button size="small" type="link" @click="handleVoucher(record)" id="financialPaymentList-voucher-btn">凭证</a-button>
       </template>
     </s-table>
   </a-card>
@@ -101,21 +102,22 @@ export default {
   components: { STable, VSelect },
   data () {
     return {
-      advanced: false,  //  高级搜索 展开/关闭
+      advanced: false, //  高级搜索 展开/关闭
       disabled: false, //  查询、重置按钮是否可操作
       // 查询参数
       queryParam: {},
       // 表头
       columns: [
-        { title: '付款单号', dataIndex: 'no', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '关联单号', dataIndex: 'name', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
+        { title: '付款单号', dataIndex: 'nos', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '关联单号', dataIndex: 'name', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '商户名称', dataIndex: 'pssayType', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '付款金额', dataIndex: 'paddyType', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '付款类型', scopedSlots: { customRender: 'purchaseNo' }, align: 'center' },
-        { title: '付款方式', dataIndex: 'totalP', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '付款时间', dataIndex: 'creatDate', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '审核时间', dataIndex: 'payType', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: 160, align: 'center' }
+        { title: '付款金额', dataIndex: 'paddyType', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '付款类型', scopedSlots: { customRender: 'purchaseNo' }, width: 100, align: 'center' },
+        { title: '付款方式', dataIndex: 'totalP', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '付款时间', dataIndex: 'creatDate', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '审核时间', dataIndex: 'payType', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: 100, align: 'center', fixed: 'right' }
       ],
       selectedRowKeys: [], // Check here to configure the default column
       loading: false,
@@ -132,7 +134,7 @@ export default {
         //   return data
         // })
         const _this = this
-        return new Promise(function(resolve, reject){
+        return new Promise(function (resolve, reject) {
           const data = {
             pageNo: 1,
             pageSize: 10,
@@ -158,7 +160,7 @@ export default {
         { id: 6, name: '急件' },
         { id: 7, name: '费用' },
         { id: 8, name: '资产' },
-        { id: 9, name: '盘点付款' },
+        { id: 9, name: '盘点付款' }
       ]
     }
   },
@@ -166,7 +168,7 @@ export default {
     hasSelected () {
       return this.selectedRowKeys.length > 0
     },
-    rowSelection() {
+    rowSelection () {
       return {
         selectedRowKeys: this.selectedRowKeys,
         onChange: (selectedRowKeys, selectedRows) => {
@@ -177,19 +179,19 @@ export default {
         getCheckboxProps: record => ({
           props: {
             disabled: record.name === 'Disabled User', // Column configuration not to be checked
-            name: record.name,
-          },
-        }),
-      };
+            name: record.name
+          }
+        })
+      }
     }
   },
   methods: {
     //  凭证
-    handleVoucher(row){
-      
+    handleVoucher (row) {
+
     },
     //  tabs  change
-    handleTabChange(key){
+    handleTabChange (key) {
       console.log(key)
     },
     // 批量付款
@@ -210,7 +212,7 @@ export default {
       this.oldTime = undefined
       this.newTime = undefined
       this.$refs.table.refresh(true)
-    },
+    }
   }
 }
 </script>
@@ -223,4 +225,4 @@ export default {
       margin-bottom: 15px;
     }
   }
-</style>
+</style>

+ 58 - 56
src/views/financialManagement/inventoryReview/detail.vue

@@ -68,14 +68,15 @@
             :rowKey="(record) => record.id"
             :columns="columns"
             :data="loadData"
+            :scroll="{ x: 1290 }"
             bordered>
             <!-- 采购数量 -->
             <template slot="purchaseNum" slot-scope="text, record">
-              <span>{{record.purchaseNum}}</span>
+              <span>{{ record.purchaseNum }}</span>
             </template>
             <!-- 缺货数量 -->
             <template slot="outOfStockNum" slot-scope="text, record">
-              <span>{{record.outOfStockNum}}</span>
+              <span>{{ record.outOfStockNum }}</span>
             </template>
           </s-table>
         </a-collapse-panel>
@@ -85,63 +86,64 @@
 </template>
 
 <script>
-  import { STable, VSelect } from '@/components'
-  export default{
-    components: { STable, VSelect },
-    data(){
-      return{
-        // 表头
-        columns: [
-          { title: '产品编码', dataIndex: 'creatDate', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '产品名称', dataIndex: 'custName', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '单位', dataIndex: 'mementPay', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '仓库', dataIndex: 'shDaste', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '仓位', dataIndex: 'shsDate', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '库存数量', scopedSlots: { customRender: 'purchaseNum' }, align: 'center' },
-          { title: '库存成本', dataIndex: 'totalNums', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-          { title: '盘点数量', scopedSlots: { customRender: 'purchasesNum' }, align: 'center' },
-          { title: '盘点盈亏数量', dataIndex: 'totalP', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-          { title: '盘点盈亏成本', dataIndex: 'shDate', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        ],
-        // 加载数据方法 必须为 Promise 对象
-        loadData: parameter => {
-          this.disabled = true
-          // return customerBundleDelayList( Object.assign(parameter, this.queryParam) ).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
-          //   }
-          //   this.disabled = false
-          //   return data
-          // })
-          const _this = this
-          return new Promise(function(resolve, reject){
-            const data = {
-              pageNo: 1,
-              pageSize: 10,
-              list: [
-                { id: '1', purchaseNo: 'jgqp11111111111', creatDate: '产品1', custName: 'jgqp111123545', totalP: '箭冠品牌', totalNums: '产品分类1', totalPrice: '5', payType: '122' }
-              ],
-              count: 10
-            }
-            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
-            resolve(data)
-          })
-        },
+import { STable, VSelect } from '@/components'
+export default {
+  components: { STable, VSelect },
+  data () {
+    return {
+      // 表头
+      columns: [
+        { title: '序号', dataIndex: 'no', width: 80, align: 'center', fixed: 'left' },
+        { title: '产品编码', dataIndex: 'productCode', width: 160, align: 'center' },
+        { title: '产品名称', dataIndex: 'productName', align: 'center', ellipsis: true },
+        { title: '单位', dataIndex: 'productOrigUnit', width: 100, align: 'center' },
+        { 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: 'qtsy', width: 110, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '库存成本', dataIndex: 'price', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '盘点数量', dataIndex: 'qtssy', width: 110, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '盘点盈亏数量', dataIndex: 'qtdsy', width: 120, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '盘点盈亏成本', dataIndex: 'prifce', width: 120, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
+      ],
+      // 加载数据方法 必须为 Promise 对象
+      loadData: parameter => {
+        this.disabled = true
+        // return customerBundleDelayList( Object.assign(parameter, this.queryParam) ).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
+        //   }
+        //   this.disabled = false
+        //   return data
+        // })
+        const _this = this
+        return new Promise(function (resolve, reject) {
+          const data = {
+            pageNo: 1,
+            pageSize: 10,
+            list: [
+              { id: '1', purchaseNo: 'jgqp11111111111', creatDate: '产品1', custName: 'jgqp111123545', totalP: '箭冠品牌', totalNums: '产品分类1', totalPrice: '5', payType: '122' }
+            ],
+            count: 10
+          }
+          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
+          resolve(data)
+        })
       }
-    },
-    methods: {
-      //  返回列表
-      handleBack(){
-        this.$router.push({ path: '/financialManagement/inventoryReview/list'})
-      },
+    }
+  },
+  methods: {
+    //  返回列表
+    handleBack () {
+      this.$router.push({ path: '/financialManagement/inventoryReview/list' })
     }
   }
+}
 </script>
 
 <style lang="less">

+ 16 - 12
src/views/financialManagement/inventoryReview/list.vue

@@ -46,6 +46,7 @@
       :rowKey="(record) => record.id"
       :columns="columns"
       :data="loadData"
+      :scroll="{ x: 1300 }"
       bordered>
       <!-- 采购单号 -->
       <template slot="purchaseNo" slot-scope="text, record">
@@ -61,9 +62,11 @@
       </template>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
-        <a-button size="small" type="primary" @click="handleExamine(record, 1)" id="inventoryReview-adopt-btn">通过</a-button>
-        <a-button size="small" @click="handleExamine(record, 2)" id="inventoryReview-unadopt-btn" style="margin: 0 0 10px 8px">不通过</a-button>
-        <a-button size="small" type="dashed" @click="handleDetail(record)" id="inventoryReview-detail-btn" style="margin: 0 0 10px 8px">详情</a-button>
+        <a-button size="small" type="link" @click="handleExamine(record, 1)" id="inventoryReview-adopt-btn">通过</a-button>
+        <a-divider type="vertical" style="margin: 0;" />
+        <a-button size="small" type="link" @click="handleExamine(record, 2)" id="inventoryReview-unadopt-btn">不通过</a-button>
+        <a-divider type="vertical" style="margin: 0;" />
+        <a-button size="small" type="link" @click="handleDetail(record)" id="inventoryReview-detail-btn">详情</a-button>
       </template>
     </s-table>
   </a-card>
@@ -81,15 +84,16 @@ export default {
       queryParam: {},
       // 表头
       columns: [
-        { title: '盘点单号', scopedSlots: { customRender: 'purchaseNo' }, align: 'center' },
-        { title: '盘点产品款数', dataIndex: 'totalP', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '库存总成本', dataIndex: 'totalPrice', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '盘盈总数量', dataIndex: 'totalNums', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '盘亏总数量', dataIndex: 'totaslNums', align: 'center' , customRender: function (text) { return ((text || text == 0) ? text : '--') }},
-        { title: '盘点审核时间', dataIndex: 'creatDates', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '财务审核时间', dataIndex: 'creatDate', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '财务审核状态', dataIndex: 'payType', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: 270, align: 'center' }
+        { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
+        { title: '盘点单号', scopedSlots: { customRender: 'purchaseBillNo' }, align: 'center' },
+        { title: '盘点产品款数', dataIndex: 'totalCategory', width: 120, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '库存总成本', dataIndex: 'totalAmount', width: 110, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '盘盈总数量', dataIndex: 'totalQty', width: 110, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '盘亏总数量', dataIndex: 'totalssQty', width: 110, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '盘点审核时间', dataIndex: 'sauditTime', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '财务审核时间', dataIndex: 'auditTime', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '财务审核状态', scopedSlots: { customRender: 'auditStatus' }, width: 120, align: 'center' },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: 190, align: 'center', fixed: 'right' }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {

+ 21 - 20
src/views/financialManagement/ledgerRecord/list.vue

@@ -51,14 +51,15 @@
       :rowKey="(record) => record.id"
       :columns="columns"
       :data="loadData"
+      :scroll="{ x: 1540 }"
       bordered>
       <!-- 结算单号 -->
       <template slot="purchaseNo" slot-scope="text, record">
-        <span style="color: #ed1c24;cursor: pointer;" @click="handleDetail(record)">{{record.purchaseNo}}</span>
+        <span style="color: #ed1c24;cursor: pointer;" @click="handleDetail(record)">{{ record.purchaseNo }}</span>
       </template>
       <!-- 结算方式 -->
       <template slot="sss" slot-scope="text, record">
-        <span>{{record.state == 1 ? '现金' : '微信'}}</span>
+        <span>{{ record.state == 1 ? '现金' : '微信' }}</span>
       </template>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
@@ -75,23 +76,23 @@ export default {
   components: { STable, VSelect },
   data () {
     return {
-      advanced: false,  //  高级搜索 展开/关闭
+      advanced: false, //  高级搜索 展开/关闭
       disabled: false, //  查询、重置按钮是否可操作
       // 查询参数
       queryParam: {},
       // 表头
       columns: [
-        { title: '序号', dataIndex: 'no', align: 'center' },
-        { title: '分账时间', dataIndex: 'name', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '序号', dataIndex: 'no', width: 80, align: 'center', fixed: 'left' },
+        { title: '分账时间', dataIndex: 'name', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '客户名称', dataIndex: 'pssayType', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '关联工单', dataIndex: 'paddyType', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '关联工单', dataIndex: 'paddyType', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '配件名称', scopedSlots: { customRender: 'purchaseNo' }, align: 'center' },
-        { title: '配件编码', dataIndex: 'totalP', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '数量', dataIndex: 'creatDate', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '分账类型', dataIndex: 'payType', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '分账金额(¥)', scopedSlots: { customRender: 'sss' }, width: 270, align: 'center' },
-        { title: '分账状态', dataIndex: 'paysType', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '备注', dataIndex: 'payTypde', align: 'center', ellipsis: true },
+        { title: '配件编码', dataIndex: 'totalP', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '数量', dataIndex: 'creatDate', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '分账类型', dataIndex: 'payType', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '分账金额(¥)', scopedSlots: { customRender: 'sss' }, width: 120, align: 'center' },
+        { title: '分账状态', dataIndex: 'paysType', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '备注', dataIndex: 'remarks', align: 'center', ellipsis: true }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
@@ -106,7 +107,7 @@ export default {
         //   return data
         // })
         const _this = this
-        return new Promise(function(resolve, reject){
+        return new Promise(function (resolve, reject) {
           const data = {
             pageNo: 1,
             pageSize: 10,
@@ -122,20 +123,20 @@ export default {
           _this.disabled = false
           resolve(data)
         })
-      },
+      }
     }
   },
   methods: {
     //  详情
-    handleDetail(row){
-      this.$router.push({ path: `/financialManagement/ledgerRecord/detail/${row.id}`})
+    handleDetail (row) {
+      this.$router.push({ path: `/financialManagement/ledgerRecord/detail/${row.id}` })
     },
     //  审核
-    handleExamine(row, type){
+    handleExamine (row, type) {
       const _this = this
       this.$confirm({
         title: '提示',
-        content: '操作后不可恢复,确定要进行'+ (type==1 ? ' 通过 ' : ' 不通过 ') +'操作吗?',
+        content: '操作后不可恢复,确定要进行' + (type == 1 ? ' 通过 ' : ' 不通过 ') + '操作吗?',
         okText: '确定',
         cancelText: '取消',
         centered: true,
@@ -161,7 +162,7 @@ export default {
       this.oldTime = undefined
       this.newTime = undefined
       this.$refs.table.refresh(true)
-    },
+    }
   }
 }
 </script>
@@ -171,4 +172,4 @@ export default {
       margin-top: 15px;
     }
   }
-</style>
+</style>

+ 69 - 63
src/views/financialManagement/warehousingAudit/detail.vue

@@ -45,15 +45,8 @@
             :rowKey="(record) => record.id"
             :columns="columns"
             :data="loadData"
+            :scroll="{ x: 1290 }"
             bordered>
-            <!-- 采购数量 -->
-            <template slot="purchaseNum" slot-scope="text, record">
-              <span>{{record.purchaseNum}}</span>
-            </template>
-            <!-- 缺货数量 -->
-            <template slot="outOfStockNum" slot-scope="text, record">
-              <span>{{record.outOfStockNum}}</span>
-            </template>
           </s-table>
         </a-collapse-panel>
       </a-collapse>
@@ -62,64 +55,77 @@
 </template>
 
 <script>
-  import { STable, VSelect } from '@/components'
-  export default{
-    components: { STable, VSelect },
-    data(){
-      return{
-        // 表头
-        columns: [
-          { title: '序号', dataIndex: 'no', align: 'center' },
-          { title: '产品编码', dataIndex: 'creatDate', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '产品名称', dataIndex: 'custName', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '原厂编码', dataIndex: 'totalP', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '采购数量', scopedSlots: { customRender: 'purchaseNum' }, align: 'center' },
-          { title: '入库数量', scopedSlots: { customRender: 'purchasesNum' }, align: 'center' },
-          { title: '成本价', dataIndex: 'totalNums', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-          { title: '单位', dataIndex: 'mementPay', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '入库小计', dataIndex: 'shDate', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-          { title: '仓库', dataIndex: 'shDaste', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '仓位', dataIndex: 'shsDate', align: 'center', customRender: function (text) { return text || '--' } },
-        ],
-        // 加载数据方法 必须为 Promise 对象
-        loadData: parameter => {
-          this.disabled = true
-          // return customerBundleDelayList( Object.assign(parameter, this.queryParam) ).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
-          //   }
-          //   this.disabled = false
-          //   return data
-          // })
-          const _this = this
-          return new Promise(function(resolve, reject){
-            const data = {
-              pageNo: 1,
-              pageSize: 10,
-              list: [
-                { id: '1', purchaseNo: 'jgqp11111111111', creatDate: '产品1', custName: 'jgqp111123545', totalP: '箭冠品牌', totalNums: '产品分类1', totalPrice: '5', payType: '122' }
-              ],
-              count: 10
-            }
-            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
-            resolve(data)
-          })
-        },
+import { getOperationalPrecision } from '@/libs/tools.js'
+import { STable, VSelect } from '@/components'
+export default {
+  components: { STable, VSelect },
+  data () {
+    return {
+      // 表头
+      columns: [
+        { title: '序号', dataIndex: 'no', width: 80, align: 'center', fixed: 'left' },
+        { title: '产品编码', dataIndex: 'productCode', width: 160, align: 'center' },
+        { title: '产品名称', dataIndex: 'productName', align: 'center', ellipsis: true },
+        { title: '原厂编码', dataIndex: 'productOrigCode', width: 200, align: 'center' },
+        { title: '采购数量', dataIndex: 'qty', width: 110, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '入库数量', dataIndex: 'qtsy', width: 110, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '成本价', dataIndex: 'price', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '单位', dataIndex: 'productOrigUnit', width: 100, align: 'center' },
+        { title: '入库小计', dataIndex: 'warehousingSubtotal', width: 100, align: 'center' },
+        { title: '仓库', dataIndex: 'warehouseName', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '仓位', dataIndex: 'warehouseLocationName', width: 100, align: 'center', customRender: function (text) { return text || '--' } }
+      ],
+      // 加载数据方法 必须为 Promise 对象
+      loadData: parameter => {
+        this.disabled = true
+        // return customerBundleDelayList(Object.assign(parameter, this.queryParam)).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
+        //     const productCode = (data.list[i].productEntity && data.list[i].productEntity.code) || (data.list[i].dealerProductEntity && data.list[i].dealerProductEntity.code)
+        //     const productName = (data.list[i].productEntity && data.list[i].productEntity.name) || (data.list[i].dealerProductEntity && data.list[i].dealerProductEntity.name)
+        //     const productOrigCode = (data.list[i].productEntity && data.list[i].productEntity.origCode) || (data.list[i].dealerProductEntity && data.list[i].dealerProductEntity.origCode)
+        //     const productOrigUnit = (data.list[i].productEntity && data.list[i].productEntity.unit) || (data.list[i].dealerProductEntity && data.list[i].dealerProductEntity.unit)
+        //     data.list[i].productCode = productCode || '--'
+        //     data.list[i].productName = productName || '--'
+        //     data.list[i].productOrigCode = productOrigCode || '--'
+        //     data.list[i].productOrigUnit = productOrigUnit || '--'
+        //     data.list[i].warehouseName = data.list[i].warehouseEntity && data.list[i].warehouseEntity.name || '--'
+        //     data.list[i].warehouseLocationName = data.list[i].warehouseLocationEntity && data.list[i].warehouseLocationEntity.name || '--'
+        //     // 入库小计  由于数据库内小数位数为4位,页面则需显示2位。因此会做小数运算精度处理
+        //     data.list[i].warehousingSubtotal = getOperationalPrecision(data.list[i].price, data.list[i].qty)
+        //   }
+        //   this.disabled = false
+        //   return data
+        // })
+        const _this = this
+        return new Promise(function (resolve, reject) {
+          const data = {
+            pageNo: 1,
+            pageSize: 10,
+            list: [
+              { id: '1', purchaseNo: 'jgqp11111111111', creatDate: '产品1', custName: 'jgqp111123545', totalP: '箭冠品牌', totalNums: '产品分类1', totalPrice: '5', payType: '122' }
+            ],
+            count: 10
+          }
+          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
+          resolve(data)
+        })
       }
-    },
-    methods: {
-      //  返回列表
-      handleBack(){
-        this.$router.push({ path: '/financialManagement/warehousingAudit/list'})
-      },
+    }
+  },
+  methods: {
+    //  返回列表
+    handleBack () {
+      this.$router.push({ path: '/financialManagement/warehousingAudit/list' })
     }
   }
+}
 </script>
 
 <style lang="less">

+ 29 - 25
src/views/financialManagement/warehousingAudit/list.vue

@@ -57,24 +57,27 @@
       :rowKey="(record) => record.id"
       :columns="columns"
       :data="loadData"
+      :scroll="{ x: 1290 }"
       bordered>
       <!-- 采购单号 -->
-      <template slot="purchaseNo" slot-scope="text, record">
-        <span style="color: #ed1c24;cursor: pointer;">{{record.purchaseNo}}</span>
+      <template slot="purchaseBillNo" slot-scope="text, record">
+        <span style="color: #ed1c24;cursor: pointer;">{{ record.purchaseBillNo }}</span>
       </template>
       <!-- 采购入库单号 -->
       <template slot="purchaseNos" slot-scope="text, record">
-        <span style="color: #ed1c24;cursor: pointer;">{{record.purchaseNo}}</span>
+        <span style="color: #ed1c24;cursor: pointer;">{{ record.purchaseNo }}</span>
       </template>
       <!-- 状态 -->
-      <template slot="state" slot-scope="text, record">
-        <span>{{record.state == 1 ? '已启用' : '已禁用'}}</span>
+      <template slot="auditStatus" slot-scope="text, record">
+        <a-tag :color="record.auditStatus=='FINISH'?'green':'red'" >{{ record.auditStatus=='FINISH'? '待备货审核': '待单据审核' }}</a-tag>
       </template>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
-        <a-button size="small" type="primary" @click="handleExamine(record, 1)" id="warehousingAudit-adopt-btn">通过</a-button>
-        <a-button size="small" @click="handleExamine(record, 2)" id="warehousingAudit-unadopt-btn" style="margin: 0 0 10px 8px">不通过</a-button>
-        <a-button size="small" type="dashed" @click="handleDetail(record)" id="warehousingAudit-detail-btn" style="margin: 0 0 10px 8px">详情</a-button>
+        <a-button size="small" type="link" @click="handleExamine(record, 1)" id="warehousingAudit-adopt-btn">通过</a-button>
+        <a-divider type="vertical" style="margin: 0;" />
+        <a-button size="small" type="link" @click="handleExamine(record, 2)" id="warehousingAudit-unadopt-btn">不通过</a-button>
+        <a-divider type="vertical" style="margin: 0;" />
+        <a-button size="small" type="link" @click="handleDetail(record)" id="warehousingAudit-detail-btn">详情</a-button>
       </template>
     </s-table>
   </a-card>
@@ -87,21 +90,22 @@ export default {
   components: { STable, VSelect },
   data () {
     return {
-      advanced: false,  //  高级搜索 展开/关闭
+      advanced: false, //  高级搜索 展开/关闭
       disabled: false, //  查询、重置按钮是否可操作
       // 查询参数
       queryParam: {},
       // 表头
       columns: [
-        { title: '采购单号', scopedSlots: { customRender: 'purchaseNo' }, align: 'center' },
+        { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
+        { title: '采购单号', scopedSlots: { customRender: 'purchaseBillNo' }, align: 'center' },
         { title: '采购入库单号', scopedSlots: { customRender: 'purchaseNos' }, align: 'center' },
-        { title: '总款数', dataIndex: 'totalP', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '入库总数量', dataIndex: 'totalNums', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '入库总成本', dataIndex: 'totalPrice', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '入库时间', dataIndex: 'creatDate', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '财务审核时间', dataIndex: 'creatDates', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '财务审核状态', dataIndex: 'payType', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: 270, align: 'center' }
+        { title: '总款数', dataIndex: 'totalCategory', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '入库总数量', dataIndex: 'totalQty', width: 110, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '入库总成本', dataIndex: 'totalAmount', width: 110, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '入库时间', dataIndex: 'sauditTime', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '财务审核时间', dataIndex: 'auditTime', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '财务审核状态', scopedSlots: { customRender: 'auditStatus' }, width: 120, align: 'center' },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: 190, align: 'center', fixed: 'right' }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
@@ -116,7 +120,7 @@ export default {
         //   return data
         // })
         const _this = this
-        return new Promise(function(resolve, reject){
+        return new Promise(function (resolve, reject) {
           const data = {
             pageNo: 1,
             pageSize: 10,
@@ -132,20 +136,20 @@ export default {
           _this.disabled = false
           resolve(data)
         })
-      },
+      }
     }
   },
   methods: {
     //  详情
-    handleDetail(row){
-      this.$router.push({ path: `/financialManagement/warehousingAudit/detail/${row.id}`})
+    handleDetail (row) {
+      this.$router.push({ path: `/financialManagement/warehousingAudit/detail/${row.id}` })
     },
     //  审核
-    handleExamine(row, type){
+    handleExamine (row, type) {
       const _this = this
       this.$confirm({
         title: '提示',
-        content: '操作后不可恢复,确定要进行'+ (type==1 ? ' 通过 ' : ' 不通过 ') +'操作吗?',
+        content: '操作后不可恢复,确定要进行' + (type == 1 ? ' 通过 ' : ' 不通过 ') + '操作吗?',
         okText: '确定',
         cancelText: '取消',
         centered: true,
@@ -171,7 +175,7 @@ export default {
       this.oldTime = undefined
       this.newTime = undefined
       this.$refs.table.refresh(true)
-    },
+    }
   }
 }
 </script>
@@ -181,4 +185,4 @@ export default {
       margin-top: 15px;
     }
   }
-</style>
+</style>

+ 19 - 18
src/views/financialManagement/withdrawalManagement/list.vue

@@ -34,14 +34,15 @@
       :rowKey="(record) => record.id"
       :columns="columns"
       :data="loadData"
+      :scroll="{ x: 1100 }"
       bordered>
       <!-- 结算单号 -->
       <template slot="purchaseNo" slot-scope="text, record">
-        <span style="color: #ed1c24;cursor: pointer;" @click="handleDetail(record)">{{record.purchaseNo}}</span>
+        <span style="color: #ed1c24;cursor: pointer;" @click="handleDetail(record)">{{ record.purchaseNo }}</span>
       </template>
       <!-- 结算方式 -->
       <template slot="sss" slot-scope="text, record">
-        <span>{{record.state == 1 ? '现金' : '微信'}}</span>
+        <span>{{ record.state == 1 ? '现金' : '微信' }}</span>
       </template>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
@@ -68,20 +69,20 @@ export default {
   components: { STable, VSelect },
   data () {
     return {
-      advanced: false,  //  高级搜索 展开/关闭
+      advanced: false, //  高级搜索 展开/关闭
       disabled: false, //  查询、重置按钮是否可操作
       // 查询参数
       queryParam: {},
       // 表头
       columns: [
-        { title: '序号', dataIndex: 'no', align: 'center' },
-        { title: '提现时间', dataIndex: 'name', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '提现单号', dataIndex: 'paddyType', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '申请提现金额', dataIndex: 'pssayType', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '开户名', scopedSlots: { customRender: 'purchaseNo' }, align: 'center' },
+        { title: '序号', dataIndex: 'no', width: 80, align: 'center', fixed: 'left' },
+        { title: '提现时间', dataIndex: 'name', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '提现单号', dataIndex: 'paddyType', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '申请提现金额', dataIndex: 'pssayType', width: 120, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '开户名', scopedSlots: { customRender: 'purchaseNo' }, width: 100, align: 'center' },
         { title: '银行卡号', dataIndex: 'totalP', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '状态', dataIndex: 'paysType', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '备注', dataIndex: 'payTypde', align: 'center', ellipsis: true },
+        { title: '状态', dataIndex: 'paysType', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '备注', dataIndex: 'remarks', align: 'center', ellipsis: true }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
@@ -96,7 +97,7 @@ export default {
         //   return data
         // })
         const _this = this
-        return new Promise(function(resolve, reject){
+        return new Promise(function (resolve, reject) {
           const data = {
             pageNo: 1,
             pageSize: 10,
@@ -112,20 +113,20 @@ export default {
           _this.disabled = false
           resolve(data)
         })
-      },
+      }
     }
   },
   methods: {
     //  详情
-    handleDetail(row){
-      this.$router.push({ path: `/financialManagement/withdrawalManagement/detail/${row.id}`})
+    handleDetail (row) {
+      this.$router.push({ path: `/financialManagement/withdrawalManagement/detail/${row.id}` })
     },
     //  审核
-    handleExamine(row, type){
+    handleExamine (row, type) {
       const _this = this
       this.$confirm({
         title: '提示',
-        content: '操作后不可恢复,确定要进行'+ (type==1 ? ' 通过 ' : ' 不通过 ') +'操作吗?',
+        content: '操作后不可恢复,确定要进行' + (type == 1 ? ' 通过 ' : ' 不通过 ') + '操作吗?',
         okText: '确定',
         cancelText: '取消',
         centered: true,
@@ -151,7 +152,7 @@ export default {
       this.oldTime = undefined
       this.newTime = undefined
       this.$refs.table.refresh(true)
-    },
+    }
   }
 }
 </script>
@@ -185,4 +186,4 @@ export default {
       }
     }
   }
-</style>
+</style>

+ 93 - 125
src/views/inventoryManagement/inventoryChecking/detail.vue

@@ -22,50 +22,53 @@
         </a-collapse-panel>
       </a-collapse>
     </a-card>
-    <!-- 详情 -->
     <a-card size="small" :bordered="false" class="inventoryCheckingDetail-cont">
-      <a-collapse :activeKey="['1']">
-        <a-collapse-panel key="1" header="详情">
-          <!-- 总计 -->
-          <a-alert type="info" showIcon style="margin-bottom:15px">
-            <div slot="message">
-              库存总数量:
-              <strong>6</strong>
-              ,盈亏总数量:
-              <strong>6</strong>
-            </div>
-          </a-alert>
-          <!-- 筛选条件 -->
-          <div 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-form-item label="类型">
-                    <a-select placeholder="请选择" id="inventoryCheckingDetail-type" allowClear v-model="queryParam.dataSourceNo">
-                      <a-select-option v-for="item in brandData" :key="item.id" :value="item.id">{{ item.name }}</a-select-option>
-                    </a-select>
-                  </a-form-item>
-                </a-col>
-                <a-col :md="6" :sm="24" style="margin-bottom: 24px;">
-                  <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="inventoryCheckingDetail-refresh">查询</a-button>
-                  <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="inventoryCheckingDetail-reset">重置</a-button>
-                </a-col>
-              </a-row>
-            </a-form>
-          </div>
-          <!-- 列表 -->
-          <s-table class="sTable" ref="table" size="default" :rowKey="record => record.id" :columns="columns" :data="loadData" bordered>
-            <!-- 采购数量 -->
-            <template slot="purchaseNum" slot-scope="text, record">
-              <span>{{ record.purchaseNum }}</span>
-            </template>
-            <!-- 缺货数量 -->
-            <template slot="outOfStockNum" slot-scope="text, record">
-              <span>{{ record.outOfStockNum }}</span>
-            </template>
-          </s-table>
-        </a-collapse-panel>
-      </a-collapse>
+      <!-- 总计 -->
+      <a-alert type="info" showIcon style="margin-bottom:15px">
+        <div slot="message">
+          库存总数量:
+          <strong>6</strong>
+          ,盈亏总数量:
+          <strong>6</strong>
+        </div>
+      </a-alert>
+      <!-- 筛选条件 -->
+      <div 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-form-item label="类型">
+                <a-select placeholder="请选择" id="inventoryCheckingDetail-type" allowClear v-model="queryParam.dataSourceNo">
+                  <a-select-option v-for="item in brandData" :key="item.id" :value="item.id">{{ item.name }}</a-select-option>
+                </a-select>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24" style="margin-bottom: 24px;">
+              <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="inventoryCheckingDetail-refresh">查询</a-button>
+              <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="inventoryCheckingDetail-reset">重置</a-button>
+            </a-col>
+          </a-row>
+        </a-form>
+      </div>
+      <!-- 列表 -->
+      <s-table
+        class="sTable"
+        ref="table"
+        size="default"
+        :rowKey="record => record.id"
+        :columns="columns"
+        :data="loadData"
+        :scroll="{ x: 820 }"
+        bordered>
+        <!-- 采购数量 -->
+        <template slot="purchaseNum" slot-scope="text, record">
+          <span>{{ record.purchaseNum }}</span>
+        </template>
+        <!-- 缺货数量 -->
+        <template slot="outOfStockNum" slot-scope="text, record">
+          <span>{{ record.outOfStockNum }}</span>
+        </template>
+      </s-table>
     </a-card>
   </div>
 </template>
@@ -74,7 +77,7 @@
 import { STable, VSelect } from '@/components'
 export default {
   components: { STable, VSelect },
-  data() {
+  data () {
     return {
       queryParam: {
         dataSourceNo: undefined
@@ -83,52 +86,17 @@ export default {
       disabled: false, //  查询、重置按钮是否可操作
       // 表头
       columns: [
-        { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
-        {
-          title: '产品编码',
-          dataIndex: 'creatDate',
-          align: 'center',
-          customRender: function(text) {
-            return text || '--';
-          }
-        },
-        {
-          title: '产品名称',
-          dataIndex: 'custName',
-          align: 'center',
-          customRender: function(text) {
-            return text || '--';
-          }
-        },
-        {
-          title: '单位',
-          dataIndex: 'mementPay',
-          align: 'center',
-          customRender: function(text) {
-            return text || '--';
-          }
-        },
-        { title: '库存数量', scopedSlots: { customRender: 'outOfStockNum' }, align: 'center' },
-        {
-          title: '盘点数量',
-          dataIndex: 'tostalP',
-          align: 'center',
-          customRender: function(text) {
-            return text || text == 0 ? text : '--';
-          }
-        },
-        {
-          title: '盈亏数量',
-          dataIndex: 'totalNums',
-          align: 'center',
-          customRender: function(text) {
-            return text || text == 0 ? text : '--';
-          }
-        }
+        { title: '序号', dataIndex: 'no', width: 80, align: 'center', fixed: 'left' },
+        { title: '产品编码', dataIndex: 'productCode', width: 140, align: 'center' },
+        { title: '产品名称', dataIndex: 'productName', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '单位', dataIndex: 'productOrigUnit', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '库存数量', dataIndex: 'qty', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '盘点数量', dataIndex: 'qtsy', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '盈亏数量', dataIndex: 'qdty', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
-        this.disabled = true;
+        this.disabled = true
         // return customerBundleDelayList( Object.assign(parameter, this.queryParam) ).then(res => {
         //   const data = res.data
         //   const no = (data.pageNo - 1) * data.pageSize
@@ -138,8 +106,8 @@ export default {
         //   this.disabled = false
         //   return data
         // })
-        const _this = this;
-        return new Promise(function(resolve, reject) {
+        const _this = this
+        return new Promise(function (resolve, reject) {
           const data = {
             pageNo: 1,
             pageSize: 10,
@@ -147,64 +115,64 @@ export default {
               { id: '1', purchaseNo: 'jgqp11111111111', creatDate: '产品1', custName: 'jgqp111123545', totalP: '箭冠品牌', totalNums: '产品分类1', totalPrice: '5', payType: '122' }
             ],
             count: 10
-          };
-          const no = (data.pageNo - 1) * data.pageSize;
+          }
+          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].no = no + i + 1
           }
-          _this.disabled = false;
-          resolve(data);
-        });
+          _this.disabled = false
+          resolve(data)
+        })
       },
       brandData: []
-    };
+    }
   },
   methods: {
     //  重置
-    resetSearchForm() {},
+    resetSearchForm () {},
     //  返回列表
-    handleBack() {
-      this.$router.push({ path: '/inventoryManagement/inventoryChecking/list' });
+    handleBack () {
+      this.$router.push({ path: '/inventoryManagement/inventoryChecking/list' })
     },
     //  导出
-    handleExport() {
-      const params = this.queryParam;
+    handleExport () {
+      const params = this.queryParam
       if (this.oldTime && this.oldTime.length > 0) {
-        params.beginOldExpiryDate = moment(this.oldTime[0]).format('YYYY-MM-DD');
-        params.endOldExpirydDate = moment(this.oldTime[1]).format('YYYY-MM-DD');
+        params.beginOldExpiryDate = moment(this.oldTime[0]).format('YYYY-MM-DD')
+        params.endOldExpirydDate = moment(this.oldTime[1]).format('YYYY-MM-DD')
       } else {
-        params.beginOldExpiryDate = '';
-        params.endOldExpirydDate = '';
+        params.beginOldExpiryDate = ''
+        params.endOldExpirydDate = ''
       }
       if (this.newTime && this.newTime.length > 0) {
-        params.beginDate = moment(this.newTime[0]).format('YYYY-MM-DD');
-        params.endDate = moment(this.newTime[1]).format('YYYY-MM-DD');
+        params.beginDate = moment(this.newTime[0]).format('YYYY-MM-DD')
+        params.endDate = moment(this.newTime[1]).format('YYYY-MM-DD')
       } else {
-        params.beginDate = '';
-        params.endDate = '';
+        params.beginDate = ''
+        params.endDate = ''
       }
-      this.exportLoading = true;
+      this.exportLoading = true
       customerBundleExportDelay(params).then(res => {
-        this.exportLoading = false;
-        this.download(res);
-      });
+        this.exportLoading = false
+        this.download(res)
+      })
     },
-    download(data) {
+    download (data) {
       if (!data) {
-        return;
+        return
       }
-      const url = window.URL.createObjectURL(new Blob([data]));
-      const link = document.createElement('a');
-      link.style.display = 'none';
-      link.href = url;
-      const a = moment().format('YYYYMMDDHHmmss');
-      const fname = '仓库调拨' + a;
-      link.setAttribute('download', fname + '.xlsx');
-      document.body.appendChild(link);
-      link.click();
+      const url = window.URL.createObjectURL(new Blob([data]))
+      const link = document.createElement('a')
+      link.style.display = 'none'
+      link.href = url
+      const a = moment().format('YYYYMMDDHHmmss')
+      const fname = '仓库调拨' + a
+      link.setAttribute('download', fname + '.xlsx')
+      document.body.appendChild(link)
+      link.click()
     }
   }
-};
+}
 </script>
 
 <style lang="less">

+ 2 - 2
src/views/inventoryManagement/inventoryChecking/list.vue

@@ -40,7 +40,7 @@
       :columns="columns"
       :data="loadData"
       :showPagination="false"
-      :scroll="{ x: 1460 }"
+      :scroll="{ x: 1480 }"
       bordered>
       <!-- 状态 -->
       <template slot="state" slot-scope="text, record">
@@ -89,7 +89,7 @@ export default {
         { title: '单据审核时间', dataIndex: 'shcreateDate', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '状态', scopedSlots: { customRender: 'state' }, width: 100, align: 'center' },
         { title: '盘点类型', dataIndex: 'sort', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: 240, align: 'center', fixed: 'right' }
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: 260, align: 'center', fixed: 'right' }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {

+ 2 - 1
src/views/inventoryManagement/satelliteWarehouseInventory/list.vue

@@ -59,6 +59,7 @@
       :rowKey="record => record.id"
       :columns="columns"
       :data="loadData"
+      :scroll="{ x: 1010 }"
       bordered>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
@@ -100,7 +101,7 @@ export default {
         { title: '产品编码', dataIndex: 'productOldNum', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '原厂编码', dataIndex: 'productType', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '当前库存', dataIndex: 'inventoryNumss', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: 150, align: 'center' }
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: 150, align: 'center', fixed: 'right' }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {

+ 1 - 11
src/views/productManagement/productInfo/list.vue

@@ -311,14 +311,4 @@ export default {
   	})
   }
 }
-</script>
-
-<style lang="less">
-  .productInfoList-wrap{
-    .sTable{
-      table{
-        width: auto;
-      }
-    }
-  }
-</style>
+</script>

+ 1 - 1
src/views/salesManagement/outboundOrder/detail.vue

@@ -3,7 +3,7 @@
     <a-page-header :ghost="false" @back="handleBack" class="outboundOrderDetail-cont">
       <template slot="subTitle">
         <a href="javascript:;" @click="handleBack">返回列表</a>
-        <a-button size="small" id="outboundOrderDetail-ts-btn" style="margin-left:50px" key="0">订单推送</a-button>
+        <a-button size="small" id="outboundOrderDetail-ts-btn" style="margin-left:30px" key="0">订单推送</a-button>
         <a-button size="small" id="outboundOrderDetail-export-btn" type="danger" style="margin-left:20px" key="1">销售导出</a-button>
       </template>
       <template slot="extra">

+ 17 - 14
src/views/salesManagement/salesReturn/detail.vue

@@ -15,15 +15,15 @@
       <a-collapse :activeKey="['1']">
         <a-collapse-panel key="1" header="基础信息">
           <a-descriptions size="small" :column="3" v-if="detailData">
-            <a-descriptions-item label="客户名称">{{ detailData.buyerName || '--' }}</a-descriptions-item>
-            <a-descriptions-item label="客户地址">{{ detailData.shippingAddressProvinceName || '--' }}{{ detailData.shippingAddressCityName || '--' }}{{ detailData.shippingAddressCountyName || '--' }}{{ detailData.shippingAddress || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="客户名称">{{ detailData.dealerName || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="客户地址">{{ detailData.provinceName || '--' }}{{ detailData.cityName || '--' }}{{ detailData.countyName || '--' }}{{ detailData.customerAddr || '--' }}</a-descriptions-item>
             <a-descriptions-item label="支付方式">{{ detailData.payType || '--' }}</a-descriptions-item>
             <a-descriptions-item label="收款方式">{{ detailData.settleStyleSn || '--' }}</a-descriptions-item>
-            <a-descriptions-item label="联系电话">{{ detailData.consigneeTel || '--' }}</a-descriptions-item>
-            <a-descriptions-item label="备注">{{ detailData.buyerName || '--' }}</a-descriptions-item>
-            <a-descriptions-item label="退货单号">{{ detailData.salesBillNo || '--' }}</a-descriptions-item>
-            <a-descriptions-item label="业务状态">{{ detailData.auditStatus || '--' }}</a-descriptions-item>
-            <a-descriptions-item label="财务状态">{{ detailData.financialStatus || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="联系电话">{{ detailData.contactTel || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="备注">{{ detailData.remarks || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="退货单号">{{ detailData.salesReturnNo || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="业务状态">{{ detailData.state || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="财务状态">{{ detailData.settleState || '--' }}</a-descriptions-item>
           </a-descriptions>
         </a-collapse-panel>
       </a-collapse>
@@ -33,7 +33,7 @@
       <a-alert type="info" style="margin-bottom: 15px;" v-if="detailData">
         <div slot="message">
           总款数:<strong>{{ detailData.totalCategory || 0 }}</strong>;总数量:<strong>{{ detailData.totalQty || 0 }}</strong>;废品数量:<strong>{{ detailData.totalGiftNum || 0 }}</strong>;<br/>
-          退货总金额:<strong>{{ detailData.totalAmount || 0 }}</strong>;折扣金额:<strong>{{ detailData.totalCost || 0 }}</strong>;折扣:<strong>{{ detailData.discountRate || 0 }}%</strong>;折后金额:<strong>{{ detailData.discountAmount || 0 }}</strong>;
+          退货总金额:<strong>{{ detailData.totalAmount || 0 }}</strong>;折扣金额:<strong>{{ detailData.discountAmount || 0 }}</strong>;折扣:<strong>{{ detailData.discountRate || 0 }}%</strong>;折后金额:<strong>{{ detailData.discountedAmount || 0 }}</strong>;
         </div>
       </a-alert>
       <!-- 列表 -->
@@ -44,7 +44,7 @@
         :rowKey="(record) => record.id"
         :columns="columns"
         :data="loadData"
-        :scroll="{ x: 1500 }"
+        :scroll="{ x: 1430 }"
         bordered>
       </s-table>
     </a-card>
@@ -71,11 +71,11 @@ export default {
         { title: '售价', dataIndex: 'price', width: 100, 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: 'qty', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '废品数量', dataIndex: 'qty', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '入库数量', dataIndex: 'qty', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '退货金额小计', dataIndex: 'saleReturnSubtotal', width: 100, align: 'center' },
+        { title: '废品数量', dataIndex: 'celQty', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '入库数量', dataIndex: 'rkqty', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '退货金额小计', dataIndex: 'saleReturnSubtotal', width: 120, align: 'center' },
         { title: '折扣金额', dataIndex: 'discountAmount', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '折后退货金额小计', dataIndex: 'discountedAmount', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
+        { title: '折后退货金额小计', dataIndex: 'discountedAmount', width: 150, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
@@ -91,13 +91,16 @@ export default {
             data.list[i].productCode = productCode || '--'
             data.list[i].productName = productName || '--'
             data.list[i].productOrigCode = productOrigCode || '--'
+            // 退货数量和入库数量取值同一个字段,因表格使用统一字段会报错,因此重新定义
+            data.list[i].rkqty = data.list[i].qty || 0
             // 折后退货金额小计  由于数据库内小数位数为4位,页面则需显示2位。因此会做小数运算精度处理
             data.list[i].saleReturnSubtotal = getOperationalPrecision(data.list[i].price, data.list[i].qty)
           }
           this.disabled = false
           return data
         })
-      }
+      },
+      detailData: null //  详情数据
     }
   },
   methods: {

+ 26 - 10
src/views/salesManagement/salesReturn/list.vue

@@ -46,13 +46,24 @@
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="单据状态">
+              <a-form-item label="业务状态">
                 <v-select
-                  v-model="queryParam.billStatus"
-                  ref="billStatus"
-                  id="salesReturn-billStatus"
+                  v-model="queryParam.auditStatus"
+                  ref="auditStatus"
+                  id="salesManagementList-auditStatus"
                   code="PAYMENT_TYPE"
-                  placeholder="请选择单据状态"
+                  placeholder="请选择业务状态"
+                  allowClear></v-select>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="财务状态">
+                <v-select
+                  v-model="queryParam.financialStatus"
+                  ref="financialStatus"
+                  id="salesManagementList-financialStatus"
+                  code="PAYMENT_TYPE"
+                  placeholder="请选择财务状态"
                   allowClear></v-select>
               </a-form-item>
             </a-col>
@@ -86,11 +97,15 @@
       :rowKey="(record) => record.id"
       :columns="columns"
       :data="loadData"
-      :scroll="{ x: 1480 }"
+      :scroll="{ x: 1590 }"
       bordered>
-      <!-- 状态 -->
-      <template slot="state" slot-scope="text, record">
-        <a-tag :color="record.state=='FINISH'?'green':'red'" >{{ record.state=='FINISH'? '已启用': '已禁用' }}</a-tag>
+      <!-- 业务/审核状态 -->
+      <template slot="auditStatus" slot-scope="text, record">
+        <a-tag :color="record.state=='FINISH'?'green':'red'" >{{ record.state=='FINISH'? '待备货审核': '待单据审核' }}</a-tag>
+      </template>
+      <!-- 财务状态 -->
+      <template slot="financialStatus" slot-scope="text, record">
+        <a-tag :color="record.state==1?'green':'red'" >{{ record.state==1? '待提交': '待单据审核' }}</a-tag>
       </template>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
@@ -145,7 +160,8 @@ export default {
         { title: '退款总金额', dataIndex: 'totalAmount', width: 110, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '是否抓单', dataIndex: 'grabFlag', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '审核时间', dataIndex: 'auditTime', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '状态', scopedSlots: { customRender: 'state' }, width: 110, align: 'center' },
+        { title: '业务状态', scopedSlots: { customRender: 'auditStatus' }, width: 110, align: 'center' },
+        { title: '财务状态', scopedSlots: { customRender: 'financialStatus' }, width: 110, align: 'center' },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: 220, align: 'center', fixed: 'right' }
       ],
       // 加载数据方法 必须为 Promise 对象

+ 2 - 2
src/views/salesManagement/urgentItemsOffset/detail.vue

@@ -74,14 +74,14 @@ export default {
       ],
       columns: [
         { title: '序号', dataIndex: 'no', width: 80, align: 'center', fixed: 'left' },
-        { title: '产品编码', dataIndex: 'productCode', width: 140, align: 'center', ellipsis: true },
+        { title: '产品编码', dataIndex: 'productCode', width: 140, align: 'center' },
         { title: '产品名称', dataIndex: 'productName', align: 'center', ellipsis: true },
         { title: '原厂编码', dataIndex: 'productOrigCode', width: 140, align: 'center' },
         { title: '入库时间', dataIndex: 'stockInDate', width: 160, 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: 'price', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '已冲减数量', dataIndex: 'qty', width: 110, align: 'center', ellipsis: true, customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '已冲减数量', dataIndex: 'qty', width: 110, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '单位', dataIndex: 'productOrigUnit', width: 100, align: 'center' },
         { title: '成本小计', dataIndex: 'costSubtotal', width: 100, align: 'center' }
       ],

+ 146 - 133
src/views/supplierManagement/supplierInfo/edit.vue

@@ -1,101 +1,109 @@
 <template>
-  <a-card size="small" :bordered="false" class="supplierInfoEdit-table-page-wrapper">
-    <a-form-model
-      id="supplierInfoEdit-form"
-      ref="ruleForm"
-      :model="form"
-      :rules="rules"
-      :label-col="formItemLayout.labelCol"
-      :wrapper-col="formItemLayout.wrapperCol"
-    >
-      <a-form-model-item label="供应商名称" prop="name">
-        <a-input
-          id="supplierInfoEdit-name"
-          :maxLength="30"
-          v-model="form.name"
-          placeholder="请输入供应商名称(最多30个字符)"
-          allowClear />
-      </a-form-model-item>
-      <a-form-model-item label="所在地区" required style="margin: 0;">
-        <a-row :gutter="20">
-          <!-- 所在地区 -->
-          <a-col span="8">
-            <a-form-model-item prop="provinceCode">
-              <a-select id="supplierInfoEdit-provinceCode" @change="getCityList" v-model="form.provinceCode" placeholder="请选择省">
-                <a-select-option v-for="item in addrProvinceList" :value="item.id" :key="item.id + 'a'">{{ item.name }}</a-select-option>
-              </a-select>
-            </a-form-model-item>
-          </a-col>
-          <a-col span="8">
-            <a-form-model-item prop="cityCode">
-              <a-select id="supplierInfoEdit-cityCode" @change="getAreaList" v-model="form.cityCode" placeholder="请选择市">
-                <a-select-option v-for="item in addrCityList" :value="item.id" :key="item.id + 'b'">{{ item.name }}</a-select-option>
-              </a-select>
-            </a-form-model-item>
-          </a-col>
-          <a-col span="8">
-            <a-form-model-item prop="districtCode">
-              <a-select id="supplierInfoEdit-districtCode" @change="areaCharged" v-model="form.districtCode" placeholder="请选择区/县">
-                <a-select-option v-for="item in addrDistrictList" :value="item.id" :key="item.id + 'c'">{{ item.name }}</a-select-option>
-              </a-select>
-            </a-form-model-item>
-          </a-col>
-        </a-row>
-      </a-form-model-item>
-      <a-form-model-item label="详细地址" prop="address">
-        <a-input
-          id="supplierInfoEdit-address"
-          :maxLength="60"
-          v-model="form.address"
-          placeholder="请输入详细地址(最多60个字符)"
-          allowClear />
-      </a-form-model-item>
-      <a-form-model-item label="联系人" prop="contactName">
-        <a-input
-          id="supplierInfoEdit-contactName"
-          :maxLength="30"
-          v-model="form.contactName"
-          placeholder="请输入联系人(最多30个字符)"
-          allowClear />
-      </a-form-model-item>
-      <a-form-model-item label="联系电话" prop="contactPhone">
-        <a-input
-          id="supplierInfoEdit-contactPhone"
-          :maxLength="20"
-          v-model="form.contactPhone"
-          placeholder="请输入联系电话(最多20个字符)"
-          allowClear />
-      </a-form-model-item>
-      <a-form-model-item label="主营内容" prop="remarks">
-        <a-textarea
-          id="supplierInfoEdit-remarks"
-          :maxLength="500"
-          v-model="form.remarks"
-          placeholder="请输入主营内容(最多500个字符)"
-          allowClear />
-      </a-form-model-item>
-      <a-form-model-item label="状态" prop="state">
-        <a-radio-group
-          name="radioGroup"
-          v-model="form.state"
-          id="supplierInfoEdit-state" >
-          <a-radio :value="1">启用</a-radio>
-          <a-radio :value="0">禁用</a-radio>
-        </a-radio-group>
-      </a-form-model-item>
-      <a-form-model-item :wrapper-col="{ span: 12, offset: 6 }" style="text-align: center;">
-        <a-button type="primary" @click="handleSubmit" id="supplierInfoEdit-btn-submit">保存</a-button>
-        <a-button @click="goBack" style="margin-left: 15px" id="supplierInfoEdit-btn-back">返回列表</a-button>
-      </a-form-model-item>
-    </a-form-model>
-  </a-card>
+  <div class="supplierInfoEdit-wrap">
+    <a-page-header :ghost="false" @back="handleBack" class="supplierInfoEdit-cont">
+      <template slot="subTitle">
+        <a href="javascript:;" @click="handleBack">返回列表</a>
+      </template>
+    </a-page-header>
+    <a-card size="small" :bordered="false" class="supplierInfoEdit-table-page-wrapper">
+      <a-form-model
+        id="supplierInfoEdit-form"
+        ref="ruleForm"
+        :model="form"
+        :rules="rules"
+        :label-col="formItemLayout.labelCol"
+        :wrapper-col="formItemLayout.wrapperCol"
+      >
+        <a-form-model-item label="供应商名称" prop="name">
+          <a-input
+            id="supplierInfoEdit-name"
+            :maxLength="30"
+            v-model="form.name"
+            placeholder="请输入供应商名称(最多30个字符)"
+            allowClear />
+        </a-form-model-item>
+        <a-form-model-item label="所在地区" required style="margin: 0;">
+          <a-row :gutter="20">
+            <!-- 所在地区 -->
+            <a-col span="8">
+              <a-form-model-item prop="provinceCode">
+                <a-select id="supplierInfoEdit-provinceCode" @change="getCityList" v-model="form.provinceCode" placeholder="请选择省">
+                  <a-select-option v-for="item in addrProvinceList" :value="item.id" :key="item.id + 'a'">{{ item.name }}</a-select-option>
+                </a-select>
+              </a-form-model-item>
+            </a-col>
+            <a-col span="8">
+              <a-form-model-item prop="cityCode">
+                <a-select id="supplierInfoEdit-cityCode" @change="getAreaList" v-model="form.cityCode" placeholder="请选择市">
+                  <a-select-option v-for="item in addrCityList" :value="item.id" :key="item.id + 'b'">{{ item.name }}</a-select-option>
+                </a-select>
+              </a-form-model-item>
+            </a-col>
+            <a-col span="8">
+              <a-form-model-item prop="districtCode">
+                <a-select id="supplierInfoEdit-districtCode" @change="areaCharged" v-model="form.districtCode" placeholder="请选择区/县">
+                  <a-select-option v-for="item in addrDistrictList" :value="item.id" :key="item.id + 'c'">{{ item.name }}</a-select-option>
+                </a-select>
+              </a-form-model-item>
+            </a-col>
+          </a-row>
+        </a-form-model-item>
+        <a-form-model-item label="详细地址" prop="address">
+          <a-input
+            id="supplierInfoEdit-address"
+            :maxLength="60"
+            v-model="form.address"
+            placeholder="请输入详细地址(最多60个字符)"
+            allowClear />
+        </a-form-model-item>
+        <a-form-model-item label="联系人" prop="contactName">
+          <a-input
+            id="supplierInfoEdit-contactName"
+            :maxLength="30"
+            v-model="form.contactName"
+            placeholder="请输入联系人(最多30个字符)"
+            allowClear />
+        </a-form-model-item>
+        <a-form-model-item label="联系电话" prop="contactPhone">
+          <a-input
+            id="supplierInfoEdit-contactPhone"
+            :maxLength="20"
+            v-model="form.contactPhone"
+            placeholder="请输入联系电话(最多20个字符)"
+            allowClear />
+        </a-form-model-item>
+        <a-form-model-item label="主营内容" prop="remarks">
+          <a-textarea
+            id="supplierInfoEdit-remarks"
+            :maxLength="500"
+            v-model="form.remarks"
+            placeholder="请输入主营内容(最多500个字符)"
+            allowClear />
+        </a-form-model-item>
+        <a-form-model-item label="状态" prop="state">
+          <a-radio-group
+            name="radioGroup"
+            v-model="form.state"
+            id="supplierInfoEdit-state" >
+            <a-radio :value="1">启用</a-radio>
+            <a-radio :value="0">禁用</a-radio>
+          </a-radio-group>
+        </a-form-model-item>
+      </a-form-model>
+    </a-card>
+    <a-affix :offset-bottom="0">
+      <div style="text-align: center;width: 100%;background-color: #fff;padding: 30px 0;box-shadow: 0 0 20px #dcdee2;">
+        <a-button type="primary" id="supplierInfoEdit-btn-submit" size="large" @click="handleSubmit" style="padding: 0 60px;">保存</a-button>
+      </div>
+    </a-affix>
+  </div>
 </template>
 
 <script>
 import { STable, VSelect } from '@/components'
-import { getProvince, getCityByPro, getDistrictByCity } from '@/api/data'
+import { getArea } from '@/api/data'
 export default {
-  name: 'supplierInfoEdit',
+  name: 'SupplierInfoEdit',
   components: { STable, VSelect },
   data () {
     return {
@@ -112,10 +120,10 @@ export default {
         districtCode: undefined, // 区
         districtName: '',
         address: '', //  详细地址
-        contactName: '',  //  联系人
-        contactPhone: '',  //  联系电话
-        remarks: '',  //  主营内容
-        state: 0  //  启禁用
+        contactName: '', //  联系人
+        contactPhone: '', //  联系电话
+        remarks: '', //  主营内容
+        state: 0 //  启禁用
       },
       rules: {
         name: [
@@ -166,7 +174,7 @@ export default {
           const form = values.form
           form.desc = _this.form.desc
           form.id = this.$route.params.id ? this.$route.params.id : null
-          console.log(form,'-----提交信息')
+          console.log(form, '-----提交信息')
           // goodsSave(form).then(res => {
           //   if (res.status == 200) {
           //     _this.$message.success(res.message)
@@ -182,19 +190,9 @@ export default {
       })
     },
     //  返回
-    goBack () {
+    handleBack () {
       this.$router.push({ path: '/supplierManagement/supplierInfo/list' })
     },
-    // 获取省列表'
-    getProvinceList () {
-      getProvince().then(res => {
-        if (res.status == 200) {
-          this.addrProvinceList = res.data || []
-        } else {
-          this.addrProvinceList = []
-        }
-      })
-    },
     // 获取城市列表
     getCityList (val) {
       this.addrCityList = []
@@ -202,45 +200,51 @@ export default {
       this.form.cityCode = undefined
       this.form.districtCode = undefined
       this.form.address = ''
-      this.getCityListRequest(val)
-    },
-    getCityListRequest (val) {
-      getCityByPro({
-        id: val
-      }).then(res => {
-        if (res.status == 200) {
-          this.addrCityList = res.data || []
-        } else {
-          this.addrCityList = []
-        }
-      })
+      this.getArea('city', val)
     },
     // 获取区县列表
     getAreaList (val) {
       this.addrDistrictList = []
       this.form.districtCode = undefined
       this.form.address = ''
-      this.getAreaListRequest(val)
+      this.getArea('district', val)
+    },
+    // 区县变更
+    areaCharged (val) {
+      this.form.address = ''
     },
-    getAreaListRequest (val) {
-      getDistrictByCity({
-        id: val
-      }).then(res => {
+    //  省/市/区
+    getArea (type, sn) {
+      let params
+      if (type == 'province') {
+        params = { level: '1' }
+      } else {
+        params = { psn: sn }
+      }
+      getArea(params).then(res => {
         if (res.status == 200) {
-          this.addrDistrictList = res.data || []
+          if (type == 'province') {
+            this.addrProvinceList = res.data || []
+          } else if (type == 'city') {
+            this.addrCityList = res.data || []
+          } else if (type == 'district') {
+            this.addrDistrictList = res.data || []
+          }
         } else {
-          this.addrDistrictList = []
+          if (type == 'province') {
+            this.addrProvinceList = []
+          } else if (type == 'city') {
+            this.addrCityList = []
+          } else if (type == 'district') {
+            this.addrDistrictList = []
+          }
         }
       })
-    },
-    // 区县变更
-    areaCharged (val) {
-      this.form.address = ''
     }
   },
   beforeRouteEnter (to, from, next) {
     next(vm => {
-      vm.getProvinceList()
+      vm.getArea('province')
       vm.$refs.ruleForm.resetFields()
       if (vm.$route.params.id) { //  编辑页
         vm.getGoodsDetail()
@@ -250,4 +254,13 @@ export default {
 }
 </script>
 
-<style lang="less"></style>
+<style lang="less">
+  .supplierInfoEdit-wrap{
+    .supplierInfoEdit-cont{
+      margin-bottom: 15px;
+    }
+    .supplierInfoEdit-table-page-wrapper{
+      padding-top: 20px;
+    }
+  }
+</style>

+ 20 - 29
src/views/supplierManagement/supplierInfo/list.vue

@@ -34,14 +34,15 @@
       :columns="columns"
       :data="loadData"
       :customRow="handleClickRow"
+      :scroll="{ x: 1260 }"
       bordered>
       <!-- 状态 -->
       <template slot="state" slot-scope="text, record">
-        <span>{{record.state == 1 ? '已启用' : '已禁用'}}</span>
+        <a-tag :color="record.state==1?'green':'red'" >{{ record.state==1? '已启用': '已禁用' }}</a-tag>
       </template>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
-        <a-button size="small" type="primary" @click="handleEdit(record)" id="supplierInfoList-edit-btn">编辑</a-button>
+        <a-button size="small" type="link" @click="handleEdit(record)" id="supplierInfoList-edit-btn">编辑</a-button>
       </template>
     </s-table>
   </a-card>
@@ -56,19 +57,19 @@ export default {
     return {
       queryParam: { //  查询条件
         bundleName: '', //  供应商名称
-        state: undefined,  //  状态
+        state: undefined //  状态
       },
       disabled: false, //  查询、重置按钮是否可操作
       columns: [
-        { title: '序号', dataIndex: 'no', width: 70, align: 'center' },
-        { title: '供应商名称', dataIndex: 'productName', width: 200, align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
-        { title: '地址', dataIndex: 'productOldNum', width: 160, align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
-        { title: '联系人', dataIndex: 'productBrand', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '联系电话', dataIndex: 'productType', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '主营内容', dataIndex: 'inventoryNum', width: 180, align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
-        { title: '创建时间', dataIndex: 'inventoryMoney', width: 180, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '状态', scopedSlots: { customRender: 'state' }, width: 180, align: 'center' },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: 240, align: 'center' }
+        { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
+        { title: '供应商名称', dataIndex: 'productName', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '地址', dataIndex: 'productOldNum', width: 200, align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
+        { title: '联系人', dataIndex: 'productBrand', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '联系电话', dataIndex: 'productType', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '主营内容', dataIndex: 'inventoryNum', width: 200, align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
+        { title: '创建时间', dataIndex: 'inventoryMoney', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '状态', scopedSlots: { customRender: 'state' }, width: 100, align: 'center' },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: 100, align: 'center', fixed: 'right' }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
@@ -83,7 +84,7 @@ export default {
         //   return data
         // })
         const _this = this
-        return new Promise(function(resolve, reject){
+        return new Promise(function (resolve, reject) {
           const data = {
             pageNo: 1,
             pageSize: 10,
@@ -98,11 +99,11 @@ export default {
           _this.disabled = false
           resolve(data)
         })
-      },
+      }
     }
   },
   methods: {
-    handleClickRow(record){
+    handleClickRow (record) {
       return {
         on: {
           dblclick: (event) => {
@@ -122,23 +123,13 @@ export default {
       this.$refs.table.refresh(true)
     },
     //  新增/编辑
-    handleEdit(row){
-      if(row){  //  编辑
+    handleEdit (row) {
+      if (row) { //  编辑
         this.$router.push({ path: `/supplierManagement/supplierInfo/edit/${row.id}` })
-      }else{  //  新增
+      } else { //  新增
         this.$router.push({ path: '/supplierManagement/supplierInfo/add' })
       }
-    },
+    }
   }
 }
 </script>
-
-<style lang="less">
-  .supplierInfoList-wrap{
-    .sTable{
-      table{
-        width: auto;
-      }
-    }
-  }
-</style>