基本问题修复

src/views/eam/equipmentSigning/equipmentSigning.data.ts

@@ -5,6 +5,7 @@ import * as DeptApi from '@/api/system/dept'
 import * as UserApi from '@/api/system/user'
 import { EquipmentAccounts,EquipmentAccountsRules } from '../equipmentAccounts/equipmentAccounts.data'
 import * as EquipmentAccountsApi from '@/api/eam/equipmentAccounts'
+import * as EquipmentSupplierApi from '@/api/eam/equipmentSupplier'
 import * as ProductionlineApi from '@/api/wms/productionline'
 import { Productionline } from '@/views/wms/basicDataManage/factoryModeling/productionline/productionline.data'
 import * as WorkshopApi from '@/api/wms/workshop'
@@ -19,6 +20,8 @@ export interface User {
   nickname: string
 }
 
+
+const equipmentSupplierList = await EquipmentSupplierApi.getEquipmentSupplierNoPage({})
 const allDeptList = await DeptApi.getSimpleDeptList()
 const deptList = ref<Tree[]>([]) // 树形结构
 const userList = ref<User[]>([]) 
@@ -136,13 +139,55 @@ export const EquipmentSigning = useCrudSchemas(reactive<CrudSchema[]>([
     label: '供应商编号',
     field: 'supplierCode',
     sort: 'custom',
-    isSearch: true
+    isSearch: false,
+    isForm: true,
+    isDetail: false,
+    isTable: false,
+    isTableForm: false,
+    form: {
+      component: 'Select',
+      componentProps: {
+        options: equipmentSupplierList,
+        optionsAlias: {
+          labelField: 'name',
+          valueField: 'number'
+        },
+        disabled: true,
+      }
+    }
   },
+  // {
+  //   label: '供应商编号',
+  //   field: 'supplierName',
+  //   sort: 'custom',
+  //   isSearch: false,
+  //   isForm: true,
+  //   isDetail: false,
+  //   isTable: false,
+  //   isTableForm: false,
+  //   form: {
+  //     component: 'Input',
+  //     componentProps: {
+  //       disabled: true
+  //     }
+  //   }
+  // },
   {
     label: '供应商联系人',
     field: 'supplierPeople',
     sort: 'custom',
-    isSearch: true
+    isSearch: true,
+    form: {
+      component: 'Select',
+      componentProps: {
+        options: userList.value,
+        optionsAlias: {
+          labelField: 'nickname',
+          valueField: 'id'
+        },
+        disabled: true,
+      }
+    }
   },
   {
     label: '供应商联系方式',
@@ -296,34 +341,34 @@ export const EquipmentSigning = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
-  {
-    label: '产线编号',
-    field: 'lineCode',
-    sort: 'custom',
-    isSearch: true,
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
-        multiple:true,
-        searchField: 'code', // 查询弹窗赋值字段
-        searchTitle: '生产线信息', // 查询弹窗标题
-        searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
-        searchPage: ProductionlineApi.getProductionlinePage, // 查询弹窗所需分页方法
-        searchCondition: [{
-          key:'workshopCode',
-          value:'workshopCode',
-          message: '请填写车间代码！',
-          isMainValue: true
-        },{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }]
-      }
-    }
-  },
+  // {
+  //   label: '产线编号',
+  //   field: 'lineCode',
+  //   sort: 'custom',
+  //   isSearch: true,
+  //   form: {
+  //     // labelMessage: '信息提示说明！！！',
+  //     componentProps: {
+  //       isSearchList: true, // 开启查询弹窗
+  //       searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
+  //       multiple:true,
+  //       searchField: 'code', // 查询弹窗赋值字段
+  //       searchTitle: '生产线信息', // 查询弹窗标题
+  //       searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
+  //       searchPage: ProductionlineApi.getProductionlinePage, // 查询弹窗所需分页方法
+  //       searchCondition: [{
+  //         key:'workshopCode',
+  //         value:'workshopCode',
+  //         message: '请填写车间代码！',
+  //         isMainValue: true
+  //       },{
+  //         key: 'available',
+  //         value: 'TRUE',
+  //         isMainValue: false
+  //       }]
+  //     }
+  //   }
+  // },
   // {
   //   label: '工序编号',
   //   field: 'processCode',

src/views/eam/equipmentSigning/index.vue

@@ -67,6 +67,7 @@ import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import Detail from '@/components/Detail/src/Detail.vue'
 import * as UserApi from '@/api/system/user'
+import * as EquipmentSupplierApi from '@/api/eam/equipmentSupplier'
 
 defineOptions({ name: 'EquipmentSigning' })
 
@@ -84,10 +85,17 @@ routeName.value = route.name
 const tableColumns = ref(EquipmentSigning.allSchemas.tableColumns)
 
 // 查询页面返回
-const searchTableSuccess = (formField, searchField, val, formRef) => {
+const searchTableSuccess = async (formField, searchField, val, formRef) => {
+  const setV = {}
+  setV[formField] = val[0][searchField]
+  if(formField == 'equipmentCode'){
+    setV['supplierCode'] = val[0]['supplierCode']
+    const equipmentSupplierList = await EquipmentSupplierApi.getEquipmentSupplierNoPage({})
+    const entry = equipmentSupplierList.find(item => item.number == val[0]['supplierCode'])
+    setV['supplierTelephone'] = entry.phone
+    setV['supplierPeople'] = Number(entry.contacts)
+  }
   nextTick(() => {
-    const setV = {}
-    setV[formField] = val[0][searchField]
     formRef.setValues(setV)
   })
 }

src/views/eam/toolMod/index.vue

@@ -57,7 +57,7 @@
   <ImportForm ref="importFormRef" url="/eam/basic/tool-mod/import" :importTemplateData="importTemplateData" @success="importSuccess" />
 
   <!-- 表单弹窗：添加/修改 -->
-  <teamForm ref="basicFormRef" @success="formsSuccess" :formAllSchemas="ToolMod.allSchemas"/>
+  <TeamForm ref="basicFormRef" @success="formsSuccess" :formAllSchemas="ToolMod.allSchemas"/>
 </template>
 
 <script setup lang="ts">

src/views/eam/toolMod/operateForm.vue

@@ -8,6 +8,18 @@
       label-width="80px"
     >
       <el-row>
+      <el-col :span="24">
+          <el-form-item label="类型" prop="type">
+            <el-select v-model="formData.type" placeholder="请选择类型">
+              <el-option
+                v-for="dict in getStrDictOptions(DICT_TYPE.DEVICE_TYPE)"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
         <el-col :span="24">
           <el-form-item label="工装" prop="toolCode">
             <div class="tag-container flex gap-2">
@@ -48,23 +60,9 @@
             </div>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="类型" prop="type">
-            <el-select v-model="formData.type" placeholder="请选择类型">
-              <el-option
-                v-for="dict in getStrDictOptions(DICT_TYPE.DEVICE_TYPE)"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
+        <el-col :span="24">
           <el-form-item label="备注" prop="remark">
-            <el-input v-model="formData.remark" placeholder="请输入内容" />
+            <el-input type='textarea' v-model="formData.remark" placeholder="请输入内容" />
           </el-form-item>
         </el-col>
       </el-row>

src/views/eam/toolMod/toolMod.data.ts

@@ -14,6 +14,17 @@ export const ToolModRules = reactive({
 })
 
 export const ToolMod = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '类型',
+    field: 'type',
+    sort: 'custom',
+    dictType: DICT_TYPE.DEVICE_TYPE,
+    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    isSearch: true,
+    form: {
+      component: 'Select',
+    }
+  },
   {
     label: '工装编码',
     field: 'toolCode',
@@ -108,17 +119,7 @@ export const ToolMod = useCrudSchemas(reactive<CrudSchema[]>([
   //     }
   //   }
   // },
-  {
-    label: '类型',
-    field: 'type',
-    sort: 'custom',
-    dictType: DICT_TYPE.DEVICE_TYPE,
-    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
-    isSearch: true,
-    form: {
-      component: 'Select'
-    }
-  },
+  
   // {
   //   label: '部门',
   //   field: 'departmentCode',