Browse Source

bug修复

chenrui 3 years ago
parent
commit
ac25ee33b1

+ 5 - 5
src/views/reportData/chainSalesDetailReport/list.vue

@@ -40,7 +40,7 @@
             <template v-if="advanced">
             <template v-if="advanced">
               <a-col :md="6" :sm="24">
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="客户类型">
                 <a-form-model-item label="客户类型">
-                  <a-select id="chainSalesReportList-customerType" v-model="queryParam.salesTargetType" allowClear placeholder="请选择客户类型">
+                  <a-select id="chainSalesDetailReportList-customerType" v-model="queryParam.salesTargetType" allowClear placeholder="请选择客户类型">
                     <a-select-option v-for="item in custTypeList" :value="item.customerTypeSn" :key="item.customerTypeSn">{{ item.name }}</a-select-option>
                     <a-select-option v-for="item in custTypeList" :value="item.customerTypeSn" :key="item.customerTypeSn">{{ item.name }}</a-select-option>
                   </a-select>
                   </a-select>
                 </a-form-model-item>
                 </a-form-model-item>
@@ -74,7 +74,7 @@
               </a-col>
               </a-col>
               <a-col :md="6" :sm="24">
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="收款方式">
                 <a-form-model-item label="收款方式">
-                  <a-select id="chainSalesReportList-settleStyleSn" v-model="queryParam.settleStyleSn" allowClear placeholder="请选择收款方式">
+                  <a-select id="chainSalesDetailReportList-settleStyleSn" v-model="queryParam.settleStyleSn" allowClear placeholder="请选择收款方式">
                     <a-select-option v-for="item in settleStyleList" :value="item.settleStyleSn" :key="item.settleStyleSn">{{ item.name }}</a-select-option>
                     <a-select-option v-for="item in settleStyleList" :value="item.settleStyleSn" :key="item.settleStyleSn">{{ item.name }}</a-select-option>
                   </a-select>
                   </a-select>
                 </a-form-model-item>
                 </a-form-model-item>
@@ -102,7 +102,7 @@
                     expand-trigger="hover"
                     expand-trigger="hover"
                     :options="productTypeList"
                     :options="productTypeList"
                     :fieldNames="{ label: 'productTypeName', value: 'productTypeSn', children: 'children' }"
                     :fieldNames="{ label: 'productTypeName', value: 'productTypeSn', children: 'children' }"
-                    id="productInfoList-productType"
+                    id="chainSalesDetailReportList-productType"
                     placeholder="请选择产品分类"
                     placeholder="请选择产品分类"
                     allowClear />
                     allowClear />
                 </a-form-model-item>
                 </a-form-model-item>
@@ -132,12 +132,12 @@
               </a-col>
               </a-col>
               <a-col :md="6" :sm="24">
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="单号">
                 <a-form-model-item label="单号">
-                  <a-input id="chainSalesReportList-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入单号"/>
+                  <a-input id="chainSalesDetailReportList-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入单号"/>
                 </a-form-model-item>
                 </a-form-model-item>
               </a-col>
               </a-col>
               <a-col :md="6" :sm="24">
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="业务员">
                 <a-form-model-item label="业务员">
-                  <a-input id="chainSalesReportList-salesManName" v-model.trim="queryParam.salesManName" allowClear placeholder="请输入业务员"/>
+                  <a-input id="chainSalesDetailReportList-salesManName" v-model.trim="queryParam.salesManName" allowClear placeholder="请输入业务员"/>
                 </a-form-model-item>
                 </a-form-model-item>
               </a-col>
               </a-col>
             </template>
             </template>

+ 5 - 5
src/views/reportData/chainStockReport/list.vue

@@ -28,25 +28,25 @@
             </a-col>
             </a-col>
             <a-col :md="6" :sm="24">
             <a-col :md="6" :sm="24">
               <a-form-model-item label="产品编码">
               <a-form-model-item label="产品编码">
-                <a-input id="productInfoList-code" v-model.trim="queryParam.productCode" allowClear placeholder="请输入产品编码"/>
+                <a-input id="chainStockReportList-code" v-model.trim="queryParam.productCode" allowClear placeholder="请输入产品编码"/>
               </a-form-model-item>
               </a-form-model-item>
             </a-col>
             </a-col>
             <a-col :md="6" :sm="24">
             <a-col :md="6" :sm="24">
               <a-form-model-item label="产品名称">
               <a-form-model-item label="产品名称">
-                <a-input id="productInfoList-name" v-model.trim="queryParam.productName" allowClear placeholder="请输入产品名称"/>
+                <a-input id="chainStockReportList-name" v-model.trim="queryParam.productName" allowClear placeholder="请输入产品名称"/>
               </a-form-model-item>
               </a-form-model-item>
             </a-col>
             </a-col>
             <template v-if="advanced">
             <template v-if="advanced">
               <a-col :md="6" :sm="24">
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="原厂编码">
                 <a-form-model-item label="原厂编码">
-                  <a-input id="productInfoList-origCode" v-model.trim="queryParam.productOrigCode" allowClear placeholder="请输入原厂编码"/>
+                  <a-input id="chainStockReportList-origCode" v-model.trim="queryParam.productOrigCode" allowClear placeholder="请输入原厂编码"/>
                 </a-form-model-item>
                 </a-form-model-item>
               </a-col>
               </a-col>
               <a-col :md="6" :sm="24">
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="产品品牌">
                 <a-form-model-item label="产品品牌">
                   <a-select
                   <a-select
                     placeholder="请选择产品品牌"
                     placeholder="请选择产品品牌"
-                    id="productInfoList-productBrandSn"
+                    id="chainStockReportList-productBrandSn"
                     allowClear
                     allowClear
                     v-model="queryParam.productBrandSn"
                     v-model="queryParam.productBrandSn"
                     :showSearch="true"
                     :showSearch="true"
@@ -65,7 +65,7 @@
                     expand-trigger="hover"
                     expand-trigger="hover"
                     :options="productTypeList"
                     :options="productTypeList"
                     :fieldNames="{ label: 'productTypeName', value: 'productTypeSn', children: 'children' }"
                     :fieldNames="{ label: 'productTypeName', value: 'productTypeSn', children: 'children' }"
-                    id="productInfoList-productType"
+                    id="chainStockReportList-productType"
                     placeholder="请选择产品分类"
                     placeholder="请选择产品分类"
                     allowClear />
                     allowClear />
                 </a-form-model-item>
                 </a-form-model-item>

+ 5 - 5
src/views/reportData/receivedSendStorageReport/list.vue

@@ -19,12 +19,12 @@
             </a-col>
             </a-col>
             <a-col :md="6" :sm="24">
             <a-col :md="6" :sm="24">
               <a-form-model-item label="产品编码">
               <a-form-model-item label="产品编码">
-                <a-input id="productInfoList-code" v-model.trim="queryParam.productEntity.code" allowClear placeholder="请输入产品编码"/>
+                <a-input id="receivedSendStorageReportList-code" v-model.trim="queryParam.productEntity.code" allowClear placeholder="请输入产品编码"/>
               </a-form-model-item>
               </a-form-model-item>
             </a-col>
             </a-col>
             <a-col :md="6" :sm="24">
             <a-col :md="6" :sm="24">
               <a-form-model-item label="产品名称">
               <a-form-model-item label="产品名称">
-                <a-input id="productInfoList-name" v-model.trim="queryParam.productEntity.name" allowClear placeholder="请输入产品名称"/>
+                <a-input id="receivedSendStorageReportList-name" v-model.trim="queryParam.productEntity.name" allowClear placeholder="请输入产品名称"/>
               </a-form-model-item>
               </a-form-model-item>
             </a-col>
             </a-col>
             <template v-if="advanced">
             <template v-if="advanced">
@@ -32,7 +32,7 @@
                 <a-form-model-item label="产品品牌">
                 <a-form-model-item label="产品品牌">
                   <a-select
                   <a-select
                     placeholder="请选择产品品牌"
                     placeholder="请选择产品品牌"
-                    id="productInfoList-productBrandSn"
+                    id="receivedSendStorageReportList-productBrandSn"
                     allowClear
                     allowClear
                     v-model="queryParam.productEntity.productBrandSn"
                     v-model="queryParam.productEntity.productBrandSn"
                     :showSearch="true"
                     :showSearch="true"
@@ -51,7 +51,7 @@
                     expand-trigger="hover"
                     expand-trigger="hover"
                     :options="productTypeList"
                     :options="productTypeList"
                     :fieldNames="{ label: 'productTypeName', value: 'productTypeSn', children: 'children' }"
                     :fieldNames="{ label: 'productTypeName', value: 'productTypeSn', children: 'children' }"
-                    id="productInfoList-productType"
+                    id="receivedSendStorageReportList-productType"
                     placeholder="请选择产品分类"
                     placeholder="请选择产品分类"
                     allowClear />
                     allowClear />
                 </a-form-model-item>
                 </a-form-model-item>
@@ -79,7 +79,7 @@
         :scroll="{ x: 2530 }"
         :scroll="{ x: 2530 }"
         :defaultLoadData="false"
         :defaultLoadData="false"
         bordered>
         bordered>
-        <template slot="footer" slot-scope="currentPageData">
+        <template slot="footer">
           <span>
           <span>
             合计: 期初数量:{{ (totalData && (totalData.beginQty || totalData.beginQty==0)) ? totalData.beginQty : '--' }} &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
             合计: 期初数量:{{ (totalData && (totalData.beginQty || totalData.beginQty==0)) ? totalData.beginQty : '--' }} &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
             期初金额:{{ (totalData && (totalData.beginAmount || totalData.beginAmount==0)) ? totalData.beginAmount : '--' }} &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
             期初金额:{{ (totalData && (totalData.beginAmount || totalData.beginAmount==0)) ? totalData.beginAmount : '--' }} &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

+ 3 - 3
src/views/reportData/stockExpenditureReport/list.vue

@@ -4,7 +4,7 @@
       <!-- 搜索条件 -->
       <!-- 搜索条件 -->
       <div class="table-page-search-wrapper">
       <div class="table-page-search-wrapper">
         <a-form-model
         <a-form-model
-          id="chainStockReportList-form"
+          id="stockExpenditureReportList-form"
           ref="ruleForm"
           ref="ruleForm"
           :model="queryParam"
           :model="queryParam"
           :rules="rules"
           :rules="rules"
@@ -96,8 +96,8 @@ export default {
       const legend = []
       const legend = []
       if (bit) {
       if (bit) {
         data.map(item => {
         data.map(item => {
-    			 const p = `${item.name}: ${item.value}${bit}`
-    			 legend.push(p)
+          const p = `${item.name}: ${item.value}${bit}`
+          legend.push(p)
         })
         })
       }
       }
       const option = {
       const option = {

+ 1 - 1
src/views/reportData/stockIncomeReport/list.vue

@@ -4,7 +4,7 @@
       <!-- 搜索条件 -->
       <!-- 搜索条件 -->
       <div class="table-page-search-wrapper">
       <div class="table-page-search-wrapper">
         <a-form-model
         <a-form-model
-          id="chainStockReportList-form"
+          id="stockIncomeReportList-form"
           ref="ruleForm"
           ref="ruleForm"
           :model="queryParam"
           :model="queryParam"
           :rules="rules"
           :rules="rules"