Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella

src/views/mes/abilityInfo/index.vue

@@ -66,6 +66,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import Detail from '../components/Detail.vue'
+import {MesOrderMonthMain} from "@/views/mes/ordermonthplan/mesOrderMonthMain.data";
 
 defineOptions({ name: 'AbilityInfo' })
 
@@ -150,6 +151,15 @@ const buttonTableClick = async (val, row) => {
 /** 添加/修改操作 */
 const basicFormRef = ref()
 const openForm = (type: string, row?: any) => {
+  let disabledFlag = false
+  if(type==='update'){
+    disabledFlag = true
+  }
+  AbilityInfo.allSchemas.formSchema.forEach(item => {
+    if (item.field == 'ablityCode') {
+      item.componentProps.disabled =disabledFlag
+    }
+  })
   basicFormRef.value.open(type, row)
 }
 

src/views/mes/opersteps/index.vue

@@ -159,7 +159,6 @@ const openForm = (type: string, row?: any) => {
       }
     })
   basicFormRef.value.open(type, row)
-  basicFormRef.value.open(type, row)
 }
 
 // form表单提交

src/views/mes/ordermonthplan/index.vue

@@ -185,6 +185,15 @@ const buttonTableClick = async (val, row) => {
 /** 添加/修改操作 */
 const basicFormRef = ref()
 const openForm = (type: string, row?: any) => {
+  let disabledFlag = false
+  if(type==='update'){
+    disabledFlag = true
+  }
+  MesOrderMonthMain.allSchemas.formSchema.forEach(item => {
+    if (item.field == 'planMasterCode' || item.field == 'planSubCode') {
+      item.componentProps.disabled =disabledFlag
+    }
+  })
   basicFormRef.value.open(type, row)
 }
 

src/views/mes/pattern/index.vue

@@ -149,6 +149,15 @@ const buttonTableClick = async (val, row) => {
 /** 添加/修改操作 */
 const basicFormRef = ref()
 const openForm = (type: string, row?: any) => {
+  let disabledFlag = false
+  if(type==='update'){
+    disabledFlag = true
+  }
+  Pattern.allSchemas.formSchema.forEach(item => {
+    if (item.field == 'code') {
+      item.componentProps.disabled =disabledFlag
+    }
+  })
   basicFormRef.value.open(type, row)
 }
 

src/views/mes/patternType/index.vue

@@ -149,6 +149,15 @@ const buttonTableClick = async (val, row) => {
 /** 添加/修改操作 */
 const basicFormRef = ref()
 const openForm = (type: string, row?: any) => {
+  let disabledFlag = false
+  if(type==='update'){
+    disabledFlag = true
+  }
+  PatternType.allSchemas.formSchema.forEach(item => {
+    if (item.field == 'code') {
+      item.componentProps.disabled =disabledFlag
+    }
+  })
   basicFormRef.value.open(type, row)
 }
 

src/views/mes/qualityclass/index.vue

@@ -149,7 +149,15 @@ const buttonTableClick = async (val, row) => {
 /** 添加/修改操作 */
 const basicFormRef = ref()
 const openForm = (type: string, row?: any) => {
-  console.log(row)
+  let disabledFlag = false
+  if(type==='update'){
+    disabledFlag = true
+  }
+  Qualityclass.allSchemas.formSchema.forEach(item => {
+    if (item.field == 'code') {
+      item.componentProps.disabled =disabledFlag
+    }
+  })
   basicFormRef.value.open(type, row)
 }
 

src/views/mes/qualitygroup/index.vue

@@ -149,6 +149,15 @@ const buttonTableClick = async (val, row) => {
 /** 添加/修改操作 */
 const basicFormRef = ref()
 const openForm = (type: string, row?: any) => {
+  let disabledFlag = false
+  if(type==='update'){
+    disabledFlag = true
+  }
+  Qualitygroup.allSchemas.formSchema.forEach(item => {
+    if (item.field == 'code') {
+      item.componentProps.disabled =disabledFlag
+    }
+  })
   basicFormRef.value.open(type, row)
 }
 

src/views/mes/workstation/index.vue

@@ -171,6 +171,15 @@ const buttonTableClick = async (val, row) => {
 /** 添加/修改操作 */
 const basicFormRef = ref()
 const openForm = (type: string, row?: any) => {
+  let disabledFlag = false
+  if(type==='update'){
+    disabledFlag = true
+  }
+  Workstation.allSchemas.formSchema.forEach(item => {
+    if (item.field == 'code') {
+      item.componentProps.disabled =disabledFlag
+    }
+  })
   basicFormRef.value.open(type, row)
 }
 

src/views/system/user/UserForm.vue

@@ -7,6 +7,23 @@
       :rules="formRules"
       label-width="80px"
     >
+    <el-row>
+        <el-col :span="12">
+          <el-form-item v-if="formData.id === undefined" label="用户账号" prop="username">
+            <el-input v-model="formData.username" placeholder="请输入用户账号" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="formData.id === undefined" label="用户密码" prop="password">
+            <el-input
+              v-model="formData.password"
+              placeholder="请输入用户密码"
+              show-password
+              type="password"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
       <el-row>
         <el-col :span="12">
           <el-form-item label="用户昵称" prop="nickname">
@@ -38,23 +55,6 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item v-if="formData.id === undefined" label="用户账号" prop="username">
-            <el-input v-model="formData.username" placeholder="请输入用户账号" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item v-if="formData.id === undefined" label="用户密码" prop="password">
-            <el-input
-              v-model="formData.password"
-              placeholder="请输入用户密码"
-              show-password
-              type="password"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
       <el-row>
         <el-col :span="12">
           <el-form-item label="用户性别">