Merge branch 'master' of http://114.132.189.42:9002/r/mom-before

zouyu

2023-09-27 b9d86ddf9e6bb36736214cd632d69ae83debc754

 src/components/view/measurementManagement.vue

@@ -456,7 +456,7 @@
                  <template slot="header">
                    <span class="requiredclass">仪器设备名称</span>
                  </template>
                  <template scope="scope">
                  <template slot-scope="scope">
                    <el-form-item
                      :prop="`measureLedgerList[` + scope.$index + `].deviceId`"
                      :rules="{
@@ -482,7 +482,7 @@
                  </template>
                </el-table-column>
                <el-table-column label="测量范围" min-width="10%">
                  <template scope="scope">
                  <template slot-scope="scope">
                    <el-form-item
                      :prop="
                        `measureLedgerList[` + scope.$index + `].measuringRange`
@@ -505,7 +505,7 @@
                  </template>
                </el-table-column>
                <el-table-column label="计量周期" min-width="5%">
                  <template scope="scope">
                  <template slot-scope="scope">
                    <span
                      v-show="
                        addFormDevice.measureLedgerList[scope.$index]
@@ -519,7 +519,7 @@
                  </template>
                </el-table-column>
                <el-table-column label="计量结果" min-width="10%">
                  <template scope="scope">
                  <template slot-scope="scope">
                    <el-select
                      v-model="
                        addFormDevice.measureLedgerList[scope.$index]
@@ -538,7 +538,7 @@
                  <template slot="header">
                    <span class="requiredclass">计量日期</span>
                  </template>
                  <template scope="scope">
                  <template slot-scope="scope">
                    <el-form-item
                      :prop="
                        `measureLedgerList[` + scope.$index + `].measureDate`
@@ -567,7 +567,7 @@
                  <template slot="header">
                    <span class="requiredclass">计量有效期</span>
                  </template>
                  <template scope="scope">
                  <template slot-scope="scope">
                    <el-form-item
                      :prop="
                        `measureLedgerList[` + scope.$index + `].planDateList`
@@ -596,7 +596,7 @@
                  </template>
                </el-table-column>
                <el-table-column label="操作" min-width="10%">
                  <template scope="scope">
                  <template slot-scope="scope">
                    <el-button
                      type="text"
                      size="mini"
@@ -744,9 +744,9 @@
      },
      key: 0,
      measurePlanPageData: [], // 计量计划表格数据
      measureLedgerTotal: "",
      measureLedgerTotal: 0,
      measureLedgerPageData: [], // 计量台账表格数据
      measureLedgerPageTotal: "",
      measureLedgerPageTotal: 0,
      recordData: [],
      measurePlanPage: {
        pageNo: 1,
@@ -755,7 +755,7 @@
        measureId: ""
      },
      measureTop: {},
      measurePlanPageTotal: "",
      measurePlanPageTotal: 0,
      okOrNo: "",
      deviceIdAndNameAndCode: [],
      addFormDevice: {