Просмотр исходного кода

refactor: 重构表格与表单时间对应数据库字段为createAt

bxy 1 год назад
Родитель
Сommit
f8df854d63

+ 2 - 2
src/api/datamanagement/alert-show.ts

@@ -24,7 +24,7 @@ export interface AddForm {
   description: String,    // 问题描述
   pictures: Array<string>,// 图片
   workspaceId: Number,    // 工位id/地点
-  issueTime: String,      // 问题时间(默认是creatAt)
+  createAt: String,      // 问题时间(默认是createAt)
   issueState: Number,     // 问题单状态:1-待审核、2-待处理、3-待复核、4-已退回、5-已处理
 };
 export const addShowTableData = (body: AddForm) => {
@@ -51,7 +51,7 @@ export interface EditForm {
   description: String,    // 问题描述
   pictures: Array<string>,// 图片
   workspaceId: Number,    // 工位id/地点
-  issueTime: String,      // 问题时间(默认是creatAt)
+  createAt: String,      // 问题时间(默认是createAt)
   issueState: Number,     // 问题单状态:1-待审核、2-待处理、3-待复核、4-已退回、5-已处理
   isHide?: Boolean,       // 问题单是否隐藏(根据UI编辑/添加表单没有这个选项。改变隐藏显示另有接口) 
 };

+ 1 - 11
src/views/datamanager/alertformdata/components/common/AlertTable.vue

@@ -24,11 +24,7 @@
           {{ getNameByWorkid(row.workshopId, row.workspaceId, locationOptions) }}
         </template>
       </el-table-column>
-      <el-table-column label="时间" prop="tableTime" width="250">
-        <template #default="{ row }">
-          {{ getTimeByTab(row.issueTime, row.createdAt) }}
-        </template>
-      </el-table-column>
+      <el-table-column label="时间" prop="createdAt" width="250"></el-table-column>
       <el-table-column label="负责人" prop="personNameInCharge" width="100"></el-table-column>
       <el-table-column label="处理状态" prop="issueState">
         <template #default="{ row }">
@@ -71,7 +67,6 @@ interface DataSourceItem {
   description: String,    // 问题描述
   workspaceId: Number[],  // 工位id(地点=车间+工位?)
   createdAt: String,
-  issueTime: String,
   personNameInCharge: String,
   issueState: Number,     // 问题单状态:1-待审核、2-待处理、3-待复核、4-已退回、5-已处理
 };
@@ -109,11 +104,6 @@ const handleDelete = (row) => {
   props.onDelete(row);
 };
 
-const getTimeByTab = (issueTime, createTime) => {
-  if (issueTime) return issueTime;
-  else return createTime;
-}
-
 const colorOfState = ({ row, columnIndex }) => {
   if (columnIndex === 7) {
     if (row.issueState === 4) return { color: "#FF4D4F" };

+ 5 - 5
src/views/datamanager/alertformdata/components/common/QuestionFormBase.vue

@@ -35,8 +35,8 @@
           <el-cascader v-model="workLocation" :options="locationOptions" :props="location" placeholder="请选择问题地点"
             clearable @change="handleCascaderChange" />
         </el-form-item>
-        <el-form-item label="问题时间:" prop="issueTime" :rules="{ required: true, message: '请完成必填项' }">
-          <el-date-picker v-model="formData.issueTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss.SSS"
+        <el-form-item label="问题时间:" prop="createdAt" :rules="{ required: true, message: '请完成必填项' }">
+          <el-date-picker v-model="formData.createdAt" type="datetime" value-format="YYYY-MM-DD HH:mm:ss.SSS"
             placeholder="请选择问题时间" />
         </el-form-item>
         <el-form-item label="问题状态:" prop="issueState" :rules="{ required: true, message: '请完成必填项' }">
@@ -83,7 +83,7 @@ interface FormModel {
   workshopName?: string,
   workspaceId?: number,    // 工位id
   workspaceName?: string,
-  issueTime?: string,      // 时间(issueTime)
+  createdAt?: string,      // 时间
   issueState?: number,     // 状态
 };
 
@@ -103,7 +103,7 @@ const formData = reactive<FormModel>({
   pictures: [],
   workshopId: undefined,
   workspaceId: undefined,
-  issueTime: '',
+  createdAt: '',
   issueState: undefined
 });
 
@@ -144,7 +144,7 @@ const handleCopyData = () => {
   formData.pictures = props.initialData?.pictures;
   formData.workshopId = props.initialData?.workshopId;
   formData.workspaceId = props.initialData?.workspaceId;
-  formData.issueTime = props.initialData?.issueTime;
+  formData.createdAt = props.initialData?.createdAt;
   formData.issueState = props.initialData?.issueState;
 
   workLocation.value = [props.initialData?.workshopId, props.initialData?.workspaceId!];