snow 1 gadu atpakaļ
vecāks
revīzija
06014d46da

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
dist/index.html


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
dist/static/css/app.b18e6f22.css


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
dist/static/css/app.c1239d34.css


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
dist/static/js/app.7dd31591.js


BIN
dist/static/js/app.7dd31591.js.gz


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
dist/static/js/app.d6c8c43f.js


BIN
dist/static/js/app.d6c8c43f.js.gz


+ 1 - 0
src/pages/index.vue

@@ -22,6 +22,7 @@ export default {
         {label:'4.订单情况', link: '/?path=newReport'},
         {label:'5.发货情况', link: '/?path=stock'},
         {label:'1.业绩报表', link: '/?path=results'},
+        {label: '测试', link: '/?path=newResultInfo'}
       ]
     }
   },

+ 2 - 1
src/pages/newResults.vue

@@ -161,13 +161,14 @@ export default {
 
 <style lang="scss" scoped>
 .new-results {
-  width: 100vw;
+  width: calc(100vw - 20px);
   height: 100vh;
   position: fixed;
   overflow: auto;
 
   .container {
     height:calc(100vh - 40px);
+    padding:10px;
     overflow:auto;
     background:white;
   }

+ 36 - 31
src/pages/newResultsInfo.vue

@@ -32,7 +32,11 @@
     </div>
 
     <template v-else-if="!state.loading">
-      <unusual-state :hasPermission="isShow" :message="state.message" path="newReport" />
+      <div style="color:red;display:flex;justify-content:center;align-items:center;margin-top:10px">
+         <i class="el-icon-warning-outline" style="font-size:18px;margin-right:5px"></i>
+        该报表为信息部内部报表,暂不对外开放
+      </div>
+      <!-- <unusual-state :hasPermission="isShow" :message="state.message" path="newReport" /> -->
     </template>
   </div>
 </template>
@@ -100,35 +104,34 @@ export default {
       const result = await userRequest.userinfo({ ...(openid ? { openid } : { code }) })
 
 //  const result = {
-        //   "code": 0,
-        //   "message": "获取成功",
-        //   "data": {
-        //     "openid": "oOpc26KiZFBKIm7SB8knFGvov1qg",
-        //     "subscribe_time": "2022-12-21 15:52:14",
-        //     "updatetime": "2023-05-09 16:22:33",
-        //     "addtime": "2023-04-10 18:11:17",
-        //     "is_show": ["1", "2", "4", "6", "cost_field"],
-        //     "nickname": "雪寒",
-        //     "addr": "\/\/",
-        //     "gender": "0",
-        //     "mobile": "",
-        //     "avatar": "",
-        //     "status": "1",
-        //     "id": "1",
-        //     "companyArr": [
-        //       {"companyNo": "GS2302231125079621", "companyName": "北京百辰荣达国际科贸有限公司", "info": [1, 2, 6]}, 
-        //       {"companyNo": "GS2302231323386950","companyName": "北京泓源广诚国际商贸有限公司", "info": [1, 2, 6]}, 
-        //       {"companyNo": "GS2203161855277894","companyName": "北京万宇恒通国际科贸有限公司", "info": [1, 2, 6]},
-        //       {"companyNo": "GS2304031312553746","companyName": "北京锦兴弘昌科技有限公司",  "info": [1, 2, 6]}, 
-        //       {"companyNo": "GS2302231124114965","companyName": "北京普润心堂商贸有限公司", "info": [1, 2, 6]},
-        //       {"companyNo": "GS2401181650538135","companyName": "北京知事文化产业发展有限公司", "info": [1, 2, 6]}
-        //     ]
-        // 	}
-        // }
-
-        const permissions = ['1','2','3','17'];
-        this.hasPermission = permissions.includes(result.data.id);
-
+//           "code": 0,
+//           "message": "获取成功",
+//           "data": {
+//             "openid": "oOpc26KiZFBKIm7SB8knFGvov1qg",
+//             "subscribe_time": "2022-12-21 15:52:14",
+//             "updatetime": "2023-05-09 16:22:33",
+//             "addtime": "2023-04-10 18:11:17",
+//             "is_show": ["1", "2", "4", "6", "cost_field"],
+//             "nickname": "雪寒",
+//             "addr": "\/\/",
+//             "gender": "0",
+//             "mobile": "",
+//             "avatar": "",
+//             "status": "1",
+//             "id": "8",
+//             "companyArr": [
+//               {"companyNo": "GS2302231125079621", "companyName": "北京百辰荣达国际科贸有限公司", "info": [1, 2, 6]}, 
+//               {"companyNo": "GS2302231323386950","companyName": "北京泓源广诚国际商贸有限公司", "info": [1, 2, 6]}, 
+//               {"companyNo": "GS2203161855277894","companyName": "北京万宇恒通国际科贸有限公司", "info": [1, 2, 6]},
+//               {"companyNo": "GS2304031312553746","companyName": "北京锦兴弘昌科技有限公司",  "info": [1, 2, 6]}, 
+//               {"companyNo": "GS2302231124114965","companyName": "北京普润心堂商贸有限公司", "info": [1, 2, 6]},
+//               {"companyNo": "GS2401181650538135","companyName": "北京知事文化产业发展有限公司", "info": [1, 2, 6]}
+//             ]
+//         	}
+//         }
+
+      const permissions = ['1','2','3','17'];
+      this.hasPermission = permissions.includes(result.data.id);
       this.companies = result.data.companyArr.reduce((prev, current) => {
         return current.info.includes(6) || current.info.includes('6') ? [...prev, {
           value: current.companyNo,
@@ -165,13 +168,15 @@ export default {
 
 <style lang="scss" scoped>
 .new-results {
-  width: 100vw;
+  // width: 100vw;
+  width: calc(100vw - 20px);
   height: 100vh;
   position: fixed;
   overflow: auto;
 
   .container {
     height:calc(100vh - 40px);
+    padding:10px;
     overflow:auto;
     background:white;
   }

Daži faili netika attēloti, jo izmaiņu fails ir pārāk liels