chenrui пре 4 година
родитељ
комит
5ad60ba37f
23 измењених фајлова са 271 додато и 65 уклоњено
  1. 37 1
      src/config/router.config.js
  2. 1 1
      src/views/basicData/customerTypeManagement/list.vue
  3. 1 1
      src/views/basicData/supplierManagement/list.vue
  4. 2 2
      src/views/bulkManagement/bulkWarehousingOrder/edit.vue
  5. 4 4
      src/views/bulkManagement/bulkWarehousingOrder/list.vue
  6. 4 4
      src/views/chainAllocation/chainTransferIn/list.vue
  7. 1 1
      src/views/chainAllocation/chainTransferOut/detail.vue
  8. 5 5
      src/views/chainAllocation/chainTransferOut/list.vue
  9. 158 0
      src/views/inventoryManagement/inventoryChecking/list.vue
  10. 8 0
      src/views/inventoryManagement/inventoryChecking/unCheckingModal.vue
  11. 2 2
      src/views/inventoryManagement/inventoryQuery/list.vue
  12. 3 3
      src/views/inventoryManagement/inventoryWarning/list.vue
  13. 2 2
      src/views/inventoryManagement/satelliteWarehouseInventory/list.vue
  14. 2 3
      src/views/inventoryManagement/warehouse/list.vue
  15. 2 2
      src/views/inventoryManagement/warehouse/storingLocation/list.vue
  16. 4 4
      src/views/inventoryManagement/warehouseAllocation/list.vue
  17. 1 1
      src/views/productManagement/productBrand/list.vue
  18. 10 11
      src/views/productManagement/productInfo/list.vue
  19. 2 2
      src/views/purchasingManagement/purchaseOrder/edit.vue
  20. 5 5
      src/views/purchasingManagement/purchaseOrder/list.vue
  21. 3 3
      src/views/salesManagement/customerManagement/list.vue
  22. 13 7
      src/views/salesManagement/urgentItemsOffset/detail.vue
  23. 1 1
      src/views/salesManagement/urgentItemsOffset/list.vue

+ 37 - 1
src/config/router.config.js

@@ -455,7 +455,43 @@ export const asyncRouterMap = [{
             }
           }
         ]
-      }
+      },
+      {
+        path: '/inventoryManagement/inventoryChecking',
+        redirect: '/inventoryManagement/inventoryChecking/list',
+        name: 'inventoryChecking',
+        component: RouteView,
+        meta: {
+          title: '库存盘点',
+          icon: 'monitor'
+          // permission: 'M_goodsManage_list'
+        },
+        hideChildrenInMenu: true,
+        children: [
+          {
+            path: '/inventoryManagement/inventoryChecking/list',
+            name: 'inventoryCheckingList',
+            component: () => import(/* webpackChunkName: "shop" */ '@/views/inventoryManagement/inventoryChecking/list.vue'),
+            meta: {
+              title: '库存盘点列表',
+              icon: 'monitor',
+              hidden: true
+              // permission: 'M_goodsManage_list'
+            }
+          },
+          // {
+          //   path: '/inventoryManagement/inventoryQuery/warehouseDetail/:id',
+          //   name: 'inventoryQueryWarehouseDetail',
+          //   component: () => import(/* webpackChunkName: "shop" */ '@/views/inventoryManagement/inventoryQuery/warehouseDetail.vue'),
+          //   meta: {
+          //     title: '盘点人盘点',
+          //     icon: 'monitor',
+          //     hidden: true
+          //     // permission: 'B_goodsManage_edit'
+          //   }
+          // }
+        ]
+      },
     ]
   },
   {

+ 1 - 1
src/views/basicData/customerTypeManagement/list.vue

@@ -32,7 +32,7 @@
       bordered>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
-        <a-button type="primary" @click="handleEdit(record)" id="customerTypeList-edit-btn">编辑</a-button>
+        <a-button size="small" type="primary" @click="handleEdit(record)" id="customerTypeList-edit-btn">编辑</a-button>
       </template>
     </s-table>
     <!-- 新增/编辑客户类型 -->

+ 1 - 1
src/views/basicData/supplierManagement/list.vue

@@ -40,7 +40,7 @@
       </template>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
-        <a-button type="primary" @click="handleEdit(record)" id="supplierManagementList-edit-btn">编辑</a-button>
+        <a-button size="small" type="primary" @click="handleEdit(record)" id="supplierManagementList-edit-btn">编辑</a-button>
       </template>
     </s-table>
   </a-card>

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

@@ -117,7 +117,7 @@
               </template>
               <!-- 操作 -->
               <template slot="action" slot-scope="text, record">
-                <a-button type="primary" @click="handleAdd(record)" id="bulkWarehousingOrderEdit-add-btn">添加</a-button>
+                <a-button size="small" type="primary" @click="handleAdd(record)" id="bulkWarehousingOrderEdit-add-btn">添加</a-button>
               </template>
             </s-table>
           </div>
@@ -181,7 +181,7 @@
               </template>
               <!-- 操作 -->
               <template slot="action" slot-scope="text, record">
-                <a-button type="primary" @click="handleDel(record)" id="bulkWarehousingOrderEdit-del-btn">删除</a-button>
+                <a-button size="small" type="primary" @click="handleDel(record)" id="bulkWarehousingOrderEdit-del-btn">删除</a-button>
               </template>
             </s-table>
           </div>

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

@@ -86,10 +86,10 @@
       </template>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
-        <a-button type="primary" @click="handleEdit(record)" id="bulkWarehousingOrderList-edit-btn">编辑</a-button>
-        <a-button type="dashed" @click="handleDetail(record)" id="bulkWarehousingOrderList-detail-btn" style="margin: 0 0 8px 8px">详情</a-button>
-        <a-button type="primary" @click="handleWarehouse(record)" id="bulkWarehousingOrderList-warehouse-btn" style="margin: 0 0 8px 8px">入库</a-button>
-        <a-button type="danger" @click="handleDel(record)" id="bulkWarehousingOrderList-del-btn" style="margin: 0 0 0 8px">删除</a-button>
+        <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>
       </template>
     </s-table>
     <!-- 选择基本信息弹框 -->

+ 4 - 4
src/views/chainAllocation/chainTransferIn/list.vue

@@ -81,10 +81,10 @@
       </template>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
-        <a-button type="primary" @click="handleWarehousing(record)" id="chainTransferInList-warehousing-btn">入库</a-button>
-        <a-button @click="handleExamine(record)" id="chainTransferInList-examine-btn" style="margin: 0 0 8px 8px;">审核</a-button>
-        <a-button type="primary" @click="handleEdit(record)" id="chainTransferInList-edit-btn" style="margin: 0 0 8px 8px;">编辑</a-button>
-        <a-button @click="handleDetail(record)" id="chainTransferInList-detail-btn" style="margin: 0 0 0 8px;">详情</a-button>
+        <a-button size="small" type="primary" @click="handleWarehousing(record)" id="chainTransferInList-warehousing-btn">入库</a-button>
+        <a-button size="small" @click="handleExamine(record)" id="chainTransferInList-examine-btn" style="margin: 0 0 10px 8px;">审核</a-button>
+        <a-button size="small" type="primary" @click="handleEdit(record)" id="chainTransferInList-edit-btn" style="margin: 0 0 0 8px;">编辑</a-button>
+        <a-button size="small" @click="handleDetail(record)" id="chainTransferInList-detail-btn" style="margin: 0 0 0 8px;">详情</a-button>
       </template>
     </s-table>
     <!-- 新增/编辑产品品牌 -->

+ 1 - 1
src/views/chainAllocation/chainTransferOut/detail.vue

@@ -101,7 +101,7 @@
       handleSubmit(){},
       //  返回列表
       handleBack(){
-        this.$router.push({ path: '/inventoryManagement/chainTransferOut/list'})
+        this.$router.push({ path: '/chainAllocation/chainTransferOut/list'})
       },
     }
   }

+ 5 - 5
src/views/chainAllocation/chainTransferOut/list.vue

@@ -81,11 +81,11 @@
       </template>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
-        <a-button type="primary" @click="handleExamine(record)" id="chainTransferOutList-examine-btn">审核</a-button>
-        <a-button @click="handleEdit(record)" id="chainTransferOutList-edit-btn" style="margin: 0 0 8px 8px;">编辑</a-button>
-        <a-button type="primary" @click="handleOut(record)" id="chainTransferOutList-out-btn" style="margin: 0 0 8px 8px;">出库</a-button>
-        <a-button type="primary" @click="handleDetail(record)" id="chainTransferOutList-detail-btn" style="margin: 0 0 8px 8px;">详情</a-button>
-        <a-button type="danger" @click="handleDel(record)" id="chainTransferOutList-del-btn" style="margin: 0 0 0 8px;">删除</a-button>
+        <a-button size="small" type="primary" @click="handleExamine(record)" id="chainTransferOutList-examine-btn">审核</a-button>
+        <a-button size="small" @click="handleEdit(record)" id="chainTransferOutList-edit-btn" style="margin: 0 0 10px 8px;">编辑</a-button>
+        <a-button size="small" type="primary" @click="handleOut(record)" id="chainTransferOutList-out-btn" style="margin: 0 0 10px 8px;">出库</a-button>
+        <a-button size="small" type="primary" @click="handleDetail(record)" id="chainTransferOutList-detail-btn" style="margin: 0 0 0 8px;">详情</a-button>
+        <a-button size="small" type="danger" @click="handleDel(record)" id="chainTransferOutList-del-btn" style="margin: 0 0 0 8px;">删除</a-button>
       </template>
     </s-table>
     <!-- 新增/编辑 -->

+ 158 - 0
src/views/inventoryManagement/inventoryChecking/list.vue

@@ -0,0 +1,158 @@
+<template>
+  <a-card :bordered="false" class="inventoryCheckingList-wrap">
+    <!-- 搜索条件 -->
+    <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-range-picker
+                style="width:100%"
+                id="inventoryCheckingList-creatTime"
+                :disabledDate="disabledDate"
+                @change="creatTimechange"
+                :format="dateFormat"
+                :placeholder="['开始时间', '结束时间']" />
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="24">
+            <a-form-item label="状态">
+              <v-select code="ENABLED_FLAG" id="inventoryCheckingList-enabledFlag" v-model="queryParam.enabledFlag" allowClear placeholder="请选择状态"></v-select>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="24">
+            <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="inventoryCheckingList-refresh">查询</a-button>
+            <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="inventoryCheckingList-reset">重置</a-button>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 操作按钮 -->
+    <div class="table-operator">
+      <a-button id="inventoryCheckingList-add" type="primary" @click="handleEdit()">新增盘点单</a-button>
+    </div>
+    <!-- 列表 -->
+    <s-table
+      class="sTable"
+      ref="table"
+      size="default"
+      :rowKey="(record) => record.id"
+      :columns="columns"
+      :data="loadData"
+      :showPagination="false"
+      bordered>
+      <!-- 操作 -->
+      <template slot="action" slot-scope="text, record">
+        <a-button size="small" type="primary" @click="handleEdit(record)" id="inventoryCheckingList-edit-btn">审核</a-button>
+        <a-button size="small" type="primary" @click="handleDel(record)" id="inventoryCheckingList-del-btn" style="margin: 0 0 10px 8px">盘点</a-button>
+        <a-button size="small" type="primary" @click="handleDel(record)" id="inventoryCheckingList-del-btn" style="margin: 0 0 10px 8px">监盘审核</a-button>
+        <a-button size="small" type="primary" @click="handleDel(record)" id="inventoryCheckingList-del-btn" style="margin: 0 0 10px 8px">编辑</a-button>
+        <a-button size="small" @click="handleDel(record)" id="inventoryCheckingList-del-btn" style="margin: 0 0 0 8px">详情</a-button>
+        <a-button size="small" type="danger" @click="handleDel(record)" id="inventoryCheckingList-del-btn" style="margin: 0 0 0 8px">删除</a-button>
+      </template>
+    </s-table>
+    <!-- 新增/编辑仓库 -->
+    <inventory-unChecking-modal :openModal="openModal" :nowData="nowData" :itemId="itemId" @ok="handleOk" @close="closeModal" />
+  </a-card>
+</template>
+
+<script>
+import { warehouseFindAll, warehouseDel } from '@/api/warehouse'
+import { STable, VSelect } from '@/components'
+import inventoryUnCheckingModal from './unCheckingModal.vue'
+export default {
+  components: { STable, VSelect, inventoryUnCheckingModal },
+  data () {
+    return {
+      queryParam: { //  查询条件
+        enabledFlag: undefined,  //  状态
+        beginDate: '',  //  创建时间  开始时间
+        endDate: '',  //  创建时间  结束时间
+      },
+      disabled: false, //  查询、重置按钮是否可操作
+      dateFormat: 'YYYY-MM-DD',
+      columns: [
+        { title: '序号', dataIndex: 'no', width: 70, align: 'center' },
+        { title: '创建时间', dataIndex: 'createDate', width: 180, align: 'center' },
+        { title: '盘点单号', dataIndex: 'nsso', width: 70, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '库存总款数', dataIndex: 'no', width: 70, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '库存总数量', dataIndex: 'no', width: 70, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '开单人', dataIndex: 'no', width: 70, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '单据审核时间', dataIndex: 'shcreateDate', width: 180, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '状态', dataIndex: 'name', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '盘点类型', dataIndex: 'sort', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: 240, align: 'center' }
+      ],
+      // 加载数据方法 必须为 Promise 对象
+      loadData: parameter => {
+        this.disabled = true
+        return warehouseFindAll( this.queryParam ).then(res => {
+          const data = res.data
+          this.disabled = false
+          return data
+        })
+      },
+      openModal: false,  //  新增编辑  弹框
+      itemId: '',  //  当前id
+      nowData: null  //  当前记录数据
+    }
+  },
+  methods: {
+    // 不可选日期
+    disabledDate (date, dateStrings) {
+      return date && date.valueOf() > Date.now()
+    },
+    //  创建时间  change
+    creatTimechange(dates, dateStrings){
+      this.queryParam.beginDate = dateStrings[0]
+      this.queryParam.endDate = dateStrings[1]
+    },
+    //  重置
+    resetSearchForm () {
+      this.queryParam.name = ''
+      this.$refs.table.refresh(true)
+    },
+    //  新增/编辑
+    handleEdit(row){
+      this.itemId = row ? row.id : null
+      this.nowData = row ? row : null
+      this.openModal = true
+    },
+    //  新增/编辑  成功
+    handleOk(){
+      this.$refs.table.refresh(true)
+    },
+    //  关闭弹框
+    closeModal(){
+      this.itemId = ''
+      this.openModal = false
+    },
+    //  删除
+    handleDel(row){
+      const _this = this
+      this.$confirm({
+        title: '提示',
+        content: '删除后不可恢复,确定要进行删除吗?',
+        okText: '确定',
+        cancelText: '取消',
+        onOk () {
+          // warehouseDel({
+          //   id: row.id
+          // }).then(res => {
+          //   if (res.status == 200) {
+          //     _this.$message.success(res.message)
+          //     _this.$refs.table.refresh()
+          //   }
+          // })
+        }
+      })
+    },
+    //  查看仓位
+    goStoringLocation(row){
+      this.$router.push({ path: `/inventoryManagement/storingLocation/${row.id}`, query: { name: row.name } })
+    }
+  }
+}
+</script>
+
+<style lang="less"></style>

+ 8 - 0
src/views/inventoryManagement/inventoryChecking/unCheckingModal.vue

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

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

@@ -65,8 +65,8 @@
       bordered>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
-        <a-button type="primary" @click="goDetail(record)" id="inventoryQueryList-detail-btn" style="margin: 0 0 8px 0;">库存详情</a-button>
-        <a-button style="margin-left: 8px" @click="goWarehouseDetail(record)" id="inventoryQueryList-warehouseDetail-btn">出入库明细</a-button>
+        <a-button size="small" type="primary" @click="goDetail(record)" id="inventoryQueryList-detail-btn" style="margin: 0 0 8px 0;">库存详情</a-button>
+        <a-button size="small" style="margin-left: 8px" @click="goWarehouseDetail(record)" id="inventoryQueryList-warehouseDetail-btn">出入库明细</a-button>
       </template>
     </s-table>
     <!-- 库存详情 -->

+ 3 - 3
src/views/inventoryManagement/inventoryWarning/list.vue

@@ -129,13 +129,13 @@
       <template slot="action" slot-scope="text, record">
         <div class="editable-row-operations">
           <span v-if="record.editable">
-            <a-button type="primary" @click="() => save(record.id, record.onWayNum, record.maxInventory, record.minInventory)" style="margin-right: 10px;">保存</a-button>
+            <a-button size="small" type="primary" @click="() => save(record.id, record.onWayNum, record.maxInventory, record.minInventory)" style="margin-right: 10px;">保存</a-button>
             <a-popconfirm title="确定要取消吗" @confirm="() => cancel(record.id)">
-              <a-button>取消</a-button>
+              <a-button size="small">取消</a-button>
             </a-popconfirm>
           </span>
           <span v-else>
-            <a-button type="primary" :disabled="editingId !== ''" @click="() => edit(record.id)">编辑</a-button type="primary">
+            <a-button size="small" type="primary" :disabled="editingId !== ''" @click="() => edit(record.id)">编辑</a-button type="primary">
           </span>
         </div>
       </template>

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

@@ -55,8 +55,8 @@
 		<s-table class="sTable" ref="table" size="default" :rowKey="record => record.id" :columns="columns" :data="loadData" bordered>
 			<!-- 操作 -->
 			<template slot="action" slot-scope="text, record">
-        <a-button type="danger" v-if="checkedList.indexOf(record.id) != -1" @click="handleRemove(record)" id="satelliteWarehouseInventoryList-remove-btn">移出补货清单</a-button>
-				<a-button type="primary" v-else @click="handleAdd(record)" id="satelliteWarehouseInventoryList-add-btn">加入补货单</a-button>
+        <a-button size="small" type="danger" v-if="checkedList.indexOf(record.id) != -1" @click="handleRemove(record)" id="satelliteWarehouseInventoryList-remove-btn">移出补货清单</a-button>
+				<a-button size="small" type="primary" v-else @click="handleAdd(record)" id="satelliteWarehouseInventoryList-add-btn">加入补货单</a-button>
       </template>
 		</s-table>
 		<!-- 客户详情 -->

+ 2 - 3
src/views/inventoryManagement/warehouse/list.vue

@@ -36,8 +36,8 @@
       </template>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
-        <a-button type="primary" @click="handleEdit(record)" id="warehouseList-edit-btn">编辑</a-button>
-        <a-button type="danger" @click="handleDel(record)" id="warehouseList-del-btn" style="margin-left: 15px;">删除</a-button>
+        <a-button size="small" type="primary" @click="handleEdit(record)" id="warehouseList-edit-btn">编辑</a-button>
+        <a-button size="small" type="danger" @click="handleDel(record)" id="warehouseList-del-btn" style="margin-left: 15px;">删除</a-button>
       </template>
     </s-table>
     <!-- 新增/编辑仓库 -->
@@ -46,7 +46,6 @@
 </template>
 
 <script>
-import moment from 'moment'
 import { warehouseFindAll, warehouseDel } from '@/api/warehouse'
 import { STable } from '@/components'
 import warehouseEditModal from './editModal.vue'

+ 2 - 2
src/views/inventoryManagement/warehouse/storingLocation/list.vue

@@ -40,8 +40,8 @@
         bordered>
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">
-          <a-button type="primary" @click="handleEdit(record)" id="storingLocationList-edit-btn">编辑</a-button>
-          <a-button type="danger" @click="handleDel(record)" id="storingLocationList-del-btn" style="margin-left: 15px;">删除</a-button>
+          <a-button size="small" type="primary" @click="handleEdit(record)" id="storingLocationList-edit-btn">编辑</a-button>
+          <a-button size="small" type="danger" @click="handleDel(record)" id="storingLocationList-del-btn" style="margin-left: 15px;">删除</a-button>
         </template>
       </s-table>
     </a-card>

+ 4 - 4
src/views/inventoryManagement/warehouseAllocation/list.vue

@@ -81,10 +81,10 @@
       </template>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
-        <a-button type="primary" @click="handleExamine(record)" id="warehouseAllocationList-examine-btn">审核</a-button>
-        <a-button @click="handleEdit(record)" id="warehouseAllocationList-edit-btn" style="margin: 0 0 8px 8px;">编辑</a-button>
-        <a-button type="primary" @click="handleDetail(record)" id="warehouseAllocationList-detail-btn" style="margin: 0 0 8px 8px;">详情</a-button>
-        <a-button type="danger" @click="handleDel(record)" id="warehouseAllocationList-del-btn" style="margin: 0 0 0 8px;">删除</a-button>
+        <a-button size="small" type="primary" @click="handleExamine(record)" id="warehouseAllocationList-examine-btn">审核</a-button>
+        <a-button size="small" @click="handleEdit(record)" id="warehouseAllocationList-edit-btn" style="margin: 0 0 0 8px;">编辑</a-button>
+        <a-button size="small" type="primary" @click="handleDetail(record)" id="warehouseAllocationList-detail-btn" style="margin: 0 0 0 8px;">详情</a-button>
+        <a-button size="small" type="danger" @click="handleDel(record)" id="warehouseAllocationList-del-btn" style="margin: 0 0 0 8px;">删除</a-button>
       </template>
     </s-table>
     <!-- 新增/编辑 -->

+ 1 - 1
src/views/productManagement/productBrand/list.vue

@@ -47,7 +47,7 @@
       </template>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
-        <a-button type="primary" @click="handleEdit(record)" id="productBrandList-edit-btn">编辑</a-button>
+        <a-button size="small" type="primary" @click="handleEdit(record)" id="productBrandList-edit-btn">编辑</a-button>
       </template>
     </s-table>
     <!-- 新增/编辑产品品牌 -->

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

@@ -38,16 +38,15 @@
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-            <a-form-item label="创建时间">
-              <a-range-picker
-                style="width:100%"
-                id="customerManagementList-creatTime"
-                :disabledDate="disabledDate"
-                @change="creatTimechange"
-                :format="dateFormat"
-                :placeholder="['开始时间', '结束时间']" />
+              <a-form-item label="创建时间">
+                <a-range-picker
+                  style="width:100%"
+                  id="customerManagementList-creatTime"
+                  :disabledDate="disabledDate"
+                  @change="creatTimechange"
+                  :format="dateFormat"
+                  :placeholder="['开始时间', '结束时间']" />
               </a-form-item>
-            </a-form-item>
             </a-col>
           </template>
           <a-col :md="6" :sm="24">
@@ -106,8 +105,8 @@
       </template>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
-        <a-button type="primary" @click="handleEdit(record)" id="productInfoList-edit-btn">编辑</a-button>
-        <a-button @click="handleDetail(record)" id="productInfoList-detail-btn" style="margin-left: 15px;">详情</a-button>
+        <a-button size="small" type="primary" @click="handleEdit(record)" id="productInfoList-edit-btn">编辑</a-button>
+        <a-button size="small" @click="handleDetail(record)" id="productInfoList-detail-btn" style="margin-left: 15px;">详情</a-button>
       </template>
     </s-table>
     <!-- 产品详情 -->

+ 2 - 2
src/views/purchasingManagement/purchaseOrder/edit.vue

@@ -89,7 +89,7 @@
               </template>
               <!-- 操作 -->
               <template slot="action" slot-scope="text, record">
-                <a-button type="primary" @click="handleAdd(record)" id="purchaseOrderEdit-add-btn">添加</a-button>
+                <a-button size="small" type="primary" @click="handleAdd(record)" id="purchaseOrderEdit-add-btn">添加</a-button>
               </template>
             </s-table>
           </div>
@@ -131,7 +131,7 @@
               </template>
               <!-- 操作 -->
               <template slot="action" slot-scope="text, record">
-                <a-button type="primary" @click="handleDel(record)" id="purchaseOrderEdit-del-btn">删除</a-button>
+                <a-button size="small" type="primary" @click="handleDel(record)" id="purchaseOrderEdit-del-btn">删除</a-button>
               </template>
             </s-table>
           </div>

+ 5 - 5
src/views/purchasingManagement/purchaseOrder/list.vue

@@ -85,11 +85,11 @@
       </template>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
-        <a-button type="primary" @click="handleEdit(record)" id="purchasingManagement-edit-btn">编辑</a-button>
-        <a-button type="dashed" @click="handleDetail(record)" id="purchasingManagement-detail-btn" style="margin: 0 0 8px 8px">详情</a-button>
-        <a-button @click="handleSubmit(record)" id="purchasingManagement-submit-btn" style="margin: 0 0 8px 8px">提交</a-button>
-        <a-button type="primary" @click="handleWarehouse(record)" id="purchasingManagement-warehouse-btn" style="margin: 0 0 8px 8px">签收入库</a-button>
-        <a-button type="danger" @click="handleDel(record)" id="purchasingManagement-del-btn" style="margin: 0 0 0 8px">删除</a-button>
+        <a-button size="small" type="primary" @click="handleEdit(record)" id="purchasingManagement-edit-btn">编辑</a-button>
+        <a-button size="small" type="dashed" @click="handleDetail(record)" id="purchasingManagement-detail-btn" style="margin: 0 0 10px 8px">详情</a-button>
+        <a-button size="small" @click="handleSubmit(record)" id="purchasingManagement-submit-btn" style="margin: 0 0 10px 8px">提交</a-button>
+        <a-button size="small" type="primary" @click="handleWarehouse(record)" id="purchasingManagement-warehouse-btn" style="margin: 0 0 0 8px">签收入库</a-button>
+        <a-button size="small" type="danger" @click="handleDel(record)" id="purchasingManagement-del-btn" style="margin: 0 0 0 8px">删除</a-button>
       </template>
     </s-table>
     <!-- 选择基本信息弹框 -->

+ 3 - 3
src/views/salesManagement/customerManagement/list.vue

@@ -106,9 +106,9 @@
       </template>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
-        <a-button type="primary" @click="handleEdit(record)" id="customerManagementList-edit-btn">编辑</a-button>
-        <a-button @click="handleDetail(record)" id="customerManagementList-detail-btn" style="margin: 0 15px;">详情</a-button>
-        <a-button type="danger" @click="handleDel(record)" id="customerManagementList-del-btn">删除</a-button>
+        <a-button size="small" type="primary" @click="handleEdit(record)" id="customerManagementList-edit-btn">编辑</a-button>
+        <a-button size="small" @click="handleDetail(record)" id="customerManagementList-detail-btn" style="margin: 0 15px;">详情</a-button>
+        <a-button size="small" type="danger" @click="handleDel(record)" id="customerManagementList-del-btn">删除</a-button>
       </template>
     </s-table>
     <!-- 客户详情 -->

+ 13 - 7
src/views/salesManagement/urgentItemsOffset/detail.vue

@@ -1,12 +1,18 @@
 <template>
   <div class="urgentItemsOffsetDetail-page-wrapper">
     <!-- 操作 -->
-    <a-card :bordered="false" class="urgentItemsOffsetDetail-operation-wrapper">
-      <a-button @click="goBack" id="urgentItemsOffsetDetail-btn-back">返回列表</a-button>
-      <a-button type="primary" @click="handleSubmit" id="urgentItemsOffsetDetail-btn-submit" style="margin-left: 15px">冲减</a-button>
-      <a-button type="primary" size="small" @click="handlePrint" id="urgentItemsOffsetDetail-btn-print" style="margin-left: 30px">快速打印</a-button>
-      <a-button type="primary" size="small" @click="handlePreview" id="urgentItemsOffsetDetail-btn-preview" style="margin-left: 15px">打印预览</a-button>
-    </a-card>
+    <a-page-header :ghost="false" @back="handleBack" class="urgentItemsOffsetDetail-operation-wrapper">
+      <!-- 自定义的二级文字标题 -->
+      <template slot="subTitle">
+        <a id="urgentItemsOffsetDetail-btn-back" href="javascript:;" @click="handleBack">返回列表</a>
+      </template>
+      <!-- 操作区,位于 title 行的行尾 -->
+      <template slot="extra">
+        <a-button key="3" type="danger" @click="handleSubmit" id="urgentItemsOffsetDetail-btn-submit">冲减</a-button>
+        <a-button key="2" @click="handlePreview" id="urgentItemsOffsetDetail-btn-preview">打印预览</a-button>
+        <a-button key="1" type="primary" @click="handlePrint" id="urgentItemsOffsetDetail-btn-print">快速打印</a-button>
+      </template>
+    </a-page-header>
     <!-- 急件单信息 -->
     <a-card :bordered="false" class="urgentItemsOffsetDetail-info-wrapper">
       <a-descriptions :column="3">
@@ -105,7 +111,7 @@
     },
     methods: {
       //  返回
-      goBack(){
+      handleBack(){
         this.$router.push({ path: '/salesManagement/urgentItemsOffset/list' })
       },
       //  冲减

+ 1 - 1
src/views/salesManagement/urgentItemsOffset/list.vue

@@ -61,7 +61,7 @@
       </template>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
-        <a-button type="primary" @click="handleDetail(record)" id="urgentItemsOffsetList-detail-btn">详情</a-button>
+        <a-button size="small" type="primary" @click="handleDetail(record)" id="urgentItemsOffsetList-detail-btn">详情</a-button>
       </template>
     </s-table>
   </a-card>