diff --git a/src/views/modules/projectman/projectinfo-add-or-update.vue b/src/views/modules/projectman/projectinfo-add-or-update.vue
deleted file mode 100644
index 3e83cbd..0000000
--- a/src/views/modules/projectman/projectinfo-add-or-update.vue
+++ /dev/null
@@ -1,238 +0,0 @@
-<template>
-  <div>
-    <el-dialog
-      v-drag
-      width="499px"
-      @close="closeDialog"
-      :title="!dataForm.id ? '新增' : '修改'"
-      :close-on-click-modal="false"
-      :visible.sync="visible">
-      <el-form :inline="true" label-position="top" :model="dataForm" :rules="dataRule" ref="dataForm"
-               @keyup.enter.native="dataFormSubmit()"
-               label-width="80px">
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="项目号" prop="projectNo">
-              <el-input v-model="dataForm.projectNo"></el-input>
-            </el-form-item>
-            <el-form-item label="项目名称" prop="projectName">
-              <el-input style="width: 150px"
-                        v-model="dataForm.projectName"></el-input>
-            </el-form-item>
-            <!--            <el-form-item label="编号" prop="itemNo">-->
-            <!--              <el-input  v-model="dataForm.itemNo" placeholder=""></el-input>-->
-            <!--            </el-form-item>-->
-            <el-form-item label="客户" prop="customer">
-              <span slot="label" style="" @click="getBaseList(3,1)"><el-link>客户</el-link></span>
-              <el-input v-model="dataForm.customer" placeholder=""></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="项目负责人" prop="startBy">
-              <span slot="label" style="" @click="getBaseList(2,1)"><el-link>项目负责人</el-link></span>
-              <el-input v-model="dataForm.startBy" placeholder=""></el-input>
-            </el-form-item>
-            <el-form-item label="开始时间" prop="startDate">
-              <el-date-picker style="width: 150px" v-model="dataForm.startDate"
-                              value-format='yyyy-MM-dd'
-                              format='yyyy-MM-dd'
-              ></el-date-picker>
-            </el-form-item>
-            <el-form-item label="结束时间" prop="finishDate">
-              <el-date-picker style="width: 145px" v-model="dataForm.finishDate"
-                              value-format='yyyy-MM-dd'
-                              format='yyyy-MM-dd'
-              ></el-date-picker>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="项目状态" prop="remark">
-              <el-select v-model="dataForm.status">
-                <el-option label="已结束" value="N"></el-option>
-                <el-option label="进行中" value="Y"></el-option>
-                <el-option label="暂停" value="S"></el-option>
-                <el-option label="取消" value="C"></el-option>
-              </el-select>
-            </el-form-item>
-
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="备注" prop="remark">
-              <el-input style="width: 470px" v-model="dataForm.remark" placeholder=""></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <span slot="footer" class="dialog-footer">
-       <el-button type="primary" @click="dataFormSubmit()">确定</el-button>
-      <el-button type="primary" @click="visible = false">取消</el-button>
-    </span>
-    </el-dialog>
-    <!--列表的组件-->
-    <Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist>
-  </div>
-</template>
-
-<script>
-  import Chooselist from '@/views/modules/common/Chooselist';
-  import {
-    projectInfo,
-    projectInfoUpdate,
-    projectInfoSave
-  } from "@/api/projectman/projectinfo.js"
-
-  export default {
-    data() {
-      return {
-        tagNo: 0,   // 选择列表编号
-        seqNo: 0,   // 同列表选择区分编号
-        visible: false,
-        dataForm: {
-          id: 0,
-          projectNo: '',
-          projectName: '',
-          site: this.$store.state.user.site,
-          itemNo: '',
-          startDate: '',
-          startBy: '',
-          finishDate: '',
-          finishBy: '',
-          customer: '',
-          remark: '',
-          status: 'Y',
-          createdBy: '',
-          createdDate: ''
-        },
-        dataRule: {
-          projectNo: [
-            // 项目号不能为空
-            {required: true, message: ' ', trigger: 'blur'}
-          ],
-          projectName: [
-            // 项目名称不能为空
-            {required: true, message: ' ', trigger: 'blur'}
-          ],
-          startDate: [
-            // 开始时间不能为空
-            {required: true, message: ' ', trigger: 'blur'}
-          ],
-          startBy: [
-            // 项目负责人不能为空
-            {required: true, message: ' ', trigger: 'blur'}
-          ],
-          customer: [
-            // 客户不能为空
-            {required: true, message: ' ', trigger: 'blur'}
-          ],
-
-        }
-      }
-    },
-    components: {
-      Chooselist
-    },
-    methods: {
-      // 获取基础数据列表
-      getBaseList(val, seqNo) {
-        this.tagNo = val
-        this.seqNo = seqNo
-        this.$nextTick(() => {
-          let strVal = "";
-          if (val == 1 && seqNo == 1) {
-            strVal = this.dataForm.startBy;
-          } else if (val == 1 && seqNo == 2) {
-            strVal = this.dataForm.finishBy;
-          } else if (val == 3) {
-            strVal = this.dataForm.customer
-          }
-          this.$refs.baseList.init(val, strVal);
-        })
-      },
-      /*列表方法的回调*/
-      getBaseData(val) {
-        if (this.tagNo === 2 && this.seqNo == 1) {
-          this.dataForm.startBy = val.pm_no;
-        } else if (this.tagNo == 2 && this.seqNo == 2) {
-          this.dataForm.finishBy = val.pm_name;
-        } else if (this.tagNo == 3 && this.seqNo == 1) {
-          this.dataForm.customer = val.customer_name;
-        }
-      },
-      init(id) {
-        this.dataForm.id = id || 0
-        this.visible = true
-        this.$nextTick(() => {
-          this.$refs['dataForm'].resetFields()
-          if (this.dataForm.id) {
-            projectInfo(this.dataForm.id).then(({data}) => {
-              if (data && data.code === 0) {
-                this.dataForm.projectNo = data.projectInfo.projectNo
-                this.dataForm.projectName = data.projectInfo.projectName
-                this.dataForm.site = data.projectInfo.site
-                this.dataForm.itemNo = data.projectInfo.itemNo
-                this.dataForm.startDate = data.projectInfo.startDate
-                this.dataForm.startBy = data.projectInfo.startBy
-                this.dataForm.finishDate = data.projectInfo.finishDate
-                this.dataForm.finishBy = data.projectInfo.finishBy
-                this.dataForm.customer = data.projectInfo.customer
-                this.dataForm.remark = data.projectInfo.remark
-                this.dataForm.status = data.projectInfo.status
-                this.dataForm.createdBy = data.projectInfo.createdBy
-                this.dataForm.createdDate = data.projectInfo.createdDate
-              }
-            })
-          } else {
-            this.dataForm.startDate = this.dayjs().format("YYYY-MM-DD HH:mm:ss")
-            this.dataForm.startBy = this.$store.state.user.name
-          }
-        })
-      },
-      // 表单提交
-      dataFormSubmit() {
-        if(this.dataForm.finishDate && this.dataForm.finishDate <this.dataForm.startDate){
-          this.$message.warning('结束时间不能早于开始时间')
-          return
-        }
-        this.$refs['dataForm'].validate((valid) => {
-          if (valid) {
-            if (this.dataForm.id) {
-              this.dataForm.updatedBy = this.$store.state.user.name
-              projectInfoUpdate(this.dataForm).then(({data}) => {
-                if (data && data.code === 0) {
-                  this.$message.success('操作成功')
-                  this.$emit('refreshDataList')
-                  this.visible = false
-                } else {
-                  this.$message.error(data.msg)
-                }
-              })
-            } else {
-              this.dataForm.createdBy = this.$store.state.user.name
-              this.dataForm.status = 'Y'
-              projectInfoSave(this.dataForm).then(({data}) => {
-                if (data && data.code === 0) {
-                  this.$message.success('操作成功')
-                  this.$emit('refreshDataList')
-                  this.visible = false
-                } else {
-                  this.$message.error(data.msg)
-                }
-              })
-            }
-          }
-        })
-      },
-      // 关闭模态框
-      closeDialog() {
-        Object.assign(this.$data, this.$options.data())
-      }
-    }
-  }
-</script>
-
diff --git a/src/views/modules/projectman/projectinfo.vue b/src/views/modules/projectman/projectinfo.vue
deleted file mode 100644
index 4eead79..0000000
--- a/src/views/modules/projectman/projectinfo.vue
+++ /dev/null
@@ -1,594 +0,0 @@
-<template>
-  <div>
-    <el-row>
-      <el-col :span="24">
-        <el-button @click="getDataList()" type="primary">查询</el-button>
-        <el-button v-if="isAuth('projectman:projectinfo:save')" type="primary" @click="addOrUpdateHandle()">新增
-        </el-button>
-        <download-excel
-          :fields="fields()"
-          type="xls"
-          :name="exportName"
-          :fetch="createExportData"
-          worksheet="导出信息"
-          class="el-button el-button--primary el-button--medium">
-          {{ '导出' }}
-        </download-excel>
-        <el-button @click="userSetting" type="primary">{{ '设置表格栏位'}}</el-button>
-        <el-button v-if="userDev" @click="saveColumnList()" type="primary">{{ '保存栏位信息' }}</el-button>
-      </el-col>
-    </el-row>
-    <el-row>
-      <el-col :span="24">
-        <el-form class="search-form" :inline="true" label-position="top" :model="dataForm"
-                 @keyup.enter.native="getDataList()">
-          <el-form-item label="项目号">
-            <el-input v-model="dataForm.projectNo" clearable></el-input>
-          </el-form-item>
-          <el-form-item>
-            <span slot="label" style="" @click="getBaseList(2,1)"><el-link>项目负责人</el-link></span>
-            <el-input v-model="dataForm.startBy" clearable></el-input>
-          </el-form-item>
-
-          <el-form-item label="开始日期">
-            <el-date-picker style="width: 120px" v-model="dataForm.startDate"
-                            value-format='yyyy-MM-dd 00:00:00'
-                            format='yyyy-MM-dd'
-            ></el-date-picker>
-            -
-            <el-date-picker style="width: 120px" v-model="dataForm.startEndDate"
-                            value-format='yyyy-MM-dd 23:59:59'
-                            format='yyyy-MM-dd'
-            ></el-date-picker>
-          </el-form-item>
-          <el-form-item label="状态">
-            <el-select v-model="dataForm.status">
-              <el-option value="" label="全部"></el-option>
-              <el-option value="Y" label="进行中"></el-option>
-              <el-option value="N" label="已结束"></el-option>
-              <el-option label="暂停" value="S"></el-option>
-              <el-option label="取消" value="C"></el-option>
-            </el-select>
-          </el-form-item>
-        </el-form>
-      </el-col>
-    </el-row>
-    <el-row>
-      <el-col :span="24">
-        <el-form class="search-form" :inline="true" label-position="top" :model="dataForm"
-                 @keyup.enter.native="getDataList()">
-          <el-form-item label="项目名称">
-            <el-input v-model="dataForm.projectName" clearable></el-input>
-          </el-form-item>
-          <el-form-item>
-            <span slot="label" style="" @click="getBaseList(3,1)"><el-link>客户</el-link></span>
-            <el-input v-model="dataForm.customer" clearable></el-input>
-          </el-form-item>
-          <el-form-item label="结束日期">
-            <el-date-picker style="width: 120px" v-model="dataForm.finishStartDate"
-                            value-format='yyyy-MM-dd 00:00:00'
-                            format='yyyy-MM-dd'
-            ></el-date-picker>
-            -
-            <el-date-picker style="width: 120px" v-model="dataForm.finishDate"
-                            value-format='yyyy-MM-dd 23:59:59'
-                            format='yyyy-MM-dd'
-            ></el-date-picker>
-          </el-form-item>
-        </el-form>
-      </el-col>
-    </el-row>
-    <el-row>
-      <el-col :span="24">
-        <el-table
-          :height="height"
-          :data="dataList"
-          border
-          v-loading="dataListLoading"
-          highlight-current-row
-          style="width: 100%;">
-          <el-table-column
-            v-if="isAuth('projectman:projectinfo:update') || isAuth('projectman:projectinfo:delete')"
-            fixed="left"
-            header-align="center"
-            align="center"
-            width="150"
-            label="操作">
-            <template slot-scope="scope">
-              <!--              <el-link v-if="scope.row.status == 'Y'" type="text" size="small" @click="closeHandle(scope.row.id)">结束-->
-              <!--              </el-link>-->
-              <el-link v-if="isAuth('projectman:projectinfo:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">修改</el-link>
-              <el-link v-if="isAuth('projectman:projectinfo:delete')" type="text" size="small" @click="deleteHandle(scope.row)">删除</el-link>
-            </template>
-          </el-table-column>
-          <el-table-column
-            v-for="(item,index) in columnList" :key="index"
-            :sortable="item.columnSortable"
-            :prop="item.columnProp"
-            :header-align="item.headerAlign"
-            :show-overflow-tooltip="item.showOverflowTooltip"
-            :align="item.align"
-            :fixed="item.fixed==''?false:item.fixed"
-            :width="item.columnWidth"
-            :label="item.columnLabel">
-            <template slot-scope="scope">
-              <span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
-              <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
-                                                 style="width: 100px; height: 80px"/></span>
-            </template>
-          </el-table-column>
-        </el-table>
-      </el-col>
-    </el-row>
-    <!-- 弹窗, 新增 / 修改 -->
-    <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
-    <!--列表的组件-->
-    <Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist>
-    <!-- 动态列    -->
-    <column v-if="visible" ref="column" @refreshData="getTableUserColumn" v-drag></column>
-  </div>
-</template>
-
-<script>
-  import column from "../common/column";
-  import {
-    projectInfoList,
-    projectInfoRemove,
-    projectInfoUpdate,
-  } from "@/api/projectman/projectinfo.js"
-  import Chooselist from '@/views/modules/common/Chooselist';
-  import AddOrUpdate from './projectinfo-add-or-update'
-  import {
-    saveTableDefaultList,
-    getTableDefaultListLanguage,
-    getTableUserListLanguage,
-    removerDefault,
-    removerUser
-  } from "@/api/table.js"
-  import pubsub from 'pubsub-js'
-
-  export default {
-    data() {
-      return {
-        tagNo: 0,   // 选择列表编号
-        seqNo: 0,   // 同列表选择区分编号
-        height: 0,
-        favorite: false, // 是否收藏,
-        visible: false,
-        userDev: this.$store.state.user.userDev,
-        dataForm: {
-          site: this.$store.state.user.site,
-          projectNo: '',
-          projectName: '',
-          startDate: '',
-          startBy: '',
-          finishDate: '',
-          finishBy: '',
-          customer: '',
-          status: '',
-          finishStartDate: '',
-          startEndDate: ''
-        },
-        dataList: [],
-        // 展示列集
-        columnList: [
-          {
-            tableId: "ProjectInfo",
-            tableName: this.$route.meta.title,
-            columnProp: "projectNo",
-            columnLabel: "项目号",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            columnWidth: null,
-            format: null,
-            functionId: this.$route.meta.menuId,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            serialNumber: null,
-            columnType: null,
-            align: null
-          },
-          {
-            tableId: "ProjectInfo",
-            tableName: this.$route.meta.title,
-            columnProp: "projectName",
-            columnLabel: "项目名称",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            columnWidth: null,
-            format: null,
-            functionId: this.$route.meta.menuId,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            serialNumber: null,
-            columnType: null,
-            align: null
-          },
-          {
-            tableId: "ProjectInfo",
-            tableName: this.$route.meta.title,
-            columnProp: "startBy",
-            columnLabel: "项目负责人",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            columnWidth: null,
-            format: null,
-            functionId: this.$route.meta.menuId,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            serialNumber: null,
-            columnType: null,
-            align: null
-          },
-          {
-            tableId: "ProjectInfo",
-            tableName: this.$route.meta.title,
-            columnProp: "customer",
-            columnLabel: "客户",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            columnWidth: null,
-            format: null,
-            functionId: this.$route.meta.menuId,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            serialNumber: null,
-            columnType: null,
-            align: null
-          },
-          {
-            tableId: "ProjectInfo",
-            tableName: this.$route.meta.title,
-            columnProp: "status",
-            columnLabel: "状态",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            columnWidth: null,
-            format: null,
-            functionId: this.$route.meta.menuId,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            serialNumber: null,
-            columnType: null,
-            align: null
-          },
-          {
-            tableId: "ProjectInfo",
-            tableName: this.$route.meta.title,
-            columnProp: "startDate",
-            columnLabel: "开始日期",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            columnWidth: 140,
-            format: null,
-            functionId: this.$route.meta.menuId,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            serialNumber: null,
-            columnType: null,
-            align: null
-          },
-          {
-            tableId: "ProjectInfo",
-            tableName: this.$route.meta.title,
-            columnProp: "finishDate",
-            columnLabel: "结束日期",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            columnWidth: 140,
-            format: null,
-            functionId: this.$route.meta.menuId,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            serialNumber: null,
-            columnType: null,
-            align: null
-          },
-          {
-            tableId: "ProjectInfo",
-            tableName: this.$route.meta.title,
-            columnProp: "remark",
-            columnLabel: "备注",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            columnWidth: null,
-            format: null,
-            functionId: this.$route.meta.menuId,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            serialNumber: null,
-            columnType: null,
-            align: null
-          },
-          {
-            tableId: "ProjectInfo",
-            tableName: this.$route.meta.title,
-            columnProp: "createdBy",
-            columnLabel: "创建人",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            columnWidth: null,
-            format: null,
-            functionId: this.$route.meta.menuId,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            serialNumber: null,
-            columnType: null,
-            align: null
-          },
-          {
-            tableId: "ProjectInfo",
-            tableName: this.$route.meta.title,
-            columnProp: "createdDate",
-            columnLabel: "创建时间",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            columnWidth: 140,
-            format: null,
-            functionId: this.$route.meta.menuId,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            serialNumber: null,
-            columnType: null,
-            align: null
-          },
-          {
-            tableId: "ProjectInfo",
-            tableName: this.$route.meta.title,
-            columnProp: "updatedBy",
-            columnLabel: "修改人",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            columnWidth: null,
-            format: null,
-            functionId: this.$route.meta.menuId,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            serialNumber: null,
-            columnType: null,
-            align: null
-          },
-          {
-            tableId: "ProjectInfo",
-            tableName: this.$route.meta.title,
-            columnProp: "updatedDate",
-            columnLabel: "修改时间",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            columnWidth: 140,
-            format: null,
-            functionId: this.$route.meta.menuId,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            serialNumber: null,
-            columnType: null,
-            align: null
-          },
-        ],
-        // 用户table 配置集合
-        userColumnList: [],
-        queryTable: {
-          userId: this.$store.state.user.name,
-          functionId: this.$route.meta.menuId,
-          tableId: "ProjectInfo",
-          languageCode: this.$i18n.locale
-        },
-        dataListLoading: false,
-        dataListSelections: [],
-        addOrUpdateVisible: false,
-        exportName: "项目信息" + this.dayjs().format('YYYYMMDDHHmmss')
-      }
-    },
-    components: {
-      AddOrUpdate,
-      Chooselist,
-      column,
-    },
-    activated() {
-      // 检查功能 用户是否收藏
-      pubsub.publish('favorite')
-    },
-    mounted() {
-      this.$nextTick(() => {
-        this.height = window.innerHeight - 220;
-      })
-    },
-    methods: {
-      // 获取基础数据列表
-      getBaseList(val, seqNo) {
-        this.tagNo = val
-        this.seqNo = seqNo
-        this.$nextTick(() => {
-          let strVal = "";
-          if (this.tagNo === 2 && this.seqNo == 1) {
-            strVal = this.dataForm.startBy;
-          } else if (this.tagNo === 2 && this.seqNo == 2) {
-            strVal = this.dataForm.finishBy;
-          } else if (this.tagNo === 3 && this.seqNo == 1) {
-            strVal = this.dataForm.customer
-          }
-          this.$refs.baseList.init(val, strVal);
-        })
-      },
-      /*列表方法的回调*/
-      getBaseData(val) {
-        if (this.tagNo === 2 && this.seqNo == 1) {
-          this.dataForm.startBy = val.pm_no;
-        } else if (this.tagNo === 2 && this.seqNo == 2) {
-          this.dataForm.finishBy = val.pm_no;
-        } else if (this.tagNo === 3 && this.seqNo == 1) {
-          this.dataForm.customer = val.customer_no;
-        }
-      },
-      // 获取数据列表
-      getDataList() {
-        this.dataListLoading = true
-        projectInfoList(this.dataForm).then(({data}) => {
-          if (data && data.code === 0) {
-            this.dataList = data.data
-          } else {
-            this.dataList = []
-          }
-          this.dataListLoading = false
-        })
-      },
-      // 新增 / 修改
-      addOrUpdateHandle(id) {
-        this.addOrUpdateVisible = true
-        this.$nextTick(() => {
-          this.$refs.addOrUpdate.init(id)
-        })
-      },
-      // 结束
-      closeHandle(id) {
-        this.$confirm(`确定进行结束该项目?`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          let dto = {
-            id: id,
-            status: 'N',
-            finishBy: this.$store.state.user.name,
-            finishDate: this.dayjs().format("YYYY-MM-DD HH:mm:ss")
-          }
-          projectInfoUpdate(dto).then(({data}) => {
-            if (data && data.code === 0) {
-              this.$message.success('操作成功')
-              this.getDataList()
-            } else {
-              this.$message.error(data.msg)
-            }
-          })
-        })
-      },
-      // 删除
-      deleteHandle(val) {
-        let ids = val.id ? [val.id] : null
-        this.$confirm(`确定进行[删除]操作?`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          projectInfoRemove(ids).then(({data}) => {
-            if (data && data.code === 0) {
-              this.$message.success('操作成功')
-              this.getDataList()
-            } else {
-              this.$message.error(data.msg)
-            }
-          })
-        })
-      },
-      // 打开页面设置
-      userSetting() {
-        this.visible = true;
-        this.$nextTick(() => {
-          this.$refs.column.init(this.queryTable);
-        });
-      },
-      // 获取 用户保存的 格式列
-      getTableUserColumn() {
-        getTableUserListLanguage(this.queryTable).then(({data}) => {
-          if (data.code == 0 && data.rows.length > 0) {
-            this.columnList = data.rows
-          } else {
-            this.getColumnList()
-          }
-        })
-      },
-      // 获取 tableDefault 列
-      getColumnList() {
-        getTableDefaultListLanguage(this.queryTable).then(({data}) => {
-          if (data.code == 0 && data.rows.length > 0) {
-            this.columnList = data.rows
-          }
-        })
-      },
-      // 保存 默认配置 列
-      async saveColumnList() {
-        // 删除所有的该页面下保存的数据
-        if (this.userColumnList) {
-          //删除 user自定义的数据
-          await removerUser(this.queryTable)
-        }
-        // 删除默认配置
-        await removerDefault(this.queryTable)
-        // 保存页面 table属性
-        let sumColumnList = this.columnList;
-        sumColumnList = sumColumnList.map(item => {
-          return item = {
-            tableId: item.tableId,
-            tableName: item.tableName,
-            columnProp: item.columnProp,
-            columnLabel: item.columnLabel,
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            columnWidth: item.columnWidth,
-            format: item.format,
-            functionId: this.$route.meta.menuId,
-            sortLv: item.sortLv,
-            status: true,
-            fixed: item.fixed,
-            serialNumber: item.serialNumber,
-            columnType: item.columnType,
-            align: item.align
-          }
-        })
-        await saveTableDefaultList(sumColumnList)
-        this.getColumnList()
-      },
-      // 导出
-      fields() {
-        let json = "{"
-        this.columnList.forEach((item, index) => {
-          if (index == this.columnList.length - 1) {
-            json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\""
-          } else {
-            json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\"" + ","
-          }
-        })
-        json += "}"
-        let s = eval("(" + json + ")")
-        return s
-      },
-      createExportData() {
-        // 点击导出按钮之后,开始导出数据之前的执行函数,返回值为需要下载的数据
-        return this.dataList;
-      },
-    },
-    created() {
-      this.getTableUserColumn()
-    }
-  }
-</script>
-<style scoped>
-  .search-form /deep/ .el-input--medium .el-input__inner {
-    width: 120px;
-  }
-</style>
diff --git a/src/views/modules/shoporder/sfdctimehist-update.vue b/src/views/modules/shoporder/sfdctimehist-update.vue
deleted file mode 100644
index 4923e07..0000000
--- a/src/views/modules/shoporder/sfdctimehist-update.vue
+++ /dev/null
@@ -1,301 +0,0 @@
-<template>
-  <div class="mod-config">
-    <el-dialog
-      v-drag
-      width="499px"
-      :title="'编辑生产记录'"
-      :close-on-click-modal="false"
-      :visible.sync="visible">
-      <el-form :model="dataForm" :inline="true" label-position="top" :rules="dataRule" ref="dataForm"
-               @keyup.enter.native="dataFormSubmit()" label-width="80px">
-        <el-form-item :label="'订单号'" prop="orderno">
-          <el-input readonly class="input_txt_red" v-model="dataForm.orderNo"></el-input>
-        </el-form-item>
-        <el-form-item :label="'工序号'" prop="itemno">
-          <el-input readonly class="input_txt_red" v-model="dataForm.itemno"></el-input>
-        </el-form-item>
-        <el-form-item :label="'开始时间'" prop="eventtime">
-          <el-date-picker style="width: 150px" v-model="dataForm.eventtime"
-                          type="datetime"
-                          value-format='yyyy-MM-dd HH:mm:ss'
-                          format='yyyy-MM-dd HH:mm:ss'
-          ></el-date-picker>
-        </el-form-item>
-        <el-form-item :label="'开始操作员'" prop="enteredby">
-          <span slot="label" style="" @click="getBaseList(1,1)"><el-link>开始操作员</el-link></span>
-          <el-input v-model="dataForm.enteredby"></el-input>
-        </el-form-item>
-        <el-form-item :label="'生产类型'" prop="eventtype">
-          <el-radio-group v-model="dataForm.eventtype">
-            <el-radio label="F">常规生产</el-radio>
-            <el-radio label="R">返工</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item :label="'结束时间'">
-          <el-date-picker :disabled="dataForm.completedflag == 'N'" style="width: 150px"
-                          v-model="dataForm.tilltime"
-                          type="datetime"
-                          value-format='yyyy-MM-dd HH:mm:ss'
-                          format='yyyy-MM-dd HH:mm:ss'
-          ></el-date-picker>
-        </el-form-item>
-        <el-form-item :label="'结束操作员'">
-          <span v-if="dataForm.completedflag == 'Y'" slot="label" style="" @click="getBaseList(1,2)"><el-link>结束操作员</el-link></span>
-          <span v-else slot="label">结束操作员</span>
-          <el-input :disabled="dataForm.completedflag == 'N'" v-model="dataForm.tillenteredby"></el-input>
-        </el-form-item>
-        <el-form-item :label="'完工数量'">
-          <el-input onkeyup="value=value.replace(/[^\d]/g,'')" :disabled="dataForm.completedflag == 'N'"
-                    class="input_number" type="number" v-model="dataForm.qtyprd"></el-input>
-        </el-form-item>
-        <el-form-item :label="'生产时长'">
-          <el-input readonly type="number" :min="0" class="input_number_red" v-model="dataForm.totaltime"></el-input>
-        </el-form-item>
-        <el-form-item :label="'项目号'">
-          <el-input readonly class="input_txt_red" v-model="dataForm.projectno"></el-input>
-        </el-form-item>
-      </el-form>
-      <span slot="footer" class="dialog-footer">
-       <el-button type="primary" @click="dataFormSubmit()">确定</el-button>
-       <el-button type="primary" @click="visible = false">取消</el-button>
-    </span>
-    </el-dialog>
-    <!--列表的组件-->
-    <Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist>
-  </div>
-
-</template>
-
-<script>
-  import Chooselist from '@/views/modules/common/Chooselist';/*列表组件*/
-  import {orderTimeHistInfo, updateOrderTimeHist} from "@/api/shoporder/sfdctimehist.js"
-  import {userList} from "@/api/user.js"
-  import {userWorkCenter} from "@/api/userwork/userWorkCenter.js"
-
-  export default {
-    data() {
-      return {
-        site: this.$store.state.user.site,
-        visible: false,
-        tagNo: 0,   // 选择列表编号
-        seqNo: 0,   // 同列表选择区分编号
-        dataForm: {
-          site: this.$store.state.user.site,
-          orderno: '',
-          orderNo: '',
-          itemno: '',
-          seqno: '',
-          histseqno: '',
-          eventtime: '',
-          enteredby: '',
-          eventdesc: '',
-          downtimecode: '',
-          eventtype: '',
-          linkhistseqno: '',
-          tilltime: '',
-          tillenteredtime: '',
-          tillenteredby: '',
-          completedflag: '',
-          totaltime: '',
-          downtimephasein: '',
-          orderref1: '',
-          orderref2: '',
-          workcenterno: '',
-          resourceid: '',
-          qtyprd: '',
-          devicecode: '',
-        },
-        dataRule: {
-          orderno: [
-            {required: true, message: ' ', trigger: 'blur'}
-          ],
-          itemno: [
-            {required: true, message: ' ', trigger: 'blur'}
-          ],
-          eventtime: [
-            {required: true, message: '开始时间不能为空', trigger: 'blur'}
-          ],
-          enteredby: [
-            {required: true, message: '开始操作员不能为空', trigger: 'blur'}
-          ],
-          eventtype: [
-            {required: true, message: '生产类型不能为空', trigger: 'blur'}
-          ],
-          tilltime: [
-            {required: true, message: '结束时间不能为空', trigger: 'blur'}
-          ],
-          tillenteredtime: [
-            {required: true, message: ' ', trigger: 'blur'}
-          ],
-          tillenteredby: [
-            {required: true, message: ' ', trigger: 'blur'}
-          ],
-          totaltime: [
-            {required: true, message: ' ', trigger: 'blur'}
-          ],
-          qtyprd: [
-            {required: true, message: ' ', trigger: 'blur'}
-          ],
-          devicecode: [
-            {required: true, message: ' ', trigger: 'blur'}
-          ]
-        }
-      }
-    },
-    components: {
-      Chooselist
-    },
-    watch: {
-      dataForm: {
-        deep: true,
-        handler: function (newV, oldV) {
-          this.dataForm.totaltime = this.dayjs(this.dataForm.tilltime).diff(this.dataForm.eventtime, 'minutes')
-        }
-      }
-    },
-    methods: {
-      // 获取基础数据列表
-      getBaseList(val, seqNo) {
-        this.tagNo = val
-        this.seqNo = seqNo
-        this.$nextTick(() => {
-          let strVal = "";
-          if (seqNo === 1) {
-            strVal = this.dataForm.enteredby;
-          } else if (seqNo === 2) {
-            strVal = this.dataForm.tillenteredby;
-          }
-          this.$refs.baseList.init(val, strVal);
-        })
-      },
-      /*列表方法的回调*/
-      getBaseData(val) {
-        if (this.tagNo === 1 && this.seqNo == 1) {
-          this.dataForm.enteredby = val.username;
-        } else if (this.tagNo === 1 && this.seqNo == 2) {
-          this.dataForm.tillenteredby = val.username;
-        }
-      },
-      init(val) {
-
-        this.visible = true
-        orderTimeHistInfo(val).then(({data}) => {
-          if (data && data.code == 0) {
-            this.dataForm = data.data
-            this.dataForm.orderNo = data.data.orderno + '-' + data.data.orderref1 + '-' + data.data.orderref2
-          }
-        })
-      },
-      // 表单提交
-      dataFormSubmit() {
-        if (this.dataForm.tilltime < this.dataForm.eventtime) {
-          this.$message.warning('结束时间不能早于开始时间')
-          return
-        }
-        this.$refs['dataForm'].validate((valid) => {
-          if (valid) {
-            userList({site: this.site, status: 1}).then(({data}) => {
-              if (data && data.code == 0) {
-                let userList = data.list
-                let enteredby = userList.filter(item => item.username == this.dataForm.enteredby).length
-                if (enteredby == 0) {
-                  this.$message.warning('开始操作员不存在')
-                  return
-                }
-                if (this.dataForm.completedflag == 'Y') {
-                  let tillenteredby = userList.filter(item => item.username == this.dataForm.tillenteredby).length
-                  if (tillenteredby == 0) {
-                    this.$message.warning('结束操作员不存在')
-                    return
-                  }
-                }
-                // 校验 开始 和结束的操作员是否包含 加工中心的权限
-                // 开始操作员
-                let dto = {
-                  site: this.site,
-                  workCenterNo: this.dataForm.workcenterno,
-                  userName: this.dataForm.enteredby
-                }
-                userWorkCenter(dto).then(({data}) => {
-                  if (data && data.code == 0 && data.data) {
-                    if (this.dataForm.completedflag == 'Y') {
-                      // 结束操作员
-                      dto.userName = this.dataForm.tillenteredby
-                      userWorkCenter(dto).then(({data}) => {
-                        if (data && data.code == 0 && data.data) {
-                          this.dataForm.updatedDate = this.dayjs().format("YYYY-MM-DD HH:mm:ss")
-                          this.dataForm.updatedBy = this.$store.state.user.name
-                          updateOrderTimeHist(this.dataForm).then(({data}) => {
-                            if (data && data.code == 0) {
-                              this.$message.success(data.msg)
-                              this.visible = false
-                              this.$emit('refreshDataList')
-                            } else {
-                              this.$message.warning(data.msg)
-                            }
-                          })
-                        } else {
-                          this.$message.warning("结束操作员没有该工序对应加工中心权限!")
-                        }
-                      })
-                    }else {
-                      updateOrderTimeHist(this.dataForm).then(({data}) => {
-                        if (data && data.code == 0) {
-                          this.$message.success(data.msg)
-                          this.visible = false
-                          this.$emit('refreshDataList')
-                        } else {
-                          this.$message.warning(data.msg)
-                        }
-                      })
-                    }
-                  } else {
-                    this.$message.warning("开始操作员没有该工序对应加工中心权限!")
-                  }
-                })
-
-              }
-            })
-
-          }
-        })
-      }
-    }
-  }
-</script>
-
-
-<style>
-  .el-radio + .el-radio {
-    margin-left: 25px;
-  }
-
-  .input_txt_red input {
-    color: red;
-  }
-
-  .input_number_red input {
-    color: red;
-    text-align: right;
-  }
-
-  .input_number input {
-    text-align: right;
-  }
-
-  input::-webkit-inner-spin-button {
-    -webkit-appearance: none !important;
-
-  }
-
-  input::-webkit-outer-spin-button {
-    -webkit-appearance: none !important;
-
-  }
-
-  input[type="number"] {
-    -moz-appearance: textfield;
-
-  }
-</style>
-
diff --git a/src/views/modules/shoporder/sfdctimehist.vue b/src/views/modules/shoporder/sfdctimehist.vue
deleted file mode 100644
index d7656e1..0000000
--- a/src/views/modules/shoporder/sfdctimehist.vue
+++ /dev/null
@@ -1,689 +0,0 @@
-<template>
-  <div class="mod-config">
-    <el-row>
-      <el-col :span="24">
-        <el-button type="primary" @click="getDataList()">查询</el-button>
-        <download-excel
-          :fields="fields()"
-          type="xls"
-          :name="exportName"
-          :fetch="createExportData"
-          worksheet="导出信息"
-          class="el-button el-button--primary el-button--medium">
-          {{ '导出' }}
-        </download-excel>
-        <el-button @click="userSetting" type="primary">{{ '设置表格栏位'}}</el-button>
-        <el-button v-if="userDev" @click="saveColumnList()" type="primary">{{ '保存栏位信息' }}</el-button>
-      </el-col>
-    </el-row>
-    <el-row>
-      <el-col :span="24">
-        <el-form :inline="true" label-position="top" :model="sfdctimehistQuery" @keyup.enter.native="getDataList()">
-          <el-form-item :label="'生产订单号'">
-            <el-input v-model="sfdctimehistQuery.orderno" clearable></el-input>
-          </el-form-item>
-          <el-form-item style="width: 100px" :label="'项目号'">
-            <el-input v-model="sfdctimehistQuery.projectno" clearable></el-input>
-          </el-form-item>
-
-          <el-form-item label="开始日期">
-            <el-date-picker style="width: 120px" v-model="sfdctimehistQuery.startDate"
-                            value-format='yyyy-MM-dd 00:00:00'
-                            format='yyyy-MM-dd'
-            ></el-date-picker>
-            -
-            <el-date-picker style="width: 120px" v-model="sfdctimehistQuery.startEndDate"
-                            value-format='yyyy-MM-dd 23:59:59'
-                            format='yyyy-MM-dd'
-            ></el-date-picker>
-          </el-form-item>
-          <el-form-item>
-            <span slot="label" style="" @click="getBaseList(1,1)"><el-link>开始操作员</el-link></span>
-            <el-input style="width: 100px" v-model="sfdctimehistQuery.enteredby" clearable></el-input>
-          </el-form-item>
-          <el-form-item :label="'生产类型'">
-            <el-select style="width: 100px" v-model="sfdctimehistQuery.eventtype">
-              <el-option value="" label="全部"></el-option>
-              <el-option value="F" label="常规"></el-option>
-              <el-option value="R" label="返工"></el-option>
-            </el-select>
-          </el-form-item>
-
-        </el-form>
-      </el-col>
-    </el-row>
-    <el-row>
-      <el-col :span="24">
-        <el-form :inline="true" label-position="top" :model="sfdctimehistQuery" @keyup.enter.native="getDataList()">
-          <el-form-item :label="'料号'">
-            <el-input v-model="sfdctimehistQuery.partno" clearable></el-input>
-          </el-form-item>
-          <el-form-item :label="'加工中心'">
-            <el-input style="width: 100px" v-model="sfdctimehistQuery.workcenterno" clearable></el-input>
-          </el-form-item>
-          <el-form-item label="结束日期">
-            <el-date-picker style="width: 120px" v-model="sfdctimehistQuery.finishStartDate"
-                            value-format='yyyy-MM-dd 00:00:00'
-                            format='yyyy-MM-dd'
-            ></el-date-picker>
-            -
-            <el-date-picker style="width: 120px" v-model="sfdctimehistQuery.finishDate"
-                            value-format='yyyy-MM-dd 23:59:59'
-                            format='yyyy-MM-dd'
-            ></el-date-picker>
-          </el-form-item>
-          <el-form-item style="width: 100px">
-            <span slot="label" style="" @click="getBaseList(1,2)"><el-link>结束操作员</el-link></span>
-            <el-input v-model="sfdctimehistQuery.tillenteredby" clearable></el-input>
-          </el-form-item>
-          <el-form-item :label="'状态'">
-            <el-select style="width: 100px" v-model="sfdctimehistQuery.completedflag">
-              <el-option value="" label="全部"></el-option>
-              <el-option value="N" label="未结束"></el-option>
-              <el-option value="Y" label="已结束"></el-option>
-            </el-select>
-          </el-form-item>
-        </el-form>
-      </el-col>
-    </el-row>
-    <el-row>
-      <el-col :span="24">
-        <el-table
-          :data="dataList"
-          border
-          :height="this.height"
-          v-loading="dataListLoading"
-          highlight-current-row
-          style="width: 100%;">
-          <el-table-column
-            v-if="isAuth('shoporder:sfdctimehist:update')"
-            fixed="left"
-            header-align="center"
-            align="center"
-            width="100"
-            label="操作">
-            <template slot-scope="scope">
-              <el-link v-if="isAuth('shoporder:sfdctimehist:update')" type="text"
-                       size="small"
-                       @click="addOrUpdateHandle(scope.row)">修改
-              </el-link>
-              <el-link v-if="isAuth('shoporder:sfdctimehist:delete')" type="text"
-                       size="small"
-                       @click="deleteHist(scope.row)"> | 删除
-              </el-link>
-            </template>
-          </el-table-column>
-          <el-table-column
-            v-for="(item,index) in columnList" :key="index"
-            :sortable="item.columnSortable"
-            :prop="item.columnProp"
-            :header-align="item.headerAlign"
-            :show-overflow-tooltip="item.showOverflowTooltip"
-            :align="item.align"
-            :fixed="item.fixed==''?false:item.fixed"
-            :width="item.columnWidth"
-            :label="item.columnLabel">
-            <template slot-scope="scope">
-              <span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
-              <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
-                                                 style="width: 100px; height: 80px"/></span>
-            </template>
-          </el-table-column>
-
-        </el-table>
-      </el-col>
-    </el-row>
-    <!--修改-->
-    <SfdctimehistUpdate v-if="addOrUpdateVisible" @refreshDataList="getDataList"
-                        ref="shUpdate"></SfdctimehistUpdate>
-    <!--列表的组件-->
-    <Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist>
-
-    <!-- 动态列    -->
-    <column v-if="visible" ref="column" @refreshData="getTableUserColumn" v-drag></column>
-  </div>
-</template>
-
-<script>
-  import {orderTimeHistList, deleteOrderHist, orderTimeHistReportList} from "@/api/shoporder/sfdctimehist.js"
-  import Chooselist from '@/views/modules/common/Chooselist';
-  import SfdctimehistUpdate from './sfdctimehist-update.vue'
-  import pubsub from "pubsub-js";
-  import {
-    saveTableDefaultList,
-    getTableDefaultListLanguage,
-    getTableUserListLanguage,
-    removerDefault,
-    removerUser
-  } from "@/api/table.js"
-  import column from "../common/column";
-
-  export default {
-    data() {
-      return {
-        tagNo: 0,   // 选择列表编号
-        seqNo: 0,   // 同列表选择区分编号
-        height: 0,
-        visible: false,
-        userDev: this.$store.state.user.userDev,
-        site: this.$store.state.user.site,
-        sfdctimehistQuery: {
-          orderno: '',
-          site: this.$store.state.user.site,
-          projectno: '',
-          projectName: '',
-          enteredby: '',
-          eventtype: '',
-          tillenteredby: '',
-          partno: '',
-          completedflag: '',
-          startDate: '',
-          finishDate: '',
-          finishStartDate: '',
-          startEndDate: '',
-          workcenterno:''
-        },
-        dataList: [],
-        columnList: [
-          {
-            tableId: "SFDCTimeHist",
-            tableName: this.$route.meta.title,
-            columnProp: "projectno",
-            columnLabel: "项目号",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            columnWidth: null,
-            format: null,
-            functionId: this.$route.meta.menuId,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            serialNumber: null,
-            columnType: null,
-            align: null
-          },
-          {
-            tableId: "SFDCTimeHist",
-            tableName: this.$route.meta.title,
-            columnProp: "orderno",
-            columnLabel: "订单号",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            columnWidth: null,
-            format: null,
-            functionId: this.$route.meta.menuId,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            serialNumber: null,
-            columnType: null,
-            align: null
-          }, {
-            tableId: "SFDCTimeHist",
-            tableName: this.$route.meta.title,
-            columnProp: "orderref1",
-            columnLabel: "下达号",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            columnWidth: null,
-            format: null,
-            functionId: this.$route.meta.menuId,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            serialNumber: null,
-            columnType: null,
-            align: null
-          }, {
-            tableId: "SFDCTimeHist",
-            tableName: this.$route.meta.title,
-            columnProp: "orderref2",
-            columnLabel: "次序号",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            columnWidth: null,
-            format: null,
-            functionId: this.$route.meta.menuId,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            serialNumber: null,
-            columnType: null,
-            align: null
-          },
-          {
-            tableId: "SFDCTimeHist",
-            tableName: this.$route.meta.title,
-            columnProp: "itemno",
-            columnLabel: "工序号",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            columnWidth: null,
-            format: null,
-            functionId: this.$route.meta.menuId,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            serialNumber: null,
-            columnType: null,
-            align: null
-          }, {
-            tableId: "SFDCTimeHist",
-            tableName: this.$route.meta.title,
-            columnProp: "partno",
-            columnLabel: "料号",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            columnWidth: null,
-            format: null,
-            functionId: this.$route.meta.menuId,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            serialNumber: null,
-            columnType: null,
-            align: null
-          }, {
-            tableId: "SFDCTimeHist",
-            tableName: this.$route.meta.title,
-            columnProp: "workcenterno",
-            columnLabel: "加工中心",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            columnWidth: null,
-            format: null,
-            functionId: this.$route.meta.menuId,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            serialNumber: null,
-            columnType: null,
-            align: null
-          }, {
-            tableId: "SFDCTimeHist",
-            tableName: this.$route.meta.title,
-            columnProp: "eventtype",
-            columnLabel: "生产类型",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            columnWidth: null,
-            format: null,
-            functionId: this.$route.meta.menuId,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            serialNumber: null,
-            columnType: null,
-            align: null
-          }, {
-            tableId: "SFDCTimeHist",
-            tableName: this.$route.meta.title,
-            columnProp: "completedflag",
-            columnLabel: "状态",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            columnWidth: null,
-            format: null,
-            functionId: this.$route.meta.menuId,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            serialNumber: null,
-            columnType: null,
-            align: null
-          }, {
-            tableId: "SFDCTimeHist",
-            tableName: this.$route.meta.title,
-            columnProp: "eventtime",
-            columnLabel: "开始时间",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            columnWidth: 130,
-            format: null,
-            functionId: this.$route.meta.menuId,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            serialNumber: null,
-            columnType: null,
-            align: null
-          }, {
-            tableId: "SFDCTimeHist",
-            tableName: this.$route.meta.title,
-            columnProp: "enteredby",
-            columnLabel: "开始操作员",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            columnWidth: null,
-            format: null,
-            functionId: this.$route.meta.menuId,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            serialNumber: null,
-            columnType: null,
-            align: null
-          },
-          {
-            tableId: "SFDCTimeHist",
-            tableName: this.$route.meta.title,
-            columnProp: "tillenteredtime",
-            columnLabel: "结束时间",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            columnWidth: 130,
-            format: null,
-            functionId: this.$route.meta.menuId,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            serialNumber: null,
-            columnType: null,
-            align: null
-          },
-          {
-            tableId: "SFDCTimeHist",
-            tableName: this.$route.meta.title,
-            columnProp: "tillenteredby",
-            columnLabel: "结束操作员",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            columnWidth: null,
-            format: null,
-            functionId: this.$route.meta.menuId,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            serialNumber: null,
-            columnType: null,
-            align: null
-          },
-          {
-            tableId: "SFDCTimeHist",
-            tableName: this.$route.meta.title,
-            columnProp: "totaltime",
-            columnLabel: "生产时长(分钟)",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            columnWidth: 100,
-            format: null,
-            functionId: this.$route.meta.menuId,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            serialNumber: null,
-            columnType: null,
-            align: 'right'
-          }, {
-            tableId: "SFDCTimeHist",
-            tableName: this.$route.meta.title,
-            columnProp: "qtyprd",
-            columnLabel: "完工数量",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            columnWidth: null,
-            format: null,
-            functionId: this.$route.meta.menuId,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            serialNumber: null,
-            columnType: null,
-            align: 'right'
-          }, {
-            tableId: "SFDCTimeHist",
-            tableName: this.$route.meta.title,
-            columnProp: "devicecode",
-            columnLabel: "开始PDA设备",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            columnWidth: null,
-            format: null,
-            functionId: this.$route.meta.menuId,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            serialNumber: null,
-            columnType: null,
-            align: null
-          }, {
-            tableId: "SFDCTimeHist",
-            tableName: this.$route.meta.title,
-            columnProp: "evententeredtime",
-            columnLabel: "开始时间",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            columnWidth: null,
-            format: null,
-            functionId: this.$route.meta.menuId,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            serialNumber: null,
-            columnType: null,
-            align: null
-          },
-          {
-            tableId: "SFDCTimeHist",
-            tableName: this.$route.meta.title,
-            columnProp: "tilldevicecode",
-            columnLabel: "结束PDA设备",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            columnWidth: null,
-            format: null,
-            functionId: this.$route.meta.menuId,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            serialNumber: null,
-            columnType: null,
-            align: null
-          },
-          {
-            tableId: "SFDCTimeHist",
-            tableName: this.$route.meta.title,
-            columnProp: "tillenteredtime",
-            columnLabel: "结束时间",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            columnWidth: null,
-            format: null,
-            functionId: this.$route.meta.menuId,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            serialNumber: null,
-            columnType: null,
-            align: null
-          },
-        ],
-        queryTable: {
-          userId: this.$store.state.user.name,
-          functionId: this.$route.meta.menuId,
-          tableId: "SFDCTimeHist",
-          languageCode: this.$i18n.locale
-        },
-        dataListLoading: false,
-        dataListSelections: [],
-        addOrUpdateVisible: false,
-        exportName: '订单生产记录' + this.dayjs().format("YYYY-MM-DD HHmmss")
-      }
-    },
-    components: {
-      SfdctimehistUpdate,
-      Chooselist,
-      column,
-    },
-    mounted() {
-      this.$nextTick(() => {
-        this.height = window.innerHeight - 220;
-      })
-    },
-    activated() {
-      // 检查功能 用户是否收藏
-      pubsub.publish('favorite')
-    },
-    methods: {
-      // 获取基础数据列表
-      getBaseList(val, seqNo) {
-        this.tagNo = val
-        this.seqNo = seqNo
-        this.$nextTick(() => {
-          let strVal = "";
-          if (seqNo === 1) {
-            strVal = this.sfdctimehistQuery.enteredby;
-          } else if (seqNo === 2) {
-            strVal = this.sfdctimehistQuery.tillenteredby;
-          }
-          this.$refs.baseList.init(val, strVal);
-        })
-      },
-      /*列表方法的回调*/
-      getBaseData(val) {
-        if (this.tagNo === 1 && this.seqNo == 1) {
-          this.sfdctimehistQuery.enteredby = val.username;
-        } else if (this.tagNo === 1 && this.seqNo == 2) {
-          this.sfdctimehistQuery.tillenteredby = val.username;
-        }
-      },
-      // 获取数据列表
-      getDataList() {
-        this.dataListLoading = true
-        orderTimeHistReportList(this.sfdctimehistQuery).then(({data}) => {
-          if (data && data.code === 0) {
-            this.dataList = data.data
-          } else {
-            this.dataList = []
-          }
-          this.dataListLoading = false
-        })
-      },
-      // 删除工单生产记录
-      deleteHist(val) {
-        this.$confirm(`确定进行删除操作?`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          deleteOrderHist(val).then(({data}) => {
-            if (data && data.code == 0) {
-              this.$message.success(data.msg)
-              this.getDataList()
-            } else {
-              this.$message.warning(data.msg)
-            }
-          })
-        }).catch(() => {
-        })
-      },
-      // 新增 / 修改
-      addOrUpdateHandle(val) {
-        this.addOrUpdateVisible = true
-        this.$nextTick(() => {
-          this.$refs.shUpdate.init(val)
-        })
-      },
-
-      // 打开页面设置
-      userSetting() {
-        this.visible = true;
-        this.$nextTick(() => {
-          this.$refs.column.init(this.queryTable);
-        });
-      },
-      // 获取 用户保存的 格式列
-      getTableUserColumn() {
-        getTableUserListLanguage(this.queryTable).then(({data}) => {
-          if (data.code == 0 && data.rows.length > 0) {
-            this.columnList = data.rows
-          } else {
-            this.getColumnList()
-          }
-        })
-      },
-      // 获取 tableDefault 列
-      getColumnList() {
-        getTableDefaultListLanguage(this.queryTable).then(({data}) => {
-          if (data.code == 0 && data.rows.length > 0) {
-            this.columnList = data.rows
-          }
-        })
-      },
-      // 保存 默认配置 列
-      async saveColumnList() {
-        // 删除所有的该页面下保存的数据
-        if (this.userColumnList) {
-          //删除 user自定义的数据
-          await removerUser(this.queryTable)
-        }
-        // 删除默认配置
-        await removerDefault(this.queryTable)
-        // 保存页面 table属性
-        let sumColumnList = this.columnList;
-        sumColumnList = sumColumnList.map(item => {
-          return item = {
-            tableId: item.tableId,
-            tableName: item.tableName,
-            columnProp: item.columnProp,
-            columnLabel: item.columnLabel,
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            columnWidth: item.columnWidth,
-            format: item.format,
-            functionId: this.$route.meta.menuId,
-            sortLv: item.sortLv,
-            status: true,
-            fixed: item.fixed,
-            serialNumber: item.serialNumber,
-            columnType: item.columnType,
-            align: item.align
-          }
-        })
-        await saveTableDefaultList(sumColumnList)
-        this.getColumnList()
-      },
-      // 导出
-      fields() {
-        let json = "{"
-        this.columnList.forEach((item, index) => {
-          if (index == this.columnList.length - 1) {
-            json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\""
-          } else {
-            json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\"" + ","
-          }
-        })
-        json += "}"
-        let s = eval("(" + json + ")")
-        return s
-      },
-      createExportData() {
-        // 点击导出按钮之后,开始导出数据之前的执行函数,返回值为需要下载的数据
-        return this.dataList;
-      },
-    },
-    created() {
-      this.getTableUserColumn()
-    }
-  }
-</script>
diff --git a/src/views/modules/shoporder/shoporder.vue b/src/views/modules/shoporder/shoporder.vue
deleted file mode 100644
index f212805..0000000
--- a/src/views/modules/shoporder/shoporder.vue
+++ /dev/null
@@ -1,503 +0,0 @@
-<template>
-  <div class="mod-config">
-    <el-row>
-      <el-col :span="24">
-        <el-button type="primary" @click="getDataList()">查询</el-button>
-        <download-excel
-          :fields="fields()"
-          type="xls"
-          :name="exportName"
-          :fetch="createExportData"
-          worksheet="导出信息"
-          class="el-button el-button--primary el-button--medium">
-          {{ '导出' }}
-        </download-excel>
-        <el-button @click="userSetting" type="primary">{{ '设置表格栏位'}}</el-button>
-        <el-button v-if="userDev" @click="saveColumnList()" type="primary">{{ '保存栏位信息' }}</el-button>
-      </el-col>
-    </el-row>
-    <el-row>
-      <el-col :span="24">
-        <el-form :inline="true" label-position="top" :model="queryForm" @keyup.enter.native="getDataList()">
-          <el-form-item label="生产订单号">
-            <el-input v-model="queryForm.orderNo" ></el-input>
-          </el-form-item>
-          <el-form-item label="项目号">
-            <el-input v-model="queryForm.typeDesignation" clearable></el-input>
-          </el-form-item>
-          <el-form-item label="料号">
-            <el-input v-model="queryForm.partNo" clearable></el-input>
-          </el-form-item>
-          <el-form-item label="加工中心">
-            <el-input v-model="queryForm.workCenterNo" clearable></el-input>
-          </el-form-item>
-        </el-form>
-      </el-col>
-    </el-row>
-    <el-row>
-      <el-col :span="24">
-        <el-table
-          :data="dataList"
-          border
-          :height="this.height"
-          highlight-current-row
-          :summary-method="getSummaries"
-          show-summary
-          v-loading="dataListLoading"
-          style="width: 100%;">
-          <el-table-column
-            v-for="(item,index) in columnList" :key="index"
-            :sortable="item.columnSortable"
-            :prop="item.columnProp"
-            :header-align="item.headerAlign"
-            :show-overflow-tooltip="item.showOverflowTooltip"
-            :align="item.align"
-            :fixed="item.fixed==''?false:item.fixed"
-            :width="item.columnWidth"
-            :label="item.columnLabel">
-            <template slot-scope="scope">
-              <span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
-              <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
-                                                 style="width: 100px; height: 80px"/></span>
-            </template>
-          </el-table-column>
-        </el-table>
-      </el-col>
-    </el-row>
-    <!-- 动态列    -->
-    <column v-if="visible" ref="column" @refreshData="getTableUserColumn" v-drag></column>
-  </div>
-</template>
-
-<script>
-  import column from "../common/column";
-  import {getShopOrderList} from '@/api/shoporder/shoporder.js'
-  import pubsub from "pubsub-js";
-  import {
-    saveTableDefaultList,
-    getTableDefaultListLanguage,
-    getTableUserListLanguage,
-    removerDefault,
-    removerUser
-  } from "@/api/table.js"
-
-  export default {
-    data() {
-      return {
-        height: 0,
-        queryForm: {
-          typeDesignation: '',
-          orderNo: '',
-          workCenterNo: '',
-          partNo: '',
-          projectStatus: '',
-          status: '',
-          contract: this.$store.state.user.site
-        },
-        dataList: [],
-        columnList: [
-          {
-            tableId: "ShopOrder",
-            tableName: this.$route.meta.title,
-            columnProp: "typeDesignation",
-            columnLabel: "项目号",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            columnWidth: null,
-            format: null,
-            functionId: this.$route.meta.menuId,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            serialNumber: null,
-            columnType: null,
-            align: null
-          },
-          {
-            tableId: "ShopOrder",
-            tableName: this.$route.meta.title,
-            columnProp: "partNo",
-            columnLabel: "料号",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            columnWidth: null,
-            format: null,
-            functionId: this.$route.meta.menuId,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            serialNumber: null,
-            columnType: null,
-            align: null
-          },
-          {
-            tableId: "ShopOrder",
-            tableName: this.$route.meta.title,
-            columnProp: "partDesc",
-            columnLabel: "物料描述",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            columnWidth: null,
-            format: null,
-            functionId: this.$route.meta.menuId,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            serialNumber: null,
-            columnType: null,
-            align: null
-          },
-          {
-            tableId: "ShopOrder",
-            tableName: this.$route.meta.title,
-            columnProp: "orderNo",
-            columnLabel: "订单号",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            columnWidth: null,
-            format: null,
-            functionId: this.$route.meta.menuId,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            serialNumber: null,
-            columnType: null,
-            align: null
-          },
-          {
-            tableId: "ShopOrder",
-            tableName: this.$route.meta.title,
-            columnProp: "releaseNo",
-            columnLabel: "下达号",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            columnWidth: null,
-            format: null,
-            functionId: this.$route.meta.menuId,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            serialNumber: null,
-            columnType: null,
-            align: null
-          },
-          {
-            tableId: "ShopOrder",
-            tableName: this.$route.meta.title,
-            columnProp: "sequenceNo",
-            columnLabel: "次序号",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            columnWidth: null,
-            format: null,
-            functionId: this.$route.meta.menuId,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            serialNumber: null,
-            columnType: null,
-            align: null
-          },
-          {
-            tableId: "ShopOrder",
-            tableName: this.$route.meta.title,
-            columnProp: "operationNo",
-            columnLabel: "工序号",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            columnWidth: null,
-            format: null,
-            functionId: this.$route.meta.menuId,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            serialNumber: null,
-            columnType: null,
-            align: null
-          },
-          {
-            tableId: "ShopOrder",
-            tableName: this.$route.meta.title,
-            columnProp: "operationDescription",
-            columnLabel: "工序描述",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            columnWidth: null,
-            format: null,
-            functionId: this.$route.meta.menuId,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            serialNumber: null,
-            columnType: null,
-            align: null
-          },
-
-          {
-            tableId: "ShopOrder",
-            tableName: this.$route.meta.title,
-            columnProp: "workCenterNo",
-            columnLabel: "加工中心",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            columnWidth: null,
-            format: null,
-            functionId: this.$route.meta.menuId,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            serialNumber: null,
-            columnType: null,
-            align: null
-          },
-          {
-            tableId: "ShopOrder",
-            tableName: this.$route.meta.title,
-            columnProp: "workCenterDesc",
-            columnLabel: "加工中心描述",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            columnWidth: null,
-            format: null,
-            functionId: this.$route.meta.menuId,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            serialNumber: null,
-            columnType: null,
-            align: null
-          },
-
-          {
-            tableId: "ShopOrder",
-            tableName: this.$route.meta.title,
-            columnProp: "totalTime",
-            columnLabel: "生产时长(分钟)",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            columnWidth: 100,
-            format: null,
-            functionId: this.$route.meta.menuId,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            serialNumber: null,
-            columnType: null,
-            align: 'right'
-          },
-          {
-            tableId: "ShopOrder",
-            tableName: this.$route.meta.title,
-            columnProp: "totalQty",
-            columnLabel: "完工数量",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            columnWidth: null,
-            format: null,
-            functionId: this.$route.meta.menuId,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            serialNumber: null,
-            columnType: null,
-            align: 'right'
-          },
-          {
-            tableId: "ShopOrder",
-            tableName: this.$route.meta.title,
-            columnProp: "startDate",
-            columnLabel: "开始时间",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            columnWidth: 130,
-            format: null,
-            functionId: this.$route.meta.menuId,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            serialNumber: null,
-            columnType: null,
-            align: null
-          },
-          {
-            tableId: "ShopOrder",
-            tableName: this.$route.meta.title,
-            columnProp: "finishDate",
-            columnLabel: "结束时间",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            columnWidth: 130,
-            format: null,
-            functionId: this.$route.meta.menuId,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            serialNumber: null,
-            columnType: null,
-            align: null
-          },
-        ],
-        visible: false,
-        userDev: this.$store.state.user.userDev,
-        queryTable: {
-          userId: this.$store.state.user.name,
-          functionId: this.$route.meta.menuId,
-          tableId: "ShopOrder",
-          languageCode: this.$i18n.locale
-        },
-        dataListLoading: false,
-        exportName: '订单生产汇总' + this.dayjs().format("YYYY-MM-DD HHmmss")
-      }
-    },
-    components: {
-      column,
-    },
-    mounted() {
-      this.$nextTick(() => {
-        this.height = window.innerHeight - 180;
-      })
-    },
-    activated() {
-      // 检查功能 用户是否收藏
-      pubsub.publish('favorite')
-    },
-    methods: {
-      // 表位合计
-      getSummaries(param) {
-        const {columns, data} = param;
-        const sums = [];
-        columns.forEach((column, index) => {
-          if (index === 0) {
-            sums[index] = '合计';
-            return;
-          }
-          const values = data.map(item => Number(item[column.property]));
-          if (!values.every(value => isNaN(value))) {
-            if (columns[index].property == 'totalQty'
-              || columns[index].property == 'totalTime'
-              || columns[index].property == 'totalCost' ) {
-              sums[index] = values.reduce((prev, curr) => {
-                const value = Number(curr);
-                if (!isNaN(value)) {
-                  return prev + curr;
-                } else {
-                  return prev;
-                }
-              }, 0);
-            } else {
-              sums[index] = ' ';
-            }
-          }
-        });
-
-        return sums;
-      },
-      // 获取数据列表
-      getDataList() {
-        this.dataListLoading = true
-        getShopOrderList(this.queryForm).then(({data}) => {
-          if (data && data.code === 0) {
-            this.dataList = data.data
-          } else {
-            this.dataList = []
-          }
-          this.dataListLoading = false
-        })
-      },
-      // 打开页面设置
-      userSetting() {
-        this.visible = true;
-        this.$nextTick(() => {
-          this.$refs.column.init(this.queryTable);
-        });
-      },
-      // 获取 用户保存的 格式列
-      getTableUserColumn() {
-        getTableUserListLanguage(this.queryTable).then(({data}) => {
-          if (data.code == 0 && data.rows.length > 0) {
-            this.columnList = data.rows
-          } else {
-            this.getColumnList()
-          }
-        })
-      },
-      // 获取 tableDefault 列
-      getColumnList() {
-        getTableDefaultListLanguage(this.queryTable).then(({data}) => {
-          if (data.code == 0 && data.rows.length > 0) {
-            this.columnList = data.rows
-          }
-        })
-      },
-      // 保存 默认配置 列
-      async saveColumnList() {
-        // 删除所有的该页面下保存的数据
-        if (this.userColumnList) {
-          //删除 user自定义的数据
-          await removerUser(this.queryTable)
-        }
-        // 删除默认配置
-        await removerDefault(this.queryTable)
-        // 保存页面 table属性
-        let sumColumnList = this.columnList;
-        sumColumnList = sumColumnList.map(item => {
-          return item = {
-            tableId: item.tableId,
-            tableName: item.tableName,
-            columnProp: item.columnProp,
-            columnLabel: item.columnLabel,
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            columnWidth: item.columnWidth,
-            format: item.format,
-            functionId: this.$route.meta.menuId,
-            sortLv: item.sortLv,
-            status: true,
-            fixed: item.fixed,
-            serialNumber: item.serialNumber,
-            columnType: item.columnType,
-            align: item.align
-          }
-        })
-        await saveTableDefaultList(sumColumnList)
-        this.getColumnList()
-      },
-      // 导出
-      fields() {
-        let json = "{"
-        this.columnList.forEach((item, index) => {
-          if (index == this.columnList.length - 1) {
-            json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\""
-          } else {
-            json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\"" + ","
-          }
-        })
-        json += "}"
-        let s = eval("(" + json + ")")
-        return s
-      },
-      createExportData() {
-        // 点击导出按钮之后,开始导出数据之前的执行函数,返回值为需要下载的数据
-        return this.dataList;
-      },
-    },
-    created() {
-      this.getTableUserColumn()
-    }
-  }
-</script>
diff --git a/src/views/modules/shoporder/shoporderhist.vue b/src/views/modules/shoporder/shoporderhist.vue
deleted file mode 100644
index 5aa114b..0000000
--- a/src/views/modules/shoporder/shoporderhist.vue
+++ /dev/null
@@ -1,452 +0,0 @@
-<template>
-  <div class="mod-config">
-    <el-row>
-      <el-col :span="24">
-        <el-button type="primary" @click="getDataList()">查询</el-button>
-        <download-excel
-          :fields="fields()"
-          type="xls"
-          :name="exportName"
-          :fetch="createExportData"
-          worksheet="导出信息"
-          class="el-button el-button--primary el-button--medium">
-          {{ '导出' }}
-        </download-excel>
-        <el-button @click="userSetting" type="primary">{{ '设置表格栏位'}}</el-button>
-        <el-button v-if="userDev" @click="saveColumnList()" type="primary">{{ '保存栏位信息' }}</el-button>
-      </el-col>
-    </el-row>
-    <el-row>
-      <el-col :span="24">
-        <el-form :inline="true" label-position="top" :model="queryForm" @keyup.enter.native="getDataList()">
-          <el-form-item label="生产订单号">
-            <el-input v-model="queryForm.orderNo" ></el-input>
-          </el-form-item>
-          <el-form-item label="项目号">
-            <el-input v-model="queryForm.projectNo" clearable></el-input>
-          </el-form-item>
-          <el-form-item label="料号">
-            <el-input v-model="queryForm.partNo" clearable></el-input>
-          </el-form-item>
-          <el-form-item label="加工中心">
-            <el-input v-model="queryForm.workCenterNo" clearable></el-input>
-          </el-form-item>
-          <el-form-item>
-            <el-checkbox style="margin-top: 20px" v-model="queryForm.status">只显示未结束的项目</el-checkbox>
-          </el-form-item>
-        </el-form>
-      </el-col>
-    </el-row>
-    <el-row>
-      <el-col :span="24">
-        <el-table
-          :data="dataList"
-          border
-          :height="this.height"
-          highlight-current-row
-          :summary-method="getSummaries"
-          show-summary
-          v-loading="dataListLoading"
-          style="width: 100%;">
-          <el-table-column
-            v-for="(item,index) in columnList" :key="index"
-            :sortable="item.columnSortable"
-            :prop="item.columnProp"
-            :header-align="item.headerAlign"
-            :show-overflow-tooltip="item.showOverflowTooltip"
-            :align="item.align"
-            :fixed="item.fixed==''?false:item.fixed"
-            :width="item.columnWidth"
-            :label="item.columnLabel">
-            <template slot-scope="scope">
-              <span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
-              <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
-                                                 style="width: 100px; height: 80px"/></span>
-            </template>
-          </el-table-column>
-        </el-table>
-      </el-col>
-    </el-row>
-    <!-- 动态列    -->
-    <column v-if="visible" ref="column" @refreshData="getTableUserColumn" v-drag></column>
-  </div>
-</template>
-
-<script>
-  import column from "../common/column";
-  import {shoporderhistList} from '@/api/shoporder/shoporderhist.js'
-  import pubsub from "pubsub-js";
-  import {
-    saveTableDefaultList,
-    getTableDefaultListLanguage,
-    getTableUserListLanguage,
-    removerDefault,
-    removerUser
-  } from "@/api/table.js"
-  import AddOrUpdate from "../projectman/projectinfo-add-or-update";
-
-  export default {
-    data() {
-      return {
-        height: 0,
-        queryForm: {
-          projectNo: '',
-          orderNo: '',
-          workCenterNo: '',
-          partNo: '',
-          projectStatus: '',
-          status: '',
-          site: this.$store.state.user.site
-        },
-        dataList: [],
-        columnList: [
-          {
-            tableId: "ShopOrderHist",
-            tableName: this.$route.meta.title,
-            columnProp: "projectNo",
-            columnLabel: "项目号",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            columnWidth: null,
-            format: null,
-            functionId: this.$route.meta.menuId,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            serialNumber: null,
-            columnType: null,
-            align: null
-          },
-          {
-            tableId: "ShopOrderHist",
-            tableName: this.$route.meta.title,
-            columnProp: "orderNo",
-            columnLabel: "订单号",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            columnWidth: null,
-            format: null,
-            functionId: this.$route.meta.menuId,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            serialNumber: null,
-            columnType: null,
-            align: null
-          },
-          {
-            tableId: "ShopOrderHist",
-            tableName: this.$route.meta.title,
-            columnProp: "orderRef1",
-            columnLabel: "下达号",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            columnWidth: null,
-            format: null,
-            functionId: this.$route.meta.menuId,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            serialNumber: null,
-            columnType: null,
-            align: null
-          },
-          {
-            tableId: "ShopOrderHist",
-            tableName: this.$route.meta.title,
-            columnProp: "orderRef2",
-            columnLabel: "次序号",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            columnWidth: null,
-            format: null,
-            functionId: this.$route.meta.menuId,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            serialNumber: null,
-            columnType: null,
-            align: null
-          },
-          {
-            tableId: "ShopOrderHist",
-            tableName: this.$route.meta.title,
-            columnProp: "itemNo",
-            columnLabel: "工序号",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            columnWidth: null,
-            format: null,
-            functionId: this.$route.meta.menuId,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            serialNumber: null,
-            columnType: null,
-            align: null
-          },
-          {
-            tableId: "ShopOrderHist",
-            tableName: this.$route.meta.title,
-            columnProp: "partNo",
-            columnLabel: "料号",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            columnWidth: null,
-            format: null,
-            functionId: this.$route.meta.menuId,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            serialNumber: null,
-            columnType: null,
-            align: null
-          },
-          {
-            tableId: "ShopOrderHist",
-            tableName: this.$route.meta.title,
-            columnProp: "workCenterNo",
-            columnLabel: "加工中心",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            columnWidth: null,
-            format: null,
-            functionId: this.$route.meta.menuId,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            serialNumber: null,
-            columnType: null,
-            align: null
-          },
-          {
-            tableId: "ShopOrderHist",
-            tableName: this.$route.meta.title,
-            columnProp: "startDate",
-            columnLabel: "开始时间",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            columnWidth: 130,
-            format: null,
-            functionId: this.$route.meta.menuId,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            serialNumber: null,
-            columnType: null,
-            align: null
-          },
-          {
-            tableId: "ShopOrderHist",
-            tableName: this.$route.meta.title,
-            columnProp: "finishDate",
-            columnLabel: "结束时间",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            columnWidth: 130,
-            format: null,
-            functionId: this.$route.meta.menuId,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            serialNumber: null,
-            columnType: null,
-            align: null
-          },
-          {
-            tableId: "ShopOrderHist",
-            tableName: this.$route.meta.title,
-            columnProp: "totalTime",
-            columnLabel: "生产时长(分钟)",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            columnWidth: 100,
-            format: null,
-            functionId: this.$route.meta.menuId,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            serialNumber: null,
-            columnType: null,
-            align: 'right'
-          },
-          {
-            tableId: "ShopOrderHist",
-            tableName: this.$route.meta.title,
-            columnProp: "totalQty",
-            columnLabel: "完工数量",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            columnWidth: null,
-            format: null,
-            functionId: this.$route.meta.menuId,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            serialNumber: null,
-            columnType: null,
-            align: 'right'
-          }
-        ],
-        visible: false,
-        userDev: this.$store.state.user.userDev,
-        queryTable: {
-          userId: this.$store.state.user.name,
-          functionId: this.$route.meta.menuId,
-          tableId: "ShopOrderHist",
-          languageCode: this.$i18n.locale
-        },
-        dataListLoading: false,
-        exportName: '订单生产汇总' + this.dayjs().format("YYYY-MM-DD HHmmss")
-      }
-    },
-    components: {
-      column,
-    },
-    mounted() {
-      this.$nextTick(() => {
-        this.height = window.innerHeight - 180;
-      })
-    },
-    activated() {
-      // 检查功能 用户是否收藏
-      pubsub.publish('favorite')
-    },
-    methods: {
-      // 表位合计
-      getSummaries(param) {
-        const {columns, data} = param;
-        const sums = [];
-        columns.forEach((column, index) => {
-          if (index === 0) {
-            sums[index] = '合计';
-            return;
-          }
-          const values = data.map(item => Number(item[column.property]));
-          if (!values.every(value => isNaN(value))) {
-            if (columns[index].property == 'totalQty'
-              || columns[index].property == 'totalTime'
-              || columns[index].property == 'totalCost' ) {
-              sums[index] = values.reduce((prev, curr) => {
-                const value = Number(curr);
-                if (!isNaN(value)) {
-                  return prev + curr;
-                } else {
-                  return prev;
-                }
-              }, 0);
-            } else {
-              sums[index] = ' ';
-            }
-          }
-        });
-
-        return sums;
-      },
-      // 获取数据列表
-      getDataList() {
-        this.dataListLoading = true
-        this.queryForm.projectStatus = this.queryForm.status ? 'Y' : ''
-        shoporderhistList(this.queryForm).then(({data}) => {
-          if (data && data.code === 0) {
-            this.dataList = data.data
-          } else {
-            this.dataList = []
-          }
-          this.dataListLoading = false
-        })
-      },
-      // 打开页面设置
-      userSetting() {
-        this.visible = true;
-        this.$nextTick(() => {
-          this.$refs.column.init(this.queryTable);
-        });
-      },
-      // 获取 用户保存的 格式列
-      getTableUserColumn() {
-        getTableUserListLanguage(this.queryTable).then(({data}) => {
-          if (data.code == 0 && data.rows.length > 0) {
-            this.columnList = data.rows
-          } else {
-            this.getColumnList()
-          }
-        })
-      },
-      // 获取 tableDefault 列
-      getColumnList() {
-        getTableDefaultListLanguage(this.queryTable).then(({data}) => {
-          if (data.code == 0 && data.rows.length > 0) {
-            this.columnList = data.rows
-          }
-        })
-      },
-      // 保存 默认配置 列
-      async saveColumnList() {
-        // 删除所有的该页面下保存的数据
-        if (this.userColumnList) {
-          //删除 user自定义的数据
-          await removerUser(this.queryTable)
-        }
-        // 删除默认配置
-        await removerDefault(this.queryTable)
-        // 保存页面 table属性
-        let sumColumnList = this.columnList;
-        sumColumnList = sumColumnList.map(item => {
-          return item = {
-            tableId: item.tableId,
-            tableName: item.tableName,
-            columnProp: item.columnProp,
-            columnLabel: item.columnLabel,
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            columnWidth: item.columnWidth,
-            format: item.format,
-            functionId: this.$route.meta.menuId,
-            sortLv: item.sortLv,
-            status: true,
-            fixed: item.fixed,
-            serialNumber: item.serialNumber,
-            columnType: item.columnType,
-            align: item.align
-          }
-        })
-        await saveTableDefaultList(sumColumnList)
-        this.getColumnList()
-      },
-      // 导出
-      fields() {
-        let json = "{"
-        this.columnList.forEach((item, index) => {
-          if (index == this.columnList.length - 1) {
-            json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\""
-          } else {
-            json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\"" + ","
-          }
-        })
-        json += "}"
-        let s = eval("(" + json + ")")
-        return s
-      },
-      createExportData() {
-        // 点击导出按钮之后,开始导出数据之前的执行函数,返回值为需要下载的数据
-        return this.dataList;
-      },
-    },
-    created() {
-      this.getTableUserColumn()
-    }
-  }
-</script>
diff --git a/src/views/modules/workcenter/workcenter.vue b/src/views/modules/workcenter/workcenter.vue
deleted file mode 100644
index b7b1e36..0000000
--- a/src/views/modules/workcenter/workcenter.vue
+++ /dev/null
@@ -1,488 +0,0 @@
-<template>
-  <div class="mod-config">
-    <el-row>
-      <el-col :span=24>
-        <el-button v-if="isAuth('workcenter/workcenter:select')" type="primary" @click="getDataList()">查询</el-button>
-        <download-excel
-          :fields="fields()"
-          type="xls"
-          :name="exportName"
-          :fetch="createExportData"
-          worksheet="导出信息"
-          class="el-button el-button--primary el-button--medium">
-          {{ '导出' }}
-        </download-excel>
-        <el-button @click="userSetting" type="primary">{{ '设置表格栏位'}}</el-button>
-        <el-button v-if="userDev" @click="saveColumnList()" type="primary">{{ '保存栏位信息' }}</el-button>
-      </el-col>
-    </el-row>
-    <el-row>
-      <el-col :span=24>
-        <el-form :inline="true" label-position="top" :model="dataForm" @keyup.enter.native="getDataList()">
-          <el-form-item label="加工中心编码">
-            <el-input v-model="dataForm.workCenterNo" clearable></el-input>
-          </el-form-item>
-          <el-form-item label="加工中心名称">
-            <el-input v-model="dataForm.description" clearable></el-input>
-          </el-form-item>
-        </el-form>
-      </el-col>
-    </el-row>
-    <el-row>
-      <el-col :span=24>
-        <el-table
-          :height="height"
-          :data="dataList"
-          border
-          highlight-current-row
-          v-loading="dataListLoading"
-          style="width: 100%;">
-          <el-table-column
-            v-if="isAuth('workcenter/workcenter:user') || isAuth('workcenter/workcenter:save')"
-            fixed="left"
-            header-align="center"
-            align="center"
-            width="120"
-            label="操作">
-            <template slot-scope="scope">
-              <a type="text" v-if="isAuth('workcenter/workcenter:user')"  size="small" @click="userWorkCenterAuthorize(scope.row)">用户 | </a>
-              <a type="text" v-if="isAuth('workcenter/workcenter:save')" size="small" @click="beforeWorkCenterAuthorize(scope.row)"> 前置加工中心</a>
-            </template>
-          </el-table-column>
-          <el-table-column
-            v-for="(item,index) in columnList" :key="index"
-            :sortable="item.columnSortable"
-            :prop="item.columnProp"
-            :header-align="item.headerAlign"
-            :show-overflow-tooltip="item.showOverflowTooltip"
-            :align="item.align"
-            :fixed="item.fixed==''?false:item.fixed"
-            :width="item.columnWidth"
-            :label="item.columnLabel">
-            <template slot-scope="scope">
-              <span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
-              <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
-                                                 style="width: 100px; height: 80px"/></span>
-            </template>
-          </el-table-column>
-
-        </el-table>
-      </el-col>
-    </el-row>
-
-    <!-- 加工中心授权-->
-    <el-dialog
-      style="font-size: 12px"
-      @close="closeDialog"
-      v-drag
-      :title="'用户列表'"
-      :visible.sync="workCenterVisible"
-      width="620px"
-      :append-to-body="true">
-      <el-form class="rred" :inline="true" label-position="top">
-        <el-form-item label="加工中心编码">
-          <el-input readonly v-model="workCenter.workCenterNo"></el-input>
-        </el-form-item>
-        <el-form-item label="加工中心名称">
-          <el-input readonly v-model="workCenter.description"></el-input>
-        </el-form-item>
-      </el-form>
-      <el-transfer v-model="selectUserList" :data="userList" :titles="['未授权用户列表', '已授权用户列表']"></el-transfer>
-      <span slot="footer" class="dialog-footer">
-        <div style="margin-top: 5px">
-                <el-button type="primary" @click="saveUserWorkCenter()">确定</el-button>
-                <el-button @click="workCenterVisible = false" type="primary">取消</el-button>
-        </div>
-
-    </span>
-    </el-dialog>
-
-
-    <!-- 前置加工中心-->
-    <el-dialog
-      style="font-size: 12px"
-      @close="closeDialog"
-      v-drag
-      :title="'前置加工中心'"
-      :visible.sync="beforeCenterVisible"
-      width="620px"
-      :append-to-body="true">
-      <el-form class="rred" :inline="true" label-position="top">
-        <el-form-item label="加工中心编码">
-          <el-input readonly v-model="workCenter.workCenterNo"></el-input>
-        </el-form-item>
-        <el-form-item label="加工中心名称">
-          <el-input readonly v-model="workCenter.description"></el-input>
-        </el-form-item>
-      </el-form>
-      <el-transfer v-model="selectWorkCenterList" :data="workCenterList" :titles="['加工中心列表', '前置加工中心']"></el-transfer>
-      <span slot="footer" class="dialog-footer">
-        <div style="margin-top: 5px">
-                <el-button type="primary" @click="saveBeforeWorkCenter()">确定</el-button>
-                <el-button @click="beforeCenterVisible = false" type="primary">取消</el-button>
-        </div>
-
-    </span>
-    </el-dialog>
-    <!-- 动态列    -->
-    <column v-if="visible" ref="column" @refreshData="getTableUserColumn" v-drag></column>
-  </div>
-</template>
-
-<script>
-
-  import {workCenterList} from "@/api/ifsapp/ifsWorkCenter.js"
-  import {userWorkCenterList, saveBatchWorkCenterUser} from "@/api/userwork/userWorkCenter.js"
-  import {beforeWorkCenterList, saveBatchBeforeWorkCenter} from "@/api/userwork/beforeWorkCenter.js"
-  import {userList} from "@/api/user.js"
-  import pubsub from "pubsub-js";
-  import column from "../common/column";
-  import {
-    saveTableDefaultList,
-    getTableDefaultListLanguage,
-    getTableUserListLanguage,
-    removerDefault,
-    removerUser
-  } from "@/api/table.js"
-
-  export default {
-    data() {
-      return {
-        height: 0,
-        site: this.$store.state.user.site,
-        dataForm: {
-          contract: this.$store.state.user.site,
-          workCenterNo: '',
-          description: ''
-        },
-        dataList: [],
-        // 展示列集
-        columnList: [
-          {
-            tableId: "WorkCenter",
-            tableName: this.$route.meta.title,
-            columnProp: "workCenterNo",
-            columnLabel: "加工中心编码",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            columnWidth: 200,
-            format: null,
-            functionId: this.$route.meta.menuId,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            serialNumber: null,
-            columnType: null,
-            align: null
-          },
-          {
-            tableId: "WorkCenter",
-            tableName: this.$route.meta.title,
-            columnProp: "description",
-            columnLabel: "加工中心名称",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            columnWidth: null,
-            format: null,
-            functionId: this.$route.meta.menuId,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            serialNumber: null,
-            columnType: null,
-            align: null
-          },
-        ],
-        // 用户table 配置集合
-        visible: false,
-        userDev: this.$store.state.user.userDev,
-        userColumnList: [],
-        queryTable: {
-          userId: this.$store.state.user.name,
-          functionId: this.$route.meta.menuId,
-          tableId: "WorkCenter",
-          languageCode: this.$i18n.locale
-        },
-        workCenterVisible: false,
-        beforeCenterVisible: false,
-        workCenter: {},
-        userList: [],
-        selectUserList: [],
-        workCenterList: [],
-        selectWorkCenterList: [],
-        dataListLoading: false,
-        dataListSelections: [],
-        addOrUpdateVisible: false,
-        exportName: "加工中心" + this.dayjs().format('YYYYMMDDHHmmss')
-      }
-    },
-    components: {column,},
-    mounted() {
-      this.$nextTick(() => {
-        this.height = window.innerHeight - 200;
-      })
-    },
-    activated() {
-      // 检查功能 用户是否收藏
-      pubsub.publish('favorite')
-    },
-    methods: {
-      // 获取数据列表
-      getDataList() {
-        this.dataListLoading = true
-        workCenterList(this.dataForm).then(({data}) => {
-          if (data && data.code == 0) {
-            this.dataList = data.data
-          }
-        })
-        this.dataListLoading = false
-      },
-      // 前置加工中心
-      beforeWorkCenterAuthorize(row) {
-        this.beforeCenterVisible = true
-        this.workCenter = row
-        this.searchWorkCenterList()
-      },
-      // 获取加工中心列表
-      searchWorkCenterList() {
-        workCenterList({contract: this.site}).then(({data}) => {
-          if (data && data.code == 0) {
-            this.workCenterList = data.data.filter(item => item.workCenterNo != this.workCenter.workCenterNo).map(item => {
-              let newItem = {
-                key: item.workCenterNo,
-                label: item.workCenterNo + " - " + item.description,
-              }
-              return newItem
-            })
-            this.searchBeforeWorkCenterList()
-          }
-        })
-      },
-      // 获取已设置的前置加工中心
-      searchBeforeWorkCenterList() {
-        let dto = {
-          site: this.site,
-          workCenterNo: this.workCenter.workCenterNo
-        }
-        beforeWorkCenterList(dto).then(({data}) => {
-          if (data && data.code == 0) {
-            this.selectWorkCenterList = data.data.map(item => {
-              return item.superWorkCenterNo
-            })
-          }
-        })
-      },
-      // 保存设置的前置加工中心
-      saveBeforeWorkCenter() {
-        let beforeWorkCenterEntityList = this.selectWorkCenterList.map(item => {
-          let newItem = {
-            site: this.site,
-            workCenterNo: this.workCenter.workCenterNo,
-            superWorkCenterNo: item,
-            createdBy: this.userId
-          }
-          return newItem;
-        })
-        let dto = {
-          beforeWorkCenterEntityList: beforeWorkCenterEntityList,
-          site: this.site,
-          workCenterNo: this.workCenter.workCenterNo,
-        }
-        saveBatchBeforeWorkCenter(dto).then(({data}) => {
-          if (data && data.code == 0) {
-            this.$message.success('操作成功')
-            this.beforeCenterVisible = false;
-          } else {
-            this.$message.error(data.msg)
-          }
-        })
-      },
-      // 获取所有用户列表
-      userWorkCenterAuthorize(row) {
-        this.workCenterVisible = true
-        this.workCenter = row
-        this.searchUserList()
-      },
-      // 保存用户加工中心
-      saveUserWorkCenter() {
-        let workCenterList = this.selectUserList.map(item => {
-          let newItem = {
-            site: this.site,
-            userName: item,
-            workCenterNo: this.workCenter.workCenterNo,
-            createdBy: this.userId
-          }
-          return newItem;
-        })
-        let dto = {
-          workCenterList: workCenterList,
-          site: this.site,
-          workCenterNo: this.workCenter.workCenterNo
-        }
-        saveBatchWorkCenterUser(dto).then(({data}) => {
-          if (data && data.code == 0) {
-            this.$message.success('操作成功')
-            this.workCenterVisible = false;
-          } else {
-            this.$message.error(data.msg)
-          }
-        })
-      },
-      // 获取已授权的用列表
-      searchUserWorkCenterList() {
-        userWorkCenterList({site: this.site, workCenterNo: this.workCenter.workCenterNo}).then(({data}) => {
-          if (data && data.code == 0) {
-            this.selectUserList = data.data.map(item => {
-              return item.userName
-            })
-
-          }
-        })
-      },
-      // 获取所有用户列表
-      searchUserList() {
-        userList({site: this.site, status: 1}).then(({data}) => {
-          if (data && data.code == 0) {
-            this.userList = data.list.map(item => {
-              let newItem = {
-                key: item.username,
-                label: item.username + " - " + item.userDisplay,
-              }
-              return newItem
-            })
-            this.searchUserWorkCenterList()
-          }
-        })
-      },
-      // 关闭模态框
-      closeDialog() {
-        Object.assign(this.$data, this.$options.data())
-      },
-      // 打开页面设置
-      userSetting() {
-        this.visible = true;
-        this.$nextTick(() => {
-          this.$refs.column.init(this.queryTable);
-        });
-      },
-      // 获取 用户保存的 格式列
-      getTableUserColumn() {
-        getTableUserListLanguage(this.queryTable).then(({data}) => {
-          if (data.code == 0 && data.rows.length > 0) {
-            this.columnList = data.rows
-          } else {
-            this.getColumnList()
-          }
-        })
-      },
-      // 获取 tableDefault 列
-      getColumnList() {
-        getTableDefaultListLanguage(this.queryTable).then(({data}) => {
-          if (data.code == 0 && data.rows.length > 0) {
-            this.columnList = data.rows
-          }
-        })
-      },
-      // 保存 默认配置 列
-      async saveColumnList() {
-        // 删除所有的该页面下保存的数据
-        if (this.userColumnList) {
-          //删除 user自定义的数据
-          await removerUser(this.queryTable)
-        }
-        // 删除默认配置
-        await removerDefault(this.queryTable)
-        // 保存页面 table属性
-        let sumColumnList = this.columnList;
-        sumColumnList = sumColumnList.map(item => {
-          return item = {
-            tableId: item.tableId,
-            tableName: item.tableName,
-            columnProp: item.columnProp,
-            columnLabel: item.columnLabel,
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            columnWidth: item.columnWidth,
-            format: item.format,
-            functionId: this.$route.meta.menuId,
-            sortLv: item.sortLv,
-            status: true,
-            fixed: item.fixed,
-            serialNumber: item.serialNumber,
-            columnType: item.columnType,
-            align: item.align
-          }
-        })
-        await saveTableDefaultList(sumColumnList)
-        this.getColumnList()
-      },
-      // 导出
-      fields() {
-        let json = "{"
-        this.columnList.forEach((item, index) => {
-          if (index == this.columnList.length - 1) {
-            json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\""
-          } else {
-            json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\"" + ","
-          }
-        })
-        json += "}"
-        let s = eval("(" + json + ")")
-        return s
-      },
-      createExportData() {
-        // 点击导出按钮之后,开始导出数据之前的执行函数,返回值为需要下载的数据
-        return this.dataList;
-      },
-    },
-    created() {
-      this.getTableUserColumn()
-    }
-  }
-</script>
-<style>
-  .el-transfer-panel {
-    border: 2px solid #17b3a3;
-    border-radius: 4px;
-    overflow: hidden;
-    background: #fff;
-    display: inline-block;
-    vertical-align: middle;
-    width: 252px;
-    max-height: 100%;
-    -webkit-box-sizing: border-box;
-    box-sizing: border-box;
-    position: relative;
-  }
-
-  .el-transfer-panel .el-transfer-panel__header {
-    height: 40px;
-    line-height: 40px;
-    background: #17b3a3;
-    margin: 0;
-    padding-left: 15px;
-    border-bottom: 1px solid #17b3a3;
-    -webkit-box-sizing: border-box;
-    box-sizing: border-box;
-    color: #000;
-  }
-
-  .el-transfer-panel .el-transfer-panel__header .el-checkbox .el-checkbox__label {
-    font-size: 14px;
-    color: #303133;
-    font-weight: 400;
-  }
-
-  .el-dialog__title {
-    line-height: 24px;
-    font-size: 16px;
-    color: #303133;
-  }
-
-  .rred .el-input--medium .el-input__inner {
-    color: red;
-  }
-</style>