合并 build

dist/static/css/chunk-d0938f4c.68d53367.css → dist/static/css/chunk-55382053.60dc8f7c.css

@@ -1 +1 @@
-.change-password{background:#f2f2f2;min-height:100%;width:100%;height:100%;overflow:hidden;position:absolute;z-index:2;-webkit-box-sizing:border-box;box-sizing:border-box}.change-password .change{padding:0 18% 0 0}.change-password .change .title{border-width:0;height:140px;display:-webkit-box;display:-ms-flexbox;display:flex;font-weight:400;font-style:normal;font-size:22px;text-align:left;padding:0;padding:60px 0 0 100px;width:100%;-webkit-box-sizing:border-box;box-sizing:border-box}.change-password[data-v-47333433]{min-height:100%;width:100%;height:100%;overflow:hidden;position:absolute;z-index:2}.change-password .login-form[data-v-47333433]{position:relative;width:415px;max-width:100%;height:100%;padding:50px 35px 150px 35px;margin:0 auto;overflow:hidden}.change-password .login-form .el-form-item__label[data-v-47333433]{height:49px;line-height:49px}
+.change-password{background:#f2f2f2;min-height:100%;width:100%;height:100%;overflow:hidden;position:absolute;z-index:2;-webkit-box-sizing:border-box;box-sizing:border-box}.change-password .change{padding:0 18% 0 0}.change-password .change .title{border-width:0;height:140px;display:-webkit-box;display:-ms-flexbox;display:flex;font-weight:400;font-style:normal;font-size:22px;text-align:left;padding:0;padding:60px 0 0 100px;width:100%;-webkit-box-sizing:border-box;box-sizing:border-box}.change-password[data-v-362a02cd]{min-height:100%;width:100%;height:100%;overflow:hidden;position:absolute;z-index:2}.change-password .login-form[data-v-362a02cd]{position:relative;width:415px;max-width:100%;height:100%;padding:50px 35px 150px 35px;margin:0 auto;overflow:hidden}.change-password .login-form .el-form-item__label[data-v-362a02cd]{height:49px;line-height:49px}

dist/static/css/chunk-37bf977e.82402d24.css → dist/static/css/chunk-b7b50378.50f0d23a.css

@@ -1 +1 @@
-.my-messagge-page{text-align:center;background:#f2f2f2;min-height:100%;width:100%;height:100%;overflow:hidden;position:absolute;z-index:2;-webkit-box-sizing:border-box;box-sizing:border-box}.my-messagge-page .change{padding:0 8% 0 0}.my-messagge-page .change .title{border-width:0;height:170px;display:-webkit-box;display:-ms-flexbox;display:flex;font-weight:400;font-style:normal;font-size:22px;text-align:left;padding:0;padding:60px 0 0 100px;width:100%;-webkit-box-sizing:border-box;box-sizing:border-box}.my-messagge-page .change-main{width:370px;margin:0 auto;text-align:left}.my-messagge-page .infor{padding:0 0 40px 0}.my-messagge-page .infor .tr{text-align:right;padding:0 15px 0 0}@supports (-webkit-mask:none) and (not (cater-color:#fff)){.my-messagge .el-input input{color:#fff}}.my-messagge[data-v-705cd365]{min-height:100%;width:100%;height:100%;background-color:#f2f2f2;overflow:hidden;position:absolute;z-index:2;background:#fff}.my-messagge .login-form[data-v-705cd365]{position:relative;width:415px;max-width:100%;height:100%;padding:50px 35px 150px 35px;margin:0 auto;overflow:hidden}.my-messagge .login-form .el-form-item__label[data-v-705cd365]{height:49px;line-height:49px}.my-messagge .tips[data-v-705cd365]{font-size:14px;color:#fff;margin-bottom:10px}.my-messagge .tips span[data-v-705cd365]:first-of-type{margin-right:16px}.my-messagge .svg-container[data-v-705cd365]{padding:6px 5px 6px 15px;color:#889aa4;vertical-align:middle;width:30px;display:inline-block}.my-messagge .show-pwd[data-v-705cd365]{position:absolute;right:10px;top:7px;font-size:16px;color:#889aa4;cursor:pointer;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.my-messagge .thirdparty-button[data-v-705cd365]{position:absolute;right:0;bottom:6px}@media only screen and (max-width:470px){.my-messagge .thirdparty-button[data-v-705cd365]{display:none}}
+.my-messagge-page{text-align:center;background:#f2f2f2;min-height:100%;width:100%;height:100%;overflow:hidden;position:absolute;z-index:2;-webkit-box-sizing:border-box;box-sizing:border-box}.my-messagge-page .change{padding:0 8% 0 0}.my-messagge-page .change .title{border-width:0;height:170px;display:-webkit-box;display:-ms-flexbox;display:flex;font-weight:400;font-style:normal;font-size:22px;text-align:left;padding:0;padding:60px 0 0 100px;width:100%;-webkit-box-sizing:border-box;box-sizing:border-box}.my-messagge-page .change-main{width:370px;margin:0 auto;text-align:left}.my-messagge-page .infor{padding:0 0 40px 0}.my-messagge-page .infor .tr{text-align:right;padding:0 15px 0 0}@supports (-webkit-mask:none) and (not (cater-color:#fff)){.my-messagge .el-input input{color:#fff}}.my-messagge[data-v-3ca720b7]{min-height:100%;width:100%;height:100%;background-color:#f2f2f2;overflow:hidden;position:absolute;z-index:2;background:#fff}.my-messagge .login-form[data-v-3ca720b7]{position:relative;width:415px;max-width:100%;height:100%;padding:50px 35px 150px 35px;margin:0 auto;overflow:hidden}.my-messagge .login-form .el-form-item__label[data-v-3ca720b7]{height:49px;line-height:49px}.my-messagge .tips[data-v-3ca720b7]{font-size:14px;color:#fff;margin-bottom:10px}.my-messagge .tips span[data-v-3ca720b7]:first-of-type{margin-right:16px}.my-messagge .svg-container[data-v-3ca720b7]{padding:6px 5px 6px 15px;color:#889aa4;vertical-align:middle;width:30px;display:inline-block}.my-messagge .show-pwd[data-v-3ca720b7]{position:absolute;right:10px;top:7px;font-size:16px;color:#889aa4;cursor:pointer;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.my-messagge .thirdparty-button[data-v-3ca720b7]{position:absolute;right:0;bottom:6px}@media only screen and (max-width:470px){.my-messagge .thirdparty-button[data-v-3ca720b7]{display:none}}

src/components/SendVerificationCode/index.vue

@@ -12,7 +12,9 @@
 <script>
 import { isMobile } from "@/utils/validate";
 import asyncRequest from "@/apis/caixiaoService/user/index";
+import asyncAoldRequest from "@/apis/aoldService/user/index";
 import resToken from "@/mixins/resToken";
+import { mapGetters } from "vuex";
 export default {
   props: {
     mobile: {
@@ -20,6 +22,9 @@ export default {
       default: "",
     },
   },
+  computed: {
+    ...mapGetters(["business_companyNo"]),
+  },
   mixins: [resToken],
   data() {
     return {
@@ -28,29 +33,33 @@ export default {
       timer: null,
     };
   },
-  computed: {},
   methods: {
-    getCode() {
+    async getCode() {
       if (this.mobile !== "" && isMobile(this.mobile)) {
         if (this.num === 60) {
-          asyncRequest.verfiy({ mobile: this.mobile }).then(async (res) => {
-            if (res && res.code === 0) {
-              this.timer = setInterval(() => {
-                if (this.num !== 0) {
-                  this.title = `${this.num}s后可重发`;
-                  this.num--;
-                } else {
-                  clearInterval(this.timer);
-                  this.num = 60;
-                  this.title = "获取验证码";
-                }
-              }, 1000);
-            } else if (res && res.code >= 100 && res.code <= 104) {
-              await this.logout();
-            } else {
-              this.$message.warning(res.message);
-            }
-          });
+          let res = {};
+          if (this.business_companyNo === "1") {
+            res = asyncRequest.verfiy({ mobile: this.mobile });
+          } else {
+            res = asyncAoldRequest.verfiy({ mobile: this.mobile });
+          }
+          const { code, data, message } = res;
+          if (code === 0) {
+            this.timer = setInterval(() => {
+              if (this.num !== 0) {
+                this.title = `${this.num}s后可重发`;
+                this.num--;
+              } else {
+                clearInterval(this.timer);
+                this.num = 60;
+                this.title = "获取验证码";
+              }
+            }, 1000);
+          } else if (code >= 100 && code <= 104) {
+            await this.logout();
+          } else {
+            this.$message.warning(message);
+          }
         }
       } else {
         this.$emit("mobileErr", false);

src/components/Upload/index.vue

@@ -15,6 +15,7 @@
 <script>
 import urlConfig from "@/apis/url-config";
 import { getToken } from "@/utils/auth";
+import { mapGetters } from "vuex";
 //Uploadcondition 用于判断个性化文件 //返回 false 就不会上传文件
 //UploadErrorEvent 上传成功
 //UploadErrorEvent 上传失败
@@ -34,10 +35,13 @@ export default {
       default: null,
     },
   },
+  computed: {
+    ...mapGetters(["business_companyNo"]),
+  },
   data() {
     return {
       loading: false,
-      imgAPI: urlConfig.baseURL,
+      imgAPI: "",
     };
   },
   methods: {
@@ -70,6 +74,7 @@ export default {
         }
       }
     },
+
     async httpupLoad(files, i) {
       return new Promise((resolve, reject) => {
         let that = this;
@@ -80,12 +85,23 @@ export default {
           form.append("image", files[i]);
           form.append("token", getToken());
           axios
-            .post(`${that.imgAPI}Admin/upload`, form)
+            .post(
+              `${
+                that.business_companyNo === "1"
+                  ? urlConfig.baseURL
+                  : urlConfig.aoldBaseURL
+              }Admin/upload`,
+              form
+            )
             .then((res) => {
               if (res && res.data && res.status === 200 && res.data.data) {
                 const { url, name } = res.data.data[0];
                 resolve({
-                  url: `${that.imgAPI}storage/${url}`,
+                  url: `${
+                    that.business_companyNo === "1"
+                      ? urlConfig.baseURL
+                      : urlConfig.aoldBaseURL
+                  }storage/${url}`,
                   name: name,
                 });
               } else {

src/components/changeDialog/capital.vue

@@ -47,7 +47,7 @@
             <el-table-column
               type="selection"
               width="45"
-               fixed="left"
+              fixed="left"
               align="center"
             ></el-table-column>
             <el-table-column
@@ -56,7 +56,7 @@
               show-overflow-tooltip
               width="270"
             ></el-table-column>
-               <el-table-column
+            <el-table-column
               prop="companyNo"
               label="认领企业编号"
               show-overflow-tooltip
@@ -88,11 +88,7 @@
               min-width="110"
             ></el-table-column>
 
-            <el-table-column
-              label="关联发票信息"
-              show-overflow-tooltip
-              align="center"
-            >
+            <el-table-column label="关联发票信息" show-overflow-tooltip align="center">
               <el-table-column
                 prop="inv_fee"
                 label="已核销金额"
@@ -111,16 +107,9 @@
                 show-overflow-tooltip
                 min-width="110"
               ></el-table-column>
-              <el-table-column
-                label="核销状态"
-                show-overflow-tooltip
-                min-width="95"
-              >
+              <el-table-column label="核销状态" show-overflow-tooltip min-width="95">
                 <template slot-scope="scope">
-                  <el-tag
-                    type="danger"
-                    :size="'mini'"
-                    v-if="scope.row.inv_status === '1'"
+                  <el-tag type="danger" :size="'mini'" v-if="scope.row.inv_status === '1'"
                     >未核销</el-tag
                   >
                   <el-tag
@@ -133,11 +122,7 @@
                 </template>
               </el-table-column>
             </el-table-column>
-            <el-table-column
-              label="关联确认单信息"
-              show-overflow-tooltip
-              align="center"
-            >
+            <el-table-column label="关联确认单信息" show-overflow-tooltip align="center">
               <el-table-column
                 prop="order_fee"
                 label="已核销金额"
@@ -156,11 +141,7 @@
                 show-overflow-tooltip
                 min-width="110"
               ></el-table-column>
-              <el-table-column
-                label="核销状态"
-                show-overflow-tooltip
-                min-width="95"
-              >
+              <el-table-column label="核销状态" show-overflow-tooltip min-width="95">
                 <template slot-scope="scope">
                   <el-tag
                     type="danger"
@@ -189,10 +170,7 @@
         <el-col :span="24">
           <el-row>
             <el-col :span="18">
-              <div
-                class="Pagination"
-                style="text-align: center; margin-top: 12px"
-              >
+              <div class="Pagination" style="text-align: center; margin-top: 12px">
                 <el-pagination
                   :current-page="parmValue.page"
                   :page-size="parmValue.size"
@@ -223,8 +201,10 @@
 
 <script>
 import asyncRequest from "@/apis/caixiaoService/InvoiceSales/capitalPool";
+import asyncAoldRequest from "@/apis/aoldService/InvoiceSales/capitalPool";
 import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";
+import { mapGetters } from "vuex";
 export default {
   props: [
     "id",
@@ -236,6 +216,9 @@ export default {
     "onces",
     "status",
   ],
+  computed: {
+    ...mapGetters(["business_companyNo"]),
+  },
   mixins: [mixinPage, resToken],
   data() {
     return {
@@ -295,11 +278,18 @@ export default {
         this.parmValue.order_status = this.order_status;
         this.parmValue.inv_status = this.inv_status;
         this.parmValue.status = this.status ? this.status : "";
-        const res = await asyncRequest.list(this.parmValue);
-        if (res && res.code === 0 && res.data && res.data.list) {
-          this.tableData = res.data.list;
-          this.count = res.data.count;
-        } else if (res && res.code >= 100 && res.code <= 104) {
+        let res = {};
+        if (this.business_companyNo === "1") {
+          res = await asyncRequest.list(this.parmValue);
+        } else {
+          res = await asyncAoldRequest.list(this.parmValue);
+        }
+        const { code, data, message } = res;
+        if (code === 0) {
+          const { list, count } = data;
+          this.tableData = list;
+          this.count = count;
+        } else if (code >= 100 && code <= 104) {
           await this.logout();
         } else {
           this.tableData = [];

src/components/changeDialog/invoice.vue

@@ -217,8 +217,10 @@
 
 <script>
 import asyncRequest from "@/apis/caixiaoService/InvoiceSales/invoicePool";
+import asyncAoldRequest from "@/apis/aoldService/InvoiceSales/invoicePool";
 import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";
+import { mapGetters } from "vuex";
 export default {
   props: [
     "id",
@@ -229,6 +231,9 @@ export default {
     "type_check",
     "onces",
   ],
+  computed: {
+    ...mapGetters(["business_companyNo"]),
+  },
   mixins: [mixinPage, resToken],
   data() {
     return {
@@ -290,11 +295,18 @@ export default {
         this.parmValue.type_check = this.type_check;
         this.parmValue.order_status = this.order_status;
         this.parmValue.trade_status = this.trade_status;
-        const res = await asyncRequest.list(this.parmValue);
-        if (res && res.code === 0 && res.data && res.data.list) {
-          this.tableData = res.data.list;
-          this.count = res.data.count;
-        } else if (res && res.code >= 100 && res.code <= 104) {
+        let res = {};
+        if (this.business_companyNo === "1") {
+          res = await asyncRequest.list(this.parmValue);
+        } else {
+          res = await asyncAoldRequest.list(this.parmValue);
+        }
+        const { code, data, message } = res;
+        if (code === 0) {
+          const { list, count } = data;
+          this.tableData = list;
+          this.count = count;
+        } else if (code >= 100 && code <= 104) {
           await this.logout();
         } else {
           this.tableData = [];

src/components/changeDialog/order.vue

@@ -425,9 +425,11 @@
 
 <script>
 import asyncRequest from "@/apis/caixiaoService/InvoiceSales/invoiceApply";
+import asyncAoldRequest from "@/apis/aoldService/InvoiceSales/invoiceApply";
 import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";
 import { platform } from "@/assets/js/linkType";
+import { mapGetters } from "vuex";
 export default {
   props: [
     "id",
@@ -438,6 +440,9 @@ export default {
     "onces",
     "isAll",
   ],
+  computed: {
+    ...mapGetters(["business_companyNo"]),
+  },
   mixins: [mixinPage, resToken],
   data() {
     return {
@@ -503,11 +508,18 @@ export default {
         this.parmValue.companyNo = this.id; // 客户企业编码
         this.parmValue.pay_status = this.trade_status; //资金核销状态
         this.parmValue.inv_status = this.inv_status; //发票核销状态
-        const res = await asyncRequest.qrdlist(this.parmValue);
-        if (res && res.code === 0 && res.data && res.data.list) {
-          this.tableData = res.data.list;
-          this.count = res.data.count;
-        } else if (res && res.code >= 100 && res.code <= 104) {
+        let res = {};
+        if (this.business_companyNo === "1") {
+          res = await asyncRequest.list(this.parmValue);
+        } else {
+          res = await asyncAoldRequest.list(this.parmValue);
+        }
+        const { code, data, message } = res;
+        if (code === 0) {
+          const { list, count } = data;
+          this.tableData = list;
+          this.count = count;
+        } else if (code >= 100 && code <= 104) {
           await this.logout();
         } else {
           this.tableData = [];

src/components/changeDialog/refund.vue

@@ -101,10 +101,7 @@
         <el-col :span="24">
           <el-row>
             <el-col :span="18">
-              <div
-                class="Pagination"
-                style="text-align: center; margin-top: 12px"
-              >
+              <div class="Pagination" style="text-align: center; margin-top: 12px">
                 <el-pagination
                   :current-page="parmValue.page"
                   :page-size="parmValue.size"
@@ -135,10 +132,15 @@
 
 <script>
 import asyncRequest from "@/apis/caixiaoService/InvoiceSales/refund";
+import asyncAoldRequest from "@/apis/aoldService/InvoiceSales/refund";
 import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";
+import { mapGetters } from "vuex";
 export default {
   props: ["id", "showModel", "refund_status", "onces"],
+  computed: {
+    ...mapGetters(["business_companyNo"]),
+  },
   mixins: [mixinPage, resToken],
   data() {
     return {
@@ -192,14 +194,19 @@ export default {
         this.loading = true;
         this.tableData = [];
         this.parmValue.companyNo = this.id; // 客户企业编码
-        this.parmValue.refund_status = this.refund_status
-          ? this.refund_status
-          : "";
-        const res = await asyncRequest.list(this.parmValue);
-        if (res && res.code === 0 && res.data && res.data.list) {
-          this.tableData = res.data.list;
-          this.count = res.data.count;
-        } else if (res && res.code >= 100 && res.code <= 104) {
+        this.parmValue.refund_status = this.refund_status ? this.refund_status : "";
+        let res = {};
+        if (this.business_companyNo === "1") {
+          res = await asyncRequest.list(this.parmValue);
+        } else {
+          res = await asyncAoldRequest.list(this.parmValue);
+        }
+        const { code, data, message } = res;
+        if (code === 0) {
+          const { list, count } = data;
+          this.tableData = list;
+          this.count = count;
+        } else if (code >= 100 && code <= 104) {
           await this.logout();
         } else {
           this.tableData = [];

src/components/global/search-select/index.vue

@@ -24,18 +24,15 @@
 </template>
 <script>
 import asyncRequest from "@/apis/caixiaoService/network/orderEntry";
+import asyncAoldRequest from "@/apis/aoldService/network/orderEntry";
 import resToken from "@/mixins/resToken";
+import { mapGetters } from "vuex";
 export default {
   name: "search-select",
-  props: [
-    "code",
-    "placeholder",
-    "size",
-    "type",
-    "isDetail",
-    "disabled",
-    "names",
-  ],
+  props: ["code", "placeholder", "size", "type", "isDetail", "disabled", "names"],
+  computed: {
+    ...mapGetters(["business_companyNo"]),
+  },
   mixins: [resToken],
   data() {
     return {
@@ -76,27 +73,28 @@ export default {
         };
 
         let res = {};
-        if (this.type === "1") {
+        const num = Number(this.type);
+        if (this.business_companyNo === "1") {
+          res = await asyncRequest[`list${num}`](num < 4 ? {} : formValue);
+        } else {
+          res = await asyncAoldRequest[`list${num}`](num < 4 ? {} : formValue);
+        }
+        if (num === 1) {
           delete formValue["name"];
-          res = await asyncRequest.list1(formValue);
-        } else if (this.type === "2") {
+        } else if (num === 2 || num === 3) {
           delete formValue["company"];
-          res = await asyncRequest.list2(formValue);
-        } else if (this.type === "3") {
-          delete formValue["company"];
-          res = await asyncRequest.list3(formValue);
-        } else {
-          res = await asyncRequest.list4({});
         }
-        if (res && res.code === 0 && res.data) {
+        const { code, data, message } = res;
+        if (code === 0) {
           this.activeOptions;
-          let list = [];
+          let arr = [];
           if (this.type === "4") {
-            list = res.data;
+            arr = data;
           } else {
-            list = res.data.list;
+            const { list } = data;
+            arr = list;
           }
-          list.forEach((v1) => {
+          arr.forEach((v1) => {
             let item = {
               code:
                 this.type === "1"
@@ -113,14 +111,14 @@ export default {
                   ? v1.company_name || ""
                   : this.type === "3"
                   ? v1.name || ""
-                  : v1.rate+"%" || "",
+                  : v1.rate + "%" || "",
             };
             this.activeOptions.push(item);
           });
-        } else if (res && res.code >= 100 && res.code <= 104) {
+        } else if (code >= 100 && code <= 104) {
           await this.logout();
         } else {
-          this.$message.warning(res.message);
+          this.$message.warning(message);
         }
       } else {
         this.activeOptions = [];
@@ -131,7 +129,7 @@ export default {
 };
 </script>
 
-   <style lang="scss" scoped>
+<style lang="scss" scoped>
 .search-select {
 }
 </style>

src/store/getters.js

@@ -1,19 +1,20 @@
 const getters = {
-  sidebar: state => state.app.sidebar,
-  size: state => state.app.size,
-  searchSize: state => state.app.searchSize,
-  tablebtnSize: state => state.app.tablebtnSize,
-  device: state => state.app.device,
-  visitedViews: state => state.tagsView.visitedViews,
-  cachedViews: state => state.tagsView.cachedViews,
-  token: state => state.user.token,
-  avatar: state => state.user.avatar,
-  name: state => state.user.name,
-  userid: state => state.user.userid,
-  introduction: state => state.user.introduction,
-  roles: state => state.user.roles,
-  errorLogs: state => state.errorLog.logs,
-  btnList: state => state.user.btnList,
-  navList: state => state.user.navList
-}
-export default getters
+  sidebar: (state) => state.app.sidebar,
+  size: (state) => state.app.size,
+  searchSize: (state) => state.app.searchSize,
+  tablebtnSize: (state) => state.app.tablebtnSize,
+  device: (state) => state.app.device,
+  visitedViews: (state) => state.tagsView.visitedViews,
+  cachedViews: (state) => state.tagsView.cachedViews,
+  token: (state) => state.user.token,
+  avatar: (state) => state.user.avatar,
+  name: (state) => state.user.name,
+  userid: (state) => state.user.userid,
+  introduction: (state) => state.user.introduction,
+  roles: (state) => state.user.roles,
+  errorLogs: (state) => state.errorLog.logs,
+  btnList: (state) => state.user.btnList,
+  navList: (state) => state.user.navList,
+  business_companyNo: (state) => state.user.business_companyNo,
+};
+export default getters;