Browse Source

仓库调拨

chenrui 4 years ago
parent
commit
4bef9d22c7

+ 15 - 26
src/api/allocWarehouse.js

@@ -1,6 +1,6 @@
 import { axios } from '@/utils/request'
 
-//  仓库调拨列表  分页
+//  仓库调拨 列表  分页
 export const allocWarehouseList = (params) => {
   const url = `/allocWarehouse/queryPage/${params.pageNo}/${params.pageSize}`
   delete params.pageNo
@@ -11,18 +11,7 @@ export const allocWarehouseList = (params) => {
     method: 'post'
   })
 }
-//  仓库调拨详情列表  分页
-export const allocWarehouseDetailList = (params) => {
-  const url = `/allocWarehouse/queryDetailPage/${params.pageNo}/${params.pageSize}`
-  delete params.pageNo
-  delete params.pageSize
-  return axios({
-    url: url,
-    data: params,
-    method: 'post'
-  })
-}
-// 审核
+// 仓库调拨  审核
 export const allocWarehouseAudit = params => {
   return axios({
     url: '/allocWarehouse/audit',
@@ -30,14 +19,14 @@ export const allocWarehouseAudit = params => {
     method: 'post'
   })
 }
-// 删除
-export const allocWarehouseDelete = params => {
+// 仓库调拨  删除
+export const allocWarehouseDel = params => {
   return axios({
     url: `/allocWarehouse/delete/${params.id}`,
     method: 'get'
   })
 }
-// 库存调拨明细列表合计
+// 仓库调拨 详情  合计
 export const allocWarehouseDetailTotal = params => {
   return axios({
     url: '/allocWarehouse/detail/queryCount',
@@ -45,8 +34,8 @@ export const allocWarehouseDetailTotal = params => {
     method: 'post'
   })
 }
-// 库存调拨明细列表
-export const allocWarehouseDetailQuery = params => {
+// 仓库调拨 详情 列表  分页
+export const allocWarehouseDetailList = params => {
   const url = `/allocWarehouse/detail/queryPage/${params.pageNo}/${params.pageSize}`
   delete params.pageNo
   delete params.pageSize
@@ -56,7 +45,7 @@ export const allocWarehouseDetailQuery = params => {
     method: 'post'
   })
 }
-// 仓库调拨明细保存
+// 仓库调拨  详情  添加/编辑
 export const allocWarehouseDetailSave = params => {
   return axios({
     url: '/allocWarehouse/detail/save',
@@ -64,15 +53,15 @@ export const allocWarehouseDetailSave = params => {
     method: 'post'
   })
 }
-// 仓库调拨明细删除
-export const allocWarehouseDetailDelete = params => {
+// 仓库调拨  详情  删除
+export const allocWarehouseDetailDel = params => {
   return axios({
     url: '/allocWarehouse/detail/delete',
     data: params,
     method: 'post'
   })
 }
-// 保存仓库调拨单
+// 仓库调拨  保存
 export const allocWarehouseSave = params => {
   return axios({
     url: '/allocWarehouse/save',
@@ -91,8 +80,8 @@ export const productQuery = params => {
     method: 'post'
   })
 }
-// 根据单据id查询单据基础信息
-export const allocWarehouseFind = params => {
+// 仓库调拨 详情
+export const allocWarehouseDetail = params => {
   const url = `/allocWarehouse/findById/${params.id}`
   delete params.id
   return axios({
@@ -101,14 +90,14 @@ export const allocWarehouseFind = params => {
     method: 'post'
   })
 }
-//  仓库调拨 详情  根据sn查
+//  仓库调拨 详情  根据sn查
 export const allocWarehouseDetailSn = (params) => {
   return axios({
     url: `/allocWarehouse/findBySn/${params.sn}`,
     method: 'get'
   })
 }
-// 提交
+// 仓库调拨 提交
 export const allocWarehouseSubmit = params => {
   return axios({
     url: '/allocWarehouse/submit',

+ 1 - 1
src/api/storeCallOut.js

@@ -38,7 +38,7 @@ export const storeCallOutOut = (params) => {
 //  店内调出 删除
 export const storeCallOutDel = (params) => {
   return axios({
-    url: `/sparePartsPur/delete/${params.id}`,
+    url: `/storeCallOut/delete/${params.id}`,
     method: 'get'
   })
 }

+ 8 - 8
src/views/allocationManagement/chainTransferOut/edit.vue

@@ -91,7 +91,7 @@
             :columns="columns"
             :customRow="handleClickRow"
             :dataSource="loadData"
-            :scroll="{ x: 1610, y: 300 }"
+            :scroll="{ x: 1650, y: 300 }"
             bordered>
             <!-- 调出数量 -->
             <template slot="outQty" slot-scope="text, record">
@@ -157,7 +157,7 @@
             :rowKey="(record) => record.id"
             :columns="chooseColumns"
             :data="chooseLoadData"
-            :scroll="{ x: 1545, y: 300 }"
+            :scroll="{ x: 1665, y: 300 }"
             bordered>
             <!-- 操作 -->
             <template slot="action" slot-scope="text, record">
@@ -216,7 +216,7 @@ export default {
         { title: '产品编码', dataIndex: 'productCode', width: 200, align: 'center' },
         { title: '产品名称', dataIndex: 'productName', align: 'center', ellipsis: true },
         { title: '原厂编码', dataIndex: 'productOrigCode', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '品牌', dataIndex: 'brandName', width: 100, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '品牌', dataIndex: 'brandName', width: 140, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '仓库', dataIndex: 'warehouseName', width: 140, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '仓位', dataIndex: 'warehouseLocationName', width: 140, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '成本价(¥)', dataIndex: 'putCost', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
@@ -242,12 +242,12 @@ export default {
       // 表头
       chooseColumns: [
         { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
-        { title: '产品编码', dataIndex: 'dealerProductEntity.code', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品编码', dataIndex: 'dealerProductEntity.code', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'dealerProductEntity.name', align: 'center', ellipsis: true },
-        { title: '原厂编码', dataIndex: 'dealerProductEntity.origCode', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '品牌', dataIndex: 'dealerProductEntity.productBrandName', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '仓库', dataIndex: 'warehouseName', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '仓位', dataIndex: 'warehouseLocationName', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '原厂编码', dataIndex: 'dealerProductEntity.origCode', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '品牌', dataIndex: 'dealerProductEntity.productBrandName', width: 140, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '仓库', dataIndex: 'warehouseName', width: 140, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '仓位', dataIndex: 'warehouseLocationName', width: 140, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '单位', dataIndex: 'dealerProductEntity.unit', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '成本价', dataIndex: 'outCost', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '调出数量', dataIndex: 'outQty', width: 150, align: 'center' },

+ 0 - 10
src/views/allocationManagement/storeTransferOut/edit.vue

@@ -331,16 +331,6 @@ export default {
         }
       })
     },
-    // 双击快速添加
-    handleClickRow (record) {
-      return {
-        on: {
-          dblclick: (event) => {
-            this.handleAdd(record)
-          }
-        }
-      }
-    },
     //  删除
     handleDel (row) {
       const _this = this

+ 342 - 351
src/views/allocationManagement/warehouseAllocation/edit.vue

@@ -4,8 +4,8 @@
       <!-- 自定义的二级文字标题 -->
       <template slot="subTitle">
         <a id="warehouseAllocationEdit-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
-        <span style="margin: 0 15px;color: #666;">调出仓库:{{ (warehouse&&warehouse.outWarehouseName) || '--' }}</span>
-        <span style="margin: 0 15px;color: #666;">调入仓库:{{ (warehouse&&warehouse.putWarehouseName) || '--' }}</span>
+        <span style="margin: 0 15px;color: #666;">调出仓库:{{ (basicInfoData&&basicInfoData.outWarehouseName) || '--' }}</span>
+        <span style="margin: 0 15px;color: #666;">调入仓库:{{ (basicInfoData&&basicInfoData.putWarehouseName) || '--' }}</span>
       </template>
       <!-- 操作区,位于 title 行的行尾 -->
       <template slot="extra">
@@ -19,7 +19,7 @@
         <a-collapse-panel key="1" header="选择产品">
           <!-- 筛选条件 -->
           <div class="table-page-search-wrapper">
-            <a-form layout="inline" @keyup.enter.native="getProductList">
+            <a-form layout="inline" @keyup.enter.native="getProductList(1)">
               <a-row :gutter="15">
                 <a-col :md="6" :sm="24">
                   <a-form-item label="产品编码" prop="productCode">
@@ -33,73 +33,51 @@
                 </a-col>
                 <a-col :md="6" :sm="24">
                   <a-form-item label="原厂编码" prop="productOrigCode">
-                    <a-input
-                      id="warehouseAllocationEdit-productOrigCode"
-                      v-model="queryParam.productOrigCode"
-                      placeholder="请输入原厂编码"
-                      allowClear />
+                    <a-input id="warehouseAllocationEdit-productOrigCode" v-model="queryParam.productOrigCode" placeholder="请输入原厂编码" allowClear />
                   </a-form-item>
                 </a-col>
                 <template v-if="advanced">
                   <a-col :md="6" :sm="24">
-                    <a-form-item label="产品品牌" prop="brandSn">
+                    <a-form-item label="产品品牌">
                       <a-select
-                        placeholder="请选择"
-                        id="warehouseAllocationEdit-state"
+                        placeholder="请选择产品品牌"
+                        id="warehouseAllocationEdit-brandSn"
                         allowClear
                         v-model="queryParam.brandSn"
                         :showSearch="true"
                         option-filter-prop="children"
                         :filter-option="filterOption">
-                        <a-select-option
-                          v-for="item in brandData"
-                          :key="item.brandSn"
-                          :value="item.brandSn">{{ item.brandName }}</a-select-option>
+                        <a-select-option v-for="item in productBrandList" :key="item.brandSn" :value="item.brandSn">{{ item.brandName }}</a-select-option>
                       </a-select>
                     </a-form-item>
                   </a-col>
                   <a-col :md="6" :sm="24">
-                    <a-form-item label="产品分类" prop="typeName">
+                    <a-form-item label="产品分类">
                       <a-cascader
-                        :field-names="{ label: 'productTypeName', value: 'productTypeSn', children: 'children'}"
-                        :options="typeData"
-                        id="warehouseAllocationEdit-typeName"
+                        @change="changeProductType"
+                        change-on-select
+                        v-model="productType"
+                        :options="productTypeList"
+                        :fieldNames="{ label: 'productTypeName', value: 'productTypeSn', children: 'children' }"
+                        id="warehouseAllocationEdit-productType"
                         placeholder="请选择产品分类"
-                        allowClear
-                        v-model="typeName" />
+                        allowClear />
                     </a-form-item>
                   </a-col>
                   <a-col :md="6" :sm="24">
                     <a-form-item label="调出仓位" prop="warehouseLocationSn">
-                      <a-select
-                        id="warehouseAllocationEdit-warehouseLocationSn"
-                        placeholder="请选择"
-                        allowClear
-                        v-model="queryParam.warehouseLocationSn"
-                        style="width: 100%;">
-                        <a-select-option
-                          v-for="item in warehouseOutLocData"
-                          :key="item.warehouseLocationSn"
-                          :value="item.warehouseLocationSn">
-                          {{ item.name }}</a-select-option>
+                      <a-select id="warehouseAllocationEdit-warehouseLocationSn" placeholder="请选择" allowClear v-model="queryParam.warehouseLocationSn" style="width: 100%;">
+                        <a-select-option v-for="item in warehouseOutLocData" :key="item.warehouseLocationSn" :value="item.warehouseLocationSn">{{ item.name }}</a-select-option>
                       </a-select>
                     </a-form-item>
                   </a-col>
                 </template>
                 <a-col :md="6" :sm="24" style="margin-bottom: 24px;">
-                  <a-button
-                    type="primary"
-                    @click="getProductList"
-                    :disabled="disabled"
-                    id="warehouseAllocationList-refresh">查询</a-button>
-                  <a-button
-                    style="margin-left: 8px"
-                    @click="resetSearchForm"
-                    :disabled="disabled"
-                    id="warehouseAllocationList-reset">重置</a-button>
+                  <a-button type="primary" @click="getProductList(1)" :disabled="disabled" id="warehouseAllocationList-refresh">查询</a-button>
+                  <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="warehouseAllocationList-reset">重置</a-button>
                   <a @click="advanced=!advanced" style="margin-left: 8px">
                     {{ advanced ? '收起' : '展开' }}
-                    <a-icon :type="advanced ? 'up' : 'down'" />
+                    <a-icon :type="advanced ? 'up' : 'down'"/>
                   </a>
                 </a-col>
               </a-row>
@@ -110,14 +88,12 @@
             class="sTable"
             ref="table"
             size="small"
-            :rowKey="(record) => record.id"
+            :rowKey="(record) => record.stockSn+record.productSn+record.warehouseSn+record.warehouseLocationSn"
             :columns="columns"
             :customRow="handleClickRow"
-            :loading="loading"
             :dataSource="loadData"
-            :pagination="pagination"
-            @change="getProductList"
-            :scroll="{ x: 1740, y: 300 }"
+            :scroll="{ x: 1080, y: 300 }"
+            :pagination="paginationProps"
             bordered>
             <!-- 产品分类 -->
             <template slot="productType" slot-scope="text, record">
@@ -125,39 +101,26 @@
               <span v-else>--</span>
             </template>
             <!-- 调入仓位 -->
-            <template slot="storageQuantity" slot-scope="text, record">
-              <a-select
-                id="warehouseAllocationEdit-warehouse"
-                placeholder="请选择"
-                allowClear
-                v-model="record.putWarehouseLocationSn"
-                style="width: 100%;">
-                <a-select-option
-                  v-for="item in warehousePutLocData"
-                  :key="item.warehouseLocationSn"
-                  :disabled="item.warehouseLocationSn==record.warehouseLocationSn"
-                  :value="item.warehouseLocationSn">{{ item.name }}</a-select-option>
+            <template slot="putWarehouseLocationSn" slot-scope="text, record">
+              <a-select id="warehouseAllocationEdit-putWarehouseLocationSn" placeholder="请选择" allowClear v-model="record.putWarehouseLocationSn" style="width: 100%;">
+                <a-select-option v-for="item in warehousePutLocData" :key="item.warehouseLocationSn" :disabled="item.warehouseLocationSn==record.warehouseLocationSn" :value="item.warehouseLocationSn">{{ item.name }}</a-select-option>
               </a-select>
             </template>
             <!-- 调出数量 -->
-            <template slot="transferOutQuantity" slot-scope="text, record">
+            <template slot="outQty" slot-scope="text, record">
               <a-input-number
-                id="warehouseAllocationEdit-allocationQty"
-                v-model="record.allocationQty"
-                :min="0"
+                id="warehouseAllocationEdit-outQty"
+                v-model="record.outQty"
+                :precision="0"
+                :min="1"
                 :max="record.currentQty"
                 placeholder="请输入" />
             </template>
             <!-- 操作 -->
-            <template slot="action" slot-scope="text,record">
-              <a-button
-                :loading="record.addLoading"
-                size="small"
-                type="primary"
-                class="button-primary"
-                @click="handleAdd(record)"
-                id="warehouseAllocationEdit-add-btn">添加</a-button>
+            <template slot="action" slot-scope="text, record">
+              <a-button size="small" type="primary" class="button-primary" @click="handleAdd(record)" id="warehouseAllocationEdit-add-btn">添加</a-button>
             </template>
+            </s-table>
           </a-table>
         </a-collapse-panel>
       </a-collapse>
@@ -168,73 +131,47 @@
         <a-collapse-panel key="1" header="已选产品">
           <!-- 总计 -->
           <a-alert type="info" showIcon style="margin-bottom:15px">
-            <div slot="message">总成本:¥<strong>{{ productTotalCost }}</strong>,总数量:
-              <strong>{{ productTotalQty }}</strong> ,总款数: <strong>{{ productTotalCategory }}</strong>
-            </div>
+            <div slot="message">总款数 <strong>{{ (productTotal&&productTotal.productTotalCategory) || 0 }}</strong> ,总数量 <strong>{{ (productTotal&&productTotal.productTotalQty) || 0 }}</strong> ,总成本¥<strong>{{ (productTotal&&productTotal.productTotalCost) || 0 }}</strong></div>
           </a-alert>
           <!-- 筛选条件 -->
           <a-row :gutter="15" justify="space-between">
             <a-col :span="17">
               <div class="table-page-search-wrapper">
-                <a-form layout="inline" @keyup.enter.native="$refs.chooseTable.refresh(true)">
+                <a-form layout="inline" @keyup.enter.native="getChooseProductList(1)">
                   <a-row :gutter="15">
                     <a-col :md="9" :sm="24">
                       <a-form-item label="产品编码" prop="productCode">
-                        <a-input
-                          id="warehouseAllocationEdit-productCode"
-                          v-model="chooseParam.productCode"
-                          placeholder="请输入产品编码"
-                          allowClear />
+                        <a-input id="warehouseAllocationEdit-productCode" v-model="chooseQueryParam.productCode" placeholder="请输入产品编码" allowClear />
                       </a-form-item>
                     </a-col>
                     <a-col :md="9" :sm="24">
                       <a-form-item label="产品名称" prop="productName">
-                        <a-input
-                          id="warehouseAllocationEdit-productName"
-                          v-model="chooseParam.productName"
-                          placeholder="请输入产品名称"
-                          allowClear />
+                        <a-input id="warehouseAllocationEdit-productName" v-model="chooseQueryParam.productName" placeholder="请输入产品名称" allowClear />
                       </a-form-item>
                     </a-col>
                     <a-col :md="6" :sm="24" style="margin-bottom: 24px;">
-                      <a-button
-                        type="primary"
-                        @click="$refs.chooseTable.refresh(true)"
-                        id="warehouseAllocationList-refresh">查询</a-button>
-                      <a-button
-                        style="margin-left: 8px"
-                        @click="resetChooseSearchForm"
-                        id="warehouseAllocationList-reset">重置</a-button>
+                      <a-button type="primary" @click="getChooseProductList(1)" :disabled="chooseDisabled" id="warehouseAllocationList-refresh">查询</a-button>
+                      <a-button style="margin-left: 8px" @click="chooseResetSearchForm" :disabled="chooseDisabled" id="warehouseAllocationList-reset">重置</a-button>
                     </a-col>
                   </a-row>
                 </a-form>
               </div>
             </a-col>
             <a-col :span="7">
-              <!-- 暂不做 -->
-              <div style="float:right;overflow: hidden;">
-                <!-- <a-button size="small" type="primary" id="warehouseAllocationEdit-pladd-btn" style="margin-bottom: 8px;">批量添加</a-button> -->
-                <a-button size="small" id="warehouseAllocationEdit-import-btn" style="margin-left: 8px">导入明细
-                </a-button>
-                <a-button
-                  size="small"
-                  :loading="delLoading"
-                  @click="handleDel({},0)"
-                  type="danger"
-                  id="warehouseAllocationEdit-del-all-btn"
-                  style="margin: 0 0 8px 8px;">整单删除</a-button>
-              </div>
+              <a-button size="small" style="margin-left: 8px" id="chainTransferOutEdit-import-btn">导入明细</a-button>
+              <a-button size="small" type="danger" style="margin-left: 8px" @click.stop="handleDel('', 'all')" id="warehouseAllocationEdit-del-all-btn">整单删除</a-button>
             </a-col>
           </a-row>
           <!-- 列表 -->
-          <s-table
+          <a-table
             class="sTable"
             ref="chooseTable"
             size="small"
             :rowKey="(record) => record.id"
             :columns="chooseColumns"
-            :data="chooseLoadData"
-            :scroll="{ x: 1600, y: 300 }"
+            :dataSource="chooseLoadData"
+            :scroll="{ x: 1185, y: 300 }"
+            :pagination="choosePaginationProps"
             bordered>
             <!-- 产品分类 -->
             <template slot="productType" slot-scope="text, record">
@@ -242,50 +179,44 @@
               <span v-else>--</span>
             </template>
             <!-- 调入仓位 -->
-            <template slot="storageQuantity" slot-scope="text, record">
+            <template slot="putWarehouseLocationSn" slot-scope="text, record">
               <a-select
-                @change="handleAdd(record)"
-                id="warehouseAllocationEdit-warehouse"
+                id="warehouseAllocationEdit-putWarehouseLocationSn"
+                @change="chooseWarehouseLocChange(record)"
                 placeholder="请选择"
                 allowClear
                 v-model="record.putWarehouseLocationSn"
                 style="width: 100%;">
-                <a-select-option v-for="item in warehousePutLocData" :key="item.warehouseLocationSn" :disabled="item.warehouseLocationSn==record.outWarehouseLocationSn" :value="item.warehouseLocationSn">{{ item.name }}</a-select-option>
+                <a-select-option v-for="item in warehousePutLocData" :key="item.warehouseLocationSn" :disabled="item.warehouseLocationSn==record.warehouseLocationSn" :value="item.warehouseLocationSn">{{ item.name }}</a-select-option>
               </a-select>
             </template>
             <!-- 调出数量 -->
-            <template slot="transferOutQuantity" slot-scope="text, record">
+            <template slot="outQty" slot-scope="text, record">
               <a-input-number
-                id="warehouseAllocationEdit-allocationQty"
-                v-model="record.allocationQty"
+                id="warehouseAllocationEdit-outQty"
+                v-model="record.outQty"
                 :precision="0"
-                :min="0"
-                @change="handleAdd(record)"
-                :max="record.currentQty"
-                placeholder="请输入" />
+                :min="1"
+                :max="999999"
+                placeholder="请输入"
+                @blur="e => outQtyBlur(e.target.value, record)"
+                style="width: 100%;" />
             </template>
             <!-- 操作 -->
             <template slot="action" slot-scope="text, record">
-              <a-button
-                size="small"
-                type="primary"
-                class="button-error"
-                @click="handleDel(record,1)"
-                id="warehouseAllocationEdit-del-btn">删除</a-button>
+              <a-button size="small" type="primary" class="button-error" @click="handleDel(record)" id="warehouseAllocationEdit-del-btn">删除</a-button>
             </template>
-          </s-table>
+          </a-table>
         </a-collapse-panel>
       </a-collapse>
     </a-card>
     <a-affix :offset-bottom="0">
-      <div
-        style="text-align: center;width: 100%;background-color: #fff;padding: 12px 0;box-shadow: 0 0 20px #dcdee2;">
+      <div style="text-align: center;width: 100%;background-color: #fff;padding: 12px 0;box-shadow: 0 0 20px #dcdee2;">
         <a-button
           type="primary"
           id="warehouseAllocationEdit-submit"
           size="large"
           class="button-primary"
-          :loading="submitLoading"
           @click="handleSubmit"
           style="padding: 0 60px;">提交</a-button>
       </div>
@@ -295,51 +226,37 @@
 
 <script>
 import { STable, VSelect } from '@/components'
-import { dealerProductBrandQuery } from '@/api/dealerProductBrand.js'
-import { dealerProductTypeList } from '@/api/dealerProductType.js'
-import { warehouseLocAllList } from '@/api/warehouse.js'
-import { productQuery, allocWarehouseFind, allocWarehouseDetailTotal, allocWarehouseDetailQuery, allocWarehouseDetailSave, allocWarehouseDetailDelete, allocWarehouseSubmit } from '@/api/allocWarehouse.js'
+import { allocWarehouseDetailList, allocWarehouseDetail, productQuery, allocWarehouseDetailTotal, allocWarehouseDetailSave, allocWarehouseDetailDel, allocWarehouseSubmit } from '@/api/allocWarehouse'
+import { dealerProductBrandQuery } from '@/api/dealerProductBrand'
+import { dealerProductTypeList } from '@/api/dealerProductType'
+import { warehouseLocAllList } from '@/api/warehouse'
+
 export default {
   components: { STable, VSelect },
   data () {
     return {
-      typeName: [], // 分类
       queryParam: {
-        warehouseSn: '', // 调出仓库sn
-        productCode: '', // 产品编码
-        productName: '', // 产品名称
+        productCode: '',
+        productName: '',
         productOrigCode: '', // 原厂编码
-        brandSn: undefined, // 品牌
+        brandSn: undefined,
+        productTypeSn1: undefined,
+        productTypeSn2: undefined,
+        productTypeSn3: undefined,
         warehouseLocationSn: undefined // 调出仓位
       },
-      chooseParam: {
-        allocationWarehouseSn: this.$route.params.sn, // 单据sn
-        productCode: '', // 产品编码
-        productName: '' // 产品名称
+      chooseQueryParam: {
+        productCode: '',
+        productName: ''
       },
-      productTotalCost: 0, // 总成本
-      productTotalQty: 0, // 总数量
-      productTotalCategory: 0, // 总款项
-      warehouse: null, // 基础信息
-      brandData: [], //  产品品牌  下拉数据
-      typeData: [], //  产品分类  下拉数据
-      warehousePutLocData: [], //  调入仓库仓位  下拉数据
-      warehouseOutLocData: [], //  调出仓库仓位  下拉数据
       disabled: false, //  查询、重置按钮是否可操作
+      chooseDisabled: false, //  查询、重置按钮是否可操作
       advanced: false, // 高级搜索 展开/关闭
-      delLoading: false, // 整单删除loading
-      submitLoading: false, // 提交按钮loading
-      // 加载数据方法 必须为 Promise 对象
-      loadData: [],
-      pageNo: 1,
-      pageSize: 10,
-      pagination: {
-        current: 1,
-        pageSize: 10,
-        pageSizeOptions: ['10', '20', '30', '40'],
-        total: 0
-      },
-      loading: false, // 表格加载圈
+      productBrandList: [], //  产品品牌  下拉数据
+      productTypeList: [], //  产品分类  下拉数据
+      productType: [],
+      warehousePutLocData: [], //  调入仓位  下拉数据
+      warehouseOutLocData: [], //  调出仓位  下拉数据
       // 表头
       columns: [
         { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
@@ -347,14 +264,24 @@ export default {
         { title: '产品名称', dataIndex: 'productName', align: 'center', ellipsis: true },
         { title: '原厂编码', dataIndex: 'productOrigCode', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '品牌', dataIndex: 'brandName', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '分类', scopedSlots: { customRender: 'productType' }, width: 200, align: 'center' },
+        { title: '分类', scopedSlots: { customRender: 'productType' }, width: 200, align: 'center', ellipsis: true },
         { title: '调出仓位', dataIndex: 'warehouseLocationName', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '调入仓位', scopedSlots: { customRender: 'storageQuantity' }, width: 140, align: 'center' },
+        { title: '调入仓位', scopedSlots: { customRender: 'putWarehouseLocationSn' }, width: 140, align: 'center' },
         { title: '库存数量', dataIndex: 'currentQty', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '单位', dataIndex: 'unit', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '调出数量', scopedSlots: { customRender: 'transferOutQuantity' }, width: 140, align: 'center' },
+        { title: '调出数量', scopedSlots: { customRender: 'outQty' }, width: 140, align: 'center' },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: 100, align: 'center', fixed: 'right' }
       ],
+      loadData: [],
+      pageNo: 1, //  分页页码
+      pageSize: 10, //  分页 每页多少条
+      paginationProps: {
+        showSizeChanger: true, //  是否可以改变 pageSize
+        total: 0, //  分页总条数
+        current: 1,
+        onShowSizeChange: (current, pageSize) => this.changePageSize(current, pageSize),
+        onChange: (current) => this.changePage(current)
+      },
       // 表头
       chooseColumns: [
         { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
@@ -362,51 +289,39 @@ export default {
         { title: '产品名称', dataIndex: 'productName', align: 'center', ellipsis: true },
         { title: '原厂编码', dataIndex: 'productOrigCode', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '品牌', dataIndex: 'brandName', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '分类', scopedSlots: { customRender: 'productType' }, width: 200, align: 'center' },
+        { title: '分类', scopedSlots: { customRender: 'productType' }, width: 200, align: 'center', ellipsis: true },
         { title: '调出仓位', dataIndex: 'outWarehouseLocationName', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '调入仓位', dataIndex: 'putWarehouseLocationSn', width: 140, align: 'center', scopedSlots: { customRender: 'storageQuantity' } },
+        { title: '调入仓位', scopedSlots: { customRender: 'putWarehouseLocationSn' }, width: 140, align: 'center' },
         { title: '单位', dataIndex: 'productUnit', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '调出数量', scopedSlots: { customRender: 'transferOutQuantity' }, width: 140, align: 'center' },
+        { title: '调出数量', scopedSlots: { customRender: 'outQty' }, width: 140, align: 'center' },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: 100, align: 'center', fixed: 'right' }
       ],
-      // 加载数据方法 必须为 Promise 对象
-      chooseLoadData: parameter => {
-        this.disabled = true
-        return allocWarehouseDetailQuery(Object.assign(parameter, this.chooseParam)).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.getProduceTotal()
-          this.disabled = false
-          return data
-        })
-      }
+      chooseLoadData: [],
+      choosePageNo: 1, //  分页页码
+      choosePageSize: 10, //  分页 每页多少条
+      choosePaginationProps: {
+        showSizeChanger: true, //  是否可以改变 pageSize
+        total: 0, //  分页总条数
+        current: 1,
+        onShowSizeChange: (current, pageSize) => this.changeChoosePageSize(current, pageSize),
+        onChange: (current) => this.changeChoosePage(current)
+      },
+      basicInfoData: null, //  基本信息
+      productTotal: null //  合计
     }
   },
   methods: {
-    pageInit () {
-      this.queryParam.productCode = '' // 产品编码
-      this.queryParam.productName = '' // 产品名称
-      this.queryParam.productOrigCode = '' // 原厂编码
-      this.queryParam.brandSn = undefined // 品牌
-      this.typeName = [] // 分类
-      this.queryParam.warehouseLocationSn = undefined // 调出仓位
-      this.chooseParam.productCode = ''
-      this.chooseParam.productName = ''
-      this.pageNo = 1
-      this.pageSize = 10
-    },
     //  重置
     resetSearchForm () {
-      this.queryParam.productCode = '' // 产品编码
-      this.queryParam.productName = '' // 产品名称
-      this.queryParam.productOrigCode = '' // 原厂编码
-      this.queryParam.brandSn = undefined // 品牌
-      this.typeName = [] // 分类
-      this.queryParam.warehouseLocationSn = undefined // 调出仓位
-      this.getProductList()
+      this.queryParam.productCode = ''
+      this.queryParam.productName = ''
+      this.queryParam.productOrigCode = ''
+      this.queryParam.brandSn = undefined
+      this.queryParam.productTypeSn1 = undefined
+      this.queryParam.productTypeSn2 = undefined
+      this.queryParam.productTypeSn3 = undefined
+      this.queryParam.warehouseLocationSn = undefined
+      this.getProductList(1)
     },
     // 双击快速添加
     handleClickRow (record) {
@@ -418,150 +333,108 @@ export default {
         }
       }
     },
-    // 已选产品重置查询
-    resetChooseSearchForm () {
-      this.chooseParam.productCode = ''
-      this.chooseParam.productName = ''
-      this.$refs.chooseTable.refresh(true)
-    },
-    // 获取产品品牌
-    getProductBrand () {
-      dealerProductBrandQuery({}).then(res => {
-        this.brandData = res.data || []
-      })
+    // 已选产品  重置
+    chooseResetSearchForm () {
+      this.chooseQueryParam.productCode = ''
+      this.chooseQueryParam.productName = ''
+      this.getChooseProductList(1)
     },
-    // 获取产品分类
-    getProductType () {
-      dealerProductTypeList({}).then(res => {
-        this.typeData = res.data || []
-      })
-    },
-    // 获取仓库仓位
-    getWarehouseLoc (sn, type) {
-      warehouseLocAllList({ warehouseSn: sn }).then(res => {
-        if (type == 'put') {
-          this.warehousePutLocData = res.data || []
-        } else {
-          this.warehouseOutLocData = res.data || []
-        }
-      })
-    },
-    // 查询基础信息
-    getHouse () {
-      allocWarehouseFind({ id: this.$route.params.id }).then(res => {
+    // 基本信息
+    getDetail () {
+      allocWarehouseDetail({ id: this.$route.params.id }).then(res => {
         if (res.status == 200) {
-          this.warehouse = res.data
-          this.queryParam.warehouseSn = res.data.outWarehouseSn
-          this.getProductList()
-          this.getWarehouseLoc(this.warehouse.putWarehouseSn, 'put')
-          this.getWarehouseLoc(this.warehouse.outWarehouseSn, 'out')
+          this.basicInfoData = res.data
+          this.getWarehouseLoc(res.data.putWarehouseSn, 'put')
+          this.getWarehouseLoc(res.data.outWarehouseSn, 'out')
         } else {
-          this.warehouse = null
+          this.basicInfoData = null
         }
       })
     },
-    // 产品查询
-    getProductList (pagination) {
-      this.disabled = true
-      this.loading = true
-      this.pageNo = pagination && pagination.current ? pagination.current : this.pageNo
-      this.pageSize = pagination && pagination.pageSize ? pagination.pageSize : this.pageSize
-      this.pagination.current = this.pageNo
-      const params = Object.assign({ pageNo: this.pageNo, pageSize: this.pageSize }, this.queryParam)
-      if (this.typeName.length) {
-        params.productTypeSn1 = this.typeName[0]
-        params.productTypeSn2 = this.typeName[1] || ''
-        params.productTypeSn3 = this.typeName[2] || ''
+    //  添加/编辑
+    handleAdd (row, isEdit) {
+      if (!isEdit && !row.putWarehouseLocationSn) {
+        this.$message.warning('请选择调入仓位')
+        return
       }
-      console.log(params, '--------------------------------params')
-      productQuery(params).then(res => {
-        if (res.status == 200) {
-          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
-            data.list[i].addLoading = false
-          }
-          this.pagination.total = Number(data.count)
-          this.loadData = data.list
-        } else {
-          this.pagination.total = 0
-          this.loadData = []
-        }
-        this.loading = false
-        this.disabled = false
-      })
-    },
-    // 已选产品总计查询
-    getProduceTotal () {
-      allocWarehouseDetailTotal(this.chooseParam).then(res => {
-        if (res.status == 200) {
-          this.productTotalCost = res.data.productTotalCost || 0
-          this.productTotalQty = res.data.productTotalQty || 0
-          this.productTotalCategory = res.data.productTotalCategory || 0
-        } else {
-          this.productTotalCost = 0
-          this.productTotalQty = 0
-          this.productTotalCategory = 0
-        }
-      })
-    },
-    //  添加
-    handleAdd (row) {
-      if (!row.putWarehouseLocationSn) {
-        return this.$message.error('请选择调入仓位!')
+      if (!isEdit && !row.outQty) {
+        this.$message.warning('请输入调出数量')
+        return
       }
-      if (!row.allocationQty) {
-        return this.$message.error('请输入调出数量!')
+      const params = {
+        id: isEdit ? row.id : undefined,
+        allocationWarehouseSn: this.$route.params.sn,
+        allocationCost: isEdit ? row.allocationCost : row.putCost,
+        allocationQty: row.outQty,
+        brandSn: row.brandSn,
+        outWarehouseLocationSn: isEdit ? row.outWarehouseLocationSn : row.warehouseLocationSn,
+        productCode: row.productCode,
+        productOrigCode: row.productOrigCode || undefined,
+        productSn: row.productSn,
+        productTypeSn1: row.productTypeSn1,
+        productTypeSn2: row.productTypeSn2,
+        productTypeSn3: row.productTypeSn3,
+        putWarehouseLocationSn: row.putWarehouseLocationSn
+      }
+      if (isEdit) { // 编辑
+        // 清空数量时,值应保持未清空前的值,因数量不可为空
+        if (!row.outQty || row.outQty == row.outQtyBackups) {
+          row.outQty = row.outQtyBackups
+          return
+        }
       }
-      row.addLoading = true
-      const params = Object.assign(row, { allocationWarehouseSn: this.chooseParam.allocationWarehouseSn })
-      params.allocationCost = params.putCost
-      params.outWarehouseLocationSn = row.warehouseLocationSn
       allocWarehouseDetailSave(params).then(res => {
         if (res.status == 200) {
           this.$message.success(res.message)
-          this.$refs.chooseTable.refresh(true)
+          this.getProductList()
+          this.getChooseProductList()
         }
-        row.addLoading = false
       })
     },
-    //  删除 type:0 整单删除 1:单个删除
-    handleDel (row, type) {
+    //  删除
+    handleDel (row, isAll) {
       const _this = this
+      const content = isAll ? '删除后不可恢复,确定要进行整单删除吗?' : '删除后不可恢复,确定要进行删除吗?'
       this.$confirm({
         title: '提示',
-        content: '删除后不可恢复,确定要进行删除吗?',
+        content: content,
         centered: true,
         onOk () {
-          let params = {}
-          if (type == 0) {
-            params = {
-              allocationWarehouseSn: _this.chooseParam.allocationWarehouseSn
-            }
-            _this.delLoading = true
-          } else {
-            params = {
-              id: row.id
-            }
+          let params
+          if (isAll) { //  整单删除
+            params = { allocationWarehouseSn: _this.$route.params.sn }
+          } else { //  单个删除
+            params = { id: row.id }
           }
-          allocWarehouseDetailDelete(params).then(res => {
+          allocWarehouseDetailDel(params).then(res => {
             if (res.status == 200) {
               _this.$message.success(res.message)
-              _this.$refs.chooseTable.refresh()
+              _this.getProductList()
+              _this.getChooseProductList()
             }
-            _this.delLoading = false
           })
         }
       })
     },
     //  提交
     handleSubmit () {
-      this.submitLoading = true
+      const _this = this
       allocWarehouseSubmit({ id: this.$route.params.id }).then(res => {
         if (res.status == 200) {
           this.$message.success(res.message)
-          this.handleBack()
+          setTimeout(() => {
+            _this.handleBack()
+          }, 1000)
+        }
+      })
+    },
+    // 合计
+    getDetailCount (params) {
+      allocWarehouseDetailTotal(params).then(res => {
+        if (res.status == 200) {
+          this.productTotal = res.data
+        } else {
+          this.productTotal = null
         }
       })
     },
@@ -571,8 +444,131 @@ export default {
     },
     //  返回列表
     handleBack () {
-      this.$router.push({
-        path: '/allocationManagement/warehouseAllocation/list'
+      this.$router.push({ path: '/allocationManagement/warehouseAllocation/list' })
+    },
+    // 产品列表数据
+    getProductList (pageNo) {
+      this.disabled = true
+      this.pageNo = pageNo || this.pageNo
+      const params = Object.assign({ pageNo: this.pageNo, pageSize: this.pageSize }, this.queryParam)
+      params.enabledFlag = 1
+      productQuery(params).then(res => {
+        if (res.status == 200) {
+          const data = res.data
+          this.paginationProps.total = Number(res.data.count) || 0
+          this.paginationProps.current = this.pageNo
+          const no = (data.pageNo - 1) * data.pageSize
+          for (var i = 0; i < data.list.length; i++) {
+            data.list[i].no = no + i + 1
+          }
+          this.loadData = data.list
+          this.disabled = false
+        } else {
+          this.paginationProps.total = 0
+          this.paginationProps.current = 1
+          this.loadData = []
+        }
+      })
+    },
+    //  分页  一页多少条change
+    changePageSize (current, pageSize) {
+      this.pageNo = current
+      this.pageSize = pageSize
+      this.getProductList()
+    },
+    //  分页 页码change
+    changePage (current) {
+      this.pageNo = current
+      this.getProductList()
+    },
+    //  已选产品 分页  一页多少条change
+    changeChoosePageSize (current, pageSize) {
+      this.choosePageNo = current
+      this.choosePageSize = pageSize
+      this.getChooseProductList()
+    },
+    //  已选产品 分页 页码change
+    changeChoosePage (current) {
+      this.choosePageNo = current
+      this.getChooseProductList()
+    },
+    // 已选产品列表数据
+    getChooseProductList (pageNo) {
+      this.choosePageNo = this.choosePageNo || pageNo
+      this.chooseDisabled = true
+      const params = {
+        pageNo: this.choosePageNo,
+        pageSize: this.choosePageSize,
+        allocationWarehouseSn: this.$route.params.sn
+      }
+      allocWarehouseDetailList(Object.assign(params, this.chooseQueryParam)).then(res => {
+        if (res.status == 200) {
+          //  合计
+          this.getDetailCount(Object.assign(params, this.chooseQueryParam))
+          const data = res.data
+          this.choosePaginationProps.total = Number(res.data.count) || 0
+          this.choosePaginationProps.current = data.pageNo
+          const no = (data.pageNo - 1) * data.pageSize
+          for (var i = 0; i < data.list.length; i++) {
+            data.list[i].no = no + i + 1
+            data.list[i].outQty = data.list[i].allocationQty
+            data.list[i].outQtyBackups = data.list[i].allocationQty
+          }
+          this.chooseLoadData = data.list
+          this.chooseDisabled = false
+        } else {
+          this.choosePaginationProps.total = 0
+          this.choosePaginationProps.current = 1
+          this.chooseLoadData = []
+        }
+      })
+    },
+    // 已选产品 调出数量  blur
+    outQtyBlur (val, record) {
+      //  光标移出,值发生改变再调用编辑接口
+      if (val != record.outQtyBackups) {
+        this.handleAdd(record, 'edit')
+      }
+    },
+    // 已选产品 仓位  change
+    chooseWarehouseLocChange (record) {
+      this.handleAdd(record, 'edit')
+    },
+    //  产品分类  change
+    changeProductType (val, opt) {
+      this.queryParam.productTypeSn1 = val[0] ? val[0] : ''
+      this.queryParam.productTypeSn2 = val[1] ? val[1] : ''
+      this.queryParam.productTypeSn3 = val[2] ? val[2] : ''
+    },
+    //  产品品牌  列表
+    getProductBrand () {
+      // sysFlag不传,此处应查询所有产品
+      dealerProductBrandQuery({}).then(res => {
+        if (res.status == 200) {
+          this.productBrandList = res.data
+        } else {
+          this.productBrandList = []
+        }
+      })
+    },
+    //  产品分类  列表
+    getProductType () {
+      dealerProductTypeList({}).then(res => {
+        if (res.status == 200) {
+          this.productTypeList = res.data
+        } else {
+          this.productTypeList = []
+        }
+      })
+    },
+    // 获取仓库仓位
+    getWarehouseLoc (sn, type) {
+      warehouseLocAllList({ warehouseSn: sn }).then(res => {
+        if (type == 'put') {
+          this.warehousePutLocData = res.data || []
+        } else if (type == 'out') {
+          this.warehouseOutLocData = res.data || []
+        }
       })
     },
     filterOption (input, option) {
@@ -583,46 +579,41 @@ export default {
   },
   beforeRouteEnter (to, from, next) {
     next(vm => {
-      vm.pageInit()
+      vm.getDetail()
+      vm.getProductList(1)
+      vm.getChooseProductList(1)
       vm.getProductBrand()
       vm.getProductType()
-      vm.getHouse()
     })
   }
 }
 </script>
 
 <style lang="less">
-	.warehouseAllocationEdit-wrap {
-		.warehouseAllocationEdit-back {
-			margin-bottom: 15px;
-		}
-
-		.warehouseAllocationEdit-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;
-			}
-		}
-	}
+  .warehouseAllocationEdit-wrap{
+    .warehouseAllocationEdit-back{
+      margin-bottom: 15px;
+    }
+    .warehouseAllocationEdit-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>

+ 1 - 1
src/views/allocationManagement/warehouseAllocation/list.vue

@@ -189,7 +189,7 @@ export default {
       this.queryParam.outWarehouseSn = undefined
       this.queryParam.putWarehouseSn = undefined
       this.queryParam.state = undefined
-      this.creatDate = undefined
+      this.createDate = undefined
       this.$refs.table.refresh(true)
     },
     //  删除