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

yuyu

2023-08-16 e8b239efa63361a8984810bf9b4047981b98050c

 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){
            display: flex;
            justify-content: end;
            margin: 10px 0;
          }
      }
      .pagination{
        display:flex;
        justify-content:end;
        margin-top: 20px
      }
    }