Merge remote-tracking branch 'origin/master_hella' into master_hella

2 months ago · 4ea36571fe
7 changed files with 77 additions and 60 deletions
--- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
+++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
@ -256,50 +256,50 @@ export const CustomerreturnRequestMain = useCrudSchemas(
        }
      }
    },
-    {
-      label: '客户月台代码',
-      field: 'customerDockCode',
-      sort: 'custom',
-      table: {
-        width: 150
-      },
-      isTable: false,
-      form: {
-        // labelMessage: '信息提示说明！！！',
-        componentProps: {
-          enterSearch: true,
-          isSearchList: true, // 开启查询弹窗
-          searchListPlaceholder: '请选择客户月台代码', // 输入框占位文本
-          searchField: 'code', // 查询弹窗赋值字段
-          searchTitle: '客户月台信息', // 查询弹窗标题
-          searchAllSchemas: Customerdock.allSchemas, // 查询弹窗所需类
-          searchPage: CustomerdockApi.pageCustomerCodeToCustomerDockReceiving, // 查询弹窗所需分页方法
-          searchCondition: [
-            {
-              key: 'available',
-              value: 'TRUE',
-              isMainValue: false
-            },
-            {
-              key: 'customerCode',
-              value: 'customerCode',
-              message: '请填写客户代码！',
-              isMainValue: true
-            }
-          ],
-          verificationParams: [
-            {
-              key: 'code',
-              action: '==',
-              value: '',
-              isMainValue: false,
-              isSearch: true,
-              isFormModel: true
-            }
-          ] // 失去焦点校验参数
-        }
-      }
-    },
+    // {
+    //   label: '客户月台代码',
+    //   field: 'customerDockCode',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   isTable: false,
+    //   form: {
+    //     // labelMessage: '信息提示说明！！！',
+    //     componentProps: {
+    //       enterSearch: true,
+    //       isSearchList: true, // 开启查询弹窗
+    //       searchListPlaceholder: '请选择客户月台代码', // 输入框占位文本
+    //       searchField: 'code', // 查询弹窗赋值字段
+    //       searchTitle: '客户月台信息', // 查询弹窗标题
+    //       searchAllSchemas: Customerdock.allSchemas, // 查询弹窗所需类
+    //       searchPage: CustomerdockApi.pageCustomerCodeToCustomerDockReceiving, // 查询弹窗所需分页方法
+    //       searchCondition: [
+    //         {
+    //           key: 'available',
+    //           value: 'TRUE',
+    //           isMainValue: false
+    //         },
+    //         {
+    //           key: 'customerCode',
+    //           value: 'customerCode',
+    //           message: '请填写客户代码！',
+    //           isMainValue: true
+    //         }
+    //       ],
+    //       verificationParams: [
+    //         {
+    //           key: 'code',
+    //           action: '==',
+    //           value: '',
+    //           isMainValue: false,
+    //           isSearch: true,
+    //           isFormModel: true
+    //         }
+    //       ] // 失去焦点校验参数
+    //     }
+    //   }
+    // },
    {
      label: '承运商',
      field: 'carrierCode',
--- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue
+++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue
@ -59,6 +59,7 @@
    @submitForm="submitForm"
    @onEnter="onEnter"
    @inputNumberChange="inputNumberChange"
+    @clearSearchInput="clearSearchInput"
  />
  <!-- 添加明细：采购收货记录单号 -->
  <SearchTable ref="searchTableRef" @searchTableSuccess="searchTableSuccess1" />
@ -210,7 +211,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
      setV['deliverRecordNumber'] = val[0]['number']
      setV['deliverPlanNumber'] = val[0]['deliverPlanNumber']
      // setV['customerCode'] = val[0]['customerCode']
-      setV['customerDockCode'] = val[0]['customerDockCode']
+      // setV['customerDockCode'] = val[0]['customerDockCode'] 
     
        // 获取子表数据 
        DeliverRecordDetailApi.getDeliverRecordDetailPageCustomerreturn({pageSize:999,masterId:val[0]['masterId']}).then(res => {
@ -569,10 +570,10 @@ const openForm =async (type: string, row?: number) => {
        item.componentProps.isSearchList = false,
        item.componentProps.disabled = true
      }
-      if(item.field == 'customerDockCode'){
-        item.componentProps.isSearchList = false,
-        item.componentProps.disabled = true
-      }
+      // if(item.field == 'customerDockCode'){
+      //   item.componentProps.isSearchList = false,
+      //   item.componentProps.disabled = true
+      // }
    })
  }else {
    CustomerreturnRequestMain.allSchemas.formSchema.forEach((item) => {
@ -582,9 +583,9 @@ const openForm =async (type: string, row?: number) => {
      if(item.field == 'customerCode'){
        item.componentProps.isSearchList = true
      }
-      if(item.field == 'customerDockCode'){
-        item.componentProps.isSearchList = true
-      }
+      // if(item.field == 'customerDockCode'){
+      //   item.componentProps.isSearchList = true
+      // }
    })
    CustomerreturnRequestDetail.allSchemas.formSchema.forEach((itemDetail) => {
        if(itemDetail.field == 'packingNumber'){
@ -725,7 +726,23 @@ const handleDeleteTable = (item, index) => {
 const tableSelectionDelete = (selection) => {
  tableData.value = tableData.value.filter(item => !selection.includes(item))
 }
-
+const clearSearchInput = (field)=>{
+  console.log('field',field)
+  if('customerCode' == field){
+    //客户代码
+    formRef.value.formRef.setValues({
+      deliverRecordNumber: '',
+      // customerDockCode:'',
+    })
+    tableData.value = []
+  }else if('deliverRecordNumber' == field){
+    //发货记录单号
+    // formRef.value.formRef.setValues({
+    //   customerDockCode:'',
+    // })
+    tableData.value = []
+  }
+}
 //为true表示子表数据中存在数量为0的数据
 const inputNumberChange = (field, val,row, index) => {
  if(field=='qty'){
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMOrderTypeMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMOrderTypeMain/index.vue
@ -143,7 +143,7 @@ const butttondata = (row,$index) => {
 const buttonTableClick = async (val, row) => {
  if (val == 'documentPrint') {
    // 单据打印
-     handleDocumentPrint(row.requestNumber,row.itemCode)
+     handleDocumentPrint(row.number,row.itemCode)
  }
 }

@ -151,7 +151,7 @@ const buttonTableClick = async (val, row) => {
 const BASE_URL = getJmreportBaseUrl()
 const documentSrc = ref(BASE_URL + '/jmreport/view/920874172025987072?token=' + getAccessToken())
 const handleDocumentPrint = async (requestNumber,itemCode) => {
-  window.open(documentSrc.value + '&requestNumber=' + requestNumber +'&itemCode=' + itemCode)
+  window.open(documentSrc.value + '&requestNumber=' + requestNumber +'&itemCode=' + itemCode + '&reqType=record')
 }
 // 获取部门 用于详情 部门回显
 const { wsCache } = useCache()
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue
@ -143,7 +143,7 @@ const butttondata = (row,$index) => {
 const buttonTableClick = async (val, row) => {
  if (val == 'documentPrint') {
    // 单据打印
-     handleDocumentPrint(row.requestNumber,row.itemCode)
+     handleDocumentPrint(row.number,row.itemCode)
  }
 }

@ -151,7 +151,7 @@ const buttonTableClick = async (val, row) => {
 const BASE_URL = getJmreportBaseUrl()
 const documentSrc = ref(BASE_URL + '/jmreport/view/920874172025987072?token=' + getAccessToken())
 const handleDocumentPrint = async (requestNumber,itemCode) => {
-  window.open(documentSrc.value + '&requestNumber=' + requestNumber +'&itemCode=' + itemCode)
+  window.open(documentSrc.value + '&requestNumber=' + requestNumber +'&itemCode=' + itemCode + '&reqType=record')
 }
 // 获取部门 用于详情 部门回显
 const { wsCache } = useCache()
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMOrderTypeMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMOrderTypeMain/index.vue
@ -637,7 +637,7 @@ const buttonTableClick = async (val, row) => {
 const BASE_URL2 = getJmreportBaseUrl()
 const documentSrc = ref(BASE_URL2 + '/jmreport/view/920874172025987072?token=' + getAccessToken())
 const handleDocumentPrint = async (number,itemCode) => {
-  window.open(documentSrc.value + '&requestNumber=' + number +'&itemCode=' + itemCode)
+  window.open(documentSrc.value + '&requestNumber=' + number +'&itemCode=' + itemCode+'&reqType=request')
 }

 /** 添加/修改操作 */
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
@ -623,7 +623,7 @@ const buttonTableClick = async (val, row) => {
 const BASE_URL2 = getJmreportBaseUrl()
 const documentSrc = ref(BASE_URL2 + '/jmreport/view/920874172025987072?token=' + getAccessToken())
 const handleDocumentPrint = async (number,itemCode) => {
-  window.open(documentSrc.value + '&requestNumber=' + number +'&itemCode=' + itemCode)
+  window.open(documentSrc.value + '&requestNumber=' + number +'&itemCode=' + itemCode + '&reqType=request')
 }

 /** 添加/修改操作 */
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue
@ -539,7 +539,7 @@ const buttonTableClick = async (val, row) => {
 const BASE_URL2 = getJmreportBaseUrl()
 const documentSrc = ref(BASE_URL2 + '/jmreport/view/920874172025987072?token=' + getAccessToken())
 const handleDocumentPrint = async (number,itemCode) => {
-  window.open(documentSrc.value + '&requestNumber=' + number +'&itemCode=' + itemCode)
+  window.open(documentSrc.value + '&requestNumber=' + number +'&itemCode=' + itemCode + '&reqType=request')
 }

 /** 添加/修改操作 */