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

src/views/wms/basicDataManage/labelManage/callmaterials/index.vue

@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="Callmaterials.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="Callmaterials.allSchemas.searchSchema" @search="searchList" @reset="searchList" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -291,7 +291,10 @@ const searchFormClick = (searchData) => {
   }
   getList() // 刷新当前列表
 }
-
+const searchList = (model)=>{
+  selectionRows.value = []
+  setSearchParams(model)
+}
 watch(
     () => tableObject.tableList,
     () => {

src/views/wms/basicDataManage/labelManage/locationLabel/index.vue

@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="Package.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="Package.allSchemas.searchSchema" @search="searchList" @reset="searchList" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -209,7 +209,10 @@ const searchFormClick = (searchData) => {
   }
   getList() // 刷新当前列表
 }
-
+const searchList = (model)=>{
+  selectionRows.value = []
+  setSearchParams(model)
+}
 watch(
   () => tableObject.tableList,
   () => {

src/views/wms/inventoryManage/balance/index.vue

@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="Balance.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="Balance.allSchemas.searchSchema" @search="searchList" @reset="searchList" />
   </ContentWrap>
 
   <!-- 列表头部 -->
@@ -135,6 +135,10 @@ const buttonBaseClick = (val, item) => {
     console.log('其他按钮', item)
   }
 }
+const searchList = (model)=>{
+  selectionRows.value = []
+  setSearchParams(model)
+}
 watch(
   () => tableObject.tableList,
   () => {

src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue

@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="[...PutawayJobMain.allSchemas.searchSchema,...PutawayJobDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...PutawayJobMain.allSchemas.searchSchema,...PutawayJobDetail.allSchemas.searchSchema]" @search="searchList" @reset="searchList" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -198,7 +198,10 @@ const buttonBaseClick = (val, item) => {
     console.log('其他按钮', item)
   }
 }
-
+const searchList = (model)=>{
+  selectionRows.value = []
+  setSearchParams(model)
+}
 watch(
   () => tableObject.tableList,
   () => {
@@ -277,7 +280,7 @@ const buttonTableClick = async (val, row) => {
 }
 
 const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
-const src = ref(BASE_URL + '/jmreport/view/954234424010665984?token=' + getAccessToken())
+const src = ref(BASE_URL + '/jmreport/view/954878108028801024?token=' + getAccessToken())
 const handleDocumentPrint = async (row) => {
   window.open(src.value+'&id='+row.masterId)
 }

src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue

@@ -155,7 +155,9 @@ console.log('PurchaseMain.allSchemas.searchSchema',PurchaseMain.allSchemas.searc
             setV['contactName']=val[0]['contacts']
             setV['contactPhone']=val[0]['phone']
             setV['contactEmail']=val[0]['email']
-            setV['taxRate']=val[0]['taxRate']
+            if(formRef.formModel.taxRate==0){
+              setV['taxRate']=val[0]['taxRate']
+            }
             formRef.setValues(setV)
             //明细
             val.forEach(item=>{