From 9fd74a61c289c54c535663a2fe2bd97d04d292c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E9=A3=9E?= <lipengfei@outlook.com>
Date: Wed, 1 Apr 2020 14:22:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=97=A5=E5=BF=97=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E5=8A=9F=E8=83=BD=E5=A2=9E=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/sys/resource-add-or-update.vue    |  36 +++-
 src/views/modules/sys/resources-list.vue      |  36 +++-
 .../sys/resourcestotalrelation-list.vue       | 140 +++++++++++++++
 .../modules/sys/totalconfig-add-or-update.vue | 124 +++++++++++++
 src/views/modules/sys/totalconfig-list.vue    | 117 +++++++++++++
 .../modules/sys/totalconfig-select-list.vue   | 164 ++++++++++++++++++
 .../resourcestotalrelation-add-or-update.vue  | 131 --------------
 .../workRecord/resourcestotalrelation.vue     |  73 --------
 .../workRecord/totalconfig-add-or-update.vue  | 145 ----------------
 src/views/modules/workRecord/totalconfig.vue  |  75 --------
 10 files changed, 610 insertions(+), 431 deletions(-)
 create mode 100644 src/views/modules/sys/resourcestotalrelation-list.vue
 create mode 100644 src/views/modules/sys/totalconfig-add-or-update.vue
 create mode 100644 src/views/modules/sys/totalconfig-list.vue
 create mode 100644 src/views/modules/sys/totalconfig-select-list.vue
 delete mode 100644 src/views/modules/workRecord/resourcestotalrelation-add-or-update.vue
 delete mode 100644 src/views/modules/workRecord/resourcestotalrelation.vue
 delete mode 100644 src/views/modules/workRecord/totalconfig-add-or-update.vue
 delete mode 100644 src/views/modules/workRecord/totalconfig.vue

diff --git a/src/views/modules/sys/resource-add-or-update.vue b/src/views/modules/sys/resource-add-or-update.vue
index 8bbde091..e5393036 100644
--- a/src/views/modules/sys/resource-add-or-update.vue
+++ b/src/views/modules/sys/resource-add-or-update.vue
@@ -92,7 +92,7 @@
     </el-form>
     <template slot="footer">
       <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
-      <el-button type="primary" @click="dataFormSubmitHandle()">{{
+      <el-button type="primary" :disabled="buttonFlag" @click="dataFormSubmitHandle()">{{
         $t('confirm')
       }}</el-button>
     </template>
@@ -107,6 +107,7 @@ export default {
   data () {
     return {
       visible: false,
+      buttonFlag : false,
       resourceList: [],
       resourceListVisible: false,
       dataForm: {
@@ -125,13 +126,41 @@ export default {
   computed: {
     dataRule () {
       return {
-        name: [
+        resourceLabel: [
           {
             required: true,
             message: this.$t('validate.required'),
             trigger: 'blur'
           }
         ],
+        resourceCode: [
+            {
+                required: true,
+                message: this.$t('validate.required'),
+                trigger: 'blur'
+            }
+        ],
+        totalDescribe: [
+            {
+                required: true,
+                message: this.$t('validate.required'),
+                trigger: 'blur'
+            }
+        ],
+        sort: [
+            {
+                required: true,
+                message: this.$t('validate.required'),
+                trigger: 'blur'
+            }
+        ],
+        showFlag: [
+            {
+                required: true,
+                message: this.$t('validate.required'),
+                trigger: 'blur'
+            }
+        ],
         parentName: [
           {
             required: true,
@@ -190,6 +219,7 @@ export default {
             return this.deptListTreeSetDefaultHandle()
           }
           this.$refs.resourceListTree.setCurrentKey(this.dataForm.pid)
+          this.dataForm.parentName = this.$refs.resourceListTree.getCurrentNode().resourceLabel
         })
         .catch(() => {})
     },
@@ -211,6 +241,7 @@ export default {
           if (!valid) {
             return false
           }
+          this.buttonFlag = true
           this.$http[!this.dataForm.id ? 'post' : 'put'](
             '/workRecord/resourcesdictionary',
             this.dataForm
@@ -219,6 +250,7 @@ export default {
               if (res.code !== 0) {
                 return this.$message.error(res.msg)
               }
+              this.buttonFlag = false
               this.$message({
                 message: this.$t('prompt.success'),
                 type: 'success',
diff --git a/src/views/modules/sys/resources-list.vue b/src/views/modules/sys/resources-list.vue
index 2d31af82..f7c7a6a5 100644
--- a/src/views/modules/sys/resources-list.vue
+++ b/src/views/modules/sys/resources-list.vue
@@ -60,16 +60,25 @@
         >
           <template slot-scope="scope">
             <el-button
-              v-if="$hasPermission('sys:menu:update')"
+                    v-if="$hasPermission('workRecord:resource:total')"
+                    type="text"
+                    :disabled="scope.row.isFatherFlag ==='0'? false :true"
+                    size="small"
+                    @click="relationHandle(scope.row.id)"
+            >统计配置</el-button
+            >
+            <el-button
+              v-if="$hasPermission('workRecord:resource:update')"
               type="text"
               size="small"
               @click="addOrUpdateHandle(scope.row.id)"
               >{{ $t('update') }}</el-button
             >
             <el-button
-              v-if="$hasPermission('sys:menu:delete')"
+              v-if="$hasPermission('workRecord:resource:delete')"
               type="text"
               size="small"
+              :disabled="scope.row.isFatherFlag ==='0'? false :true"
               @click="deleteHandle(scope.row.id)"
               >{{ $t('delete') }}</el-button
             >
@@ -82,6 +91,11 @@
         ref="addOrUpdate"
         @refreshDataList="getDataList"
       ></add-or-update>
+      <relation-list
+              v-if="relationListVisible"
+              ref="relationList"
+              @refreshDataList="getDataList"
+      ></relation-list>
     </div>
   </el-card>
 </template>
@@ -90,19 +104,23 @@
 import mixinViewModule from '@/mixins/view-module'
 import TableTreeColumn from '@/components/table-tree-column'
 import AddOrUpdate from './resource-add-or-update'
+import RelationList from './resourcestotalrelation-list'
 export default {
   mixins: [mixinViewModule],
   data () {
     return {
       mixinViewModuleOptions: {
         getDataListURL: '/workRecord/resourcesdictionary/list',
-        deleteURL: '/workRecord/resourcesdictionary'
-      }
+        deleteURL: '/workRecord/resourcesdictionary',
+        deleteIsBatch: true
+      },
+      relationListVisible: false
     }
   },
   components: {
     TableTreeColumn,
-    AddOrUpdate
+    AddOrUpdate,
+    RelationList
   },
   methods: {
     showFlagFormatter: function (row, column) {
@@ -111,6 +129,14 @@ export default {
       } else if (row.showFlag === '1') {
         return '是'
       }
+    },
+    // 配置统计
+    relationHandle (id) {
+      this.relationListVisible = true
+      this.$nextTick(() => {
+        this.$refs.relationList.dataForm.resourceId = id
+        this.$refs.relationList.init()
+      })
     }
   }
 }
diff --git a/src/views/modules/sys/resourcestotalrelation-list.vue b/src/views/modules/sys/resourcestotalrelation-list.vue
new file mode 100644
index 00000000..03463f0b
--- /dev/null
+++ b/src/views/modules/sys/resourcestotalrelation-list.vue
@@ -0,0 +1,140 @@
+<template>
+  <el-dialog
+          :visible.sync="visible"
+          :close-on-click-modal="false"
+          :close-on-press-escape="false"
+          width="80%"
+  >
+    <el-card shadow="never" class="aui-card--fill">
+      <div class="mod-news__resourcestotalrelation}">
+        <el-form :inline="true" :model="dataForm" @keyup.enter.native="selectData()">
+            <div>
+                <el-form-item label="统计名称" prop="totalName">
+                    <el-input v-model="dataForm.totalName" placeholder="统计名称" clearable></el-input>
+                </el-form-item>
+                <el-form-item label="统计类型" prop="totalType">
+                    <el-input v-model="dataForm.totalType" placeholder="统计类型" clearable></el-input>
+                </el-form-item>
+            </div>
+            <div>
+                <el-form-item label="统计方式" prop="totalStyle">
+                    <el-select v-model="dataForm.totalStyle" placeholder="统计方式" clearable>
+                        <el-option label="其他" :value="0"></el-option>
+                        <el-option label="统计次数" :value="1"></el-option>
+                        <el-option label="统计人数" :value="2"></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="自动计算" prop="autoFlag">
+                    <el-select v-model="dataForm.autoFlag" placeholder="自动计算" clearable>
+                        <el-option label="否" :value="0"></el-option>
+                        <el-option label="是" :value="1"></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item>
+                    <el-button @click="selectData()">{{ $t('query') }}</el-button>
+                </el-form-item>
+                <el-form-item>
+                    <el-button v-if="$hasPermission('workRecord:relation:save')" type="primary" @click="selectHandle()">{{ "新增" }}</el-button>
+                </el-form-item>
+            </div>
+        </el-form>
+        <el-table v-loading="dataListLoading" :data="dataList" max-height="500"
+                  style="width: 100%;">
+<!--        <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">-->
+          <el-table-column label="序号" header-align="center" align="center" width="50px">
+            <template slot-scope="scope">
+              {{scope.$index+1}}
+            </template>
+          </el-table-column>
+          <el-table-column prop="totalName" label="统计名称" header-align="center" align="center"></el-table-column>
+          <el-table-column prop="totalType" label="统计类型" header-align="center" align="center"></el-table-column>
+          <el-table-column prop="totalStyle" label="统计方式" :formatter="totalStyleFormatter" header-align="center" align="center"></el-table-column>
+          <el-table-column prop="sort" label="排序" header-align="center" align="center"></el-table-column>
+          <el-table-column prop="autoFlag" label="是否自动计算" :formatter="autoFlagFormatter" header-align="center" align="center"></el-table-column>
+          <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+            <template slot-scope="scope">
+              <el-button v-if="$hasPermission('workRecord:relation:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <el-pagination
+                :current-page="page"
+                :page-sizes="[10, 20, 50, 100]"
+                :page-size="limit"
+                :total="total"
+                layout="total, sizes, prev, pager, next, jumper"
+                @size-change="pageSizeChangeHandle"
+                @current-change="pageCurrentChangeHandle">
+        </el-pagination>
+      </div>
+    </el-card>
+    <!-- 弹窗, 新增 / 修改 -->
+    <select-list v-if="selectListVisible" ref="selectList" @refreshDataList="selectData"></select-list>
+  </el-dialog>
+</template>
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import SelectList from './totalconfig-select-list'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/workRecord/resourcestotalrelation/page',
+        getDataListIsPage: true,
+        deleteURL: '/workRecord/resourcestotalrelation',
+        deleteIsBatch: true
+      },
+      visible: false,
+      selectListVisible : false,
+      dataForm: {
+        id: '',
+        totalName: '',
+        totalType: '',
+        totalStyle: '',
+        autoFlag: ''
+      }
+    }
+  },
+  components: {
+    SelectList
+  },
+  methods: {
+    init () {
+      this.visible = true
+      this.$nextTick(() => {
+        if (this.dataForm.resourceId) {
+          this.getDataList()
+        }
+      })
+    },
+    selectData(){
+        this.page = 1
+        this.getDataList()
+    },
+    totalStyleFormatter: function (row, column) {
+      if (row.totalStyle === 0) {
+        return '其他'
+      } else if (row.totalStyle === 1) {
+        return '统计次数'
+      } else if (row.totalStyle === 2) {
+        return '统计人数'
+      }
+    },
+    autoFlagFormatter: function (row, column) {
+      if (row.autoFlag === '0') {
+        return '否'
+      } else if (row.autoFlag === '1') {
+        return '是'
+      }
+    },
+    selectHandle () {
+      this.selectListVisible = true
+      this.$nextTick(() => {
+        this.$refs.selectList.dataForm.resourceId = this.dataForm.resourceId
+        this.$refs.selectList.init()
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/modules/sys/totalconfig-add-or-update.vue b/src/views/modules/sys/totalconfig-add-or-update.vue
new file mode 100644
index 00000000..be27fb9d
--- /dev/null
+++ b/src/views/modules/sys/totalconfig-add-or-update.vue
@@ -0,0 +1,124 @@
+<template>
+  <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
+        <el-form-item label="统计名称" prop="totalName">
+            <el-input v-model="dataForm.totalName" placeholder="统计名称"></el-input>
+        </el-form-item>
+        <el-form-item label="统计类型" prop="totalType">
+          <el-input v-model="dataForm.totalType" placeholder="统计类型（自定义）"></el-input>
+        </el-form-item>
+        <el-form-item label="统计方式" prop="totalStyle">
+            <el-select v-model="dataForm.totalStyle" placeholder="统计方式" clearable>
+                <el-option label="其他" :value="0"></el-option>
+                <el-option label="统计次数" :value="1"></el-option>
+                <el-option label="统计人数" :value="2"></el-option>
+            </el-select>
+        </el-form-item>
+        <el-form-item prop="sort" label="排序">
+            <el-input-number
+                    v-model="dataForm.sort"
+                    controls-position="right"
+                    :min="0"
+                    label="排序"
+            ></el-input-number>
+        </el-form-item>
+        <el-form-item prop="autoFlag"
+                      label="自动计算"
+                      size="mini">
+            <el-radio-group v-model="dataForm.autoFlag">
+                <el-radio label="0">否</el-radio>
+                <el-radio label="1">是</el-radio>
+            </el-radio-group>
+        </el-form-item>
+    </el-form>
+    <template slot="footer">
+      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
+      <el-button type="primary" :disabled="buttonFlag" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import debounce from 'lodash/debounce'
+export default {
+  data () {
+    return {
+      visible: false,
+      buttonFlag : false,
+      dataForm: {
+        id: '',
+        totalType: '',
+        totalName: '',
+        totalStyle: '',
+        sort: 0,
+        autoFlag: '0'
+      }
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        totalName: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        totalStyle: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        sort: [
+            { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        autoFlag: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  methods: {
+    init () {
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          this.getInfo()
+        }
+      })
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/workRecord/totalconfig/${this.dataForm.id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data
+        }
+      }).catch(() => {})
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(function () {
+      this.$refs['dataForm'].validate((valid) => {
+        if (!valid) {
+          return false
+        }
+        this.buttonFlag = true
+        this.$http[!this.dataForm.id ? 'post' : 'put']('/workRecord/totalconfig/', this.dataForm).then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.buttonFlag = false
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              this.visible = false
+              this.$emit('refreshDataList')
+            }
+          })
+        }).catch(() => {})
+      })
+    }, 1000, { 'leading': true, 'trailing': false })
+  }
+}
+</script>
diff --git a/src/views/modules/sys/totalconfig-list.vue b/src/views/modules/sys/totalconfig-list.vue
new file mode 100644
index 00000000..062b1012
--- /dev/null
+++ b/src/views/modules/sys/totalconfig-list.vue
@@ -0,0 +1,117 @@
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-news__totalconfig}">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="selectData()">
+        <div>
+          <el-form-item label="统计名称" prop="totalName">
+            <el-input v-model="dataForm.totalName" placeholder="统计名称" clearable></el-input>
+          </el-form-item>
+          <el-form-item label="统计类型" prop="totalType">
+            <el-input v-model="dataForm.totalType" placeholder="统计类型" clearable></el-input>
+          </el-form-item>
+        </div>
+        <div>
+          <el-form-item label="统计方式" prop="totalStyle">
+            <el-select v-model="dataForm.totalStyle" placeholder="统计方式" clearable>
+              <el-option label="其他" :value="0"></el-option>
+              <el-option label="统计次数" :value="1"></el-option>
+              <el-option label="统计人数" :value="2"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="自动计算" prop="autoFlag">
+            <el-select v-model="dataForm.autoFlag" placeholder="自动计算" clearable>
+              <el-option label="否" :value="0"></el-option>
+              <el-option label="是" :value="1"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item>
+            <el-button @click="selectData()">{{ $t('query') }}</el-button>
+          </el-form-item>
+          <el-form-item>
+            <el-button v-if="$hasPermission('workRecord:totalconfig:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+          </el-form-item>
+        </div>
+      </el-form>
+      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
+        <el-table-column label="序号" header-align="center" align="center" width="50px">
+            <template slot-scope="scope">
+                {{scope.$index+1}}
+            </template>
+        </el-table-column>
+        <el-table-column prop="totalName" label="统计名称" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="totalType" label="统计类型" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="totalStyle" label="统计方式" :formatter="totalStyleFormatter" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="createdTime" label="创建时间" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="sort" label="排序" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="autoFlag" label="是否自动计算" :formatter="autoFlagFormatter" header-align="center" align="center"></el-table-column>
+        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+          <template slot-scope="scope">
+            <el-button v-if="$hasPermission('workRecord:totalconfig:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button v-if="$hasPermission('workRecord:totalconfig:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        :current-page="page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="limit"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="pageSizeChangeHandle"
+        @current-change="pageCurrentChangeHandle">
+      </el-pagination>
+      <!-- 弹窗, 新增 / 修改 -->
+      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="selectData"></add-or-update>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import AddOrUpdate from './totalconfig-add-or-update'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/workRecord/totalconfig/page',
+        getDataListIsPage: true,
+        deleteURL: '/workRecord/totalconfig',
+        deleteIsBatch: true
+      },
+      dataForm: {
+        id: '',
+        totalName: '',
+        totalType: '',
+        totalStyle: '',
+        autoFlag: ''
+      }
+    }
+  },
+  components: {
+    AddOrUpdate
+  },
+  methods: {
+    autoFlagFormatter: function (row, column) {
+      if (row.autoFlag === '0') {
+        return '否'
+      } else if (row.autoFlag === '1') {
+        return '是'
+      }
+    },
+    selectData(){
+      this.page = 1
+      this.getDataList()
+    },
+    totalStyleFormatter: function (row, column) {
+      if (row.totalStyle === 0) {
+        return '其他'
+      } else if (row.totalStyle === 1) {
+        return '统计次数'
+      } else if (row.totalStyle === 2) {
+        return '统计人数'
+      }
+    }
+  }
+}
+</script>
diff --git a/src/views/modules/sys/totalconfig-select-list.vue b/src/views/modules/sys/totalconfig-select-list.vue
new file mode 100644
index 00000000..3bd761b0
--- /dev/null
+++ b/src/views/modules/sys/totalconfig-select-list.vue
@@ -0,0 +1,164 @@
+<template>
+  <el-dialog
+          :visible.sync="visible"
+          :append-to-body="true"
+          :modal-append-to-body="false"
+          :close-on-click-modal="false"
+          :close-on-press-escape="false"
+          width="80%"
+  >
+    <el-card shadow="never" class="aui-card--fill">
+      <div class="mod-news__totalconfigselectlist}">
+          <el-form :inline="true" :model="dataForm" @keyup.enter.native="selectData()">
+              <div>
+                  <el-form-item label="统计名称" prop="totalName">
+                      <el-input v-model="dataForm.totalName" placeholder="统计名称" clearable></el-input>
+                  </el-form-item>
+                  <el-form-item label="统计类型" prop="totalType">
+                      <el-input v-model="dataForm.totalType" placeholder="统计类型" clearable></el-input>
+                  </el-form-item>
+              </div>
+              <div>
+                  <el-form-item label="统计方式" prop="totalStyle">
+                      <el-select v-model="dataForm.totalStyle" placeholder="统计方式" clearable>
+                          <el-option label="其他" :value="0"></el-option>
+                          <el-option label="统计次数" :value="1"></el-option>
+                          <el-option label="统计人数" :value="2"></el-option>
+                      </el-select>
+                  </el-form-item>
+                  <el-form-item label="自动计算" prop="autoFlag">
+                      <el-select v-model="dataForm.autoFlag" placeholder="自动计算" clearable>
+                          <el-option label="否" :value="0"></el-option>
+                          <el-option label="是" :value="1"></el-option>
+                      </el-select>
+                  </el-form-item>
+                  <el-form-item>
+                      <el-button @click="selectData()">{{ $t('query') }}</el-button>
+                  </el-form-item>
+                  <el-form-item>
+                      <el-button v-if="$hasPermission('workRecord:relation:select')" type="primary" @click="SubmitHandle()">{{ "选择" }}</el-button>
+                  </el-form-item>
+              </div>
+          </el-form>
+        <el-table v-loading="dataListLoading" :data="dataList" max-height="500" @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
+          <!--        <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">-->
+            <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
+            <el-table-column label="序号" header-align="center" align="center" width="50px">
+              <template slot-scope="scope">
+                  {{scope.$index+1}}
+              </template>
+          </el-table-column>
+            <el-table-column prop="totalName" label="统计名称" header-align="center" align="center"></el-table-column>
+            <el-table-column prop="totalType" label="统计类型" header-align="center" align="center"></el-table-column>
+            <el-table-column prop="totalStyle" label="统计方式" :formatter="totalStyleFormatter" header-align="center" align="center"></el-table-column>
+            <el-table-column prop="createdTime" label="创建时间" header-align="center" align="center"></el-table-column>
+            <el-table-column prop="sort" label="排序" header-align="center" align="center"></el-table-column>
+            <el-table-column prop="autoFlag" label="是否自动计算" :formatter="autoFlagFormatter" header-align="center" align="center"></el-table-column>
+            <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+                <template slot-scope="scope">
+                    <el-button v-if="$hasPermission('workRecord:relation:select')" type="text" size="small" @click="SubmitHandle(scope.row.id)">选择</el-button>
+
+                </template>
+            </el-table-column>
+      </el-table>
+        <el-pagination
+                :current-page="page"
+                :page-sizes="[10, 20, 50, 100]"
+                :page-size="limit"
+                :total="total"
+                layout="total, sizes, prev, pager, next, jumper"
+                @size-change="pageSizeChangeHandle"
+                @current-change="pageCurrentChangeHandle">
+        </el-pagination>
+      </div>
+    </el-card>
+  </el-dialog>
+</template>
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import debounce from 'lodash/debounce'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/workRecord/totalconfig/selectPage',
+        getDataListIsPage: true
+      },
+      selectIsBatchKey: 'id',
+      buttonFlag : false,
+      visible: false,
+      dataForm: {
+        resourceId: '',
+        totalConfigIdList: [],
+        totalName: '',
+        totalType: '',
+        totalStyle: '',
+        autoFlag: ''
+      }
+    }
+  },
+  methods: {
+    init () {
+      this.visible = true
+      this.$nextTick(() => {
+        if (this.dataForm.resourceId) {
+          this.dataListSelections = []
+          this.dataForm.totalConfigIdList = []
+          this.getDataList()
+        }
+      })
+    },
+    totalStyleFormatter: function (row, column) {
+      if (row.totalStyle === 0) {
+        return '其他'
+      } else if (row.totalStyle === 1) {
+        return '统计次数'
+      } else if (row.totalStyle === 2) {
+        return '统计人数'
+      }
+    },
+    selectData(){
+        this.page = 1
+        this.getDataList()
+    },
+    autoFlagFormatter: function (row, column) {
+      if (row.autoFlag === '0') {
+        return '否'
+      } else if (row.autoFlag === '1') {
+        return '是'
+      }
+    },
+    SubmitHandle(configId) {
+      if(!configId && this.dataListSelections.length <= 0) {
+          return this.$message({
+              message: this.$t('prompt.selectBatch'),
+              type: 'warning',
+              duration: 500
+          })
+      }
+      this.buttonFlag = true
+      if(configId){
+          this.dataForm.totalConfigIdList = [configId]
+      } else {
+          this.dataForm.totalConfigIdList = this.dataListSelections.map(item => item[this.selectIsBatchKey])
+      }
+      this.$http['post']('/workRecord/resourcestotalrelation/', this.dataForm).then(({ data: res }) => {
+          if (res.code !== 0) {
+              return this.$message.error(res.msg)
+          }
+          this.buttonFlag = false
+          this.$message({
+              message: this.$t('prompt.success'),
+              type: 'success',
+              duration: 500,
+              onClose: () => {
+                  this.visible = false
+                  this.$emit('refreshDataList')
+              }
+          })
+      }).catch(() => {})
+    }
+  }
+}
+</script>
diff --git a/src/views/modules/workRecord/resourcestotalrelation-add-or-update.vue b/src/views/modules/workRecord/resourcestotalrelation-add-or-update.vue
deleted file mode 100644
index f14b3311..00000000
--- a/src/views/modules/workRecord/resourcestotalrelation-add-or-update.vue
+++ /dev/null
@@ -1,131 +0,0 @@
-<template>
-  <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
-    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
-          <el-form-item label="资源ID" prop="resourceId">
-          <el-input v-model="dataForm.resourceId" placeholder="资源ID"></el-input>
-      </el-form-item>
-          <el-form-item label="统计配置ID" prop="totalConfigId">
-          <el-input v-model="dataForm.totalConfigId" placeholder="统计配置ID"></el-input>
-      </el-form-item>
-          <el-form-item label="逻辑删除标识" prop="delFlag">
-          <el-input v-model="dataForm.delFlag" placeholder="逻辑删除标识"></el-input>
-      </el-form-item>
-          <el-form-item label="乐观锁" prop="revision">
-          <el-input v-model="dataForm.revision" placeholder="乐观锁"></el-input>
-      </el-form-item>
-          <el-form-item label="创建人" prop="createdBy">
-          <el-input v-model="dataForm.createdBy" placeholder="创建人"></el-input>
-      </el-form-item>
-          <el-form-item label="创建时间" prop="createdTime">
-          <el-input v-model="dataForm.createdTime" placeholder="创建时间"></el-input>
-      </el-form-item>
-          <el-form-item label="更新人" prop="updatedBy">
-          <el-input v-model="dataForm.updatedBy" placeholder="更新人"></el-input>
-      </el-form-item>
-          <el-form-item label="更新时间" prop="updatedTime">
-          <el-input v-model="dataForm.updatedTime" placeholder="更新时间"></el-input>
-      </el-form-item>
-      </el-form>
-    <template slot="footer">
-      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
-      <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
-    </template>
-  </el-dialog>
-</template>
-
-<script>
-import debounce from 'lodash/debounce'
-export default {
-  data () {
-    return {
-      visible: false,
-      dataForm: {
-        id: '',
-        resourceId: '',
-        totalConfigId: '',
-        delFlag: '',
-        revision: '',
-        createdBy: '',
-        createdTime: '',
-        updatedBy: '',
-        updatedTime: ''
-      }
-    }
-  },
-  computed: {
-    dataRule () {
-      return {
-        resourceId: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        totalConfigId: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        delFlag: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        revision: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        createdBy: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        createdTime: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        updatedBy: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        updatedTime: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ]
-      }
-    }
-  },
-  methods: {
-    init () {
-      this.visible = true
-      this.$nextTick(() => {
-        this.$refs['dataForm'].resetFields()
-        if (this.dataForm.id) {
-          this.getInfo()
-        }
-      })
-    },
-    // 获取信息
-    getInfo () {
-      this.$http.get(`/news/resourcestotalrelation/${this.dataForm.id}`).then(({ data: res }) => {
-        if (res.code !== 0) {
-          return this.$message.error(res.msg)
-        }
-        this.dataForm = {
-          ...this.dataForm,
-          ...res.data
-        }
-      }).catch(() => {})
-    },
-    // 表单提交
-    dataFormSubmitHandle: debounce(function () {
-      this.$refs['dataForm'].validate((valid) => {
-        if (!valid) {
-          return false
-        }
-        this.$http[!this.dataForm.id ? 'post' : 'put']('/news/resourcestotalrelation/', this.dataForm).then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          }
-          this.$message({
-            message: this.$t('prompt.success'),
-            type: 'success',
-            duration: 500,
-            onClose: () => {
-              this.visible = false
-              this.$emit('refreshDataList')
-            }
-          })
-        }).catch(() => {})
-      })
-    }, 1000, { 'leading': true, 'trailing': false })
-  }
-}
-</script>
diff --git a/src/views/modules/workRecord/resourcestotalrelation.vue b/src/views/modules/workRecord/resourcestotalrelation.vue
deleted file mode 100644
index 8da5c769..00000000
--- a/src/views/modules/workRecord/resourcestotalrelation.vue
+++ /dev/null
@@ -1,73 +0,0 @@
-<template>
-  <el-card shadow="never" class="aui-card--fill">
-    <div class="mod-news__resourcestotalrelation}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <el-form-item>
-          <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
-        </el-form-item>
-        <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button v-if="$hasPermission('news:resourcestotalrelation:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button v-if="$hasPermission('news:resourcestotalrelation:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
-        </el-form-item>
-      </el-form>
-      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
-        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
-        <el-table-column prop="id" label="主键" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="resourceId" label="资源ID" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="totalConfigId" label="统计配置ID" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="delFlag" label="逻辑删除标识" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="revision" label="乐观锁" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createdBy" label="创建人" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createdTime" label="创建时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="updatedBy" label="更新人" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="updatedTime" label="更新时间" header-align="center" align="center"></el-table-column>
-        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
-          <template slot-scope="scope">
-            <el-button v-if="$hasPermission('news:resourcestotalrelation:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
-            <el-button v-if="$hasPermission('news:resourcestotalrelation:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <el-pagination
-        :current-page="page"
-        :page-sizes="[10, 20, 50, 100]"
-        :page-size="limit"
-        :total="total"
-        layout="total, sizes, prev, pager, next, jumper"
-        @size-change="pageSizeChangeHandle"
-        @current-change="pageCurrentChangeHandle">
-      </el-pagination>
-      <!-- 弹窗, 新增 / 修改 -->
-      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
-    </div>
-  </el-card>
-</template>
-
-<script>
-import mixinViewModule from '@/mixins/view-module'
-import AddOrUpdate from './resourcestotalrelation-add-or-update'
-export default {
-  mixins: [mixinViewModule],
-  data () {
-    return {
-      mixinViewModuleOptions: {
-        getDataListURL: '/news/resourcestotalrelation/page',
-        getDataListIsPage: true,
-        deleteURL: '/news/resourcestotalrelation',
-        deleteIsBatch: true
-      },
-      dataForm: {
-        id: ''
-      }
-    }
-  },
-  components: {
-    AddOrUpdate
-  }
-}
-</script>
diff --git a/src/views/modules/workRecord/totalconfig-add-or-update.vue b/src/views/modules/workRecord/totalconfig-add-or-update.vue
deleted file mode 100644
index 97cb9d52..00000000
--- a/src/views/modules/workRecord/totalconfig-add-or-update.vue
+++ /dev/null
@@ -1,145 +0,0 @@
-<template>
-  <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
-    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
-          <el-form-item label="统计类型（自定义）" prop="totalType">
-          <el-input v-model="dataForm.totalType" placeholder="统计类型（自定义）"></el-input>
-      </el-form-item>
-          <el-form-item label="统计名称" prop="totalName">
-          <el-input v-model="dataForm.totalName" placeholder="统计名称"></el-input>
-      </el-form-item>
-          <el-form-item label="统计方式：1count，2sum" prop="totalStyle">
-          <el-input v-model="dataForm.totalStyle" placeholder="统计方式：1count，2sum"></el-input>
-      </el-form-item>
-          <el-form-item label="逻辑删除标识" prop="delFlag">
-          <el-input v-model="dataForm.delFlag" placeholder="逻辑删除标识"></el-input>
-      </el-form-item>
-          <el-form-item label="乐观锁" prop="revision">
-          <el-input v-model="dataForm.revision" placeholder="乐观锁"></el-input>
-      </el-form-item>
-          <el-form-item label="创建人" prop="createdBy">
-          <el-input v-model="dataForm.createdBy" placeholder="创建人"></el-input>
-      </el-form-item>
-          <el-form-item label="创建时间" prop="createdTime">
-          <el-input v-model="dataForm.createdTime" placeholder="创建时间"></el-input>
-      </el-form-item>
-          <el-form-item label="更新人" prop="updatedBy">
-          <el-input v-model="dataForm.updatedBy" placeholder="更新人"></el-input>
-      </el-form-item>
-          <el-form-item label="更新时间" prop="updatedTime">
-          <el-input v-model="dataForm.updatedTime" placeholder="更新时间"></el-input>
-      </el-form-item>
-          <el-form-item label="自动计算flag" prop="autoFlag">
-          <el-input v-model="dataForm.autoFlag" placeholder="自动计算flag"></el-input>
-      </el-form-item>
-      </el-form>
-    <template slot="footer">
-      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
-      <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
-    </template>
-  </el-dialog>
-</template>
-
-<script>
-import debounce from 'lodash/debounce'
-export default {
-  data () {
-    return {
-      visible: false,
-      dataForm: {
-        id: '',
-        totalType: '',
-        totalName: '',
-        totalStyle: '',
-        delFlag: '',
-        revision: '',
-        createdBy: '',
-        createdTime: '',
-        updatedBy: '',
-        updatedTime: '',
-        autoFlag: ''
-      }
-    }
-  },
-  computed: {
-    dataRule () {
-      return {
-        totalType: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        totalName: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        totalStyle: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        delFlag: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        revision: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        createdBy: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        createdTime: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        updatedBy: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        updatedTime: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        autoFlag: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ]
-      }
-    }
-  },
-  methods: {
-    init () {
-      this.visible = true
-      this.$nextTick(() => {
-        this.$refs['dataForm'].resetFields()
-        if (this.dataForm.id) {
-          this.getInfo()
-        }
-      })
-    },
-    // 获取信息
-    getInfo () {
-      this.$http.get(`/news/totalconfig/${this.dataForm.id}`).then(({ data: res }) => {
-        if (res.code !== 0) {
-          return this.$message.error(res.msg)
-        }
-        this.dataForm = {
-          ...this.dataForm,
-          ...res.data
-        }
-      }).catch(() => {})
-    },
-    // 表单提交
-    dataFormSubmitHandle: debounce(function () {
-      this.$refs['dataForm'].validate((valid) => {
-        if (!valid) {
-          return false
-        }
-        this.$http[!this.dataForm.id ? 'post' : 'put']('/news/totalconfig/', this.dataForm).then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          }
-          this.$message({
-            message: this.$t('prompt.success'),
-            type: 'success',
-            duration: 500,
-            onClose: () => {
-              this.visible = false
-              this.$emit('refreshDataList')
-            }
-          })
-        }).catch(() => {})
-      })
-    }, 1000, { 'leading': true, 'trailing': false })
-  }
-}
-</script>
diff --git a/src/views/modules/workRecord/totalconfig.vue b/src/views/modules/workRecord/totalconfig.vue
deleted file mode 100644
index 771fe107..00000000
--- a/src/views/modules/workRecord/totalconfig.vue
+++ /dev/null
@@ -1,75 +0,0 @@
-<template>
-  <el-card shadow="never" class="aui-card--fill">
-    <div class="mod-news__totalconfig}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <el-form-item>
-          <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
-        </el-form-item>
-        <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button v-if="$hasPermission('news:totalconfig:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button v-if="$hasPermission('news:totalconfig:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
-        </el-form-item>
-      </el-form>
-      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
-        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
-        <el-table-column prop="id" label="主键" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="totalType" label="统计类型（自定义）" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="totalName" label="统计名称" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="totalStyle" label="统计方式：1count，2sum" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="delFlag" label="逻辑删除标识" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="revision" label="乐观锁" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createdBy" label="创建人" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createdTime" label="创建时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="updatedBy" label="更新人" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="updatedTime" label="更新时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="autoFlag" label="自动计算flag" header-align="center" align="center"></el-table-column>
-        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
-          <template slot-scope="scope">
-            <el-button v-if="$hasPermission('news:totalconfig:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
-            <el-button v-if="$hasPermission('news:totalconfig:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <el-pagination
-        :current-page="page"
-        :page-sizes="[10, 20, 50, 100]"
-        :page-size="limit"
-        :total="total"
-        layout="total, sizes, prev, pager, next, jumper"
-        @size-change="pageSizeChangeHandle"
-        @current-change="pageCurrentChangeHandle">
-      </el-pagination>
-      <!-- 弹窗, 新增 / 修改 -->
-      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
-    </div>
-  </el-card>
-</template>
-
-<script>
-import mixinViewModule from '@/mixins/view-module'
-import AddOrUpdate from './totalconfig-add-or-update'
-export default {
-  mixins: [mixinViewModule],
-  data () {
-    return {
-      mixinViewModuleOptions: {
-        getDataListURL: '/news/totalconfig/page',
-        getDataListIsPage: true,
-        deleteURL: '/news/totalconfig',
-        deleteIsBatch: true
-      },
-      dataForm: {
-        id: ''
-      }
-    }
-  },
-  components: {
-    AddOrUpdate
-  }
-}
-</script>