Merge branch 'master' of http://dev.ccwin-in.com:3000/eam/eam-ui

src/components/Detail/src/Detail.vue

@@ -460,7 +460,7 @@ const buttonTableClick = async (val, row) => {
   if (val == 'edit') {
     // 编辑
     openForm('update', row)
-    // emit('detailOpenForm',val, row)
+    emit('detailOpenForm',val, row)
   } else if (val == 'delete') {
     // 删除
     handleDelete(row.id)

src/components/ImportForm/src/ImportForm.vue

@@ -88,8 +88,8 @@
     </el-upload>
     <template #footer>
       <div class="flex items-center">
-        <div class="flex-1 text-left">
+        <div class="flex-1 text-left" >
-          <el-button type="primary" plain @click="importTemplate">
+          <el-button type="primary" plain @click="importTemplate" v-if="isShow">
             <Icon icon="ep:download" />
             下载模板
           </el-button>
@@ -166,6 +166,12 @@ const props = defineProps({
     required: false,
     default: false
   },
+  // 是否显示下载模板按钮
+  isShow: {
+    type: Boolean,
+    required: false,
+    default: true
+  },
   outFile: {
     type: Boolean,
     required: false,

src/views/eam/basic/deviceMaintenance/deviceMaintenance.data.ts

@@ -123,7 +123,6 @@ export const DeviceMaintenance = useCrudSchemas(reactive<CrudSchema[]>([
       component: 'Select'
     },
   },
-
   {
     label: '人数',
     field: 'peoples',
@@ -134,8 +133,12 @@ export const DeviceMaintenance = useCrudSchemas(reactive<CrudSchema[]>([
     },
     form: {
       component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 0
       }
     },
+  },
   {
     label: '保养所需时间（分钟）',
     field: 'estimatedMinutes',

src/views/eam/basic/item/item.data.ts

@@ -27,7 +27,7 @@ export const Item = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isSearch: true,
     table: {
-      width:110,
+      width: 110,
     },
   },
   {
@@ -44,7 +44,7 @@ export const Item = useCrudSchemas(reactive<CrudSchema[]>([
     isTable: true,
     sort: 'custom',
     table: {
-      width:110,
+      width: 110,
     },
     tableForm: {
       type: 'Select',
@@ -64,7 +64,15 @@ export const Item = useCrudSchemas(reactive<CrudSchema[]>([
     label: '科目',
     field: 'subject',
     sort: 'custom',
+    dictType: DICT_TYPE.ITEM_SUBJECT,
+    dictClass: 'string',
+    isSearch: false,
+    isTable: true,
+    tableForm: {
+      type: 'Select'
+    }
   },
+
   {
     label: '科目代码',
     field: 'subjectCode',
@@ -129,7 +137,7 @@ export const Item = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'reprocurement',
     sort: 'custom',
     table: {
-      width:110,
+      width: 110,
     },
     form: {
       component: 'InputNumber',
@@ -141,7 +149,7 @@ export const Item = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'safetyStock',
     sort: 'custom',
     table: {
-      width:110,
+      width: 110,
     },
     form: {
       component: 'InputNumber',
@@ -153,7 +161,7 @@ export const Item = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'cost',
     sort: 'custom',
     table: {
-      width:110,
+      width: 110,
     },
   },
   {
@@ -161,7 +169,7 @@ export const Item = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'purchaser',
     sort: 'custom',
     table: {
-      width:100,
+      width: 100,
     },
   },
   {

src/views/eam/basic/moldMaintenance/moldMaintenance.data.ts

@@ -122,6 +122,38 @@ export const MoldMaintenance = useCrudSchemas(reactive<CrudSchema[]>([
       component: 'Select'
     },
   },
+  {
+    label: '人数',
+    field: 'peoples',
+    sort: 'custom',
+    isSearch: false,
+    table: {
+      width: 150,
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 0
+      }
+    },
+  },
+  {
+    label: '保养所需时间（分钟）',
+    field: 'estimatedMinutes',
+    sort: 'custom',
+    isSearch: false,
+    table: {
+      width: 170,
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 0
+      }
+    },
+  },
   {
     label: '是否可用',
     field: 'available',

src/views/eam/device/devicemaintenancejob/deviceMaintenanceMain.data.ts

@@ -25,7 +25,7 @@ export const DeviceMaintenanceMainRules = reactive({
   type: [required],
   classes: [required],
   faultType: [required],
-  describes : [
+  describes: [
     required,
     { max: 200, message: '不得超过200个字符', trigger: 'blur' },
   ],
@@ -159,13 +159,13 @@ export const DeviceMaintenanceMain = useCrudSchemas(reactive<CrudSchema[]>([
         placeholder: "请先选择设备"
       },
     },
-    isSearch:true,
+    isSearch: true,
-    search:{
+    search: {
       component: 'Select',
       api: () => userListAll,
       componentProps: {
-        collapseTags:true,
+        collapseTags: true,
-        collapseTagsTooltip:true,
+        collapseTagsTooltip: true,
         optionsAlias: {
           labelField: 'nickname',
           valueField: 'id'
@@ -295,7 +295,7 @@ export const DeviceMaintenanceMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 300,
       fixed: 'right'
     },
-    isDetail:false
+    isDetail: false
   }
 ]))
 
@@ -362,31 +362,38 @@ export const DeviceMaintenanceDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'maintenances',
     sort: 'custom',
     isDetail: false,
-    formatter: (_: Recordable, __: TableColumn, cellValue) => {
+    // formatter: (_: Recordable, __: TableColumn, cellValue) => {
-      const cellValueList = cellValue ? cellValue.split(',') : [];
+    //   let cellValueList = []
-      return userListAll
+    //   if (Array.isArray(cellValue)) {
-        .filter(item => cellValueList.includes(item.id.toString()))
+    //     cellValueList = cellValue
-        .map(item => item.nickname)
+    //   } else {
-        .join(',');
+    //     cellValueList = cellValue ? cellValue.split(',') : [];
-    },
+    //   }
+    //   // const cellValueList = cellValue  ? cellValue.split(',') : [];
+    //   return userListAll
+    //     .filter(item => cellValueList.includes(item.id.toString()))
+    //     .map(item => item.nickname)
+    //     .join(',');
+    // },
+    isTable:false,
     tableForm: {
       type: 'Select',
       initOptions: userListAll,
-      multiple:true,
+      multiple: true,
-      collapseTags:true,
+      collapseTags: true,
-      collapseTagsTooltip:true,
+      collapseTagsTooltip: true,
       optionsAlias: {
         labelField: 'nickname',
         valueField: 'id'
       }
     },
-    form:{
+    form: {
       component: 'Select',
       // api: () => dutyUserList,
       componentProps: {
-        multiple:true,
+        multiple: true,
-        collapseTags:true,
+        collapseTags: true,
-        collapseTagsTooltip:true,
+        collapseTagsTooltip: true,
         optionsAlias: {
           labelField: 'name',
           valueField: 'id'
@@ -394,18 +401,27 @@ export const DeviceMaintenanceDetail = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '维修人',
+    field: 'maintenancesName',
+    sort: 'custom',
+    isForm:false,
+    isDetail:true,
+    isTable:true,
+    isTableForm:false
+  },
   {
     label: '备件',
     field: 'itemNumbers1',
     sort: 'custom',
     table: {
     },
-    tableForm:{
+    tableForm: {
       isInpuFocusShow: true, // 开启查询弹窗
       searchListPlaceholder: '请选择备件',
       searchField: 'itemNumbers1',
       searchTitle: '备件',
-      multiple:true,
+      multiple: true,
       searchAllSchemas: ItemSearchTable.allSchemas,
       searchPage: ItemApi.getItemList,
       searchCondition: [{
@@ -422,7 +438,7 @@ export const DeviceMaintenanceDetail = useCrudSchemas(reactive<CrudSchema[]>([
         searchListPlaceholder: '请选择备件', // 输入框占位文本
         searchField: 'itemNumbers1', // 查询弹窗赋值字段
         searchTitle: '备件', // 查询弹窗标题
-        multiple:true,
+        multiple: true,
         searchAllSchemas: ItemSearchTable.allSchemas, // 查询弹窗所需类
         searchPage: ItemApi.getItemList, // 查询弹窗所需分页方法
         searchCondition: [{
@@ -441,9 +457,9 @@ export const DeviceMaintenanceDetail = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     table: {
     },
-    isForm:false,
+    isForm: false,
-    isDetail:false,
+    isDetail: false,
-    isTable:false,
+    isTable: false,
     isSearch: false,
     isTableForm: false,
   },
@@ -489,7 +505,7 @@ export const DeviceMaintenanceMainSecRules = reactive({
   type: [required],
   classes: [required],
   faultType: [required],
-  describes : [
+  describes: [
     required,
     { max: 200, message: '不得超过200个字符', trigger: 'blur' },
   ],
@@ -758,6 +774,6 @@ export const DeviceMaintenanceMainSec = useCrudSchemas(reactive<CrudSchema[]>([
       width: 300,
       fixed: 'right'
     },
-    isDetail:false
+    isDetail: false
   }
 ]))

src/views/eam/device/devicemaintenancejob/index.vue

@@ -770,8 +770,9 @@ const submitFormSec = async (formType, data) => {
 
 
 const detailOpenForm = (type, row) =>{
-  console.log("type",type);
+  row.maintenances =  row.maintenances.split(',').map(item=>Number(item))
-  console.log("row",row);
+ 
+  console.log(row.maintenances)
   DeviceMaintenanceDetail.allSchemas.tableFormColumns.map((item) => {
     // if(purchaseReceiptRecordNumberRef.value == ''){
     //   if (item.field == 'itemCode') {

src/views/eam/item/countadjustWork/index.vue

@@ -42,7 +42,7 @@
     :detailButtonIsShow="true"/>
   <!-- 导入 -->
   <ImportForm ref="importFormRef" url="/eam/countJobDetail/import" :importTemplateData="importTemplateData"
-    @success="importSuccess" />
+    @success="importSuccess" :isShow="false"/>
 </template>
 
 <script setup lang="ts">

src/views/eam/item/itemAccounts/itemAccounts.data.ts

@@ -169,6 +169,7 @@ export const ItemAccounts = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'itemDO.isRadeIn',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
+    isSearch: false,
     isTable: true,
     sort: 'custom',
     table: {
@@ -188,6 +189,8 @@ export const ItemAccounts = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  
+  
   {
     label: '是否可用',
     field: 'available',

src/views/eam/item/itemApplyMain/index.vue

@@ -31,7 +31,7 @@
     :tableAllSchemas="ItemApplyDetail.allSchemas" :tableFormRules="ItemApplyDetailRules" :tableData="tableData"
     :apiUpdate="ItemApplyMainApi.updateItemApplyMain" :apiCreate="ItemApplyMainApi.createItemApplyMain"
     :isBusiness="true" @handleAddTable="handleAddTable" @handleDeleteTable="handleDeleteTable"
-    @searchTableSuccess="searchTableSuccess" @submitForm="submitForm" />
+    @searchTableSuccess="searchTableSuccess" @submitForm="submitForm" @formSelectChange='formSelectChange' />
 
   <!-- 详情 -->
   <Detail ref="detailRef" :isBasic="false" :allSchemas="ItemApplyMain.allSchemas"
@@ -78,7 +78,6 @@
   const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
     nextTick(async () => {
       if (type == 'tableForm') {
-        console.log(formField);
         // 明细查询页赋值
         if (formField == 'itemNumber') {
           let subList = tableData.value
@@ -126,6 +125,11 @@
       formRef.setValues(setV)
     })
   }
+   const formSelectChange = (field, val, row) => {
+     if (field == 'type') {
+       row['deviceNumber'] = ""
+     }
+  }
 
   // 子表新增的时候选择表格之后需要会显得字段
   // const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
@@ -167,8 +171,6 @@
     } else if (val == 'refresh') { // 刷新
       getList()
     } else if (val == 'filtrate') { // 筛选
-    } else { // 其他按钮
-      console.log('其他按钮', item)
     } 
   }
 

src/views/eam/item/itemOrderMain/itemOrderMain.data.ts

@@ -98,31 +98,31 @@ export const ItemOrderMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'dutyParagraph',
     sort: 'custom',
   },
-  {
+  // {
-    label: '是否关闭',
+  //   label: '是否关闭',
-    field: 'available',
+  //   field: 'available',
-    dictType: DICT_TYPE.TRUE_FALSE,
+  //   dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
+  //   dictClass: 'string',
-    isSearch: false,
+  //   isSearch: false,
-    isTable: true,
+  //   isTable: true,
-    sort: 'custom',
+  //   sort: 'custom',
-    table: {
+  //   table: {
-      width: 150
+  //     width: 150
-    },
+  //   },
-    tableForm: {
+  //   tableForm: {
-      type: 'Select',
+  //     type: 'Select',
-      inactiveValue: 'FALSE',
+  //     inactiveValue: 'FALSE',
-      disabled: true
+  //     disabled: true
-    },
+  //   },
-    form: {
+  //   form: {
-      component: 'Switch',
+  //     component: 'Switch',
-      value: 'FALSE',
+  //     value: 'FALSE',
-      componentProps: {
+  //     componentProps: {
-        inactiveValue: 'FALSE',
+  //       inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
+  //       activeValue: 'TRUE'
-      }
+  //     }
-    }
+  //   }
-  },
+  // },
   {
     label: '状态',
     field: 'status',

src/views/eam/item/replaceItemDes/index.vue

@@ -138,11 +138,12 @@
   // form表单提交
   const formsSuccess = async (formType, data) => {
     data.filePathList = data.filePathListView.map(item=>item.url)
+    console.log(formType)
     if (formType === 'create') {
       await ReplaceItemDesApi.createReplaceItemDes(data)
       message.success(t('common.createSuccess'))
     } else {
-      await ReplaceItemDesApi.createReplaceItemDes(data)
+      await ReplaceItemDesApi.updateReplaceItemDes(data)
       message.success(t('common.updateSuccess'))
     }
     basicFormRef.value.dialogVisible = false

src/views/eam/item/transaction/transaction.data.ts

@@ -61,6 +61,15 @@ export const Transaction = useCrudSchemas(reactive<CrudSchema[]>([
       component: 'Radio'
     },
   },
+  {
+    label: '关联单号',
+    field: 'associatedNumber',
+    sort: 'custom',
+    isSearch: false,
+    form: {
+      component: 'Radio'
+    },
+  },
   {
     label: '计量单位',
     field: 'uom',

src/views/eam/mold/moldmaintenancejob/index.vue

@@ -595,8 +595,8 @@ const submitForm = async (formType, data) => {
   }
 }
 const detailOpenForm = (type, row) =>{
-  console.log("type",type);
+  
-  console.log("row",row);
+  row.maintenances =  row.maintenances.split(',').map(item=>Number(item))
   MoldMaintenanceDetail.allSchemas.tableFormColumns.map((item) => {
     // if(purchaseReceiptRecordNumberRef.value == ''){
     //   if (item.field == 'itemCode') {

src/views/eam/mold/moldmaintenancejob/moldMaintenanceMain.data.ts

@@ -313,32 +313,39 @@ export const MoldMaintenanceDetail = useCrudSchemas(reactive<CrudSchema[]>([
     label: '维修人',
     field: 'maintenances',
     sort: 'custom',
-    api: () => userListAll,
+    isDetail: false,
-    formatter: (_: Recordable, __: TableColumn, cellValue) => {
+    // formatter: (_: Recordable, __: TableColumn, cellValue) => {
-      const cellValueList = cellValue ? cellValue.split(',') : [];
+    //   let cellValueList = []
-      return userListAll
+    //   if (Array.isArray(cellValue)) {
-        .filter(item => cellValueList.includes(item.id.toString()))
+    //     cellValueList = cellValue
-        .map(item => item.nickname)
+    //   } else {
-        .join(',');
+    //     cellValueList = cellValue ? cellValue.split(',') : [];
-    },
+    //   }
+    //   // const cellValueList = cellValue  ? cellValue.split(',') : [];
+    //   return userListAll
+    //     .filter(item => cellValueList.includes(item.id.toString()))
+    //     .map(item => item.nickname)
+    //     .join(',');
+    // },
+    isTable:false,
     tableForm: {
       type: 'Select',
       initOptions: userListAll,
-      multiple:true,
+      multiple: true,
-      collapseTags:true,
+      collapseTags: true,
-      collapseTagsTooltip:true,
+      collapseTagsTooltip: true,
       optionsAlias: {
         labelField: 'nickname',
         valueField: 'id'
       }
     },
-    form:{
+    form: {
       component: 'Select',
-      api: () => userListAll,
+      // api: () => dutyUserList,
       componentProps: {
-        multiple:true,
+        multiple: true,
-        collapseTags:true,
+        collapseTags: true,
-        collapseTagsTooltip:true,
+        collapseTagsTooltip: true,
         optionsAlias: {
           labelField: 'name',
           valueField: 'id'
@@ -346,6 +353,15 @@ export const MoldMaintenanceDetail = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '维修人',
+    field: 'maintenancesName',
+    sort: 'custom',
+    isForm:false,
+    isDetail:true,
+    isTable:true,
+    isTableForm:false
+  },
   {
     label: '备件',
     field: 'itemNumbers1',