فهرست منبع

Merge branch 'sit'

xiaodai2022 2 سال پیش
والد
کامیت
4c92c50640

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
dist/index.html


BIN
dist/static/css/chunk-4db33314.61660e0b.css.gz


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
dist/static/css/chunk-8dc673fc.5f160c93.css


BIN
dist/static/css/chunk-8dc673fc.5f160c93.css.gz


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
dist/static/css/chunk-de27df2a.6db26dda.css


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
dist/static/js/app.42392526.js


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


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
dist/static/js/app.4e343a92.js


BIN
dist/static/js/app.4e343a92.js.gz


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
dist/static/js/chunk-0b024dde.d75ea072.js


BIN
dist/static/js/chunk-4db33314.afec8108.js.gz


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
dist/static/js/chunk-8dc673fc.ac005f4f.js


BIN
dist/static/js/chunk-8dc673fc.ac005f4f.js.gz


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
dist/static/js/chunk-de27df2a.91b70639.js


+ 2 - 2
src/apis/service/user/index.js

@@ -1,5 +1,5 @@
 import http from '@/apis/userAxios'
-
+import https from '@/apis/axios'
 export default {
   // 获取验证码
   verfiy: (data, params) => http(`admin/verify_code`, data, 'post', params),
@@ -15,7 +15,7 @@ export default {
   // 获取个人信息
   detail: (data, params) => http(`Api/userinfo`, data, 'post', params),
   // 获取最新版本号
-  version: (data, params) => http(`admin/lastversion`, data, 'post', params),
+  version: (data, params) => https(`admin/lastversion`, data, 'post', params),
   // 个人信息完善
   prefect: (data, params) => http(`Api/prefect`, data, 'post', params),
 

+ 8 - 7
src/views/goodStore/goodsOnline/ShowDataTableColumns.js

@@ -187,6 +187,13 @@ const public_listCol = [
     append: '天',
     span: 4
   },
+ 
+  {
+    prop: "noble",
+    label: "贵金属信息",
+    _slot_: "noble",
+    span: 16,
+  },
   {
     prop: "sample_day",
     label: "调样周期",
@@ -198,16 +205,10 @@ const public_listCol = [
     label: "备库起订量",
     span: 4,
   },
-  {
-    prop: "noble",
-    label: "贵金属信息",
-    _slot_: "noble",
-    span: 20,
-  },
   {
     prop: "good_remark",
     label: "商品备注",
-    span: 24,
+    span: 16,
   },
 
 

+ 11 - 26
src/views/login/index.vue

@@ -61,9 +61,7 @@
               @keyup.enter.native="handleLogin"
             />
             <span class="show-pwd" @click="showPwd">
-              <svg-icon
-                :icon-class="passwordType === 'password' ? 'eye' : 'eye-open'"
-              />
+              <svg-icon :icon-class="passwordType === 'password' ? 'eye' : 'eye-open'" />
             </span>
           </el-form-item>
         </el-tooltip>
@@ -99,9 +97,7 @@
     </div>
     <div class="beian">
       <span>万宇恒通</span>
-      <a target="_blank" href="https://beian.miit.gov.cn/"
-        >京ICP备2020033956号-1</a
-      >
+      <a target="_blank" href="https://beian.miit.gov.cn/">京ICP备2020033956号-1</a>
       <span> </span>
     </div>
   </div>
@@ -110,12 +106,7 @@
 <script>
 import asyncRequest from "@/apis/service/user";
 import resToken from "@/mixins/resToken";
-import {
-  isnumber,
-  isAlphanumeric,
-  validAlphabets,
-  isMobile,
-} from "@/utils/validate";
+import { isnumber, isAlphanumeric, validAlphabets, isMobile } from "@/utils/validate";
 export default {
   name: "Login",
   mixins: [resToken],
@@ -156,12 +147,8 @@ export default {
         password: "",
       },
       loginRules: {
-        username: [
-          { required: true, trigger: "blur", validator: validateUsername },
-        ],
-        password: [
-          { required: true, trigger: "blur", validator: validatePassword },
-        ],
+        username: [{ required: true, trigger: "blur", validator: validateUsername }],
+        password: [{ required: true, trigger: "blur", validator: validatePassword }],
       },
       passwordType: "password",
       capsTooltip: false,
@@ -191,7 +178,7 @@ export default {
     //     password: "mlp123",
     //   };
     // }
-    // this.getversion();
+    this.getversion();
     if (this.loginForm.username === "") {
       this.$refs.username.focus();
     } else if (this.loginForm.password === "") {
@@ -200,14 +187,12 @@ export default {
   },
   methods: {
     async getversion() {
-      let res = await asyncRequest.version({});
-      if (res && res.code === 0) {
-        let data = res.data;
-        this.ver = data.version;
-      } else if (res && res.code >= 100 && res.code <= 104) {
-        await this.logout();
+      const { code, data } = await asyncRequest.version({});
+      if (code === 0) {
+        const { version } = data;
+        this.ver = version;
       } else {
-        this.$message.warning(res.message);
+        this.ver = "";
       }
     },
     setVisible(val) {

+ 72 - 54
src/views/reportQuery/purchaseReport/index.vue

@@ -1,29 +1,50 @@
 <template>
-    <div class="pagePadding">
-    <div
-      v-if=" powers.some((i) => i == '001')"
-    >
-        <!-- <el-tabs v-model="activeName" @tab-click="handleClick"> -->
-        <el-tabs v-model="activeName">
-            <el-tab-pane label="竞价单总数" name="table1"><table1 v-if="activeName == 'table1'"></table1></el-tab-pane>
+  <div class="pagePadding">
+    <div v-if="powers.some((i) => i == '001')">
+      <!-- <el-tabs v-model="activeName" @tab-click="handleClick"> -->
+      <el-tabs v-model="activeName">
+        <el-tab-pane label="竞价单总数" name="table1"
+          ><table1 v-if="activeName == 'table1'"></table1
+        ></el-tab-pane>
 
-            <el-tab-pane label="采购订单总金额" name="table2"><table2 v-if="activeName == 'table2'"></table2></el-tab-pane>
-            <el-tab-pane label="采购员回复竞价单数" name="table3"><table3 v-if="activeName == 'table3'"></table3></el-tab-pane>
-            <el-tab-pane label="采购员订单金额" name="table4"><table4 v-if="activeName == 'table4'"></table4></el-tab-pane>
-            <el-tab-pane label="已采返报价信息" name="table5"><table5 v-if="activeName == 'table5'"></table5></el-tab-pane>
-            <el-tab-pane label="未采返信息" name="table6"><table6 v-if="activeName == 'table6'"></table6></el-tab-pane>
-            <el-tab-pane label="订单明细报表" name="table7"><table7 v-if="activeName == 'table7'"></table7></el-tab-pane>
-            <el-tab-pane label="售后明细报表" name="table8"><table8 v-if="activeName == 'table8'"></table8></el-tab-pane>
-            <el-tab-pane label="每日录入供应商报表" name="table9"><table9 v-if="activeName == 'table9'"></table9></el-tab-pane>
-            <el-tab-pane label="退货流水报表" name="table10"><table10 v-if="activeName == 'table10'"></table10></el-tab-pane>
-            <el-tab-pane label="商品上线报表" name="table11"><table11 v-if="activeName == 'table11'"></table11></el-tab-pane>
-            <el-tab-pane label="商品下线报表" name="table12"><table12 v-if="activeName == 'table12'"></table12></el-tab-pane>
-            <el-tab-pane label="商品修改报表" name="table13"><table13 v-if="activeName == 'table13'"></table13></el-tab-pane>
-            <!-- <el-tab-pane label="出入库明细报表" name="table14"><table14 v-if="activeName == 'table14'"></table14></el-tab-pane> -->
-          
-          
-        </el-tabs>
-      
+        <el-tab-pane label="采购订单总金额" name="table2"
+          ><table2 v-if="activeName == 'table2'"></table2
+        ></el-tab-pane>
+        <el-tab-pane label="采购员回复竞价单数" name="table3"
+          ><table3 v-if="activeName == 'table3'"></table3
+        ></el-tab-pane>
+        <el-tab-pane label="采购员订单金额" name="table4"
+          ><table4 v-if="activeName == 'table4'"></table4
+        ></el-tab-pane>
+        <el-tab-pane label="竞价反馈表" name="table5"
+          ><table5 v-if="activeName == 'table5'"></table5
+        ></el-tab-pane>
+        <el-tab-pane label="未采返信息" name="table6"
+          ><table6 v-if="activeName == 'table6'"></table6
+        ></el-tab-pane>
+        <el-tab-pane label="订单明细报表" name="table7"
+          ><table7 v-if="activeName == 'table7'"></table7
+        ></el-tab-pane>
+        <el-tab-pane label="售后明细报表" name="table8"
+          ><table8 v-if="activeName == 'table8'"></table8
+        ></el-tab-pane>
+        <el-tab-pane label="每日录入供应商报表" name="table9"
+          ><table9 v-if="activeName == 'table9'"></table9
+        ></el-tab-pane>
+        <el-tab-pane label="退货流水报表" name="table10"
+          ><table10 v-if="activeName == 'table10'"></table10
+        ></el-tab-pane>
+        <el-tab-pane label="商品上线报表" name="table11"
+          ><table11 v-if="activeName == 'table11'"></table11
+        ></el-tab-pane>
+        <el-tab-pane label="商品下线报表" name="table12"
+          ><table12 v-if="activeName == 'table12'"></table12
+        ></el-tab-pane>
+        <el-tab-pane label="商品修改报表" name="table13"
+          ><table13 v-if="activeName == 'table13'"></table13
+        ></el-tab-pane>
+        <!-- <el-tab-pane label="出入库明细报表" name="table14"><table14 v-if="activeName == 'table14'"></table14></el-tab-pane> -->
+      </el-tabs>
     </div>
     <div v-else>
       <no-auth></no-auth>
@@ -36,24 +57,24 @@ import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";
 import { mapGetters } from "vuex";
 //标签页组件引入
-const table1 = ()=>import(/* webpackChunkName:'mycomp' */ "./components/table1")
-const table2 = ()=>import(/* webpackChunkName:'mycomp' */ "./components/table2")
-const table3 = ()=>import(/* webpackChunkName:'mycomp' */ "./components/table3")
-const table4 = ()=>import(/* webpackChunkName:'mycomp' */ "./components/table4")
-const table5 = ()=>import(/* webpackChunkName:'mycomp' */ "./components/table5")
-const table6 = ()=>import(/* webpackChunkName:'mycomp' */ "./components/table6")
-const table7 = ()=>import(/* webpackChunkName:'mycomp' */ "./components/table7")
-const table8 = ()=>import(/* webpackChunkName:'mycomp' */ "./components/table8")
-const table9 = ()=>import(/* webpackChunkName:'mycomp' */ "./components/table9")
-const table10 = ()=>import(/* webpackChunkName:'mycomp' */ "./components/table10")
-const table11 = ()=>import(/* webpackChunkName:'mycomp' */ "./components/table11")
-const table12 = ()=>import(/* webpackChunkName:'mycomp' */ "./components/table12")
-const table13 = ()=>import(/* webpackChunkName:'mycomp' */ "./components/table13")
-const table14 = ()=>import(/* webpackChunkName:'mycomp' */ "./components/table14")
+const table1 = () => import(/* webpackChunkName:'mycomp' */ "./components/table1");
+const table2 = () => import(/* webpackChunkName:'mycomp' */ "./components/table2");
+const table3 = () => import(/* webpackChunkName:'mycomp' */ "./components/table3");
+const table4 = () => import(/* webpackChunkName:'mycomp' */ "./components/table4");
+const table5 = () => import(/* webpackChunkName:'mycomp' */ "./components/table5");
+const table6 = () => import(/* webpackChunkName:'mycomp' */ "./components/table6");
+const table7 = () => import(/* webpackChunkName:'mycomp' */ "./components/table7");
+const table8 = () => import(/* webpackChunkName:'mycomp' */ "./components/table8");
+const table9 = () => import(/* webpackChunkName:'mycomp' */ "./components/table9");
+const table10 = () => import(/* webpackChunkName:'mycomp' */ "./components/table10");
+const table11 = () => import(/* webpackChunkName:'mycomp' */ "./components/table11");
+const table12 = () => import(/* webpackChunkName:'mycomp' */ "./components/table12");
+const table13 = () => import(/* webpackChunkName:'mycomp' */ "./components/table13");
+const table14 = () => import(/* webpackChunkName:'mycomp' */ "./components/table14");
 
 export default {
-mixins: [mixinPage, resToken],
-components:{
+  mixins: [mixinPage, resToken],
+  components: {
     table1,
     table2,
     table3,
@@ -68,32 +89,29 @@ components:{
     table12,
     table13,
     table14,
-},
+  },
 
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {
       const tran =
-        this.$store.getters.btnList.find(
-          (item) => item.menu_route == "purchaseReport"
-        ) || {};
+        this.$store.getters.btnList.find((item) => item.menu_route == "purchaseReport") ||
+        {};
       const { action } = tran ?? {};
       return action ?? [];
     },
   },
-  data(){
-      return {
-          activeName: 'table1'
-      }
+  data() {
+    return {
+      activeName: "table1",
+    };
   },
-  methods:{
+  methods: {
     //   handleClick(tab, event) {
     //     console.log(tab, event);
     //   }
-  }
-}
+  },
+};
 </script>
 
-<style lang="scss" scoped>
-
-</style>
+<style lang="scss" scoped></style>

برخی فایل ها در این مقایسه diff نمایش داده نمی شوند زیرا تعداد فایل ها بسیار زیاد است