90ebad3c by lihua

添加bizApproveState

1 parent a335bd10
...@@ -444,7 +444,7 @@ export const tagType = (row, type) => { ...@@ -444,7 +444,7 @@ export const tagType = (row, type) => {
444 state = 'warning'; 444 state = 'warning';
445 break; 445 break;
446 } 446 }
447 } else if (type == 'approveState') { 447 } else if (type == 'approveState' || type == 'bizApproveState') {
448 switch (row[type]) { 448 switch (row[type]) {
449 case "N": 449 case "N":
450 state = 'info'; 450 state = 'info';
...@@ -455,6 +455,7 @@ export const tagType = (row, type) => { ...@@ -455,6 +455,7 @@ export const tagType = (row, type) => {
455 case "Y": 455 case "Y":
456 state = 'success' 456 state = 'success'
457 break; 457 break;
458 case 'E':
458 case "R": 459 case "R":
459 state = 'danger' 460 state = 'danger'
460 break; 461 break;
...@@ -754,7 +755,7 @@ export const tagMethod = (row, type) => { ...@@ -754,7 +755,7 @@ export const tagMethod = (row, type) => {
754 tag = '待受理' 755 tag = '待受理'
755 break; 756 break;
756 } 757 }
757 } else if (type == 'approveState') { 758 } else if (type == 'approveState' || type == 'bizApproveState') {
758 switch (row[type]) { 759 switch (row[type]) {
759 case "N": 760 case "N":
760 tag = '草稿中' 761 tag = '草稿中'
...@@ -771,6 +772,9 @@ export const tagMethod = (row, type) => { ...@@ -771,6 +772,9 @@ export const tagMethod = (row, type) => {
771 case "C": 772 case "C":
772 tag = '已撤销' 773 tag = '已撤销'
773 break; 774 break;
775 case 'E':
776 tag = '发起失败'
777 break;
774 default: 778 default:
775 tag = '--' 779 tag = '--'
776 break; 780 break;
......
...@@ -187,7 +187,7 @@ const tableInfo = ref({ ...@@ -187,7 +187,7 @@ const tableInfo = ref({
187 const getTableBtns = (row, includeDetail = true) => { 187 const getTableBtns = (row, includeDetail = true) => {
188 let btnsArr: any[] = []; 188 let btnsArr: any[] = [];
189 const currentStaffGuid = userData.userGuid 189 const currentStaffGuid = userData.userGuid
190 const approveState = row.approveState; 190 const approveState = row.bizApproveState;
191 const staffGuid = row.createUserId || ''; 191 const staffGuid = row.createUserId || '';
192 let flowState; 192 let flowState;
193 if (approveState == 'N' && staffGuid == currentStaffGuid) { 193 if (approveState == 'N' && staffGuid == currentStaffGuid) {
......
...@@ -36,7 +36,7 @@ const searchItemList = ref([ ...@@ -36,7 +36,7 @@ const searchItemList = ref([
36 { 36 {
37 type: 'select', 37 type: 'select',
38 label: '', 38 label: '',
39 field: 'approveState', 39 field: 'bizApproveState',
40 default: '', 40 default: '',
41 placeholder: '审核状态', 41 placeholder: '审核状态',
42 options: [ 42 options: [
...@@ -130,7 +130,7 @@ const page = ref({ ...@@ -130,7 +130,7 @@ const page = ref({
130 { label: "200", value: 200 }, 130 { label: "200", value: 200 },
131 ], 131 ],
132 connectorName: '', 132 connectorName: '',
133 approveState: '' 133 bizApproveState: ''
134 }); 134 });
135 const currTableData: any = ref({}); 135 const currTableData: any = ref({});
136 const tableInfo = ref({ 136 const tableInfo = ref({
...@@ -197,10 +197,10 @@ const toSearch = (val: any, clear: boolean = false) => { ...@@ -197,10 +197,10 @@ const toSearch = (val: any, clear: boolean = false) => {
197 if (clear) { 197 if (clear) {
198 searchItemList.value.map((item) => (item.default = "")); 198 searchItemList.value.map((item) => (item.default = ""));
199 page.value.connectorName = ''; 199 page.value.connectorName = '';
200 page.value.approveState = ""; 200 page.value.bizApproveState = "";
201 } else { 201 } else {
202 page.value.connectorName = val.connectorName; 202 page.value.connectorName = val.connectorName;
203 page.value.approveState = val.approveState; 203 page.value.bizApproveState = val.bizApproveState;
204 } 204 }
205 getTableData(); 205 getTableData();
206 updateCheckConnector(); 206 updateCheckConnector();
...@@ -212,7 +212,7 @@ const getTableData = () => { ...@@ -212,7 +212,7 @@ const getTableData = () => {
212 pageIndex: page.value.curr, 212 pageIndex: page.value.curr,
213 pageSize: page.value.limit, 213 pageSize: page.value.limit,
214 connectorName: page.value.connectorName, 214 connectorName: page.value.connectorName,
215 approveState: page.value.approveState, 215 bizApproveState: page.value.bizApproveState,
216 currentStaffGuid: userData.staffGuid 216 currentStaffGuid: userData.staffGuid
217 }).then((res: any) => { 217 }).then((res: any) => {
218 if (res?.code == proxy.$passCode) { 218 if (res?.code == proxy.$passCode) {
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!