licp
2024-06-05 38febeef0511f6d8812a82f55f440567a2b39c10
人员管理bug
已修改2个文件
已添加3个文件
544 ■■■■■ 文件已修改
src/components/view/a6-external-personnel-management.vue 126 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/view/a6-standard-material-list.vue 138 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/view/a6-waste-handover.vue 272 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/view/person-manage.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
static/js/menu.js 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/view/a6-external-personnel-management.vue
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,126 @@
<style scoped>
  .title {
    height: 60px;
    line-height: 60px;
  }
  .search {
    background-color: #fff;
    height: 80px;
    display: flex;
    align-items: center;
  }
  .search_thing {
    display: flex;
    align-items: center;
    height: 50px;
  }
  .search_label {
    width: 80px;
    font-size: 14px;
    text-align: right;
  }
  .search_input {
    width: calc(100% - 120px);
  }
  .table {
    margin-top: 10px;
    background-color: #fff;
    width: calc(100% - 40px);
    height: calc(100% - 60px - 80px - 10px - 40px);
    padding: 20px;
  }
</style>
<template>
  <div class="below-standard-main">
    <div style="width: 100%;height: 100%;">
      <div>
        <el-row class="title">
          <el-col :span="12" style="padding-left: 20px;">外来人员管理</el-col>
          <el-col :span="12" style="text-align: right;">
                        <el-button size="medium" type="primary" @click="$refs['ValueTable'].openAddDia('新增接口')" v-if="addPower">新 å¢ž</el-button>
            <el-button size="medium" @click="$refs['ValueTable'].openDownDia()">导 å‡º</el-button>
                    </el-col>
        </el-row>
      </div>
      <div class="search">
        <div class="search_thing">
          <div class="search_label">日期:</div>
          <div class="search_input">
            <el-date-picker
              v-model="componentData.entity.sample"
              format="yyyy-MM-dd HH:mm:ss"
              value-format="yyyy-MM-dd HH:mm:ss"
              type="date"
              size="small"
              @change="refreshTable()"
              placeholder="选择日期">
            </el-date-picker>
          </div>
        </div>
        <div class="search_thing" style="padding-left: 30px;">
          <el-button size="small" @click="refresh()">重 ç½®</el-button>
          <el-button size="small" type="primary" @click="refreshTable()">查 è¯¢</el-button>
        </div>
      </div>
      <div class="table">
          <ValueTable ref="ValueTable" :url="$api.unPass.pageInsUnPass" :componentData="componentData"
          :key="upIndex" />
      </div>
    </div>
  </div>
</template>
<script>
  import ValueTable from '../tool/value-table.vue'
export default {
  components: {
    ValueTable,
  },
  data() {
    return {
        componentData: {
          entity: {
            sample: null,
            model: null,
            orderBy: {
              field: 'id',
              order: 'asc'
            }
          },
          isIndex: true,
          showSelect: false,
          select: false,
          do: [],
          tagField: [],
          selectField: [],
          requiredAdd: [],
          requiredUp: []
        },
        entityCopy: {},
        upIndex: 0,
        stateList: [],
        addPower:true,
      }
  },
  mounted() {
    this.entityCopy = this.HaveJson(this.componentData.entity)
    this.getPower()
  },
  methods :{
    refreshTable() {
        this.$refs['ValueTable'].selectList()
      },
    refresh() {
        this.componentData.entity = this.HaveJson(this.entityCopy)
        this.upIndex++
      },
    // æƒé™åˆ†é…
    getPower(radio) {
      let power = JSON.parse(sessionStorage.getItem('power'))
    },
  }
}
</script>
src/components/view/a6-standard-material-list.vue
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,138 @@
<style scoped>
  .title {
    height: 60px;
    line-height: 60px;
  }
  .search {
    background-color: #fff;
    height: 80px;
    display: flex;
    align-items: center;
  }
  .search_thing {
    display: flex;
    align-items: center;
    height: 50px;
  }
  .search_label {
    width: 120px;
    font-size: 14px;
    text-align: right;
  }
  .search_input {
    width: calc(100% - 120px);
  }
  .table {
    margin-top: 10px;
    background-color: #fff;
    width: calc(100% - 40px);
    height: calc(100% - 60px - 80px - 10px - 40px);
    padding: 20px;
  }
</style>
<template>
  <div class="below-standard-main">
    <div style="width: 100%;height: 100%;">
      <div>
        <el-row class="title">
          <el-col :span="12" style="padding-left: 20px;">标准物质清单</el-col>
          <el-col :span="12" style="text-align: right;">
                        <el-button size="medium" type="primary" @click="$refs['ValueTable'].openAddDia('新增接口')" v-if="addPower">新 å¢ž</el-button>
            <el-button size="medium" @click="$refs['ValueTable'].openDownDia()">导 å‡º</el-button>
                    </el-col>
        </el-row>
      </div>
      <div class="search">
        <div class="search_thing">
          <div class="search_label">名称:</div>
          <div class="search_input">
              <el-input size="small" placeholder="请输入" clearable v-model="componentData.entity.model"
                        @keyup.enter.native="refreshTable()"></el-input></div>
        </div>
        <div class="search_thing">
          <div class="search_label">生产厂家:</div>
          <div class="search_input">
            <el-input size="small" placeholder="请输入" clearable v-model="componentData.entity.sample"
              @keyup.enter.native="refreshTable()"></el-input>
          </div>
        </div>
        <div class="search_thing" style="padding-left: 30px;">
          <el-button size="small" @click="refresh()">重 ç½®</el-button>
          <el-button size="small" type="primary" @click="refreshTable()">查 è¯¢</el-button>
        </div>
      </div>
      <div class="table">
          <ValueTable ref="ValueTable" :url="$api.unPass.pageInsUnPass" :componentData="componentData"
          :key="upIndex" />
      </div>
    </div>
  </div>
</template>
<script>
  import ValueTable from '../tool/value-table.vue'
export default {
  components: {
    ValueTable,
  },
  data() {
    return {
        componentData: {
          entity: {
            sample: null,
            model: null,
            orderBy: {
              field: 'id',
              order: 'asc'
            }
          },
          isIndex: true,
          showSelect: false,
          select: false,
          do: [
            {
              id: 'update',
              font: '编辑',
              type: 'text',
              method: 'doDiy',
              field:['createUserName','updateUserName']
            },{
              id: 'delete',
              font: '删除',
              type: 'text',
              method: 'doDiy'
            }
          ],
          tagField: [],
          selectField: [],
          requiredAdd: ['model','sample',],
          requiredUp: []
        },
        entityCopy: {},
        upIndex: 0,
        stateList: [],
        addPower:true,
      }
  },
  mounted() {
    this.entityCopy = this.HaveJson(this.componentData.entity)
    this.getPower()
  },
  methods :{
    refreshTable() {
        this.$refs['ValueTable'].selectList()
      },
    refresh() {
        this.componentData.entity = this.HaveJson(this.entityCopy)
        this.upIndex++
      },
    // æƒé™åˆ†é…
    getPower(radio) {
      let power = JSON.parse(sessionStorage.getItem('power'))
    },
  }
}
</script>
src/components/view/a6-waste-handover.vue
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,272 @@
<style scoped>
  .title {
    height: 60px;
    line-height: 60px;
  }
  .search {
    background-color: #fff;
    height: 80px;
    display: flex;
    align-items: center;
  }
  .search_thing {
    display: flex;
    align-items: center;
    height: 50px;
  }
  .search_label {
    width: 100px;
    font-size: 14px;
    text-align: right;
  }
  .search_input {
    width: calc(100% - 120px);
  }
  .table {
    margin-top: 10px;
    background-color: #fff;
    width: calc(100% - 40px);
    padding: 20px;
  }
  .standard-main{
    overflow-y: auto;
    scrollbar-width: none;
  }
</style>
<template>
  <div class="standard-main">
    <div style="width: 100%;height: 100%;">
      <div>
        <el-row class="title">
          <el-col :span="12" style="padding-left: 20px;">废物处理交接记录</el-col>
          <el-col :span="12" style="text-align: right;">
                        <el-button size="medium" type="primary" @click="$refs['ValueTable'].openAddDia('新增接口')" v-if="addPower">新 å¢ž</el-button>
            <el-button size="medium" type="primary" @click="openAddDetail" v-if="addPower">新增明细</el-button>
            <el-button size="medium" @click="$refs['ValueTable'].openDownDia()">导 å‡º</el-button>
                    </el-col>
        </el-row>
      </div>
      <div class="search">
        <div class="search_thing">
          <div class="search_label">日期:</div>
          <div class="search_input">
            <el-date-picker
              v-model="componentData.entity.sample"
              format="yyyy-MM-dd HH:mm:ss"
              value-format="yyyy-MM-dd HH:mm:ss"
              type="date"
              size="small"
              @change="refreshTable()"
              placeholder="选择日期">
            </el-date-picker>
          </div>
        </div>
        <div class="search_thing" style="padding-left: 30px;">
          <el-button size="small" @click="refresh()">重 ç½®</el-button>
          <el-button size="small" type="primary" @click="refreshTable()">查 è¯¢</el-button>
        </div>
      </div>
      <div class="table">
        <el-table
            :data="tableData"
            style="width: 100%;margin-bottom: 10px;"
            height="200px">
            <el-table-column
              prop="value0"
              label="文件编码"
              width="180">
            </el-table-column>
            <el-table-column
              prop="value1"
              label="NO:"
              width="180">
            </el-table-column>
            <el-table-column
              prop="value2"
              label="录入日期">
            </el-table-column>
            <el-table-column
              prop="value3"
              label="录入人">
            </el-table-column>
            <el-table-column
              prop="value4"
              label="更新人">
            </el-table-column>
            <el-table-column
              prop="value5"
              label="更新时间">
            </el-table-column>
          </el-table>
          <ValueTable ref="ValueTable" :url="$api.unPass.pageInsUnPass" :componentData="componentData"
          :key="upIndex" style="height: 400px;" />
      </div>
    </div>
    <el-dialog title="明细新增" :visible.sync="addDetailVisible" width="400px">
      <div class="body" style="max-height: 60vh;">
        <el-row>
          <el-col class="search_thing" :span="22">
            <div class="search_label"><span class="required-span">* </span>名称:</div>
            <div class="search_input">
              <el-input v-model="form.value0" size="small" placeholder="请输入"></el-input>
            </div>
          </el-col>
          <el-col class="search_thing" :span="22">
            <div class="search_label"><span class="required-span">* </span>体积:</div>
            <div class="search_input">
              <el-input v-model="form.value1" size="small" placeholder="请输入"></el-input>
            </div>
          </el-col>
          <el-col class="search_thing" :span="22">
            <div class="search_label">送处理日期:</div>
            <div class="search_input">
              <el-date-picker
              v-model="form.value2"
              type="date"
              size="small"
              format="yyyy-MM-dd HH:mm:ss"
              value-format="yyyy-MM-dd HH:mm:ss"
              placeholder="选择日期"
              style="width: 100%;">
            </el-date-picker>
            </div>
          </el-col>
          <el-col class="search_thing" :span="22">
            <div class="search_label">移交人:</div>
            <div class="search_input">
              <el-select v-model="form.value3" placeholder="请选择" size="small" style="width: 100%;">
                <el-option
                  v-for="item in personList"
                  :key="item.value"
                  :label="item.label"
                  :value="item.value">
                </el-option>
              </el-select>
            </div>
          </el-col>
          <el-col class="search_thing" :span="22">
            <div class="search_label">接收人:</div>
            <div class="search_input">
              <el-select v-model="form.value3" placeholder="请选择" size="small" style="width: 100%;">
                <el-option
                  v-for="item in personList"
                  :key="item.value"
                  :label="item.label"
                  :value="item.value">
                </el-option>
              </el-select>
            </div>
          </el-col>
          <el-col class="search_thing" :span="22">
            <div class="search_label">接收单位:</div>
            <div class="search_input">
              <el-select v-model="form.value3" placeholder="请选择" size="small" style="width: 100%;">
                <el-option
                  v-for="item in compList"
                  :key="item.value"
                  :label="item.label"
                  :value="item.value">
                </el-option>
              </el-select>
            </div>
          </el-col>
        </el-row>
      </div>
      <span slot="footer" class="dialog-footer">
        <el-row>
          <el-button @click="noDialogVisible=false,tell=''">取 æ¶ˆ</el-button>
          <el-button type="primary" @click="addDetail" :loading="addDetailLoading">ç¡® å®š</el-button>
        </el-row>
      </span>
    </el-dialog>
  </div>
</template>
<script>
  import ValueTable from '../tool/value-table.vue'
export default {
  components: {
    ValueTable,
  },
  data() {
    return {
        componentData: {
          entity: {
            sample: null,
            model: null,
            orderBy: {
              field: 'id',
              order: 'asc'
            }
          },
          isIndex: true,
          showSelect: false,
          select: false,
          do: [
            {
              id: 'update',
              font: '编辑',
              type: 'text',
              method: 'doDiy',
              field:['createUserName','updateUserName']
            },{
              id: 'delete',
              font: '删除',
              type: 'text',
              method: 'doDiy'
            }
          ],
          tagField: [],
          selectField: [],
          requiredAdd: ['model','sample',],
          requiredUp: []
        },
        tableData:[],
        entityCopy: {},
        upIndex: 0,
        stateList: [],
        addPower:true,
        addDetailLoading:false,
        addDetailVisible:false,
        form:{},
        personList:[],
        compList:[]
      }
  },
  mounted() {
    this.entityCopy = this.HaveJson(this.componentData.entity)
    this.getPower()
  },
  methods :{
    refreshTable() {
        this.$refs['ValueTable'].selectList()
      },
    refresh() {
        this.componentData.entity = this.HaveJson(this.entityCopy)
        this.upIndex++
      },
    // æƒé™åˆ†é…
    getPower(radio) {
      let power = JSON.parse(sessionStorage.getItem('power'))
    },
    openAddDetail(){
      this.form = {}
      this.addDetailVisible = true
    },
    addDetail(){
      if(!this.form.value0){
        this.$message.error('请输入名称')
        return
      }
      if(!this.form.value0){
        this.$message.error('体积')
        return
      }
      this.addDetailLoading = true
    }
  }
}
</script>
src/components/view/person-manage.vue
@@ -289,7 +289,7 @@
            type: 'text',
            method: 'doDiy',
            field: ['roleName', '角色=roleId', '密码=password',
              '姓名EN=nameEn', '年龄=age', '邮箱=email', '单位=company', '签名=pictureUrl', '个人照片=signatureUrl'
              '姓名EN=nameEn', '年龄=age', '邮箱=email', '单位=company', '签名=signatureUrl', '个人照片=pictureUrl'
            ]
          }],
          tagField: {
static/js/menu.js
@@ -368,7 +368,7 @@
        }, {
            v: "外来人员管理",
            i: "font icon-erjidaohang",
            u: "",
            u: "a6-external-personnel-management",
            g: "6.3 è®¾æ–½å’ŒçŽ¯å¢ƒæ¡ä»¶",
            p: ""
        }, {
@@ -404,7 +404,7 @@
        }, {
            v: "废物处理交接记录",
            i: "font icon-erjidaohang",
            u: "",
            u: "a6-waste-handover",
            g: "6.3 è®¾æ–½å’ŒçŽ¯å¢ƒæ¡ä»¶",
            p: ""
        }, {
@@ -500,7 +500,7 @@
        }, {
            v: "标准物质清单",
            i: "font icon-erjidaohang",
            u: "",
            u: "a6-standard-material-list",
            g: "6.5 è®¡é‡æº¯æºæ€§",
            p: ""
        }, {