chenrui 4 년 전
부모
커밋
37211b1635

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

@@ -390,6 +390,88 @@ export const asyncRouterMap = [{
     ]
   },
   // 散件管理
+  {
+    path: '/bulkManagement',
+    redirect: '/bulkManagement/purchaseOrder',
+    component: PageView,
+    meta: {
+      title: '散件管理',
+      icon: 'shop'
+      // permission: 'M_shop'
+    },
+    children: [
+      {
+        path: '/bulkManagement/bulkWarehousingOrder',
+        redirect: '/bulkManagement/bulkWarehousingOrder/list',
+        name: 'bulkWarehousingOrder',
+        component: RouteView,
+        meta: {
+          title: '散件入库',
+          icon: 'shopping'
+          // permission: 'M_goodsManage_list'
+        },
+        hideChildrenInMenu: true,
+        children: [
+          {
+            path: '/bulkManagement/bulkWarehousingOrder/list',
+            name: 'bulkWarehousingOrderList',
+            component: () => import(/* webpackChunkName: "shop" */ '@/views/bulkManagement/bulkWarehousingOrder/list.vue'),
+            meta: {
+              title: '散件入库单列表',
+              icon: 'shopping',
+              hidden: true
+              // permission: 'M_goodsManage_list'
+            }
+          },
+          {
+            path: '/bulkManagement/bulkWarehousingOrder/add',
+            name: 'bulkWarehousingOrderAdd',
+            component: () => import(/* webpackChunkName: "shop" */ '@/views/bulkManagement/bulkWarehousingOrder/edit.vue'),
+            meta: {
+              title: '新增散件入库单',
+              icon: 'shopping',
+              hidden: true
+              // permission: 'B_goodsManage_edit'
+            }
+          },
+          {
+            path: '/bulkManagement/bulkWarehousingOrder/edit/:id',
+            name: 'bulkWarehousingOrderEdit',
+            component: () => import(/* webpackChunkName: "shop" */ '@/views/bulkManagement/bulkWarehousingOrder/edit.vue'),
+            meta: {
+              title: '编辑散件入库单',
+              icon: 'shopping',
+              hidden: true
+              // permission: 'B_goodsManage_edit'
+            }
+          },
+          {
+            path: '/bulkManagement/bulkWarehousingOrder/detail/:id',
+            name: 'bulkWarehousingOrderDetail',
+            component: () => import(/* webpackChunkName: "shop" */ '@/views/bulkManagement/bulkWarehousingOrder/detail.vue'),
+            meta: {
+              title: '散件入库单详情',
+              icon: 'shopping',
+              hidden: true
+              // permission: 'B_goodsManage_edit'
+            }
+          },
+          {
+            path: '/bulkManagement/bulkWarehousingOrder/warehousing/:id',
+            name: 'bulkWarehousingOrderWarehousing',
+            component: () => import(/* webpackChunkName: "shop" */ '@/views/bulkManagement/bulkWarehousingOrder/warehousing.vue'),
+            meta: {
+              title: '入库',
+              icon: 'shopping',
+              hidden: true
+              // permission: 'B_goodsManage_edit'
+            }
+          }
+        ]
+      }
+  
+    ]
+  },
   // 产品管理
   {
     path: '/productManagement',

+ 109 - 0
src/views/bulkManagement/bulkWarehousingOrder/basicInfoModal.vue

@@ -0,0 +1,109 @@
+<template>
+  <a-modal
+    centered
+    class="bulkWarehousingOrder-basicInfo-modal"
+    :footer="null"
+    :maskClosable="false"
+    title="新建散件入库单"
+    v-model="isShow"
+    @cancle="isShow=false"
+    width="80%">
+    <a-form-model
+      id="bulkWarehousingOrder-basicInfo-form"
+      ref="ruleForm"
+      :model="form"
+      :rules="rules"
+      :label-col="formItemLayout.labelCol"
+      :wrapper-col="formItemLayout.wrapperCol" >
+      <a-form-model-item label="供应商" prop="state">
+        <a-select placeholder="请输入名称或拼音查询,如果没有请点击 '+' 新增" allowClear v-model="form.dataSourceNo" :showSearch="true" option-filter-prop="children" :filter-option="filterOption" style="width: 80%;">
+        	<a-select-option v-for="item in brandData" :key="item.salesChannelNo" :value="item.salesChannelNo">{{ item.salesChannelName }}</a-select-option>
+        </a-select>
+        <a-button icon="plus" size="small" id="bulkWarehousingOrder-basicInfo-add-btn" style="margin-left: 10px;"></a-button>
+      </a-form-model-item>
+      <a-form-model-item label="散件入库类型" prop="sort">
+        <v-select
+          v-model="form.billStatus"
+          ref="billStatus"
+          id="bulkWarehousingOrder-basicInfo-billStatus"
+          code="PAYMENT_TYPE"
+          placeholder="请选择散件入库类型"
+          allowClear
+          style="width: 80%;"></v-select>
+      </a-form-model-item>
+    </a-form-model>
+    <div class="btn-cont">
+      <a-button type="primary" id="bulkWarehousingOrder-basicInfo-modal-save" @click="handleSave">保存</a-button>
+      <a-button id="bulkWarehousingOrder-basicInfo-modal-back" @click="isShow = false" style="margin-left: 15px;">取消</a-button>
+    </div>
+  </a-modal>
+</template>
+
+<script>
+  import { VSelect } from '@/components'
+  export default{
+    name: 'BulkWarehousingOrderBasicInfoModal',
+    components: { VSelect },
+    props: {
+      openModal: { //  弹框显示状态
+        type: Boolean,
+        default: false
+      }
+    },
+    data(){
+      return{
+        isShow: this.openModal, //  是否打开弹框
+        formItemLayout: {
+          labelCol: { span: 6 },
+          wrapperCol: { span: 16 }
+        },
+        form: {
+          name: '', // 仓库名称
+          sort: '',  //  排序
+        },
+        rules: {
+          name: [
+            { required: true, message: '请输入仓库名称', trigger: 'blur' }
+          ],
+        },
+        brandData: [],  //  供应商  下拉数据
+      }
+    },
+    methods: {
+      //  保存
+      handleSave(){
+        this.isShow = false
+        this.$emit('ok')
+      },
+      filterOption(input, option) {
+      	return (
+      		option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+      	)
+      },
+    },
+    watch: {
+      //  父页面传过来的弹框状态
+      openModal (newValue, oldValue) {
+        this.isShow = newValue
+      },
+      //  重定义的弹框状态
+      isShow (newValue, oldValue) {
+        if (!newValue) {
+          this.$emit('close')
+        }
+      }
+    }
+  }
+</script>
+
+<style lang="less">
+  .bulkWarehousingOrder-basicInfo-modal{
+    .ant-modal-body {
+    	padding: 40px 40px 24px;
+    }
+    .btn-cont {
+    	text-align: center;
+    	margin: 35px 0 10px;
+    }
+  }
+</style>

+ 153 - 0
src/views/bulkManagement/bulkWarehousingOrder/detail.vue

@@ -0,0 +1,153 @@
+<template>
+  <div class="bulkWarehousingOrderDetail-wrap">
+    <a-page-header :ghost="false" @back="handleBack" >
+      <!-- 自定义的二级文字标题 -->
+      <template slot="subTitle">
+        <a id="bulkWarehousingOrderDetail-back-btn" href="javascript:;" @click="handleBack">返回列表</a>
+      </template>
+      <!-- 操作区,位于 title 行的行尾 -->
+      <template slot="extra">
+        <a-button key="2" id="bulkWarehousingOrderDetail-preview-btn">打印预览</a-button>
+        <a-button key="1" type="primary" id="bulkWarehousingOrderDetail-print-btn">快速打印</a-button>
+      </template>
+    </a-page-header>
+    <!-- 内容 -->
+    <a-page-header title="单号:CG2021010100001" >
+      <template slot="tags">
+        <a-tag color="blue">审核通过</a-tag>
+        <a-tag color="orange">未结算</a-tag>
+      </template>
+    </a-page-header>
+    <!-- 基础信息 -->
+    <a-card :bordered="false" class="bulkWarehousingOrderDetail-cont">
+      <a-collapse :activeKey="['1']">
+        <a-collapse-panel key="1" header="基础信息">
+          <a-descriptions :column="3">
+            <a-descriptions-item label="供应商">箭冠营销中心</a-descriptions-item>
+            <a-descriptions-item label="支付方式">箭冠营销中心</a-descriptions-item>
+            <a-descriptions-item label="采购员工">箭冠营销中心</a-descriptions-item>
+            <a-descriptions-item label="收货人">箭冠营销中心</a-descriptions-item>
+            <a-descriptions-item label="收货地址">箭冠营销中心</a-descriptions-item>
+          </a-descriptions>
+        </a-collapse-panel>
+      </a-collapse>
+    </a-card>
+    <!-- 产品详情 -->
+    <a-card :bordered="false" class="bulkWarehousingOrderDetail-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"
+            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-card>
+    <!-- 单据记录 -->
+    <a-card :bordered="false" class="bulkWarehousingOrderDetail-cont">
+      <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-collapse-panel>
+      </a-collapse>
+    </a-card>
+  </div>
+</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' },
+          { title: '产品名称', dataIndex: 'custName', align: 'center' },
+          { title: '原厂编码', dataIndex: 'totalP', align: 'center' },
+          { title: '采购单价', dataIndex: 'totalNums', align: 'center' },
+          { title: '采购数量', scopedSlots: { customRender: 'purchaseNum' }, align: 'center' },
+          { title: '缺货数量', scopedSlots: { customRender: 'outOfStockNum' }, align: 'center' },
+          { title: '单位', dataIndex: 'mementPay', align: 'center' },
+          { title: '采购金额', dataIndex: 'shDate', 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: '/bulkManagement/bulkWarehousingOrder/list'})
+      },
+    }
+  }
+</script>
+
+<style lang="less">
+  .bulkWarehousingOrderDetail-cont{
+    margin-bottom: 15px;
+    .timeline-box{
+      margin-top: 30px;
+      .auxiliary-txt{
+        color: #808695;
+      }
+    }
+  }
+</style>

+ 351 - 0
src/views/bulkManagement/bulkWarehousingOrder/edit.vue

@@ -0,0 +1,351 @@
+<template>
+  <div class="bulkWarehousingOrderEdit-wrap">
+    <!-- 内容 -->
+    <a-page-header title="单号:CG2021010100001" style="margin-top: -24px;" >
+      <!-- 操作区,位于 title 行的行尾 -->
+      <template slot="extra">
+        <a-button key="2" id="bulkWarehousingOrderEdit-preview-btn">打印预览</a-button>
+        <a-button key="1" type="primary" id="bulkWarehousingOrderEdit-print-btn">快速打印</a-button>
+      </template>
+    </a-page-header>
+    <!-- 基础信息 -->
+    <a-card :bordered="false" class="bulkWarehousingOrderEdit-cont">
+      <a-collapse :activeKey="['1']">
+        <a-collapse-panel key="1">
+          <template slot="header">
+            基础信息
+            <a-button type="primary" shape="circle" size="small" icon="edit" class="edit-circle-btn" id="bulkWarehousingOrderEdit-edit-circle-btn" @click.stop="handleEditInfo" />
+          </template>
+          <a-descriptions :column="3">
+            <a-descriptions-item label="供应商">箭冠营销中心</a-descriptions-item>
+            <a-descriptions-item label="类型">箭冠营销中心</a-descriptions-item>
+          </a-descriptions>
+        </a-collapse-panel>
+      </a-collapse>
+    </a-card>
+    <!-- 选择产品 -->
+    <a-card :bordered="false" class="bulkWarehousingOrderEdit-cont">
+      <a-collapse :activeKey="['1']">
+        <a-collapse-panel key="1">
+          <template slot="header">
+            选择产品<span class="sub-title">①输入查询条件--->②查找到需要入库的配件--->③录入成本价、数量、仓库、仓位--->④点击“添加”</span>
+          </template>
+          <!-- 选择产品 -->
+          <div>
+            <!-- 搜索条件 -->
+            <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="bulkWarehousingOrderEdit-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="bulkWarehousingOrderEdit-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="bulkWarehousingOrderEdit-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="bulkWarehousingOrderEdit-refresh">查询</a-button>
+                    <a-button style="margin: 0 0 18px 8px" @click="resetSearchForm" :disabled="disabled" id="bulkWarehousingOrderEdit-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="costPrice" slot-scope="text, record">
+                <a-input-number
+                  id="bulkWarehousingOrderEdit-costPrice"
+                  :value="record.costPrice"
+                  :precision="2"
+                  :min="0"
+                  :max="999999"
+                  placeholder="请输入" />
+              </template>
+              <!-- 数量 -->
+              <template slot="quantity" slot-scope="text, record">
+                <a-input-number
+                  id="bulkWarehousingOrderEdit-quantity"
+                  :value="record.quantity"
+                  :precision="0"
+                  :min="0"
+                  :max="999999"
+                  placeholder="请输入" />
+              </template>
+              <!-- 仓库 -->
+              <template slot="warehouse" slot-scope="text, record">
+                <a-select id="bulkWarehousingOrderEdit-warehouse" placeholder="请选择" allowClear v-model="record.warehouse">
+                	<a-select-option v-for="item in customeList" :key="item.salesChannelNo" :value="item.salesChannelNo">{{ item.salesChannelName }}</a-select-option>
+                </a-select>
+              </template>
+              <!-- 仓位 -->
+              <template slot="position" slot-scope="text, record">
+                <a-select id="bulkWarehousingOrderEdit-position" placeholder="请选择" allowClear v-model="record.position">
+                	<a-select-option v-for="item in customeList" :key="item.salesChannelNo" :value="item.salesChannelNo">{{ item.salesChannelName }}</a-select-option>
+                </a-select>
+              </template>
+              <!-- 操作 -->
+              <template slot="action" slot-scope="text, record">
+                <a-button type="primary" @click="handleAdd(record)" id="bulkWarehousingOrderEdit-add-btn">添加</a-button>
+              </template>
+            </s-table>
+          </div>
+        </a-collapse-panel>
+      </a-collapse>
+    </a-card>
+    <!-- 已选产品 -->
+    <a-card :bordered="false" class="bulkWarehousingOrderEdit-cont">
+      <a-collapse :activeKey="['1']">
+        <a-collapse-panel key="1">
+          <template slot="header">
+            已选产品
+            <a-button size="small" class="import-btn" id="bulkWarehousingOrderEdit-import-btn" @click.stop="handleImport">导入明细</a-button>
+          </template>
+          <!-- 已选产品 -->
+          <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="chooseColumns"
+              :data="chooseLoadData"
+              bordered>
+              <!-- 成本价 -->
+              <template slot="costPrice" slot-scope="text, record">
+                <a-input-number
+                  id="bulkWarehousingOrderEdit-costPrice"
+                  :value="record.costPrice"
+                  :precision="2"
+                  :min="0"
+                  :max="999999"
+                  placeholder="请输入" />
+              </template>
+              <!-- 数量 -->
+              <template slot="quantity" slot-scope="text, record">
+                <a-input-number
+                  id="bulkWarehousingOrderEdit-quantity"
+                  :value="record.quantity"
+                  :precision="0"
+                  :min="0"
+                  :max="999999"
+                  placeholder="请输入" />
+              </template>
+              <!-- 仓库 -->
+              <template slot="warehouse" slot-scope="text, record">
+                <a-select id="bulkWarehousingOrderEdit-warehouse" placeholder="请选择" allowClear v-model="record.warehouse">
+                	<a-select-option v-for="item in customeList" :key="item.salesChannelNo" :value="item.salesChannelNo">{{ item.salesChannelName }}</a-select-option>
+                </a-select>
+              </template>
+              <!-- 仓位 -->
+              <template slot="position" slot-scope="text, record">
+                <a-select id="bulkWarehousingOrderEdit-position" placeholder="请选择" allowClear v-model="record.position">
+                	<a-select-option v-for="item in customeList" :key="item.salesChannelNo" :value="item.salesChannelNo">{{ item.salesChannelName }}</a-select-option>
+                </a-select>
+              </template>
+              <!-- 操作 -->
+              <template slot="action" slot-scope="text, record">
+                <a-button type="primary" @click="handleDel(record)" id="bulkWarehousingOrderEdit-del-btn">删除</a-button>
+              </template>
+            </s-table>
+          </div>
+        </a-collapse-panel>
+      </a-collapse>
+    </a-card>
+    <!-- 选择基本信息弹框 -->
+    <basic-info-modal :openModal="openModal" @ok="handleOk" @close="openModal=false" />
+  </div>
+</template>
+
+<script>
+  import { STable, VSelect } from '@/components'
+  import basicInfoModal from './basicInfoModal.vue'
+  export default{
+    components: { STable, VSelect, basicInfoModal },
+    data(){
+      return{
+        queryParam: {
+          
+        },
+        brandData: [],  //  产品品牌  下拉数据
+        typeData: [],  //  产品类别  下拉数据
+        disabled: false, //  查询、重置按钮是否可操作
+        // 表头
+        columns: [
+          { title: '产品编码', dataIndex: 'creatDate', align: 'center', sorter: true },
+          { title: '产品名称', dataIndex: 'custName', align: 'center' },
+          { title: '原厂编码', dataIndex: 'totalP', align: 'center' },
+          { title: '产品品牌', dataIndex: 'custsName', align: 'center', sorter: true },
+          { title: '单位', dataIndex: 'custsNdame', align: 'center' },
+          { title: '成本价', scopedSlots: { customRender: 'costPrice' }, align: 'center' },
+          { title: '数量', scopedSlots: { customRender: 'quantity' }, align: 'center' },
+          { title: '仓库', scopedSlots: { customRender: 'warehouse' }, align: 'center' },
+          { title: '仓位', scopedSlots: { customRender: 'position' }, align: 'center' },
+          { title: '操作', scopedSlots: { customRender: 'action' }, width: 150, 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)
+          })
+        },
+        // 表头
+        chooseColumns: [
+          { title: '产品编码', dataIndex: 'creatDate', align: 'center', sorter: true },
+          { title: '产品名称', dataIndex: 'custName', align: 'center' },
+          { title: '原厂编码', dataIndex: 'totalP', align: 'center' },
+          { title: '产品品牌', dataIndex: 'custsName', align: 'center', sorter: true },
+          { title: '单位', dataIndex: 'custsNdame', align: 'center' },
+          { title: '成本价', scopedSlots: { customRender: 'costPrice' }, align: 'center' },
+          { title: '数量', scopedSlots: { customRender: 'quantity' }, align: 'center' },
+          { title: '成本小计', dataIndex: 'custsNdsame', align: 'center' },
+          { title: '仓库', scopedSlots: { customRender: 'warehouse' }, align: 'center' },
+          { title: '仓位', scopedSlots: { customRender: 'position' }, align: 'center' },
+          { title: '操作', scopedSlots: { customRender: 'action' }, width: 150, align: 'center' }
+        ],
+        // 加载数据方法 必须为 Promise 对象
+        chooseLoadData: 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', custssName: 0, 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)
+          })
+        },
+        openModal: false, // 选择基本信息弹框是否显示
+        customeList: [],  //  仓库  下拉数据
+      }
+    },
+    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)
+      },
+      //  添加
+      handleAdd(row){},
+      //  删除
+      handleDel(row){},
+      //  编辑基本信息
+      handleEditInfo(){
+        this.openModal = true
+      },
+      //  基本信息  保存
+      handleOk(){
+        
+      },
+      //  导入明细
+      handleImport(){
+        console.log(333)
+      },
+      filterOption(input, option) {
+      	return (
+      		option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+      	)
+      },
+    },
+    beforeRouteEnter (to, from, next) {
+      next(vm => {
+        vm.openModal = false
+      })
+    }
+  }
+</script>
+
+<style lang="less">
+  .bulkWarehousingOrderEdit-wrap{
+    .bulkWarehousingOrderEdit-cont{
+      margin-bottom: 15px;
+      .sub-title{
+        font-size: 12px;
+        color: #808695;
+        margin-left: 10px;
+      }
+      .tag-txt{
+        font-size: 12px;
+        color: #ff0000;
+      }
+      .edit-circle-btn{
+        margin-left: 15px;
+        i{
+          vertical-align: text-bottom;
+        }
+      }
+      .import-btn{
+        margin-left: 15px;
+      }
+    }
+  }
+</style>

+ 267 - 0
src/views/bulkManagement/bulkWarehousingOrder/list.vue

@@ -0,0 +1,267 @@
+<template>
+  <a-card :bordered="false" class="bulkWarehousingOrderList-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 v-model="queryParam.creatDate" id="bulkWarehousingOrderList-creatDate"/>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="24">
+            <a-form-item label="散件单号">
+              <a-input id="bulkWarehousingOrderList-purchaseNo" v-model.trim="queryParam.purchaseNo" allowClear placeholder="请输入散件单号"/>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="24">
+            <a-form-item label="供应商" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
+            	<a-select id="bulkWarehousingOrderList-customeName" placeholder="请选择供应商" allowClear v-model="queryParam.dataSourceNo" :showSearch="true" option-filter-prop="children" :filter-option="filterOption">
+            		<a-select-option v-for="item in customeList" :key="item.salesChannelNo" :value="item.salesChannelNo">{{ item.salesChannelName }}</a-select-option>
+            	</a-select>
+            </a-form-item>
+          </a-col>
+          <template v-if="advanced">
+            <a-col :md="6" :sm="24">
+              <a-form-item label="单据状态">
+                <v-select
+                  v-model="queryParam.billStatus"
+                  ref="billStatus"
+                  id="bulkWarehousingOrderList-billStatus"
+                  code="PAYMENT_TYPE"
+                  placeholder="请选择单据状态"
+                  allowClear></v-select>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="结算状态">
+                <v-select
+                  v-model="queryParam.billStatus"
+                  ref="billStatus"
+                  id="bulkWarehousingOrderList-billStatus"
+                  code="PAYMENT_TYPE"
+                  placeholder="请选择结算状态"
+                  allowClear></v-select>
+              </a-form-item>
+            </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>
+              <a @click="advanced=!advanced" style="margin-left: 8px">
+                {{ advanced ? '收起' : '展开' }}
+                <a-icon :type="advanced ? 'up' : 'down'"/>
+              </a>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 操作按钮 -->
+    <div class="table-operator">
+      <a-button id="bulkWarehousingOrderList-add" type="primary" @click="handleAdd">新增散件入库单</a-button>
+    </div>
+    <!-- alert -->
+    <a-alert type="info" showIcon style="margin-bottom:15px">
+      <div slot="message">共 <strong>6</strong> 条记录,总数量合计 <strong>14</strong> ,总金额合计¥<strong>14.00</strong> </div>
+    </a-alert>
+    <!-- 列表 -->
+    <s-table
+      class="sTable"
+      ref="table"
+      size="default"
+      :rowKey="(record) => record.id"
+      :columns="columns"
+      :data="loadData"
+      bordered>
+      <!-- 散件单号 -->
+      <template slot="purchaseNo" slot-scope="text, record">
+        <span style="color: #ff0000;cursor: pointer;">{{record.purchaseNo}}</span>
+      </template>
+      <!-- 状态 -->
+      <template slot="state" slot-scope="text, record">
+        <span>{{record.state == 1 ? '已启用' : '已禁用'}}</span>
+      </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>
+      </template>
+    </s-table>
+    <!-- 选择基本信息弹框 -->
+    <basic-info-modal :openModal="openModal" @ok="handleOk" @close="openModal=false" />
+  </a-card>
+</template>
+
+<script>
+import moment from 'moment'
+import { STable, VSelect } from '@/components'
+import basicInfoModal from './basicInfoModal.vue'
+// import { getRoleList, getServiceList } from '@/api/manage'
+export default {
+  components: { STable, VSelect, basicInfoModal },
+  data () {
+    return {
+      // 高级搜索 展开/关闭
+      advanced: false,
+      disabled: false, //  查询、重置按钮是否可操作
+      exportLoading: false, // 导出loading
+      openModal: false, // 基本信息弹框是否显示
+      customeList:[],
+      // 查询参数
+      queryParam: {},
+      // 表头
+      columns: [
+        { title: '散件单号', scopedSlots: { customRender: 'purchaseNo' }, align: 'center' },
+        { title: '创建时间', dataIndex: 'creatDate', align: 'center' },
+        { title: '供应商', dataIndex: 'custName', align: 'center' },
+        { title: '产品款数', dataIndex: 'totalP', align: 'center' },
+        { title: '总数量', dataIndex: 'totalNums', align: 'center' },
+        { title: '总金额', dataIndex: 'totalPrice', align: 'center' },
+        { title: '单据状态', dataIndex: 'payType', align: 'center' },
+        { title: '结算状态', dataIndex: 'mementPay', align: 'center' },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: 270, 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: {
+    //  新增
+    handleAdd(){
+      this.openModal = true
+    },
+    //  基本信息  保存
+    handleOk(){
+      this.$router.push({ path: `/bulkManagement/bulkWarehousingOrder/add` })
+    },
+    //  编辑
+    handleEdit (row) {
+      this.$router.push({ path: `/bulkManagement/bulkWarehousingOrder/edit/${row.id}`})
+    },
+    //  详情
+    handleDetail(row){
+      this.$router.push({ path: `/bulkManagement/bulkWarehousingOrder/detail/${row.id}`})
+    },
+    //  入库
+    handleWarehouse(row){
+      this.$router.push({ path: `/bulkManagement/bulkWarehousingOrder/warehousing/${row.id}`})
+    },
+    //  删除
+    handleDel(row){
+      const _this = this
+      this.$confirm({
+        title: '提示',
+        content: '删除后不可恢复,确定要进行删除吗?',
+        okText: '确定',
+        cancelText: '取消',
+        onOk () {
+          // delectRolePower({
+          //   id: row.id
+          // }).then(res => {
+          //   console.log(res, 'res1111')
+          //   if (res.status == 200) {
+          //     _this.$message.success(res.message)
+          //     _this.$refs.table.refresh()
+          //   }
+          // })
+        }
+      })
+    },
+    //  重置
+    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)
+    },
+    filterOption(input, option) {
+    	return (
+    		option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+    	)
+    },
+    //  导出
+    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()
+    }
+  },
+  beforeRouteEnter (to, from, next) {
+    next(vm => {
+      vm.openModal = false
+    })
+  }
+}
+</script>
+<style lang="less">
+  .bulkWarehousingOrderList-wrap{
+    .sTable{
+      margin-top: 15px;
+    }
+  }
+</style>

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

@@ -0,0 +1,170 @@
+<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 :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>
+      <div class="btn-cont">
+        <a-button type="primary" id="satellite-warehouse-inventory-add-modal-add" @click="handleWarehousing">确认入库</a-button>
+        <a-button id="satellite-warehouse-inventory-add-modal-back" @click="handleBack" style="margin-left: 15px;">返回列表</a-button>
+      </div>
+    </a-card>
+  </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' },
+          { title: '产品名称', dataIndex: 'custName', align: 'center' },
+          { title: '原厂编码', dataIndex: 'totalP', align: 'center' },
+          { title: '采购单价', dataIndex: 'totalNums', align: 'center' },
+          { title: '采购数量', scopedSlots: { customRender: 'purchaseNum' }, align: 'center' },
+          { title: '缺货数量', scopedSlots: { customRender: 'outOfStockNum' }, align: 'center' },
+          { title: '单位', dataIndex: 'mementPay', align: 'center' },
+          { title: '采购金额', dataIndex: 'shDate', align: 'center' },
+          { 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">
+  .bulkWarehousingOrderWarehousing-wrap{
+    .btn-cont {
+    	text-align: center;
+    	margin: 35px 0 10px;
+    }
+  }
+</style>

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

@@ -181,7 +181,7 @@ export default {
         { title: '最小库存数(个)', scopedSlots: { customRender: 'minInventory' }, width: 150, align: 'center' },
         { title: '差异数量', dataIndex: 'variabilityMeasures', width: 120, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '预警提示', scopedSlots: { customRender: 'warningTips' }, width: 120, align: 'center' },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: 240, align: 'center' }
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: 240, align: 'center', fixed: 'right' }
       ],
       // 加载数据方法 必须为 Promise 对象
       // loadData: parameter => {

+ 125 - 0
src/views/purchasingManagement/purchaseOrder/basicInfoModal.vue

@@ -0,0 +1,125 @@
+<template>
+  <a-modal
+    centered
+    class="purchaseOrder-basicInfo-modal"
+    :footer="null"
+    :maskClosable="false"
+    title="新建采购单"
+    v-model="isShow"
+    @cancle="isShow=false"
+    width="80%">
+    <a-form-model
+      id="purchaseOrder-basicInfo-form"
+      ref="ruleForm"
+      :model="form"
+      :rules="rules"
+      :label-col="formItemLayout.labelCol"
+      :wrapper-col="formItemLayout.wrapperCol" >
+      <a-form-model-item label="供应商" prop="state">
+        <a-radio-group
+          name="radioGroup"
+          v-model="form.state"
+          id="purchaseOrder-basicInfo-state" >
+          <a-radio :value="1">箭冠营销中心</a-radio>
+          <a-radio :value="0">支持省级</a-radio>
+        </a-radio-group>
+      </a-form-model-item>
+      <a-form-model-item label="支付方式" prop="sort">
+        <v-select
+          v-model="form.billStatus"
+          ref="billStatus"
+          id="purchaseOrder-basicInfo-billStatus"
+          code="PAYMENT_TYPE"
+          placeholder="请选择支付方式"
+          allowClear></v-select>
+      </a-form-model-item>
+      <a-form-model-item label="收货地址" prop="name">
+        {{chooseAddr}}
+        <a-button type="link" id="purchaseOrder-basicInfo-chooseAddr" @click="handleChoose">{{addressVal}} >></a-button>
+      </a-form-model-item>
+    </a-form-model>
+    <div class="btn-cont">
+      <a-button type="primary" id="purchaseOrder-basicInfo-modal-save" @click="handleSave">保存</a-button>
+      <a-button id="purchaseOrder-basicInfo-modal-back" @click="isShow = false" style="margin-left: 15px;">取消</a-button>
+    </div>
+    <!-- 选择地址 -->
+    <choose-address-modal :openModal="openAddrModal" @ok="handleOk" @close="openAddrModal=false" />
+  </a-modal>
+</template>
+
+<script>
+  import { VSelect } from '@/components'
+  import chooseAddressModal from './receivingAddress/chooseAddressModal.vue'
+  export default{
+    name: 'BasicInfoModal',
+    components: { VSelect, chooseAddressModal },
+    props: {
+      openModal: { //  弹框显示状态
+        type: Boolean,
+        default: false
+      }
+    },
+    data(){
+      return{
+        isShow: this.openModal, //  是否打开弹框
+        formItemLayout: {
+          labelCol: { span: 6 },
+          wrapperCol: { span: 16 }
+        },
+        form: {
+          name: '', // 仓库名称
+          sort: '',  //  排序
+        },
+        rules: {
+          name: [
+            { required: true, message: '请输入仓库名称', trigger: 'blur' }
+          ],
+        },
+        addressVal: '选择地址',  //  选择地址/更换地址
+        chooseAddr: '',  //  当前已选地址信息
+        openAddrModal: false, // 选择地址弹框是否显示
+      }
+    },
+    methods: {
+      //  保存
+      handleSave(){
+        this.isShow = false
+        this.$emit('ok')
+      },
+      //  选择地址
+      handleChoose(){
+        this.openAddrModal = true
+      },
+      //  地址保存
+      handleOk(data){
+        this.chooseAddr = '张三(18800001111) 河南省 郑州市 中原区 大学科技园'
+        this.addressVal = '更换地址'
+        this.openAddrModal = false
+      }
+    },
+    watch: {
+      //  父页面传过来的弹框状态
+      openModal (newValue, oldValue) {
+        this.isShow = newValue
+      },
+      //  重定义的弹框状态
+      isShow (newValue, oldValue) {
+        if (!newValue) {
+          this.$emit('close')
+        }
+      }
+    }
+  }
+</script>
+
+<style lang="less">
+  .purchaseOrder-basicInfo-modal{
+    .ant-modal-body {
+    	padding: 40px 40px 24px;
+    }
+    .btn-cont {
+    	text-align: center;
+    	margin: 35px 0 10px;
+    }
+  }
+</style>

+ 33 - 5
src/views/purchasingManagement/purchaseOrder/detail.vue

@@ -1,9 +1,9 @@
 <template>
   <div class="purchaseOrderDetail-wrap">
-    <a-page-header :ghost="false" @back="() => $router.go(-1)" >
+    <a-page-header :ghost="false" @back="handleBack" >
       <!-- 自定义的二级文字标题 -->
       <template slot="subTitle">
-        <a id="purchaseOrderDetail-back-btn" href="javascript:;" @click="() => $router.go(-1)">返回列表</a>
+        <a id="purchaseOrderDetail-back-btn" href="javascript:;" @click="handleBack">返回列表</a>
       </template>
       <!-- 操作区,位于 title 行的行尾 -->
       <template slot="extra">
@@ -22,7 +22,7 @@
     <a-card :bordered="false" class="purchaseOrderDetail-cont">
       <a-collapse :activeKey="['1']">
         <a-collapse-panel key="1" header="基础信息">
-          <a-descriptions column="3">
+          <a-descriptions :column="3">
             <a-descriptions-item label="供应商">箭冠营销中心</a-descriptions-item>
             <a-descriptions-item label="支付方式">箭冠营销中心</a-descriptions-item>
             <a-descriptions-item label="采购员工">箭冠营销中心</a-descriptions-item>
@@ -61,7 +61,23 @@
         </a-collapse-panel>
       </a-collapse>
     </a-card>
-    
+    <!-- 单据记录 -->
+    <a-card :bordered="false" class="purchaseOrderDetail-cont">
+      <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-collapse-panel>
+      </a-collapse>
+    </a-card>
   </div>
 </template>
 
@@ -114,12 +130,24 @@
           })
         },
       }
+    },
+    methods: {
+      //  返回列表
+      handleBack(){
+        this.$router.push({ path: '/purchasingManagement/purchaseOrder/list'})
+      },
     }
   }
 </script>
 
 <style lang="less">
   .purchaseOrderDetail-cont{
-    margin-top: 15px;
+    margin-bottom: 15px;
+    .timeline-box{
+      margin-top: 30px;
+      .auxiliary-txt{
+        color: #808695;
+      }
+    }
   }
 </style>

+ 303 - 1
src/views/purchasingManagement/purchaseOrder/edit.vue

@@ -1,8 +1,310 @@
 <template>
+  <div class="purchaseOrderEdit-wrap">
+    <!-- 内容 -->
+    <a-page-header title="单号:CG2021010100001" style="margin-top: -24px;" >
+      <!-- 操作区,位于 title 行的行尾 -->
+      <template slot="extra">
+        <a-button key="2" id="purchaseOrderEdit-preview-btn">打印预览</a-button>
+        <a-button key="1" type="primary" id="purchaseOrderEdit-print-btn">快速打印</a-button>
+      </template>
+    </a-page-header>
+    <!-- 基础信息 -->
+    <a-card :bordered="false" class="purchaseOrderEdit-cont">
+      <a-collapse :activeKey="['1']">
+        <a-collapse-panel key="1">
+          <template slot="header">
+            基础信息
+            <a-button type="primary" shape="circle" size="small" icon="edit" class="edit-circle-btn" id="purchaseOrderEdit-edit-circle-btn" @click.stop="handleEditInfo" />
+          </template>
+          <a-descriptions :column="3">
+            <a-descriptions-item label="供应商">箭冠营销中心</a-descriptions-item>
+            <a-descriptions-item label="支付方式">箭冠营销中心</a-descriptions-item>
+            <a-descriptions-item label="收货人">箭冠营销中心</a-descriptions-item>
+            <a-descriptions-item label="收货地址">箭冠营销中心</a-descriptions-item>
+          </a-descriptions>
+        </a-collapse-panel>
+      </a-collapse>
+    </a-card>
+    <!-- 选择产品 -->
+    <a-card :bordered="false" class="purchaseOrderEdit-cont">
+      <a-collapse :activeKey="['1']">
+        <a-collapse-panel key="1">
+          <template slot="header">
+            选择产品<span class="sub-title">①输入查询条件--->②查找到需要采购的产品--->③录入采购数量--->④点击“添加”</span>
+            <p class="tag-txt">注意:仅限采购【箭冠】产品。自建产品的采购入库请使用“散件入库”功能</p>
+          </template>
+          <!-- 选择产品 -->
+          <div>
+            <!-- 搜索条件 -->
+            <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="purchaseOrderEdit-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="purchaseOrderEdit-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="purchaseOrderEdit-state" placeholder="请选择产品类别" allowClear v-model="queryParam.brand" />
+                    </a-form-item>
+                  </a-col>
+                  <a-col :md="6" :sm="24">
+                    <a-form-item label="适用车型">
+                      <a-cascader :options="typeData" id="purchaseOrderEdit-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="purchaseOrderEdit-refresh">查询</a-button>
+                    <a-button style="margin: 0 0 18px 8px" @click="resetSearchForm" :disabled="disabled" id="purchaseOrderEdit-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="storageQuantity" slot-scope="text, record">
+                <a-input-number
+                  id="purchaseOrderEdit-storageQuantity"
+                  :value="record.storageQuantity"
+                  :precision="0"
+                  :min="0"
+                  :max="999999"
+                  placeholder="请输入" />
+              </template>
+              <!-- 操作 -->
+              <template slot="action" slot-scope="text, record">
+                <a-button type="primary" @click="handleAdd(record)" id="purchaseOrderEdit-add-btn">添加</a-button>
+              </template>
+            </s-table>
+          </div>
+        </a-collapse-panel>
+      </a-collapse>
+    </a-card>
+    <!-- 已选产品 -->
+    <a-card :bordered="false" class="purchaseOrderEdit-cont">
+      <a-collapse :activeKey="['1']">
+        <a-collapse-panel key="1">
+          <template slot="header">
+            已选产品
+            <a-button size="small" class="import-btn" id="purchaseOrderEdit-import-btn" @click.stop="handleImport">导入明细</a-button>
+          </template>
+          <!-- 已选产品 -->
+          <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="chooseColumns"
+              :data="chooseLoadData"
+              bordered>
+              <!-- 采购数量 -->
+              <template slot="storageQuantity" slot-scope="text, record">
+                <a-input-number
+                  id="purchaseOrderEdit-storageQuantity"
+                  :value="record.storageQuantity"
+                  :precision="0"
+                  :min="0"
+                  :max="999999"
+                  placeholder="请输入" />
+              </template>
+              <!-- 操作 -->
+              <template slot="action" slot-scope="text, record">
+                <a-button type="primary" @click="handleDel(record)" id="purchaseOrderEdit-del-btn">删除</a-button>
+              </template>
+            </s-table>
+          </div>
+        </a-collapse-panel>
+      </a-collapse>
+    </a-card>
+    <!-- 选择基本信息弹框 -->
+    <basic-info-modal :openModal="openModal" @ok="handleOk" @close="openModal=false" />
+  </div>
 </template>
 
 <script>
+  import { STable, VSelect } from '@/components'
+  import basicInfoModal from './basicInfoModal.vue'
+  export default{
+    components: { STable, VSelect, basicInfoModal },
+    data(){
+      return{
+        queryParam: {
+          
+        },
+        brandData: [],  //  产品品牌  下拉数据
+        typeData: [],  //  产品类别  下拉数据
+        disabled: false, //  查询、重置按钮是否可操作
+        // 表头
+        columns: [
+          { title: '产品编码', dataIndex: 'creatDate', align: 'center', sorter: true },
+          { title: '产品名称', dataIndex: 'custName', align: 'center' },
+          { title: '产品级别', dataIndex: 'custsName', align: 'center' },
+          { title: '原厂编码', dataIndex: 'totalP', align: 'center' },
+          { title: '终端会员价', dataIndex: 'totalNums', align: 'center' },
+          { title: '车主零售价', scopedSlots: { customRender: 'purchaseNum' }, align: 'center' },
+          { title: '箱/单位', scopedSlots: { customRender: 'outOfStockNum' }, align: 'center' },
+          { title: '采购单价', dataIndex: 'mementPay', align: 'center' },
+          { title: '采购数量', scopedSlots: { customRender: 'storageQuantity' }, align: 'center' },
+          { title: '操作', scopedSlots: { customRender: 'action' }, width: 150, 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)
+          })
+        },
+        // 表头
+        chooseColumns: [
+          { title: '产品编码', dataIndex: 'creatDaite', align: 'center', sorter: true },
+          { title: '产品名称', dataIndex: 'custNayme', align: 'center' },
+          { title: '采购单价', dataIndex: 'mementPay', align: 'center' },
+          { title: '采购数量', scopedSlots: { customRender: 'storageQuantity' }, align: 'center' },
+          { title: '单位', dataIndex: 'custsNakme', align: 'center' },
+          { title: '采购金额', dataIndex: 'custssNakme', align: 'center', customRender: function (text) { return ((text || text == 0) ? '¥'+text : '--') } },
+          { title: '操作', scopedSlots: { customRender: 'action' }, width: 150, align: 'center' }
+        ],
+        // 加载数据方法 必须为 Promise 对象
+        chooseLoadData: 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', custssName: 0, 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)
+          })
+        },
+        openModal: false, // 选择基本信息弹框是否显示
+      }
+    },
+    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)
+      },
+      //  添加
+      handleAdd(row){},
+      //  删除
+      handleDel(row){},
+      //  编辑基本信息
+      handleEditInfo(){
+        this.openModal = true
+      },
+      //  基本信息  保存
+      handleOk(){
+        
+      },
+      //  导入明细
+      handleImport(){
+        console.log(333)
+      },
+      filterOption(input, option) {
+      	return (
+      		option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+      	)
+      },
+    },
+    beforeRouteEnter (to, from, next) {
+      next(vm => {
+        vm.openModal = false
+      })
+    }
+  }
 </script>
 
-<style>
+<style lang="less">
+  .purchaseOrderEdit-wrap{
+    .purchaseOrderEdit-cont{
+      margin-bottom: 15px;
+      .sub-title{
+        font-size: 12px;
+        color: #808695;
+        margin-left: 10px;
+      }
+      .tag-txt{
+        font-size: 12px;
+        color: #ff0000;
+      }
+      .edit-circle-btn{
+        margin-left: 15px;
+        i{
+          vertical-align: text-bottom;
+        }
+      }
+      .import-btn{
+        margin-left: 15px;
+      }
+    }
+  }
 </style>

+ 33 - 26
src/views/purchasingManagement/purchaseOrder/list.vue

@@ -1,22 +1,22 @@
 <template>
-  <a-card :bordered="false" class="salesManagementList-wrap">
+  <a-card :bordered="false" class="purchaseOrderList-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 v-model="queryParam.creatDate" id="purchasingManagementList-creatDate"/>
+              <a-range-picker v-model="queryParam.creatDate" id="purchaseOrderList-creatDate"/>
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="24">
             <a-form-item label="采购单号">
-              <a-input id="purchasingManagementList-purchaseNo" v-model.trim="queryParam.purchaseNo" allowClear placeholder="请输入采购单号"/>
+              <a-input id="purchaseOrderList-purchaseNo" v-model.trim="queryParam.purchaseNo" allowClear placeholder="请输入采购单号"/>
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="24">
             <a-form-item label="供应商" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
-            	<a-select id="purchasingManagementList-customeName" placeholder="请选择供应商" allowClear v-model="queryParam.dataSourceNo" :showSearch="true" option-filter-prop="children" :filter-option="filterOption">
+            	<a-select id="purchaseOrderList-customeName" placeholder="请选择供应商" allowClear v-model="queryParam.dataSourceNo" :showSearch="true" option-filter-prop="children" :filter-option="filterOption">
             		<a-select-option v-for="item in customeList" :key="item.salesChannelNo" :value="item.salesChannelNo">{{ item.salesChannelName }}</a-select-option>
             	</a-select>
             </a-form-item>
@@ -27,7 +27,7 @@
                 <v-select
                   v-model="queryParam.billStatus"
                   ref="billStatus"
-                  id="purchasingManagementList-billStatus"
+                  id="purchaseOrderList-billStatus"
                   code="PAYMENT_TYPE"
                   placeholder="请选择单据状态"
                   allowClear></v-select>
@@ -38,7 +38,7 @@
                 <v-select
                   v-model="queryParam.billStatus"
                   ref="billStatus"
-                  id="purchasingManagementList-billStatus"
+                  id="purchaseOrderList-billStatus"
                   code="PAYMENT_TYPE"
                   placeholder="请选择结算状态"
                   allowClear></v-select>
@@ -47,8 +47,8 @@
           </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="purchasingManagementList-refresh">查询</a-button>
-              <a-button style="margin-left: 8px" @click="resetSearchForm()" :disabled="disabled" id="purchasingManagementList-reset">重置</a-button>
+              <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="purchaseOrderList-refresh">查询</a-button>
+              <a-button style="margin-left: 8px" @click="resetSearchForm()" :disabled="disabled" id="purchaseOrderList-reset">重置</a-button>
               <a @click="advanced=!advanced" style="margin-left: 8px">
                 {{ advanced ? '收起' : '展开' }}
                 <a-icon :type="advanced ? 'up' : 'down'"/>
@@ -60,7 +60,7 @@
     </div>
     <!-- 操作按钮 -->
     <div class="table-operator">
-      <a-button id="purchasingManagementList-add" type="primary" @click="handleAdd()">新增采购单(箭冠)</a-button>
+      <a-button id="purchaseOrderList-add" type="primary" @click="handleAdd">新增采购单(箭冠)</a-button>
     </div>
     <!-- alert -->
     <a-alert type="info" showIcon style="margin-bottom:15px">
@@ -85,31 +85,31 @@
       </template>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
-        <a-button type="primary" @click="handleEdit(record)" id="inventoryQueryList-edit-btn">编辑</a-button>
-        <a-button type="dashed" @click="handleDetail(record)" id="inventoryQueryList-detail-btn" style="margin: 0 0 8px 8px">详情</a-button>
-        <a-button @click="handleSubmit(record)" id="inventoryQueryList-submit-btn" style="margin: 0 0 8px 8px">提交</a-button>
-        <a-button type="primary" @click="handleWarehouse(record)" id="inventoryQueryList-warehouse-btn" style="margin: 0 0 8px 8px">签收入库</a-button>
-        <a-button type="danger" @click="handleDel(record)" id="inventoryQueryList-del-btn" style="margin: 0 0 0 8px">删除</a-button>
+        <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>
       </template>
     </s-table>
-    <!-- 选择客户弹框 -->
-    <!-- <chooseCustom :openModal="openModal" @ok="chooseCustomOk" @cancel="openModal=false"></chooseCustom> -->
+    <!-- 选择基本信息弹框 -->
+    <basic-info-modal :openModal="openModal" @ok="handleOk" @close="openModal=false" />
   </a-card>
 </template>
 
 <script>
 import moment from 'moment'
 import { STable, VSelect } from '@/components'
-// import chooseCustom from './chooseCustom.vue'
+import basicInfoModal from './basicInfoModal.vue'
 // import { getRoleList, getServiceList } from '@/api/manage'
 export default {
-  components: { STable, VSelect },
+  components: { STable, VSelect, basicInfoModal },
   data () {
     return {
       // 高级搜索 展开/关闭
       advanced: false,
       disabled: false, //  查询、重置按钮是否可操作
-      openModal: false, // 选择客户弹框是否显示
+      openModal: false, // 基本信息弹框是否显示
       customeList:[],
       // 查询参数
       queryParam: {},
@@ -158,12 +158,14 @@ export default {
       },
     }
   },
-  created () {
-  },
   methods: {
-    // 选择客户成功
-    chooseCustomOk(data){
-      this.$router.push({ name: 'salesNew' })
+    //  新增
+    handleAdd(){
+      this.openModal = true
+    },
+    //  基本信息  保存
+    handleOk(){
+      this.$router.push({ path: `/purchasingManagement/purchaseOrder/add` })
     },
     //  编辑
     handleEdit (row) {
@@ -179,7 +181,7 @@ export default {
     },
     //  签收入库
     handleWarehouse(row){
-      
+      this.$router.push({ path: `/purchasingManagement/purchaseOrder/warehousing/${row.id}`})
     },
     //  删除
     handleDel(row){
@@ -217,11 +219,16 @@ export default {
     		option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
     	)
     },
+  },
+  beforeRouteEnter (to, from, next) {
+    next(vm => {
+      vm.openModal = false
+    })
   }
 }
 </script>
 <style lang="less">
-  .salesManagementList-wrap{
+  .purchaseOrderList-wrap{
     .sTable{
       margin-top: 15px;
     }

+ 193 - 0
src/views/purchasingManagement/purchaseOrder/receivingAddress/chooseAddressModal.vue

@@ -0,0 +1,193 @@
+<template>
+  <a-modal
+    centered
+    class="chooseAddressList-modal"
+    :footer="null"
+    :maskClosable="false"
+    title="收货地址"
+    v-model="isShow"
+    @cancle="isShow=false"
+    width="70%">
+    <!-- 操作按钮 -->
+    <div class="table-operator">
+      <a-button id="chooseAddressList-add" type="primary" @click="handleEdit">新增收货地址</a-button>
+    </div>
+    <!-- 列表 -->
+    <s-table
+      class="sTable"
+      ref="table"
+      size="default"
+      :rowKey="(record) => record.id"
+      :columns="columns"
+      :data="loadData"
+      bordered>
+      <!-- 收货人 -->
+      <template slot="consignee" slot-scope="text, record">
+        <div class="item-box">
+          <a-tooltip placement="top">
+            <template slot="title">
+              <span>{{record.consignee}}</span>
+            </template>
+            <p class="ellipsis-txt">{{record.consignee}}</p>
+          </a-tooltip>
+          <span v-if="record.isDefault" class="badge-txt">默认</span>
+        </div>
+      </template>
+      <!-- 操作 -->
+      <template slot="action" slot-scope="text, record">
+        <a-button type="link" v-if="!record.isDefault" @click="handleDefault(record)" id="chooseAddressList-default-btn">设置为默认地址</a-button>
+        <a-button type="link" @click="handleEdit(record)" id="chooseAddressList-edit-btn" style="margin-left: 5px;">编辑</a-button>
+        <a-button type="link" @click="handleDel(record)" id="chooseAddressList-del-btn" style="margin-left: 5px;">删除</a-button>
+      </template>
+      <!-- 选择 -->
+      <template slot="choose" slot-scope="text, record">
+        <a-button type="primary" @click="handleChoose(record)" id="chooseAddressList-choose-btn">选择</a-button>
+      </template>
+    </s-table>
+    <!-- 新增/编辑地址 -->
+    <edit-address-modal :openModal="openAddrModal" @ok="handleOk" @close="openAddrModal=false" />
+  </a-modal>
+</template>
+
+<script>
+  import { STable, VSelect } from '@/components'
+  import editAddressModal from './editAddressModal'
+  export default{
+    name: 'ChooseAddressModal',
+    components: { STable, VSelect, editAddressModal },
+    props: {
+      openModal: { //  弹框显示状态
+        type: Boolean,
+        default: false
+      }
+    },
+    data(){
+      return{
+        isShow: this.openModal, //  是否打开弹框
+        // 表头
+        columns: [
+          { title: '收货人', scopedSlots: { customRender: 'consignee' }, align: 'center', ellipsis: true },
+          { title: '手机号码', dataIndex: 'phone', width: 120, align: 'center' },
+          { title: '收货地址', dataIndex: 'address', align: 'center', ellipsis: true },
+          { title: '操作', scopedSlots: { customRender: 'action' }, width: 295, align: 'center' },
+          { title: '选择', scopedSlots: { customRender: 'choose' }, width: 160, 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', consignee: '张三', phone: '15878458789', address: '陕西省西安市雁塔区高新三路', isDefault: true },
+                { id: '2', consignee: '张冀凯股份结构设计风格剑荡四方收费价格就会收到福建师范大书法家顾客三', phone: '15878458789', address: '陕西省西安市雁塔区高新三路', isDefault: false },
+                { id: '3', consignee: '张三', phone: '15878458789', address: '陕西省西安市到福建师范大书法家雁塔区高新三路', isDefault: false },
+              ],
+              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)
+          })
+        },
+        openAddrModal: false, // 选择地址弹框是否显示
+      }
+    },
+    methods: {
+      //  设为默认
+      handleDefault(row){
+        
+      },
+      //  新增/编辑收货地址
+      handleEdit(row){
+        this.openAddrModal = true
+      },
+      //  选择
+      handleChoose(row){
+        
+      },
+      //  删除
+      handleDel(row){
+        const _this = this
+        this.$confirm({
+          title: '提示',
+          content: '删除后不可恢复,确定要进行删除吗?',
+          okText: '确定',
+          cancelText: '取消',
+          onOk () {
+            // delectRolePower({
+            //   id: row.id
+            // }).then(res => {
+            //   console.log(res, 'res1111')
+            //   if (res.status == 200) {
+            //     _this.$message.success(res.message)
+            //     _this.$refs.table.refresh()
+            //   }
+            // })
+          }
+        })
+      },
+      //  地址保存
+      handleOk(data){
+        
+      }
+    },
+    watch: {
+      //  父页面传过来的弹框状态
+      openModal (newValue, oldValue) {
+        this.isShow = newValue
+      },
+      //  重定义的弹框状态
+      isShow (newValue, oldValue) {
+        if (!newValue) {
+          this.$emit('close')
+        }
+      }
+    }
+  }
+</script>
+
+<style lang="less">
+  .chooseAddressList-modal{
+    .table-operator{
+      margin-bottom: 15px;
+    }
+    .item-box{
+      position: relative;
+      .ellipsis-txt{
+        margin: 0;
+        width: 100%;    
+        overflow: hidden;    
+        text-overflow:ellipsis;    
+        whitewhite-space: nowrap;
+      }
+      .badge-txt{
+        position: absolute;
+        right: -15px;
+        top: -17px;
+        line-height: 20px;
+        padding: 0 7px;
+        font-size: 12px;
+        background-color: #fff;
+        color: #ff0000;
+        border-color: #ff0000;
+        border-radius: 20px;
+        box-shadow: 0 0 0 1px #d9d9d9 inset;
+      }
+    }
+  }
+</style>

+ 183 - 0
src/views/purchasingManagement/purchaseOrder/receivingAddress/editAddressModal.vue

@@ -0,0 +1,183 @@
+<template>
+  <a-modal
+    centered
+    class="editAddress-modal"
+    :footer="null"
+    :maskClosable="false"
+    title="收货地址"
+    v-model="isShow"
+    @cancle="isShow=false"
+    width="65%">
+    <a-form-model
+      id="editAddress-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="editAddress-name"
+          :maxLength="30"
+          v-model="form.name"
+          placeholder="请输入收货人(最多30个字符)"
+          allowClear />
+      </a-form-model-item>
+      <a-form-model-item label="手机号码" prop="phone">
+        <a-input
+          id="editAddress-phone"
+          :maxLength="11"
+          v-model="form.phone"
+          placeholder="请输入手机号码(最多11个字符)"
+          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="editAddress-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="editAddress-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="editAddress-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="editAddress-address"
+          :maxLength="60"
+          v-model="form.address"
+          placeholder="请输入详细地址(最多60个字符)"
+          allowClear />
+      </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="editAddress-btn-submit">保存</a-button>
+        <a-button @click="isShow=false" style="margin-left: 15px" id="editAddress-btn-back">返回</a-button>
+      </a-form-model-item>
+    </a-form-model>
+  </a-modal>
+</template>
+
+<script>
+  export default{
+    name: 'EditAddressModal',
+    props: {
+      openModal: { //  弹框显示状态
+        type: Boolean,
+        default: false
+      }
+    },
+    data(){
+      return{
+        isShow: this.openModal, //  是否打开弹框
+        formItemLayout: {
+          labelCol: { span: 4 },
+          wrapperCol: { span: 16 }
+        },
+        form: {
+          name: '',
+          phone: '',
+        },
+        rules: {
+          name: [
+            { required: true, message: '请输入收货人', trigger: 'blur' }
+          ],
+          phone: [
+            { required: true, message: '请输入手机号', trigger: 'blur' },
+            { pattern: /^\d{11}$/, message: '请输入正确的手机号' }
+          ]
+        },
+        addrProvinceList: [], //  省下拉
+        addrCityList: [], //  市下拉
+        addrDistrictList: [] //  区下拉
+      }
+    },
+    methods: {
+      //  保存
+      handleSubmit(){},
+      // 获取省列表'
+      getProvinceList () {
+        getProvince().then(res => {
+          if (res.status == 200) {
+            this.addrProvinceList = res.data || []
+          } else {
+            this.addrProvinceList = []
+          }
+        })
+      },
+      // 获取城市列表
+      getCityList (val) {
+        this.addrCityList = []
+        this.addrDistrictList = []
+        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 = []
+          }
+        })
+      },
+      // 获取区县列表
+      getAreaList (val) {
+        this.addrDistrictList = []
+        this.form.districtCode = undefined
+        this.form.address = ''
+        this.getAreaListRequest(val)
+      },
+      getAreaListRequest (val) {
+        getDistrictByCity({
+          id: val
+        }).then(res => {
+          if (res.status == 200) {
+            this.addrDistrictList = res.data || []
+          } else {
+            this.addrDistrictList = []
+          }
+        })
+      },
+      // 区县变更
+      areaCharged (val) {
+        this.form.address = ''
+      }
+    },
+    watch: {
+      //  父页面传过来的弹框状态
+      openModal (newValue, oldValue) {
+        this.isShow = newValue
+      },
+      //  重定义的弹框状态
+      isShow (newValue, oldValue) {
+        if (!newValue) {
+          this.$emit('close')
+        }
+      }
+    }
+  }
+</script>
+
+<style>
+</style>

+ 163 - 1
src/views/purchasingManagement/purchaseOrder/warehousing.vue

@@ -1,8 +1,170 @@
 <template>
+  <div class="purchaseOrderWarehousing-wrap">
+    <a-page-header :ghost="false" @back="handleBack" >
+      <!-- 自定义的二级文字标题 -->
+      <template slot="subTitle">
+        <a id="purchaseOrderWarehousing-back-btn" href="javascript:;" @click="handleBack">返回列表</a>
+      </template>
+    </a-page-header>
+    <!-- 内容 -->
+    <a-page-header title="单号:CG2021010100001" ></a-page-header>
+    <a-card :bordered="false" class="purchaseOrderWarehousing-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="purchaseOrderWarehousing-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="purchaseOrderWarehousing-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="purchaseOrderWarehousing-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="purchaseOrderWarehousing-refresh">查询</a-button>
+              <a-button style="margin: 0 0 18px 8px" @click="resetSearchForm" :disabled="disabled" id="purchaseOrderWarehousing-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="purchaseOrderWarehousing-storageQuantity"
+            :value="record.storageQuantity"
+            :precision="0"
+            :min="0"
+            :max="999999"
+            placeholder="请输入" />
+        </template>
+        <!-- 仓库仓位 -->
+        <template slot="warehousePosition" slot-scope="text, record">
+          <a-cascader :options="typeData" id="purchaseOrderWarehousing-state" placeholder="请选择" allowClear v-model="record.brand" />
+        </template>
+      </s-table>
+      <div class="btn-cont">
+        <a-button type="primary" id="satellite-warehouse-inventory-add-modal-add" @click="handleWarehousing">确认入库</a-button>
+        <a-button id="satellite-warehouse-inventory-add-modal-back" @click="handleBack" style="margin-left: 15px;">返回列表</a-button>
+      </div>
+    </a-card>
+  </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' },
+          { title: '产品名称', dataIndex: 'custName', align: 'center' },
+          { title: '原厂编码', dataIndex: 'totalP', align: 'center' },
+          { title: '采购单价', dataIndex: 'totalNums', align: 'center' },
+          { title: '采购数量', scopedSlots: { customRender: 'purchaseNum' }, align: 'center' },
+          { title: '缺货数量', scopedSlots: { customRender: 'outOfStockNum' }, align: 'center' },
+          { title: '单位', dataIndex: 'mementPay', align: 'center' },
+          { title: '采购金额', dataIndex: 'shDate', align: 'center' },
+          { 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>
+<style lang="less">
+  .purchaseOrderWarehousing-wrap{
+    .btn-cont {
+    	text-align: center;
+    	margin: 35px 0 10px;
+    }
+  }
 </style>

+ 2 - 2
vue.config.js

@@ -108,8 +108,8 @@ const vueConfig = {
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        // target: 'http://192.168.0.12:8503/qpls-md',
-        target: 'http://it.test.zyucgj.com/zyit',
+        target: 'http://192.168.31.87:8503/qpls-md',
+        // target: 'http://it.test.zyucgj.com/zyit',
         // target: 'https://it.test.qiubcar.com/zyit',
         ws: false,
         changeOrigin: true,