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

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

@@ -1524,20 +1524,23 @@ export const InspectNote = [
 // 不合格库存（不合格转合格） 已调整
 export const unqualifiedToQualified = [
   { label: "创建时间", prop: "creationTime", type: "dateTime" },
-  // { label: "发货单号", prop: "asnNumber", width: orderWidth },
+  { label: "创建者ID", prop: 'creatorId' },
   { label: "物品代码", prop: "itemCode" },
   { label: "物品名称", prop: "itemName" },
-  { label: "物品描述", prop: "itemDesc1" },
+  { label: "物品描述1", prop: "itemDesc1" },
+  { label: "物品描述2", prop: "itemDesc2" },
   { label: "数量", prop: "qty" },
   { label: "单位", prop: "uom" },
   { label: "批次", prop: "lot" },
   { label: "箱码", prop: "packingCode" },
   { label: "库位", prop: 'locationCode' },
   { label: "入库时间", prop: 'putInTime',type: "dateTime" },
+  { label: "备注", prop: 'remark' },
   // -----------------------------------------------------------------------
   { label: "ERP库位", prop: "locationErpCode" },
+  { label: "标包数量", prop: "stdPackQty" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "公司", prop: 'company' },
+  { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "供应商批次", prop: 'supplierBatch' },
   { label: "到货时间", prop: 'arriveDate', type: "dateTime" },
   { label: "生产时间", prop: 'produceDate', type: "dateTime" },
@@ -1551,9 +1554,13 @@ export const unqualifiedToQualified = [
   { label: "最后盘点标签", prop: 'lastCountLabel' },
   { label: "是否可用", prop: 'isActive' },
   { label: "最后事务号", prop: 'lastTransNumber' },
-  { label: "lastTransType", prop: 'lastTransType' },
+  { label: "最后事务类型", prop: "lastTransType", type: "filter", filters: "TransTypeBase" },
   { label: "manageType", prop: 'manageType' },
   { label: "status", prop: 'status' },
+  { label: "ID", prop: 'id' },
+  { label: "事务ID", prop: "tenantId" },
+  // { label: "发货单号", prop: "asnNumber", width: orderWidth },
+  // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
 // 不合格转合格记录 已调整 20230407

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

@@ -110,22 +110,23 @@ export default {
       if (this.selectionData != undefined ) {
         if (this.selectionData.length > 0) {
           this.Loading.appMainLoading = true
+          // 20230407
           let params = {
             tenantId: null,
             remark: null,
             extraProperties: null,
             worker: store.getters.name.userName,
-            warehouseCode: null,
             activeDate: new Date(),
             autoSubmit: false,
             autoAgree: false,
             autoHandle: false,
             autoCompleteJob: false,
             directCreateNote: false,
-            requestStatus: 0,
-            company: localStorage.getItem('company'),
             number: null,
             details: []
+            // warehouseCode: null,
+            // requestStatus: 0,
+            // company: localStorage.getItem('company'),
           }
           // company "DongYang"
           // concurrencyStamp "187ecf6d642e48f68a86f05ceddcbaea"
@@ -147,12 +148,10 @@ export default {
           // status 3
           // tenantId null
           this.selectionData.forEach(item => {
-            item.stdPackUom = null
+            //  20230407
             item.stdPackQty = 0
             item.fromPackingCode = item.packingCode
             item.toPackingCode = item.packingCode
-            item.fromContainerCode = item.containerCode
-            item.toContainerCode = item.containerCode
             item.fromLot = item.lot
             item.toLot = item.lot
             item.fromLocationCode = item.locationCode
@@ -173,6 +172,9 @@ export default {
             item.poNumber = null
             item.supplierCode = null
             params.details.push(item)
+            // item.fromContainerCode = item.containerCode
+            // item.toContainerCode = item.containerCode
+            // item.stdPackUom = null
           })
           convertOk(params).then(res => {
             this.$message.success('已成功转为合格')