8.16提交 原材料报检 角色管理

yuyu

2023-08-16 e8b239efa63361a8984810bf9b4047981b98050c

8.16提交 原材料报检 角色管理

 src/api/inspection/rawmaterial.js

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,10 @@
import request from '@/utils/request'

// æŸ¥è¯¢åŽŸææ–™æ£€éªŒåˆ—表
export function getRawMaterialList(params) {
  return request({
    url: '/raw-material/selectAll',
    method: 'get',
    params
  })
}

 src/router/index.js

@@ -327,6 +327,11 @@
        name: 'Personnel',
        component: () => import('@/views/laboratory/personnel/index'),
        meta: { title: '人员管理', icon: 'tree' }
      },{
        path: 'role',
        name: 'Role',
        component: () => import('@/views/laboratory/role/index'),
        meta: { title: '角色管理', icon: 'tree' }
      }
    ]
  },

 src/views/inspectionManagement/reportForInspection/index.vue

@@ -37,18 +37,16 @@
              </el-input>
            </el-form-item>
            <el-form-item>
              <el-button type="primary">查询</el-button>
              <el-button type="primary" plain>重置</el-button>
              <el-button type="primary" @click="search">查询</el-button>
              <el-button type="primary" plain @click="reset">重置</el-button>
            </el-form-item>
            </el-form>
        </div>
        <div class="library-table">
          <div class="table-header">
            <div class="search-bar">
              <el-radio-group v-model="radioValue">
                <el-radio-button label="全部" />
                <el-radio-button label="待检验" />
                <el-radio-button label="已检验" />
              <el-radio-group v-model="radioValue" @change="radioclick">
                <el-radio-button v-for="option in radioOptions" :key="option.value" :label="option.value">{{ option.label }}</el-radio-button>
              </el-radio-group>
            </div>
            <div class="generateInsp">
@@ -66,7 +64,6 @@
            >
              <el-table-column
                type="selection"
                label=""
                min-width="10%"
              /> 
              <el-table-column
@@ -75,27 +72,27 @@
                min-width="8%"
              />
              <el-table-column
                prop="date"
                prop="createTime"
                label="来料日期"
                min-width="8%"
              />
              <el-table-column
                prop="providerName"
                prop="supplierName"
                label="供应商名称"
                min-width="12%"
              />
              <el-table-column
                prop="code"
                prop="materialCoding"
                label="材料编码"
                min-width="8%"
              />
              <el-table-column
                prop="name"
                prop="materialName"
                label="材料名称"
                min-width="8%"
              />
              <el-table-column
                prop="modelandspecification"
                prop="specificationsModels"
                label="规格型号"
                min-width="12%"
              />
@@ -105,33 +102,33 @@
                min-width="5%"
              />
              <el-table-column
                prop="amount"
                prop="quantity"
                label="数量"
                min-width="5%"
              />
              <el-table-column
                prop="commisiondate"
                prop="inspectionDate"
                label="报检日期"
                min-width="8%"
              />
              <el-table-column
                prop="person"
                prop="surveyor"
                label="检验人"
                min-width="8%"
              />
              <el-table-column
                prop="checkdate"
                prop="dateSurvey"
                label="检验日期"
                min-width="8%"
              />
              <el-table-column
                prop="state"
                prop="condition"
                label="状态"
                min-width="8%"
              >
              <template slot-scope="scope">
                <span :style="{ color: scope.row.state === '已检测' ? 'green' : 'red' }">
                  {{ scope.row.state }}
                <span :style="{ color: scope.row.condition === 1 ? 'green' : 'red' }">
                  {{ scope.row.condition === 1 ? '已检测':'未检测' }}
                </span>
              </template>
              </el-table-column>
@@ -142,10 +139,10 @@
                @size-change="handleSizeChange"
                @current-change="handleCurrentChange"
                :current-page="currentPage"
                :page-sizes="[100, 200, 300, 400]"
                :page-size="100"
                :page-sizes="[5, 10, 15, 20]"
                :page-size="pageSize"
                layout="total, sizes, prev, pager, next, jumper"
                :total="400">
                :total="total">
              </el-pagination>
            </div>
          </div>
@@ -154,6 +151,7 @@
</template>

<script>
import {getRawMaterialList } from '@/api/inspection/rawmaterial'
export default {
  data() {
    return {
@@ -165,79 +163,102 @@
        date: ''
      },
      options: [{
        value: '1',
        label: '部门1'
        value: 0,
        label: '全部'
      }, {
        value: '2',
        label: '部门2'
        value: 1,
        label: '已检验'
      }, {
        value: '3',
        label: '部门3'
        value: 2,
        label: '未检验'
      }],
      radioValue: '',
      radioOptions:[{
        label: '全部',
        value: 0
      },{
        value: 1,
        label: '已检验'
      },{
        value: 2,
        label: '待检验'
      }],
      radioValue: 0,
      inspectionTable: [{
        date: '2023-07-28',
        providerName: '国网山东省电力有限公司',
        code: 'BP214274',
        name: '铝包钢绞线',
        modelandspecification: 'JLHA/G1A-185/30-26/7',
        createTime: '2023-07-28',
        supplier_name: '国网山东省电力有限公司',
        materialCoding: 'BP214274',
        materialName: '铝包钢绞线',
        specificationsModels: 'JLHA/G1A-185/30-26/7',
        unit: '吨',
        amount: '21',
        commisiondate: '2023-08-02',
        person: '黄小明',
        checkdate: '2023-12-09',
        state: '已检测'
      }, {
        date: '2023-07-28',
        providerName: '国网山东省电力有限公司',
        code: 'BP214274',
        name: '铝包钢绞线',
        modelandspecification: 'JLHA/G1A-185/30-26/7',
        unit: '吨',
        amount: '21',
        commisiondate: '2023-08-02',
        person: '黄小明',
        checkdate: '2023-12-09',
        state: '待检测'
      }, {
        date: '2023-07-28',
        providerName: '国网山东省电力有限公司',
        code: 'BP214274',
        name: '铝包钢绞线',
        modelandspecification: 'JLHA/G1A-185/30-26/7',
        unit: '吨',
        amount: '21',
        commisiondate: '2023-08-02',
        person: '黄小明',
        checkdate: '2023-12-09',
        state: '已检测'
      }, {
        date: '2023-07-28',
        providerName: '国网山东省电力有限公司',
        code: 'BP214274',
        name: '铝包钢绞线',
        modelandspecification: 'JLHA/G1A-185/30-26/7',
        unit: '吨',
        amount: '21',
        commisiondate: '2023-08-02',
        person: '黄小明',
        checkdate: '2023-12-09',
        state: '待检测'
        quantity: 21,
        dateSurvey: '2023-08-02',
        surveyor: '黄小明',
        inspectionDate: '2023-12-09',
        condition: 1
      }],
      currentPage: 0
      currentPage: 1,
      pageSize: 5,
      total:20,
      data: ''
    }
  },
  created(){
    this.getRawMaterialList()
  },
  methods: {
    // èŽ·å–分页列表数据
    async getRawMaterialList(){
      const res = await getRawMaterialList({pageNo: this.currentPage,pageSize:this.pageSize})
      // console.log(res)
      this.inspectionTable = res.data.row
      this.data = res.data.row
      this.total = res.data.total
    },
    async search(){
      this.radioValue = this.searchData.state
      const res = await getRawMaterialList({condition: this.searchData.state,
        createTime:this.searchData.date,
        materialCoding:this.searchData.code,
        materialName: this.searchData.name,
        pageNo: this.currentPage,
        pageSize: this.pageSize
      })
      // console.log(res)
      this.inspectionTable = res.data.row
      this.data = res.data.row
      this.total = res.data.total
    },
    reset(){
      this.searchData = {
        code: '',
        name: '',
        state: '',
        date: ''
      }
      this.getRawMaterialList()
    },
    radioclick(){
      this.searchData.state = this.radioValue
      // console.log(this.radioValue)
      this.inspectionTable = this.data.filter((item)=>{
        return item.condition === this.radioValue
      })
      if(this.radioValue === 0){
        this.inspectionTable = this.data
      }
      this.total = this.inspectionTable.length
    },
    // æ¯é¡µæ¡æ•°æ”¹å˜æ—¶è§¦å‘ é€‰æ‹©ä¸€é¡µæ˜¾ç¤ºå¤šå°‘è¡Œ
    handleSizeChange(val) {
      console.log(`每页 ${val} æ¡`)
      this.currentPage = 1
      this.pageSize = val
      this.getRawMaterialList({pageNo: this.currentPage,pageSize:this.pageSize})
    },
    // å½“前页改变时触发 è·³è½¬å…¶ä»–页
    handleCurrentChange(val) {
      console.log(`当前页: ${val}`)
      this.currentPage = val
      this.getRawMaterialList({pageNo: this.currentPage,pageSize:this.pageSize})
    }
  }
}

 src/views/laboratory/measure/index.vue

@@ -63,31 +63,31 @@
                  min-width="10%"
                />
                <el-table-column
                  prop="hello"
                  prop="equipment_code"
                  label="仪器设备编号"
                  min-width="10%"
                />
                <el-table-column
                  prop="entrust_coding"
                  prop="equipment_name"
                  label="仪器设备名称"
                  min-width="10%"
                />
                <el-table-column
                  prop="entrusted"
                  prop="measure_range"
                  label="测量范围"
                  min-width="15%"
                />
                <el-table-column
                  prop="samples_number"
                  prop="measurecycle"
                  label="计量周期"
                  min-width="6%"
                />
                <el-table-column
                  prop="inspection_status"
                  prop="mesureresult"
                  label="计量结果"
                  min-width="6%">
                  <template slot-scope="scope">
                    <div v-if="scope.row.inspection_status === 1">
                    <div v-if="scope.row.mesureresult === 1">
                      <span style="color: green;">正常</span>
                    </div>
                    <div v-else>
@@ -96,32 +96,32 @@
                  </template>
                </el-table-column>
                <el-table-column
                  prop="specifications_models"
                  prop="date"
                  label="计量日期"
                  min-width="12%"
                />
                <el-table-column
                  prop="dateSurvey"
                  prop="term_validity"
                  label="计量有效期"
                  min-width="8%"
                />
                <el-table-column
                  prop="completionDeadline"
                  prop="head"
                  label="负责人"
                  min-width="6%"
                />
                <el-table-column
                  prop="contacts"
                  prop="create_time"
                  label="创建日期"
                  min-width="8%"
                />
                <el-table-column
                  prop="inspectionTime"
                  prop="create_person"
                  label="创建人"
                  min-width="8%"
                />
                <el-table-column
                  prop="inspectionTime"
                  prop="measure_code"
                  label="计量编号"
                  min-width="8%"
                />
@@ -136,7 +136,7 @@
                </el-table-column>
              </el-table>
              <el-table
                v-if="this.radioValue === 1"
                v-show="this.radioValue === 1"
                :max-height="800"
                :cell-style="{textAlign: 'center'}"
                :header-cell-style="{border:'0px',background:'#f5f7fa',color:'#606266',boxShadow: 'inset 0 1px 0 #ebeef5',textAlign: 'center'}"
@@ -148,31 +148,31 @@
                  min-width="10%"
                />
                <el-table-column
                  prop="hello"
                  prop="measure_number"
                  label="计量单号"
                  min-width="10%"
                />
                <el-table-column
                  prop="entrust_coding"
                  prop="equipment_code"
                  label="设备编号"
                  min-width="10%"
                />
                <el-table-column
                  prop="entrusted"
                  prop="equipment_name"
                  label="设备名称"
                  min-width="8%"
                />
                <el-table-column
                  prop="scheduled_date"
                  label="计划日期"
                  min-width="15%"
                />
                <el-table-column
                  prop="samples_number"
                  label="计划日期"
                  min-width="6%"
                />
                <el-table-column
                  prop="inspection_status"
                  prop="measure_state"
                  label="计量状态"
                  min-width="6%">
                  <template slot-scope="scope">
                    <div v-if="scope.row.inspection_status === 1">
                    <div v-if="scope.row.measure_state === 1">
                      <span style="color: green;">已完成</span>
                    </div>
                    <div v-else>
@@ -181,22 +181,22 @@
                  </template>
                </el-table-column>
                <el-table-column
                  prop="specifications_models"
                  prop="head"
                  label="计量负责人"
                  min-width="12%"
                />
                <el-table-column
                  prop="dateSurvey"
                  prop="department"
                  label="计量单位"
                  min-width="8%"
                />
                <el-table-column
                  prop="completionDeadline"
                  prop="creater"
                  label="创建人"
                  min-width="6%"
                />
                <el-table-column
                  prop="contacts"
                  prop="create_date"
                  label="创建日期"
                  min-width="8%"
                />
@@ -211,7 +211,7 @@
                </el-table-column>
              </el-table>
              <!-- åˆ†é¡µå™¨ -->
              <div>
              <div class="pagination">
                <el-pagination
                  @size-change="handleSizeChange"
                  @current-change="handleCurrentChange"
@@ -246,8 +246,74 @@
        value: 1 ,
        label: '计量计划'
      }],
      measureLedgerTable: [],
      measurePlanTable: [],
      measureLedgerTable: [{
        equipment_code: 'JSTC-W1-00001',  // ä»ªå™¨è®¾å¤‡ç¼–号
        equipment_name: '数字电桥',   // ä»ªå™¨è®¾å¤‡åç§°
        measure_range: '---',  // æµ‹é‡èŒƒå›´
        measurecycle: '12月',   // è®¡é‡å‘¨æœŸ
        mesureresult: 1,   // è®¡é‡ç»“æžœ
        date: '2022-07-20',   // è®¡é‡æ—¥æœŸ
        term_validity: '2023-07-20',   // è®¡é‡æœ‰æ•ˆæœŸ
        head: '黄小明' ,  // è´Ÿè´£äºº
        create_time: '2023-07-20', // åˆ›å»ºæ—¥æœŸ
        create_person: '黄小明', // åˆ›å»ºäºº
        measure_code: 'QCX20230720' // è®¡é‡ç¼–号
      },{
        equipment_code: 'JSTC-W1-00001',  // ä»ªå™¨è®¾å¤‡ç¼–号
        equipment_name: '数字电桥',   // ä»ªå™¨è®¾å¤‡åç§°
        measure_range: '---',  // æµ‹é‡èŒƒå›´
        measurecycle: '12月',   // è®¡é‡å‘¨æœŸ
        mesureresult: 0,   // è®¡é‡ç»“æžœ
        date: '2022-07-20',   // è®¡é‡æ—¥æœŸ
        term_validity: '2023-07-20',   // è®¡é‡æœ‰æ•ˆæœŸ
        head: '黄小明' ,  // è´Ÿè´£äºº
        create_time: '2023-07-20', // åˆ›å»ºæ—¥æœŸ
        create_person: '黄小明', // åˆ›å»ºäºº
        measure_code: 'QCX20230720' // è®¡é‡ç¼–号
      },{
        equipment_code: 'JSTC-W1-00001',  // ä»ªå™¨è®¾å¤‡ç¼–号
        equipment_name: '数字电桥',   // ä»ªå™¨è®¾å¤‡åç§°
        measure_range: '---',  // æµ‹é‡èŒƒå›´
        measurecycle: '12月',   // è®¡é‡å‘¨æœŸ
        mesureresult: 1,   // è®¡é‡ç»“æžœ
        date: '2022-07-20',   // è®¡é‡æ—¥æœŸ
        term_validity: '2023-07-20',   // è®¡é‡æœ‰æ•ˆæœŸ
        head: '黄小明' ,  // è´Ÿè´£äºº
        create_time: '2023-07-20', // åˆ›å»ºæ—¥æœŸ
        create_person: '黄小明', // åˆ›å»ºäºº
        measure_code: 'QCX20230720' // è®¡é‡ç¼–号
      }],
      measurePlanTable: [{
        measure_number: 'QC568946512', // è®¡é‡å•å·
        equipment_code: '010101', // è®¾å¤‡ç¼–号
        equipment_name: '拉力机', // è®¾å¤‡åç§°
        scheduled_date: '2023-04-08 ~ 2023-08-08', // è®¡åˆ’日期
        measure_state: 1, // è®¡é‡çŠ¶æ€
        head: '黄小明', // è®¡é‡è´Ÿè´£äºº
        department: '地线检测', // è®¡é‡å•ä½
        creater: '黄小明', // åˆ›å»ºäºº
        create_date: '2023-07-20', // åˆ›å»ºæ—¥æœŸ
      },{
        measure_number: 'QC568946512', // è®¡é‡å•å·
        equipment_code: '010101', // è®¾å¤‡ç¼–号
        equipment_name: '拉力机', // è®¾å¤‡åç§°
        scheduled_date: '2023-04-08 ~ 2023-08-08', // è®¡åˆ’日期
        measure_state: 1, // è®¡é‡çŠ¶æ€
        head: '黄小明', // è®¡é‡è´Ÿè´£äºº
        department: '地线检测', // è®¡é‡å•ä½
        creater: '黄小明', // åˆ›å»ºäºº
        create_date: '2023-07-20', // åˆ›å»ºæ—¥æœŸ
      },{
        measure_number: 'QC568946512', // è®¡é‡å•å·
        equipment_code: '010101', // è®¾å¤‡ç¼–号
        equipment_name: '拉力机', // è®¾å¤‡åç§°
        scheduled_date: '2023-04-08 ~ 2023-08-08', // è®¡åˆ’日期
        measure_state: 0, // è®¡é‡çŠ¶æ€
        head: '黄小明', // è®¡é‡è´Ÿè´£äºº
        department: '地线检测', // è®¡é‡å•ä½
        creater: '黄小明', // åˆ›å»ºäºº
        create_date: '2023-07-20', // åˆ›å»ºæ—¥æœŸ
      }],
      currentPage: 1,
      pageSize: 5,
      total: 20
@@ -255,14 +321,27 @@
  },
  created(){
    this.getStandingPageList()
    // this.getPlanPageList()
  },
  methods: {
    // è¯·æ±‚计量台账分页列表
    async getStandingPageList(){
      const res = await getStandingPageList({pageNo:this.currentPage , pageSize:this.pageSize })
      this.measureLedgerTable = res.data
      console.log(this.measureLedgerTable)
      // this.measureLedgerTable = res.data
      // console.log(this.measureLedgerTable)
    },
    // è¯·æ±‚计量计划分页列表
    async getPlanPageList(){
      const res = await getPlanPageList({})
    },
    handleSizeChange(val) {
      console.log(`当前每页${val}条数据`)
      this.pageSize = val
    },
    handleCurrentChange(val) {
      console.log(`当前是第${val}页`)
      this.currentPage = val
    }
    
  }
}
</script>
@@ -308,11 +387,11 @@
          .el-table {
            flex: 1;
          }
          >div:nth-child(2){
      }
      .pagination{
            display: flex;
            justify-content: end;
            margin: 10px 0;
          }
        margin-top: 20px
      }
    }


 src/views/laboratory/role/index.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,213 @@
<template>
  <div>
      <div class="content-main">
          <div class="top-bar">
              <el-form ref="form" :inline="true" :model="searchData">
              <el-form-item label="角色名称：" class="sermargin">
                <el-input
                  v-model="searchData.roleName"
                  class="input-form"
                  placeholder="请输入角色名称"
                  style="width:250px"
                >
                </el-input>
              </el-form-item>
              <el-form-item label="权限：" class="sermargin">
                <el-input
                  v-model="searchData.permission"
                  class="input-form"
                  placeholder="请输入权限"
                  style="width:250px"
                >
                </el-input>
              </el-form-item>
              <el-form-item class="rightBtn">
                <el-button type="primary" @click="search">查询</el-button>
                <el-button type="primary" plain @click="reset">重置</el-button>
              </el-form-item>
              </el-form>
              <el-form>
                <el-form-item class="rightBtn">
                  <el-button type="primary" @click="addRole" icon="el-icon-plus">新增权限</el-button>
                </el-form-item>
              </el-form>
              </el-form>
          </div>
          <div class="library-table">
            <div class="table-box">
              <el-table
                :max-height="800"
                :cell-style="{textAlign: 'center'}"
                :header-cell-style="{border:'0px',background:'#f5f7fa',color:'#606266',boxShadow: 'inset 0 1px 0 #ebeef5',textAlign: 'center'}"
                :data="roleTable"
                style="width: 100%"
              >
                <el-table-column
                  type="selection"
                  min-width="8%"
                />
                <el-table-column
                  prop="rolename"
                  label="角色名称"
                  min-width="20%"
                />
                <el-table-column
                  prop="permission"
                  label="权限"
                  min-width="20%"
                />
                <el-table-column
                  prop="create_time"
                  label="创建时间"
                  min-width="20%"
                />
                <el-table-column
                  prop="update_time"
                  label="更新时间"
                  min-width="20%"
                />
                <el-table-column
                  label="操作"
                  min-width="12%"
                >
                  <template slot-scope="scope">
                    <el-button type="text" size="small" >编辑</el-button>
                    <el-button type="text" size="small" >删除</el-button>
                  </template>
                </el-table-column>
              </el-table>
              <!-- åˆ†é¡µå™¨ -->
              <div class="pagination">
                <el-pagination
                  @size-change="handleSizeChange"
                  @current-change="handleCurrentChange"
                  :current-page="currentPage"
                  :page-sizes="[5, 10, 20]"
                  :page-size="pageSize"
                  layout="total, sizes, prev, pager, next, jumper"
                  :total="total">
                </el-pagination>
              </div>
            </div>
          </div>
      </div>
      <el-dialog title="修改密码" :visible.sync="dialogTableVisible" width="30%">
        <el-form :model="updateData" ref="updateData" label-position="right" label-width="100px">
          <el-form-item label="原密码：">
            <el-input style="width: 300px" v-model="updateData.oldPassWord" placeholder="请输入原密码" >
            </el-input>
          </el-form-item>
          <el-form-item label="新密码：">
            <el-input style="width: 300px" v-model="updateData.newPassWord" placeholder="请输入新密码">
            </el-input>
          </el-form-item>
          <el-form-item label="确认密码：">
            <el-input style="width: 300px" v-model="updateData.confirmPassWord" placeholder="再次输入密码">
            </el-input>
          </el-form-item>
        </el-form>
        <span slot="footer" class="dialog-footer">
          <el-button @click="dialogTableVisible = false">取 æ¶ˆ</el-button>
          <el-button type="primary" @click="changePassword">ç¡® å®š</el-button>
        </span>
      </el-dialog>
  </div>
</template>

<script>
import { getPlanPageList, getStandingPageList } from '@/api/laboratory/measure'
export default {
  data() {
    return {
      searchData:{
        roleName: '',
        permission: ''
      },
      roleTable:[{
        rolename: '部长',
        permission: 'ROOT',
        create_time: '2023-07-04 12:12:12',
        update_time: '2023-07-04 12:12:12'
      },{
        rolename: '组长',
        permission: '--',
        create_time: '2023-07-04 12:12:12',
        update_time: '2023-07-04 12:12:12'
      }],
      updateData:{
        oldPassWord: '',
        newPassWord: '',
        confirmPassWord: ''
      },
      dialogTableVisible: false,
      currentPage: 1,
      pageSize: 5,
      total: 20
    }
  },
  created(){
    
  },
  methods: {
    addRole(){
      this.dialogTableVisible = true
      // console.log(this.dialogTableVisible)
    },
    // search(){},
    // reset(){},
    // changePassword(){},

    handleSizeChange(val) {
      console.log(`当前每页${val}条数据`)
      this.pageSize = val
    },
    handleCurrentChange(val) {
      console.log(`当前是第${val}页`)
      this.currentPage = val
    }
  }
}
</script>

<style scoped>

.top-bar{
    margin: -25px -15px;
    background: #fff;
    display: flex;
    justify-content: space-between;
    padding: 5px 24px 0px 24px;
    .sermargin{
      margin-right: 60px;
    }
  }
.rightBtn{
    margin-right: 50px
}
.library-table{
      background-color: #fff;
      flex: 1;
      margin: 0px -15px;
      margin-top: 40px;
      display: flex;
      flex-direction: column;
      .table-box{
          padding: 10px 20px;
          margin-top: 0px;
          flex: 1;
          background: #fff;
          /* padding: 20px 20px 10px 20px; */
          display: flex;
          flex-direction: column;
          .el-table {
            flex: 1;
          }
      }
      .pagination{
        display:flex;
        justify-content:end;
        margin-top: 20px
      }
    }

</style>