数据格式化

src/combination/formComponent.vue

@@ -10,7 +10,7 @@
       >
         <el-input v-model="form[item.label]" :onkeyup="item.onabort" :disabled="item.disabled" v-if="item.inputType == 2" :style="{ width: item.width + 'px' }" size="small" :placeholder="'请输入'+item.name"></el-input>
         <span v-if="item.inputType == 1">
-          <el-select clearable v-model="form[item.label]" :disabled="item.disabled" :style="{ width: item.width + 'px' }" filterable slot="prepend" @change="change(item.label,dataList[item.label],form[item.label])" placeholder="请选择">
+          <el-select :multiple="item.multiple" clearable v-model="form[item.label]" :disabled="item.disabled" :style="{ width: item.width + 'px' }" filterable slot="prepend" @change="change(item.label,dataList[item.label],form[item.label])" placeholder="请选择">
             <el-option v-for="(li,index) in dataList[item.label]" :key="index" :label="li.label" :value="li.value"></el-option>
           </el-select>
         </span>

src/combination/listComponent.vue

@@ -217,10 +217,12 @@ export default {
                   return prev
                 }
               }, 0)
+              sums[index] = sums[index].toFixed(2)
             }
           }
         })
       }
+      console.log(sums)
       return sums
     },
     initData(){

src/components/Pagination/index.vue

@@ -1,6 +1,17 @@
 <template>
   <div :class="{'hidden':hidden}" class="pagination-container">
+
+<!--    <el-input-->
+<!--      v-model="pageSize"-->
+<!--      style="-->
+<!--      width: 160px;-->
+<!--      float: right;-->
+<!--"-->
+<!--      @input="input"-->
+<!--      @change="handleSizeChange"-->
+<!--    ></el-input>-->
     <el-pagination
+      style="margin-right: 200px"
       :background="background"
       :current-page.sync="currentPage"
       :page-size.sync="pageSize"
@@ -10,7 +21,9 @@
       v-bind="$attrs"
       @size-change="handleSizeChange"
       @current-change="handleCurrentChange"
-    />
+    >
+
+    </el-pagination>
   </div>
 </template>
 
@@ -74,6 +87,9 @@ export default {
     }
   },
   methods: {
+    input(){
+      // Number
+    },
     handleSizeChange(val) {
       this.$emit('pagination', { page: this.currentPage, limit: val })
       if (this.autoScroll) {

src/views/basicdata/dept/index.vue

@@ -33,7 +33,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['system:dept:add']"
+          v-hasPermi="['basicdata:warehouse:add']"
         >新增</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -78,14 +78,14 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['system:dept:edit']"
+            v-hasPermi="['basicdata:warehouse:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-plus"
             @click="handleAdd(scope.row)"
-            v-hasPermi="['system:dept:add']"
+            v-hasPermi="['basicdata:warehouse:add']"
           >新增</el-button>
           <el-button
             v-if="scope.row.parentId != 0"
@@ -93,7 +93,7 @@
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['system:dept:remove']"
+            v-hasPermi="['basicdata:warehouse:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
@@ -522,4 +522,4 @@ export default {
   background-color: rgba(0, 0, 0, 0.05);
   height: 100%;
 }
-</style>
+</style>

src/views/purchaseIssue/index.vue

@@ -39,13 +39,16 @@
 <!--        :total="total"-->
 <!--      >-->
 <!--      </el-pagination>-->
+      <div style="float: right">
       <pagination
         v-show="total > 0"
         :total="total"
         :page.sync="formDataList.pageNum"
         :limit.sync="formDataList.pageSize"
-        @pagination="getList"
+        @pagination="feedback('搜索')"
+        :page-sizes="[100,200,500,1000]"
       />
+      </div>
     </div>
     <div v-else class="app-container">
       <div style="display: flex;margin-bottom: 10px">
@@ -202,6 +205,7 @@ export default {
   name: 'index',
   data() {
     return {
+      form:{},
       before: '',
       hasPermi: {
         lookup: ['anpin:stockControl:query'],
@@ -1097,11 +1101,11 @@ export default {
             this.$set(this.queryList,'columnList',this.$options.data().listStyle)
             this.setRowList = this.$options.data().listStyle
           }
+          this.$refs.avatar.form = this.form
           this.pageDisplay = true
           this.isItHidden = true
           this.inDex = 4
         }
-        this.$refs.avatar.form = {}
         if (list) {
           this.$refs.avatar.form = list.warehouseBills
           this.contentList = list.tWarehousebillsfees
@@ -1174,6 +1178,7 @@ export default {
     },
     //查看
     viewMethod(scope,res) {
+      this.form = this.$refs.avatar.form
       if(res){
         this.contentButton.forEach(item => {
           item.disabled = false
@@ -1651,6 +1656,7 @@ export default {
         this.$refs.avatar.submitForm()
       } else if (res == '重置') {
         this.$refs.avatar.form = {}
+        this.formDataList.pageNum = 1
         this.$refs.avatar.submitForm()
       }
     },

src/views/purchaseRequest/index.vue

@@ -37,13 +37,16 @@
 <!--        layout="sizes, prev, pager, next"-->
 <!--        :total="total">-->
 <!--      </el-pagination>-->
+      <div style="float: right">
       <pagination
         v-show="total > 0"
         :total="total"
         :page.sync="formDataList.pageNum"
         :limit.sync="formDataList.pageSize"
-        @pagination="getList"
+        :page-sizes="[100,200,500,1000]"
+        @pagination="feedback('搜索')"
       />
+      </div>
     </div>
     <div v-else class="app-container">
       <div style="display: flex;margin-bottom: 10px">
@@ -627,8 +630,8 @@ export default {
           rules: [{ required: false, message: ' ' }]
         }, {
           span: 6,
-          label: 'cLoadDate',
-          name: '制单日期',
+          label: 'timeInterval',
+          name: '提货日期',
           inputType: 3,
           width: 300,
           labelSize: '80',
@@ -1004,6 +1007,7 @@ export default {
     },
     //查询主页列数据
     query(data) {
+      console.log(data)
       listQuery(data).then(res => {
         this.tableData = res.rows
         this.total = res.total
@@ -1602,6 +1606,7 @@ export default {
         this.$refs.avatar.submitForm()
       } else if (res == '重置') {
         this.$refs.avatar.form = {}
+        this.formDataList.pageNum = 1
         this.$refs.avatar.submitForm()
       }
     },

src/views/reportAnalysis/inoutStatistics.vue

@@ -34,13 +34,16 @@
 <!--      layout="sizes, prev, pager, next"-->
 <!--      :total="total">-->
 <!--    </el-pagination>-->
+    <div style="float: right">
     <pagination
       v-show="total > 0"
       :total="total"
       :page.sync="formDataList.pageNum"
       :limit.sync="formDataList.pageSize"
+      :page-sizes="[100,200,500,1000]"
       @pagination="getList"
     />
+    </div>
   </div>
 </template>
 

src/views/reportAnalysis/profitGeneralLedger.vue

@@ -197,7 +197,7 @@
         :fixed="item.fixed"
       />
     </el-table>
-
+  <div style="float: right">
     <pagination
       v-show="total>0"
       :total="total"
@@ -206,6 +206,7 @@
       :page-sizes="[50,100, 200, 500, 1000]"
       @pagination="getList"
     />
+    </div>
   </div>
 </template>
 

src/views/reportAnalysis/salesStatistics.vue

@@ -24,13 +24,18 @@
       :setRowList="setRowList"
       :tatolLabel="tatolLabel"
     />
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      :page.sync="formDataList.pageNum"
-      :limit.sync="formDataList.pageSize"
-      @pagination="getList"
-    />
+    <div style="float: right">
+
+      <pagination
+        v-show="total > 0"
+        :total="total"
+        :page.sync="formDataList.pageNum"
+        :limit.sync="formDataList.pageSize"
+        :page-sizes="[100,200,500,1000]"
+        @pagination="getList"
+      />
+
+    </div>
 <!--    <el-pagination-->
 <!--      style="float: right;margin-top: 10px"-->
 <!--      @size-change="handleSizeChange"-->
@@ -56,8 +61,9 @@ export default {
       tatolLabel:['数量','金额'],
       dataList:{
         fGoodsid:[],
-        fFeeType:[],
+        fFeeTypeList:[],
         fFeeid:[],
+        groupDate:[{label:'是',value:0},{label: '否',value: 1}],
         fBillstatus:[{label:'全部',value:''},{label:'暂存',value:'2'},{label:'审核中',value:'5'},{label:'审核通过',value:'6'},]
       },
       tableData:[],
@@ -171,11 +177,12 @@ export default {
           rules: [{ required: false, message: ' ' }]
         },{
           span: 6,
-          label: 'fFeeType',
+          label: 'fFeeTypeList',
           name: '物资类别',
           inputType: 1,
           width: 200,
           labelSize: '80',
+          multiple:true,
           rules: [{ required: false, message: ' ' }]
         },{
           span: 6,
@@ -203,6 +210,15 @@ export default {
           labelSize: '80',
           rules: [{ required: false, message: ' ' }]
         },
+        {
+          span: 6,
+          label: 'groupDate',
+          name: '是否按照日期分组',
+          inputType: 1,
+          width: 200,
+          labelSize: '80',
+          rules: [{ required: false, message: ' ' }]
+        },
       ]
     }
   },
@@ -219,7 +235,7 @@ export default {
     })
     this.getDicts("data_cost_attribute").then((response) => {
       for(let item in response.data){
-        this.dataList.fFeeType.push({
+        this.dataList.fFeeTypeList.push({
           value: response.data[item].dictValue,
           label:response.data[item].dictLabel
         })
@@ -241,7 +257,8 @@ export default {
       tableName: this.queryList.tableName,
       userId: Cookies.get('userName')
     }
-    this.getRow(data)
+    this.getRow(data,'S')
+
   },
   methods:{
     getRow(data,list) {
@@ -259,6 +276,9 @@ export default {
         this.isItHidden = true
         // this.inDex = this.formOption.length
         this.inDex = 4
+        if (list == 'S'){
+          this.$set(this.$refs.avatar.form,'groupDate',1)
+        }
       })
     },
     //修改

src/views/warehouse/inStock/index.vue

@@ -30,13 +30,16 @@
         :listStyle="listStyle"
         :isItHidden="isItHidden"
         :queryList="queryList"/>
+      <div style="float: right">
       <pagination
         v-show="total > 0"
         :total="total"
         :page.sync="queryParms.pageNum"
         :limit.sync="queryParms.pageSize"
         @pagination="getList"
+        :page-sizes="[100,200,500,1000]"
       />
+      </div>
     </div>
     <div v-if="MainTable == true">
       <el-breadcrumb separator="/" style="display:flex;align-items: center;margin-bottom: 10px">

src/views/warehouse/outStock/index.vue

@@ -30,13 +30,16 @@
         :listStyle="listStyle"
         :isItHidden="isItHidden"
         :queryList="queryList"/>
+      <div style="float: right">
       <pagination
         v-show="total > 0"
         :total="total"
         :page.sync="queryParms.pageNum"
         :limit.sync="queryParms.pageSize"
         @pagination="getList"
+        :page-sizes="[100,200,500,1000]"
       />
+      </div>
     </div>
     <div v-if="MainTable == true">
       <el-breadcrumb separator="/" style="display:flex;align-items: center;margin-bottom: 10px">