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

src/api/eam/basic/moldInspection/index.ts

@@ -51,8 +51,8 @@ export const updateMoldItems = async (data: DeviceMoldItemsVO) => {
 }
 
 // 删除项记录表（设备 模具 保养 维修 巡检点检）
-export const deleteDeviceMoldItems = async (id: number) => {
+export const deleteDeviceMoldItems = async (id: number, remark: string) => {
-  return await request.delete({ url: `/eam/device-mold-items/delete?id=` + id })
+  return await request.delete({ url: `/eam/device-mold-items/delete?id=` + id + `&remark=` + remark })
 }
 
 // 导出项记录表（设备 模具 保养 维修 巡检点检） Excel

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

@@ -114,14 +114,12 @@ export const AssetsAccountControlsHistory = useCrudSchemas(reactive<CrudSchema[]
     field: 'user',
     sort: 'custom',
   },
-  // {
+  {
-  //   label: '状态',
+    label: '状态',
-  //   field: 'status',
+    field: 'status',
-  //   sort: 'custom',
+    sort: 'custom',
-  //   form: {
+    isForm: false,
-  //     component: 'Radio'
+  },
-  //   },
-  // },
   {
     label: '操作时间',
     field: 'createTime',

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

@@ -118,14 +118,12 @@ export const FixedAssetsControlsHistory = useCrudSchemas(reactive<CrudSchema[]>(
     field: 'user',
     sort: 'custom',
   },
-  // {
+  {
-  //   label: '状态',
+    label: '状态',
-  //   field: 'status',
+    field: 'status',
-  //   sort: 'custom',
+    sort: 'custom',
-  //   form: {
+    isForm: false,
-  //     component: 'Radio'
+  },
-  //   },
-  // },
   {
     label: '操作时间',
     field: 'createTime',

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

@@ -144,6 +144,19 @@ export const DeviceMoldItems = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
 
+  {
+    label: '是否点检',
+    field: 'isNeedInspection',
+    sort: 'custom',
+    isSearch: false,
+    formatter: (_: Recordable, __: TableColumn, cellValue: boolean) => {
+      return trueOrFalse.find((account) => account.value == cellValue)?.label
+    },
+    form: {
+      component: 'Switch',
+      value: false,
+    }
+  },
   // {
   //   label: '是否可用',
   //   field: 'available',

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

@@ -248,9 +248,10 @@
     }
     if (data.activeTime == 0) data.activeTime = null
     if (data.expireTime == 0) data.expireTime = null
-    data.filePathList = []
+    data.fileInfoList = []
-    for (let i = 0; i < data.filePathListView.length; i++) {
+    for (let i = 0; i < data.attachmentFileList.length; i++) {
-      data.filePathList.push(data.filePathListView[i].url)
+      data.filePathList.push(data.attachmentFileList[i].url)
+      data.fileInfoList.push(data.attachmentFileList[i])
     }
     if (formType === 'create') {
       await ItemApi.createItem(data)

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

@@ -134,11 +134,11 @@ export const Item = useCrudSchemas(reactive<CrudSchema[]>([
       type: 'Select'
     }
   },
-  // {
+  {
-  //   label: '单价',
+    label: '单价',
-  //   field: 'singlePrice',
+    field: 'singlePrice',
-  //   sort: 'custom',
+    sort: 'custom',
-  // },
+  },
   {
     label: '重采购点',
     field: 'reprocurement',
@@ -279,25 +279,25 @@ export const Item = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'upload',
     isTable: true,
   },
+  // {
+  //   label: '文件',
+  //   field: 'filePathListView',
+  //   sort: 'custom',
+  //   isTable: false,
+  //   table: {
+  //   },
+  //   form: {
+  //     component: 'UploadFile',
+  //     componentProps: {
+  //     }
+  //   }
+  // },
   {
     label: '文件',
-    field: 'filePathListView',
+    field: 'attachmentFileList',
-    sort: 'custom',
-    isTable: false,
-    table: {
-    },
-    form: {
-      component: 'UploadFile',
-      componentProps: {
-      }
-    }
-  },
-  {
-    label: '文件',
-    field: 'filePathList',
     sort: 'custom',
     isTable: false,
-    isForm: false,
+    isForm: true,
     table: {
     },
     form: {
@@ -312,7 +312,7 @@ export const Item = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'action',
     isForm: false,
     table: {
-      width: 180,
+      width: 200,
       fixed: 'right'
     }
   }

src/views/eam/basic/moldInspection/index.vue

@@ -52,7 +52,32 @@
 
   <!-- 详情 -->
   <Detail ref="detailRef" :isBasic="true" :allSchemas="DeviceMoldItems.allSchemas" />
-
+<Dialog 
+    ref="updateDialog"
+    title="本次修改修改描述" 
+    v-model="dialogVisible"
+    :width="600"
+    :maxHeight="700"
+    :style="{height:'450px'}"
+    :before-close="handleBeforeClose"
+  >
+    <el-form :model="updateFormValue" class="demo-form-inline">
+      <el-form-item label="备注">
+        <el-input
+          type="textarea"
+          v-model="updateFormValue.remark"
+          placeholder="请对本次修改内容添加备注"
+          clearable
+          :rows="12"
+        />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <div style="text-align: center;">
+        <el-button type="primary" @click="onSubmit">提交</el-button>
+      </div>
+    </template>
+  </Dialog>
 </template>
 
 <script setup lang="ts">
@@ -72,7 +97,15 @@ const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
 const tableColumns = ref(DeviceMoldItems.allSchemas.tableColumns)
-
+const updateDialog = ref()
+const dialogVisible = ref(false)
+const updateData = ref()
+const updateFormValue = reactive({
+  remark: '',
+})
+const openDataOld = ref()
+const openDataNew = ref()
+const operatType = ref('')
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef) => {
   nextTick(() => {
@@ -134,8 +167,11 @@ const butttondata = [
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
   if (val == 'edit') { // 编辑
+    operatType.value = 'edit'
     openForm('update', row)
   } else if (val == 'delete') { // 删除
+    operatType.value = 'delete'
+    updateData.value = row
     handleDelete(row.id)
   }
 }
@@ -143,6 +179,8 @@ const buttonTableClick = async (val, row) => {
 /** 添加/修改操作 */
 const basicFormRef = ref()
 const openForm = (type: string, row?: any) => {
+  openDataOld.value = row
+  updateFormValue.remark = ''
   basicFormRef.value.open(type, row)
 }
 
@@ -163,8 +201,14 @@ const formsSuccess = async (formType,data) => {
     await DeviceMoldItemsApi.creatMoldItems(data)
     message.success(t('common.createSuccess'))
   } else {
-    await DeviceMoldItemsApi.updateMoldItems(data)
+    openDataNew.value = data
-    message.success(t('common.updateSuccess'))
+    if(judgeSame()){
+      basicFormRef.value.dialogVisible = false
+      getList()
+    }else{
+      updateData.value = data
+      dialogVisible.value = true
+    }
   }
   basicFormRef.value.dialogVisible = false
   getList()
@@ -181,11 +225,8 @@ const handleDelete = async (id: number) => {
   try {
     // 删除的二次确认
     await message.delConfirm()
-    // 发起删除
+    dialogVisible.value = true
-    await DeviceMoldItemsApi.deleteDeviceMoldItems(id)
+
-    message.success(t('common.delSuccess'))
-    // 刷新列表
-    await getList()
   } catch {}
 }
 
@@ -230,6 +271,50 @@ const searchFormClick = (searchData) => {
   getList() // 刷新当前列表
 }
 
+const onSubmit = async () => {
+  console.log('submit!');
+  updateData.value.remark = updateFormValue.remark
+  try {
+    if(operatType.value == 'edit'){
+      await DeviceMoldItemsApi.updateMoldItems(updateData.value);
+      message.success(t('common.updateSuccess'));
+      // 假设这里是用户点击了"确定"并且操作成功
+      basicFormRef.value.dialogVisible = false; // 关闭basicFormRef窗口
+      dialogVisible.value = false; // 同时关闭updateDialog窗口
+    }else if(operatType.value == 'delete'){
+      // 发起删除
+      await DeviceMoldItemsApi.deleteDeviceMoldItems(updateData.value.id,updateData.value.remark)
+      message.success(t('common.delSuccess'))
+      dialogVisible.value = false; 
+    }
+    // 刷新列表
+    await getList()
+  } catch (error) {
+    console.error(error);
+    // 假设这里是操作失败，不关闭basicFormRef窗口
+    // 可以选择是否关闭updateDialog窗口或者显示错误信息
+    message.error(t('common.updateFailed'));
+  }
+};
+const handleBeforeClose = async(done)=>{
+  basicFormRef.value.formLoading = false
+  done()
+}
+
+// 判断两个对象中相同字段的值是否全部相同
+const judgeSame = () => {
+  // 获取openDataOld.value对象的所有键（字段名）
+  const keys = Object.keys(openDataOld.value);
+  // 使用every()方法检查每个键对应的值是否相同
+  const isSame = keys.every(key => {
+    // 检查openDataNew.value中是否有该键，并且两个对象中该键对应的值是否相同
+    return openDataNew.value.hasOwnProperty(key) && openDataOld.value[key] === openDataNew.value[key];
+  });
+
+  // 返回比较结果
+  return isSame;
+};
+
 /** 初始化 **/
 onMounted(async () => {
   getList()

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

@@ -76,7 +76,7 @@ export const DeviceMoldItems = useCrudSchemas(reactive<CrudSchema[]>([
     label: '模具编号',
     field: 'deviceNumber',
     sort: 'custom',
-    isSearch: false,
+    isSearch: true,
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
@@ -143,7 +143,19 @@ export const DeviceMoldItems = useCrudSchemas(reactive<CrudSchema[]>([
       value: false,
     }
   },
-
+  {
+    label: '是否点检',
+    field: 'isNeedInspection',
+    sort: 'custom',
+    isSearch: false,
+    formatter: (_: Recordable, __: TableColumn, cellValue: boolean) => {
+      return trueOrFalse.find((account) => account.value == cellValue)?.label
+    },
+    form: {
+      component: 'Switch',
+      value: false,
+    }
+  },
   // {
   //   label: '是否可用',
   //   field: 'available',

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

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

src/views/eam/basic/taskLog/index.vue

@@ -100,7 +100,7 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'eam:task-log:create'}), // 新增
+  // defaultButtons.defaultAddBtn({hasPermi:'eam:task-log:create'}), // 新增
   // defaultButtons.defaultImportBtn({hasPermi:'eam:task-log:import'}), // 导入
   // defaultButtons.defaultExportBtn({hasPermi:'eam:task-log:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新

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

@@ -59,6 +59,16 @@ export const ItemAccounts = useCrudSchemas(reactive<CrudSchema[]>([
       width: 110
     },
   },
+  {
+    label: '单价',
+    field: 'singlePrice',
+    sort: 'custom',
+  },
+  {
+    label: '总价',
+    field: 'totalPrice',
+    sort: 'custom',
+  },
   {
     label: '是否账内库',
     field: 'isInAccount',