Merge remote-tracking branch 'origin/dev_New' into dev_New

gaoluyang

3 天以前 9bca5ca91f2ec5107c6e10c8d18588636213bd58

 src/views/equipmentManagement/ledger/Form.vue

@@ -8,7 +8,7 @@
      </el-col>
      <el-col :span="12">
        <el-form-item label="规格型号" prop="deviceModel">
          <el-input v-model="form.deviceModel" :disabled="(form.deviceModel != null && operationType === 'edit')" placeholder="请输入规格型号" />
          <el-input v-model="form.deviceModel" placeholder="请输入规格型号" />
        </el-form-item>
      </el-col>
      <el-col :span="12">