chenrui 4 rokov pred
rodič
commit
9d7369086a

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

@@ -293,6 +293,64 @@ export const asyncRouterMap = [{
           }
           }
         ]
         ]
       },
       },
+      {
+        path: '/salesManagement/quotation',
+        redirect: '/salesManagement/quotation/list',
+        name: 'quotation',
+        component: RouteView,
+        meta: {
+          title: '报价单',
+          icon: 'idcard'
+          // permission: 'M_goodsManage_list'
+        },
+        hideChildrenInMenu: true,
+        children: [
+          {
+            path: '/salesManagement/quotation/list',
+            name: 'quotationList',
+            component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/quotation/list.vue'),
+            meta: {
+              title: '报价单列表',
+              icon: 'profile',
+              hidden: true
+              // permission: 'M_goodsManage_list'
+            }
+          },
+          {
+            path: '/salesManagement/quotation/add',
+            name: 'quotationAdd',
+            component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/quotation/edit.vue'),
+            meta: {
+              title: '新增报价单',
+              icon: 'profile',
+              hidden: true
+              // permission: 'M_goodsManage_list'
+            }
+          },
+          {
+            path: '/salesManagement/quotation/edit/:id',
+            name: 'quotationEdit',
+            component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/quotation/edit.vue'),
+            meta: {
+              title: '编辑报价单',
+              icon: 'profile',
+              hidden: true
+              // permission: 'M_goodsManage_list'
+            }
+          },
+          {
+            path: '/salesManagement/quotation/detail/:id',
+            name: 'quotationDetail',
+            component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/quotation/detail.vue'),
+            meta: {
+              title: '报价单详情',
+              icon: 'profile',
+              hidden: true
+              // permission: 'M_goodsManage_list'
+            }
+          }
+        ]
+      },
       {
       {
         path: '/salesManagement/giftRecord',
         path: '/salesManagement/giftRecord',
         redirect: '/salesManagement/giftRecord/list',
         redirect: '/salesManagement/giftRecord/list',

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

@@ -1,13 +1,6 @@
 <template>
 <template>
   <div class="bulkWarehousingOrderEdit-wrap">
   <div class="bulkWarehousingOrderEdit-wrap">
     <!-- 内容 -->
     <!-- 内容 -->
-    <!-- <a-page-header title="单号:CG2021010100001" style="margin-top: -24px;" >
-      <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-page-header :ghost="false" @back="handleBack" >
     <a-page-header :ghost="false" @back="handleBack" >
       <!-- 自定义的二级文字标题 -->
       <!-- 自定义的二级文字标题 -->
       <template slot="subTitle">
       <template slot="subTitle">

+ 1 - 1
src/views/purchasingManagement/purchaseOrder/basicInfoModal.vue

@@ -4,7 +4,7 @@
     class="purchaseOrder-basicInfo-modal"
     class="purchaseOrder-basicInfo-modal"
     :footer="null"
     :footer="null"
     :maskClosable="false"
     :maskClosable="false"
-    title="新采购单"
+    title="新采购单"
     v-model="isShow"
     v-model="isShow"
     @cancle="isShow=false"
     @cancle="isShow=false"
     width="80%">
     width="80%">

+ 129 - 0
src/views/salesManagement/quotation/basicInfoModal.vue

@@ -0,0 +1,129 @@
+<template>
+  <a-modal
+    centered
+    class="quotation-basicInfo-modal"
+    :footer="null"
+    :maskClosable="false"
+    title="选择客户"
+    v-model="isShow"
+    @cancle="isShow=false"
+    width="80%">
+    <a-form-model
+      id="quotation-basicInfo-form"
+      ref="ruleForm"
+      :model="form"
+      :rules="rules"
+      :label-col="formItemLayout.labelCol"
+      :wrapper-col="formItemLayout.wrapperCol" >
+      <a-form-model-item label="客户名称" prop="name" extra="(未搜索到客户时可直接录入,但客户信息不保存于客户资料)">
+        <a-auto-complete id="quotation-basicInfo-bundleName" allowClear v-model="form.name" placeholder="请输入客户名称">
+          <template slot="dataSource">
+            <a-select-option v-for="item in optData" :key="item">{{ item }}</a-select-option>
+          </template>
+        </a-auto-complete>
+      </a-form-model-item>
+      <a-form-model-item label="价格类型" prop="priceType">
+      	<v-select code="PRICE_TYPE" id="quotation-basicInfo-priceType" v-model="form.priceType" allowClear placeholder="请选择价格类型" ></v-select>
+      </a-form-model-item>
+      <a-form-model-item label="电话" prop="phone">
+        <a-input id="quotation-basicInfo-bundleName" v-model="form.bundleName" allowClear :maxLength="30" placeholder="请输入电话(最多30个字符)"/>
+      </a-form-model-item>
+      <a-form-model-item label="联系人" prop="phone">
+        <a-input id="quotation-basicInfo-bundleName" v-model="form.bundleName" allowClear :maxLength="30" placeholder="请输入联系人(最多30个字符)"/>
+      </a-form-model-item>
+      <a-form-model-item label="备注" prop="phone">
+        <a-textarea id="quotation-basicInfo-bundleName" v-model="form.bundleName" allowClear :maxLength="120" placeholder="请输入备注(最多120个字符)"/>
+      </a-form-model-item>
+    </a-form-model>
+    <div class="btn-cont">
+      <a-button type="primary" id="quotation-basicInfo-modal-submit" @click="handleSubmit">提交</a-button>
+      <a-button id="quotation-basicInfo-modal-back" @click="isShow = false" style="margin-left: 15px;">取消</a-button>
+    </div>
+  </a-modal>
+</template>
+
+<script>
+  import { VSelect } from '@/components'
+  export default{
+    name: 'BasicInfoModal',
+    components: { VSelect },
+    props: {
+      openModal: { //  弹框显示状态
+        type: Boolean,
+        default: false
+      }
+    },
+    data(){
+      return{
+        isShow: this.openModal, //  是否打开弹框
+        formItemLayout: {
+          labelCol: { span: 6 },
+          wrapperCol: { span: 16 }
+        },
+        form: {
+          name: '', // 仓库名称
+          priceType: undefined,  //  价格类型
+        },
+        rules: {
+          name: [
+            { required: true, message: '请输入客户名称', trigger: 'blur' }
+          ],
+          priceType: [
+            { required: true, message: '请选择价格类型', trigger: 'change' },
+          ],
+        },
+        optData: ['aa', 'bb', 'cc'],
+        dataSource: [
+          {name: '111', id:1},
+          {name: '222', id:2},
+          {name: '333', id:3},
+        ],
+      }
+    },
+    methods: {
+      //  提交
+      handleSubmit(){
+        const _this = this
+        // this.$refs.ruleForm.validate(valid => {
+        //   if (valid) {
+            _this.$emit('ok')
+            _this.isShow = false
+        //   } else {
+        //     console.log('error submit!!')
+        //     return false
+        //   }
+        // })
+      },
+      filterOption(input, option) {
+        console.log(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">
+  .quotation-basicInfo-modal{
+    .ant-modal-body {
+    	padding: 40px 40px 24px;
+    }
+    .btn-cont {
+    	text-align: center;
+    	margin: 35px 0 10px;
+    }
+  }
+</style>

+ 132 - 0
src/views/salesManagement/quotation/detail.vue

@@ -0,0 +1,132 @@
+<template>
+  <div class="quotationDetail-wrap">
+    <a-page-header :ghost="false" @back="handleBack" class="quotationDetail-back">
+      <!-- 自定义的二级文字标题 -->
+      <template slot="subTitle">
+        <a id="quotationDetail-back-btn" href="javascript:;" @click="handleBack">返回列表</a>
+      </template>
+      <!-- 操作区,位于 title 行的行尾 -->
+      <template slot="extra">
+        <a-button key="3" type="danger" id="quotationDetail-export-btn">导出</a-button>
+        <a-button key="2" id="quotationDetail-preview-btn">打印预览</a-button>
+        <a-button key="1" type="primary" id="quotationDetail-print-btn">快速打印</a-button>
+      </template>
+    </a-page-header>
+    <a-card :bordered="false" class="quotationDetail-cont">
+      <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-item label="备注">箭冠营销中心</a-descriptions-item>
+        <a-descriptions-item label="业务员">箭冠营销中心</a-descriptions-item>
+        <a-descriptions-item label="制单人">箭冠营销中心</a-descriptions-item>
+      </a-descriptions>
+    </a-card>
+    <!-- 总计 -->
+    <a-alert type="info" showIcon style="margin-bottom:15px">
+      <div slot="message">总款数:<strong>1</strong>,总数量:<strong>1</strong>,总赠品数量:<strong>0</strong>,总售价:<strong>14</strong>,总成本:<strong>6.33</strong>,总毛利: <strong>6</strong></div>
+    </a-alert>
+    <a-card :bordered="false" class="quotationDetail-cont">
+      <!-- 列表 -->
+      <s-table
+        class="sTable"
+        ref="table"
+        size="default"
+        :rowKey="(record) => record.id"
+        :columns="columns"
+        :data="loadData"
+        bordered></s-table>
+    </a-card>
+  </div>
+</template>
+
+<script>
+  import { STable, VSelect } from '@/components'
+  export default{
+    components: { STable, VSelect },
+    data(){
+      return{
+        queryParam: {
+          
+        },
+        disabled: false, //  查询、重置按钮是否可操作
+        brandData: [],  //  产品品牌  下拉数据
+        typeData: [],  //  产品类别  下拉数据
+        // 表头
+        columns: [
+          { title: '序号', dataIndex: 'no', width: 70, align: 'center' },
+          { title: '产品编码', dataIndex: 'creatDate', align: 'center' },
+          { title: '产品名称', dataIndex: 'custNahme', align: 'center', ellipsis: true },
+          { title: '原厂编码', dataIndex: 'totalP', align: 'center' },
+          { title: '品牌', dataIndex: 'custsN2agme', align: 'center' },
+          { title: '成本价', dataIndex: 'transferOutQuantity', align: 'center' },
+          { title: '销售价', dataIndex: 'custsNsagme', align: 'center' },
+          { title: '数量', dataIndex: 'custsNagme', align: 'center' },
+          { title: '单位', dataIndex: 'warehouse', align: 'center' },
+          { title: '售价小计', dataIndex: 'warehouseLoc', 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)
+      },
+      //  提交
+      handleSubmit(){},
+      //  返回列表
+      handleBack(){
+        this.$router.push({ path: '/salesManagement/quotation/list'})
+      },
+    }
+  }
+</script>
+
+<style lang="less">
+  .quotationDetail-wrap{
+    .quotationDetail-back{
+      margin-bottom: 15px;
+    }
+    .quotationDetail-cont{
+      margin-bottom: 15px;
+    }
+  }
+</style>

+ 370 - 0
src/views/salesManagement/quotation/edit.vue

@@ -0,0 +1,370 @@
+<template>
+  <div class="quotationEdit-wrap">
+    <!-- 内容 -->
+    <a-page-header :ghost="false" @back="handleBack" class="quotationEdit-cont">
+      <!-- 自定义的二级文字标题 -->
+      <template slot="subTitle">
+        <a id="quotationEdit-back-btn" href="javascript:;" @click="handleBack">返回列表</a>
+      </template>
+      <!-- 操作区,位于 title 行的行尾 -->
+      <template slot="extra">
+        <a-button key="2" id="quotationEdit-preview-btn">打印预览</a-button>
+        <a-button key="1" type="primary" id="quotationEdit-print-btn">快速打印</a-button>
+      </template>
+    </a-page-header>
+    <!-- 基础信息 -->
+    <a-card :bordered="false" class="quotationEdit-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="quotationEdit-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-item label="备注">箭冠营销中心</a-descriptions-item>
+          </a-descriptions>
+        </a-collapse-panel>
+      </a-collapse>
+    </a-card>
+    <!-- 选择产品 -->
+    <a-card :bordered="false" class="quotationEdit-cont">
+      <a-collapse :activeKey="['1']">
+        <a-collapse-panel key="1">
+          <template slot="header">选择产品</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="quotationEdit-bundleName" v-model.trim="queryParam.bundleName" allowClear placeholder="请输入产品编码"/>
+                    </a-form-item>
+                  </a-col>
+                  <a-col :md="6" :sm="24">
+                    <a-form-item label="产品名称">
+                      <a-input id="quotationEdit-bundleName" v-model.trim="queryParam.bundleName" allowClear placeholder="请输入产品名称"/>
+                    </a-form-item>
+                  </a-col>
+                  <a-col :md="6" :sm="24">
+                    <a-form-item label="原厂编码">
+                      <a-input id="quotationEdit-bundleName" v-model.trim="queryParam.bundleName" allowClear placeholder="请输入原厂编码"/>
+                    </a-form-item>
+                  </a-col>
+                  <template v-if="advanced">
+                    <a-col :md="6" :sm="24">
+                      <a-form-item label="车架号(VIN)">
+                        <a-input id="quotationEdit-bundleName" v-model.trim="queryParam.bundleName" allowClear placeholder="请输入车架号(VIN)"/>
+                      </a-form-item>
+                    </a-col>
+                    <a-col :md="6" :sm="24">
+                      <a-form-item label="产品品牌">
+                        <a-select placeholder="请选择" id="quotationEdit-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="quotationEdit-state" placeholder="请选择产品类别" allowClear v-model="queryParam.brand" />
+                      </a-form-item>
+                    </a-col>
+                  </template>
+                  <a-col :md="6" :sm="24">
+                    <a-button style="margin-bottom: 18px;" type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="quotationEdit-refresh">查询</a-button>
+                    <a-button style="margin: 0 0 18px 8px" @click="resetSearchForm" :disabled="disabled" id="quotationEdit-reset">重置</a-button>
+                    <a @click="advanced=!advanced" style="margin-left: 8px">
+                      {{ advanced ? '收起' : '展开' }}
+                      <a-icon :type="advanced ? 'up' : 'down'"/>
+                    </a>
+                  </a-col>
+                </a-row>
+              </a-form>
+            </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="quotationEdit-storageQuantity"
+                  :value="record.storageQuantity"
+                  :precision="0"
+                  :min="0"
+                  :max="999999"
+                  placeholder="请输入" />
+              </template>
+              <!-- 操作 -->
+              <template slot="action" slot-scope="text, record">
+                <a-button size="small" type="primary" @click="handleAdd(record)" id="quotationEdit-add-btn">添加</a-button>
+              </template>
+            </s-table>
+          </div>
+        </a-collapse-panel>
+      </a-collapse>
+    </a-card>
+    <!-- 已选产品 -->
+    <a-card :bordered="false" class="quotationEdit-cont">
+      <a-collapse :activeKey="['1']">
+        <a-collapse-panel key="1">
+          <template slot="header">已选产品</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>
+            <!-- 搜索条件 -->
+            <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="quotationEdit-bundleName" v-model.trim="queryParam.bundleName" allowClear placeholder="请输入产品编码"/>
+                    </a-form-item>
+                  </a-col>
+                  <a-col :md="6" :sm="24">
+                    <a-form-item label="产品名称">
+                      <a-input id="quotationEdit-bundleName" v-model.trim="queryParam.bundleName" allowClear placeholder="请输入产品名称"/>
+                    </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="quotationEdit-refresh">查询</a-button>
+                    <a-button style="margin: 0 0 18px 8px" @click="resetSearchForm" :disabled="disabled" id="quotationEdit-reset">重置</a-button>
+                  </a-col>
+                </a-row>
+              </a-form>
+            </div>
+            <!-- 列表 -->
+            <s-table
+              class="sTable"
+              ref="table"
+              size="default"
+              :rowKey="(record) => record.id"
+              :columns="chooseColumns"
+              :data="chooseLoadData"
+              bordered>
+              <!-- 销售价 -->
+              <template slot="mementPay" slot-scope="text, record">
+                <a-input-number
+                  id="quotationEdit-mementPay"
+                  :value="record.mementPay"
+                  :precision="0"
+                  :min="0"
+                  :max="999999"
+                  placeholder="请输入" />
+              </template>
+              <!-- 销售数量 -->
+              <template slot="storageQuantity" slot-scope="text, record">
+                <a-input-number
+                  id="quotationEdit-storageQuantity"
+                  :value="record.storageQuantity"
+                  :precision="0"
+                  :min="0"
+                  :max="999999"
+                  placeholder="请输入" />
+              </template>
+              <!-- 操作 -->
+              <template slot="action" slot-scope="text, record">
+                <a-button size="small" type="primary" @click="handleDel(record)" id="quotationEdit-del-btn">删除</a-button>
+              </template>
+            </s-table>
+          </div>
+        </a-collapse-panel>
+      </a-collapse>
+    </a-card>
+    <a-affix :offset-bottom="0">
+      <div style="text-align: center;width: 100%;background-color: #fff;padding: 30px 0;box-shadow: 0 0 20px #dcdee2;">
+        <a-button type="danger" id="quotationEdit-transfer-order" size="large" @click="handleTransferOrder" style="padding: 0 60px;margin: 0 30px;">转销售单</a-button>
+        <a-button type="primary" id="quotationEdit-submit" size="large" @click="handleSubmit" style="padding: 0 60px;margin: 0 30px;">提交</a-button>
+      </div>
+    </a-affix>
+    <!-- 选择基本信息弹框 -->
+    <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: [],  //  产品类别  下拉数据
+        advanced: false,  //  高级搜索 展开/关闭
+        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' },
+          { title: '品牌', dataIndex: 'totalNums', align: 'center', sorter: true },
+          { title: '单位', scopedSlots: { customRender: 'outOfStockNum' }, align: 'center' },
+          { title: '成本价(¥)', dataIndex: 'mementPay', align: 'center' },
+          { title: '销售指导价(¥)', dataIndex: 'storageQuantity', 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: 'no', align: 'center' },
+          { title: '产品编码', dataIndex: 'creatDaite', align: 'center', sorter: true },
+          { title: '产品名称', dataIndex: 'custNayme', align: 'center' },
+          { title: '原厂编码', dataIndex: 'totalP', align: 'center' },
+          { title: '品牌', dataIndex: 'totalNums', align: 'center', sorter: true },
+          { title: '销售价', scopedSlots: { customRender: '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)
+      },
+      //  转销售单
+      handleTransferOrder(){},
+      //  提交
+      handleSubmit(){},
+      //  添加
+      handleAdd(row){},
+      //  删除
+      handleDel(row){},
+      //  编辑基本信息
+      handleEditInfo(){
+        this.openModal = true
+      },
+      //  基本信息  保存
+      handleOk(){
+        
+      },
+      //  返回列表
+      handleBack(){
+        this.$router.push({ path: '/salesManagement/quotation/list'})
+      },
+      //  编辑客户名称
+      handleEditCustom(){},
+      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">
+  .quotationEdit-wrap{
+    .quotationEdit-cont{
+      margin-bottom: 15px;
+      .sub-title{
+        font-size: 12px;
+        color: #808695;
+        margin-left: 10px;
+      }
+      .tag-txt{
+        font-size: 12px;
+        color: #ed1c24;
+      }
+      .edit-circle-btn{
+        margin-left: 15px;
+        i{
+          vertical-align: text-bottom;
+        }
+      }
+      .import-btn{
+        margin-left: 15px;
+      }
+    }
+  }
+</style>

+ 208 - 0
src/views/salesManagement/quotation/list.vue

@@ -0,0 +1,208 @@
+<template>
+  <a-card :bordered="false" class="quotationList-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="quotationList-creatTime"
+                  :disabledDate="disabledDate"
+                  v-model="time"
+                  :format="dateFormat"
+                  :placeholder="['开始时间', '结束时间']" />
+              </a-form-item>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="24">
+            <a-form-item label="客户名称">
+              <a-select id="quotationList-bundleName" placeholder="请选择" 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-input id="quotationList-bundleName" v-model.trim="queryParam.bundleName" allowClear placeholder="请输入关联销售单号"/>
+            </a-form-item>
+          </a-col>
+          <template v-if="advanced">
+            <a-col :md="6" :sm="24">
+              <a-form-item label="报价单号">
+                <a-input id="quotationList-bundleName" v-model.trim="queryParam.bundleName" allowClear placeholder="请输入产品编码"/>
+              </a-form-item>
+            </a-col>
+          </template>
+          <a-col :md="6" :sm="24">
+            <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="quotationList-refresh">查询</a-button>
+            <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="quotationList-reset">重置</a-button>
+            <a @click="advanced=!advanced" style="margin-left: 8px">
+              {{ advanced ? '收起' : '展开' }}
+              <a-icon :type="advanced ? 'up' : 'down'"/>
+            </a>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 操作按钮 -->
+    <div class="table-operator">
+      <a-button id="quotationList-add" type="primary" @click="handleAdd()">新增报价单</a-button>
+    </div>
+    <!-- 列表 -->
+    <s-table
+      class="sTable"
+      ref="table"
+      size="default"
+      :rowKey="(record) => record.id"
+      :columns="columns"
+      :data="loadData"
+      bordered>
+      <!-- 是否转销售单 -->
+      <template slot="invenstoryNum" slot-scope="text, record">
+        <span>{{record.invenstoryNum == 1 ? '是' : '否'}}</span>
+      </template>
+      <!-- 操作 -->
+      <template slot="action" slot-scope="text, record">
+        <a-button size="small" type="primary" @click="handleEdit(record)" id="quotationList-edit-btn">编辑</a-button>
+        <a-button size="small" @click="handleDetail(record)" id="quotationList-detail-btn" style="margin: 0 0 10px 8px">详情</a-button>
+        <a-button size="small" type="danger" @click="handleDel(record)" id="quotationList-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 { getProvince, getCityByPro, getDistrictByCity } from '@/api/data'
+import { STable, VSelect } from '@/components'
+import basicInfoModal from './basicInfoModal.vue'
+export default {
+  components: { STable, VSelect, basicInfoModal },
+  data () {
+    return {
+      advanced: false,  // 高级搜索 展开/关闭
+      queryParam: { //  查询条件
+        bundleName: '', //  供应商名称
+        state: undefined,  //  状态
+      },
+      disabled: false, //  查询、重置按钮是否可操作
+      dateFormat: 'YYYY-MM-DD',
+      time: [],  //  创建时间
+      columns: [
+        { title: '序号', dataIndex: 'no', width: 70, align: 'center' },
+        { title: '创建时间', dataIndex: 'inventoryMoney', width: 180, align: 'center' },
+        { title: '报价单号', dataIndex: 'inventosryMoney', width: 180, align: 'center' },
+        { title: '关联销售单号', dataIndex: 'productType', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '客户名称', dataIndex: 'productName', width: 200, align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
+        { title: '总款数', dataIndex: 'productBrand', width: 200, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '总数量', dataIndex: 'psroductBrand', width: 200, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '总价格', dataIndex: 'invdentoryNum', width: 180, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '是否转销售单', scopedSlots: { customRender: 'invenstoryNum' }, width: 180, align: 'center' },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: 240, 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', productNum: 'jgqp11111111111', productName: '产品1', productOldNum: 'jgqp111123545', productBrand: '箭冠品牌', productType: '产品分类1', inventoryNum: '5', inventoryMoney: '122' }
+            ]
+          }
+          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)
+        })
+      },
+      brandData: [],
+      openModal: false, // 基本信息弹框是否显示
+    }
+  },
+  methods: {
+    // 不可选日期
+    disabledDate (date, dateStrings) {
+      return date && date.valueOf() > Date.now()
+    },
+    filterOption(input, option) {
+    	return (
+    		option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+    	)
+    },
+    //  重置
+    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)
+    },
+    //  基本信息  保存
+    handleOk(){
+      this.$router.push({ path: `/salesManagement/quotation/add` })
+    },
+    //  新增
+    handleAdd(){
+      this.openModal = true
+    },
+    //  编辑
+    handleEdit (row) {
+      this.$router.push({ path: `/salesManagement/quotation/edit/${row.id}`})
+    },
+    //  详情
+    handleDetail(row){
+      this.$router.push({ path: `/salesManagement/quotation/detail/${row.id}`})
+    },
+    //  删除
+    handleDel(row){
+      const _this = this
+      this.$confirm({
+        title: '提示',
+        content: '删除后不可恢复,确定要进行删除吗?',
+        okText: '确定',
+        cancelText: '取消',
+        centered: true,
+        onOk () {
+          // warehouseDel({
+          //   id: row.id
+          // }).then(res => {
+          //   if (res.status == 200) {
+          //     _this.$message.success(res.message)
+          //     _this.$refs.table.refresh()
+          //   }
+          // })
+        }
+      })
+    },
+  }
+}
+</script>
+
+<style lang="less">
+  .quotationList-wrap{
+    .sTable{
+      table{
+        width: auto;
+      }
+    }
+  }
+</style>