完善报表页面的提示字符

jshERP-web/src/views/report/AllocationDetail.vue

@@ -13,7 +13,7 @@
             <a-row :gutter="24">
               <a-col :md="6" :sm="24">
                 <a-form-item label="商品信息" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                  <a-input placeholder="条码/名称/规格/型号" v-model="queryParam.materialParam"></a-input>
+                  <a-input placeholder="条码/名称/助记码/规格/型号/颜色/品牌/制造商" v-model="queryParam.materialParam"></a-input>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
@@ -189,12 +189,12 @@
         },
         // 查询条件
         queryParam: {
-          organId: '',
+          organId: undefined,
           number: '',
           materialParam:'',
-          depotId: '',
+          depotId: undefined,
-          depotIdF: '',
+          depotIdF: undefined,
-          organizationId: '',
+          organizationId: undefined,
           beginTime: getPrevMonthFormatDate(3),
           endTime: getFormatDate(),
           createTimeRange: [moment(getPrevMonthFormatDate(3)), moment(getFormatDate())],

jshERP-web/src/views/report/BuyInReport.vue

@@ -9,7 +9,7 @@
             <a-row :gutter="24">
               <a-col :md="6" :sm="24">
                 <a-form-item label="商品信息" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                  <a-input placeholder="条码/名称/规格/型号" v-model="queryParam.materialParam"></a-input>
+                  <a-input placeholder="条码/名称/助记码/规格/型号/颜色/品牌/制造商" v-model="queryParam.materialParam"></a-input>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
@@ -42,7 +42,7 @@
               <template v-if="toggleSearchStatus">
                 <a-col :md="6" :sm="24">
                   <a-form-item label="供应商" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                    <a-select placeholder="选择供应商" v-model="queryParam.organId"
+                    <a-select placeholder="请选择供应商" v-model="queryParam.organId"
                               :dropdownMatchSelectWidth="false" showSearch allow-clear optionFilterProp="children">
                       <a-select-option v-for="(item,index) in supList" :key="index" :value="item.id">
                         {{ item.supplier }}
@@ -167,9 +167,9 @@
           beginTime: getPrevMonthFormatDate(3),
           endTime: getFormatDate(),
           createTimeRange: [moment(getPrevMonthFormatDate(3)), moment(getFormatDate())],
-          organId: '',
+          organId: undefined,
-          depotId: '',
+          depotId: undefined,
-          organizationId: '',
+          organizationId: undefined,
           mpList: getMpListShort(Vue.ls.get('materialPropertyList'))
         },
         ipagination:{

jshERP-web/src/views/report/CustomerAccount.vue

@@ -9,7 +9,7 @@
             <a-row :gutter="24">
               <a-col :md="6" :sm="24">
                 <a-form-item label="客户" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                  <a-select placeholder="选择客户" v-model="queryParam.organId"
+                  <a-select placeholder="请选择客户" v-model="queryParam.organId"
                     :dropdownMatchSelectWidth="false" showSearch allow-clear optionFilterProp="children">
                     <a-select-option v-for="(item,index) in supList" :key="index" :value="item.id">
                       {{ item.supplier }}
@@ -160,7 +160,7 @@
         // 查询条件
         queryParam: {
           supplierType: "客户",
-          organId: '',
+          organId: undefined,
           hasDebt: '1',
           beginTime: getPrevMonthFormatDate(3),
           endTime: getFormatDate(),

jshERP-web/src/views/report/InDetail.vue

@@ -9,7 +9,7 @@
             <a-row :gutter="24">
               <a-col :md="6" :sm="24">
                 <a-form-item label="商品信息" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                  <a-input placeholder="条码/名称/规格/型号" v-model="queryParam.materialParam"></a-input>
+                  <a-input placeholder="条码/名称/助记码/规格/型号/颜色/品牌/制造商" v-model="queryParam.materialParam"></a-input>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
@@ -47,7 +47,7 @@
                 </a-col>
                 <a-col :md="6" :sm="24">
                   <a-form-item label="往来单位" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                    <a-select placeholder="选择往来单位" v-model="queryParam.organId"
+                    <a-select placeholder="请选择往来单位" v-model="queryParam.organId"
                               :dropdownMatchSelectWidth="false" showSearch allow-clear optionFilterProp="children">
                       <a-select-option v-for="(item,index) in organList" :key="index" :value="item.id">
                         {{ item.supplier }}
@@ -71,7 +71,7 @@
                 </a-col>
                 <a-col :md="6" :sm="24">
                   <a-form-item label="操作员" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                    <a-select placeholder="选择操作员" showSearch allow-clear optionFilterProp="children" v-model="queryParam.creator">
+                    <a-select placeholder="请选择操作员" showSearch allow-clear optionFilterProp="children" v-model="queryParam.creator">
                       <a-select-option v-for="(item,index) in userList" :key="index" :value="item.id">
                         {{ item.userName }}
                       </a-select-option>
@@ -190,16 +190,16 @@
         },
         // 查询条件
         queryParam: {
-          organId: '',
+          organId: undefined,
           number: '',
           materialParam:'',
-          depotId: '',
+          depotId: undefined,
           beginTime: getPrevMonthFormatDate(3),
           endTime: getFormatDate(),
           createTimeRange: [moment(getPrevMonthFormatDate(3)), moment(getFormatDate())],
           type: "入库",
-          creator: "",
+          creator: undefined,
-          organizationId: '',
+          organizationId: undefined,
           remark: '',
         },
         ipagination:{

jshERP-web/src/views/report/InMaterialCount.vue

@@ -9,7 +9,7 @@
             <a-row :gutter="24">
               <a-col :md="6" :sm="24">
                 <a-form-item label="商品信息" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                  <a-input placeholder="条码/名称/规格/型号" v-model="queryParam.materialParam"></a-input>
+                  <a-input placeholder="条码/名称/助记码/规格/型号/颜色/品牌/制造商" v-model="queryParam.materialParam"></a-input>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
@@ -42,7 +42,7 @@
               <template v-if="toggleSearchStatus">
                 <a-col :md="6" :sm="24">
                   <a-form-item label="往来单位" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                    <a-select placeholder="选择往来单位" v-model="queryParam.organId"
+                    <a-select placeholder="请选择往来单位" v-model="queryParam.organId"
                               :dropdownMatchSelectWidth="false" showSearch allow-clear optionFilterProp="children">
                       <a-select-option v-for="(item,index) in organList" :key="index" :value="item.id">
                         {{ item.supplier }}
@@ -163,10 +163,10 @@
         },
         // 查询条件
         queryParam: {
-          organId: '',
+          organId: undefined,
           materialParam:'',
-          depotId: '',
+          depotId: undefined,
-          organizationId: '',
+          organizationId: undefined,
           beginTime: getPrevMonthFormatDate(3),
           endTime: getFormatDate(),
           createTimeRange: [moment(getPrevMonthFormatDate(3)), moment(getFormatDate())],

jshERP-web/src/views/report/InOutStockReport.vue

@@ -9,7 +9,7 @@
             <a-row :gutter="24">
               <a-col :md="6" :sm="24">
                 <a-form-item label="商品信息" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                  <a-input placeholder="条码/名称/规格/型号" v-model="queryParam.materialParam"></a-input>
+                  <a-input placeholder="条码/名称/助记码/规格/型号/颜色/品牌/制造商" v-model="queryParam.materialParam"></a-input>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
@@ -161,12 +161,12 @@
           offset: 1
         },
         queryParam: {
-          depotId:'',
+          depotId: undefined,
           beginTime: getPrevMonthFormatDate(1),
           endTime: getFormatDate(),
           createTimeRange: [moment(getPrevMonthFormatDate(1)), moment(getFormatDate())],
           materialParam:'',
-          categoryId:'',
+          categoryId: undefined,
           mpList: getMpListShort(Vue.ls.get('materialPropertyList'))  //扩展属性
         },
         ipagination:{
@@ -207,8 +207,7 @@
         ],
         url: {
           list: "/depotItem/getInOutStock",
-          totalCountMoney: "/depotItem/getInOutStockCountMoney",
+          totalCountMoney: "/depotItem/getInOutStockCountMoney"
-          exportXlsUrl: "/depotItem/exportExcel"
         }
       }
     },

jshERP-web/src/views/report/MaterialStock.vue

@@ -21,9 +21,9 @@
                   </a-select>
                 </a-form-item>
               </a-col>
-              <a-col :md="5" :sm="24">
+              <a-col :md="6" :sm="24">
                 <a-form-item label="商品信息" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                  <a-input placeholder="条码/名称/规格/型号/颜色" v-model="queryParam.materialParam"></a-input>
+                  <a-input placeholder="条码/名称/助记码/规格/型号/颜色/品牌/制造商" v-model="queryParam.materialParam"></a-input>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24" >
@@ -37,7 +37,7 @@
                   </a>
                 </span>
               </a-col>
-              <a-col :md="8" :sm="24">
+              <a-col :md="7" :sm="24">
                 <a-form-item>
                   <span>总库存：{{currentStock}}，总库存金额：{{currentStockPrice}}，总重量：{{currentWeight}}</span>
                 </a-form-item>
@@ -50,7 +50,7 @@
                     </a-tree-select>
                   </a-form-item>
                 </a-col>
-                <a-col :md="5" :sm="24">
+                <a-col :md="6" :sm="24">
                   <a-form-item label="仓位货架" :labelCol="labelCol" :wrapperCol="wrapperCol">
                     <a-input style="width: 100%" placeholder="请输入仓位货架查询" v-model="queryParam.position"></a-input>
                   </a-form-item>
@@ -178,7 +178,7 @@
         },
         // 查询条件
         queryParam: {
-          categoryId:'',
+          categoryId: undefined,
           materialParam:'',
           position:'',
           zeroStock: '0',

jshERP-web/src/views/report/OutDetail.vue

@@ -9,7 +9,7 @@
             <a-row :gutter="24">
               <a-col :md="6" :sm="24">
                 <a-form-item label="商品信息" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                  <a-input placeholder="条码/名称/规格/型号" v-model="queryParam.materialParam"></a-input>
+                  <a-input placeholder="条码/名称/助记码/规格/型号/颜色/品牌/制造商" v-model="queryParam.materialParam"></a-input>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
@@ -47,7 +47,7 @@
                 </a-col>
                 <a-col :md="6" :sm="24">
                   <a-form-item label="往来单位" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                    <a-select placeholder="选择往来单位" v-model="queryParam.organId"
+                    <a-select placeholder="请选择往来单位" v-model="queryParam.organId"
                               :dropdownMatchSelectWidth="false" showSearch allow-clear optionFilterProp="children">
                       <a-select-option v-for="(item,index) in organList" :key="index" :value="item.id">
                         {{ item.supplier }}
@@ -71,7 +71,7 @@
                 </a-col>
                 <a-col :md="6" :sm="24">
                   <a-form-item label="操作员" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                    <a-select placeholder="选择操作员" showSearch allow-clear optionFilterProp="children" v-model="queryParam.creator">
+                    <a-select placeholder="请选择操作员" showSearch allow-clear optionFilterProp="children" v-model="queryParam.creator">
                       <a-select-option v-for="(item,index) in userList" :key="index" :value="item.id">
                         {{ item.userName }}
                       </a-select-option>
@@ -190,16 +190,16 @@
         },
         // 查询条件
         queryParam: {
-          organId: '',
+          organId: undefined,
           number: '',
           materialParam:'',
-          depotId: '',
+          depotId: undefined,
           beginTime: getPrevMonthFormatDate(3),
           endTime: getFormatDate(),
           createTimeRange: [moment(getPrevMonthFormatDate(3)), moment(getFormatDate())],
           type: "出库",
-          creator: "",
+          creator: undefined,
-          organizationId: '',
+          organizationId: undefined,
           remark: ''
         },
         ipagination:{

jshERP-web/src/views/report/OutMaterialCount.vue

@@ -9,7 +9,7 @@
             <a-row :gutter="24">
               <a-col :md="6" :sm="24">
                 <a-form-item label="商品信息" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                  <a-input placeholder="条码/名称/规格/型号" v-model="queryParam.materialParam"></a-input>
+                  <a-input placeholder="条码/名称/助记码/规格/型号/颜色/品牌/制造商" v-model="queryParam.materialParam"></a-input>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
@@ -42,7 +42,7 @@
               <template v-if="toggleSearchStatus">
                 <a-col :md="6" :sm="24">
                   <a-form-item label="往来单位" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                    <a-select placeholder="选择往来单位" v-model="queryParam.organId"
+                    <a-select placeholder="请选择往来单位" v-model="queryParam.organId"
                               :dropdownMatchSelectWidth="false" showSearch allow-clear optionFilterProp="children">
                       <a-select-option v-for="(item,index) in organList" :key="index" :value="item.id">
                         {{ item.supplier }}
@@ -163,10 +163,10 @@
         },
         // 查询条件
         queryParam: {
-          organId: '',
+          organId: undefined,
           materialParam:'',
-          depotId: '',
+          depotId: undefined,
-          organizationId: '',
+          organizationId: undefined,
           beginTime: getPrevMonthFormatDate(3),
           endTime: getFormatDate(),
           createTimeRange: [moment(getPrevMonthFormatDate(3)), moment(getFormatDate())],

jshERP-web/src/views/report/RetailOutReport.vue

@@ -9,7 +9,7 @@
             <a-row :gutter="24">
               <a-col :md="6" :sm="24">
                 <a-form-item label="商品信息" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                  <a-input placeholder="条码/名称/规格/型号" v-model="queryParam.materialParam"></a-input>
+                  <a-input placeholder="条码/名称/助记码/规格/型号/颜色/品牌/制造商" v-model="queryParam.materialParam"></a-input>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
@@ -42,7 +42,7 @@
               <template v-if="toggleSearchStatus">
                 <a-col :md="6" :sm="24">
                   <a-form-item label="会员卡号" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                    <a-select placeholder="选择会员卡号" v-model="queryParam.organId"
+                    <a-select placeholder="请选择会员卡号" v-model="queryParam.organId"
                               :dropdownMatchSelectWidth="false" showSearch allow-clear optionFilterProp="children">
                       <a-select-option v-for="(item,index) in retailList" :key="index" :value="item.id">
                         {{ item.supplier }}
@@ -167,9 +167,9 @@
           beginTime: getPrevMonthFormatDate(3),
           endTime: getFormatDate(),
           createTimeRange: [moment(getPrevMonthFormatDate(3)), moment(getFormatDate())],
-          organId: '',
+          organId: undefined,
-          depotId: '',
+          depotId: undefined,
-          organizationId: '',
+          organizationId: undefined,
           mpList: getMpListShort(Vue.ls.get('materialPropertyList')),
         },
         ipagination:{

jshERP-web/src/views/report/SaleOutReport.vue

@@ -9,7 +9,7 @@
             <a-row :gutter="24">
               <a-col :md="6" :sm="24">
                 <a-form-item label="商品信息" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                  <a-input placeholder="条码/名称/规格/型号" v-model="queryParam.materialParam"></a-input>
+                  <a-input placeholder="条码/名称/助记码/规格/型号/颜色/品牌/制造商" v-model="queryParam.materialParam"></a-input>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
@@ -42,7 +42,7 @@
               <template v-if="toggleSearchStatus">
                 <a-col :md="6" :sm="24">
                   <a-form-item label="客户" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                    <a-select placeholder="选择客户" v-model="queryParam.organId"
+                    <a-select placeholder="请选择客户" v-model="queryParam.organId"
                               :dropdownMatchSelectWidth="false" showSearch allow-clear optionFilterProp="children">
                       <a-select-option v-for="(item,index) in cusList" :key="index" :value="item.id">
                         {{ item.supplier }}
@@ -167,9 +167,9 @@
           beginTime: getPrevMonthFormatDate(3),
           endTime: getFormatDate(),
           createTimeRange: [moment(getPrevMonthFormatDate(3)), moment(getFormatDate())],
-          organId: '',
+          organId: undefined,
-          depotId: '',
+          depotId: undefined,
-          organizationId: '',
+          organizationId: undefined,
           mpList: getMpListShort(Vue.ls.get('materialPropertyList')),
         },
         ipagination:{

jshERP-web/src/views/report/StockWarningReport.vue

@@ -22,7 +22,7 @@
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="商品信息" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                  <a-input placeholder="条码/名称/规格/型号" v-model="queryParam.materialParam"></a-input>
+                  <a-input placeholder="条码/名称/助记码/规格/型号/颜色/品牌/制造商" v-model="queryParam.materialParam"></a-input>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
@@ -123,7 +123,7 @@
         // 查询条件
         queryParam: {
           materialParam:'',
-          depotId: '',
+          depotId: undefined,
           mpList: getMpListShort(Vue.ls.get('materialPropertyList'))  //扩展属性
         },
         ipagination:{

jshERP-web/src/views/report/VendorAccount.vue

@@ -9,7 +9,7 @@
             <a-row :gutter="24">
               <a-col :md="6" :sm="24">
                 <a-form-item label="供应商" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                  <a-select placeholder="选择供应商" v-model="queryParam.organId"
+                  <a-select placeholder="请选择供应商" v-model="queryParam.organId"
                     :dropdownMatchSelectWidth="false" showSearch allow-clear optionFilterProp="children">
                     <a-select-option v-for="(item,index) in supList" :key="index" :value="item.id">
                       {{ item.supplier }}
@@ -160,7 +160,7 @@
         // 查询条件
         queryParam: {
           supplierType: "供应商",
-          organId: '',
+          organId: undefined,
           hasDebt: '1',
           beginTime: getPrevMonthFormatDate(3),
           endTime: getFormatDate(),

jshERP-web/src/views/report/modules/HistoryFinancialList.vue

@@ -28,7 +28,7 @@
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="操作员" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                <a-select placeholder="选择操作员" showSearch optionFilterProp="children" v-model="queryParam.creator">
+                <a-select placeholder="请选择操作员" showSearch optionFilterProp="children" v-model="queryParam.creator">
                   <a-select-option v-for="(item,index) in userList" :key="index" :value="item.id">
                     {{ item.userName }}
                   </a-select-option>
@@ -37,7 +37,7 @@
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="单据状态" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                <a-select placeholder="选择单据状态" v-model="queryParam.status">
+                <a-select placeholder="请选择单据状态" v-model="queryParam.status">
                   <a-select-option value="0">未审核</a-select-option>
                   <a-select-option value="1">已审核</a-select-option>
                 </a-select>
@@ -56,7 +56,7 @@
             <template v-if="toggleSearchStatus">
               <a-col :md="6" :sm="24">
                 <a-form-item label="财务人员" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                  <a-select placeholder="选择财务人员" showSearch optionFilterProp="children" v-model="queryParam.handsPersonId">
+                  <a-select placeholder="请选择财务人员" showSearch optionFilterProp="children" v-model="queryParam.handsPersonId">
                     <a-select-option v-for="(item,index) in personList" :key="index" :value="item.id">
                       {{ item.name }}
                     </a-select-option>
@@ -65,7 +65,7 @@
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="账户信息" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                  <a-select placeholder="选择账户信息" showSearch optionFilterProp="children" v-model="queryParam.accountId">
+                  <a-select placeholder="请选择账户信息" showSearch optionFilterProp="children" v-model="queryParam.accountId">
                     <a-select-option v-for="(item,index) in accountList" :key="index" :value="item.id">
                       {{ item.name }}
                     </a-select-option>