Merge remote-tracking branch 'origin/master'

src/views/modules/code/generation.vue

@@ -329,7 +329,7 @@ export default {
       </el-col>
       <el-col :span="24">
         <el-form-item label="编码描述:">
-          <el-input v-model="searchModel.drawingDesc"></el-input>
+          <el-input v-model="searchModel.drawingDesc" readonly></el-input>
         </el-form-item>
       </el-col>
       <el-col :span="24">

src/views/modules/code/list.vue

@@ -218,7 +218,7 @@ export default {
           </el-col>
           <el-col :span="24">
             <el-form-item label="编码描述:">
-              <el-input v-model="drawing.drawingDesc" ></el-input>
+              <el-input v-model="drawing.drawingDesc" readonly></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="24">