Merge remote-tracking branch 'origin/master'

 src/views/xmcpms/coal-quality/detection/quick/QuickForm.vue

@@ -58,7 +58,6 @@
          :model="formData"
          :rules="dataRule"
          ref="formDataDet"
          @keyup.enter.native="formDataSubmitHandle()"
          label-width="120px"
        >
          <el-table
@@ -74,7 +73,7 @@
              align="center"
              min-width="150"
            >
              <template slot-scope="scope">
              <template #default="scope">
                <dict-select-tag
                style="width: 100%"
                size="mini"
@@ -92,7 +91,7 @@
              align="center"
              min-width="100"
            >
              <template slot-scope="scope">
              <template #default="scope">
                <el-input-number
                  v-model="scope.row.yl"
                  size="mini"
@@ -112,7 +111,7 @@
              align="center"
              min-width="100"
            >
              <template slot-scope="scope">
              <template #default="scope">
                <el-input-number
                  v-model="scope.row.md"
                  size="mini"
@@ -132,7 +131,7 @@
              align="center"
              min-width="100"
            >
              <template slot-scope="scope">
              <template #default="scope">
                <el-input-number
                  v-model="scope.row.hf"
                  size="mini"
@@ -152,7 +151,7 @@
              align="center"
              min-width="100"
            >
              <template slot-scope="scope">
              <template #default="scope">
                <el-input-number
                  v-model="scope.row.lf"
                  size="mini"
@@ -173,7 +172,7 @@
                align="center"
                min-width="100"
              >
                <template slot-scope="scope">
                <template #default="scope">
                  <el-input-number
                    v-model="scope.row.cl1"
                    size="mini"
@@ -193,7 +192,7 @@
                align="center"
                min-width="100"
              >
                <template slot-scope="scope">
                <template #default="scope">
                  <el-input-number
                    v-model="scope.row.hf1"
                    size="mini"
@@ -215,7 +214,7 @@
                align="center"
                min-width="100"
              >
                <template slot-scope="scope">
                <template #default="scope">
                  <el-input-number
                    v-model="scope.row.cl2"
                    size="mini"
@@ -235,7 +234,7 @@
                align="center"
                min-width="100"
              >
                <template slot-scope="scope">
                <template #default="scope">
                  <el-input-number
                    v-model="scope.row.hf2"
                    size="mini"
@@ -257,7 +256,7 @@
                align="center"
                min-width="100"
              >
                <template slot-scope="scope">
                <template #default="scope">
                  <el-input-number
                    v-model="scope.row.cl3"
                    size="mini"
@@ -277,7 +276,7 @@
                align="center"
                min-width="100"
              >
                <template slot-scope="scope">
                <template #default="scope">
                  <el-input-number
                    v-model="scope.row.hf3"
                    size="mini"
@@ -297,20 +296,16 @@
              min-width="100"
              align="center"
            >
              <template slot-scope="scope">
              <template #default="scope">
                <el-button
                  @click.native.prevent="
                    addExpressionRow(scope.$index, formData.itemList)
                  "
                  @click="addExpressionRow(scope.$index, formData.itemList)"
                  type="text"
                  size="small"
                >
                  添加
                </el-button>
                <el-button
                  @click.native.prevent="
                    deleteExpressionRow(scope.$index, formData.itemList)
                  "
                  @click="deleteExpressionRow(scope.$index, formData.itemList)"
                  type="text"
                  size="small"
                >

 src/views/xmcpms/coal-quality/detection/quick/QuickItem.vue

@@ -1,6 +1,6 @@
<template>
  <div class="mod-quality-quick-item">
    <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
    <el-form :inline="true" :model="dataForm">
          <el-form-item>
        <span>生产运行煤样快速检查详情</span><span>【{{dataForm.lsh}}】</span>
      </el-form-item>

 src/views/xmcpms/coal-quality/detection/quick/index.vue

@@ -24,14 +24,9 @@
          <el-button type="warning" plain @click="handleImport">
            <Icon icon="ep:upload" /> 导出
          </el-button>
        </el-form-item>
        <el-form-item>
          <el-button>
            <a
              href="/template/乌达煤炭加工有限公司生产煤样快速检查.xlsx"
              download="乌达煤炭加工有限公司生产煤样快速检查.xlsx"
              >下载模版</a
            >
            <a href="/template/乌达煤炭加工有限公司生产煤样快速检查.xlsx" style="text-decoration:none;color: inherit"
              download="乌达煤炭加工有限公司生产煤样快速检查.xlsx">下载模版</a>
          </el-button>
        </el-form-item>
        <el-form-item>
@@ -43,9 +38,8 @@
            :on-success="uploadModelSuccess"
            :on-error="uploadModelError"
            :action="uploadModelUrl"
          >
          />
            <el-button type="primary">导入</el-button>
          </el-upload>
        </el-form-item>
      </el-form>
      <el-table