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

zouyu

2023-11-09 b15de00ffba31695514c1a404dbbbf65dc1e87c1

 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: {