4c2826dc by lihua

添加专区名称来源

1 parent 755e4547
...@@ -40,6 +40,7 @@ const tableFields = ref([ ...@@ -40,6 +40,7 @@ const tableFields = ref([
40 // { label: "企业名称", field: "tenantName", width: 240, align: "left" }, 40 // { label: "企业名称", field: "tenantName", width: 240, align: "left" },
41 { label: "评估机构", field: "evaluationAgencyName", width: 250, align: "left" }, 41 { label: "评估机构", field: "evaluationAgencyName", width: 250, align: "left" },
42 { label: "审批状态", field: "approveVO", type: "approveTag", width: 96, align: 'center' }, 42 { label: "审批状态", field: "approveVO", type: "approveTag", width: 96, align: 'center' },
43 { label: "专区名称", field: "zqName", width: 160, align: "left" },
43 ]); 44 ]);
44 45
45 const deploymentId = ref(''); 46 const deploymentId = ref('');
...@@ -207,13 +208,13 @@ const getTableBtns = (row) => { ...@@ -207,13 +208,13 @@ const getTableBtns = (row) => {
207 if (flowState === 2) { 208 if (flowState === 2) {
208 btnsArr = [{ label: "通过", value: "pass" }, { label: "驳回", value: "reject" }] 209 btnsArr = [{ label: "通过", value: "pass" }, { label: "驳回", value: "reject" }]
209 } 210 }
210 if (flowState === 3) { 211 if (flowState === 3 && !row.zqName) {
211 btnsArr.push({ label: "删除", value: "del" }) 212 btnsArr.push({ label: "删除", value: "del" })
212 } 213 }
213 if (flowState === 3 && bizApproveState != 'D') { 214 if (flowState === 3 && bizApproveState != 'D' && !row.zqName) {
214 btnsArr.push({ label: "重新提交", value: "redit" }) 215 btnsArr.push({ label: "重新提交", value: "redit" })
215 } 216 }
216 if (isShowCancel) { 217 if (isShowCancel && !row.zqName) {
217 btnsArr.push({ label: "撤销", value: "revoke" }) 218 btnsArr.push({ label: "撤销", value: "revoke" })
218 } 219 }
219 if (flowState !== 1) { 220 if (flowState !== 1) {
......
...@@ -100,6 +100,7 @@ const tableFields = ref([{ label: "序号", type: "index", width: 56, align: "ce ...@@ -100,6 +100,7 @@ const tableFields = ref([{ label: "序号", type: "index", width: 56, align: "ce
100 { label: "数据分类", field: "dataCategoryName", width: 120, align: "left" }, 100 { label: "数据分类", field: "dataCategoryName", width: 120, align: "left" },
101 { label: "存储方式", field: "storageFormName", width: 120, align: "left" }, 101 { label: "存储方式", field: "storageFormName", width: 120, align: "left" },
102 { label: "数交所名称", field: "exchangeName", width: 160, align: "left" }, 102 { label: "数交所名称", field: "exchangeName", width: 160, align: "left" },
103 { label: "专区名称", field: "zqName", width: 160, align: "left" },
103 { 104 {
104 label: "状态", field: "approveState", type: "tag", width: 96, align: 'center', getName: (scope) => { 105 label: "状态", field: "approveState", type: "tag", width: 96, align: 'center', getName: (scope) => {
105 const approveVO = scope.row.approveVO || {} 106 const approveVO = scope.row.approveVO || {}
...@@ -190,12 +191,12 @@ const getTableBtns = (row, includeDetail = true) => { ...@@ -190,12 +191,12 @@ const getTableBtns = (row, includeDetail = true) => {
190 if (flowState === 2) { 191 if (flowState === 2) {
191 btnsArr.push(...[{ label: "通过", value: "pass" }, { label: "驳回", value: "reject" }]) 192 btnsArr.push(...[{ label: "通过", value: "pass" }, { label: "驳回", value: "reject" }])
192 } else if (flowState === 3) { 193 } else if (flowState === 3) {
193 if (bizApproveState != 'D') { 194 if (bizApproveState != 'D' && !row.zqName) {
194 btnsArr.push({ label: "重新提交", value: "edit" }) 195 btnsArr.push({ label: "重新提交", value: "edit" })
195 } 196 }
196 } 197 }
197 isShowCancel && btnsArr.push({ label: "撤销", value: "revoke" }) 198 isShowCancel && !row.zqName && btnsArr.push({ label: "撤销", value: "revoke" })
198 flowState === 3 && btnsArr.push({ label: "删除", value: "delete" }) 199 flowState === 3 && !row.zqName && btnsArr.push({ label: "删除", value: "delete" })
199 } 200 }
200 return btnsArr 201 return btnsArr
201 } 202 }
......
...@@ -129,6 +129,7 @@ const tableInfo = ref({ ...@@ -129,6 +129,7 @@ const tableInfo = ref({
129 return scope.row.listingStatus == 'Y' ? '已上架' : '未上架'; 129 return scope.row.listingStatus == 'Y' ? '已上架' : '未上架';
130 } 130 }
131 }, 131 },
132 { label: "专区名称", field: "zqName", width: 160, align: "left" },
132 { label: "修改时间", field: "updateTime", width: TableColumnWidth.DATETIME }, 133 { label: "修改时间", field: "updateTime", width: TableColumnWidth.DATETIME },
133 ], 134 ],
134 loading: false, 135 loading: false,
...@@ -179,13 +180,13 @@ const tableInfo = ref({ ...@@ -179,13 +180,13 @@ const tableInfo = ref({
179 if (flowState === 2) { 180 if (flowState === 2) {
180 list = [{ label: "通过", value: "pass" }, { label: "驳回", value: "reject" }] 181 list = [{ label: "通过", value: "pass" }, { label: "驳回", value: "reject" }]
181 } 182 }
182 if (flowState === 3) { 183 if (flowState === 3 && !row.zqName) {
183 list.push({ label: "删除", value: "del" }) 184 list.push({ label: "删除", value: "del" })
184 } 185 }
185 if (flowState === 3 && bizApproveState != 'D') { 186 if (flowState === 3 && bizApproveState != 'D' && !row.zqName) {
186 list.push({ label: "重新提交", value: "redit" }) //已驳回 187 list.push({ label: "重新提交", value: "redit" }) //已驳回
187 } 188 }
188 if (isShowCancel) { 189 if (isShowCancel && !row.zqName) {
189 list.push({ label: "撤销", value: "revoke" }) 190 list.push({ label: "撤销", value: "revoke" })
190 } 191 }
191 if (flowState !== 1) { 192 if (flowState !== 1) {
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!