Skip to content

csbr-daop / fe-data-trusted-space

Go to a project
Toggle navigation
Toggle navigation pinning
d4f5564d by lihua
Options

去掉跨平台审批

1 parent ebbeddb8
Inline Side-by-side
Showing 4 changed files with 44 additions and 43 deletions
src/views/data_facilitator/authenticationManagement.vue
...@@ -72,7 +72,7 @@ const getArea = (node, resolve) => { ...@@ -72,7 +72,7 @@ const getArea = (node, resolve) => {
72 const isEdit = ref(true); 72 const isEdit = ref(true);
73 const detailGuid = ref(''); 73 const detailGuid = ref('');
74 const bizApproveState = ref(''); 74 const bizApproveState = ref('');
75 const crossPlatformApproveState = ref(''); 75
76 const expand1 = ref(true) 76 const expand1 = ref(true)
77 const expand2 = ref(true) 77 const expand2 = ref(true)
78 const expand3 = ref(true) 78 const expand3 = ref(true)
...@@ -882,9 +882,9 @@ const getTenant = () => { ...@@ -882,9 +882,9 @@ const getTenant = () => {
882 flowDetail.value = data; 882 flowDetail.value = data;
883 detailGuid.value = data.guid || ''; 883 detailGuid.value = data.guid || '';
884 bizApproveState.value = data.bizApproveState || ''; 884 bizApproveState.value = data.bizApproveState || '';
885 crossPlatformApproveState.value = data.crossPlatformApproveState || ''; 885 // crossPlatformApproveState.value = data.crossPlatformApproveState || '';
886 isEdit.value = (bizApproveState.value == 'Y' || crossPlatformApproveState.value == 'Y' || bizApproveState.value == 'A' || crossPlatformApproveState.value == 'A' || bizApproveState.value == 'B') ? false : true; 886 isEdit.value = (bizApproveState.value == 'Y' || bizApproveState.value == 'A' || bizApproveState.value == 'B') ? false : true;
887 contentFormItems.value[1].disabled = bizApproveState.value == 'Y' || crossPlatformApproveState.value == 'Y' ? true : false; 887 contentFormItems.value[1].disabled = bizApproveState.value == 'Y' ? true : false;
888 tableData.value = data.changeList || []; 888 tableData.value = data.changeList || [];
889 orgData.value = data.domainRSVOS?.map(d => { 889 orgData.value = data.domainRSVOS?.map(d => {
890 return Object.assign(d, { 890 return Object.assign(d, {
...@@ -1279,7 +1279,7 @@ const btnClick = async (btn, bType = null) => { ...@@ -1279,7 +1279,7 @@ const btnClick = async (btn, bType = null) => {
1279 } 1279 }
1280 params.attachmentRQVOS = attachmentRQVOS; 1280 params.attachmentRQVOS = attachmentRQVOS;
1281 1281
1282 if (bizApproveState.value == 'Y' && crossPlatformApproveState.value == 'Y') { 1282 if (bizApproveState.value == 'Y') {
1283 let flowParams: any = {}; 1283 let flowParams: any = {};
1284 flowParams.flowType = '10014'; 1284 flowParams.flowType = '10014';
1285 flowParams.bizGuid = detailGuid.value; 1285 flowParams.bizGuid = detailGuid.value;
...@@ -1337,14 +1337,14 @@ const btnClick = async (btn, bType = null) => { ...@@ -1337,14 +1337,14 @@ const btnClick = async (btn, bType = null) => {
1337 }); 1337 });
1338 } else if (type == 'cancel') { 1338 } else if (type == 'cancel') {
1339 setFormItems(); 1339 setFormItems();
1340 if (bizApproveState.value == 'Y' && crossPlatformApproveState.value == 'Y') { 1340 if (bizApproveState.value == 'Y') {
1341 setFormDisable(); 1341 setFormDisable();
1342 } 1342 }
1343 } else if (type == 'change') { 1343 } else if (type == 'change') {
1344 isEdit.value = true; 1344 isEdit.value = true;
1345 contentFormItems.value.map(a => { 1345 contentFormItems.value.map(a => {
1346 if (a.field == 'socialCreditCode') { 1346 if (a.field == 'socialCreditCode') {
1347 a.disabled = bizApproveState.value == 'Y' || crossPlatformApproveState.value == 'Y' ? true : false; 1347 a.disabled = bizApproveState.value == 'Y' ? true : false;
1348 } else { 1348 } else {
1349 a.disabled = false 1349 a.disabled = false
1350 } 1350 }
...@@ -1557,7 +1557,7 @@ const viewVoucherFile = () => { ...@@ -1557,7 +1557,7 @@ const viewVoucherFile = () => {
1557 <template> 1557 <template>
1558 <div class="container_wrap full" v-loading="loading"> 1558 <div class="container_wrap full" v-loading="loading">
1559 <div class="content_main panel" 1559 <div class="content_main panel"
1560 :class="{ full: bizApproveState == 'A' || bizApproveState == 'B' || crossPlatformApproveState == 'A' }"> 1560 :class="{ full: bizApproveState == 'A' || bizApproveState == 'B' }">
1561 <ContentWrap title="企业信息" expandSwicth style="margin-top: 15px" :isExpand="expand1" @expand="(v) => expand1 = v" 1561 <ContentWrap title="企业信息" expandSwicth style="margin-top: 15px" :isExpand="expand1" @expand="(v) => expand1 = v"
1562 description="备注：与平台运营签订相关的合同后才能进行认证，避免认证不成功，请知晓！"> 1562 description="备注：与平台运营签订相关的合同后才能进行认证，避免认证不成功，请知晓！">
1563 <div class="form_panel"> 1563 <div class="form_panel">
...@@ -1613,7 +1613,7 @@ const viewVoucherFile = () => { ...@@ -1613,7 +1613,7 @@ const viewVoucherFile = () => {
1613 <div class="empty_tips" v-else>暂无变更信息</div> 1613 <div class="empty_tips" v-else>暂无变更信息</div>
1614 </div> 1614 </div>
1615 </ContentWrap> 1615 </ContentWrap>
1616 <ContentWrap title="认证结果信息" v-if="bizApproveState == 'Y' && crossPlatformApproveState == 'Y' && !isEdit" expandSwicth style="margin-top: 15px" :isExpand="expandResult" 1616 <ContentWrap title="认证结果信息" v-if="bizApproveState == 'Y' && !isEdit" expandSwicth style="margin-top: 15px" :isExpand="expandResult"
1617 @expand="(v) => expandResult = v"> 1617 @expand="(v) => expandResult = v">
1618 <div class="list_panel"> 1618 <div class="list_panel">
1619 <div class="list_item"> 1619 <div class="list_item">
...@@ -1641,7 +1641,7 @@ const viewVoucherFile = () => { ...@@ -1641,7 +1641,7 @@ const viewVoucherFile = () => {
1641 @click="btnClick({ value: 'save' })">保存</el-button> --> 1641 @click="btnClick({ value: 'save' })">保存</el-button> -->
1642 <el-button type="primary" @click="btnClick({ value: 'submit' })">提交</el-button> 1642 <el-button type="primary" @click="btnClick({ value: 'submit' })">提交</el-button>
1643 </div> 1643 </div>
1644 <div class="btns" v-else-if="bizApproveState == 'Y' && crossPlatformApproveState == 'Y' && !isEdit"> 1644 <div class="btns" v-else-if="bizApproveState == 'Y' && !isEdit">
1645 <el-button type="primary" @click="btnClick({ value: 'change' })">变更认证</el-button> 1645 <el-button type="primary" @click="btnClick({ value: 'change' })">变更认证</el-button>
1646 </div> 1646 </div>
1647 </div> 1647 </div>
......
src/views/data_facilitator/certificationAudit.vue
...@@ -120,16 +120,16 @@ const tableFields: any = ref([ ...@@ -120,16 +120,16 @@ const tableFields: any = ref([
120 } 120 }
121 } 121 }
122 }, 122 },
123 { 123 // {
124 label: "主平台审批状态", field: "crossPlatformApproveState", type: "approveTagBtn", width: 150, align: 'center', btn: { 124 // label: "主平台审批状态", field: "crossPlatformApproveState", type: "approveTagBtn", width: 150, align: 'center', btn: {
125 label: '查看', visible: (scope) => { 125 // label: '查看', visible: (scope) => {
126 return scope.row.crossPlatformApproveState != null; 126 // return scope.row.crossPlatformApproveState != null;
127 }, click: (scope) => { 127 // }, click: (scope) => {
128 systemApproveCurrentRowInfo.value = scope.row; 128 // systemApproveCurrentRowInfo.value = scope.row;
129 approvalDialogVisible.value = true; 129 // approvalDialogVisible.value = true;
130 } 130 // }
131 } 131 // }
132 }, 132 // },
133 { 133 {
134 label: "提交时间", field: "createTime", width: TableColumnWidth.DATETIME, getName: (scope) => { 134 label: "提交时间", field: "createTime", width: TableColumnWidth.DATETIME, getName: (scope) => {
135 return scope.row.createTime ? Moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '--'; 135 return scope.row.createTime ? Moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '--';
...@@ -166,7 +166,7 @@ const tableInfo = ref({ ...@@ -166,7 +166,7 @@ const tableInfo = ref({
166 actionInfo: { 166 actionInfo: {
167 label: "操作", 167 label: "操作",
168 type: "btn", 168 type: "btn",
169 width: 180, 169 width: 170,
170 btns: (scope) => { 170 btns: (scope) => {
171 let row = scope.row; 171 let row = scope.row;
172 return getTableBtns(row); 172 return getTableBtns(row);
...@@ -201,9 +201,10 @@ const getTableBtns = (row, includeDetail = true) => { ...@@ -201,9 +201,10 @@ const getTableBtns = (row, includeDetail = true) => {
201 btnsArr.push(...[{ label: "通过", value: "pass" }, { label: "驳回", value: "reject" }]) 201 btnsArr.push(...[{ label: "通过", value: "pass" }, { label: "驳回", value: "reject" }])
202 } else if (flowState === 3) { 202 } else if (flowState === 3) {
203 btnsArr.push({ label: "删除", value: "delete" }) 203 btnsArr.push({ label: "删除", value: "delete" })
204 } else if (flowState === 4) {
205 btnsArr.push({ label: "查看进度", value: "progress" })
206 } 204 }
205 // else if (flowState === 4) {
206 // btnsArr.push({ label: "查看进度", value: "progress" })
207 // }
207 return btnsArr 208 return btnsArr
208 } 209 }
209 210
......
src/views/data_facilitator/settleManagement.vue
...@@ -103,16 +103,16 @@ const tableFields = ref([ ...@@ -103,16 +103,16 @@ const tableFields = ref([
103 }, 103 },
104 // { label: "同步状态", field: "approveVO", type: "tag", }, 104 // { label: "同步状态", field: "approveVO", type: "tag", },
105 // 专区才需要显示的 105 // 专区才需要显示的
106 { 106 // {
107 label: "主平台审批状态", field: "crossPlatformApproveState", type: "approveTagBtn", width: 170, align: 'center', btn: { 107 // label: "主平台审批状态", field: "crossPlatformApproveState", type: "approveTagBtn", width: 170, align: 'center', btn: {
108 label: '查看', visible: (scope) => { 108 // label: '查看', visible: (scope) => {
109 return scope.row.crossPlatformApproveState != null; 109 // return scope.row.crossPlatformApproveState != null;
110 }, click: (scope) => { 110 // }, click: (scope) => {
111 systemApproveCurrentRowInfo.value = scope.row; 111 // systemApproveCurrentRowInfo.value = scope.row;
112 approvalDialogVisible.value = true; 112 // approvalDialogVisible.value = true;
113 } 113 // }
114 } 114 // }
115 }, 115 // },
116 { label: "法人或其他组织", field: "legalEntity", width: 200 }, 116 { label: "法人或其他组织", field: "legalEntity", width: 200 },
117 { label: "修改人", field: "updateUserName", width: 130 }, 117 { label: "修改人", field: "updateUserName", width: 130 },
118 { label: "修改时间", field: "updateTime", width: 170 }, 118 { label: "修改时间", field: "updateTime", width: 170 },
......
src/views/data_product/productListing.vue
...@@ -112,16 +112,16 @@ const tableInfo = ref({ ...@@ -112,16 +112,16 @@ const tableInfo = ref({
112 return scope.row.listingStatus == 'Y' ? '已上架' : '未上架'; 112 return scope.row.listingStatus == 'Y' ? '已上架' : '未上架';
113 } 113 }
114 }, 114 },
115 { 115 // {
116 label: "主平台审批状态", field: "crossPlatformApproveState", type: "approveTagBtn", width: 150, align: 'center', btn: { 116 // label: "主平台审批状态", field: "crossPlatformApproveState", type: "approveTagBtn", width: 150, align: 'center', btn: {
117 label: '查看', visible: (scope) => { 117 // label: '查看', visible: (scope) => {
118 return scope.row.crossPlatformApproveState != null; 118 // return scope.row.crossPlatformApproveState != null;
119 }, click: (scope) => { 119 // }, click: (scope) => {
120 systemApproveCurrentRowInfo.value = scope.row; 120 // systemApproveCurrentRowInfo.value = scope.row;
121 approvalDialogVisible.value = true; 121 // approvalDialogVisible.value = true;
122 } 122 // }
123 } 123 // }
124 }, 124 // },
125 { label: "修改时间", field: "updateTime", width: TableColumnWidth.DATETIME }, 125 { label: "修改时间", field: "updateTime", width: TableColumnWidth.DATETIME },
126 ], 126 ],
127 loading: false, 127 loading: false,
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!