Merge branch 'dev_web' of http://dev.ccwin-in.com:3000/BoXu.Zheng/WZC2 into dev_web

fe/PC/src/api/wms-job.js

@@ -198,7 +198,7 @@ export function preparationPlanByNumber(params) {
 //质检——完成质检
 export function completeSummaryDetailStatus(params, data) {
   return request({
-    url: baseURL + 'wms/job/inspect-job/complete-summary-detail-status/' + params.id,
+    url: baseURL + 'wms/store/inspect-job/complete-summary-detail-status/' + params.id,
     method: 'post',
     params: params,
     data
@@ -208,7 +208,7 @@ export function completeSummaryDetailStatus(params, data) {
 //质检——设置默认状态（清除质检）
 export function setDetailDefaultOkStatus(params, id, data) {
   return request({
-    url: baseURL + 'wms/job/inspect-job/set-detail-default-ok-status/' + id,
+    url: baseURL + 'wms/store/inspect-job/set-detail-default-ok-status/' + id,
     method: 'post',
     params: params,
     data
@@ -218,7 +218,7 @@ export function setDetailDefaultOkStatus(params, id, data) {
 //质检——设置详情为合格
 export function setDetailOkStatus(params, id, data) {
   return request({
-    url: baseURL + 'wms/job/inspect-job/set-detail-ok-status/' + id,
+    url: baseURL + 'wms/store/inspect-job/set-detail-ok-status/' + id,
     method: 'post',
     params: params,
     data
@@ -228,7 +228,7 @@ export function setDetailOkStatus(params, id, data) {
 //质检——设置详情为不合格
 export function setDetailNookStatus(params, id, data) {
   return request({
-    url: baseURL + 'wms/job/inspect-job/set-detail-nook-status/' + id,
+    url: baseURL + 'wms/store/inspect-job/set-detail-nook-status/' + id,
     method: 'post',
     params: params,
     data

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

@@ -209,29 +209,27 @@ export const PurchaseReceiptJob =  [
   // { label: "ERP库位", prop: "recommendErpCode" },
   // -----------------------------------------------------------------------
 ]
-// 报检单 已调整
+// 报检单 20230407
 export const InspectRequest =  [
   { label: "物品代码", prop: "itemCode", fixed: "left" },
   { label: "物品名称", prop: "itemName", width: orderWidth },
-  { label: "物品描述", prop: "itemDesc1" },
+  { label: "物品描述1", prop: "itemDesc1" },
+  { label: "物品描述2", prop: "itemDesc2" },
   { label: "收货数量", prop: "receiveQty" },
-  { label: "物品单位", prop: "receiveUom" },
   { label: "生产批次", prop: "lot" },
   { label: "箱码", prop: "packingCode" },
+  { label: "状态", prop: "status", type: "tagFilter", filters: "requestStatus" },
   { label: "状态", prop: "detailInspectStatus", type: "filter", filters: "detailInspectStatus" },
   { label: "库位", prop: 'locationCode' },
   { label: "ERP库位", prop: 'locationErpCode' },
-  { label: "合格数量", prop: 'goodQty' },
+  { label: "检验单号", prop: "number" },
-  { label: "不合格数量", prop: 'failedQty' },
-  { label: "外观", prop: 'appearance' },
-  { label: "尺寸", prop: 'volume' },
-  { label: "重量", prop: 'weight' },
-  { label: "其他属性", prop: 'otherPropertyJson' },
   // -----------------------------------------------------------------------
+  { label: "计量单位", prop: 'uom' },
+  { label: "创建时间", prop: "creationTime", type: "dateTime" },
+  { label: "创建者Id", prop: 'creatorId' },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "完成时间", prop: "completeTime",type: "dateTime" },
+  { label: "上次修改者Id", prop: 'lastModifierId' },
   { label: "备注", prop: 'remark' },
-  { label: "标包计量单位", prop: 'stdPackUom' },
   { label: "标包数量", prop: 'stdPackQty' },
   { label: "供应商批次", prop: 'supplierBatch' },
   { label: "到货时间", prop: 'arriveDate', type: "dateTime" },
@@ -244,17 +242,30 @@ export const InspectRequest =  [
   { label: "订单行", prop: 'poLine' },
   { label: "样品率", prop: 'samplePercent' },
   { label: "检验数量", prop: 'inspectQty' },
-  { label: "不合格原因代码", prop: 'failedReason' },
-  { label: "不合格原因说明", prop: 'failedReason', type: "filter", filters: "getDict" , dictType:"UnqualifiedReason" },
-  { label: "破坏数量", prop: 'crackQty' },
-  { label: "检验人姓名", prop: 'inspectUserName' },
-  { label: "检验人电话", prop: 'inspectUserPhone' },
-  { label: "检验人邮件", prop: 'inspectUserEmail' },
-  { label: "最终不合格数量", prop: 'notPassedQty' },
   { label: "AbcClass类别", prop: 'abcClass' },
-  { label: "供应商包装计量单位", prop: 'supplierPackUom' },
+  { label: "事务ID", prop: "tenantId" },
-  { label: "供应商包装数量", prop: 'supplierPackQty' },
+  { label: "主表ID", prop: "masterID" },
-  { label: "inspectType", prop: 'inspectType' },
+  { label: "附加属性", prop: "attributes" },
+  { label: "检验类型", prop: "inspectType", type: "filter", filters: "inspectType" },
+  { label: "ID", prop: "id" },
+  // { label: "完成时间", prop: "completeTime",type: "dateTime" },
+  // { label: "标包计量单位", prop: 'stdPackUom' },
+  // { label: "不合格原因代码", prop: 'failedReason' },
+  // { label: "不合格原因说明", prop: 'failedReason', type: "filter", filters: "getDict" , dictType:"UnqualifiedReason" },
+  // { label: "破坏数量", prop: 'crackQty' },
+  // { label: "检验人姓名", prop: 'inspectUserName' },
+  // { label: "检验人电话", prop: 'inspectUserPhone' },
+  // { label: "检验人邮件", prop: 'inspectUserEmail' },
+  // { label: "最终不合格数量", prop: 'notPassedQty' },
+  // { label: "供应商包装计量单位", prop: 'supplierPackUom' },
+  // { label: "供应商包装数量", prop: 'supplierPackQty' },
+  // { label: "物品单位", prop: "receiveUom" },
+  // { label: "合格数量", prop: 'goodQty' },
+  // { label: "不合格数量", prop: 'failedQty' },
+  // { label: "外观", prop: 'appearance' },
+  // { label: "尺寸", prop: 'volume' },
+  // { label: "重量", prop: 'weight' },
+  // { label: "其他属性", prop: 'otherPropertyJson' },
   // -----------------------------------------------------------------------
 ]
 // 检验记录 字段需要确定
@@ -308,7 +319,7 @@ export const InspectNote =  [
   { label: "检验人电话", prop: 'inspectUserPhone' },
   { label: "status", prop: 'status' },
   { label: "主表ID", prop: "masterID" },
-  { label: "inspectType", prop: 'inspectType' },
+  { label: "检验类型", prop: "inspectType", type: "filter", filters: "inspectType" },
   { label: "ID", prop: "id" },
   // { label: "其他属性", prop: 'otherPropertyJson' },
   // -----------------------------------------------------------------------

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

@@ -3,25 +3,28 @@
 const orderWidth = 180
 // 原料管理
 /**/
-// 报检单 已调整
+// 报检单 20230407
 export const InspectRequest =  [
-  // { label: "检验详情", fixed: "left", type: "button" },
   { label: "物品代码", prop: "itemCode" },
   { label: "物品名称", prop: "itemName" },
-  { label: "物品描述", prop: "itemDesc1" },
+  { label: "物品描述1", prop: "itemDesc1" },
-  { label: "物品单位", prop: "receiveUom" },
+  { label: "物品描述2", prop: "itemDesc2" },
   { label: "生产批次", prop: "lot" },
   { label: "收货数量", prop: 'receiveQty' },
   { label: "检验数量", prop: 'inspectQty' },
   { label: "合格数量", prop: 'goodQty' },
   { label: "不合格数量", prop: 'failedQty' },
   // -----------------------------------------------------------------------
+  { label: "检验单号", prop: "number" },
+  { label: "创建时间", prop: "creationTime",type: "dateTime" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "状态", prop: "summaryInspectStatus", type: "filter", filters: "summaryInspectStatus" },
   { label: "ABC类", prop: 'abcClass', type: "filter", filters: "abcClass" },
-  { label: "完成时间", prop: "completeTime",type: "dateTime" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
+  { label: "主表ID", prop: "masterID" },
   { label: "备注", prop: 'remark' },
-  { label: "标包计量单位", prop: 'stdPackUom' },
+  { label: "计量单位", prop: 'uom' },
   { label: "标包数量", prop: 'stdPackQty' },
   { label: "供应商批次", prop: 'supplierBatch' },
   { label: "到货时间", prop: 'arriveDate', type: "dateTime" },
@@ -30,17 +33,23 @@ export const InspectRequest =  [
   { label: "订单号", prop: 'poNumber',width: orderWidth },
   { label: "订单行", prop: 'poLine' },
   { label: "样品率", prop: 'samplePercent' },
-  { label: "不合格原因代码", prop: 'failedReason' },
-  { label: "不合格原因", prop: 'failedReason', type: "filter", filters: "getDict" , dictType:"UnqualifiedReason" },
   { label: "破坏数量", prop: 'crackQty' },
-  { label: "检验人姓名", prop: 'inspectUserName' },
-  { label: "检验人电话", prop: 'inspectUserPhone' },
-  { label: "检验人邮件", prop: 'inspectUserEmail' },
   { label: "最终不合格数量", prop: 'notPassedQty' },
-  { label: "供应商包装计量单位", prop: 'supplierPackUom' },
-  { label: "供应商包装数量", prop: 'supplierPackQty' },
   { label: "检验报告", prop: 'inspectReport' },
-  { label: "inspectType", prop: 'inspectType' },
+  { label: "事务ID", prop: "tenantId" },
+  { label: "检验类型", prop: "inspectType", type: "filter", filters: "inspectType" },
+  { label: "ID", prop: 'id' },
+  // { label: "检验详情", fixed: "left", type: "button" },
+  // { label: "检验人姓名", prop: 'inspectUserName' },
+  // { label: "检验人电话", prop: 'inspectUserPhone' },
+  // { label: "检验人邮件", prop: 'inspectUserEmail' },
+  // { label: "不合格原因代码", prop: 'failedReason' },
+  // { label: "不合格原因", prop: 'failedReason', type: "filter", filters: "getDict" , dictType:"UnqualifiedReason" },
+  // { label: "供应商包装计量单位", prop: 'supplierPackUom' },
+  // { label: "供应商包装数量", prop: 'supplierPackQty' },
+  // { label: "物品单位", prop: "receiveUom" },
+  // { label: "完成时间", prop: "completeTime",type: "dateTime" },
+  // { label: "标包计量单位", prop: 'stdPackUom' },
   // -----------------------------------------------------------------------
 ]
 // 检验记录  字段需要确定
@@ -83,7 +92,7 @@ export const InspectNote =  [
   { label: "检验人邮件", prop: 'inspectUserEmail' },
   { label: "检验人姓名", prop: 'inspectUserName' },
   { label: "检验人电话", prop: 'inspectUserPhone' },
-  { label: "inspectType", prop: 'inspectType' },
+  { label: "检验类型", prop: "inspectType", type: "filter", filters: "inspectType" },
   { label: "masterID", prop: "masterID" },
   // -----------------------------------------------------------------------
 ]

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

@@ -1437,7 +1437,7 @@ export const lackMaterialsInfo = [
   { label: "供应商包装数量", prop: "supplierPackQty" },
   { label: "status", prop: 'status' },
 ]
-// 报检单 已调整
+// 报检单 20230407
 export const InspectRequest =  [
   {
     label: "检验单号",
@@ -1446,37 +1446,47 @@ export const InspectRequest =  [
     type: "name",
     width: orderWidth
   },
-  { label: "状态", prop: "jobStatus", type: "tagFilter", filters: "jobStatus" },
+  { label: "状态", prop: "requestStatus", type: "tagFilter", filters: "requestStatus" },
   { label: "创建时间", prop: "creationTime",type: "dateTime" },
-  { label: "筹措员代码", prop: "worker" },
+  { label: "操作员", prop: "worker" },
   { label: "采购订单号", prop: "poNumber",width: orderWidth },
   { label: "发货单号", prop: "asnNumber",width: orderWidth },
-  { label: "到货单号", prop: "arriveNoticeNumber",width: orderWidth },
   { label: "收货单号", prop: "receiptNumber",width: orderWidth },
   { label: "供应商代码", prop: "supplierCode" },
   { label: "备注", prop: 'remark' },
   // -----------------------------------------------------------------------
-  { label: "要求到货日期", prop: "planArriveDate",type: "dateTime" },
+  { label: "创建者ID", prop: 'creatorId' },
-  { label: "发货日期", prop: "shipDate",type: "dateTime" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "公司", prop: 'company' },
+  { label: "上次修改者ID", prop: "lastModifierId" },
+  { label: "生效日期", prop: "activeDate",type: "dateTime" },
+  { label: "自动提交审批", prop: 'autoSubmit', type: "filter", filters: "whetherOrNot" },
+  { label: "自动审批通过", prop: 'autoAgree', type: "filter", filters: "whetherOrNot" },
+  { label: "自动执行", prop: 'autoHandle', type: "filter", filters: "whetherOrNot" },
+  { label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot" },
+  { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" },
+  { label: "到货单号", prop: 'purchaseReceiptRequestNumber' },
   { label: "仓库", prop: 'warehouseCode' },
-  { label: "上游任务编号", prop: 'upStreamJobNumber' },
-  { label: "任务类型", prop: 'jobType' },
-  { label: "优先级", prop: 'priority' },
-  { label: "优先级增量", prop: 'priorityIncrement' },
-  { label: "工作组", prop: 'workGroupCode' },
-  { label: "是否自动完成", prop: 'isAutoComplete', type: "filter", filters: "whetherOrNot" },
-  { label: "承接者ID", prop: 'acceptUserId' },
-  { label: "承接者用户名", prop: 'acceptUserName' },
-  { label: "承接时间", prop: 'acceptTime', type: "dateTime" },
-  { label: "完成者", prop: 'completeUserId' },
-  { label: "完成者用户名", prop: 'completeUserName' },
-  { label: "完成时间", prop: 'completeTime', type: "dateTime" },
-  { label: "任务描述", prop: 'jobDescription' },
-  { label: "检验单号", prop: 'inspectNumber' },
   { label: "要货计划单号", prop: 'rpNumber' },
-  { label: "nextAction", prop: 'nextAction' },
+  { label: "事务ID", prop: "tenantId" },
+  // { label: "状态", prop: "jobStatus", type: "tagFilter", filters: "jobStatus" },
+  // { label: "到货单号", prop: "arriveNoticeNumber",width: orderWidth },
+  // { label: "要求到货日期", prop: "planArriveDate",type: "dateTime" },
+  // { label: "发货日期", prop: "shipDate",type: "dateTime" },
+  // { label: "上游任务编号", prop: 'upStreamJobNumber' },
+  // { label: "任务类型", prop: 'jobType' },
+  // { label: "优先级", prop: 'priority' },
+  // { label: "优先级增量", prop: 'priorityIncrement' },
+  // { label: "工作组", prop: 'workGroupCode' },
+  // { label: "是否自动完成", prop: 'isAutoComplete', type: "filter", filters: "whetherOrNot" },
+  // { label: "承接者ID", prop: 'acceptUserId' },
+  // { label: "承接者用户名", prop: 'acceptUserName' },
+  // { label: "承接时间", prop: 'acceptTime', type: "dateTime" },
+  // { label: "完成者", prop: 'completeUserId' },
+  // { label: "完成者用户名", prop: 'completeUserName' },
+  // { label: "完成时间", prop: 'completeTime', type: "dateTime" },
+  // { label: "任务描述", prop: 'jobDescription' },
+  // { label: "检验单号", prop: 'inspectNumber' },
+  // { label: "nextAction", prop: 'nextAction' },
   // -----------------------------------------------------------------------
 ]
 // 检验记录 字段需要确定

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

@@ -983,42 +983,52 @@ export const PurchaseReceiptNote =  [
   // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
-// 报检单 已调整 20221220
+// 报检单 20230407
 export const InspectRequest = [
   { label: "检验单号", prop: "number" },
-  { label: "状态", prop: "jobStatus", type: "filter", filters: "jobStatus" },
+  { label: "状态", prop: "requestStatus", type: "tagFilter", filters: "requestStatus" },
   { label: "创建时间", prop: "creationTime",type: "dateTime" },
   { label: "采购订单号", prop: "poNumber" },
   { label: "发货单号", prop: "asnNumber" },
-  { label: "到货单号", prop: "arriveNoticeNumber" },
   { label: "收货单号", prop: "receiptNumber" },
   { label: "供应商代码", prop: "supplierCode" },
   { label: "操作员", prop: 'worker' },
   { label: "备注", prop: 'remark' },
-  { label: "承接用户", prop: 'acceptUserName' },
+  { label: "生效日期", prop: "activeDate",type: "dateTime" },
-  { label: "承接时间", prop: 'acceptTime', type: "dateTime" },
-  { label: "完成用户", prop: 'completeUserName' },
-  { label: "完成时间", prop: 'completeTime', type: "dateTime" },
   // -----------------------------------------------------------------------
+  { label: "自动提交审批", prop: 'autoSubmit', type: "filter", filters: "whetherOrNot" },
+  { label: "自动审批通过", prop: 'autoAgree', type: "filter", filters: "whetherOrNot" },
+  { label: "自动执行", prop: 'autoHandle', type: "filter", filters: "whetherOrNot" },
+  { label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot" },
+  { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" },
+  { label: "到货单号", prop: 'purchaseReceiptRequestNumber' },
+  { label: "仓库", prop: 'warehouseCode' },
+  { label: "要货计划单号", prop: 'rpNumber' },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
   { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "事务ID", prop: "tenantId" },
-  { label: "上游任务编号", prop: 'upStreamJobNumber' },
-  { label: "任务类型", prop: 'jobType', type: "filter", filters: "taskType" },
-  { label: "优先级", prop: 'priority' },
-  { label: "优先级增量", prop: 'priorityIncrement' },
-  { label: "工作组", prop: 'workGroupCode' },
-  { label: "是否自动完成", prop: 'isAutoComplete', type: "filter", filters: "whetherOrNot" },
   { label: "创建者ID", prop: "creatorId" },
-  { label: "承接者ID", prop: 'acceptUserId' },
-  { label: "完成者ID", prop: 'completeUserId' },
-  { label: "任务描述", prop: 'jobDescription' },
-  { label: "检验单号", prop: 'inspectNumber' },
-  { label: "要货计划单号", prop: 'rpNumber' },
-  { label: "nextAction", prop: 'nextAction' },
-  { label: "仓库", prop: 'warehouseCode' },
   { label: "ID", prop: 'id' },
-  { label: "公司", prop: 'company' },
+  // { label: "到货单号", prop: "arriveNoticeNumber" },
+  // { label: "承接用户", prop: 'acceptUserName' },
+  // { label: "承接时间", prop: 'acceptTime', type: "dateTime" },
+  // { label: "完成用户", prop: 'completeUserName' },
+  // { label: "完成时间", prop: 'completeTime', type: "dateTime" },
+  // { label: "上游任务编号", prop: 'upStreamJobNumber' },
+  // { label: "任务类型", prop: 'jobType', type: "filter", filters: "taskType" },
+  // { label: "优先级", prop: 'priority' },
+  // { label: "优先级增量", prop: 'priorityIncrement' },
+  // { label: "工作组", prop: 'workGroupCode' },
+  // { label: "是否自动完成", prop: 'isAutoComplete', type: "filter", filters: "whetherOrNot" },
+  // { label: "承接者ID", prop: 'acceptUserId' },
+  // { label: "完成者ID", prop: 'completeUserId' },
+  // { label: "任务描述", prop: 'jobDescription' },
+  // { label: "检验单号", prop: 'inspectNumber' },
+  // { label: "要货计划单号", prop: 'rpNumber' },
+  // { label: "nextAction", prop: 'nextAction' },
+  // { label: "仓库", prop: 'warehouseCode' },
+  // { label: "公司", prop: 'company' },
+  // { label: "状态", prop: "jobStatus", type: "filter", filters: "jobStatus" },
   // -----------------------------------------------------------------------
 ]
 // 检验记录 字段需要确定

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

@@ -277,6 +277,8 @@ export default {
       inspectNoticeDetailsTableLoading: false,
       // 检验
       inspectFormData: {
+        inspectUser: null,
+        uom: null,
         samplePercent: 0,
         number: null,
         otherPropertyJson: null,
@@ -286,55 +288,54 @@ export default {
         lot: null,
         locationErpCode: null,
         failedQty: 0,
-        inspectUserEmail: null,
         supplierBatch: null,
         produceDate: null,
         lastModificationTime: null,
         creationTime: null,
         lastModifierId: null,
-        tenantId: null,
-        supplierPackUom: null,
         receiveQty: 0,
         remark: null,
         expireDate: null,
         poNumber: null,
         inspectType: 0,
         notPassedQty: 0,
-        inspectUserName: null,
-        receiveUom: null,
         locationCode: null,
         abcClass: null,
         locationGroup: null,
         containerCode: null,
         id:  null,
-        supplierPackQty: 0,
         warehouseCode: null,
         creatorId: null,
         poLine: null,
         masterID: null,
-        inspectUserPhone: "18182874811",
         status: 0,
         goodQty: 0,
         locationArea: null,
         failedReason: null,
-
         itemCode: null,
         itemName: null,
         itemDesc1: null,
         itemDesc2: null,
         stdPackQty: 0,
-        stdPackUom: null,
         packingCode:null,
         inspectQty: 0,
         appearance: null,
         volume: null,
         weight: null,
-        // otherPropertyJson 其他属性json,
         otherPropertyJson: null,
         details: [{
           name: '',
           value: ''
         }],
+        // supplierPackQty: 0,
+        // inspectUserPhone: "18182874811",
+        // stdPackUom: null,
+        // otherPropertyJson 其他属性json,
+        // inspectUserEmail: null,
+        // tenantId: null,
+        // supplierPackUom: null,
+        // inspectUserName: null,
+        // receiveUom: null,
       },
       inspectForm: [
         { type: "input", label: "物品代码", prop: "itemCode", disabled: true, colSpan: 12  },
@@ -402,28 +403,25 @@ export default {
       ],
       // 质检详情页面-form数据
       inspectNoticeDetailsFormData: {
+        warehouseCode: localStorage.getItem('warehouseCode'),
         supplierBatch: null,
-        inspectUserPhone: null,
         creationTime: null,
         summaryInspectStatus: 0,
-        supplierPackUom: null,
+        inspectUser: null,
+        uom: null,
         receiveQty: 0,
         lot: null,
         notPassedQty: 0,
         remark: null,
         itemDesc1: null,
-        stdPackUom: null,
         itemDesc2: null,
-        receiveUom: null,
         poLine: null,
         stdPackQty: 0,
         arriveDate: null,
         goodQty: 0,
-        inspectUserName: null,
         itemCode: null,
         samplePercent: 0,
         masterID: null,
-        tenantId: null,
         crackQty: 0,
         inspectType: 0,
         lastModifierId: null,
@@ -431,8 +429,6 @@ export default {
         expireDate: null,
         number: null,
         itemName: null,
-        inspectUserEmail: null,
-        supplierPackQty: 0,
         abcClass: null,
         failedReason: null,
         failedQty: 0,
@@ -443,10 +439,18 @@ export default {
         inspectReport: null,
         lastModificationTime: null,
         filesList:[],
-        sampleQty: 0,  // 要求检验数量
-        goodQty: 0,
         formFile: [],
         details: []
+        // inspectUserEmail: null,
+        // supplierPackQty: 0,
+        // tenantId: null,
+        // inspectUserName: null,
+        // receiveUom: null,
+        // sampleQty: 0,  // 要求检验数量
+        // goodQty: 0,
+        // supplierPackUom: null,
+        // inspectUserPhone: null,
+        // stdPackUom: null,
       },
       // 质检详情页面-form字段
       inspectNoticeDetailsForm: [
@@ -580,28 +584,25 @@ export default {
       }
       this.inspectNoticeDetailsFormData.formFile = []
       this.inspectNoticeDetailsFormData = {
+        warehouseCode: localStorage.getItem('warehouseCode'),
         supplierBatch: null,
-        inspectUserPhone: null,
         creationTime: null,
         summaryInspectStatus: 0,
-        supplierPackUom: null,
+        inspectUser: null,
+        uom: null,
         receiveQty: 0,
         lot: null,
         notPassedQty: 0,
         remark: null,
         itemDesc1: null,
-        stdPackUom: null,
         itemDesc2: null,
-        receiveUom: null,
         poLine: null,
         stdPackQty: 0,
         arriveDate: null,
         goodQty: 0,
-        inspectUserName: null,
         itemCode: null,
         samplePercent: 0,
         masterID: null,
-        tenantId: null,
         crackQty: 0,
         inspectType: 0,
         lastModifierId: null,
@@ -609,8 +610,6 @@ export default {
         expireDate: null,
         number: null,
         itemName: null,
-        inspectUserEmail: null,
-        supplierPackQty: 0,
         abcClass: null,
         failedReason: null,
         failedQty: 0,
@@ -621,10 +620,18 @@ export default {
         inspectReport: null,
         lastModificationTime: null,
         filesList:[],
-        sampleQty: 0,  // 要求检验数量
-        goodQty: 0,
         formFile: [],
         details: []
+        // inspectUserEmail: null,
+        // supplierPackQty: 0,
+        // tenantId: null,
+        // inspectUserName: null,
+        // receiveUom: null,
+        // sampleQty: 0,  // 要求检验数量
+        // goodQty: 0,
+        // supplierPackUom: null,
+        // inspectUserPhone: null,
+        // stdPackUom: null,
       }
       this.$listAssign(this.inspectNoticeDetailsFormData, row)
       let findRs = this.tableDataDetails.details.filter(item => (