From 88b081af32292a7698f60247f9ca865bc75ee179 Mon Sep 17 00:00:00 2001 From: "ruofei.yu" Date: Thu, 4 Sep 2025 17:18:37 +0800 Subject: [PATCH] feat: Add import and update basic functions --- config/index.js | 156 +- src/api/salesAPI.js | 341 +- src/components/Dialog/dialogImportFile.vue | 169 + src/components/Layout/index.vue | 594 ++-- src/pages/equipment/account.vue | 1326 ++++---- .../independent/center/components/disc.vue | 749 ++-- src/pages/independent/center/index.vue | 68 +- src/pages/independent/screen.vue | 8 +- src/pages/inspection/plan/index.vue | 1069 +++--- src/pages/khgxgl/wlps/index.vue | 1083 +++--- src/pages/khgxgl/xqgl/index.vue | 1078 +++--- src/pages/login/index.vue | 16 +- src/pages/maintain/plan/index.vue | 1081 +++--- src/pages/management/company.vue | 1098 +++--- src/pages/management/customer/index.vue | 1998 +++++------ src/pages/management/project/index.vue | 1107 +++--- src/pages/mes/basic/process/index.vue | 754 ++--- src/pages/mes/inspection/plan/index.vue | 868 ++--- src/pages/mes/inspection/plan/index_1.vue | 868 ++--- src/pages/mes/jobShop/workReport/index.vue | 2178 ++++++------ .../mes/planManagement/production/index.vue | 2150 ++++++------ .../working_procedure/index.vue | 2114 ++++++------ .../mes/quality/deliveryInspection/index.vue | 1283 +++---- .../mes/quality/productInspection/index.vue | 1378 ++++---- src/pages/scm/sales/delivery_note/index.vue | 2319 ++++++------- src/pages/scm/sales/sales_contract/index.vue | 2011 +++++------ .../scm/sales/sales_contract/indexNew.vue | 3008 +++++++++-------- .../scm/sales/sales_contract/indexNew_1.vue | 2649 +++++++-------- .../scm/sales/sales_contract/index_1.vue | 2046 +++++------ src/pages/scm/sales/sales_stock/index.vue | 1801 +++++----- src/pages/scm/warehouse/otherStock/index.vue | 1800 +++++----- .../scm/warehouse/produceStock/index.vue | 1743 +++++----- .../scm/warehouse/produceStock/index_1.vue | 1788 +++++----- src/pages/scm/warehouse/stock/index.vue | 939 +++-- src/store/modules/common/index.js | 192 +- 35 files changed, 22138 insertions(+), 21692 deletions(-) create mode 100644 src/components/Dialog/dialogImportFile.vue diff --git a/config/index.js b/config/index.js index 6d59569..c36a3a0 100644 --- a/config/index.js +++ b/config/index.js @@ -1,78 +1,78 @@ -"use strict"; -// Template version: 1.3.1 -// see http://vuejs-templates.github.io/webpack for documentation. - -const path = require("path"); - -module.exports = { - dev: { - // Paths - assetsSubDirectory: "static", - assetsPublicPath: "/", - proxyTable: { - "/gyhl": { - // target: "/gyhl", //8889 - target: "http://36.137.58.70:52/gyhl", - // // target:"http://192.168.1.194:21925", //lj-local - changeOrigin: true, - pathRewrite: { - "^/gyhl": "" - } - } - }, - - // Various Dev Server settings - host: "localhost", // can be overwritten by process.env.HOST - port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined - autoOpenBrowser: true, - errorOverlay: true, - notifyOnErrors: true, - poll: false, - // https://webpack.js.org/configuration/dev-server/#devserver-watchoptions- - - /** - * Source Maps - */ - - // https://webpack.js.org/configuration/devtool/#development - devtool: "cheap-module-eval-source-map", - - // If you have problems debugging vue-files in devtools, - // set this to false - it *may* help - // https://vue-loader.vuejs.org/en/options.html#cachebusting - cacheBusting: true, - - cssSourceMap: true - }, - - build: { - // Template for index.html - index: path.resolve(__dirname, "../gyhl/index.html"), - - // Paths - assetsRoot: path.resolve(__dirname, "../gyhl"), - assetsSubDirectory: "static", - assetsPublicPath: "/", - - /** - * Source Maps - */ - - productionSourceMap: false, - // https://webpack.js.org/configuration/devtool/#production - devtool: "#source-map", - - // Gzip off by default as many popular static hosts such as - // Surge or Netlify already gzip all static assets for you. - // Before setting to `true`, make sure to: - // npm install --save-dev compression-webpack-plugin - productionGzip: false, - productionGzipExtensions: ["js", "css"], - - // Run the build command with an extra argument to - // View the bundle analyzer report after build finishes: - // `npm run build --report` - // Set to `true` or `false` to always turn it on or off - bundleAnalyzerReport: process.env.npm_config_report - } -}; +"use strict"; +// Template version: 1.3.1 +// see http://vuejs-templates.github.io/webpack for documentation. + +const path = require("path"); + +module.exports = { + dev: { + // Paths + assetsSubDirectory: "static", + assetsPublicPath: "/", + proxyTable: { + "/gyhl": { + // target: "/gyhl", //8889 + target: "http://36.139.25.238:52/gyhl", + // // target:"http://192.168.1.194:21925", //lj-local + changeOrigin: true, + pathRewrite: { + "^/gyhl": "" + } + } + }, + + // Various Dev Server settings + host: "localhost", // can be overwritten by process.env.HOST + port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined + autoOpenBrowser: true, + errorOverlay: true, + notifyOnErrors: true, + poll: false, + // https://webpack.js.org/configuration/dev-server/#devserver-watchoptions- + + /** + * Source Maps + */ + + // https://webpack.js.org/configuration/devtool/#development + devtool: "cheap-module-eval-source-map", + + // If you have problems debugging vue-files in devtools, + // set this to false - it *may* help + // https://vue-loader.vuejs.org/en/options.html#cachebusting + cacheBusting: true, + + cssSourceMap: true + }, + + build: { + // Template for index.html + index: path.resolve(__dirname, "../gyhl/index.html"), + + // Paths + assetsRoot: path.resolve(__dirname, "../gyhl"), + assetsSubDirectory: "static", + assetsPublicPath: "/", + + /** + * Source Maps + */ + + productionSourceMap: false, + // https://webpack.js.org/configuration/devtool/#production + devtool: "#source-map", + + // Gzip off by default as many popular static hosts such as + // Surge or Netlify already gzip all static assets for you. + // Before setting to `true`, make sure to: + // npm install --save-dev compression-webpack-plugin + productionGzip: false, + productionGzipExtensions: ["js", "css"], + + // Run the build command with an extra argument to + // View the bundle analyzer report after build finishes: + // `npm run build --report` + // Set to `true` or `false` to always turn it on or off + bundleAnalyzerReport: process.env.npm_config_report + } +}; diff --git a/src/api/salesAPI.js b/src/api/salesAPI.js index 81ffda6..b78418a 100644 --- a/src/api/salesAPI.js +++ b/src/api/salesAPI.js @@ -1,155 +1,186 @@ -/** - *销售订单 - */ -import base from './base'; // 导入接口域名列表 -import axios from '@/request'; // 导入http中创建的axios实例 - -const salesAPI = { - // 获取销售订单列表 - listSalesContract(param) { - return axios.get(`${base.url}/apis/salesContractApi/salesContractList`, { params: param }) - }, - productionTraceabilityListSalesContract(param) { - return axios.get(`${base.url}/apis/productionTraceability/salesContractList`, { params: param }) - }, - // 获取销售订单导出列表 - listForExport(param) { - return axios.get(`${base.url}/apis/salesContractApi/salesContractListForExport`, { params: param }) - }, - // 查询合同类型 - listContractType(param) { - return axios.post(`${base.url}/apis/dict/getDictsByType`, param) - }, - // 查询审核状态 - listAauditSign(param) { - return axios.post(`${base.url}/apis/dict/getDictsByType`, param) - }, - // 删除合同 - removeContract(param) { - return axios.post(`${base.url}/apis/salesContractApi/batchRemove`, param) - }, - // 暂存合同 - saveContract(param) { - return axios.post(`${base.url}/apis/salesContractApi/addOrUpdate`, param) - }, - /** 地磅生成销售 */ - saveContractFormTruck(param){ - return axios.post(`${base.url}/apis/salesContractApi/submitScalesContract`,param) - }, - // 提交审批 - submitContract(param) { - return axios.post(`${base.url}/apis/salesContractApi/submitContract`, param) - }, - // 获取合同详细信息 - getContractDetail(param) { - return axios.get(`${base.url}/apis/salesContractApi/detail`, { params: param }) - }, - // 审核合同 - auditContract(param) { - return axios.post(`${base.url}/apis/salesContract/audit`, param) - }, - // 反审核合同 - reverseAuditContract(param) { - return axios.post(`${base.url}/apis/salesContract/reverseAudit`, param) - }, - // 关闭合同 - closeContract(param) { - return axios.post(`${base.url}/apis/salesContract/close`, param) - }, - // 反关闭合同 - reverseClose(param) { - return axios.post(`${base.url}/apis/salesContract/reverseClose`, param) - }, - // 变更合同 - changeContract(param) { - return axios.post(`${base.url}/apis/salesContractApi/edit`, param) - }, - // 获取变更销售订单列表 - getAlterationList(param) { - return axios.get(`${base.url}/apis/salesContractApi/alterationList`, { params: param }) - }, - // 获取变更销售订单详情 - getAlterationDetail(param) { - return axios.get(`${base.url}/apis/salesContractApi/alterationDetail`, { params: param }) - }, - // 导出销售退货 - exportExcel(param) { - return axios.get(`${base.url}/apis/exportExcel/salesContract`, { params: param ,responseType: "blob"}) - }, - // 销售订单导入单据 - getSalesContractList(param) { - return axios.get(`${base.url}/apis/salesContractApi/dialog`, { params: param }) - }, - // 行关闭 - closeLine(param) { - return axios.post(`${base.url}/apis/salesContractApi/closeLine`, param) - }, - - - - - // 自定义文件名称文件下载 - downloadByCusName(param) { - return axios.get(`${base.url}/apis/document/downloadByCusName`, { params: param }) - }, - // 单文件下载 - down(param) { - return axios.get(`${base.url}/apis/file/down`, { params: param }) - }, - // 下载薪资档案模板 - downLoadSalaryArchives(param) { - return axios.get(`${base.url}/apis/exportExcel/downLoadSalaryArchives`, { params: param ,responseType: "blob"}) - }, - // 下载社保模板 - downLoadSocialSecurity(param) { - return axios.get(`${base.url}/apis/exportExcel/downLoadSocialSecurity`, { params: param ,responseType: "blob"}) - }, - // 下载个税模板 - downLoadTax(param) { - return axios.get(`${base.url}/apis/exportExcel/downLoadTax`, { params: param ,responseType: "blob"}) - }, - // 导出薪资记录 - downLoadRecord(param) { - return axios.get(`${base.url}/apis/exportExcel/downLoadRecord`, { params: param ,responseType: "blob"}) - }, - - // 查询合同类型 - associatedBill(param) { - return axios({ - url:`${base.url}/apis/associatedBill/salesOrder`, - method: 'post', - data: param, - headers: { - 'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8' - } - }) - }, - - // 获取字典列表信息 - list(param) { - return axios.post(`${base.url}/apis/dictionary/list`, param) -}, - -} -export default salesAPI; - - - - - - - - - - - - - - - - - - - - - +/** + *销售订单 + */ +import base from './base'; // 导入接口域名列表 +import axios from '@/request'; // 导入http中创建的axios实例 + +const salesAPI = { + // 导入 + importAllFile(param,type) { + let url = ""; + switch (type) { + case "sales": + url = "/apis/standard/importExcel/sales"; + break; + case 'wlps': + url ="/apis/mdh/shfw/importExcel"; + break; + case 'patrolPlan': + url ="/apis/patrolPlan/importExcel"; + break; + case 'project': + url ="/apis/project/importExcel"; + break; + case 'upkeepPlan': + url ="/apis/upkeepPlan/importExcel"; + break; + case 'xqgl': + url ="/apis/mdh/xqgl/importExcel"; + break; + default:'' + } + return axios.post(`${base.url}${url}`, param, { + headers: { + 'Content-Type': 'multipart/form-data' + } + }); + }, + + // 获取销售订单列表 + listSalesContract(param) { + return axios.get(`${base.url}/apis/salesContractApi/salesContractList`, { params: param }) + }, + productionTraceabilityListSalesContract(param) { + return axios.get(`${base.url}/apis/productionTraceability/salesContractList`, { params: param }) + }, + // 获取销售订单导出列表 + listForExport(param) { + return axios.get(`${base.url}/apis/salesContractApi/salesContractListForExport`, { params: param }) + }, + // 查询合同类型 + listContractType(param) { + return axios.post(`${base.url}/apis/dict/getDictsByType`, param) + }, + // 查询审核状态 + listAauditSign(param) { + return axios.post(`${base.url}/apis/dict/getDictsByType`, param) + }, + // 删除合同 + removeContract(param) { + return axios.post(`${base.url}/apis/salesContractApi/batchRemove`, param) + }, + // 暂存合同 + saveContract(param) { + return axios.post(`${base.url}/apis/salesContractApi/addOrUpdate`, param) + }, + /** 地磅生成销售 */ + saveContractFormTruck(param){ + return axios.post(`${base.url}/apis/salesContractApi/submitScalesContract`,param) + }, + // 提交审批 + submitContract(param) { + return axios.post(`${base.url}/apis/salesContractApi/submitContract`, param) + }, + // 获取合同详细信息 + getContractDetail(param) { + return axios.get(`${base.url}/apis/salesContractApi/detail`, { params: param }) + }, + // 审核合同 + auditContract(param) { + return axios.post(`${base.url}/apis/salesContract/audit`, param) + }, + // 反审核合同 + reverseAuditContract(param) { + return axios.post(`${base.url}/apis/salesContract/reverseAudit`, param) + }, + // 关闭合同 + closeContract(param) { + return axios.post(`${base.url}/apis/salesContract/close`, param) + }, + // 反关闭合同 + reverseClose(param) { + return axios.post(`${base.url}/apis/salesContract/reverseClose`, param) + }, + // 变更合同 + changeContract(param) { + return axios.post(`${base.url}/apis/salesContractApi/edit`, param) + }, + // 获取变更销售订单列表 + getAlterationList(param) { + return axios.get(`${base.url}/apis/salesContractApi/alterationList`, { params: param }) + }, + // 获取变更销售订单详情 + getAlterationDetail(param) { + return axios.get(`${base.url}/apis/salesContractApi/alterationDetail`, { params: param }) + }, + // 导出销售退货 + exportExcel(param) { + return axios.get(`${base.url}/apis/exportExcel/salesContract`, { params: param ,responseType: "blob"}) + }, + // 销售订单导入单据 + getSalesContractList(param) { + return axios.get(`${base.url}/apis/salesContractApi/dialog`, { params: param }) + }, + // 行关闭 + closeLine(param) { + return axios.post(`${base.url}/apis/salesContractApi/closeLine`, param) + }, + + + + + // 自定义文件名称文件下载 + downloadByCusName(param) { + return axios.get(`${base.url}/apis/document/downloadByCusName`, { params: param }) + }, + // 单文件下载 + down(param) { + return axios.get(`${base.url}/apis/file/down`, { params: param }) + }, + // 下载薪资档案模板 + downLoadSalaryArchives(param) { + return axios.get(`${base.url}/apis/exportExcel/downLoadSalaryArchives`, { params: param ,responseType: "blob"}) + }, + // 下载社保模板 + downLoadSocialSecurity(param) { + return axios.get(`${base.url}/apis/exportExcel/downLoadSocialSecurity`, { params: param ,responseType: "blob"}) + }, + // 下载个税模板 + downLoadTax(param) { + return axios.get(`${base.url}/apis/exportExcel/downLoadTax`, { params: param ,responseType: "blob"}) + }, + // 导出薪资记录 + downLoadRecord(param) { + return axios.get(`${base.url}/apis/exportExcel/downLoadRecord`, { params: param ,responseType: "blob"}) + }, + + // 查询合同类型 + associatedBill(param) { + return axios({ + url:`${base.url}/apis/associatedBill/salesOrder`, + method: 'post', + data: param, + headers: { + 'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8' + } + }) + }, + + // 获取字典列表信息 + list(param) { + return axios.post(`${base.url}/apis/dictionary/list`, param) +}, + +} +export default salesAPI; + + + + + + + + + + + + + + + + + + + + + diff --git a/src/components/Dialog/dialogImportFile.vue b/src/components/Dialog/dialogImportFile.vue new file mode 100644 index 0000000..61db190 --- /dev/null +++ b/src/components/Dialog/dialogImportFile.vue @@ -0,0 +1,169 @@ + + + + + diff --git a/src/components/Layout/index.vue b/src/components/Layout/index.vue index 504f69d..78a95c2 100644 --- a/src/components/Layout/index.vue +++ b/src/components/Layout/index.vue @@ -1,297 +1,297 @@ - - - - - - + + + + + + diff --git a/src/pages/equipment/account.vue b/src/pages/equipment/account.vue index e371b9d..50e56d0 100644 --- a/src/pages/equipment/account.vue +++ b/src/pages/equipment/account.vue @@ -1,663 +1,663 @@ - - - - - - + + + + + + diff --git a/src/pages/independent/center/components/disc.vue b/src/pages/independent/center/components/disc.vue index 25d99d2..3919b1a 100644 --- a/src/pages/independent/center/components/disc.vue +++ b/src/pages/independent/center/components/disc.vue @@ -1,371 +1,378 @@ - - - + + + diff --git a/src/pages/independent/center/index.vue b/src/pages/independent/center/index.vue index e2d7b7b..1304ed7 100644 --- a/src/pages/independent/center/index.vue +++ b/src/pages/independent/center/index.vue @@ -1,34 +1,34 @@ - - - - - + + + + + diff --git a/src/pages/independent/screen.vue b/src/pages/independent/screen.vue index 3c25ee6..5e1939a 100644 --- a/src/pages/independent/screen.vue +++ b/src/pages/independent/screen.vue @@ -5,7 +5,7 @@

- 江西心诚药业互联网平台数字化展示中心 + {{ companyInfo.screenName }}

{{ time }}
@@ -51,6 +51,7 @@ import model3d from "./screen-3d"; import model3dsb from "./screen-3d-sb"; import model3dhcl from "./screen-3d-hcl"; import model3dfq from "./screen-3d-fq"; +import { mapState } from "vuex"; export default { name: "LongScreen", @@ -70,6 +71,11 @@ export default { show: "cj" }; }, + computed: { + ...mapState({ + companyInfo: state => state.common.companyInfo + }), + }, mounted() { this.timeSelse = setInterval(() => { this.getTime(); diff --git a/src/pages/inspection/plan/index.vue b/src/pages/inspection/plan/index.vue index 6b74021..9665723 100644 --- a/src/pages/inspection/plan/index.vue +++ b/src/pages/inspection/plan/index.vue @@ -1,525 +1,544 @@ - - - - - + + + + + diff --git a/src/pages/khgxgl/wlps/index.vue b/src/pages/khgxgl/wlps/index.vue index c8a9142..0741598 100644 --- a/src/pages/khgxgl/wlps/index.vue +++ b/src/pages/khgxgl/wlps/index.vue @@ -1,531 +1,552 @@ - - - - - + + + + + diff --git a/src/pages/khgxgl/xqgl/index.vue b/src/pages/khgxgl/xqgl/index.vue index 03f6ae5..27feb22 100644 --- a/src/pages/khgxgl/xqgl/index.vue +++ b/src/pages/khgxgl/xqgl/index.vue @@ -1,529 +1,549 @@ - - - - - + + + + + diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue index 23c9946..b7babd1 100644 --- a/src/pages/login/index.vue +++ b/src/pages/login/index.vue @@ -1,9 +1,8 @@ - - - - + + + + + diff --git a/src/pages/management/company.vue b/src/pages/management/company.vue index 0e8ed9f..ba1e259 100644 --- a/src/pages/management/company.vue +++ b/src/pages/management/company.vue @@ -1,547 +1,551 @@ - - - - - - + + + + + + diff --git a/src/pages/management/customer/index.vue b/src/pages/management/customer/index.vue index bef5d19..3667e06 100644 --- a/src/pages/management/customer/index.vue +++ b/src/pages/management/customer/index.vue @@ -1,999 +1,999 @@ - - - - - + + + + + diff --git a/src/pages/management/project/index.vue b/src/pages/management/project/index.vue index d1fd7d1..2823d8d 100644 --- a/src/pages/management/project/index.vue +++ b/src/pages/management/project/index.vue @@ -1,543 +1,564 @@ - - - - - + + + + + diff --git a/src/pages/mes/basic/process/index.vue b/src/pages/mes/basic/process/index.vue index 42bce2e..db9c1ea 100644 --- a/src/pages/mes/basic/process/index.vue +++ b/src/pages/mes/basic/process/index.vue @@ -1,377 +1,377 @@ - - - - - + + + + + diff --git a/src/pages/mes/inspection/plan/index.vue b/src/pages/mes/inspection/plan/index.vue index 067d0f5..e275312 100644 --- a/src/pages/mes/inspection/plan/index.vue +++ b/src/pages/mes/inspection/plan/index.vue @@ -1,434 +1,434 @@ - - - - - + + + + + diff --git a/src/pages/mes/inspection/plan/index_1.vue b/src/pages/mes/inspection/plan/index_1.vue index 067d0f5..e275312 100644 --- a/src/pages/mes/inspection/plan/index_1.vue +++ b/src/pages/mes/inspection/plan/index_1.vue @@ -1,434 +1,434 @@ - - - - - + + + + + diff --git a/src/pages/mes/jobShop/workReport/index.vue b/src/pages/mes/jobShop/workReport/index.vue index f31686e..5d80767 100644 --- a/src/pages/mes/jobShop/workReport/index.vue +++ b/src/pages/mes/jobShop/workReport/index.vue @@ -1,1072 +1,1106 @@ - - - - - - + + + + + + diff --git a/src/pages/mes/planManagement/production/index.vue b/src/pages/mes/planManagement/production/index.vue index 4b97961..a74a3e8 100644 --- a/src/pages/mes/planManagement/production/index.vue +++ b/src/pages/mes/planManagement/production/index.vue @@ -1,1075 +1,1075 @@ - - - - - + + + + + diff --git a/src/pages/mes/planManagement/working_procedure/index.vue b/src/pages/mes/planManagement/working_procedure/index.vue index afa9f54..8384ddb 100644 --- a/src/pages/mes/planManagement/working_procedure/index.vue +++ b/src/pages/mes/planManagement/working_procedure/index.vue @@ -1,1057 +1,1057 @@ - - - - - - + + + + + + diff --git a/src/pages/mes/quality/deliveryInspection/index.vue b/src/pages/mes/quality/deliveryInspection/index.vue index 5dd56af..72d3ca3 100644 --- a/src/pages/mes/quality/deliveryInspection/index.vue +++ b/src/pages/mes/quality/deliveryInspection/index.vue @@ -1,639 +1,644 @@ - - - - - + + + + + diff --git a/src/pages/mes/quality/productInspection/index.vue b/src/pages/mes/quality/productInspection/index.vue index e82a750..069f5c6 100644 --- a/src/pages/mes/quality/productInspection/index.vue +++ b/src/pages/mes/quality/productInspection/index.vue @@ -1,672 +1,706 @@ - - - - - + + + + + diff --git a/src/pages/scm/sales/delivery_note/index.vue b/src/pages/scm/sales/delivery_note/index.vue index b678ff7..96fa780 100644 --- a/src/pages/scm/sales/delivery_note/index.vue +++ b/src/pages/scm/sales/delivery_note/index.vue @@ -1,1156 +1,1163 @@ - - - - - - - - - - + + + + + + + + + + diff --git a/src/pages/scm/sales/sales_contract/index.vue b/src/pages/scm/sales/sales_contract/index.vue index 441e9c2..131f1f6 100644 --- a/src/pages/scm/sales/sales_contract/index.vue +++ b/src/pages/scm/sales/sales_contract/index.vue @@ -1,1005 +1,1006 @@ - - - - - - - - - + + + + + + + + + diff --git a/src/pages/scm/sales/sales_contract/indexNew.vue b/src/pages/scm/sales/sales_contract/indexNew.vue index 34dd156..ec5d5a4 100644 --- a/src/pages/scm/sales/sales_contract/indexNew.vue +++ b/src/pages/scm/sales/sales_contract/indexNew.vue @@ -1,1492 +1,1516 @@ - - - - - + + + + + diff --git a/src/pages/scm/sales/sales_contract/indexNew_1.vue b/src/pages/scm/sales/sales_contract/indexNew_1.vue index 0d3d427..abedc7e 100644 --- a/src/pages/scm/sales/sales_contract/indexNew_1.vue +++ b/src/pages/scm/sales/sales_contract/indexNew_1.vue @@ -1,1324 +1,1325 @@ - - - - - - - - - - + + + + + + + + + + diff --git a/src/pages/scm/sales/sales_contract/index_1.vue b/src/pages/scm/sales/sales_contract/index_1.vue index 6649d45..42965dd 100644 --- a/src/pages/scm/sales/sales_contract/index_1.vue +++ b/src/pages/scm/sales/sales_contract/index_1.vue @@ -1,1023 +1,1023 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/src/pages/scm/sales/sales_stock/index.vue b/src/pages/scm/sales/sales_stock/index.vue index 56b4042..ca15a2a 100644 --- a/src/pages/scm/sales/sales_stock/index.vue +++ b/src/pages/scm/sales/sales_stock/index.vue @@ -1,899 +1,902 @@ - - - - - - + + + + + + diff --git a/src/pages/scm/warehouse/otherStock/index.vue b/src/pages/scm/warehouse/otherStock/index.vue index c850b6a..88bc2e4 100644 --- a/src/pages/scm/warehouse/otherStock/index.vue +++ b/src/pages/scm/warehouse/otherStock/index.vue @@ -1,900 +1,900 @@ - - - - - - + + + + + + diff --git a/src/pages/scm/warehouse/produceStock/index.vue b/src/pages/scm/warehouse/produceStock/index.vue index aa0d78c..b835dd3 100644 --- a/src/pages/scm/warehouse/produceStock/index.vue +++ b/src/pages/scm/warehouse/produceStock/index.vue @@ -1,870 +1,873 @@ - - - - - + + + + + diff --git a/src/pages/scm/warehouse/produceStock/index_1.vue b/src/pages/scm/warehouse/produceStock/index_1.vue index 147842b..3500506 100644 --- a/src/pages/scm/warehouse/produceStock/index_1.vue +++ b/src/pages/scm/warehouse/produceStock/index_1.vue @@ -1,894 +1,894 @@ - - - - - + + + + + diff --git a/src/pages/scm/warehouse/stock/index.vue b/src/pages/scm/warehouse/stock/index.vue index f633f0e..868162a 100644 --- a/src/pages/scm/warehouse/stock/index.vue +++ b/src/pages/scm/warehouse/stock/index.vue @@ -1,470 +1,469 @@ - - - - - - - - - + + + + + + + + + diff --git a/src/store/modules/common/index.js b/src/store/modules/common/index.js index fcd9071..539cea1 100644 --- a/src/store/modules/common/index.js +++ b/src/store/modules/common/index.js @@ -1,92 +1,100 @@ -import base from "../../../api/base"; -import companyAPI from "../../../api/companyAPI"; -const state = { - commonUserList: [], - commonDepts: [], - logoUrl:undefined, - logoUrlFlag:false, -} - -const mutations = { - setCommonUserList: (state, data) => { - state.commonUserList = data - sessionStorage.setItem("commonUserList", JSON.stringify(state.commonUserList)); - }, - setCommonDeptList: (state, data) => { - state.commonDepts = data - sessionStorage.setItem("commonUserList", JSON.stringify(state.commonDepts)); - }, - setLogoUrl:(state,data)=>{ - if(data!=''){ - state.logoUrl = base.ftpPrefix+data - }else { - state.logoUrl = undefined - } - state.logoUrlFlag = true - sessionStorage.setItem("logoUrl",state.logoUrl) - } -} - -const actions = { - getUsers({ commit }, user) { - return new Promise((resolve, reject) => { - this.$api.commonAPI.getUsers().then(res => { - if (res.code === 0) { - commit('setCommonUserList', res.datas) - } - resolve(res); - }).catch(r => { - console.log(r); - reject(r); - }) - }); - }, - getDepts({ commit }, depts) { - return new Promise((resolve, reject) => { - this.$api.commonAPI.getDepts().then(res => { - if (res.code === 0) { - commit('setCommonDeptList', res.datas) - } - resolve(res); - }).catch(r => { - console.log(r); - reject(r); - }) - }); - }, - getLogoUrl({commit}){ - return new Promise((resolve,reject) => { - console.log("cesssssss") - companyAPI.detail().then(res=>{ - if(res.code ===0){ - console.log("cesssssss") - commit('setLogoUrl',res.result.logoUrl) - } - resolve(res) - }).catch(r=>{ - reject(r) - }) - }) - } -} - -const getters = { - getCommonUserList: state => { - if (!state.commonUserList) { - state.commonUserList = sessionStorage.getItem("commonUserList"); - } - return state.commonUserList; - }, - getLogoUrl:state =>{ - if(!state.logoUrl){ - state.logoUrl = sessionStorage.getItem("logoUrl") - } - } -} - -export default { - namespaced: true, - state, - mutations, - actions -} +import base from "../../../api/base"; +import companyAPI from "../../../api/companyAPI"; +const state = { + commonUserList: [], + commonDepts: [], + logoUrl:undefined, + logoUrlFlag:false, + companyInfo:{} +} + +const mutations = { + setCommonUserList: (state, data) => { + state.commonUserList = data + sessionStorage.setItem("commonUserList", JSON.stringify(state.commonUserList)); + }, + setCommonDeptList: (state, data) => { + state.commonDepts = data + sessionStorage.setItem("commonUserList", JSON.stringify(state.commonDepts)); + }, + setLogoUrl:(state,data)=>{ + if(data!=''){ + state.logoUrl = base.ftpPrefix+data + }else { + state.logoUrl = undefined + } + state.logoUrlFlag = true + sessionStorage.setItem("logoUrl",state.logoUrl) + }, + setCompanyInfo: (state, data) => { + state.companyInfo = data; + sessionStorage.setItem("companyInfo", JSON.stringify(data)); + }, + +} + +const actions = { + getUsers({ commit }, user) { + return new Promise((resolve, reject) => { + this.$api.commonAPI.getUsers().then(res => { + if (res.code === 0) { + commit('setCommonUserList', res.datas) + } + resolve(res); + }).catch(r => { + console.log(r); + reject(r); + }) + }); + }, + getDepts({ commit }, depts) { + return new Promise((resolve, reject) => { + this.$api.commonAPI.getDepts().then(res => { + if (res.code === 0) { + commit('setCommonDeptList', res.datas) + } + resolve(res); + }).catch(r => { + console.log(r); + reject(r); + }) + }); + }, + getLogoUrl({commit}){ + return new Promise((resolve,reject) => { + console.log("cesssssss") + companyAPI.detail().then(res=>{ + if(res.code ===0){ + console.log("cesssssss") + commit('setLogoUrl',res.result.logoUrl) + commit('setCompanyInfo', res.result); + + } + resolve(res) + }).catch(r=>{ + reject(r) + }) + }) + }, +} + +const getters = { + getCommonUserList: state => { + if (!state.commonUserList) { + state.commonUserList = sessionStorage.getItem("commonUserList"); + } + return state.commonUserList; + }, + getLogoUrl:state =>{ + if(!state.logoUrl){ + state.logoUrl = sessionStorage.getItem("logoUrl") + } + } +} + +export default { + namespaced: true, + state, + mutations, + actions +}