Переглянути джерело

Merge branch 'develop_yh17_fencang' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into develop_yh17_fencang

lilei 2 роки тому
батько
коміт
d83821e645

+ 17 - 8
src/views/reportData/receivedSendStorageReport/index.vue

@@ -7,7 +7,7 @@
         :rules="rules"
         :model="form">
         <a-row :gutter="15">
-          <a-col :md="5" :sm="24">
+          <a-col :md="6" :sm="24">
             <a-form-model-item label="选择周期" prop="time">
               <div class="monthBox" style="display:flex;align-item:center;">
                 <a-month-picker
@@ -31,26 +31,31 @@
               </div>
             </a-form-model-item>
           </a-col>
-          <a-col :md="4" :sm="24">
+          <a-col :md="6" :sm="24">
             <a-form-model-item label="产品编码">
               <a-input id="receivedSendStorageReport-queryWord" v-model.trim="queryParam.product.code" allowClear placeholder="请输入产品编码"/>
             </a-form-model-item>
           </a-col>
-          <a-col :md="5" :sm="24">
+          <a-col :md="6" :sm="24">
             <a-form-model-item label="产品名称">
               <a-input id="receivedSendStorageReport-name" v-model.trim="queryParam.product.name" allowClear placeholder="请输入产品名称"/>
             </a-form-model-item>
           </a-col>
-          <a-col :md="5" :sm="24">
+          <a-col :md="6" :sm="24">
             <a-form-model-item label="产品品牌">
               <ProductBrand id="receivedSendStorageReport-productBrandSn" v-model="queryParam.productBrandSn"></ProductBrand>
             </a-form-model-item>
           </a-col>
-          <a-col :md="5" :sm="24">
+          <a-col :md="6" :sm="24">
             <a-form-model-item label="产品分类">
               <productTypeAll placeholder="请选择产品分类" @change="changeProductType" v-model="productType" id="receivedSendStorageReport-productType"></productTypeAll>
             </a-form-model-item>
           </a-col>
+          <a-col :md="6" :sm="24">
+            <a-form-item label="仓库">
+              <chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn"></chooseWarehouse>
+            </a-form-item>
+          </a-col>
           <a-col :md="24" :sm="24" style="margin-bottom: 10px;display:flex;align-item:center;justify-content:center;">
             <a-button type="primary" @click="testForm('search')" :disabled="disabled" id="receivedSendStorageReport-refresh">查询</a-button>
             <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="receivedSendStorageReport-reset">重置</a-button>
@@ -121,11 +126,12 @@ import reportModal from '@/views/common/reportModal.vue'
 import { queryDetailReportPage, exportDetailReport, queryReportCount } from '@/api/reportData'
 import { hdExportExcel } from '@/libs/exportExcel'
 import gatherList from './list'
+import chooseWarehouse from '@/views/common/chooseWarehouse'
 import moment from 'moment'
 export default {
   name: 'PriceDifferenceDetailReportList',
   mixins: [commonMixin],
-  components: { STable, VSelect, ProductBrand, gatherList, productTypeAll, reportModal },
+  components: { STable, VSelect, ProductBrand, gatherList, productTypeAll, reportModal, chooseWarehouse },
   data () {
     return {
       moment,
@@ -139,7 +145,8 @@ export default {
         productBrandSn: undefined,
         productTypeSn1: undefined,
         productTypeSn2: undefined,
-        productTypeSn3: undefined
+        productTypeSn3: undefined,
+        warehouseSn: undefined
       },
       form: {
         time: []
@@ -159,11 +166,12 @@ export default {
       columns: [
         { title: '产品编码', dataIndex: 'productCode', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'productName', width: '30%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '原厂编码', dataIndex: 'productOrigCode', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '原厂编码', dataIndex: 'productOrigCode', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '品牌', dataIndex: 'productBrandName', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '二级分类', dataIndex: 'productTypeName2', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '三级分类', dataIndex: 'productTypeName3', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '单位', dataIndex: 'productUnit', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '仓库', dataIndex: 'warehouseName', width: '20%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '期初结存数量', dataIndex: 'beginQty', width: '12%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '期初结存单价', dataIndex: 'beginPrice', width: '12%', align: 'center', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
         { title: '期初结存金额', dataIndex: 'beginAmount', width: '12%', align: 'center', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
@@ -305,6 +313,7 @@ export default {
       this.queryParam.productTypeSn1 = undefined
       this.queryParam.productTypeSn2 = undefined
       this.queryParam.productTypeSn3 = undefined
+      this.queryParam.warehouseSn = undefined
       this.$refs.table.clearTable()
       this.productType = []
       this.totalData = null