From 35c917bafbd8853ff172542050abebfc599ecb44 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期三, 19 四月 2023 17:00:52 +0800
Subject: [PATCH] 1.采购管理新增 多个静态页面

---
 src/views/purchasesManager/goodsStatisticsList.vue |  746 +++++++++++++++++
 src/views/purchasesManager/InventoryLedgerList.vue |  825 +++++++++++++++++++
 src/views/purchasesManager/purchasesList.vue       |  138 --
 src/store/modules/permission.js                    |    1 
 src/router/index.js                                |   20 
 src/views/purchasesManager/salesStatisticsList.vue |  746 +++++++++++++++++
 6 files changed, 2,350 insertions(+), 126 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index 41b64ee..6914f66 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -651,7 +651,25 @@
         name: 'arrivalNoticeListCancel',
         code: '1202',
         component: () => import('@/views/purchasesManager/arrivalNoticeList'),
-        meta: { code: '1202', title: '鍒拌揣閫氱煡鍗�', icon: '', keepAlive: true }
+        meta: { code: '1202', title: '閲囪喘鏀惰揣鍗�', icon: '', keepAlive: true }
+      }, {
+        path: 'salesStatisticsList',
+        name: 'salesStatisticsCancel',
+        code: '1203',
+        component: () => import('@/views/purchasesManager/salesStatisticsList'),
+        meta: { code: '1203', title: '閿�鍞鍗�', icon: '', keepAlive: true }
+      }, {
+        path: 'goodsStatisticsList',
+        name: 'goodsStatisticsListCancel',
+        code: '1204',
+        component: () => import('@/views/purchasesManager/goodsStatisticsList'),
+        meta: { code: '1204', title: '閿�璐у崟', icon: '', keepAlive: true }
+      }, {
+        path: 'InventoryLedgerList',
+        name: 'InventoryLedgerListCancel',
+        code: '1205',
+        component: () => import('@/views/purchasesManager/InventoryLedgerList'),
+        meta: { code: '1205', title: '搴撳瓨鍙拌处', icon: '', keepAlive: true }
       }
     ]
   }
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 216c241..e15629c 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -98,6 +98,7 @@
 const actions = {
   generateRoutes({ commit }, menu) {
     return new Promise(resolve => {
+      console.log(menu, 'menu')
       const newRoutes = getAsyncRoutes(asyncRoutes, menu)
       commit('SET_ROUTES', newRoutes)
       resolve(newRoutes)
diff --git a/src/views/purchasesManager/InventoryLedgerList.vue b/src/views/purchasesManager/InventoryLedgerList.vue
new file mode 100644
index 0000000..3ef7931
--- /dev/null
+++ b/src/views/purchasesManager/InventoryLedgerList.vue
@@ -0,0 +1,825 @@
+<template>
+  <div>
+    <div class="body" :style="{height:mainHeight+'px'}">
+
+      <!--      <div class="bodyTopButtonGroup">-->
+      <!--        <el-button v-waves type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>-->
+      <!--      </div>-->
+      <div class="bodyTopFormGroup" style="margin-top: 10px">
+        <el-form
+          ref="form"
+          :model="form"
+          label-width="100px"
+          inline
+          style="display: flex;"
+        >
+          <div class="elForm">
+            <el-form-item label="鍗曟嵁鏃ユ湡" style="display: flex;font-size: 14px;align-items: center">
+              <el-date-picker
+                v-model="form.orderdate"
+                type="daterange"
+                range-separator="~"
+                class="timeMini"
+                size="mini"
+                style="width: 200px;display: flex;line-height: 34px;height: 34px;"
+                :clearable="false"
+                start-placeholder="寮�濮嬫棩鏈�"
+                end-placeholder="缁撴潫鏃ユ湡"
+              />
+            </el-form-item>
+
+            <el-form-item label="鍗曟嵁缂栧彿" style=" display: flex;">
+              <el-input v-model="form.OrgCode" placeholder="璇疯緭鍏�" style="width: 200px" />
+            </el-form-item>
+            <el-form-item label="寰�鏉ュ崟浣�" style=" display: flex;">
+              <el-input v-model="form.OrgName" placeholder="璇疯緭鍏�" style="width: 200px" />
+            </el-form-item>
+            <!--            <el-form-item label="鍒涘缓浜哄憳" style=" display: flex;">-->
+            <!--              <el-input v-model="form.UserName" style="width: 200px" placeholder="璇疯緭鍏�" />-->
+            <!--            </el-form-item>-->
+            <!--            <el-form-item label="棰勮浜よ揣鏃ユ湡" style="display: flex;font-size: 14px;align-items: center">-->
+            <!--              <el-date-picker-->
+            <!--                v-model="form.orderdate"-->
+            <!--                type="daterange"-->
+            <!--                range-separator="~"-->
+            <!--                class="timeMini"-->
+            <!--                size="mini"-->
+            <!--                style="width: 200px;display: flex;line-height: 34px;height: 34px;"-->
+            <!--                :clearable="false"-->
+            <!--                start-placeholder="寮�濮嬫棩鏈�"-->
+            <!--                end-placeholder="缁撴潫鏃ユ湡"-->
+            <!--              />-->
+            <!--            </el-form-item>-->
+          </div>
+          <div
+            class="bodySearchReset"
+            :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}"
+          >
+            <el-button v-waves type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
+            <el-button v-waves type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
+          </div>
+        </el-form>
+        <div
+          class="bodyTopFormExpand"
+        />
+      </div>
+      <div class="elTableDiv">
+        <!--        <TableColumnSettings-->
+        <!--          :list1="tableColumnSettingsArray"-->
+        <!--          @tableColumnUpdate="tableColumnUpdate"-->
+        <!--        />-->
+        <el-table
+          ref="tableDataRef"
+          :key="tableTimeStampKey"
+          class="tableFixed"
+          :data="tableData"
+          border
+          :row-class-name="tableRowClassName"
+          :style="{width: 100+'%',height:tableHeight+'px'}"
+          highlight-current-row
+          :height="tableHeight+'px'"
+          :header-cell-style="this.$headerCellStyle"
+          :cell-style="this.$cellStyle"
+        >
+          <!--          @sort-change="sortChange"-->
+
+          <el-table-column
+            type="index"
+            width="50"
+            label="搴忓彿"
+            fixed
+          />
+          <el-table-column
+            prop="doc_date"
+            label="鍗曟嵁鏃ユ湡"
+            sortable="custom"
+            show-tooltip-when-overflow
+            min-width="110"
+          />
+          <el-table-column
+            prop="doc_type"
+            label="鍗曟嵁绫诲瀷"
+            sortable="custom"
+            show-tooltip-when-overflow
+            width="110"
+          />
+          <el-table-column
+            prop="doc_code"
+            label="鍗曟嵁缂栧彿"
+            width="160"
+            show-tooltip-when-overflow
+            sortable="custom"
+          />
+          <el-table-column
+            prop="businessType"
+            label="涓氬姟绫诲瀷"
+            sortable="custom"
+            show-tooltip-when-overflow
+            width="110"
+          />
+          <el-table-column
+            prop="commUnit"
+            label="寰�鏉ュ崟浣�"
+            width="220"
+            show-tooltip-when-overflow
+            sortable="custom"
+          />
+          <el-table-column
+            prop="item"
+            label="椤圭洰"
+            width="110"
+            show-tooltip-when-overflow
+            sortable="custom"
+          />
+          <el-table-column
+            label="鏀跺叆"
+          >
+            <el-table-column
+              prop="in_sum"
+              label="鏁伴噺(涓�)"
+              width="160"
+            />
+            <el-table-column
+              prop="in_price"
+              label="鍗曚环"
+              width="160"
+            />
+            <el-table-column
+              prop="in_money"
+              label="閲戦"
+              width="160"
+            />
+          </el-table-column>
+          <el-table-column
+            label="鍙戝嚭"
+          >
+            <el-table-column
+              prop="out_sum"
+              label="鏁伴噺(涓�)"
+              width="160"
+            />
+            <el-table-column
+              prop="out_price"
+              label="鍗曚环"
+              width="160"
+            />
+            <el-table-column
+              prop="out_money"
+              label="閲戦"
+              width="160"
+            />
+          </el-table-column>
+
+          <el-table-column
+            label="鏀跺叆"
+          >
+            <el-table-column
+              prop="balance_sum"
+              label="鏁伴噺(涓�)"
+              width="160"
+            />
+            <el-table-column
+              prop="balance_price"
+              label="鍗曚环"
+              width="160"
+            />
+            <el-table-column
+              prop="balance_money"
+              label="閲戦"
+              width="160"
+            />
+          </el-table-column>
+          <!--          <el-table-column-->
+          <!--            fixed="right"-->
+          <!--            label="鎿嶄綔"-->
+          <!--            width="120"-->
+          <!--          >-->
+          <!--            <template slot-scope="{row}">-->
+          <!--              <div class="operationClass">-->
+          <!--                <el-tooltip class="item" effect="dark" content="缂栬緫" placement="top">-->
+          <!--                  <i-->
+          <!--                    :style="{color:$store.state.settings.theme}"-->
+          <!--                    class="el-icon-edit-outline"-->
+          <!--                    @click="edit('edit',row)"-->
+          <!--                  />-->
+          <!--                </el-tooltip>-->
+          <!--                <el-tooltip v-del-tab-index class="item" effect="dark" content="鍒犻櫎" placement="top">-->
+          <!--                  <i :style="{color:$store.state.settings.theme}" class="el-icon-delete" @click="del(row.id)" />-->
+          <!--                </el-tooltip>-->
+          <!--                &lt;!&ndash;                <el-button type="primary" size="mini" />&ndash;&gt;-->
+          <!--                &lt;!&ndash;                <el-button type="danger" size="mini">鍒犻櫎</el-button>&ndash;&gt;-->
+
+          <!--              </div>-->
+          <!--            </template>-->
+          <!--          </el-table-column>-->
+        </el-table>
+      </div>
+      <!--鍒嗛〉-->
+      <pagination
+        :total="total"
+        :page.sync="form.page"
+        :limit.sync="form.rows"
+        align="right"
+        layout="total ,prev, pager, next,sizes"
+        popper-class="select_bottom"
+        @pagination="getOrganizationSearch"
+      />
+    </div>
+
+    <el-dialog
+      v-el-drag-dialog
+      :title="operation==='add'?'鏂板':'缂栬緫'"
+      :visible.sync="dialogVisible"
+      width="800px"
+      top="15vh"
+      :close-on-click-modal="false"
+      @closed="handleClose"
+      @close="handleClose"
+    >
+      <el-form ref="dialogForm" :rules="dialogFormRules" :model="dialogForm" label-width="80px">
+        <el-form-item label="缁勭粐绫诲瀷" prop="OrgType">
+          <el-radio-group
+            v-model="dialogForm.OrgType"
+            :disabled="operation==='edit'"
+            @change="changeRadio"
+          >
+            <el-radio
+              v-for="item in OrgTypeArr"
+              :key="item.value"
+              :value="item.value"
+              :label="item.label"
+            />
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="缁勭粐缂栫爜" prop="OrgCode">
+          <el-input v-model="dialogForm.OrgCode" :disabled="operation!=='add'" style="width: 200px" />
+        </el-form-item>
+        <el-form-item label="缁勭粐鍚嶇О" prop="OrgName">
+          <el-input v-model="dialogForm.OrgName" style="width: 200px" />
+        </el-form-item>
+        <el-form-item v-if="dialogForm.OrgType!=='閮ㄩ棬'" prop="SupUnit" label="涓婄骇鍗曚綅">
+          <el-select
+            v-model="dialogForm.SupUnit"
+            style="width: 200px"
+            filterable
+            :popper-append-to-body="false"
+            placeholder="璇烽�夋嫨"
+          >
+            <el-option
+              v-for="item in SupUnitArr"
+              :key="item.id"
+              :label="item.org_name"
+              :value="item.id"
+            />
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <div class="footerButton">
+          <el-button v-waves @click="dialogVisibleCancel">鍙� 娑�</el-button>
+          <el-button
+            v-waves
+            type="primary"
+            :loading="$store.state.app.buttonIsDisabled"
+            :disabled="$store.state.app.buttonIsDisabled"
+            @click="dialogVisibleConfirm"
+          >纭� 瀹�</el-button>
+        </div>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import Pagination from '@/components/Pagination'
+import { AddUpdateOrganization, DeleteOrganization, OrganizationSearch, PrentOrganization } from '@/api/basicSettings'
+import { getCookie } from '@/utils/auth'
+import { validateCode } from '@/utils/global'
+import TableColumnSettings from '@/components/TableColumnSettings'
+import elDragDialog from '@/directive/el-drag-dialog' // base on element-ui
+import waves from '@/directive/waves/index.js' // 姘存尝绾规寚浠�
+
+// const SER_HZ = /^[\u4e00-\u9fa5]+$/
+// const SER_HZ = /^[a-zA-Z0-9_;,.<>() ]{0,}$/
+export default {
+  name: 'ZZJG',
+  components: {
+    Pagination, TableColumnSettings
+  },
+  directives: { elDragDialog, waves },
+  data() {
+    const validateTypeCode = (rule, value, callback) => {
+      if (!value) {
+        return callback(new Error('璇烽�夋嫨涓婄骇'))
+      } else {
+        callback()
+      }
+    }
+    return {
+      windowHeight: 0,
+      windowWidth: 0,
+      mainHeight: 0,
+      tableHeight: 0,
+      numvalue: 0,
+      form: {
+        OrgCode: '', // 缁勭粐鏋舵瀯浠g爜
+        OrgName: '', // 缁勭粐鏋舵瀯鍚嶇О
+        orderdate: '', // 鍗曟嵁鏃ユ湡
+        prop: 'lm_date', // 鎺掑簭瀛楁
+        order: 'desc', // 鎺掑簭瀛楁
+        page: 1, // 绗嚑椤�
+        rows: 20 // 姣忛〉澶氬皯鏉�
+      },
+
+      tableColumnSettingsArray: [
+        { minWidth: 50, width: false, prop: 'id', label: 'id', id: 1, show: false, fixed: false, sortable: false }, // 闅愯棌鍒�  show: false闅愯棌锛宼rue鏄剧ず
+        // { minWidth: 25, width: 50, prop: 'RowNum', label: '搴忓彿', id: 2, show: true, fixed: 'left', sortable: false }, // custom
+        {
+          minWidth: 110,
+          width: false,
+          prop: 'partcode',
+          label: '瀛樿揣缂栫爜',
+          id: 2,
+          show: true,
+          fixed: false,
+          sortable: true
+        }, {
+          minWidth: 110,
+          width: false,
+          prop: 'partname',
+          label: '瀛樿揣鍚嶇О',
+          id: 3,
+          show: true,
+          fixed: false,
+          sortable: true
+        },
+        {
+          minWidth: 110,
+          width: false,
+          prop: 'partspec',
+          label: '瑙勬牸鍨嬪彿',
+          id: 4,
+          show: true,
+          fixed: false,
+          sortable: true
+        },
+        {
+          minWidth: 110,
+          width: false,
+          prop: 'saleUnit',
+          label: '閿�鍞崟浣�',
+          id: 5,
+          show: true,
+          fixed: false,
+          sortable: true
+        },
+        {
+          minWidth: 110,
+          width: false,
+          prop: 'sum',
+          label: '鏁伴噺',
+          id: 6,
+          show: true,
+          fixed: false,
+          sortable: true
+        },
+        {
+          minWidth: 130,
+          width: false,
+          prop: 'newSale',
+          label: '鏈�鏂板惈绋庡敭浠�',
+          id: 7,
+          show: true,
+          fixed: false,
+          sortable: true
+        },
+        {
+          minWidth: 110,
+          width: false,
+          prop: 'taxPercent',
+          label: '绋庣巼%',
+          id: 8,
+          show: true,
+          fixed: false,
+          sortable: true
+        },
+        {
+          minWidth: 110,
+          width: false,
+          prop: 'newTaxPrice',
+          label: '鍚◣鍗曚环',
+          id: 9,
+          show: true,
+          fixed: false,
+          sortable: true
+        },
+        {
+          minWidth: 110,
+          width: false,
+          prop: 'money',
+          label: '閲戦',
+          id: 10,
+          show: true,
+          fixed: false,
+          sortable: true
+        },
+        {
+          minWidth: 110,
+          width: false,
+          prop: 'taxMoney',
+          label: '鍚◣閲戦',
+          id: 11,
+          show: true,
+          fixed: false,
+          sortable: true
+        },
+        // {
+        //   minWidth: 130,
+        //   width: false,
+        //   prop: 'expectedDate',
+        //   label: '棰勮浜よ揣鏃ユ湡',
+        //   id: 12,
+        //   show: true,
+        //   fixed: false,
+        //   sortable: true
+        // },
+        {
+          minWidth: 110,
+          width: false,
+          prop: 'stockCount',
+          label: '鐜板瓨閲�',
+          id: 13,
+          show: true,
+          fixed: false,
+          sortable: true
+        },
+        {
+          minWidth: 120,
+          width: false,
+          prop: 'stockDesc',
+          label: '鐜板瓨閲忚鏄�',
+          id: 13,
+          show: true,
+          fixed: false,
+          sortable: true
+        },
+        {
+          minWidth: 110,
+          width: false,
+          prop: 'notes',
+          label: '澶囨敞',
+          id: 13,
+          show: true,
+          fixed: false,
+          sortable: true
+        },
+        {
+          minWidth: 110,
+          width: false,
+          prop: 'returnReason',
+          label: '閫�璐у師鍥�',
+          id: 13,
+          show: true,
+          fixed: false,
+          sortable: true
+        }
+      ],
+      tableTimeStampKey: new Date().getTime(), // 琛ㄦ牸key
+
+      total: 10,
+      tableData: [
+        {
+          id: 1001,
+          doc_date: '2023-04-05',
+          doc_type: '鏈熷垵缁撳瓨',
+          doc_code: 'K202304050001',
+          businessType: '',
+          commUnit: '鐜夌幆瀹濅俊閽㈢鏈夐檺鍏徃',
+          item: '',
+          in_sum: '1000',
+          in_price: '5',
+          in_money: '5000',
+          out_sum: '300',
+          out_price: '5',
+          out_money: '1500',
+          balance_sum: '0',
+          balance_price: '0',
+          balance_money: '0'
+        }
+      ],
+
+      dialogVisible: false,
+      dialogForm: {
+        OrgType: '閮ㄩ棬',
+        OrgCode: '',
+        OrgName: '',
+        SupUnit: ''// 涓婄骇鍗曚綅
+      },
+      SupUnitArr: [],
+      operation: ''
+
+    }
+  },
+  // watch: {
+  //   windowHeight(val) {
+  //     console.log('瀹炴椂灞忓箷楂樺害锛�', val, this.windowHeight)
+  //   },
+  //   windowWidth(val) {
+  //     if (val < 768) {
+  //       this.dialogWidth = '100%'
+  //     } else {
+  //       this.dialogWidth = '75%'
+  //     }
+  //     console.log('瀹炴椂灞忓箷瀹藉害锛�', val, this.windowHeight)
+  //   }
+  // },
+  created() {
+    // this.getOrganizationSearch()
+  },
+  mounted() {
+    window.addEventListener('resize', this.getHeight)
+    this.getHeight()
+
+    this.total = this.tableData.length
+  },
+  destroyed() {
+
+  },
+  methods: {
+    tableColumnUpdate(val, isCopyTrue) {
+      if (isCopyTrue) {
+        this.tableColumnSettingsArray = val
+      }
+      this.tableTimeStampKey = new Date().getTime()
+      this.$refs.tableDataRef.doLayout()
+    },
+    async getOrganizationSearch() {
+      const res = await OrganizationSearch(this.form)
+      this.tableData = res.data
+      this.total = res.count
+    },
+    // 鎺掑簭鏀瑰彉鏃�
+    sortChange({ column, prop, order }) {
+      if (order === 'descending') {
+        order = 'desc'
+      } else if (order === 'ascending') {
+        order = 'asc'
+      } else {
+        order = 'desc'
+      }
+      this.form.order = order
+      this.form.prop = prop
+      this.getOrganizationSearch()
+    },
+    // 鏌ヨ
+    search() {
+      // this.getOrganizationSearch()
+
+    },
+    // 閲嶇疆
+    reset() {
+      this.form.OrgCode = ''
+      this.form.OrgName = ''
+      // this.form.OrgType = ''
+      // this.form.UserName = ''
+      // this.getOrganizationSearch()
+    },
+    // 鍗曢�夋鏀瑰彉鏃�
+    async changeRadio(val) {
+      if (this.dialogForm.OrgType !== '閮ㄩ棬') {
+        const { data: res } = await PrentOrganization({ orgcode: this.OrgTypeArr.find(item => item.label === this.dialogForm.OrgType).value })
+        this.SupUnitArr = res
+      }
+    },
+    // 鏂板鎸夐挳
+    async add(operation) {
+      this.operation = operation
+      this.dialogVisible = true
+
+      // const res = await getNewEncodingRules(getCookie('ruleCode'))
+      // this.dialogForm.OrgCode = res.RightCode
+      // this.numvalue = res.numvalue
+    },
+    // 淇敼鎸夐挳
+    edit(operation, row) {
+      this.operation = operation
+      this.dialogVisible = true
+      // if (row.description === 'F') {
+      //   this.dialogForm.OrgType = '宸ュ巶'
+      // } else
+      if (row.description === 'D') {
+        this.dialogForm.OrgType = '閮ㄩ棬'
+      } else if (row.description === 'W') {
+        this.dialogForm.OrgType = '杞﹂棿'
+      }
+      // else if (row.description === 'K') {
+      //   this.dialogForm.OrgType = '绉戝'
+      // } else if (row.description === 'L') {
+      //   this.dialogForm.OrgType = '鐢熶骇绾�'
+      // }
+      this.$nextTick(() => {
+        this.changeRadio(this.dialogForm.OrgType)
+        this.dialogForm.OrgCode = row.org_code
+        this.dialogForm.OrgName = row.org_name
+        this.dialogForm.SupUnit = row.parent_id
+      })
+    },
+    // 鍒犻櫎鎸夐挳
+    async del(id) {
+      this.$confirm('鏄惁纭鍒犻櫎?', '鎻愮ず', {
+        confirmButtonText: '纭畾',
+        cancelButtonText: '鍙栨秷',
+        type: 'warning'
+      }).then(() => {
+        DeleteOrganization({ orgid: id }).then(res => {
+          if (res.code === '200') {
+            this.$message.success('鍒犻櫎鎴愬姛!')
+            if (this.form.page > 1 && this.tableData.length === 1) {
+              this.form.page--
+            }
+            this.getOrganizationSearch()
+          }
+        })
+      }).catch(() => {
+        this.$message.info('宸插彇娑堝垹闄�')
+      })
+    },
+    // 瀵硅瘽妗嗗叧闂簨浠�
+    handleClose() {
+      this.dialogForm.OrgType = '閮ㄩ棬'
+      this.dialogForm.OrgCode = ''
+      this.dialogForm.OrgName = ''
+      this.dialogForm.SupUnit = ''
+      this.$refs.dialogForm.clearValidate()
+    },
+    // 瀵硅瘽妗嗗彇娑�
+    dialogVisibleCancel() {
+      this.dialogVisible = false
+    },
+    // 瀵硅瘽妗嗙‘璁�
+    dialogVisibleConfirm() {
+      this.$refs.dialogForm.validate(valid => {
+        if (valid) {
+          this.$store.state.app.buttonIsDisabled = true
+          const data = {
+            OrganType: this.dialogForm.OrgType === '閮ㄩ棬' ? 'D' : 'W',
+            OrganCode: this.dialogForm.OrgCode,
+            OrganName: this.dialogForm.OrgName,
+            RightCode: '',
+            numvalue: '',
+            // RightCode: this.operation === 'add' ? getCookie('ruleCode') : '',
+            // numvalue: this.operation === 'add' ? this.numvalue : '',
+            SupUnit: this.dialogForm.OrgType === '閮ㄩ棬' ? '0' : this.dialogForm.SupUnit,
+            OperType: this.operation === 'add' ? 'Add' : 'Update',
+            Operator: getCookie('admin')
+          }
+
+          AddUpdateOrganization(data).then(res => {
+            if (res.code === '200') {
+              this.dialogVisible = false
+              this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
+              this.getOrganizationSearch()
+              this.$store.state.app.buttonIsDisabled = false
+            } else {
+              this.$message.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
+              this.$store.state.app.buttonIsDisabled = false
+            }
+          })
+        }
+      })
+    },
+    // 鑾峰彇椤甸潰楂樺害
+    getHeight() {
+      this.$nextTick(() => {
+        this.mainHeight = window.innerHeight - 85
+        this.tableHeight = this.mainHeight - 145
+        if (window.innerHeight < 769) {
+          this.tableHeight = this.tableHeight - 40
+        }
+        this.isIpad = window.innerHeight < 769 && window.innerWidth < 1367
+        this.$refs.tableDataRef.doLayout()
+      })
+    },
+    tableRowClassName({ row, rowIndex }) {
+      return 'custom-row'
+    }
+  }
+}
+</script>
+
+<!--鍏叡椤甸潰鏍峰紡-->
+<style lang="scss" scoped>
+$main_color: #42b983;
+.el-icon-share, .el-icon-delete, .el-icon-edit-outline {
+  color: $main_color;
+  cursor: pointer;
+}
+
+.el-icon-edit-outline {
+  margin-right: 15px;
+}
+
+::v-deep .el-button--primary, .el-button--default, .el-button--info {
+  height: 34px;
+  display: flex;
+  align-items: center;
+  padding: 0 15px;
+}
+
+::v-deep .el-button--primary {
+  //background-color: $main_color !important;
+}
+
+::v-deep .el-button--default {
+  background-color: #f8f8fa;
+  border: none;
+}
+
+::v-deep .el-input__inner {
+  height: 34px;
+  line-height: 34px;
+  //color: #a7a7a7;
+}
+
+::v-deep .el-dialog__body {
+  padding: 20px 100px !important;
+}
+
+::v-deep .dialogVisibleRoles .el-dialog__body {
+  padding: 20px 20px !important;
+}
+
+::v-deep .importPickerClass .el-dialog__body {
+  padding: 20px 20px !important;
+}
+
+::v-deep .el-dialog__footer {
+  display: flex;
+  justify-content: flex-end;
+}
+
+::v-deep .el-table .caret-wrapper {
+  transform: scale(0.8);
+}
+
+::v-deep .cell {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+
+::v-deep .el-table::before {
+  height: 0;
+}
+
+::v-deep .el-table__body-wrapper {
+  background-color: #f8f8fa;
+}
+
+::v-deep .el-table__body .el-table__row.hover-row td {
+  background-color: #eaecef;
+}
+
+::v-deep .el-form--inline .el-form-item__label {
+  color: #a7a7a7;
+}
+
+.body ::v-deep .el-divider {
+  border: 1px solid #eee;
+  width: 99%;
+  margin: 10px auto;
+}
+
+.body ::v-deep .el-form-item {
+  margin-bottom: 0;
+}
+
+.tableFixed {
+  ::v-deep .el-table__fixed-right {
+    height: 100% !important;
+  }
+
+  ::v-deep .el-table__fixed {
+    height: 100% !important;
+  }
+}
+
+//::v-deep .cell {
+//  display: flex;
+//  flex-wrap: nowrap;
+//}
+//
+//::v-deep .has-gutter .cell {
+//  display: flex;
+//  flex-wrap: nowrap;
+//}
+</style>
+<style>
+.osloading {
+  font-size: 30px;
+}
+
+.el-table .custom-row {
+  background: #f8f8fa;
+}
+</style>
diff --git a/src/views/purchasesManager/goodsStatisticsList.vue b/src/views/purchasesManager/goodsStatisticsList.vue
new file mode 100644
index 0000000..7721be2
--- /dev/null
+++ b/src/views/purchasesManager/goodsStatisticsList.vue
@@ -0,0 +1,746 @@
+<template>
+  <div>
+    <div class="body" :style="{height:mainHeight+'px'}">
+
+      <div class="bodyTopButtonGroup">
+        <el-button v-waves type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
+      </div>
+      <div class="bodyTopFormGroup">
+        <el-form
+          ref="form"
+          :model="form"
+          label-width="100px"
+          inline
+          style="display: flex;"
+        >
+          <div class="elForm">
+            <el-form-item label="瀛樿揣缂栫爜" style=" display: flex;">
+              <el-input v-model="form.OrgCode" placeholder="璇疯緭鍏�" style="width: 200px" />
+            </el-form-item>
+            <el-form-item label="瀛樿揣鍚嶇О" style=" display: flex;">
+              <el-input v-model="form.OrgName" placeholder="璇疯緭鍏�" style="width: 200px" />
+            </el-form-item>
+            <!--            <el-form-item label="鍒涘缓浜哄憳" style=" display: flex;">-->
+            <!--              <el-input v-model="form.UserName" style="width: 200px" placeholder="璇疯緭鍏�" />-->
+            <!--            </el-form-item>-->
+            <!--            <el-form-item label="棰勮浜よ揣鏃ユ湡" style="display: flex;font-size: 14px;align-items: center">-->
+            <!--              <el-date-picker-->
+            <!--                v-model="form.orderdate"-->
+            <!--                type="daterange"-->
+            <!--                range-separator="~"-->
+            <!--                class="timeMini"-->
+            <!--                size="mini"-->
+            <!--                style="width: 200px;display: flex;line-height: 34px;height: 34px;"-->
+            <!--                :clearable="false"-->
+            <!--                start-placeholder="寮�濮嬫棩鏈�"-->
+            <!--                end-placeholder="缁撴潫鏃ユ湡"-->
+            <!--              />-->
+            <!--            </el-form-item>-->
+          </div>
+          <div
+            class="bodySearchReset"
+            :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}"
+          >
+            <el-button v-waves type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
+            <el-button v-waves type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
+          </div>
+        </el-form>
+        <div
+          class="bodyTopFormExpand"
+        />
+      </div>
+      <div class="elTableDiv">
+        <!--        <TableColumnSettings-->
+        <!--          :list1="tableColumnSettingsArray"-->
+        <!--          @tableColumnUpdate="tableColumnUpdate"-->
+        <!--        />-->
+        <el-table
+          ref="tableDataRef"
+          :key="tableTimeStampKey"
+          class="tableFixed"
+          :data="tableData"
+          border
+          :row-class-name="tableRowClassName"
+          :style="{width: 100+'%',height:tableHeight+'px'}"
+          highlight-current-row
+          :height="tableHeight+'px'"
+          :header-cell-style="this.$headerCellStyle"
+          :cell-style="this.$cellStyle"
+        >
+          <!--          @sort-change="sortChange"-->
+
+          <el-table-column
+            type="index"
+            width="50"
+            label="搴忓彿"
+            fixed
+          />
+          <el-table-column
+            v-for="item in tableColumnSettingsArray"
+            v-if="item.show"
+            :key="item.id"
+            :sortable="item.sortable"
+            :prop="item.prop"
+            :min-width="item.minWidth"
+            :label="item.label"
+            :width="item.width"
+            show-tooltip-when-overflow
+            :fixed="item.fixed?(item.fixed==='left'?'left':'right'):false"
+          >
+            <template slot-scope="{row}">
+              <div v-if="!row[item.prop]">/</div>
+              <div v-else>{{ row[item.prop] }}</div>
+            </template>
+          </el-table-column>
+
+          <el-table-column
+            fixed="right"
+            label="鎿嶄綔"
+            width="120"
+          >
+            <template slot-scope="{row}">
+              <div class="operationClass">
+                <el-tooltip class="item" effect="dark" content="缂栬緫" placement="top">
+                  <i
+                    :style="{color:$store.state.settings.theme}"
+                    class="el-icon-edit-outline"
+                    @click="edit('edit',row)"
+                  />
+                </el-tooltip>
+                <el-tooltip v-del-tab-index class="item" effect="dark" content="鍒犻櫎" placement="top">
+                  <i :style="{color:$store.state.settings.theme}" class="el-icon-delete" @click="del(row.id)" />
+                </el-tooltip>
+                <!--                <el-button type="primary" size="mini" />-->
+                <!--                <el-button type="danger" size="mini">鍒犻櫎</el-button>-->
+
+              </div>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <!--鍒嗛〉-->
+      <pagination
+        :total="total"
+        :page.sync="form.page"
+        :limit.sync="form.rows"
+        align="right"
+        layout="total ,prev, pager, next,sizes"
+        popper-class="select_bottom"
+        @pagination="getOrganizationSearch"
+      />
+    </div>
+    <el-dialog
+      v-el-drag-dialog
+      :title="operation==='add'?'鏂板':'缂栬緫'"
+      :visible.sync="dialogVisible"
+      width="900px"
+      top="15vh"
+      :close-on-click-modal="false"
+      @closed="handleClose"
+      @close="handleClose"
+    >
+      <el-form ref="dialogForm" inline :rules="dialogFormRules" :model="dialogForm" label-width="100px">
+        <el-form-item label="瀛樿揣缂栫爜" prop="partcode">
+          <el-input v-model="dialogForm.partcode" :disabled="operation!=='add'" style="width: 200px" />
+        </el-form-item>
+        <el-form-item label="瀛樿揣鍚嶇О" prop="partname">
+          <el-input v-model="dialogForm.partname" :disabled="operation!=='add'" style="width: 200px" />
+        </el-form-item>
+        <el-form-item label="瑙勬牸鍨嬪彿" prop="partspec">
+          <el-input v-model="dialogForm.partspec" style="width: 200px" />
+        </el-form-item>
+        <el-form-item label="閿�鍞崟浣�" prop="saleUnit">
+          <el-input v-model="dialogForm.saleUnit" style="width: 200px" />
+        </el-form-item>
+        <el-form-item label="鏁伴噺" prop="sum">
+          <el-input v-model="dialogForm.sum" style="width: 200px" />
+        </el-form-item>
+        <el-form-item label="鏈�鏂板惈绋庡敭浠�" prop="newSale">
+          <el-input v-model="dialogForm.newSale" style="width: 200px" />
+        </el-form-item>
+        <el-form-item label="绋庣巼%" prop="taxPercent">
+          <el-input v-model="dialogForm.taxPercent" style="width: 200px" />
+        </el-form-item>
+        <el-form-item label="鍚◣鍗曚环" prop="newTaxPrice">
+          <el-input v-model="dialogForm.newTaxPrice" style="width: 200px" />
+        </el-form-item>
+        <el-form-item label="閲戦" prop="money">
+          <el-input v-model="dialogForm.money" style="width: 200px" />
+        </el-form-item>
+        <el-form-item label="鍚◣閲戦" prop="taxMoney">
+          <el-input v-model="dialogForm.taxMoney" style="width: 200px" />
+        </el-form-item>
+
+        <el-form-item label="棰勮浜よ揣鏃ユ湡" prop="expectedDate" style="width: 200px" />
+        <el-date-picker
+          v-model="dialogForm.expectedDate"
+          type="date"
+          placeholder="閫夋嫨鏃ユ湡"
+        />
+        <!--          <el-input v-model="dialogForm.expectedDate" style="width: 200px" />-->
+        </el-form-item>
+        <el-form-item label="鐜板瓨閲�" prop="stockCount">
+          <el-input v-model="dialogForm.stockCount" style="width: 200px" />
+        </el-form-item>
+        <el-form-item label="鐜板瓨閲忚鏄�" prop="stockDesc">
+          <el-input v-model="dialogForm.stockDesc" type="textarea" style="width: 200px" />
+        </el-form-item>
+        <el-form-item label="澶囨敞" prop="notes">
+          <el-input v-model="dialogForm.notes" type="textarea" style="width: 200px" />
+        </el-form-item>
+        <el-form-item label="閫�璐у師鍥�" prop="returnReason">
+          <el-input v-model="dialogForm.returnReason" type="textarea" style="width: 200px" />
+        </el-form-item>
+
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <div class="footerButton">
+          <el-button v-waves @click="dialogVisibleCancel">鍙� 娑�</el-button>
+          <el-button
+            v-waves
+            type="primary"
+            :loading="$store.state.app.buttonIsDisabled"
+            :disabled="$store.state.app.buttonIsDisabled"
+            @click="dialogVisibleConfirm"
+          >纭� 瀹�</el-button>
+        </div>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import Pagination from '@/components/Pagination'
+import { AddUpdateOrganization, DeleteOrganization, OrganizationSearch, PrentOrganization } from '@/api/basicSettings'
+import { getCookie } from '@/utils/auth'
+import { validateCode } from '@/utils/global'
+import TableColumnSettings from '@/components/TableColumnSettings'
+import elDragDialog from '@/directive/el-drag-dialog' // base on element-ui
+import waves from '@/directive/waves/index.js' // 姘存尝绾规寚浠�
+
+// const SER_HZ = /^[\u4e00-\u9fa5]+$/
+// const SER_HZ = /^[a-zA-Z0-9_;,.<>() ]{0,}$/
+export default {
+  name: 'ZZJG',
+  components: {
+    Pagination, TableColumnSettings
+  },
+  directives: { elDragDialog, waves },
+  data() {
+    const validateTypeCode = (rule, value, callback) => {
+      if (!value) {
+        return callback(new Error('璇烽�夋嫨涓婄骇'))
+      } else {
+        callback()
+      }
+    }
+    return {
+      windowHeight: 0,
+      windowWidth: 0,
+      mainHeight: 0,
+      tableHeight: 0,
+      numvalue: 0,
+      form: {
+        OrgCode: '', // 缁勭粐鏋舵瀯浠g爜
+        OrgName: '', // 缁勭粐鏋舵瀯鍚嶇О
+        orderdate: '', // 鍗曟嵁鏃ユ湡
+        prop: 'lm_date', // 鎺掑簭瀛楁
+        order: 'desc', // 鎺掑簭瀛楁
+        page: 1, // 绗嚑椤�
+        rows: 20 // 姣忛〉澶氬皯鏉�
+      },
+
+      tableColumnSettingsArray: [
+        { minWidth: 50, width: false, prop: 'id', label: 'id', id: 1, show: false, fixed: false, sortable: false }, // 闅愯棌鍒�  show: false闅愯棌锛宼rue鏄剧ず
+        // { minWidth: 25, width: 50, prop: 'RowNum', label: '搴忓彿', id: 2, show: true, fixed: 'left', sortable: false }, // custom
+        {
+          minWidth: 110,
+          width: false,
+          prop: 'partcode',
+          label: '瀛樿揣缂栫爜',
+          id: 2,
+          show: true,
+          fixed: false,
+          sortable: true
+        }, {
+          minWidth: 110,
+          width: false,
+          prop: 'partname',
+          label: '瀛樿揣鍚嶇О',
+          id: 3,
+          show: true,
+          fixed: false,
+          sortable: true
+        },
+        {
+          minWidth: 110,
+          width: false,
+          prop: 'partspec',
+          label: '瑙勬牸鍨嬪彿',
+          id: 4,
+          show: true,
+          fixed: false,
+          sortable: true
+        },
+        {
+          minWidth: 110,
+          width: false,
+          prop: 'saleUnit',
+          label: '閿�鍞崟浣�',
+          id: 5,
+          show: true,
+          fixed: false,
+          sortable: true
+        },
+        {
+          minWidth: 110,
+          width: false,
+          prop: 'sum',
+          label: '鏁伴噺',
+          id: 6,
+          show: true,
+          fixed: false,
+          sortable: true
+        },
+        {
+          minWidth: 130,
+          width: false,
+          prop: 'newSale',
+          label: '鏈�鏂板惈绋庡敭浠�',
+          id: 7,
+          show: true,
+          fixed: false,
+          sortable: true
+        },
+        {
+          minWidth: 110,
+          width: false,
+          prop: 'taxPercent',
+          label: '绋庣巼%',
+          id: 8,
+          show: true,
+          fixed: false,
+          sortable: true
+        },
+        {
+          minWidth: 110,
+          width: false,
+          prop: 'newTaxPrice',
+          label: '鍚◣鍗曚环',
+          id: 9,
+          show: true,
+          fixed: false,
+          sortable: true
+        },
+        {
+          minWidth: 110,
+          width: false,
+          prop: 'money',
+          label: '閲戦',
+          id: 10,
+          show: true,
+          fixed: false,
+          sortable: true
+        },
+        {
+          minWidth: 110,
+          width: false,
+          prop: 'taxMoney',
+          label: '鍚◣閲戦',
+          id: 11,
+          show: true,
+          fixed: false,
+          sortable: true
+        },
+        // {
+        //   minWidth: 130,
+        //   width: false,
+        //   prop: 'expectedDate',
+        //   label: '棰勮浜よ揣鏃ユ湡',
+        //   id: 12,
+        //   show: true,
+        //   fixed: false,
+        //   sortable: true
+        // },
+        {
+          minWidth: 110,
+          width: false,
+          prop: 'stockCount',
+          label: '鐜板瓨閲�',
+          id: 13,
+          show: true,
+          fixed: false,
+          sortable: true
+        },
+        {
+          minWidth: 120,
+          width: false,
+          prop: 'stockDesc',
+          label: '鐜板瓨閲忚鏄�',
+          id: 13,
+          show: true,
+          fixed: false,
+          sortable: true
+        },
+        {
+          minWidth: 110,
+          width: false,
+          prop: 'notes',
+          label: '澶囨敞',
+          id: 13,
+          show: true,
+          fixed: false,
+          sortable: true
+        },
+        {
+          minWidth: 110,
+          width: false,
+          prop: 'returnReason',
+          label: '閫�璐у師鍥�',
+          id: 13,
+          show: true,
+          fixed: false,
+          sortable: true
+        }
+      ],
+      tableTimeStampKey: new Date().getTime(), // 琛ㄦ牸key
+
+      total: 10,
+      tableData: [
+        { id: 1001, partcode: 201, partname: '涓绘満', partspec: '', saleUnit: '涓�', sum: 1000, newScale: 200000, taxPercent: '', newTaxPrice: 200000, money: 200000, taxMoney: 200000, expectedDate: '2023-04-04', stockCount: 300, stockDesc: '', notes: '', returnReason: '' },
+        { id: 1002, partcode: 114, partname: '涓绘澘2', partspec: '#333', saleUnit: '涓�', sum: 1000, newScale: 100000, taxPercent: '', newTaxPrice: 100000, money: 100000, taxMoney: 100000, expectedDate: '2023-04-05', stockCount: 500, stockDesc: '', notes: '', returnReason: '' },
+        { id: 1003, partcode: 108, partname: '鏄剧ず鍣�', partspec: '', saleUnit: '涓�', sum: 2000, newScale: 100000, taxPercent: '', newTaxPrice: 100000, money: 100000, taxMoney: 100000, expectedDate: '2023-04-05', stockCount: 600, stockDesc: '', notes: '', returnReason: '' },
+        { id: 1004, partcode: 105, partname: '鏈虹', partspec: '', saleUnit: '涓�', sum: 1000, newScale: 20000, taxPercent: '', newTaxPrice: 20000, money: 20000, taxMoney: 20000, expectedDate: '2023-04-06', stockCount: 300, stockDesc: '', notes: '', returnReason: '' },
+        { id: 1005, partcode: 103, partname: '纭洏', partspec: '', saleUnit: '涓�', sum: 1000, newScale: 60000, taxPercent: '', newTaxPrice: 60000, money: 60000, taxMoney: 60000, expectedDate: '2023-04-07', stockCount: 300, stockDesc: '', notes: '', returnReason: '' }
+      ],
+
+      dialogVisible: false,
+      dialogForm: {
+        partcode: '',
+        partname: '',
+        partspec: '',
+        saleUnit: '',
+        sum: '',
+        newSale: '',
+        taxPercent: '',
+        newTaxPrice: '',
+        money: '',
+        taxMoney: '',
+        expectedDate: '',
+        stockCount: '',
+        stockDesc: '',
+        notes: '',
+        returnReason: ''
+      },
+
+      operation: '',
+      dialogFormRules: {
+        partcode: [
+          { required: true, validator: validateCode, trigger: ['blur', 'change'] }
+        ],
+        partname: [
+          { required: true, message: '璇疯緭鍏ュ悕绉�', trigger: ['blur', 'change'] }
+        ]
+
+      }
+
+    }
+  },
+  // watch: {
+  //   windowHeight(val) {
+  //     console.log('瀹炴椂灞忓箷楂樺害锛�', val, this.windowHeight)
+  //   },
+  //   windowWidth(val) {
+  //     if (val < 768) {
+  //       this.dialogWidth = '100%'
+  //     } else {
+  //       this.dialogWidth = '75%'
+  //     }
+  //     console.log('瀹炴椂灞忓箷瀹藉害锛�', val, this.windowHeight)
+  //   }
+  // },
+  created() {
+    // this.getOrganizationSearch()
+  },
+  mounted() {
+    window.addEventListener('resize', this.getHeight)
+    this.getHeight()
+
+    this.total = this.tableData.length
+  },
+  destroyed() {
+
+  },
+  methods: {
+    tableColumnUpdate(val, isCopyTrue) {
+      if (isCopyTrue) {
+        this.tableColumnSettingsArray = val
+      }
+      this.tableTimeStampKey = new Date().getTime()
+      this.$refs.tableDataRef.doLayout()
+    },
+    async getOrganizationSearch() {
+      const res = await OrganizationSearch(this.form)
+      this.tableData = res.data
+      this.total = res.count
+    },
+    // 鎺掑簭鏀瑰彉鏃�
+    sortChange({ column, prop, order }) {
+      if (order === 'descending') {
+        order = 'desc'
+      } else if (order === 'ascending') {
+        order = 'asc'
+      } else {
+        order = 'desc'
+      }
+      this.form.order = order
+      this.form.prop = prop
+      this.getOrganizationSearch()
+    },
+    // 鏌ヨ
+    search() {
+      // this.getOrganizationSearch()
+
+    },
+    // 閲嶇疆
+    reset() {
+      this.form.OrgCode = ''
+      this.form.OrgName = ''
+      // this.form.OrgType = ''
+      // this.form.UserName = ''
+      // this.getOrganizationSearch()
+    },
+    // 鍗曢�夋鏀瑰彉鏃�
+
+    // 鏂板鎸夐挳
+    async add(operation) {
+      this.operation = operation
+      this.dialogVisible = true
+
+      // const res = await getNewEncodingRules(getCookie('ruleCode'))
+      // this.dialogForm.OrgCode = res.RightCode
+      // this.numvalue = res.numvalue
+    },
+    // 淇敼鎸夐挳
+    edit(operation, row) {
+      this.operation = operation
+      this.dialogVisible = true
+      // if (row.description === 'F') {
+      //   this.dialogForm.OrgType = '宸ュ巶'
+      // } else
+      if (row.description === 'D') {
+        this.dialogForm.OrgType = '閮ㄩ棬'
+      } else if (row.description === 'W') {
+        this.dialogForm.OrgType = '杞﹂棿'
+      }
+      // else if (row.description === 'K') {
+      //   this.dialogForm.OrgType = '绉戝'
+      // } else if (row.description === 'L') {
+      //   this.dialogForm.OrgType = '鐢熶骇绾�'
+      // }
+      this.$nextTick(() => {
+        this.changeRadio(this.dialogForm.OrgType)
+        this.dialogForm.OrgCode = row.org_code
+        this.dialogForm.OrgName = row.org_name
+        this.dialogForm.SupUnit = row.parent_id
+      })
+    },
+    // 鍒犻櫎鎸夐挳
+    async del(id) {
+      this.$confirm('鏄惁纭鍒犻櫎?', '鎻愮ず', {
+        confirmButtonText: '纭畾',
+        cancelButtonText: '鍙栨秷',
+        type: 'warning'
+      }).then(() => {
+        DeleteOrganization({ orgid: id }).then(res => {
+          if (res.code === '200') {
+            this.$message.success('鍒犻櫎鎴愬姛!')
+            if (this.form.page > 1 && this.tableData.length === 1) {
+              this.form.page--
+            }
+            this.getOrganizationSearch()
+          }
+        })
+      }).catch(() => {
+        this.$message.info('宸插彇娑堝垹闄�')
+      })
+    },
+    // 瀵硅瘽妗嗗叧闂簨浠�
+    handleClose() {
+      this.dialogForm.OrgType = '閮ㄩ棬'
+      this.dialogForm.OrgCode = ''
+      this.dialogForm.OrgName = ''
+      this.dialogForm.SupUnit = ''
+      this.$refs.dialogForm.clearValidate()
+    },
+    // 瀵硅瘽妗嗗彇娑�
+    dialogVisibleCancel() {
+      this.dialogVisible = false
+    },
+    // 瀵硅瘽妗嗙‘璁�
+    dialogVisibleConfirm() {
+      this.$refs.dialogForm.validate(valid => {
+        if (valid) {
+          this.$store.state.app.buttonIsDisabled = true
+          const data = {
+            OrganType: this.dialogForm.OrgType === '閮ㄩ棬' ? 'D' : 'W',
+            OrganCode: this.dialogForm.OrgCode,
+            OrganName: this.dialogForm.OrgName,
+            RightCode: '',
+            numvalue: '',
+            // RightCode: this.operation === 'add' ? getCookie('ruleCode') : '',
+            // numvalue: this.operation === 'add' ? this.numvalue : '',
+            SupUnit: this.dialogForm.OrgType === '閮ㄩ棬' ? '0' : this.dialogForm.SupUnit,
+            OperType: this.operation === 'add' ? 'Add' : 'Update',
+            Operator: getCookie('admin')
+          }
+
+          AddUpdateOrganization(data).then(res => {
+            if (res.code === '200') {
+              this.dialogVisible = false
+              this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
+              this.getOrganizationSearch()
+              this.$store.state.app.buttonIsDisabled = false
+            } else {
+              this.$message.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
+              this.$store.state.app.buttonIsDisabled = false
+            }
+          })
+        }
+      })
+    },
+    // 鑾峰彇椤甸潰楂樺害
+    getHeight() {
+      this.$nextTick(() => {
+        this.mainHeight = window.innerHeight - 85
+        this.tableHeight = this.mainHeight - 195
+        if (window.innerHeight < 769) {
+          this.tableHeight = this.tableHeight - 40
+        }
+        this.isIpad = window.innerHeight < 769 && window.innerWidth < 1367
+        this.$refs.tableDataRef.doLayout()
+      })
+    },
+    tableRowClassName({ row, rowIndex }) {
+      return 'custom-row'
+    }
+  }
+}
+</script>
+
+<!--鍏叡椤甸潰鏍峰紡-->
+<style lang="scss" scoped>
+$main_color: #42b983;
+.el-icon-share, .el-icon-delete, .el-icon-edit-outline {
+  color: $main_color;
+  cursor: pointer;
+}
+
+.el-icon-edit-outline {
+  margin-right: 15px;
+}
+
+::v-deep .el-button--primary, .el-button--default, .el-button--info {
+  height: 34px;
+  display: flex;
+  align-items: center;
+  padding: 0 15px;
+}
+
+::v-deep .el-button--primary {
+  //background-color: $main_color !important;
+}
+
+::v-deep .el-button--default {
+  background-color: #f8f8fa;
+  border: none;
+}
+
+::v-deep .el-input__inner {
+  height: 34px;
+  line-height: 34px;
+  //color: #a7a7a7;
+}
+
+::v-deep .el-dialog__body {
+  padding: 20px 100px !important;
+}
+
+::v-deep .dialogVisibleRoles .el-dialog__body {
+  padding: 20px 20px !important;
+}
+
+::v-deep .importPickerClass .el-dialog__body {
+  padding: 20px 20px !important;
+}
+
+::v-deep .el-dialog__footer {
+  display: flex;
+  justify-content: flex-end;
+}
+
+::v-deep .el-table .caret-wrapper {
+  transform: scale(0.8);
+}
+
+::v-deep .cell {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+
+::v-deep .el-table::before {
+  height: 0;
+}
+
+::v-deep .el-table__body-wrapper {
+  background-color: #f8f8fa;
+}
+
+::v-deep .el-table__body .el-table__row.hover-row td {
+  background-color: #eaecef;
+}
+
+::v-deep .el-form--inline .el-form-item__label {
+  color: #a7a7a7;
+}
+
+.body ::v-deep .el-divider {
+  border: 1px solid #eee;
+  width: 99%;
+  margin: 10px auto;
+}
+
+.body ::v-deep .el-form-item {
+  margin-bottom: 0;
+}
+
+.tableFixed {
+  ::v-deep .el-table__fixed-right {
+    height: 100% !important;
+  }
+
+  ::v-deep .el-table__fixed {
+    height: 100% !important;
+  }
+}
+
+//::v-deep .cell {
+//  display: flex;
+//  flex-wrap: nowrap;
+//}
+//
+//::v-deep .has-gutter .cell {
+//  display: flex;
+//  flex-wrap: nowrap;
+//}
+</style>
+<style>
+.osloading {
+  font-size: 30px;
+}
+
+.el-table .custom-row {
+  background: #f8f8fa;
+}
+</style>
diff --git a/src/views/purchasesManager/purchasesList.vue b/src/views/purchasesManager/purchasesList.vue
index 6d91c5f..41795de 100644
--- a/src/views/purchasesManager/purchasesList.vue
+++ b/src/views/purchasesManager/purchasesList.vue
@@ -196,126 +196,6 @@
             </template>
           </el-table-column>
 
-          <!--          <el-table-column-->
-          <!--            prop="RowNum"-->
-          <!--            width="50"-->
-          <!--            fixed-->
-          <!--            label="搴忓彿"-->
-          <!--          />-->
-          <!--          <el-table-column-->
-          <!--            prop="status"-->
-          <!--            label="璁㈠崟鐘舵��"-->
-          <!--            width="110"-->
-          <!--            sortable="custom"-->
-          <!--          >-->
-          <!--            <template slot-scope="{row}">-->
-          <!--              <div>{{ mesorderstusArr.find(i=>i.value===row.status).label }}</div>-->
-          <!--            </template>-->
-          <!--          </el-table-column>-->
-          <!--          <el-table-column-->
-          <!--            prop="orderdate"-->
-          <!--            label="鍗曟嵁鏃ユ湡"-->
-          <!--            sortable="custom"-->
-          <!--            width="110"-->
-          <!--          >-->
-          <!--            <template slot-scope="{row}">-->
-          <!--              <div v-if="row.orderdate">{{ row.orderdate.substring(0, 11) }}</div>-->
-          <!--              <div v-else>/</div>-->
-          <!--            </template>-->
-          <!--          </el-table-column>-->
-          <!--          <el-table-column-->
-          <!--            prop="ordercode"-->
-          <!--            label="璁㈠崟缂栧彿"-->
-          <!--            sortable="custom"-->
-          <!--            width="160"-->
-          <!--            show-tooltip-when-overflow-->
-          <!--          />-->
-          <!--          <el-table-column-->
-          <!--            prop="deptname"-->
-          <!--            label="閮ㄩ棬鍚嶇О"-->
-          <!--            width="130"-->
-          <!--            show-tooltip-when-overflow-->
-          <!--            sortable="custom"-->
-          <!--          >-->
-          <!--            <template slot-scope="{row}">-->
-          <!--              <div v-if="row.deptname">{{ row.deptname }}</div>-->
-          <!--              <div v-else>/</div>-->
-          <!--            </template>-->
-          <!--          </el-table-column>-->
-          <!--          <el-table-column-->
-          <!--            prop="customername"-->
-          <!--            label="閲囪喘渚涙柟"-->
-          <!--            sortable="custom"-->
-          <!--            min-width="180"-->
-          <!--            show-tooltip-when-overflow-->
-          <!--          >-->
-          <!--            <template slot-scope="{row}">-->
-          <!--              <div v-if="row.customername">{{ row.customername }}</div>-->
-          <!--              <div v-else>/</div>-->
-          <!--            </template>-->
-          <!--          </el-table-column>-->
-          <!--          <el-table-column-->
-          <!--            prop="saleorderCode"-->
-          <!--            label="婧愬崟鍗曞彿"-->
-          <!--            sortable="custom"-->
-          <!--            width="160"-->
-          <!--            show-tooltip-when-overflow-->
-          <!--          >-->
-          <!--            <template slot-scope="{row}">-->
-          <!--              <div v-if="row.saleorderCode">{{ row.saleorderCode }}</div>-->
-          <!--              <div v-else>/</div>-->
-          <!--            </template>-->
-          <!--          </el-table-column>-->
-          <!--          <el-table-column-->
-          <!--            prop="acceptdate"-->
-          <!--            label="棰勮鍒拌揣鏃ユ湡"-->
-          <!--            width="130"-->
-          <!--            sortable="custom"-->
-          <!--          >-->
-          <!--            <template slot-scope="{row}">-->
-          <!--              <div v-if="row.acceptdate">{{ row.acceptdate.substring(0, 11) }}</div>-->
-          <!--              <div v-else>/</div>-->
-          <!--            </template>-->
-          <!--          </el-table-column>-->
-          <!--          <el-table-column-->
-          <!--            prop="lm_user"-->
-          <!--            label="鍒涘缓浜哄憳"-->
-          <!--            sortable="custom"-->
-          <!--            width="110"-->
-          <!--          />-->
-          <!--          <el-table-column-->
-          <!--            prop="lm_date"-->
-          <!--            label="鍒涘缓鏃堕棿"-->
-          <!--            width="110"-->
-          <!--            sortable="custom"-->
-          <!--          >-->
-          <!--            <template slot-scope="{row}">-->
-          <!--              <div v-if="row.lm_date">{{ row.lm_date.substring(0, 11) }}</div>-->
-          <!--              <div v-else>/</div>-->
-          <!--            </template>-->
-          <!--          </el-table-column>-->
-          <!--          <el-table-column-->
-          <!--            prop="auditoruser"-->
-          <!--            label="瀹℃牳浜�"-->
-          <!--            width="110"-->
-          <!--            sortable="custom"-->
-          <!--          >-->
-          <!--            <template slot-scope="{row}">-->
-          <!--              <div v-if="row.auditoruser">{{ row.auditoruser }}</div>-->
-          <!--              <div v-else>/</div>-->
-          <!--            </template>-->
-          <!--          </el-table-column>-->
-          <!--          <el-table-column-->
-          <!--            prop="auditordate"-->
-          <!--            label="瀹℃牳鏃堕棿"-->
-          <!--            width="110"-->
-          <!--            sortable="custom"-->
-          <!--          >-->
-          <!--            <template slot-scope="{row}">-->
-          <!--              <div v-if="row.auditordate">{{ row.auditordate.substring(0, 11) }}</div>-->
-          <!--              <div v-else>/</div>-->
-          <!--            </template>-->
-          <!--          </el-table-column>-->
           <el-table-column
             label="鎿嶄綔"
             width="120"
@@ -763,11 +643,19 @@
     },
 
     async switchButton(row) {
-      ClosedPurchaseOrder({ po: row.ordercode }).then(res => {
-        if (res.code === '200') {
-          this.$message.success('鍏冲崟鎴愬姛锛�')
-          this.getPurchaseOrderSearch()
-        }
+      this.$confirm('鏄惁纭鍏冲崟?', '鎻愮ず', {
+        confirmButtonText: '纭畾',
+        cancelButtonText: '鍙栨秷',
+        type: 'warning'
+      }).then(() => {
+        ClosedPurchaseOrder({ po: row.ordercode }).then(res => {
+          if (res.code === '200') {
+            this.$message.success('鍏冲崟鎴愬姛锛�')
+            this.getPurchaseOrderSearch()
+          }
+        })
+      }).catch(() => {
+        this.$message.info('宸插彇娑堝叧鍗�')
       })
     },
     // 鍒犻櫎鎸夐挳
diff --git a/src/views/purchasesManager/salesStatisticsList.vue b/src/views/purchasesManager/salesStatisticsList.vue
new file mode 100644
index 0000000..f08586d
--- /dev/null
+++ b/src/views/purchasesManager/salesStatisticsList.vue
@@ -0,0 +1,746 @@
+<template>
+  <div>
+    <div class="body" :style="{height:mainHeight+'px'}">
+
+      <div class="bodyTopButtonGroup">
+        <el-button v-waves type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
+      </div>
+      <div class="bodyTopFormGroup">
+        <el-form
+          ref="form"
+          :model="form"
+          label-width="100px"
+          inline
+          style="display: flex;"
+        >
+          <div class="elForm">
+            <el-form-item label="瀛樿揣缂栫爜" style=" display: flex;">
+              <el-input v-model="form.OrgCode" placeholder="璇疯緭鍏�" style="width: 200px" />
+            </el-form-item>
+            <el-form-item label="瀛樿揣鍚嶇О" style=" display: flex;">
+              <el-input v-model="form.OrgName" placeholder="璇疯緭鍏�" style="width: 200px" />
+            </el-form-item>
+            <!--            <el-form-item label="鍒涘缓浜哄憳" style=" display: flex;">-->
+            <!--              <el-input v-model="form.UserName" style="width: 200px" placeholder="璇疯緭鍏�" />-->
+            <!--            </el-form-item>-->
+            <el-form-item label="棰勮浜よ揣鏃ユ湡" style="display: flex;font-size: 14px;align-items: center">
+              <el-date-picker
+                v-model="form.orderdate"
+                type="daterange"
+                range-separator="~"
+                class="timeMini"
+                size="mini"
+                style="width: 200px;display: flex;line-height: 34px;height: 34px;"
+                :clearable="false"
+                start-placeholder="寮�濮嬫棩鏈�"
+                end-placeholder="缁撴潫鏃ユ湡"
+              />
+            </el-form-item>
+          </div>
+          <div
+            class="bodySearchReset"
+            :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}"
+          >
+            <el-button v-waves type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
+            <el-button v-waves type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
+          </div>
+        </el-form>
+        <div
+          class="bodyTopFormExpand"
+        />
+      </div>
+      <div class="elTableDiv">
+        <!--        <TableColumnSettings-->
+        <!--          :list1="tableColumnSettingsArray"-->
+        <!--          @tableColumnUpdate="tableColumnUpdate"-->
+        <!--        />-->
+        <el-table
+          ref="tableDataRef"
+          :key="tableTimeStampKey"
+          class="tableFixed"
+          :data="tableData"
+          border
+          :row-class-name="tableRowClassName"
+          :style="{width: 100+'%',height:tableHeight+'px'}"
+          highlight-current-row
+          :height="tableHeight+'px'"
+          :header-cell-style="this.$headerCellStyle"
+          :cell-style="this.$cellStyle"
+        >
+          <!--          @sort-change="sortChange"-->
+
+          <el-table-column
+            type="index"
+            width="50"
+            label="搴忓彿"
+            fixed
+          />
+          <el-table-column
+            v-for="item in tableColumnSettingsArray"
+            v-if="item.show"
+            :key="item.id"
+            :sortable="item.sortable"
+            :prop="item.prop"
+            :min-width="item.minWidth"
+            :label="item.label"
+            :width="item.width"
+            show-tooltip-when-overflow
+            :fixed="item.fixed?(item.fixed==='left'?'left':'right'):false"
+          >
+            <template slot-scope="{row}">
+              <div v-if="!row[item.prop]">/</div>
+              <div v-else>{{ row[item.prop] }}</div>
+            </template>
+          </el-table-column>
+
+          <el-table-column
+            fixed="right"
+            label="鎿嶄綔"
+            width="120"
+          >
+            <template slot-scope="{row}">
+              <div class="operationClass">
+                <el-tooltip class="item" effect="dark" content="缂栬緫" placement="top">
+                  <i
+                    :style="{color:$store.state.settings.theme}"
+                    class="el-icon-edit-outline"
+                    @click="edit('edit',row)"
+                  />
+                </el-tooltip>
+                <el-tooltip v-del-tab-index class="item" effect="dark" content="鍒犻櫎" placement="top">
+                  <i :style="{color:$store.state.settings.theme}" class="el-icon-delete" @click="del(row.id)" />
+                </el-tooltip>
+                <!--                <el-button type="primary" size="mini" />-->
+                <!--                <el-button type="danger" size="mini">鍒犻櫎</el-button>-->
+
+              </div>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <!--鍒嗛〉-->
+      <pagination
+        :total="total"
+        :page.sync="form.page"
+        :limit.sync="form.rows"
+        align="right"
+        layout="total ,prev, pager, next,sizes"
+        popper-class="select_bottom"
+        @pagination="getOrganizationSearch"
+      />
+    </div>
+
+    <el-dialog
+      v-el-drag-dialog
+      :title="operation==='add'?'鏂板':'缂栬緫'"
+      :visible.sync="dialogVisible"
+      width="900px"
+      top="15vh"
+      :close-on-click-modal="false"
+      @closed="handleClose"
+      @close="handleClose"
+    >
+      <el-form ref="dialogForm" inline :rules="dialogFormRules" :model="dialogForm" label-width="100px">
+        <el-form-item label="瀛樿揣缂栫爜" prop="partcode">
+          <el-input v-model="dialogForm.partcode" :disabled="operation!=='add'" style="width: 200px" />
+        </el-form-item>
+        <el-form-item label="瀛樿揣鍚嶇О" prop="partname">
+          <el-input v-model="dialogForm.partname" :disabled="operation!=='add'" style="width: 200px" />
+        </el-form-item>
+        <el-form-item label="瑙勬牸鍨嬪彿" prop="partspec">
+          <el-input v-model="dialogForm.partspec" style="width: 200px" />
+        </el-form-item>
+        <el-form-item label="閿�鍞崟浣�" prop="saleUnit">
+          <el-input v-model="dialogForm.saleUnit" style="width: 200px" />
+        </el-form-item>
+        <el-form-item label="鏁伴噺" prop="sum">
+          <el-input v-model="dialogForm.sum" style="width: 200px" />
+        </el-form-item>
+        <el-form-item label="鏈�鏂板惈绋庡敭浠�" prop="newSale">
+          <el-input v-model="dialogForm.newSale" style="width: 200px" />
+        </el-form-item>
+        <el-form-item label="绋庣巼%" prop="taxPercent">
+          <el-input v-model="dialogForm.taxPercent" style="width: 200px" />
+        </el-form-item>
+        <el-form-item label="鍚◣鍗曚环" prop="newTaxPrice">
+          <el-input v-model="dialogForm.newTaxPrice" style="width: 200px" />
+        </el-form-item>
+        <el-form-item label="閲戦" prop="money">
+          <el-input v-model="dialogForm.money" style="width: 200px" />
+        </el-form-item>
+        <el-form-item label="鍚◣閲戦" prop="taxMoney">
+          <el-input v-model="dialogForm.taxMoney" style="width: 200px" />
+        </el-form-item>
+
+        <el-form-item label="棰勮浜よ揣鏃ユ湡" prop="expectedDate" style="width: 200px" />
+        <el-date-picker
+          v-model="dialogForm.expectedDate"
+          type="date"
+          placeholder="閫夋嫨鏃ユ湡"
+        />
+          <!--          <el-input v-model="dialogForm.expectedDate" style="width: 200px" />-->
+        </el-form-item>
+        <el-form-item label="鐜板瓨閲�" prop="stockCount">
+          <el-input v-model="dialogForm.stockCount" style="width: 200px" />
+        </el-form-item>
+        <el-form-item label="鐜板瓨閲忚鏄�" prop="stockDesc">
+          <el-input v-model="dialogForm.stockDesc" type="textarea" style="width: 200px" />
+        </el-form-item>
+        <el-form-item label="澶囨敞" prop="notes">
+          <el-input v-model="dialogForm.notes" type="textarea" style="width: 200px" />
+        </el-form-item>
+        <el-form-item label="閫�璐у師鍥�" prop="returnReason">
+          <el-input v-model="dialogForm.returnReason" type="textarea" style="width: 200px" />
+        </el-form-item>
+
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <div class="footerButton">
+          <el-button v-waves @click="dialogVisibleCancel">鍙� 娑�</el-button>
+          <el-button
+            v-waves
+            type="primary"
+            :loading="$store.state.app.buttonIsDisabled"
+            :disabled="$store.state.app.buttonIsDisabled"
+            @click="dialogVisibleConfirm"
+          >纭� 瀹�</el-button>
+        </div>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import Pagination from '@/components/Pagination'
+import { AddUpdateOrganization, DeleteOrganization, OrganizationSearch, PrentOrganization } from '@/api/basicSettings'
+import { getCookie } from '@/utils/auth'
+import { validateCode } from '@/utils/global'
+import TableColumnSettings from '@/components/TableColumnSettings'
+import elDragDialog from '@/directive/el-drag-dialog' // base on element-ui
+import waves from '@/directive/waves/index.js' // 姘存尝绾规寚浠�
+
+// const SER_HZ = /^[\u4e00-\u9fa5]+$/
+// const SER_HZ = /^[a-zA-Z0-9_;,.<>() ]{0,}$/
+export default {
+  name: 'ZZJG',
+  components: {
+    Pagination, TableColumnSettings
+  },
+  directives: { elDragDialog, waves },
+  data() {
+    const validateTypeCode = (rule, value, callback) => {
+      if (!value) {
+        return callback(new Error('璇烽�夋嫨涓婄骇'))
+      } else {
+        callback()
+      }
+    }
+    return {
+      windowHeight: 0,
+      windowWidth: 0,
+      mainHeight: 0,
+      tableHeight: 0,
+      numvalue: 0,
+      form: {
+        OrgCode: '', // 缁勭粐鏋舵瀯浠g爜
+        OrgName: '', // 缁勭粐鏋舵瀯鍚嶇О
+        orderdate: '', // 鍗曟嵁鏃ユ湡
+        prop: 'lm_date', // 鎺掑簭瀛楁
+        order: 'desc', // 鎺掑簭瀛楁
+        page: 1, // 绗嚑椤�
+        rows: 20 // 姣忛〉澶氬皯鏉�
+      },
+
+      tableColumnSettingsArray: [
+        { minWidth: 50, width: false, prop: 'id', label: 'id', id: 1, show: false, fixed: false, sortable: false }, // 闅愯棌鍒�  show: false闅愯棌锛宼rue鏄剧ず
+        // { minWidth: 25, width: 50, prop: 'RowNum', label: '搴忓彿', id: 2, show: true, fixed: 'left', sortable: false }, // custom
+        {
+          minWidth: 110,
+          width: false,
+          prop: 'partcode',
+          label: '瀛樿揣缂栫爜',
+          id: 2,
+          show: true,
+          fixed: false,
+          sortable: true
+        }, {
+          minWidth: 110,
+          width: false,
+          prop: 'partname',
+          label: '瀛樿揣鍚嶇О',
+          id: 3,
+          show: true,
+          fixed: false,
+          sortable: true
+        },
+        {
+          minWidth: 110,
+          width: false,
+          prop: 'partspec',
+          label: '瑙勬牸鍨嬪彿',
+          id: 4,
+          show: true,
+          fixed: false,
+          sortable: true
+        },
+        {
+          minWidth: 110,
+          width: false,
+          prop: 'saleUnit',
+          label: '閿�鍞崟浣�',
+          id: 5,
+          show: true,
+          fixed: false,
+          sortable: true
+        },
+        {
+          minWidth: 110,
+          width: false,
+          prop: 'sum',
+          label: '鏁伴噺',
+          id: 6,
+          show: true,
+          fixed: false,
+          sortable: true
+        },
+        {
+          minWidth: 130,
+          width: false,
+          prop: 'newSale',
+          label: '鏈�鏂板惈绋庡敭浠�',
+          id: 7,
+          show: true,
+          fixed: false,
+          sortable: true
+        },
+        {
+          minWidth: 110,
+          width: false,
+          prop: 'taxPercent',
+          label: '绋庣巼%',
+          id: 8,
+          show: true,
+          fixed: false,
+          sortable: true
+        },
+        {
+          minWidth: 110,
+          width: false,
+          prop: 'newTaxPrice',
+          label: '鍚◣鍗曚环',
+          id: 9,
+          show: true,
+          fixed: false,
+          sortable: true
+        },
+        {
+          minWidth: 110,
+          width: false,
+          prop: 'money',
+          label: '閲戦',
+          id: 10,
+          show: true,
+          fixed: false,
+          sortable: true
+        },
+        {
+          minWidth: 110,
+          width: false,
+          prop: 'taxMoney',
+          label: '鍚◣閲戦',
+          id: 11,
+          show: true,
+          fixed: false,
+          sortable: true
+        },
+        {
+          minWidth: 130,
+          width: false,
+          prop: 'expectedDate',
+          label: '棰勮浜よ揣鏃ユ湡',
+          id: 12,
+          show: true,
+          fixed: false,
+          sortable: true
+        },
+        {
+          minWidth: 110,
+          width: false,
+          prop: 'stockCount',
+          label: '鐜板瓨閲�',
+          id: 13,
+          show: true,
+          fixed: false,
+          sortable: true
+        },
+        {
+          minWidth: 120,
+          width: false,
+          prop: 'stockDesc',
+          label: '鐜板瓨閲忚鏄�',
+          id: 13,
+          show: true,
+          fixed: false,
+          sortable: true
+        },
+        {
+          minWidth: 110,
+          width: false,
+          prop: 'notes',
+          label: '澶囨敞',
+          id: 13,
+          show: true,
+          fixed: false,
+          sortable: true
+        },
+        {
+          minWidth: 110,
+          width: false,
+          prop: 'returnReason',
+          label: '閫�璐у師鍥�',
+          id: 13,
+          show: true,
+          fixed: false,
+          sortable: true
+        }
+      ],
+      tableTimeStampKey: new Date().getTime(), // 琛ㄦ牸key
+
+      total: 10,
+      tableData: [
+        { id: 1001, partcode: 201, partname: '涓绘満', partspec: '', saleUnit: '涓�', sum: 1000, newScale: 200000, taxPercent: '', newTaxPrice: 200000, money: 200000, taxMoney: 200000, expectedDate: '2023-04-04', stockCount: 300, stockDesc: '', notes: '', returnReason: '' },
+        { id: 1002, partcode: 114, partname: '涓绘澘2', partspec: '#333', saleUnit: '涓�', sum: 1000, newScale: 100000, taxPercent: '', newTaxPrice: 100000, money: 100000, taxMoney: 100000, expectedDate: '2023-04-05', stockCount: 500, stockDesc: '', notes: '', returnReason: '' },
+        { id: 1003, partcode: 108, partname: '鏄剧ず鍣�', partspec: '', saleUnit: '涓�', sum: 2000, newScale: 100000, taxPercent: '', newTaxPrice: 100000, money: 100000, taxMoney: 100000, expectedDate: '2023-04-05', stockCount: 600, stockDesc: '', notes: '', returnReason: '' },
+        { id: 1004, partcode: 105, partname: '鏈虹', partspec: '', saleUnit: '涓�', sum: 1000, newScale: 20000, taxPercent: '', newTaxPrice: 20000, money: 20000, taxMoney: 20000, expectedDate: '2023-04-06', stockCount: 300, stockDesc: '', notes: '', returnReason: '' },
+        { id: 1005, partcode: 103, partname: '纭洏', partspec: '', saleUnit: '涓�', sum: 1000, newScale: 60000, taxPercent: '', newTaxPrice: 60000, money: 60000, taxMoney: 60000, expectedDate: '2023-04-07', stockCount: 300, stockDesc: '', notes: '', returnReason: '' }
+      ],
+
+      dialogVisible: false,
+      dialogForm: {
+        partcode: '',
+        partname: '',
+        partspec: '',
+        saleUnit: '',
+        sum: '',
+        newSale: '',
+        taxPercent: '',
+        newTaxPrice: '',
+        money: '',
+        taxMoney: '',
+        expectedDate: '',
+        stockCount: '',
+        stockDesc: '',
+        notes: '',
+        returnReason: ''
+      },
+
+      operation: '',
+      dialogFormRules: {
+        partcode: [
+          { required: true, validator: validateCode, trigger: ['blur', 'change'] }
+        ],
+        partname: [
+          { required: true, message: '璇疯緭鍏ュ悕绉�', trigger: ['blur', 'change'] }
+        ]
+
+      }
+
+    }
+  },
+  // watch: {
+  //   windowHeight(val) {
+  //     console.log('瀹炴椂灞忓箷楂樺害锛�', val, this.windowHeight)
+  //   },
+  //   windowWidth(val) {
+  //     if (val < 768) {
+  //       this.dialogWidth = '100%'
+  //     } else {
+  //       this.dialogWidth = '75%'
+  //     }
+  //     console.log('瀹炴椂灞忓箷瀹藉害锛�', val, this.windowHeight)
+  //   }
+  // },
+  created() {
+    // this.getOrganizationSearch()
+  },
+  mounted() {
+    window.addEventListener('resize', this.getHeight)
+    this.getHeight()
+
+    this.total = this.tableData.length
+  },
+  destroyed() {
+
+  },
+  methods: {
+    tableColumnUpdate(val, isCopyTrue) {
+      if (isCopyTrue) {
+        this.tableColumnSettingsArray = val
+      }
+      this.tableTimeStampKey = new Date().getTime()
+      this.$refs.tableDataRef.doLayout()
+    },
+    async getOrganizationSearch() {
+      const res = await OrganizationSearch(this.form)
+      this.tableData = res.data
+      this.total = res.count
+    },
+    // 鎺掑簭鏀瑰彉鏃�
+    sortChange({ column, prop, order }) {
+      if (order === 'descending') {
+        order = 'desc'
+      } else if (order === 'ascending') {
+        order = 'asc'
+      } else {
+        order = 'desc'
+      }
+      this.form.order = order
+      this.form.prop = prop
+      this.getOrganizationSearch()
+    },
+    // 鏌ヨ
+    search() {
+      // this.getOrganizationSearch()
+
+    },
+    // 閲嶇疆
+    reset() {
+      this.form.OrgCode = ''
+      this.form.OrgName = ''
+      // this.form.OrgType = ''
+      // this.form.UserName = ''
+      // this.getOrganizationSearch()
+    },
+
+    // 鏂板鎸夐挳
+    async add(operation) {
+      this.operation = operation
+      this.dialogVisible = true
+
+      // const res = await getNewEncodingRules(getCookie('ruleCode'))
+      // this.dialogForm.OrgCode = res.RightCode
+      // this.numvalue = res.numvalue
+    },
+    // 淇敼鎸夐挳
+    edit(operation, row) {
+      this.operation = operation
+      this.dialogVisible = true
+      // if (row.description === 'F') {
+      //   this.dialogForm.OrgType = '宸ュ巶'
+      // } else
+      if (row.description === 'D') {
+        this.dialogForm.OrgType = '閮ㄩ棬'
+      } else if (row.description === 'W') {
+        this.dialogForm.OrgType = '杞﹂棿'
+      }
+      // else if (row.description === 'K') {
+      //   this.dialogForm.OrgType = '绉戝'
+      // } else if (row.description === 'L') {
+      //   this.dialogForm.OrgType = '鐢熶骇绾�'
+      // }
+      this.$nextTick(() => {
+        this.changeRadio(this.dialogForm.OrgType)
+        this.dialogForm.OrgCode = row.org_code
+        this.dialogForm.OrgName = row.org_name
+        this.dialogForm.SupUnit = row.parent_id
+      })
+    },
+    // 鍒犻櫎鎸夐挳
+    async del(id) {
+      this.$confirm('鏄惁纭鍒犻櫎?', '鎻愮ず', {
+        confirmButtonText: '纭畾',
+        cancelButtonText: '鍙栨秷',
+        type: 'warning'
+      }).then(() => {
+        DeleteOrganization({ orgid: id }).then(res => {
+          if (res.code === '200') {
+            this.$message.success('鍒犻櫎鎴愬姛!')
+            if (this.form.page > 1 && this.tableData.length === 1) {
+              this.form.page--
+            }
+            this.getOrganizationSearch()
+          }
+        })
+      }).catch(() => {
+        this.$message.info('宸插彇娑堝垹闄�')
+      })
+    },
+    // 瀵硅瘽妗嗗叧闂簨浠�
+    handleClose() {
+      this.dialogForm.OrgType = '閮ㄩ棬'
+      this.dialogForm.OrgCode = ''
+      this.dialogForm.OrgName = ''
+      this.dialogForm.SupUnit = ''
+      this.$refs.dialogForm.clearValidate()
+    },
+    // 瀵硅瘽妗嗗彇娑�
+    dialogVisibleCancel() {
+      this.dialogVisible = false
+    },
+    // 瀵硅瘽妗嗙‘璁�
+    dialogVisibleConfirm() {
+      this.$refs.dialogForm.validate(valid => {
+        if (valid) {
+          this.$store.state.app.buttonIsDisabled = true
+          const data = {
+            OrganType: this.dialogForm.OrgType === '閮ㄩ棬' ? 'D' : 'W',
+            OrganCode: this.dialogForm.OrgCode,
+            OrganName: this.dialogForm.OrgName,
+            RightCode: '',
+            numvalue: '',
+            // RightCode: this.operation === 'add' ? getCookie('ruleCode') : '',
+            // numvalue: this.operation === 'add' ? this.numvalue : '',
+            SupUnit: this.dialogForm.OrgType === '閮ㄩ棬' ? '0' : this.dialogForm.SupUnit,
+            OperType: this.operation === 'add' ? 'Add' : 'Update',
+            Operator: getCookie('admin')
+          }
+
+          AddUpdateOrganization(data).then(res => {
+            if (res.code === '200') {
+              this.dialogVisible = false
+              this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
+              this.getOrganizationSearch()
+              this.$store.state.app.buttonIsDisabled = false
+            } else {
+              this.$message.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
+              this.$store.state.app.buttonIsDisabled = false
+            }
+          })
+        }
+      })
+    },
+    // 鑾峰彇椤甸潰楂樺害
+    getHeight() {
+      this.$nextTick(() => {
+        this.mainHeight = window.innerHeight - 85
+        this.tableHeight = this.mainHeight - 195
+        if (window.innerHeight < 769) {
+          this.tableHeight = this.tableHeight - 40
+        }
+        this.isIpad = window.innerHeight < 769 && window.innerWidth < 1367
+        this.$refs.tableDataRef.doLayout()
+      })
+    },
+    tableRowClassName({ row, rowIndex }) {
+      return 'custom-row'
+    }
+  }
+}
+</script>
+
+<!--鍏叡椤甸潰鏍峰紡-->
+<style lang="scss" scoped>
+$main_color: #42b983;
+.el-icon-share, .el-icon-delete, .el-icon-edit-outline {
+  color: $main_color;
+  cursor: pointer;
+}
+
+.el-icon-edit-outline {
+  margin-right: 15px;
+}
+
+::v-deep .el-button--primary, .el-button--default, .el-button--info {
+  height: 34px;
+  display: flex;
+  align-items: center;
+  padding: 0 15px;
+}
+
+::v-deep .el-button--primary {
+  //background-color: $main_color !important;
+}
+
+::v-deep .el-button--default {
+  background-color: #f8f8fa;
+  border: none;
+}
+
+::v-deep .el-input__inner {
+  height: 34px;
+  line-height: 34px;
+  //color: #a7a7a7;
+}
+
+::v-deep .el-dialog__body {
+  padding: 20px 100px !important;
+}
+
+::v-deep .dialogVisibleRoles .el-dialog__body {
+  padding: 20px 20px !important;
+}
+
+::v-deep .importPickerClass .el-dialog__body {
+  padding: 20px 20px !important;
+}
+
+::v-deep .el-dialog__footer {
+  display: flex;
+  justify-content: flex-end;
+}
+
+::v-deep .el-table .caret-wrapper {
+  transform: scale(0.8);
+}
+
+::v-deep .cell {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+
+::v-deep .el-table::before {
+  height: 0;
+}
+
+::v-deep .el-table__body-wrapper {
+  background-color: #f8f8fa;
+}
+
+::v-deep .el-table__body .el-table__row.hover-row td {
+  background-color: #eaecef;
+}
+
+::v-deep .el-form--inline .el-form-item__label {
+  color: #a7a7a7;
+}
+
+.body ::v-deep .el-divider {
+  border: 1px solid #eee;
+  width: 99%;
+  margin: 10px auto;
+}
+
+.body ::v-deep .el-form-item {
+  margin-bottom: 0;
+}
+
+.tableFixed {
+  ::v-deep .el-table__fixed-right {
+    height: 100% !important;
+  }
+
+  ::v-deep .el-table__fixed {
+    height: 100% !important;
+  }
+}
+
+//::v-deep .cell {
+//  display: flex;
+//  flex-wrap: nowrap;
+//}
+//
+//::v-deep .has-gutter .cell {
+//  display: flex;
+//  flex-wrap: nowrap;
+//}
+</style>
+<style>
+.osloading {
+  font-size: 30px;
+}
+
+.el-table .custom-row {
+  background: #f8f8fa;
+}
+</style>

--
Gitblit v1.9.3