99fa49d2 by lihua

门户上架可信空间产品还是需要显示审批状态

1 parent 673242c8
...@@ -32,7 +32,7 @@ const sjsLogo = new URL('@/assets/images/sjs-logo.png', import.meta.url).href ...@@ -32,7 +32,7 @@ const sjsLogo = new URL('@/assets/images/sjs-logo.png', import.meta.url).href
32 32
33 const carouselInfo: any = ref({ 33 const carouselInfo: any = ref({
34 list: [], 34 list: [],
35 height: '128px', 35 height: '172px',
36 loop: false, 36 loop: false,
37 autoplay: false, 37 autoplay: false,
38 arrow: 'hover', 38 arrow: 'hover',
...@@ -104,24 +104,24 @@ const tableInfo = ref({ ...@@ -104,24 +104,24 @@ const tableInfo = ref({
104 } 104 }
105 }, 105 },
106 { label: "上架分类", field: "exchangeName", width: 140 }, 106 { label: "上架分类", field: "exchangeName", width: 140 },
107 // { 107 {
108 // label: "审批状态", field: "approveVO", type: "approveTag", width: TableColumnWidth.STATE, align: 'center' 108 label: "审批状态", field: "approveVO", type: "approveTag", width: TableColumnWidth.STATE, align: 'center'
109 // }, 109 },
110 { 110 {
111 label: '上架状态', field: 'listingStatus', width: 100, getName: (scope) => { 111 label: '上架状态', field: 'listingStatus', width: 100, getName: (scope) => {
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,
...@@ -134,7 +134,7 @@ const tableInfo = ref({ ...@@ -134,7 +134,7 @@ const tableInfo = ref({
134 actionInfo: { 134 actionInfo: {
135 label: "操作", 135 label: "操作",
136 type: "btn", 136 type: "btn",
137 width: 130, 137 width: 170,
138 btns: (scope) => { 138 btns: (scope) => {
139 const { row } = scope; 139 const { row } = scope;
140 const approveVO = row.approveVO || {}; 140 const approveVO = row.approveVO || {};
...@@ -149,6 +149,12 @@ const tableInfo = ref({ ...@@ -149,6 +149,12 @@ const tableInfo = ref({
149 if (approveState == 'N') { 149 if (approveState == 'N') {
150 flowState = 1; 150 flowState = 1;
151 } 151 }
152 if (row.foundMode == 4) { //江苏专区的不需要上架下架,从数交所直接返回的。
153 if (flowState !== 1) {
154 list.push({ label: "详情", value: "detail" })
155 }
156 return list;
157 }
152 if (approveState == 'A' && approveStaffGuids.indexOf(currentStaffGuid) > -1) { 158 if (approveState == 'A' && approveStaffGuids.indexOf(currentStaffGuid) > -1) {
153 flowState = 2; 159 flowState = 2;
154 } 160 }
...@@ -158,31 +164,31 @@ const tableInfo = ref({ ...@@ -158,31 +164,31 @@ const tableInfo = ref({
158 if (approveVO && approveVO.approveState == 'A' && staffGuid == currentStaffGuid) { 164 if (approveVO && approveVO.approveState == 'A' && staffGuid == currentStaffGuid) {
159 isShowCancel = true; 165 isShowCancel = true;
160 } 166 }
161 // if ((bizApproveState === 'Y' || row.crossPlatformApproveState == 'Y') && staffGuid == currentStaffGuid) { 167 if ((bizApproveState === 'Y' || row.crossPlatformApproveState == 'Y') && staffGuid == currentStaffGuid) {
162 // if (row.listingStatus == 'Y') { 168 if (row.listingStatus == 'Y') {
163 // list.push({ label: "下架", value: "down" }); 169 list.push({ label: "下架", value: "down" });
164 // } else { 170 } else {
165 // list.push({ label: "上架", value: "up" }); 171 list.push({ label: "上架", value: "up" });
166 // } 172 }
167 // } 173 }
168 // if (flowState === 1) { 174 if (flowState === 1) {
169 // list = [{ label: "编辑", value: "edit" }, { label: "删除", value: "del" }] 175 list = [{ label: "编辑", value: "edit" }, { label: "删除", value: "del" }]
170 // } 176 }
171 // if (flowState === 2) { 177 if (flowState === 2) {
172 // list = [{ label: "通过", value: "pass" }, { label: "驳回", value: "reject" }] 178 list = [{ label: "通过", value: "pass" }, { label: "驳回", value: "reject" }]
173 // }
174 // if (flowState === 3 && bizApproveState != 'D') { //重新提交过的不能再重新提交
175 // list.push({ label: "重新提交", value: "redit" }) //已驳回
176 // }
177 // if (isShowCancel) {
178 // list.push({ label: "撤销", value: "revoke" })
179 // }
180 if (flowState !== 1) {
181 list.push({ label: "详情", value: "detail" })
182 } 179 }
183 if (flowState === 3) { 180 if (flowState === 3) {
184 list.push({ label: "删除", value: "del" }) 181 list.push({ label: "删除", value: "del" })
185 } 182 }
183 if (flowState === 3 && bizApproveState != 'D') { //重新提交过的不能再重新提交
184 list.push({ label: "重新提交", value: "redit" }) //已驳回
185 }
186 if (isShowCancel) {
187 list.push({ label: "撤销", value: "revoke" })
188 }
189 if (flowState !== 1) {
190 list.push({ label: "详情", value: "detail" })
191 }
186 return list 192 return list
187 }, 193 },
188 } 194 }
...@@ -954,6 +960,7 @@ const rejectDialogBtnClick = (btn, info) => { ...@@ -954,6 +960,7 @@ const rejectDialogBtnClick = (btn, info) => {
954 </div> 960 </div>
955 </div> 961 </div>
956 <div class="operator-btn" v-show="item.exchangeName?.indexOf('门户') > -1 " @click.stop="btnClick(item)"> 962 <div class="operator-btn" v-show="item.exchangeName?.indexOf('门户') > -1 " @click.stop="btnClick(item)">
963 <!-- <div class="left-btn">更新模板</div> -->
957 <div class="right-btn">产品上架</div> 964 <div class="right-btn">产品上架</div>
958 </div> 965 </div>
959 </div> 966 </div>
...@@ -970,7 +977,7 @@ const rejectDialogBtnClick = (btn, info) => { ...@@ -970,7 +977,7 @@ const rejectDialogBtnClick = (btn, info) => {
970 </div> 977 </div>
971 </div> 978 </div>
972 <div class="table_panel_wrap" :style="{ 979 <div class="table_panel_wrap" :style="{
973 height: demandListData.length > 0 ? 'calc(100% - 247px)' : 'calc(100% - 54px)' 980 height: demandListData.length > 0 ? 'calc(100% - 291px)' : 'calc(100% - 54px)'
974 }"> 981 }">
975 <Table :tableInfo="tableInfo" @tableBtnClick="tableBtnClick" @tablePageChange="tablePageChange" 982 <Table :tableInfo="tableInfo" @tableBtnClick="tableBtnClick" @tablePageChange="tablePageChange"
976 @tableSwitchBeforeChange="tableSwitchBeforeChange" /> 983 @tableSwitchBeforeChange="tableSwitchBeforeChange" />
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!