From ed6c6350015d52ea1cb033c7558f72b721ece84a Mon Sep 17 00:00:00 2001
From: WangHan <wwh_work@126,com>
Date: 星期四, 19 十二月 2024 19:58:55 +0800
Subject: [PATCH] 打包名称修改,去除错误输出

---
 admin-web/src/views/statisticalreport/itemReport/index.vue |  415 ++++++++++++++++++++++------------------------------------
 1 files changed, 158 insertions(+), 257 deletions(-)

diff --git a/admin-web/src/views/statisticalreport/itemReport/index.vue b/admin-web/src/views/statisticalreport/itemReport/index.vue
index 2936cd9..a9a2cd3 100644
--- a/admin-web/src/views/statisticalreport/itemReport/index.vue
+++ b/admin-web/src/views/statisticalreport/itemReport/index.vue
@@ -1,280 +1,181 @@
 <template>
   <div class="app-container">
-    <el-container>
-      <el-container>
-        <el-card class="box-card" style="width: 100%" shadow="never">
-          <!--鎼滅储鏉′欢-->
-          <div class="filter-container">
-            <my-search ref="searchBar" :items="items" @search="fifterForm"></my-search>
-          </div>
-          <el-row style="margin-top: 15px">
-            <el-col>
-              <!--鍒楄〃-->
-              <my-table-v2 ref="myTable" :filter="filterFrom" :table="table"/>
-            </el-col>
-          </el-row>
-          <!--娣诲姞/缂栬緫寮圭獥-->
-          <edit v-if="editSetting.show" :setting="editSetting" @close="editSetting.show = false" @search="search"/>
-        </el-card>
-      </el-container>
-    </el-container>
-    <my-import
-      :import-setting="importSetting"
-      :dialog-show="importSetting.dialogShow"
-      :dialog-title="importSetting.dialogTitle"
-    />
+    <el-card class="box-card" shadow="never">
+      <div class="filter-container" style="margin-bottom: 10px">
+        <my-search ref="searchBar" :items="items" @search="filterForm"></my-search>
+      </div>
+      <div class="title">鐗╁搧缁熻琛�</div>
+      <el-table
+        v-loading="loading"
+        :data="tableData"
+        border
+        style="width: 100%">
+        <el-table-column
+          align="center"
+          prop="orgName"
+          label="鏈烘瀯"
+          min-width="150">
+        </el-table-column>
+        <el-table-column
+          align="center"
+          prop="warehouseName"
+          label="浠撳簱/閮ㄩ棬"
+          min-width="150">
+        </el-table-column>
+        <el-table-column
+          align="center"
+          prop="goodsCode"
+          label="鐗╁搧缂栫爜"
+          width="150">
+        </el-table-column>
+        <el-table-column
+          align="center"
+          prop="goodsTemplateName"
+          label="鐗╁搧鍚嶇О"
+          min-width="150">
+        </el-table-column>
+        <el-table-column
+          align="center"
+          prop="baseGoodsModelsName"
+          label="瑙勬牸鍨嬪彿"
+          min-width="150">
+        </el-table-column>
+        <el-table-column
+          align="center"
+          prop="zaiKuNum"
+          label="鍦ㄥ簱/鍦ㄧ敤鏁伴噺"
+          width="150">
+        </el-table-column>
+
+        <el-table-column
+          align="center"
+          prop="baoFeiNum"
+          label="鎶ュ簾鏁�"
+          width="150">
+        </el-table-column>
+<!--        <el-table-column-->
+<!--          align="center"-->
+<!--          prop="diaoBoNum"-->
+<!--          label="璋冩嫧鏁�"-->
+<!--          width="150">-->
+<!--        </el-table-column>-->
+        <el-table-column
+          align="center"
+          prop="totalNum"
+          label="鎬绘暟閲�"
+          width="150">
+        </el-table-column>
+      </el-table>
+    </el-card>
   </div>
 </template>
 
 <script>
-import MyTableV2 from "@/components/myTable/myTableV2";
-import MyButton from "@/components/myButton/myButton";
+import {getGoodsStatistics} from '@/api/dashboard/goodsStatis.js'
+import {formatDate} from "@/utils/DateFormatter";
 import SettingIplatform from '@/utils/settingIplatform';
-import edit from './edit'
-import * as finsystenant from '@/api/baseSetting/finsystenant'
-import myImport from '@/views/components/myImport'
-import {getBaseUrl} from '@/utils/base';
 
 export default {
-  name: "index",
-  components: {MyButton, MyTableV2, edit, myImport},
-  data() {
-    return {
-      // 鎼滅储妗�
-      items: [
-        {
-          type: 'text',
-          dataIndex: 'name',
-          label: '鍗曞彿',
-          placeholder: '璇疯緭鍏�',
-          defaultValue: ''
-        },
-        {
-          type: 'select',
-          dataIndex: 'status',
-          label: '绫诲瀷',
-          placeholder: '璇烽�夋嫨',
-          defaultValue: '1',
-          options: [
-            {
-              label: '鍚敤',
-              value: '1'
+    data() {
+      return {
+        items: [
+          {
+            type: 'cascader',
+            dataIndex: 'agencyId',
+            label: '鏈烘瀯',
+            placeholder: '璇烽�夋嫨',
+            defaultValue: '',
+            options: [],
+            cascader: [{key:'baseWarehouseId',queryKey: 'agencyId'},{key:'goodsTemplateId',queryKey: 'agencyId'}],
+            optionsConfig: { url: '/pc/fin/sys/tenant/select/tree_fin_tenant', props: null },
+          },
+          {
+            type: 'select',
+            dataIndex: 'baseWarehouseId',
+            label: '浠撳簱',
+            placeholder: '璇烽�夋嫨',
+            defaultValue: '',
+            options: [],
+            optionsConfig: {
+              label: 'warehouseName',
+              value: 'id',
+              url: SettingIplatform.apiBaseURL + '/pc/base/warehouse/select/tenant_warehouse'
             },
-            {
-              label: '绂佺敤',
-              value: '0'
-            }
-          ]
-        },
-        {
-          type: 'text',
-          dataIndex: 'name',
-          label: '鐗╁搧鍚嶇О',
-          placeholder: '璇疯緭鍏�',
-          defaultValue: ''
-        },
-        {
-          type: 'text',
-          dataIndex: 'name',
-          label: '鍒涘缓浜�',
-          placeholder: '璇疯緭鍏�',
-          defaultValue: ''
-        },
-      ],
-      // 鏍戞暟鎹�
-      treeDataList: [],
-      // 鎼滅储鏉′欢
-      filterFrom: {
-        tenantId: null,
-        userName: null,
-        userPhone: null,
-        status: 1
-      },
-      // 瀵煎叆
-      importSetting: {
-          dialogTitle: '瀵煎叆',
-          dialogShow: false,
-          fileSettings: {
-              data: {},
-              uploadUrl: getBaseUrl()+"/pc/fin/sys/tenant/import", // 涓婁紶鍦板潃
-              accept: '.xls', // 鏍煎紡
-              type: 'text', // 鍥炴樉褰㈠紡
-              loading: false // 瀵煎叆鏁堟灉
           },
-          /* 妯℃澘涓嬭浇 */
-          templateSettings: {
-              templateName: '瀵煎叆妯℃澘.xls', // 鍚嶇О
-              templateUrl: SettingIplatform.apiBaseURL + '/pc/fin/sys/tenant/getImportTemplate' // 涓嬭浇鍦板潃
+          {
+            type: 'select',
+            dataIndex: 'goodsTemplateId',
+            label: '鐗╁搧鍚嶇О',
+            placeholder: '璇疯緭鍏�',
+            defaultValue: '',
+            options: [],
+            cascader: [{key:'categoryId',queryKey: 'goodsTemplatesId'}],
+            optionsConfig: {
+              label: 'goodsName',
+              value: 'id',
+              url: SettingIplatform.apiBaseURL + '/pc/base/goods/template/query/goodsTemplate',
+            },
           },
-          onSuccess: null
-      },
-      editSetting: {
-        title: '',
-        id: '',
-        orgId: '',
-        show: false,
-      },
-      // 琛ㄦ牸鏁版嵁
-      table: {
-        showIndex: true, // 鏄惁鏄剧ず搴忓彿
-        expand: false, // 鏄惁鏄剧ず璇︽儏鏁版嵁
-        url: SettingIplatform.apiBaseURL + '/pc/fin/sys/tenant/select/list', // 璇锋眰鍦板潃
-        // 宸ュ叿鏉�
-        tools: {
-          columnsCtrl: {// 鍒楁帶鍒舵寜閽�
-            show: false
+          {
+            type: 'select',
+            dataIndex: 'baseGoodsModelsId',
+            label: '瑙勬牸鍨嬪彿',
+            placeholder: '璇烽�夋嫨',
+            defaultValue: '',
+            options: [],
+            optionsConfig: {
+              label: 'modelName',
+              value: 'id',
+              url: SettingIplatform.apiBaseURL + '/pc/base/goods/models/query/goodsModel'
+            },
           },
-          generalExport: {// 閫氱敤瀵煎嚭鎸夐挳
-            show: false
+          {
+            type: 'select',
+            dataIndex: 'costType',
+            label: '绫诲埆',
+            placeholder: '璇烽�夋嫨',
+            defaultValue: '',
+            options: [{
+              label: 'A',
+              value: '1'},{
+              label: 'B',
+              value: '2'},{
+              label: 'C',
+              value: '3'}],
+
           },
-          // 鑷畾涔夊伐鍏锋潯鎸夐挳
-          custom: [
-          ]
-        },
-        // 鍒椾俊鎭�
-        columns: [
-          {title: '绫诲瀷', field: 'name', align: 'left',},
-          {title: '鍗曞彿', field: 'code', align: 'center'},
-          {title: '鐗╁搧鍚嶇О', field: 'lv', align: 'center', },
-          {title: '瑙勬牸鍨嬪彿', field: 'lv', align: 'center', },
-          {title: '鍑哄叆搴撴暟閲�', field: 'summary', align: 'left',},
-          {title: '閲戦', field: 'summary', align: 'left',},
-          {title: '鎵�灞炴満鏋�', field: 'summary', align: 'left',},
-          {title: '鍒涘缓浜�', field: 'summary', align: 'left',},
-          {title: '鎿嶄綔鏃堕棿', field: 'summary', align: 'left',},
         ],
-        // 鎿嶄綔淇℃伅
-        operation: {
-          show: true, // 鏄剧ず鎿嶄綔鍒�
-          width: '150', // 鍒楀
-          attr: [
-            {
-              title: '璇︽儏',
-              events: (row) => {
-                this.showAudit(row);
-              },
-            },
-          ],
-        },
-        paging: {
-          show: true, // 鏄剧ず鍒嗛〉
-          // 鍒嗛〉淇℃伅
-          page: {
-            small: false,
-            pageNum: 1,
-            pageSize: 10,
-            total: 0
-          }
-        }
+        tableData: [],
+        loading: true,
+        params:{examYear: formatDate(new Date(),'yyyyMMdd')}
+      }
+    },
+    mounted() {
+      this.getTableData({})
+    },
+    methods: {
+      filterForm(e) {
+        this.params = e
+        this.getTableData(e)
       },
-    }
-  },
-  created() {
-    // 鑾峰彇鏈烘瀯鏍�
-    this.initTreeData()
-  },
-  methods: {
-    //瀵煎叆
-    importOrg() {
-        this.importSetting.dialogShow = true
-        this.importSetting.onSuccess = (response, callBack) => {
-            if (response.code===1){
-              this.$message.success(response.msg)
-              this.search(1)
-            }else{
-              this.$message.warning(response.msg)
-            }
-            callBack()
-        }
-    },
-    // 宸︿晶鏍戝垵濮嬪寲
-    initTreeData() {
-      finsystenant.getTree().then(res => {
-        const content = res || []
-        this.treeDataList.splice(0, this.treeDataList.length)
-        this.treeDataList = content
-        if (content.length > 0) {
-          this.importSetting.fileSettings.data = {pid: content[0].id}
-        }
-      })
-    },
-    updState(row) {
-      let vm = this
-      let text = row.status == 0 ? "鍚敤" : "绂佺敤";
-      vm.$modal.confirm('纭瑕�' + text + '"' + row.name + '"鍚楋紵').then(function () {
-        let params = Object.assign({}, row)
-        params.status = row.status == 1 ? 0 : 1
-        finsystenant.edit(params).then(res => {
-          if (res) {
-            row.status = row.status === 1 ? 0 : 1
-            vm.$modal.msgSuccess(text + "鎴愬姛");
-            vm.search()
-          }
+      getTableData(e) {
+        this.loading = true
+        getGoodsStatistics(e).then(res => {
+          this.tableData = res
+          this.loading = false
+        }).catch(() => {
+          this.loading = false
         })
-      })
-    },
-    del(row) {
-      this.$modal
-        .confirm('鏄惁纭鍒犻櫎鍚嶇О涓�"' + row.name + '"鐨勬満鏋勫悧锛�')
-        .then(function () {
-          finsystenant.del({id: row.id}).then((res) => {
-          });
-        })
-        .then((res) => {
-          this.$message.success('鍒犻櫎鎴愬姛锛�');
-          this.search()
-        })
-        .catch(() => {
-        });
-    },
-    showAdd() {
-      // if (!this.editSetting.orgId) {
-      //   this.$message.warning('璇峰厛閫夋嫨宸︿晶鏈烘瀯')
-      // } else {
-        this.editSetting.id = null;
-        this.editSetting.info = null;
-        this.editSetting.title = '鏂板';
-        this.editSetting.show = true;
-      // }
-    },
-    showAudit(row) {
-      this.editSetting.id = row.id;
-      this.editSetting.info = JSON.stringify(row);
-      this.editSetting.title = '缂栬緫';
-      this.editSetting.show = true;
-    },
-    nodeClick(param) {
-      param = param || {}
-      this.p = Object.assign({}, {
-        id: param.id,
-        name: param.name
-      })
-      if (this.p.id != undefined && this.p.id != null) {
-        this.filterFrom.tenantId = this.p.id
-        this.editSetting.orgId = this.p.id
-      } else {
-        this.filterFrom.tenantId = null
-        this.editSetting.orgId = null
       }
-      this.importSetting.fileSettings.data = {pid: param.id}
-      this.search(1)
-    },
-    // 鏌ヨtable鍒楄〃
-    search(pageNum) {
-      if (pageNum != undefined) {
-        this.$refs.myTable.search(pageNum)
-      } else {
-        this.$refs.myTable.search()
-      }
-    },
-    fifterForm(params) {
-      this.filterFrom = Object.assign(this.filterFrom, params)
-      this.search(1)
     }
   }
-}
 </script>
 
-<style scoped>
-
+<style scoped class="">
+  .title{
+    text-align: center;
+    font-size: 18px;
+    font-weight: bold;
+    margin-bottom: 10px;
+  }
 </style>

--
Gitblit v1.9.1