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

王震

2023-11-09 bd3670cf1f3ddf4201941a1673d870cc185fe184

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

 src/views/common/ztt-table.vue

@@ -507,11 +507,11 @@
            >
              <i class="el-icon-upload"></i>
              <div class="el-upload__text"><em>点击导入数据</em></div>
              <div class="el-upload__tip" slot="tip">
              <div class="el-upload__tip" slot="tip" >
                只能上传xlsx/xls文件，且不超过10M<el-button
                  type="text"
                  style="font-size:12px;"
                  @click="downDataTemplate"
                  @click="downDataTemplate"   v-if="uploadInfo.Download"
                  >下载模板</el-button
                >
              </div>

 src/views/equipment/metering/index.vue

@@ -65,7 +65,8 @@
        multipleSelection: [],
        uploadInfo: {
          // 是否展示上传EXCEL以及对应的url
          isShow: true,
          Download:false,
         isShow: true,
          url: '/mes/equipmentDevice/upload'
        },
        prelang: 'workstation',
@@ -143,7 +144,7 @@
              minWidth: '150',
              width: '250',
              prop: 'createTime',
              label: '创建时间',
              label: '校准时间',
              sort: true,
              isTrue: true,
              formatter: this.formatReceiveTime,
@@ -155,7 +156,7 @@
              minWidth: '150',
              width: '250',
              prop: 'updateTime',
              label: '修改时间',
              label: '校准到期时间',
              sort: true,
              isTrue: true,
              formatter: this.formatReceiveTime,
@@ -203,7 +204,7 @@
            },
            {
              minWidth: '30',
              prop: 'InspectionUnit',
              prop: 'inspectionUnit',
              label: '检验单位',
              sort: true,
              isTrue: true,
@@ -239,7 +240,7 @@
            },
            {
              minWidth: '30',
              prop: 'FixedPointPosition',
              prop: 'fixedPointPosition',
              label: '定点位置',
              sort: true,
              isTrue: true,

 src/views/equipment/metering/metering-form.vue

@@ -22,7 +22,7 @@
              <el-input v-model="dataForm.name" placeholder="名称"></el-input>
            </el-form-item>
          </el-col>
          <el-col :span="12">
          <!-- <el-col :span="12">
            <el-form-item label="类型" prop="type">
              <el-select
                v-model="dataForm.type"
@@ -39,7 +39,16 @@
                </el-option>
              </el-select>
            </el-form-item>
          </el-col>
          </el-col> -->
          <!-- <el-col :span="12">
            <el-form-item label="责任人" prop="createUser">
              <el-input
                v-model="dataForm.createUser"
                placeholder="责任人"
              ></el-input>
            </el-form-item>
          </el-col> -->

          <el-col :span="12">
            <el-form-item label="厂家" prop="supplier">
              <el-input
@@ -48,11 +57,38 @@
              ></el-input>
            </el-form-item>
          </el-col>
         
          <el-col :span="12">
            <el-form-item label="状态" prop="state">
              <el-select
            <el-form-item label="责任部门" prop="responsibleDepartment">
              <el-input
                v-model="dataForm.responsibleDepartment"
                placeholder="责任部门"
              ></el-input>
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="状态" prop="status">
              <el-input
                v-model="dataForm.status"
                placeholder="状态"
              ></el-input>
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="规格" prop="specifications">
              <el-input
                v-model="dataForm.specifications"
                placeholder="规格"
              ></el-input>
            </el-form-item>
          </el-col>


          <!-- <el-col :span="12">
            <el-form-item label="设备状态" prop="status">
              <el-select
                v-model="dataForm.status"
                placeholder="设备状态"
                filterable
                style="width: 100%"
              >
@@ -64,7 +100,7 @@
                />
              </el-select>
            </el-form-item>
          </el-col>
          </el-col> -->
        </el-row>
      </el-form>
      <span slot="footer" class="dialog-footer">
@@ -100,12 +136,18 @@
          typeSpecification: '',
          manufactureDate: '',
          installDate: '',
          state: '',
          // state: '',
          specifications:'',
          responsibleDepartment:'',
          // createUser:'',
          status:'',


          description: '',
          value1: '',
          code: null,
          type: null,
          status: null,
          // type: null,
          // status: null,
          supplier: null
        },
        dataRule: {