فهرست منبع

Merge branch 'master' of http://git.echepei.com/wengyuwen/anpinjingyuan-ui

wengyuwen 4 سال پیش
والد
کامیت
2ab11b258f
2فایلهای تغییر یافته به همراه180 افزوده شده و 7 حذف شده
  1. 16 7
      src/views/purchaseIssue/index.vue
  2. 164 0
      src/views/reportAnalysis/salesStatistics.vue

+ 16 - 7
src/views/purchaseIssue/index.vue

@@ -89,19 +89,18 @@
     ></approval-comments>
 
     <el-dialog
-      title="打印"
       :visible.sync="dialogVisible"
       :fullscreen="true"
-      style="padding: 0;margin:0"
       width="70%"
+      style="background-color: #1c84c6"
     >
       <div ref="print">
         <h1 style="text-align: center;font-weight:bold">{{ formList.fsbuName }}</h1>
-        <div style="display: flex;justify-content: space-between;margin-bottom: 20px">
+        <div style="display: flex;justify-content: space-between;margin-bottom: 10px">
           <div style="width: 200px;height: 20px;font-size: 14px;">客户项目:{{projectName}}</div>
           <div style="width: 200px;height: 20px;font-size: 14px;">出库日期:{{formList.fBsdate}}</div>
         </div>
-        <div style="display: flex;justify-content: space-between;margin-bottom: 20px">
+        <div style="display: flex;justify-content: space-between;margin-bottom: 10px">
           <div style="width: 200px;height: 20px;font-size: 14px;">录入人:{{formList.createBy}}</div>
           <div style="width: 200px;height: 20px;font-size: 14px;">公司电话:{{formList.fsbuTel}}</div>
           <div style="width: 200px;height: 20px;font-size: 14px;">编号:{{formList.fBillno}}</div>
@@ -112,7 +111,7 @@
             <td class="column" style="width: 20%;">物料名称</td>
             <td class="column" style="width: 10%;">规格型号</td>
             <td class="column" style="width: 8%;">单位</td>
-            <td class="column" style="width: 10%;">量</td>
+            <td class="column" style="width: 10%;">量</td>
             <td class="column" style="width: 10%;">单价</td>
             <td class="column" style="width: 10%;">金额</td>
             <td class="column" style="width: 10%;">备注</td>
@@ -351,7 +350,7 @@ export default {
         }, {
           surface: '5',
           label: 'fPurchase',
-          name: '量',
+          name: '量',
           checked: 0,
           width: 100,
           onabort: '',
@@ -360,7 +359,7 @@ export default {
         }, {
           surface: '6',
           label: 'fQty',
-          name: '实际量',
+          name: '实际量',
           checked: 0,
           width: 100,
           onabort: '',
@@ -1402,4 +1401,14 @@ export default {
 .app-container >>> .el-form-item {
   margin-bottom: 0;
 }
+
+::v-deep .el-table__body-wrapper{
+  z-index: 2
+}
+::v-deep .el-dialog__header{
+  padding: 0;
+}
+::v-deep .el-dialog__body{
+   padding: 0 20px;
+ }
 </style>

+ 164 - 0
src/views/reportAnalysis/salesStatistics.vue

@@ -0,0 +1,164 @@
+<template>
+  <div class="app-container">
+    <formComponent
+      :formOption="formOption"
+      :dataList="dataList"
+      :inDex="inDex"
+      ref="avatar"
+      @submitForm="submitForm"
+      @returnToForm="returnToForm"
+    />
+    <listComponent
+      :tableData="tableData"
+      @modify="modification"
+      @deletion="deletion"
+      @buttonList="buttonList"
+      @showSearch="showSearch"
+      @feedback="feedback"
+      @getList="getList"
+      :hasPermi="hasPermi"
+      :isItHidden="isItHidden"
+      :customButton="customButton"
+      :listStyle="listStyle"
+      :queryList="queryList"
+      :setRowList="setRowList"
+    />
+    <el-pagination
+      style="float: right;margin-top: 10px"
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+      :page-sizes="[10, 20, 30, 50]"
+      :page-size="this.formDataList.pageSize"
+      background
+      layout="sizes, prev, pager, next"
+      :total="total">
+    </el-pagination>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'salesStatistics',
+  data(){
+    return{
+      dataList:{},
+      tableData:[],
+      setRowList:[],
+      isItHidden: true,
+      queryList: {
+        tableName: '销售出库统计',
+        columnList: []
+      },
+      hasPermi:{
+        lookup:['anpin:stockControl:query'],
+        disappear:['anpin:stockControl:remove']
+      },
+      customButton: [
+        {
+          type: 'primary',
+          size: 'mini',
+          icon: 'el-icon-edit',
+          name: '导出',
+          disabled: false,
+          hasPermi:['anpin:stockControl:anPingApply']
+        }],
+      inDex: 4,
+      total:0,
+      formDataList:{
+        pageSize:10,
+        pageNum:1,
+      },
+      listStyle: [
+        {
+          surface: '1',
+          label: 'serialNumber',
+          name: '序号',
+          checked: 0,
+          width: 100,
+          onabort: ''
+        },{
+          surface: '2',
+          label: 'fBillno',
+          name: '客户名称',
+          checked: 0,
+          width: 100,
+          onabort: ''
+        }
+        ],
+      formOption:[
+        {
+          span: 6,
+          label: 'fBillno',
+          name: '申请编号',
+          inputType: 2,
+          width: 200,
+          labelSize: '80',
+          rules: [{ required: false, message: ' ' }]
+        }
+      ]
+    }
+  },
+  created() {
+    this.queryList.columnList = this.listStyle
+  },
+  methods:{
+    //修改
+    modification(scope) {
+      console.log(scope)
+    },
+    //删除
+    deletion(scope){},
+    //所以按钮
+    buttonList(row){
+      console.log(row)
+    },
+    // 显示搜索条件、点击后会调用此方法
+    showSearch() {
+      console.log('到我了')
+      this.searchWhether = !this.searchWhether
+    },
+    //搜索、重置、展开
+    feedback(res) {
+      console.log(res)
+      if (res == '展开') {
+        if (this.inDex == 4) {
+          this.inDex = this.formOption.length
+        } else {
+          this.inDex = 4
+        }
+      } else if (res == '搜索') {
+        this.$refs.avatar.submitForm()
+      } else if (res == '重置') {
+        this.$refs.avatar.form = {}
+        this.$refs.avatar.submitForm()
+      }
+    },
+    //点击刷新会调用此方法
+    getList() {
+      console.log('到我了2')
+    },
+    submitForm() {
+      console.log(this.$refs.avatar.form)
+      this.formDataList = this.$refs.avatar.form
+    },
+    returnToForm(row) {
+      console.log(row, 111)
+    },
+    //分页
+    handleSizeChange(val) {
+      // console.log(`每页 ${val} 条`);
+      this.formDataList.pageSize = val
+      this.query(this.formDataList)
+    },
+    handleCurrentChange(val) {
+      // console.log(`当前页: ${val}`);
+      this.formDataList.pageNum = val
+      this.query(this.formDataList)
+    },
+  }
+}
+</script>
+
+<style scoped>
+
+</style>