Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend into dev

src/views/material/BOMmanage/components/replaceMaterialPop.vue

@@ -56,7 +56,7 @@
       </template>
 
       <template v-slot:action="{ row, $index }">
-        <el-link type="danger" @click="handleDel(row, $index)">删除</el-link>
+        <el-link type="danger"  v-if="!isView" @click="handleDel(row, $index)">删除</el-link>
       </template>
     </ele-pro-table>
 

src/views/material/BOMmanage/components/workingProcedure.vue

@@ -338,7 +338,6 @@
                 >替代料</el-link
               >
 
-              
             </template>
             <template v-slot:subCode="{ row }">
               <div v-if="isView">{{ row.subCode }}</div>
@@ -391,7 +390,7 @@
             </template>
 
             <template v-slot:categoryName="{ row, $index }">
-              <div v-if="isView">{{ row.categoryName }}</div>
+              <el-link type="primary" :underline="false" @click="handSubstitution(row)"  v-if="isView" >{{ row.categoryName }}</el-link>
               <div v-else
                 ><el-input
                   :value="row.categoryName"

src/views/technology/version/components/user-edit.vue

@@ -8,7 +8,7 @@
 
         <el-col :span="8">
           <el-form-item label="版本编码:" prop="code">
-            <el-input clearable v-model="form.code" placeholder="请输入版本编码" />
+            <el-input clearable v-model="form.code" :disabled="isUpdate" placeholder="请输入版本编码" />
           </el-form-item>
         </el-col>