报检单bug及字段调整修改

fe/PC/src/utils/detailsTableColumns/index.js

@@ -158,7 +158,6 @@ export const PurchaseReceiptJob =  [
   { label: "主表ID", prop: 'masterID' },
   { label: "任务编号", prop: 'number' },
   { label: "备注", prop: 'remark' },
-  { label: "状态", prop: 'status' },
   { label: "实际箱码", prop: 'handledPackingCode' },
   { label: "推荐供应商批次", prop: 'recommendSupplierBatch' },
   { label: "实际供应商批次", prop: 'handledSupplierBatch' },
@@ -189,6 +188,7 @@ export const PurchaseReceiptJob =  [
   { label: "供应商包装计量单位", prop: 'supplierPackUom' },
   { label: "供应商包装数量", prop: 'supplierPackQty' },
   { label: "ID", prop: "id" },
+  { label: "status", prop: 'status' },
   { label: "创建者ID", prop: "creatorId" },
   { label: "事务ID", prop: "tenantId" },
   // { label: "推荐箱码", prop: 'recommendPackingCode' },
@@ -219,7 +219,7 @@ export const InspectRequest =  [
   { label: "生产批次", prop: "lot" },
   { label: "箱码", prop: "packingCode" },
   { label: "状态", prop: "status", type: "tagFilter", filters: "requestStatus" },
-  { label: "状态", prop: "detailInspectStatus", type: "filter", filters: "detailInspectStatus" },
+  { label: "检验状态", prop: "detailInspectStatus", type: "filter", filters: "detailInspectStatus" },
   { label: "库位", prop: 'locationCode' },
   { label: "ERP库位", prop: 'locationErpCode' },
   { label: "检验单号", prop: "number" },

fe/PC/src/utils/tableColumns/index.js

@@ -1441,27 +1441,25 @@ export const lackMaterialsInfo = [
 export const InspectRequest =  [
   {
     label: "检验单号",
-    prop: "number",
+    prop: "inspectNumber",
     fixed: "left",
     type: "name",
-    width: orderWidth
   },
+  { label: "单据号", prop: 'number', width: orderWidth },
   { label: "状态", prop: "jobStatus", type: "tagFilter", filters: "jobStatus" },
-  { label: "创建时间", prop: "creationTime",type: "dateTime" },
   { label: "操作员", prop: "worker" },
   { label: "采购订单号", prop: "poNumber",width: orderWidth },
   { label: "发货单号", prop: "asnNumber",width: orderWidth },
   { label: "收货单号", prop: "receiptNumber",width: orderWidth },
+  { label: "到货单号", prop: 'purchaseReceiptRequestNumber' },
   { label: "供应商代码", prop: "supplierCode" },
-  { label: "备注", prop: 'remark' },
   // -----------------------------------------------------------------------
+  { label: "创建时间", prop: "creationTime",type: "dateTime" },
   { label: "创建者ID", prop: 'creatorId' },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
   { label: "上次修改者ID", prop: "lastModifierId" },
-  { label: "到货单号", prop: 'purchaseReceiptRequestNumber' },
   { label: "仓库", prop: 'warehouseCode' },
   { label: "要货计划单号", prop: 'rpNumber' },
-  { label: "事务ID", prop: "tenantId" },
   { label: "上游任务编号", prop: 'upStreamJobNumber' },
   { label: "任务类型", prop: 'jobType' },
   { label: "优先级", prop: 'priority' },
@@ -1475,7 +1473,8 @@ export const InspectRequest =  [
   { label: "完成者用户名", prop: 'completeUserName' },
   { label: "完成时间", prop: 'completeTime', type: "dateTime" },
   { label: "任务描述", prop: 'jobDescription' },
-  { label: "检验单号", prop: 'inspectNumber' },
+  { label: "备注", prop: 'remark' },
+  { label: "事务ID", prop: "tenantId" },
   { label: "nextAction", prop: 'nextAction' },
   // { label: "到货单号", prop: "arriveNoticeNumber",width: orderWidth },
   // { label: "要求到货日期", prop: "planArriveDate",type: "dateTime" },
@@ -1493,22 +1492,23 @@ export const InspectRequest =  [
 export const InspectNote = [
   {
     label: "检验单号",
-    prop: "number",
+    prop: "inspectNumber",
     fixed: "left",
     type: "name",
     width: orderWidth
   },
-  { label: "创建时间", prop: "creationTime",type: "dateTime" },
-  { label: "创建者ID", prop: 'creatorId' },
-  { label: "筹措员代码", prop: "worker" },
+  { label: "单据号", prop: 'number',width: orderWidth },
   { label: "到货单号", prop: 'purchaseReceiptRequestNumber' },
   { label: "采购订单号", prop: "poNumber" ,width: orderWidth },
   { label: "发货单号", prop: "asnNumber",width: orderWidth },
   { label: "收货单号", prop: "receiptNumber",width: orderWidth },
   { label: "供应商代码", prop: "supplierCode" },
+  { label: "筹措员代码", prop: "worker" },
+  { label: "创建时间", prop: "creationTime",type: "dateTime" },
+  { label: "创建者ID", prop: 'creatorId' },
   { label: "备注", prop: 'remark' },
   // -----------------------------------------------------------------------
-  { label: "检验单号", prop: 'inspectNumber',width: orderWidth },
+  
   { label: "要货计划单号", prop: 'rpNumber',width: orderWidth },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
   { label: "上次修改者ID", prop: "lastModifierId" },

fe/PC/src/views/rawMaterialManage/quality/InspectRequest.vue

@@ -480,7 +480,7 @@ export default {
         { label: "箱码", prop: "packingCode", width:'100%' },
         { label: "物品代码", prop: "itemCode", width:'100%'  },
         { label: "物品名称", prop: "itemName", width:'100%' },
-        { label: "单位", prop: "receiveUom", width:'100%' },
+        // { label: "单位", prop: "receiveUom", width:'100%' },
         { label: "收货数量", prop: "receiveQty", width:'100%' },
         { label: "状态", prop: "detailInspectStatus", type: "filter", filters: "detailInspectStatus", width:'100%' },
         { type: "button", label: "检验", prop: "buttonHide", width:'100%' },
@@ -970,11 +970,11 @@ export default {
     },
     //设置指定行、列、具体单元格颜色
     cellStyle({row, column, rowIndex, columnIndex}){
-      if (row.detailInspectStatus == 1 && columnIndex === 6) {
+      if (row.detailInspectStatus == 1 && columnIndex === 5) {
         return 'background:#42a9b9;color:#fff' //默认合格
-      } else if (row.detailInspectStatus == 2 && columnIndex === 6) {
+      } else if (row.detailInspectStatus == 2 && columnIndex === 5) {
         return 'background:#42b983;color:#fff'//合格
-      } else if (row.detailInspectStatus == 3 && columnIndex === 6) {
+      } else if (row.detailInspectStatus == 3 && columnIndex === 5) {
         return 'background:#c3503e;color:#fff'//不合格
       }
       return ''