搜索修改、用印已撤回修改

api/approve/contract.js

@@ -53,7 +53,7 @@ export const apiContractReject=params=>{
 
 /**
  * 合同搜索
- * @param {string} CompanyName 搜索关键字
+ * @param {string} Keyword 搜索关键字
  */
 export const apiContractSearch=params=>{
 	return httpGet('/contract/company_list',params)

api/approve/custome.js

@@ -5,7 +5,7 @@ import {httpGet,httpPost} from "@/utils/request.js"
 
 /**
  * 客户搜索
- * @param {string} CompanyName 搜索值 
+ * @param {string} Keyword 搜索值 
  */
 export const apiCustomeSearch=params=>{
 	return httpGet('/approval/company_list',params)
@@ -16,7 +16,7 @@ export const apiCustomeSearch=params=>{
  * @param {int}  PageSize  每页数据条数
  * @param {int}  CurrentIndex 当前页页码，从1开始
  * @param {string}  Status  状态：’全部(传空串)’,’待审批’,’已审批’,’驳回’,’已撤回’
- * @param {string}  KeyWord  搜索关键词    
+ * @param {string}  Keyword  搜索关键词    
  */
 export const apiCustomeList=params=>{
 	return httpGet('/approval/list',{...params,PageSize:20})

api/approve/seal.js

@@ -50,14 +50,15 @@ export const apiSearchCustome=params=>{
  * @param {string}  Keyword	搜索关键字(对应客户名称)
  */
 export const apiSearchContract=params=>{
-	return httpGet('/contract/list',{...params,Status:'已审批'})
+	// return httpGet('/contract/list',{...params,Status:'已审批'})
+	return httpGet('/contract_approval/list',{...params,Status:'已审批',PageSize:10000})
 }
 
 /**
  * 审批单列表
  * @param {type} Status	状态：待审批、处理中、已审批、已作废 
  */
-export const apiSealList=params=>{
+export const apiSealApproveList=params=>{
 	return httpGet('/seal_approval/list',params)
 }
 
@@ -115,4 +116,11 @@ export const apiSealEdit=params=>{
  */
 export const apiSealCancelApply=params=>{
 	return httpGet('/seal_approval/cancelApply',params)
+}
+
+/**
+ * 用印列表
+ */
+export const apiSealList=params=>{
+	return httpGet('/seal/list',params)
 }

pages-approve/contract/list.vue

@@ -115,7 +115,7 @@
 				const res=await apiContractApproveList({
 					CurrentIndex:this.page,
 					Status:this.status,
-					KeyWord:''
+					Keyword:''
 				})
 				if(res.code===200){
 					if(!res.data.List||res.data.List.length===0){
@@ -153,7 +153,7 @@
 				const res=await apiContractList({
 					CurrentIndex:this.page,
 					Status:this.status,
-					KeyWord:''
+					Keyword:''
 				})
 				if(res.code===200){
 					if(res.data.Paging.IsEnd){

pages-approve/custome/list.vue

@@ -80,7 +80,7 @@
 				const res=await apiCustomeList({
 					CurrentIndex:this.page,
 					Status:this.status,
-					KeyWord:''
+					Keyword:''
 				})
 				if(res.code===200){
 					if(!res.data.List||res.data.List.length===0){

pages-approve/seal/addSeal.vue

@@ -127,7 +127,7 @@
 		<!-- 客户搜索 -->
 		<van-popup :show="showCustome" @close="showCustome=false" position="bottom" custom-style="height: 100vh">
 			<view class="custome-search-wrap">
-				<van-search use-left-icon-slot use-action-slot shape="round" :value="searchCustomeVal" placeholder="请输入客户名称" @change="onSearchValChange" @search="onSearch"
+				<van-search use-left-icon-slot use-action-slot shape="round" :value="searchCustomeVal" placeholder="请输入客户名称/社会信用码" @change="onSearchValChange" @search="onSearch"
 					custom-class="search-box" field-class="search-con">
 					<view slot="left-icon">
 						<image src="../static/search-icon.png" mode="aspectFill" class="search-icon"></image>
@@ -268,7 +268,7 @@
 			async onSearch(){
 				this.searchContractList=[]
 				this.searchCustomeList=[]
-				const res=await apiSearchCustome({CompanyName:this.searchCustomeVal})
+				const res=await apiSearchCustome({Keyword:this.searchCustomeVal})
 				if(res.code===200){
 					this.searchCustomeList=res.data
 					if(res.data.length===0){

pages-approve/seal/detail.vue

@@ -106,7 +106,7 @@
 		<!-- 客户搜索 -->
 		<van-popup :show="showCustome" @close="showCustome=false" position="bottom" custom-style="height: 100vh">
 			<view class="custome-search-wrap">
-				<van-search use-left-icon-slot use-action-slot shape="round" :value="searchCustomeVal" placeholder="请输入客户名称" @change="onSearchValChange" @search="onSearch"
+				<van-search use-left-icon-slot use-action-slot shape="round" :value="searchCustomeVal" placeholder="请输入客户名称/社会信用码" @change="onSearchValChange" @search="onSearch"
 					custom-class="search-box" field-class="search-con">
 					<view slot="left-icon">
 						<image src="../static/search-icon.png" mode="aspectFill" class="search-icon"></image>
@@ -392,7 +392,7 @@
 			async onSearch(){
 				this.searchContractList=[]
 				this.searchCustomeList=[]
-				const res=await apiSearchCustome({CompanyName:this.searchCustomeVal})
+				const res=await apiSearchCustome({Keyword:this.searchCustomeVal})
 				if(res.code===200){
 					this.searchCustomeList=res.data
 				}

pages-approve/seal/edit.vue

@@ -122,7 +122,7 @@
 		<!-- 客户搜索 -->
 		<van-popup :show="showCustome" @close="showCustome=false" position="bottom" custom-style="height: 100vh">
 			<view class="custome-search-wrap">
-				<van-search use-left-icon-slot use-action-slot shape="round" :value="searchCustomeVal" placeholder="请输入客户名称" @change="onSearchValChange" @search="onSearch"
+				<van-search use-left-icon-slot use-action-slot shape="round" :value="searchCustomeVal" placeholder="请输入客户名称/社会信用码" @change="onSearchValChange" @search="onSearch"
 					custom-class="search-box" field-class="search-con">
 					<view slot="left-icon">
 						<image src="../static/search-icon.png" mode="aspectFill" class="search-icon"></image>
@@ -305,7 +305,7 @@
 			async onSearch(){
 				this.searchContractList=[]
 				this.searchCustomeList=[]
-				const res=await apiSearchCustome({CompanyName:this.searchCustomeVal})
+				const res=await apiSearchCustome({Keyword:this.searchCustomeVal})
 				if(res.code===200){
 					this.searchCustomeList=res.data
 				}

pages-approve/seal/list.vue

@@ -25,7 +25,7 @@
 </template>
 
 <script>
-	import {apiSealList} from '@/api/approve/seal.js'
+	import {apiSealList,apiSealApproveList} from '@/api/approve/seal.js'
 	import approveListItem from '../components/approveListItem.vue'
 	export default {
 		components:{
@@ -116,11 +116,20 @@
 			
 			//获取列表数据
 			async getList(){
-				const res=await apiSealList({
-					CurrentIndex:this.page,
-					Status:this.status,
-					KeyWord:''
-				})
+				let res=null
+				if(this.status==='已撤回'){
+					res=await apiSealList({
+						CurrentIndex:this.page,
+						Status:this.status,
+						Keyword:''
+					})
+				}else{
+					res=await apiSealApproveList({
+						CurrentIndex:this.page,
+						Status:this.status,
+						Keyword:''
+					})
+				}
 				if(res.code===200){
 					if(!res.data.List||res.data.List.length===0){
 						this.finished=true

pages-approve/search/index.vue

@@ -81,7 +81,7 @@
 			// 客户审批搜索
 			async handleCustome() {
 				const res = await apiCustomeSearch({
-					CompanyName: this.value,
+					Keyword: this.value,
 				})
 				if (res.code === 200) {
 					
@@ -97,7 +97,7 @@
 			// 合同审批搜索
 			async handleContract() {
 				const res = await apiContractSearch({
-					CompanyName: this.value,
+					Keyword: this.value,
 				})
 				if (res.code === 200) {
 					this.list = res.data
@@ -112,7 +112,7 @@
 			//用印搜索
 			async handleSeal(){
 				const res=await apiSealSearch({
-					CompanyName: this.value,
+					Keyword: this.value,
 				})
 				if (res.code === 200) {
 					this.list = res.data