modified: src/api/laboratory/measure.js new file: src/views/laborator...

Fixiaobai

2023-08-18 245c252060bcbd966da8bcb069f6456a1498de31

	modified:   src/api/laboratory/measure.js
	new file:   src/views/laboratory/measure/Add.vue
	new file:   src/views/laboratory/measure/Select.vue
	modified:   src/views/laboratory/measure/index.vue

 src/api/laboratory/measure.js

@@ -17,3 +17,20 @@
    params
  })
}

//查询计划信息
export function getPlanMeasureInstrument(params) {
  return request({
    url: '/metering-plan/getPlanMeasureInstrument',
    method: 'get',
    params
  })
}
//查询计划下计量信息分页
export function limitGetPlanMeasureRequest(params) {
  return request({
    url: '/metering-plan/limitGetPlanMeasureInstrument',
    method: 'get',
    params
  })
}

 src/views/laboratory/measure/Add.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,10 @@
<template>
    <div>
        11112561564564456456
    </div>
</template>
<script>
export default{

}
</script>

 src/views/laboratory/measure/Select.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,8 @@
<template>
    
</template>
<script>
export default({
    
})
</script>

 src/views/laboratory/measure/index.vue

@@ -3,7 +3,7 @@
    <div class="content-main">
      <div class="top-bar">
        <el-form :hidden="lookVisible" ref="form" :inline="true" :model="searchData">
          <el-form-item :label="this.radioValue === 0 ? '仪器设备编号:' : '计划单号:'" class="sermargin">
          <el-form-item :label="this.radioValue === 0 ? '仪器设备编号:' : '计划编号:'" class="sermargin">
            <el-input v-model="searchData.code" @blur="blurSearch()" class="input-form" placeholder="请输入">
            </el-input>
          </el-form-item>
@@ -82,7 +82,7 @@
            :header-cell-style="{ border: '0px', background: '#f5f7fa', color: '#606266', boxShadow: 'inset 0 1px 0 #ebeef5', textAlign: 'center' }"
            :data="measurePlanTable" style="width: 100%">
            <el-table-column type="index" min-width="10%" />
            <el-table-column prop="plannedOrderNumber" label="计划单号" min-width="10%" />
            <el-table-column prop="plannedOrderNumber" label="计划编号" min-width="10%" />
            <el-table-column prop="palanDate" label="计划日期" min-width="10%">
              <template lot-scope="scope">
                <!-- {{ scope.row.palanDate }} -->
@@ -117,11 +117,11 @@
          </div>
        </div>
      </div>
      <el-drawer title="我是标题" :visible.sync="drawer" :direction="direction" :before-close="handleClose">
        <span>我来啦!</span>
      </el-drawer>
      <div style="position: absolute;top:14px;left: 9px;transition: 1s;width: 100%;height: 82vh;background-color: #fff;z-index: 21;">
          <Add/>
      </div>
      <div id="myMOdel"
        :style="`position: absolute;transition: 1s;top:${mymodelTop}px; left: 9px; width: 100%; height: 60vh; background-color: #fff;z-index: 20;`">
        :style="`position: absolute;transition: 1s;top:${mymodelTop}px; left: 9px; width: 100%; height: 65vh; background-color: #fff;z-index: 20;`">
        <el-col :span="10">
          <p style="font-size: 13px;padding-left: 40px;">计划信息</p>
        </el-col>
@@ -130,7 +130,7 @@
            <el-form-item>
              <el-col :span="8">计划编号：<span style="color: black;">{{ planInfo.plannedOrderNumber }}</span></el-col>
              <el-col :span="8">负责人：<span style="color: black;">{{ planInfo.measurePerson }}</span></el-col>
              <el-col :span="8">计划时间：<span style="color: black;">{{ planInfo.palanDate }}</span></el-col>
              <el-col :span="8">计划时间：<span style="color: black;">{{ planInfo.planDate }}</span></el-col>
            </el-form-item>
            <el-form-item>
              <el-col :span="8">计量单位：<span style="color: black;">{{ planInfo.unit }}</span></el-col>
@@ -148,28 +148,54 @@
              :show-text="false"></el-progress>
          </el-col>
        </el-col>
        <el-col  style="width:93%;height: 20vh;margin-top: 30px; margin-left: 40px;">
        <el-col style="width:93%;height: 20vh;margin-top: 30px; margin-left: 40px;">
          <el-table :data="measureData">
            <el-table-column type="inde" label="序号"/>
            <el-table-column type="inde" label="仪器设备编号"/>
            <el-table-column type="inde" label="仪器设备名称"/>
            <el-table-column type="inde" label="测量范围"/>
            <el-table-column type="inde" label="计算周期"/>
            <el-table-column type="inde" label="计算结果"/>
            <el-table-column type="inde" label="计算日期"/>
            <el-table-column type="inde" label="计算有效期"/>
            <el-table-column type="inde" label="负责人"/>
            <el-table-column type="inde" label="创建日期"/>
            <el-table-column type="inde" label="创建人"/>
            <el-table-column type="inde" label="计量单位"/>
            <el-table-column type="inde" label="计量编号"/>
            <el-table-column type="index" label="序号" />
            <el-table-column prop="equipmentCode" label="仪器设备编号" />
            <el-table-column prop="equipmentName" label="仪器设备名称" />
            <el-table-column prop="measuringRange" label="测量范围" />
            <el-table-column prop="termValidity" label="计算周期">
              <template slot-scope="scope">
                {{ scope.row.termValidity }}月
              </template>
            </el-table-column>
            <el-table-column prop="result" label="计算结果">
              <template slot-scope="scopeResult">
                <div v-if="scopeResult.row.result === 1">
                  <span style="color: rgb(78, 210, 16);">正常</span>
                </div>
                <div v-else-if="scopeResult.row.result === 2">
                  <span style="color: rgb(27, 202, 233);">矫正后可用</span>
                </div>
                <div v-else-if="scopeResult.row.result == '' || scopeResult.row.result == null">
                  <span style="color: #424744;">暂未计量</span>
                </div>
                <div v-else>
                  <span style="color: red;">失准</span>
                </div>
              </template>
            </el-table-column>
            <el-table-column label="计算日期">
              <template slot-scope="scopeEndDate">
                <span v-if="scopeEndDate.row.endDate != '' && scopeEndDate.row.endDate != null">{{
                  scopeEndDate.row.endDate
                }}</span>
                <span v-else>无</span>
              </template>
            </el-table-column>
            <el-table-column prop="validit" label="计算有效期" />
            <el-table-column prop="measurementName" label="负责人" />
            <el-table-column prop="imCreateTime" label="创建日期" />
            <el-table-column prop="measurementName" label="创建人" />
            <el-table-column prop="measurementUnit" label="计量单位" />
            <el-table-column prop="equipmentCode" label="计量编号" />
          </el-table>
        </el-col>
        <el-col style="width: 93%;margin-left: 40px; display: flex;justify-content: end;">
        <el-col style="width: 93%;margin-left: 40px; margin-top: 90px;display: flex;justify-content: end;">
          <el-pagination @size-change="handleSizeChangePlan" @current-change="handleCurrentChangePllan"
              :current-page="currentPagePlan" :page-sizes="[5, 10, 20]" :page-size="pageSizePlan"
              layout="total, sizes, prev, pager, next, jumper" :total="totalPlan">
            </el-pagination>
            :current-page="currentPagePlan" :page-sizes="[5, 10, 20]" :page-size="pageSizePlan"
            layout="total, sizes, prev, pager, next, jumper" :total="totalPlan">
          </el-pagination>
        </el-col>
      </div>
    </div>
@@ -177,8 +203,12 @@
</template>

<script>
import { getPlanPageList, getStandingPageList } from '@/api/laboratory/measure'
import { getPlanPageList, getStandingPageList, getPlanMeasureInstrument, limitGetPlanMeasureRequest } from '@/api/laboratory/measure'
import { default as Add } from "./Add.vue";
export default {
  components: {
    Add: () => import('./Add.vue')
  },
  data() {
    return {
      searchData: {
@@ -194,74 +224,8 @@
        value: 1,
        label: '计量计划'
      }],
      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', // åˆ›å»ºæ—¥æœŸ
      }],
      measureLedgerTable: [],
      measurePlanTable: [],
      currentPage: 1,
      pageSize: 5,
      total: 0,
@@ -270,17 +234,18 @@
      totalPlan: 0,
      drawer: false,
      direction: 'rtl',
      lookVisible: false,
      lookVisible: true,
      measureData: [],
      planInfo: {
        plannedOrderNumber: 7897897987,
        measurePerson: '某某人',
        palanDate: "2021-09-08 ~ 2024-08-09",
        planDate: "2021-09-08 ~ 2024-08-09",
        unit: '某某检测局',
        createPerson: '某某负责人',
        createTime: '2021-09-08'
      },
      mymodelTop: -450//14
      mymodelTop: -600,//14
      planId: 0
    }
  },
  created() {
@@ -288,23 +253,53 @@
    // this.getPlanPageList()
  },
  methods: {
    handleSizeChangePlan(){

    async handleSizeChangePlan(num) {
      this.pageSizePlan = num
      await this.limitGetPlanMeasureInstrument()
    },
    handleCurrentChangePllan(){

    async handleCurrentChangePllan(num) {
      this.currentPagePlan = num
      await this.limitGetPlanMeasureInstrument()
    },
    addPlan() {
      this.drawer = true
    },
    async limitGetPlanMeasureInstrument() {
      let res = await limitGetPlanMeasureRequest({
        id: this.planId,
        currentPage: this.currentPagePlan,
        pageSize: this.pageSize
      })
      this.totalPlan = res.data.taotal
      this.measureData = res.data.list
    },
    lookPalan(id) {
      this.planId = id
      this.getPlanAndInfoAndIns(id)
      this.lookVisible = true
      this.mymodelTop=10
      this.mymodelTop = 10
      this.$parent.triggerMainBtnPlan()
    },
    combackLookPlan(){
    async getPlanAndInfoAndIns(id) {
      let res = await getPlanMeasureInstrument({ "id": id, "currentPage": this.currentPagePlan, "pageSize": this.pageSize });
      console.log(res);
      for (const key in res.data.list) {
        this.planInfo[key] = res.data.list[key]
      }
      this.planInfo.planDate = this.planInfo.beginTime + " ~ " + this.planInfo.endTime
      this.planInfo.metricalInfoAndInsList.forEach(item => {
        if (item.endDate != '' && item.endDate != null) {
          item.validit = this.addMonths(item.endDate, item.termValidity)
        } else {
          item.validit = '无'
        }
      })
      this.measureData = this.planInfo.metricalInfoAndInsList
      this.totalPlan = res.data.total
    },
    combackLookPlan() {
      this.lookVisible = false
      this.mymodelTop=-450
      this.mymodelTop = -600
    },
    blurSearch() {
      if (this.radioValue === 1) {
@@ -377,7 +372,7 @@
      this.measurePlanTable = res.data.list
      this.total = res.data.total
    },
    lookMeasurement(code) {
    async lookMeasurement(code) {
      console.log(code);
    },
  }