Merge remote-tracking branch 'origin/master'

王震

2023-11-09 d98942fd0d8b9097e5a5ed4e4f2b3161a0174661

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

@@ -24,44 +24,23 @@
          </el-col>
          <el-col :span="12">
            <el-form-item label="校准时间" prop="createTime">
                <el-date-picker
                  v-model="dataForm.createTime"
                    align="right"
                  type="date"
                  placeholder="校准时间"
                  :picker-options="pickerOptions">
                </el-date-picker>
              <el-date-picker
      v-model="dataForm.createTime"
      type="datetime"
      placeholder="校准时间">
        </el-date-picker>
         </el-form-item>
      </el-col>
        <el-col :span="12">
            <el-form-item label="到期时间" prop="updateTime">
              <el-date-picker
              v-model="dataForm.updateTime"
              type="datetime"
      placeholder="校准到期时间">
    </el-date-picker>
  </el-form-item>
  </el-col>
  <el-col :span="12">
            <el-form-item label="校准到期时间" prop="updateTime">
                  <el-date-picker
                  v-model="dataForm.updateTime"
                    align="right"
                  type="date"
                  placeholder="校准到期时间"
                  :picker-options="pickerOptions">
                </el-date-picker>
          </el-form-item>
  </el-col>
          <!-- <el-col :span="12">
            <el-form-item label="类型" prop="type">
              <el-select
                v-model="dataForm.type"
                filterable
                placeholder="请选择"
                style="width:100%"
              >
                <el-option
                  v-for="item in workshopList"
                  :key="item.id"
                  :label="item.label"
                  :value="item.value"
                >
                </el-option>
              </el-select>
            </el-form-item>
          </el-col> -->

          <el-col :span="12">
            <el-form-item label="责任人" prop="createUser">
              <el-input
@@ -79,7 +58,7 @@
              ></el-input>
            </el-form-item>
          </el-col>
         

          <el-col :span="12">
            <el-form-item label="责任部门" prop="responsibleDepartment">
              <el-input
@@ -111,7 +90,7 @@
                placeholder="检定/校准"
              ></el-input>
            </el-form-item>
          </el-col> 
          </el-col>
          <el-col :span="12">
            <el-form-item label="分类" prop="classification">
              <el-input
@@ -119,7 +98,7 @@
                placeholder="分类"
              ></el-input>
            </el-form-item>
          </el-col> 
          </el-col>
          <el-col :span="12">
            <el-form-item label="定点位置" prop="fixedPointPosition">
              <el-input
@@ -127,8 +106,8 @@
                placeholder="定点位置"
              ></el-input>
            </el-form-item>
          </el-col> 
          
          </el-col>



          <!-- <el-col :span="12">
@@ -168,13 +147,10 @@
  export default {
    data() {
      return {
     
        pickerOptions: {
          disabledDate(time) {
            return time.getTime() > Date.now();
          }
        },

          },},
        // options: regionData,
        visible: false,
        dataForm: {
@@ -191,17 +167,22 @@
          manufactureDate: '',
          installDate: '',
          // state: '',
          verification:'',
          inspectionUnit:'',
          specifications:'',
          responsibleDepartment:'',
          // createUser:'',
          classification:'',
           createUser:'',
          status:'',


          updateTime:'',
          createTime:'',
          description: '',
          value1: '',
          certificate:'',
          fixedPointPosition:'',
          code: null,
          // type: null,
          // status: null,
           status: null,
          supplier: null
        },
        dataRule: {
@@ -269,7 +250,7 @@
          }
        })
      },
  

      initFactorySelect() {
        loadFactoryList().then((res) => {
          this.factoryOptions = res.data
@@ -279,11 +260,11 @@
        })
      }
    },
  

    created() {
      this.initFactorySelect()
      this.getEquipmentState()
  

    //   remote('work_shop').then((response) => {
    //     if (response.data.code === 0) {
    //       this.workshopList = response.data.data
@@ -294,4 +275,3 @@
    }
  }
  </script>