fix(历史控制计划):列表修改

src/locales/controlPlan/CCAPControlPlan/CCAPControlPlanManagement/history/cn.json

@@ -12,17 +12,18 @@
   "controlPlanStatus": "控制计划状态",
   "controlPlanNumber": "控制计划编号",
   "productionAddress": "生产地址",
-  "compilationDeadline": "编制截止日期",
+  "deadline": "截止日期",
   "revisionDate": "修订日期",
   "creationDate": "创建日期",
   "productionPlant": "生产厂",
   "productionSituation": "生产情况",
-  "keyPartsListFormStatus": "关键件清单表单状态",
-  "keyProcessFormStatus": "关键工序……表单状态",
-  "COPTestAndChecklistFormStatus": "COP试验和检查表表单状态",
+  "keyPartsList": "关键件清单",
+  "keyProcess": "关键工序",
+  "COPTestAndChecklist": "COP试验和检查表",
   "operation": "操作",
   "serialNumber": "序号",
   "viewHistoricalControlPlan": "查看历史控制计划",
+  "viewFile": "查看文件",
   "view": "查看",
   "revoke": "撤销",
   "adjustCompilationResponsiblePerson": "调整编制负责人",

src/locales/controlPlan/CCAPControlPlan/CCAPControlPlanManagement/history/en.json

@@ -12,17 +12,18 @@
   "controlPlanStatus": "Control Plan Status",
   "controlPlanNumber": "Control Plan Number",
   "productionAddress": "Production Address",
-  "compilationDeadline": "Compilation Deadline",
+  "deadline": "Deadline",
   "revisionDate": "Revision Date",
   "creationDate": "Creation Date",
   "productionPlant": "Production Plant",
   "productionSituation": "Production Situation",
-  "keyPartsListFormStatus": "Key Parts List Form Status",
-  "keyProcessFormStatus": "Key Process...Form Status",
-  "COPTestAndChecklistFormStatus": "COP Test and Checklist Form Status",
+  "keyPartsList": "Key Parts List",
+  "keyProcess": "Key Process",
+  "COPTestAndChecklist": "COP Test and Checklist",
   "operation": "Operation",
   "serialNumber": "Ordinal",
   "viewHistoricalControlPlan": "View Historical Control Plan",
+  "viewFile": "View File",
   "view": "View",
   "revoke": "Revoke",
   "adjustCompilationResponsiblePerson": "Adjust Compilation Responsible Person",

src/views/controlPlan/CCAPControlPlan/CCAPControlPlanManagement/history.vue

@@ -204,7 +204,7 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column label="事业部" width="150" align="center" prop="businessUnitName" >
+      <el-table-column label="事业部" width="150" align="center" prop="businessUnitId" >
         <template #header>
           <div style="display: flex;flex-direction: column">
             <div>{{cn.businessDivision}}</div>
@@ -212,7 +212,7 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column label="车型代码" width="150" align="center" prop="vehicleTypeCode" >
+      <el-table-column label="车型代码" width="150" align="center" prop="vehicleModelCode" >
         <template #header>
           <div style="display: flex;flex-direction: column">
             <div>{{cn.vehicleTypeCode}}</div>
@@ -220,7 +220,7 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column label="车型系列" width="150" align="center" prop="vehicleTypeSeries" >
+      <el-table-column label="车型系列" width="150" align="center" prop="vehicleSeries" >
         <template #header>
           <div style="display: flex;flex-direction: column">
             <div>{{cn.vehicleTypeSeries}}</div>
@@ -244,14 +244,6 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column label="编制截止日期" width="170" align="center" prop="compilationDeadline" >
-        <template #header>
-          <div style="display: flex;flex-direction: column">
-            <div>{{cn.compilationDeadline}}</div>
-            <div>{{en.compilationDeadline}}</div>
-          </div>
-        </template>
-      </el-table-column>
       <el-table-column label="创建人" width="170" align="center" prop="createBy" >
         <template #header>
           <div style="display: flex;flex-direction: column">
@@ -268,14 +260,6 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column label="创建日期" width="170" align="center" prop="createTime" >
-        <template #header>
-          <div style="display: flex;flex-direction: column">
-            <div>{{cn.creationDate}}</div>
-            <div>{{en.creationDate}}</div>
-          </div>
-        </template>
-      </el-table-column>
       <el-table-column label="生产厂" width="170" align="center" prop="productionFactory" >
         <template #header>
           <div style="display: flex;flex-direction: column">
@@ -292,31 +276,74 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column label="关键件清单表单状态" fixed="right" width="190" align="center" prop="keyPartsListTaskStatus" >
+      <el-table-column label="创建日期" width="170" align="center" prop="createTime" >
+        <template #header>
+          <div style="display: flex;flex-direction: column">
+            <div>{{cn.creationDate}}</div>
+            <div>{{en.creationDate}}</div>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column label="截止日期" width="170" align="center" prop="deadline" >
+              <template #header>
+                <div style="display: flex;flex-direction: column">
+                  <div>{{cn.deadline}}</div>
+                  <div>{{en.deadline}}</div>
+                </div>
+              </template>
+            </el-table-column>
+      <el-table-column label="关键件清单" fixed="right" width="120" align="center" prop="" >
         <template #header>
           <div style="display: flex;flex-direction: column">
-            <div>{{cn.keyPartsListFormStatus}}</div>
-            <div>{{en.keyPartsListFormStatus}}</div>
+            <div>{{cn.keyPartsList}}</div>
+            <div>{{en.keyPartsList}}</div>
           </div>
         </template>
+        <template #default="scope">
+          <!-- 查看文件-->
+          <el-button link type="primary" @click="handleView(scope.row)">
+            <div>
+              <div>{{cn.viewFile}}</div>
+              <div>{{en.viewFile}}</div>
+            </div>
+          </el-button>
+        </template>
       </el-table-column>
-      <el-table-column label="关键工序……表单状态" fixed="right" width="190" align="center" prop="keyProcessTaskStatus" >
+      <el-table-column label="关键工序" fixed="right" width="120" align="center" prop="" >
         <template #header>
           <div style="display: flex;flex-direction: column">
-            <div>{{cn.keyProcessFormStatus}}</div>
-            <div>{{en.keyProcessFormStatus}}</div>
+            <div>{{cn.keyProcess}}</div>
+            <div>{{en.keyProcess}}</div>
+          </div>
+        </template>
+        <template #default="scope">
+          <!-- 查看文件-->
+          <el-button link type="primary" @click="handleView(scope.row)">
+            <div>
+              <div>{{cn.viewFile}}</div>
+              <div>{{en.viewFile}}</div>
             </div>
+          </el-button>
         </template>
       </el-table-column>
-      <el-table-column label="COP试验和检查表表单状态" fixed="right" width="250" align="center" prop="copTestAndInspectionTaskStatus" >
+      <el-table-column label="COP试验和检查表" fixed="right" width="120" align="center" prop="" >
         <template #header>
           <div style="display: flex;flex-direction: column">
-            <div>{{cn.COPTestAndChecklistFormStatus}}</div>
-            <div>{{en.COPTestAndChecklistFormStatus}}</div>
+            <div>{{cn.COPTestAndChecklist}}</div>
+            <div>{{en.COPTestAndChecklist}}</div>
+          </div>
+        </template>
+        <template #default="scope">
+          <!-- 查看文件-->
+          <el-button link type="primary" @click="handleView(scope.row)">
+            <div>
+              <div>{{cn.viewFile}}</div>
+              <div>{{en.viewFile}}</div>
             </div>
+          </el-button>
         </template>
       </el-table-column>
-      <el-table-column label="控制计划状态" fixed="right" width="150" align="center" prop="controlPlanStatus" >
+      <el-table-column label="控制计划状态" fixed="right" width="120" align="center" prop="controlPlanStatus" >
         <template #header>
           <div style="display: flex;flex-direction: column">
             <div>{{cn.controlPlanStatus}}</div>
@@ -324,7 +351,7 @@
           </div>
         </template>
         <template #default="scope">
-          <span :class="getStatusClass(changeControlPlanStatus(scope.row.controlPlanStatus))">{{ changeControlPlanStatus(scope.row.controlPlanStatus) }}</span>
+          <dict-tag :options="control_plan_status" :value="scope.row.controlPlanStatus"/>
         </template>
       </el-table-column>
       <el-table-column label="操作" fixed="right"  align="center" class-name="small-padding fixed-width">
@@ -334,6 +361,14 @@
             <div>{{en.operation}}</div>
           </div>
         </template>
+        <template #default="scope">
+          <el-button link type="primary" @click="handleView(scope.row)">
+            <div>
+              <div>{{cn.view}}</div>
+              <div>{{en.view}}</div>
+            </div>
+          </el-button>
+        </template>
       </el-table-column>
     </el-table>
 
@@ -374,6 +409,7 @@ const queryParams = ref({
   vehicleSeries:null,
   productionAddress:null,
   versionNumber:null,
+  createBy:null,
   productionFactory:null
 });
 // 版本号 A0 - Z9
@@ -404,6 +440,8 @@ function getList() {
   getCCAPPlanHistoryList(queryParams.value).then(res => {
     total.value = res.total
     tableList.value = res.rows
+    // 按创建日期降序排列
+    // rows.sort((a, b) => new Date(b.createTime) - new Date(a.createTime))
     console.log("列表",tableList.value)
   });
 }
@@ -430,6 +468,10 @@ function resetQuery() {
   };
   handleQuery();
 }
+/** 查看文件操作 */
+function handleView(row) {
+
+}
 
 onMounted(()=>{
   getList()