Merge branch 'intex' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into intex

src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue

@@ -369,9 +369,9 @@
                     :key="'库存事务Operator'+cur.value"
                   />
                 </el-select>
-                <el-input key="库存事务Value" style="flex:1" placeholder="请选择库存事务" disabled v-model="item.Value" @blur="blurTransactionType">
+                <el-input key="库存事务Value" style="flex:1" placeholder="请选择库存事务" disabled v-model="item.Value" @blur="blurBusinessType">
                     <template #suffix>
-                      <el-button :disabled="formData.priority==0&&formType=='update'" type="text" plain style="color:var(--el-button-text-color)" @click="searchTransactionType">
+                      <el-button :disabled="formData.priority==0&&formType=='update'" type="text" plain style="color:var(--el-button-text-color)" @click="searchTransactiontype">
                         <Icon icon="ep:search" class="mr-5px" /> 
                       </el-button> 
                     </template>
@@ -392,7 +392,7 @@
                     :key="'业务类型Operator'+cur.value"
                   />
                 </el-select>
-                <el-input key="业务类型Value" style="flex:1" placeholder="请选择业务类型" disabled v-model="item.Value" @blur="blurTransactionType">
+                <el-input key="业务类型Value" style="flex:1" placeholder="请选择业务类型" disabled v-model="item.Value" @blur="blurBusinessType">
                     <template #suffix>
                       <el-button :disabled="formData.priority==0&&formType=='update'" type="text" plain style="color:var(--el-button-text-color)" @click="searchBusinessType">
                         <Icon icon="ep:search" class="mr-5px" /> 
@@ -751,7 +751,7 @@ const formData = ref({
     // // 存储类型
     // { ParamCode: 'StorageType', Operator: 'IN', Value: [] },
     // 库存事务     // 业务类型
-    { ParamCode: 'TransactionType', Operator: 'IN', Value: '' },
+    { ParamCode: 'BusinessType', Operator: 'IN', Value: '' },
   ],
   configuration: {
     // 仓库代码
@@ -1099,7 +1099,7 @@ const searchBusinessType = ()=>{
     '请选择业务类型',
     Businesstype.allSchemas,
     BusinesstypeApi.getBusinesstypePage,
-    'TransactionType',
+    'BusinessType',
     'code',
     true,
     undefined,
@@ -1108,12 +1108,12 @@ const searchBusinessType = ()=>{
   )
 }
 //事务类型
-const searchTransactionType = ()=>{
+const searchTransactiontype = ()=>{
   searchTableRef.value.open(
     '请选择事务类型',
     Transactiontype.allSchemas,
     TransactiontypeApi.getTransactiontypePage,
-    'TransactionType',
+    'BusinessType',
     'code',
     true,
     undefined,
@@ -1121,21 +1121,22 @@ const searchTransactionType = ()=>{
     undefined
   )
 }
+
 // 失去焦点校验
-const blurTransactionType = async ()=>{
+const blurBusinessType = async ()=>{
-  let transactionType = formData.value.condition.find(item=>item['ParamCode']=='TransactionType')
+  let BusinessType = formData.value.condition.find(item=>item['ParamCode']=='BusinessType')
-  console.log('transactionType',transactionType)
+  console.log('BusinessType',BusinessType)
-  if(transactionType&&transactionType.Value){
+  if(BusinessType&&BusinessType.Value){
     let verifyRes = await TransactiontypeApi.verifyTransactiontype({
-      code:transactionType.Value
+      code:BusinessType.Value
     })
     console.log('事务类型verifyRes',verifyRes)
     if(verifyRes&&verifyRes.length>0){
       let verifyList = verifyRes.map(item=>(item['code']))
-      let codeList = transactionType.Value.split(',')
+      let codeList = BusinessType.Value.split(',')
-      transactionType.Value = codeList.filter(item=>verifyList.indexOf(item)>-1).join(',')
+      BusinessType.Value = codeList.filter(item=>verifyList.indexOf(item)>-1).join(',')
     }else{
-      transactionType.Value = ''
+      BusinessType.Value = ''
     }
   }
 }
@@ -1143,15 +1144,18 @@ const searchTableSuccess = (formField, searchField, val, type, row) => {
   // let searchTableTitle  =  warehouseType.value == 'WarehouseCode'?'请选择仓库':warehouseType.value == 'AreaCode'?'请选择库区':warehouseType.value == 'LocationGroupCode'?'请选择库位组':warehouseType.value == 'LocationCode'?'请选择库位':''
   console.log('searchTableSuccess',formField, searchField, val, type, row)
   console.log(val.map(item=>(item['code'])).join(','))
-  // if(formField=='TransactionType'){
+  // if(formField=='BusinessType'){
-  //   let transactionType = formData.value.condition.find(item=>item['ParamCode']=='TransactionType')
+  //   let BusinessType = formData.value.condition.find(item=>item['ParamCode']=='BusinessType')
-  //   if(transactionType){
+  //   if(BusinessType){
-  //     transactionType.Value = val.map(item=>(item['code'])).join(',')
+  //     BusinessType.Value = val.map(item=>(item['code'])).join(',')
   //   }
   //   return
   // }else 
-  if(formField=='TransactionType'){
+  if(formField=='BusinessType'){
-    let businessType = formData.value.condition.find(item=>item['ParamCode']=='TransactionType')
+    console.log('condition',formData.value.condition)
+    
+    let businessType = formData.value.condition.find(item=>item['ParamCode']=='BusinessType')
+    console.log('businessType',businessType)
     if(businessType){
       businessType.Value = val.map(item=>(item['code'])).join(',')
     }
@@ -1291,11 +1295,11 @@ defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 /** 提交表单 */
 const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
 const submitForm = async () => {
-  let TransactionType = formData.value.condition[2]['Value']
+  let BusinessType = formData.value.condition[2]['Value']
-  if(Array.isArray(TransactionType)){
+  if(Array.isArray(BusinessType)){
-    TransactionType = TransactionType.join(',')
+    BusinessType = BusinessType.join(',')
   }
-  if(TransactionType=='Repleinment'){
+  if(BusinessType=='Repleinment'){
     //补料--物料和库位必填
     let msg = ''
     let itemCodeType = formData.value.condition[1]['ParamCode']
@@ -1323,7 +1327,7 @@ const submitForm = async () => {
     }
   }
   await blurWarehouse({module:'config',type:warehouseType.value})
-  // await blurTransactionType()
+  // await blurBusinessType()
   if(warehouseType.value == 'WarehouseCode' && !formData.value.configuration.WarehouseCode){
     // 仓库
     message.error('请选择仓库')
@@ -1426,7 +1430,7 @@ const resetForm = () => {
       // // 存储类型
       // { ParamCode: 'StorageType', Operator: 'IN', Value: [] },
       // 库存事务 // 业务类型
-      { ParamCode: 'TransactionType', Operator: 'IN', Value: '' },
+      { ParamCode: 'BusinessType', Operator: 'IN', Value: '' },
     ],
     configuration: {
       // 仓库代码

src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue

@@ -119,8 +119,22 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
           message.warning(`物料${val[0]['componentItemCode']}已经存在`)
           return
         }
-        row['itemCode'] = val[0]['componentItemCode']
+        val.forEach((item, index)=>{
-        row['uom'] = val[0]['componentUom']
+          let tableForm = JSON.parse(JSON.stringify(tableFormKeys))
+          if(index == 0){
+            row['itemCode'] = item['componentItemCode']
+            row['uom'] = item['componentUom']
+          }else{
+            const newRow = JSON.parse(JSON.stringify({...tableForm,...item}))
+            newRow['itemCode'] = item['componentItemCode']
+            newRow['uom'] = item['componentUom']
+            newRow['workStation'] = row['workStation']
+            newRow['toLocationCode'] = row['toLocationCode']
+            newRow['remark'] = ''
+            tableData.value.push(newRow)
+          }
+        })
+
       } else if(formField == 'workStation'){
         if(isShowButton.value){
           val.forEach(item=>{

src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts

@@ -617,6 +617,7 @@ export const PreparetoissueDetail = useCrudSchemas(reactive<CrudSchema[]>([
         searchListPlaceholder: '请选择物料代码', // 输入框占位文本
         searchField: 'itemCode', // 查询弹窗赋值字段
         searchTitle: '物料清单信息', // 查询弹窗标题
+        multiple: true,
         searchAllSchemas: Bom.allSchemas, // 查询弹窗所需类
         searchPage: ProductionlineitemApi.getProductionlineitemPageByItemtype, // 查询弹窗所需分页方法
         searchCondition: [{
@@ -642,6 +643,7 @@ export const PreparetoissueDetail = useCrudSchemas(reactive<CrudSchema[]>([
       searchField: 'itemCode', // 查询弹窗赋值字段
       searchTitle: '物料清单信息', // 查询弹窗标题
       searchAllSchemas: Bom.allSchemas, // 查询弹窗所需类
+      multiple: true,
       searchPage: ProductionlineitemApi.getProductionlineitemPageByItemtype, // 查询弹窗所需分页方法
       searchCondition: [{
         key: 'productionLineCode',

src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts

@@ -690,7 +690,7 @@ export const InventorymoveJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     sortTableDefault:10,
   },
   {
-    label: '批次',
+    label: '从批次',
     field: 'batch',
     sort: 'custom',
     table: {
@@ -698,34 +698,34 @@ export const InventorymoveJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     sortTableDefault:11,
   },
-  {
+  // {
-    label: '供应商代码',
+  //   label: '供应商代码',
-    field: 'supplierCode',
+  //   field: 'supplierCode',
-    sort: 'custom',
+  //   sort: 'custom',
-    isDetail: true,
+  //   isDetail: true,
-    table: {
+  //   table: {
-      width: 150,
+  //     width: 150,
-    },
+  //   },
-    sortTableDefault:12,
+  //   sortTableDefault:12,
-  },
+  // },
-  {
+  // {
-    label: '供应商名称',
+  //   label: '供应商名称',
-    field: 'supplierName',
+  //   field: 'supplierName',
-    isDetail: true,
+  //   isDetail: true,
-    table: {
+  //   table: {
-      width: 180
+  //     width: 180
-    },
+  //   },
-    sortTableDefault:13,
+  //   sortTableDefault:13,
-  },
+  // },
-  {
+  // {
-    label: '供应商批次',
+  //   label: '供应商批次',
-    field: 'altBatch',
+  //   field: 'altBatch',
-    sort: 'custom',
+  //   sort: 'custom',
-    table: {
+  //   table: {
-      width: 150
+  //     width: 150
-    },
+  //   },
-    sortTableDefault:14,
+  //   sortTableDefault:14,
-  },
+  // },
   {
     label: '包装号',
     field: 'packingNumber',
@@ -902,7 +902,7 @@ export const InventorymoveJobDetailRules = reactive({
     { required: true, message: '请选择包装号', trigger: 'change' }
   ],
   batch: [
-    { required: true, message: '请输入批次', trigger: 'blur' }
+    { required: true, message: '请输入从批次', trigger: 'blur' }
   ],
   inventoryStatus: [
     { required: true, message: '请选择库存状态', trigger: 'change' }

src/views/wms/moveManage/inventorymove/inventorymoveRecordMainOKHOLD/inventorymoveRecordMainOKHOLD.data.ts

@@ -502,34 +502,34 @@ export const InventorymoveRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     sortTableDefault:15,
   },
-  {
+  // {
-    label: '供应商代码',
+  //   label: '供应商代码',
-    field: 'supplierCode',
+  //   field: 'supplierCode',
-    sort: 'custom',
+  //   sort: 'custom',
-    isDetail: true,
+  //   isDetail: true,
-    table: {
+  //   table: {
-      width: 150,
+  //     width: 150,
-    },
+  //   },
-    sortTableDefault:16,
+  //   sortTableDefault:16,
-  },
+  // },
-  {
+  // {
-    label: '供应商名称',
+  //   label: '供应商名称',
-    field: 'supplierName',
+  //   field: 'supplierName',
-    isDetail: true,
+  //   isDetail: true,
-    table: {
+  //   table: {
-      width: 180
+  //     width: 180
-    },
+  //   },
-    sortTableDefault:17,
+  //   sortTableDefault:17,
-  },
+  // },
-  {
+  // {
-    label: '供应商批次',
+  //   label: '供应商批次',
-    field: 'altBatch',
+  //   field: 'altBatch',
-    sort: 'custom',
+  //   sort: 'custom',
-    table: {
+  //   table: {
-      width: 150
+  //     width: 150
-    },
+  //   },
-    sortTableDefault:18,
+  //   sortTableDefault:18,
-  },
+  // },
   {
     label: '从包装号',
     field: 'fromPackingNumber',

src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue

@@ -364,9 +364,10 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
           newRow['itemCode'] = item['itemCode']
           if (item['batch'] != '') {
             newRow['fromBatch'] = item['batch']
-          }else{
-            newRow['fromBatch'] = getFormattedDate(); // 获取 YYYYMMDD 格式的日期
           }
+          // else{
+          //   newRow['fromBatch'] = getFormattedDate(); // 获取 YYYYMMDD 格式的日期
+          // }
           await ruleApi.getManagementPrecision({
         	itemCodes: [item['itemCode']],
 		      locationCode:val[0]['locationCode']

src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts

@@ -1787,7 +1787,6 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive<CrudSchema[]>(
       }
     },
     tableForm: {
-      enterSearch: true,
       disabled: true,
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择包装',
@@ -1834,7 +1833,7 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive<CrudSchema[]>(
     },
     isTable: false,
     tableForm: {
-      enterSearch: true,
+      disabled: true,
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择生产线代码',
       searchField: 'code',

src/views/wms/purchasereceiptManage/amvpurchasereceipt/amvPurchasereceiptRecordMain/index.vue

@@ -239,7 +239,7 @@ const butttondata = (row, $index) => {
       hide: isShowputawayRequestFlagButton(row)
     }), // 生成到货检验申请
     defaultButtons.mainPutawayRequestBtn({
-      hide: (row.isPutaway==1 || row.putawayRequestFlag == 'FALSE')?false:true
+      hide: (row.isPutaway==1 && row.putawayRequestFlag == 'FALSE')?false:true
     }), // 生成采购上架申请
     defaultButtons.mainPurchasereturnRecordBtn({
       hasPermi: 'wms:purchasereceipt-record-main:createPurchasereturnRecord',

src/views/wms/purchasereceiptManage/amvpurchasereceipt/amvPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts

@@ -38,26 +38,6 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     sortTableDefault:3
   },
-  {
-    label: '备注',
-    field: 'mainRemark',
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isSearch: false,
-    sortTableDefault:3
-  },
-  {
-    label: '明细备注',
-    field: 'remark',
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isSearch: false,
-    sortTableDefault:3
-  },
   {
     label: '发货单号',
     field: 'asnNumber',
@@ -135,22 +115,6 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isTable:false
   },
-  {
-    label: '数据来源',
-    field: 'sourceType',
-    dictType: DICT_TYPE.PURCHASERECEIPT_SOURCE_TYPE,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      value: 'ASN_ExternalReceipt',
-      componentProps: {
-        disabled: true
-      }
-    },
-    isSearch: false,
-  },
   {
     label: '车牌号',
     field: 'vehiclePlateNumber',
@@ -447,24 +411,6 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     sortTableDefault:12,
   },
-  {
-    label: '包装号', // 实际是子表的从包装号，为了不影响页面，单独放上面
-    field: 'fromPackingNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:16,
-  },
-  {
-    label: '检验申请单号',
-    field: 'inspectNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:6,
-  },
   {
     label: '发货数量',
     field: 'shippedQty',
@@ -631,16 +577,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     sortTableDefault:1998,
     hiddenInMain:true
   },
-  {
+  
-    label: '检验申请单号',
-    field: 'inspectNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable:false,
-    sortTableDefault:6,
-  },
   {
     label: '采购订单号',
     field: 'poNumber',
@@ -722,24 +659,6 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
       }
     },
   },
-  {
-    label: '物料类型',
-    field: 'itemType',
-    sort: 'custom',
-    dictType: DICT_TYPE.ITEM_TYPE,
-    dictClass: 'string',
-    isSearch: true,
-    isDetail:false,
-    table: {
-      width: 150
-    },
-    search:{
-      componentProps:{
-        multiple:true,
-      }
-    }
-
-  },
   {
     label: '物料名称',
     field: 'itemName',
@@ -952,16 +871,6 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     sortTableDefault:18,
     hiddenInMain:true
   },
-  {
-    label: '从库位代码',
-    field: 'fromLocationCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:18,
-
-  },
   {
     label: '到库位代码',
     field: 'toLocationCode',

src/views/wms/purchasereceiptManage/bspurchasereceipt/bsPurchasereceiptRecordMain/index.vue

@@ -239,7 +239,7 @@ const butttondata = (row, $index) => {
       hide: isShowputawayRequestFlagButton(row)
     }), // 生成到货检验申请
     defaultButtons.mainPutawayRequestBtn({
-      hide: (row.isPutaway==1 || row.putawayRequestFlag == 'FALSE')?false:true
+      hide: (row.isPutaway==1 && row.putawayRequestFlag == 'FALSE')?false:true
     }), // 生成采购上架申请
     defaultButtons.mainPurchasereturnRecordBtn({
       hasPermi: 'wms:purchasereceipt-record-main:createPurchasereturnRecord',

src/views/wms/purchasereceiptManage/bspurchasereceipt/bsPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts

@@ -38,26 +38,6 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     sortTableDefault:3
   },
-  {
-    label: '备注',
-    field: 'mainRemark',
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isSearch: false,
-    sortTableDefault:3
-  },
-  {
-    label: '明细备注',
-    field: 'remark',
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isSearch: false,
-    sortTableDefault:3
-  },
   {
     label: '发货单号',
     field: 'asnNumber',
@@ -135,22 +115,6 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isTable:false
   },
-  {
-    label: '数据来源',
-    field: 'sourceType',
-    dictType: DICT_TYPE.PURCHASERECEIPT_SOURCE_TYPE,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      value: 'ASN_ExternalReceipt',
-      componentProps: {
-        disabled: true
-      }
-    },
-    isSearch: false,
-  },
   {
     label: '车牌号',
     field: 'vehiclePlateNumber',
@@ -447,24 +411,6 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     sortTableDefault:12,
   },
-  {
-    label: '包装号', // 实际是子表的从包装号，为了不影响页面，单独放上面
-    field: 'fromPackingNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:16,
-  },
-  {
-    label: '检验申请单号',
-    field: 'inspectNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:6,
-  },
   {
     label: '发货数量',
     field: 'shippedQty',
@@ -631,16 +577,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     sortTableDefault:1998,
     hiddenInMain:true
   },
-  {
+  
-    label: '检验申请单号',
-    field: 'inspectNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable:false,
-    sortTableDefault:6,
-  },
   {
     label: '采购订单号',
     field: 'poNumber',
@@ -722,24 +659,6 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
       }
     },
   },
-  {
-    label: '物料类型',
-    field: 'itemType',
-    sort: 'custom',
-    dictType: DICT_TYPE.ITEM_TYPE,
-    dictClass: 'string',
-    isSearch: true,
-    isDetail:false,
-    table: {
-      width: 150
-    },
-    search:{
-      componentProps:{
-        multiple:true,
-      }
-    }
-
-  },
   {
     label: '物料名称',
     field: 'itemName',
@@ -952,16 +871,6 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     sortTableDefault:18,
     hiddenInMain:true
   },
-  {
-    label: '从库位代码',
-    field: 'fromLocationCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:18,
-
-  },
   {
     label: '到库位代码',
     field: 'toLocationCode',

src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptJobMain/purchasereceiptJobMain.data.ts

@@ -76,21 +76,6 @@ export const PurchasereceiptJobMain = useCrudSchemas(
       },
       sortTableDefault: 1010
     },
-    {
-      label: '数据来源',
-      field: 'sourceType',
-      dictType: DICT_TYPE.PURCHASERECEIPT_SOURCE_TYPE,
-      sort: 'custom',
-      table: {
-        width: 150
-      },
-      form: {
-        value: 'ASN_ExternalReceipt',
-        componentProps: {
-          disabled: true
-        }
-      },
-    },
     {
       label: '运输方式',
       field: 'transferMode',
@@ -1081,8 +1066,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(
       table: {
         width: 150
       },
-      hiddenInMain: true,
+      sortTableDefault: 1001
-      sortTableDefault: 1004
     },
     {
       label: '数量',

src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/index.vue

@@ -243,7 +243,7 @@ const butttondata = (row, $index) => {
       hide: row.isPutaway==1?row.putawayRequestFlag == 'FALSE':'TRUE'
     }), // 生成采购上架申请
     defaultButtons.mainPurchasereturnRecordBtn({
-      hide: (row.isPutaway==1 || row.putawayRequestFlag == 'FALSE')?false:true
+      hide: (row.isPutaway==1 && row.putawayRequestFlag == 'FALSE')?false:true
     }), // 生成采购退后记录申请
     //defaultButtons.mainListPlanCheckQualityReportBtn({hide:row.orderTypeM == "2"}), // 查看质检报告
     defaultButtons.mainListPlanCheckQualityReportBtn({ hide: isShowSourceTypeButton(row) }), // 查看质检报告

src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts

@@ -38,26 +38,6 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     sortTableDefault:3
   },
-  {
-    label: '备注',
-    field: 'mainRemark',
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isSearch: false,
-    sortTableDefault:3
-  },
-  {
-    label: '明细备注',
-    field: 'remark',
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isSearch: false,
-    sortTableDefault:3
-  },
   {
     label: '发货单号',
     field: 'asnNumber',
@@ -135,22 +115,6 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isTable:false
   },
-  {
-    label: '数据来源',
-    field: 'sourceType',
-    dictType: DICT_TYPE.PURCHASERECEIPT_SOURCE_TYPE,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      value: 'ASN_ExternalReceipt',
-      componentProps: {
-        disabled: true
-      }
-    },
-    isSearch: false,
-  },
   {
     label: '车牌号',
     field: 'vehiclePlateNumber',
@@ -447,24 +411,6 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     sortTableDefault:12,
   },
-  {
-    label: '包装号', // 实际是子表的从包装号，为了不影响页面，单独放上面
-    field: 'fromPackingNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:16,
-  },
-  {
-    label: '检验申请单号',
-    field: 'inspectNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:6,
-  },
   {
     label: '发货数量',
     field: 'shippedQty',
@@ -631,16 +577,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     sortTableDefault:1998,
     hiddenInMain:true
   },
-  {
+  
-    label: '检验申请单号',
-    field: 'inspectNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable:false,
-    sortTableDefault:6,
-  },
   {
     label: '采购订单号',
     field: 'poNumber',
@@ -722,24 +659,6 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
       }
     },
   },
-  {
-    label: '物料类型',
-    field: 'itemType',
-    sort: 'custom',
-    dictType: DICT_TYPE.ITEM_TYPE,
-    dictClass: 'string',
-    isSearch: true,
-    isDetail:false,
-    table: {
-      width: 150
-    },
-    search:{
-      componentProps:{
-        multiple:true,
-      }
-    }
-
-  },
   {
     label: '物料名称',
     field: 'itemName',
@@ -952,16 +871,6 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     sortTableDefault:18,
     hiddenInMain:true
   },
-  {
-    label: '从库位代码',
-    field: 'fromLocationCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:18,
-
-  },
   {
     label: '到库位代码',
     field: 'toLocationCode',

src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts

@@ -192,21 +192,6 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       width: 150
     },
   },
-  {
-    label: '数据来源',
-    field: 'sourceType',
-    dictType: DICT_TYPE.PURCHASERECEIPT_SOURCE_TYPE,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      value: 'ASN_ExternalReceipt',
-      componentProps: {
-        disabled: true
-      }
-    },
-  },
   {
     label: '从仓库代码',
     field: 'fromWarehouseCode',

src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRecordMain/index.vue

@@ -239,7 +239,7 @@ const butttondata = (row, $index) => {
       hide: isShowputawayRequestFlagButton(row)
     }), // 生成到货检验申请
     defaultButtons.mainPutawayRequestBtn({
-      hide: (row.isPutaway==1 || row.putawayRequestFlag == 'FALSE')?false:true
+      hide: (row.isPutaway==1 && row.putawayRequestFlag == 'FALSE')?false:true
     }), // 生成采购上架申请
     defaultButtons.mainPurchasereturnRecordBtn({
       hasPermi: 'wms:purchasereceipt-record-main:createPurchasereturnRecord',

src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts

@@ -38,26 +38,6 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     sortTableDefault:3
   },
-  {
-    label: '备注',
-    field: 'mainRemark',
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isSearch: false,
-    sortTableDefault:3
-  },
-  {
-    label: '明细备注',
-    field: 'remark',
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isSearch: false,
-    sortTableDefault:3
-  },
   {
     label: '发货单号',
     field: 'asnNumber',
@@ -135,22 +115,6 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isTable:false
   },
-  {
-    label: '数据来源',
-    field: 'sourceType',
-    dictType: DICT_TYPE.PURCHASERECEIPT_SOURCE_TYPE,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      value: 'ASN_ExternalReceipt',
-      componentProps: {
-        disabled: true
-      }
-    },
-    isSearch: false,
-  },
   {
     label: '车牌号',
     field: 'vehiclePlateNumber',
@@ -447,24 +411,6 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     sortTableDefault:12,
   },
-  {
-    label: '包装号', // 实际是子表的从包装号，为了不影响页面，单独放上面
-    field: 'fromPackingNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:16,
-  },
-  {
-    label: '检验申请单号',
-    field: 'inspectNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:6,
-  },
   {
     label: '发货数量',
     field: 'shippedQty',
@@ -631,16 +577,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     sortTableDefault:1998,
     hiddenInMain:true
   },
-  {
+  
-    label: '检验申请单号',
-    field: 'inspectNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable:false,
-    sortTableDefault:6,
-  },
   {
     label: '采购订单号',
     field: 'poNumber',
@@ -722,24 +659,6 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
       }
     },
   },
-  {
-    label: '物料类型',
-    field: 'itemType',
-    sort: 'custom',
-    dictType: DICT_TYPE.ITEM_TYPE,
-    dictClass: 'string',
-    isSearch: true,
-    isDetail:false,
-    table: {
-      width: 150
-    },
-    search:{
-      componentProps:{
-        multiple:true,
-      }
-    }
-
-  },
   {
     label: '物料名称',
     field: 'itemName',
@@ -952,16 +871,6 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     sortTableDefault:18,
     hiddenInMain:true
   },
-  {
-    label: '从库位代码',
-    field: 'fromLocationCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:18,
-
-  },
   {
     label: '到库位代码',
     field: 'toLocationCode',

src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts

@@ -192,21 +192,6 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       width: 150
     },
   },
-  {
-    label: '数据来源',
-    field: 'sourceType',
-    dictType: DICT_TYPE.PURCHASERECEIPT_SOURCE_TYPE,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      value: 'ASN_ExternalReceipt',
-      componentProps: {
-        disabled: true
-      }
-    },
-  },
   {
     label: '从仓库代码',
     field: 'fromWarehouseCode',

src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts

@@ -76,21 +76,6 @@ export const PurchasereceiptJobMain = useCrudSchemas(
       },
       sortTableDefault: 1010
     },
-    {
-      label: '数据来源',
-      field: 'sourceType',
-      dictType: DICT_TYPE.PURCHASERECEIPT_SOURCE_TYPE,
-      sort: 'custom',
-      table: {
-        width: 150
-      },
-      form: {
-        value: 'ASN_ExternalReceipt',
-        componentProps: {
-          disabled: true
-        }
-      },
-    },
     {
       label: '运输方式',
       field: 'transferMode',
@@ -1081,8 +1066,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(
       table: {
         width: 150
       },
-      hiddenInMain: true,
+      sortTableDefault: 1001
-      sortTableDefault: 1004
     },
     {
       label: '数量',

src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue

@@ -248,7 +248,7 @@ const butttondata = (row, $index) => {
       hide: isShowputawayRequestFlagButton(row)
     }), // 生成到货检验申请
     defaultButtons.mainPutawayRequestBtn({
-      hide: (row.isPutaway==1 || row.putawayRequestFlag == 'FALSE')?false:true
+      hide: (row.isPutaway==1 && row.putawayRequestFlag == 'FALSE')?false:true
     }), // 生成采购上架申请
     defaultButtons.mainPurchasereturnRecordBtn({
       hasPermi: 'wms:purchasereceipt-record-main:createPurchasereturnRecord',
@@ -287,7 +287,6 @@ const searchList = (model) => {
     params.itemTypes = ''
     params.itemType = ''
   }
-  params.orderTypeM = '1'
   setSearchParams(params)
 }
 
@@ -439,11 +438,6 @@ const handleExport = async () => {
 
 // 筛选提交
 const searchFormClick = (searchData) => {
-  searchData.filters.push({
-    action: '==',
-    column: 'order_type_m',
-    value: '1'
-  })
   tableObject.params = {
     isSearch: true,
     filters: searchData.filters
@@ -475,18 +469,12 @@ const changeTabs = (data) => {
 
 /** 初始化 **/
 onMounted(async () => {
-  tableObject.params = {
-    orderTypeM: '1'
-  }
   await getSwitchByCode('EnableQms').then((res) => {
     EnableQms.value = res == 'TRUE' ? true : false
   })
   getList()
 })
 onActivated(() => {
-  tableObject.params = {
-    orderTypeM: '1'
-  }
   getList()
 })
 </script>

src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts

@@ -38,26 +38,6 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     sortTableDefault:3
   },
-  {
-    label: '备注',
-    field: 'mainRemark',
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isSearch: false,
-    sortTableDefault:3
-  },
-  {
-    label: '明细备注',
-    field: 'remark',
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isSearch: false,
-    sortTableDefault:3
-  },
   {
     label: '发货单号',
     field: 'asnNumber',
@@ -135,22 +115,6 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isTable:false
   },
-  {
-    label: '数据来源',
-    field: 'sourceType',
-    dictType: DICT_TYPE.PURCHASERECEIPT_SOURCE_TYPE,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      value: 'ASN_ExternalReceipt',
-      componentProps: {
-        disabled: true
-      }
-    },
-    isSearch: false,
-  },
   {
     label: '车牌号',
     field: 'vehiclePlateNumber',
@@ -447,24 +411,6 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     sortTableDefault:12,
   },
-  {
-    label: '包装号', // 实际是子表的从包装号，为了不影响页面，单独放上面
-    field: 'fromPackingNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:16,
-  },
-  {
-    label: '检验申请单号',
-    field: 'inspectNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:6,
-  },
   {
     label: '发货数量',
     field: 'shippedQty',
@@ -631,16 +577,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     sortTableDefault:1998,
     hiddenInMain:true
   },
-  {
+  
-    label: '检验申请单号',
-    field: 'inspectNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable:false,
-    sortTableDefault:6,
-  },
   {
     label: '采购订单号',
     field: 'poNumber',
@@ -722,24 +659,6 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
       }
     },
   },
-  {
-    label: '物料类型',
-    field: 'itemType',
-    sort: 'custom',
-    dictType: DICT_TYPE.ITEM_TYPE,
-    dictClass: 'string',
-    isSearch: true,
-    isDetail:false,
-    table: {
-      width: 150
-    },
-    search:{
-      componentProps:{
-        multiple:true,
-      }
-    }
-
-  },
   {
     label: '物料名称',
     field: 'itemName',
@@ -952,16 +871,6 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     sortTableDefault:18,
     hiddenInMain:true
   },
-  {
-    label: '从库位代码',
-    field: 'fromLocationCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:18,
-
-  },
   {
     label: '到库位代码',
     field: 'toLocationCode',

src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts

@@ -192,21 +192,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       width: 150
     },
   },
-  {
+  
-    label: '数据来源',
-    field: 'sourceType',
-    dictType: DICT_TYPE.PURCHASERECEIPT_SOURCE_TYPE,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      value: 'ASN_ExternalReceipt',
-      componentProps: {
-        disabled: true
-      }
-    },
-  },
   {
     label: '从仓库代码',
     field: 'fromWarehouseCode',

src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptJobMain/purchasereceiptJobMain.data.ts

@@ -76,21 +76,6 @@ export const PurchasereceiptJobMain = useCrudSchemas(
       },
       sortTableDefault: 1010
     },
-    {
-      label: '数据来源',
-      field: 'sourceType',
-      dictType: DICT_TYPE.PURCHASERECEIPT_SOURCE_TYPE,
-      sort: 'custom',
-      table: {
-        width: 150
-      },
-      form: {
-        value: 'ASN_ExternalReceipt',
-        componentProps: {
-          disabled: true
-        }
-      },
-    },
     {
       label: '运输方式',
       field: 'transferMode',
@@ -1081,8 +1066,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(
       table: {
         width: 150
       },
-      hiddenInMain: true,
+      sortTableDefault: 1001
-      sortTableDefault: 1004
     },
     {
       label: '数量',

src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRecordMain/index.vue

@@ -240,7 +240,7 @@ const butttondata = (row, $index) => {
     }), // 生成到货检验申请
     defaultButtons.mainPutawayRequestBtn({
       // hasPermi: 'wms:tool-purchasereceipt-record-main:createPutawayRequest',
-      hide: (row.isPutaway==1 || row.putawayRequestFlag == 'FALSE')?false:true
+      hide: (row.isPutaway==1 && row.putawayRequestFlag == 'FALSE')?false:true
     }), // 生成采购上架申请
     defaultButtons.mainPurchasereturnRecordBtn({
       hasPermi: true,

src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts

@@ -38,26 +38,6 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     sortTableDefault:3
   },
-  {
-    label: '备注',
-    field: 'mainRemark',
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isSearch: false,
-    sortTableDefault:3
-  },
-  {
-    label: '明细备注',
-    field: 'remark',
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isSearch: false,
-    sortTableDefault:3
-  },
   {
     label: '发货单号',
     field: 'asnNumber',
@@ -135,22 +115,6 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isTable:false
   },
-  {
-    label: '数据来源',
-    field: 'sourceType',
-    dictType: DICT_TYPE.PURCHASERECEIPT_SOURCE_TYPE,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      value: 'ASN_ExternalReceipt',
-      componentProps: {
-        disabled: true
-      }
-    },
-    isSearch: false,
-  },
   {
     label: '车牌号',
     field: 'vehiclePlateNumber',
@@ -447,24 +411,6 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     sortTableDefault:12,
   },
-  {
-    label: '包装号', // 实际是子表的从包装号，为了不影响页面，单独放上面
-    field: 'fromPackingNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:16,
-  },
-  {
-    label: '检验申请单号',
-    field: 'inspectNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:6,
-  },
   {
     label: '发货数量',
     field: 'shippedQty',
@@ -631,16 +577,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     sortTableDefault:1998,
     hiddenInMain:true
   },
-  {
+  
-    label: '检验申请单号',
-    field: 'inspectNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable:false,
-    sortTableDefault:6,
-  },
   {
     label: '采购订单号',
     field: 'poNumber',
@@ -722,24 +659,6 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
       }
     },
   },
-  {
-    label: '物料类型',
-    field: 'itemType',
-    sort: 'custom',
-    dictType: DICT_TYPE.ITEM_TYPE,
-    dictClass: 'string',
-    isSearch: true,
-    isDetail:false,
-    table: {
-      width: 150
-    },
-    search:{
-      componentProps:{
-        multiple:true,
-      }
-    }
-
-  },
   {
     label: '物料名称',
     field: 'itemName',
@@ -952,16 +871,6 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     sortTableDefault:18,
     hiddenInMain:true
   },
-  {
-    label: '从库位代码',
-    field: 'fromLocationCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:18,
-
-  },
   {
     label: '到库位代码',
     field: 'toLocationCode',

src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts

@@ -192,21 +192,6 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       width: 150
     },
   },
-  {
-    label: '数据来源',
-    field: 'sourceType',
-    dictType: DICT_TYPE.PURCHASERECEIPT_SOURCE_TYPE,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      value: 'ASN_ExternalReceipt',
-      componentProps: {
-        disabled: true
-      }
-    },
-  },
   {
     label: '从仓库代码',
     field: 'fromWarehouseCode',