浏览代码

Merge branch 'develop_yh13' of http://git.chelingzhu.com/jianguan-web/qpls-md-html into develop_yh13

lilei 2 年之前
父节点
当前提交
55add4a893

+ 42 - 5
src/config/router.config.js

@@ -693,8 +693,7 @@ export const asyncRouterMap = [
           //   children: [
           //     {
           //       path: 'list',
-          //       name: 'accountManagementList',
-          //       component: () => import(/* webpackChunkName: "numsGoodsShelves" */ '@/views/numsGoodsShelves/accountManagement/list.vue'),
+          //       name: 'accountManagementList',        //       component: () => import(/* webpackChunkName: "numsGoodsShelves" */ '@/views/numsGoodsShelves/accountManagement/list.vue'),
           //       meta: {
           //         title: '账户明细列表',
           //         icon: 'monitor',
@@ -702,10 +701,48 @@ export const asyncRouterMap = [
           //         // permission: 'M_salesQueryList'
           //       }
           //     }
-          //   ]
+           //   ]
           // }
         ]
       },
+      // 购物车
+      {
+        path: '/shoppingCarManagement',
+        redirect: '/shoppingCarManagement/shoppingCar',
+        component: PageView,
+        meta: {
+          title: '购物车管理',
+          icon: 'contacts'
+          // permission: 'M_supplierInfoList'
+           },
+         children: [
+          {
+            path: '/shoppingCarManagement/shoppingCar',
+            redirect: '/shoppingCarManagement/shoppingCar/list',
+            name: 'shoppingCar',
+            component: BlankLayout,
+            meta: {
+              title: '购物车',
+              icon: 'contacts'
+              // permission: 'M_supplierInfoList'
+           },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'shoppingCarList',
+                component: () => import(/* webpackChunkName: "productManagement" */ '@/views/shoppingCarManagement/shoppingCar/list.vue'),
+                meta: {
+                  title: '购物车列表',
+                  icon: 'contacts',
+                  hidden: true
+                  // permission: 'M_supplierInfoList'
+                }
+              }
+            ]
+          }
+        ]
+      },
       // 采购管理
       {
         path: '/purchasingManagement',
@@ -754,7 +791,7 @@ export const asyncRouterMap = [
               {
                 path: 'edit/:sn/:dealerSn',
                 name: 'purchaseOrderEdit',
-                component: () => import(/* webpackChunkName: "purchasingManagement" */ '@/views/purchasingManagement/purchaseOrder/edit.vue'),
+                component: () => import(/* webpackChunkName: purchasingManagement" */ '@/views/purchasingManagement/purchaseOrder/edit.vue'),
                 meta: {
                   title: '编辑采购单',
                   icon: 'file-done',
@@ -813,7 +850,7 @@ export const asyncRouterMap = [
               {
                 path: 'edit/:sn/:dealerSn',
                 name: 'purchaseOrderNewEdit',
-                component: () => import(/* webpackChunkName: "purchasingManagement" */ '@/views/purchasingManagement/purchaseOrderNew/edit.vue'),
+               component: () => import(/* webpackChunkName: "purchasingManagement" */ '@/views/purchasingManagement/purchaseOrderNew/edit.vue'),
                 meta: {
                   title: '编辑采购单',
                   icon: 'file-done',

+ 17 - 6
src/views/inventoryManagement/inventoryQuery/list.vue

@@ -112,6 +112,9 @@
           <div style="display: inline-block;" v-if="$hasPermissions('M_ShowAllCost')">
             可用库存总成本:<strong>{{ currentStock&&(currentStock.totalCurrentStockCost || currentStock.totalCurrentStockCost==0) ? toThousands(currentStock.totalCurrentStockCost) : '--' }}</strong>。
           </div>
+          <div style="display: inline-block;color:#f30f30;margin-left: 60px;" >
+            注意:购物车仅限添加箭冠产品。
+          </div>
         </div>
       </a-alert>
       <!-- 列表 -->
@@ -153,12 +156,15 @@
             class="button-primary"
             @click="goWarehouseDetail(record)"
             id="inventoryQueryList-warehouseDetail-btn">出入库明细</a-button>
+          <a-button type="link" @click="addShopCar">加入购物车</a-button>
           <span v-if="!$hasPermissions('B_inventoryInventoryQueryDetail') && !$hasPermissions('B_inventoryInventoryQueryStock')">--</span>
         </template>
       </s-table>
     </a-spin>
     <!-- 库存详情 -->
     <inventory-query-detail-modal v-drag :openModal="openModal" :nowData="nowData" @close="closeModal" />
+    <!-- 设置采购数量 -->
+    <set-purchase-qty :openModal="openPurchaseModal" @close="openPurchaseModal=false" v-drag></set-purchase-qty>
   </a-card>
 </template>
 
@@ -170,10 +176,11 @@ import ProductBrand from '../../common/productBrand.js'
 import Warehouse from '@/views/common/warehouse.js'
 import { STable, VSelect } from '@/components'
 import inventoryQueryDetailModal from './detailModal.vue'
+import setPurchaseQty from './setPurchaseQty.vue'
 import { downloadExcel } from '@/libs/JGPrint.js'
 export default {
   name: 'InventoryQueryList',
-  components: { STable, VSelect, inventoryQueryDetailModal, ProductType, ProductBrand, Warehouse },
+  components: { STable, VSelect, inventoryQueryDetailModal, ProductType, ProductBrand, Warehouse, setPurchaseQty },
   mixins: [commonMixin],
   data () {
     return {
@@ -190,7 +197,7 @@ export default {
         productTypeSn3: '', //  产品分类3
         warehouse: [],
         warehouseSn: '',
-        warehouseLocationSn:'',
+        warehouseLocationSn: '',
         zeroQtyFlag: false, //  库存情况
         enableFlag: true, // 显示禁用产品
         minUnsalableDays: undefined, // 滞销天数最小值
@@ -204,6 +211,7 @@ export default {
         { name: '库存数量为0', id: '1' },
         { name: '库存数量不为0', id: '0' }
       ],
+      openPurchaseModal: false,
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         console.log(parameter)
@@ -230,11 +238,11 @@ export default {
           params.product = {
             sysFlag: params.productSysFlag || undefined
           }
-          
+
           // 仓库仓位
           params.warehouseSn = params.warehouse[0]
           params.warehouseLocationSn = params.warehouse[1]
-          
+
           return stockList(params).then(res => {
             let data
             if (res.status == 200) {
@@ -280,7 +288,7 @@ export default {
         { title: '可用库存数量(个)', dataIndex: 'currentStockQty', width: '8%', align: 'center', sorter: true, customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { title: '可用库存成本(¥)', dataIndex: 'currentStockCost', width: '8%', align: 'center', sorter: true, customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: <div><a-tooltip placement='top' title='1:产品距离最近一次销售的时间,30天算一个月 2:采购退货,调拨等不算销售,不用来计算滞销天数'><a-icon type="question-circle" /></a-tooltip>&nbsp;滞销天数</div>, width: '10%', align: 'center', dataIndex: 'unsalableDays', scopedSlots: { customRender: 'unsalableDays' }, sorter: true },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: '16%', align: 'center' }
       ]
       if (this.$hasPermissions('M_ShowAllCost')) {
         arr.splice(7, 0, { title: '可用库存成本(¥)', dataIndex: 'currentStockCost', width: '8%', align: 'right', sorter: true, customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
@@ -289,6 +297,9 @@ export default {
     }
   },
   methods: {
+    addShopCar () {
+      this.openPurchaseModal = true
+    },
     // 校验滞销天数数值范围
     checkValueRange () {
       const isONull = this.queryParam.minUnsalableDays === null || this.queryParam.minUnsalableDays === undefined
@@ -349,7 +360,7 @@ export default {
       this.queryParam.productTypeName = undefined
       this.queryParam.zeroQtyFlag = false
       this.queryParam.warehouse = []
-      this.queryParam.warehouseSn =  ''
+      this.queryParam.warehouseSn = ''
       this.queryParam.warehouseLocationSn = ''
       this.$refs.warehouse.setDefaultVal()
       this.productTypeSn = []

+ 161 - 0
src/views/inventoryManagement/inventoryQuery/setPurchaseQty.vue

@@ -0,0 +1,161 @@
+<template>
+  <a-modal
+    centered
+    class="setPurchaseQty-modal"
+    :footer="null"
+    :maskClosable="false"
+    title="设置采购数量"
+    v-model="isShow"
+    @cancel="isShow = false"
+    :width="600">
+    <a-spin :spinning="spinning" tip="Loading...">
+      <a-form-model
+        id="setPurchaseQty-form"
+        ref="ruleForm"
+        :model="form"
+        :rules="rules"
+        :label-col="formItemLayout.labelCol"
+        :wrapper-col="formItemLayout.wrapperCol"
+      >
+        <a-form-model-item label="产品名称:" prop="checkType">
+          BBB滤清器
+        </a-form-model-item>
+        <a-form-model-item label="产品编码" prop="warehouseFlag">
+          XX-108
+        </a-form-model-item>
+        <a-form-model-item label="采购数量" prop="warehouseSnList">
+          <a-input-number
+            id="shelfMonitoringList-maxUnsalableDays"
+            v-model="formItemLayout.wrapperCol"
+            :precision="0"
+            :min="0"
+            :max="999999"
+            placeholder="采购数量"/>
+        </a-form-model-item>
+      </a-form-model>
+      <div class="btn-cont">
+        <a-button type="primary" id="setPurchaseQty-modal-save" @click="handleSave">保存</a-button>
+        <a-button id="setPurchaseQty-modal-back" @click="isShow = false" style="margin-left: 15px;">取消</a-button>
+      </div>
+    </a-spin>
+  </a-modal>
+</template>
+
+<script>
+import { commonMixin } from '@/utils/mixin'
+import { VSelect } from '@/components'
+import { checkWarehouseSave, checkWarehouseWarehouse } from '@/api/checkWarehouse'
+export default {
+  name: 'ChainTransferOutBasicInfoModal',
+  components: { VSelect },
+  mixins: [commonMixin],
+  props: {
+    openModal: {
+      //  弹框显示状态
+      type: Boolean,
+      default: false
+    }
+  },
+  data () {
+    return {
+      spinning: false,
+      isShow: this.openModal, //  是否打开弹框
+      formItemLayout: {
+        labelCol: { span: 4 },
+        wrapperCol: { span: 20 }
+      },
+      form: {
+        checkType: 'ALL',
+        warehouseFlag: '0',
+        warehouseSnList: undefined
+      },
+      rules: {
+        checkType: [{ required: true, message: '请选择盘点类型', trigger: 'change' }],
+        warehouseFlag: [{ required: true, message: '请选择是否区分仓库', trigger: 'change' }],
+        warehouseSnList: [{ required: true, message: '请选择盘点仓库', trigger: 'change' }]
+      },
+      checkTypeList: [
+        { dispName: '全盘', code: 'ALL' },
+        { dispName: '自选盘点', code: 'SELECT' }
+      ],
+      warehouseFlagList: [
+        { dispName: '不区分仓库', code: '0' },
+        { dispName: '区分仓库', code: '1' }
+      ],
+      warehouseList: []
+    }
+  },
+  methods: {
+    //  保存
+    handleSave () {
+      const _this = this
+      this.$refs.ruleForm.validate(valid => {
+        if (valid) {
+          const form = JSON.parse(JSON.stringify(_this.form))
+          if (form.checkType == 'ALL') {
+            delete form.warehouseFlag
+          }
+          if (form.warehouseSnList) {
+            form.warehouseSnList = form.warehouseSnList.join(',')
+          }
+          _this.spinning = true
+          checkWarehouseSave(form).then(res => {
+            if (res.status == 200) {
+              _this.$message.success(res.message)
+              setTimeout(() => {
+                _this.isShow = false
+                _this.$emit('ok', res.data)
+                _this.spinning = false
+              }, 1000)
+            } else {
+              _this.spinning = false
+            }
+          })
+        } else {
+          console.log('error submit!!')
+          return false
+        }
+      })
+    },
+    checkTypeChange (e) {
+      this.form.warehouseFlag = '0'
+      this.form.warehouseSnList = undefined
+    },
+    warehouseFlagChange (e) {
+      this.form.warehouseSnList = undefined
+    },
+    // 获取仓库列表
+    getWarehouseList () {
+      checkWarehouseWarehouse({}).then(res => {
+        if (res.status == 200) {
+          this.warehouseList = res.data || []
+        } else {
+          this.warehouseList = []
+        }
+      })
+    }
+  },
+  watch: {
+    //  父页面传过来的弹框状态
+    openModal (newValue, oldValue) {
+      this.isShow = newValue
+    },
+    //  重定义的弹框状态
+    isShow (newValue, oldValue) {
+      if (!newValue) {
+        this.$emit('close')
+        this.$refs.ruleForm.resetFields()
+      }
+    }
+  }
+}
+</script>
+
+<style lang="less">
+.setPurchaseQty-modal {
+	.btn-cont {
+		text-align: center;
+		margin: 35px 0 10px;
+	}
+}
+</style>

+ 9 - 2
src/views/inventoryManagement/inventoryWarning/list.vue

@@ -77,6 +77,12 @@
           <template v-if="rowSelectionInfo&&rowSelectionInfo.selectedRowKeys.length>0">{{ `已选 ${rowSelectionInfo.selectedRowKeys.length} 项` }}</template>
         </span>
       </div>
+      <!-- 合计 -->
+      <a-alert type="info" style="margin-bottom:10px">
+        <div class="ftext" slot="message" style="color:#f30f30;">
+          注意:购物车仅限添加箭冠产品。
+        </div>
+      </a-alert>
       <!-- 列表 -->
       <s-table
         class="sTable fixPagination"
@@ -160,11 +166,12 @@
             class="button-primary"
             @click="handleSave(record)"
             id="inventoryWarningList-add-btn">保存</a-button>
+          <a-button type="link">加入购物车</a-button>
           <span v-if="!$hasPermissions('B_inventoryWarningSave')">--</span>
         </template>
       </s-table>
     </a-spin>
-    
+
     <!-- 导入产品 -->
     <importGuideModal :openModal="openGuideModal" @close="openGuideModal=false" @ok="resetSearchForm" />
   </a-card>
@@ -216,7 +223,7 @@ export default {
         { title: '最小库存数(个)', scopedSlots: { customRender: 'lowerLimit' }, width: 100, align: 'center' },
         { title: '差异数量', dataIndex: 'differenceNum', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '预警提示', scopedSlots: { customRender: 'stockState' }, width: 100, align: 'center' },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: 80, align: 'center', fixed: 'right' }
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: 160, align: 'center', fixed: 'right' }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {

+ 47 - 158
src/views/shoppingCar/index.vue → src/views/shoppingCarManagement/shoppingCar/list.vue

@@ -4,46 +4,30 @@
     <div ref="tableSearch" class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchForm">
         <a-row :gutter="15">
-          <a-col :md="6" :sm="24">
+          <a-col :md="8" :sm="24">
             <a-form-item label="产品编码">
               <a-input id="shoppingCar-code" v-model.trim="queryParam.code" allowClear placeholder="请输入产品编码"/>
             </a-form-item>
           </a-col>
-          <a-col :md="6" :sm="24">
+          <a-col :md="8" :sm="24">
             <a-form-item label="产品名称">
               <a-input id="shoppingCar-name" v-model.trim="queryParam.name" allowClear placeholder="请输入产品名称"/>
             </a-form-item>
           </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="原厂编码">
-              <a-input id="shoppingCar-origCode" v-model.trim="queryParam.origCode" allowClear placeholder="请输入原厂编码"/>
+          <a-col :md="8" :sm="24">
+            <a-form-item label="产品分类">
+              <ProductType id="shoppingCar-productType" placeholder="请选择产品分类" :isDealer="true" @change="changeProductType" v-model="productType"></ProductType>
+            </a-form-item>
+          </a-col>
+          <a-col :md="8" :sm="24">
+            <a-form-item label="产品品牌">
+              <ProductBrand id="shoppingCar-productBrandSn" placeholder="请选择产品品牌" v-model="queryParam.productBrandSn"></ProductBrand>
+              </a-select>
             </a-form-item>
           </a-col>
-          <template v-if="advanced">
-            <a-col :md="6" :sm="24">
-              <a-form-item label="产品品牌">
-                <ProductBrand id="shoppingCar-productBrandSn" placeholder="请选择产品品牌" v-model="queryParam.productBrandSn"></ProductBrand>
-                </a-select>
-              </a-form-item>
-            </a-col>
-            <!-- <a-col :md="6" :sm="24">
-              <a-form-item label="产品分类">
-              <ProductType id="shoppingCar-productType" placeholder="请选择产品分类" :isDealer="true" @change="changeProductType" v-model="productType"></ProductType>
-              </a-form-item>
-            </a-col> -->
-            <a-col :md="6" :sm="24">
-              <a-form-item label="状态">
-                <v-select code="ENABLE_FLAG" id="shoppingCar-enabledFlag" v-model="queryParam.enabledFlag" allowClear placeholder="请选择状态"></v-select>
-              </a-form-item>
-            </a-col>
-          </template>
           <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
             <a-button type="primary" @click="searchForm" :disabled="disabled" id="shoppingCar-refresh">查询</a-button>
             <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="shoppingCar-reset">重置</a-button>
-            <a @click="advanced=!advanced" style="margin-left: 5px">
-              {{ advanced ? '收起' : '展开' }}
-              <a-icon :type="advanced ? 'up' : 'down'"/>
-            </a>
           </a-col>
         </a-row>
       </a-form>
@@ -52,48 +36,14 @@
     <div class="table-operator" v-if="$hasPermissions('B_JgProduct_enable')">
       <a-row :gutter="16">
         <a-col class="gutter-row" :span="12">
-          <a-dropdown>
-            <a-menu slot="overlay" @click="handleMenuClick">
-              <a-menu-item key="1"> 批量启用</a-menu-item>
-              <a-menu-item key="2"> 批量禁用</a-menu-item>
-            </a-menu>
-            <a-button ghost type="danger"> 批量操作 <a-icon type="down" /> </a-button>
-          </a-dropdown>
+          <a-button type="primary" ghost v-if="type=='globalBtn'" @click="deleteMore">
+            批量删除
+          </a-button>
+          <a-button type="primary" ghost v-else>
+            批量添加
+          </a-button>
           <span v-if="rowSelectionInfo&&rowSelectionInfo.selectedRowKeys">已选 {{ rowSelectionInfo.selectedRowKeys.length }} 项</span>
         </a-col>
-        <a-col class="gutter-row" :span="12">
-          <div class="setTableList">
-            <span @click="iconShowFlag=!iconShowFlag">列表显示配置</span>
-            <a-icon :type="iconShowFlag?'up':'down'" :style="{ color: '#d5d5d5' }" @click="iconShowFlag=!iconShowFlag"/>
-            <div class="setTableList-box" v-show="iconShowFlag">
-              <a-checkbox-group @change="onChangeList" :value="chooseShowList">
-                <div>
-                  <a-checkbox value="A">
-                    省级价
-                  </a-checkbox>
-                </div>
-                <div><a-checkbox value="B">
-                  市级建议价
-                </a-checkbox></div>
-                <div><a-checkbox value="C">
-                  特约建议价
-                </a-checkbox></div>
-                <div><a-checkbox value="D">
-                  建议终端价
-                </a-checkbox></div>
-                <div> <a-checkbox value="E">
-                  建议车主价
-                </a-checkbox></div>
-                <div> <a-checkbox value="F">
-                  自定义终端价
-                </a-checkbox></div>
-                <div><a-checkbox value="G">
-                  自定义车主价
-                </a-checkbox></div>
-              </a-checkbox-group>
-            </div>
-          </div>
-        </a-col>
       </a-row>
     </div>
     <!-- 列表 -->
@@ -111,49 +61,11 @@
       :scroll="{ y: tableHeight }"
       :defaultLoadData="false"
       bordered>
-      <!-- 产品图片 -->
-      <template slot="imageUrl" slot-scope="text, record">
-        <div v-if="record.productPicList && record.productPicList.length>0">
-          <img :src="record.productPicList[0].imageUrl+'?x-oss-process=image/resize,h_30,m_lfit' || ''" width="30" height="30" class="imageUrl" @click="inited(record.productPicList)" />
-        </div>
-        <span v-else>--</span>
-      </template>
-      <!-- 产品分类 -->
-      <template slot="productType" slot-scope="text, record">
-        <span v-if="record.productTypeName2 || record.productTypeName3">{{ record.productTypeName2 }} {{ record.productTypeName3 ? '>' : '' }} {{ record.productTypeName3 }}</span>
-        <span v-else>--</span>
-      </template>
-      <!-- 状态 -->
-      <template slot="enabledFlag" slot-scope="text, record">
-        <a-switch
-          checkedChildren="启用"
-          unCheckedChildren="禁用"
-          v-if="$hasPermissions('B_JgProduct_enable')&&record.enabledFlag!=undefined"
-          @change="changeStatus(record)"
-          :checked="record.enabledFlag == 1 ? true : false"
-        />
-        <span v-else :style="{ color: record.enabledFlag == 1 ? '#00aa00' : '#999' }">
-          {{ record.enabledFlag == 1 ? '已启用' : (record.enabledFlag!=undefined?'已禁用':'--') }}
-        </span>
-      </template>
-      <!-- 操作 -->
-      <template slot="action" slot-scope="text, record">
-        <a-button
-          size="small"
-          type="link"
-          class="button-success"
-          @click="handleDetail(record)"
-          id="shoppingCar-detail-btn">详情</a-button>
-        <a-button
-          size="small"
-          type="link"
-          class="button-primary"
-          @click="handleEditPrice(record)"
-          id="shoppingCar-price-btn">自定义报价</a-button>
+      <!-- 采购数量 -->
+      <template slot="purchaseQty" slot-scope="text, record">
+        <a-input placeholder="请输入采购数量" v-model="record.qty"/>
       </template>
     </s-table>
-    <!-- 自定义报价弹窗 -->
-    <edit-price-modal :openModal="openEditPriceModal" ref="editPrice" @close="openEditPriceModal=false" />
   </a-card>
 </template>
 
@@ -162,29 +74,28 @@ import { commonMixin } from '@/utils/mixin'
 import { productList, getCurrentDealer, productUpdate } from '@/api/product'
 import ProductType from '../../common/productType.js'
 import ProductBrand from '../../common/productBrand.js'
-import { STable, VSelect } from '@/components'
-// import { downloadExcel } from '@/libs/JGPrint.js'
-import editPriceModal from './editPriceModal.vue'
+import { STable } from '@/components'
 export default {
-  name: 'ProductJgList',
-  components: { STable, VSelect, ProductType, ProductBrand, editPriceModal },
+  name: 'ShoppingCarList',
+  components: { STable, ProductType, ProductBrand },
   mixins: [commonMixin],
+  props: {
+    type: { //  按钮状态
+      type: String,
+      default: 'globalBtn'
+    }
+  },
   data () {
     return {
-      advanced: true, // 高级搜索 展开/关闭
       tableHeight: 0,
       productType: [],
       queryParam: { //  查询条件
         code: '', //  产品编码
         name: '', //  产品名称
-        origCode: '', //  原厂编码
-        sysFlag: '1',
         productBrandSn: undefined, //  产品品牌
         productTypeSn1: '', //  产品一级分类
         productTypeSn2: '', //  产品二级分类
-        productTypeSn3: '', //  产品三级分类
-        onlineFalg: '',
-        enabledFlag: '1'
+        productTypeSn3: '' //  产品三级分类
       },
       openEditPriceModal: false, // 自定义报价弹窗
       iconShowFlag: false, // 列表配置图标显示
@@ -229,6 +140,17 @@ export default {
     }
   },
   methods: {
+    // 批量删除
+    deleteMore () {
+      this.$confirm({
+        title: '提示',
+        content: '您已经选择3个产品,确认要将已选产品从购物车中移除吗?',
+        centered: true,
+        onOk: () => {
+          console.log('确定删除')
+        }
+      })
+    },
     inited (viewer) {
       if (viewer) {
         const imageUrl = []
@@ -256,13 +178,10 @@ export default {
     resetSearchForm () {
       this.queryParam.code = ''
       this.queryParam.name = ''
-      this.queryParam.origCode = ''
       this.queryParam.productBrandSn = undefined
       this.queryParam.productTypeSn1 = ''
       this.queryParam.productTypeSn2 = ''
       this.queryParam.productTypeSn3 = ''
-      this.queryParam.onlineFalg = ''
-      this.queryParam.enabledFlag = '1'
       this.productType = []
       this.$refs.table.refresh(true)
       this.rowSelectionInfo = null
@@ -272,38 +191,14 @@ export default {
     getColumns () {
       const _this = this
       this.columns = [
-        { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '产品编码', dataIndex: 'code', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'name', width: '16%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '原厂编码', dataIndex: 'origCode', width: '12%', align: 'center', customRender: function (text) { return (!text || text == ' ') ? '--' : text } }
-      ]
-      const cArr = [
-        { title: '终端建议价', dataIndex: 'terminalPrice', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '车主建议价', dataIndex: 'carOwnersPrice', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '自定义终端价', dataIndex: 'price1', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '自定义车主价', dataIndex: 'price2', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '状态', scopedSlots: { customRender: 'enabledFlag' }, width: '7%', align: 'center' },
-        { title: '产品图片', scopedSlots: { customRender: 'imageUrl' }, width: '6%', align: 'center' },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: '12%', align: 'center' }
+        { title: '产品名称', dataIndex: 'name', width: '30%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '单位', dataIndex: 'origCode', width: '12%', align: 'center', customRender: function (text) { return (!text || text == ' ') ? '--' : text } },
+        { title: '包装数', dataIndex: 'terminalPrice', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '可用库存数量', dataIndex: 'carOwnersPrice', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '成本价', dataIndex: 'price1', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '采购数量', scopedSlots: { customRender: 'purchaseQty' }, width: '20%', align: 'center' }
       ]
-      getCurrentDealer().then(res => {
-        if (res.status == 200) {
-          if (res.data.dealerLevel && res.data.dealerLevel == 'PROVINCE') { //  省级
-            this.columns.push(
-              { title: '省级价', dataIndex: 'provincePrice', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-              { title: '市级建议价', dataIndex: 'cityPrice', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } }
-            )
-          } else if (res.data.dealerLevel && res.data.dealerLevel == 'CITY') { //  市级
-            this.columns.push(
-              { title: '市级建议价', dataIndex: 'cityPrice', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } }
-            )
-          }
-          if (res.data.isShowSpecialPrice && res.data.isShowSpecialPrice == '1') { //  是否展示特约价
-            this.columns.push({ title: '特约建议价', dataIndex: 'specialPrice', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-          }
-          this.columns = [...this.columns, ...cArr]
-        }
-      })
     },
     filterOption (input, option) {
       return (
@@ -391,12 +286,6 @@ export default {
     }
   },
   watch: {
-    advanced (newValue, oldValue) {
-      const _this = this
-      this.$nextTick(() => { // 页面渲染完成后的回调
-        _this.setTableH()
-      })
-    },
     '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
       this.setTableH()
     }