canrd-outside / order-erp-front · Commits

Commit a6e1fd20319a8025947a6e02141471117c2274e9

Authored by boyang
1 parent 6b21216d
build: skipped

fix: bug修复

Inline Side-by-side
Showing 4 changed files with 48 additions and 41 deletions
src/views/project/finance/financeProfit/ProductProfit/InnerData/index.vue
  View file @a6e1fd2
@@ -176,18 +176,20 @@ @@ -176,18 +176,20 @@
176 // }, 176 // },
177 onClick: handleFalse.bind(null, record), 177 onClick: handleFalse.bind(null, record),
178 }, 178 },
179 - {  
180 - label: '审批通过',  
181 - popConfirm: {  
182 - title: '确认审批？',  
183 - confirm: () => {  
184 - if (record.innerProduceStatus === 0 && role.value === ROLE.ADMIN) {  
185 - handleStatus(record, true);  
186 - }  
187 - return; 179 + ...(role.value === ROLE.ADMIN ? [
  180 + {
  181 + label: '审核通过',
  182 + popConfirm: {
  183 + title: '确认审核？',
  184 + confirm: () => {
  185 + if (record.innerProduceStatus === 0) {
  186 + handleStatus(record, true);
  187 + }
  188 + return;
  189 + },
188 }, 190 },
189 }, 191 },
190 - }, 192 + ] : []),
191 ]; 193 ];
192 } 194 }
193 return [ 195 return [
src/views/project/finance/financeProfit/ProductProfit/InnerProduce/index.vue
  View file @a6e1fd2
@@ -166,18 +166,20 @@ @@ -166,18 +166,20 @@
166 // }, 166 // },
167 onClick: handleFalse.bind(null, record), 167 onClick: handleFalse.bind(null, record),
168 }, 168 },
169 - {  
170 - label: '审核通过',  
171 - popConfirm: {  
172 - title: '确认审核？',  
173 - confirm: () => {  
174 - if (record.innerProductionStatus === 0 && role.value === ROLE.ADMIN) {  
175 - handleStatus(record, true);  
176 - }  
177 - return; 169 + ...(role.value === ROLE.ADMIN ? [
  170 + {
  171 + label: '审核通过',
  172 + popConfirm: {
  173 + title: '确认审核？',
  174 + confirm: () => {
  175 + if (record.innerProductionStatus === 0) {
  176 + handleStatus(record, true);
  177 + }
  178 + return;
  179 + },
178 }, 180 },
179 }, 181 },
180 - }, 182 + ] : []),
181 ]; 183 ];
182 } 184 }
183 return [ 185 return [
src/views/project/finance/financeProfit/ServiceProfit/PackageProfit/index.vue
  View file @a6e1fd2
@@ -182,18 +182,20 @@ @@ -182,18 +182,20 @@
182 // }, 182 // },
183 onClick: handleFalse.bind(null, record), 183 onClick: handleFalse.bind(null, record),
184 }, 184 },
185 - {  
186 - label: '审核通过',  
187 - popConfirm: {  
188 - title: '确认审核？',  
189 - confirm: () => {  
190 - if (record.packStatus === 0 && role.value === ROLE.ADMIN) {  
191 - handleStatus(record, true);  
192 - }  
193 - return; 185 + ...(role.value === ROLE.ADMIN ? [
  186 + {
  187 + label: '审核通过',
  188 + popConfirm: {
  189 + title: '确认审核？',
  190 + confirm: () => {
  191 + if (record.packStatus === 0) {
  192 + handleStatus(record, true);
  193 + }
  194 + return;
  195 + },
194 }, 196 },
195 }, 197 },
196 - }, 198 + ] : []),
197 ]; 199 ];
198 } 200 }
199 return [ 201 return [
@@ -324,7 +326,6 @@ @@ -324,7 +326,6 @@
324 }; 326 };
325 } 327 }
326 328
327 - console.log('Export parameters:', exportParams);  
328 329
329 const token = userStore.getToken; 330 const token = userStore.getToken;
330 axios 331 axios
src/views/project/finance/financeProfit/ServiceProfit/ServiceProfit/index.vue
  View file @a6e1fd2
@@ -115,18 +115,20 @@ @@ -115,18 +115,20 @@
115 label: '申请权限', 115 label: '申请权限',
116 onClick: handleFalse.bind(null, record), 116 onClick: handleFalse.bind(null, record),
117 }, 117 },
118 - {  
119 - label: '审核通过',  
120 - popConfirm: {  
121 - title: '确认审核？',  
122 - confirm: () => {  
123 - if (record.developmentStatus === 0 && role.value === ROLE.ADMIN) {  
124 - handleStatus(record, true);  
125 - }  
126 - return; 118 + ...(role.value === ROLE.ADMIN ? [
  119 + {
  120 + label: '审核通过',
  121 + popConfirm: {
  122 + title: '确认审核？',
  123 + confirm: () => {
  124 + if (record.developmentStatus === 0) {
  125 + handleStatus(record, true);
  126 + }
  127 + return;
  128 + },
127 }, 129 },
128 }, 130 },
129 - }, 131 + ] : []),
130 ]; 132 ];
131 return actions; 133 return actions;
132 } 134 }