diff --git a/dist.7z b/dist.7z deleted file mode 100644 index 114d42d..0000000 Binary files a/dist.7z and /dev/null differ diff --git a/package-lock.json b/package-lock.json index 82b486f..bc3c838 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3531,6 +3531,11 @@ "resolved": "https://registry.nlark.com/dayjs/download/dayjs-1.10.7.tgz", "integrity": "sha1-LPX5Gt0oEWdIRAhmoKHSbzps5Gg=" }, + "dayjs": { + "version": "1.10.7", + "resolved": "https://r.cnpmjs.org/dayjs/download/dayjs-1.10.7.tgz", + "integrity": "sha1-LPX5Gt0oEWdIRAhmoKHSbzps5Gg=" + }, "de-indent": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz", diff --git a/package.json b/package.json index 44a2a48..7ffbaf7 100644 --- a/package.json +++ b/package.json @@ -17,6 +17,7 @@ "axios": "0.17.1", "babel-plugin-component": "0.10.1", "babel-polyfill": "6.26.0", + "dayjs": "^1.10.7", "decimal.js": "^10.3.1", "element-ui": "2.8.2", "file-saver": "^2.0.5", @@ -37,8 +38,7 @@ "vue-json-excel": "^0.3.0", "vue-router": "3.0.1", "vuex": "3.0.1", - "xlsx": "^0.17.0", - "dayjs": "1.10.7" + "xlsx": "^0.17.0" }, "devDependencies": { "autoprefixer": "7.1.2", diff --git a/src/api/base/site.js b/src/api/base/site.js index b4a67cc..6d66698 100644 --- a/src/api/base/site.js +++ b/src/api/base/site.js @@ -83,3 +83,13 @@ export const deleteWorkCenterData = data => createAPI(`/base/deleteWorkCenterDat //校验客户编号是否存在 export const checkCustomerID = data => createAPI(`/base/checkCustomerID`,'post',data) + +//------------会计单位信息---------------- +// 获取停机原因 +export const getCompanyInformation = data => createAPI(`/base/getCompanyInformation`,'post',data) + +// 保存修改停机原因 +export const saveCompanyInformation = data => createAPI(`/base/saveCompanyInformation`,'post',data) + +// 删除停机原因 +export const deleteCompanyInformation = data => createAPI(`/base/deleteCompanyInformation`,'post',data) diff --git a/src/assets/scss/global.scss b/src/assets/scss/global.scss index 088c065..9951f87 100644 --- a/src/assets/scss/global.scss +++ b/src/assets/scss/global.scss @@ -202,6 +202,7 @@ .el-form-item__label { font-size: 12px; } + /* checkbox__label */ .el-checkbox__label { font-size: 12px; diff --git a/src/router/index.js b/src/router/index.js index 9bb5af1..daecaf0 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -40,7 +40,7 @@ const mainRoutes = { // { path: '/demo-ueditor', component: _import('demo/ueditor'), name: 'demo-ueditor', meta: { title: 'demo-ueditor', isTab: true } } ], beforeEnter (to, from, next) { - let token = Vue.cookie.get('token') + let token =Vue.cookie.get('token') if (!token || !/\S/.test(token)) { clearLoginInfo() next({ name: 'login' }) diff --git a/src/utils/httpRequest.js b/src/utils/httpRequest.js index f1557cd..a1a5d90 100644 --- a/src/utils/httpRequest.js +++ b/src/utils/httpRequest.js @@ -19,7 +19,7 @@ const http = axios.create({ * 请求拦截 */ http.interceptors.request.use(config => { - config.headers['token'] = Vue.cookie.get('token') // 请求头带上token + config.headers['token'] =Vue.cookie.get('token') // 请求头带上token return config }, error => { return Promise.reject(error) @@ -92,7 +92,7 @@ const instance = axios.create({ * 请求拦截 */ instance.interceptors.request.use(config => { - config.headers['token'] = Vue.cookie.get('token') // 请求头带上token + config.headers['token'] =Vue.cookie.get('token') // 请求头带上token return config }, error => { return Promise.reject(error) diff --git a/src/views/common/home.vue b/src/views/common/home.vue index 73451d6..5411a02 100644 --- a/src/views/common/home.vue +++ b/src/views/common/home.vue @@ -13,7 +13,7 @@ languageRefresh(){ let bool = localStorage.getItem('refresh') if (bool == '0'){ - this.$router.go(0); + // this.$router.go(0); localStorage.setItem('refresh','1') } } diff --git a/src/views/modules/base/companyInformation.vue b/src/views/modules/base/companyInformation.vue new file mode 100644 index 0000000..db0eaca --- /dev/null +++ b/src/views/modules/base/companyInformation.vue @@ -0,0 +1,380 @@ + + + + + diff --git a/src/views/modules/base/factoryInformation.vue b/src/views/modules/base/factoryInformation.vue index eff1e8e..647db73 100644 --- a/src/views/modules/base/factoryInformation.vue +++ b/src/views/modules/base/factoryInformation.vue @@ -158,6 +158,42 @@ search:'查询', }, columnList: [ + { + userId: this.$store.state.user.name, + functionId: 6001, + serialNumber: '6001TableSiteID', + tableId: "6001Table", + tableName: "工厂信息表", + columnProp: "siteID", + headerAlign: "center", + align: "left", + columnLabel: "工厂编码", + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: false, + columnWidth: 60 + }, + { + userId: this.$store.state.user.name, + functionId: 6001, + serialNumber: '6001TableSiteName', + tableId: "6001Table", + tableName: "工厂信息表", + columnProp: "siteName", + headerAlign: "center", + align: "left", + columnLabel: "工厂名称", + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: false, + columnWidth: 120 + }, { userId: this.$store.state.user.name, functionId: 6001, @@ -374,42 +410,6 @@ fixed: false, columnWidth: 50 }, - { - userId: this.$store.state.user.name, - functionId: 6001, - serialNumber: '6001TableSiteName', - tableId: "6001Table", - tableName: "工厂信息表", - columnProp: "siteName", - headerAlign: "center", - align: "left", - columnLabel: "工厂名称", - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: false, - columnWidth: 120 - }, - { - userId: this.$store.state.user.name, - functionId: 6001, - serialNumber: '6001TableSiteID', - tableId: "6001Table", - tableName: "工厂信息表", - columnProp: "siteID", - headerAlign: "center", - align: "left", - columnLabel: "工厂编码", - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: false, - columnWidth: 60 - }, { userId: this.$store.state.user.name, functionId: 6001, diff --git a/src/views/modules/purchaseorder/purchaseRequisition.vue b/src/views/modules/purchaseorder/purchaseRequisition.vue index 707c462..5b66827 100644 --- a/src/views/modules/purchaseorder/purchaseRequisition.vue +++ b/src/views/modules/purchaseorder/purchaseRequisition.vue @@ -212,7 +212,8 @@ v-model="currentPRDetailData.qty"> - + { - if(data.code == 0){ + getFileList(jsonData).then(({data}) => { + if (data.code == 0) { this.fileList = data.row } }) }, // 文件下载 fileDownload(row) { - this.$http({ - url: this.$http.adornUrl('ftp/file/downFtpFile'), - method: 'post', - data: JSON.stringify(row), + axios.get('/api/ftp/file/downFtpFile/' + row.id, { responseType: 'blob', headers: { - 'Content-Type': 'application/json' + 'Content-Type': 'application/json', + 'token':Vue.cookie.get('token') } }).then(({data}) => { // 不限制文件下载类型 @@ -1033,7 +1034,7 @@ export default { const linkNode = document.createElement('a') linkNode.download = fileName // a标签的download属性规定下载文件的名称 linkNode.style.display = 'none' - linkNode.href = URL.createObjectURL(blob) // 生成一个Blob URL + linkNode.href = window.URL.createObjectURL(blob) // 生成一个Blob URL document.body.appendChild(linkNode) linkNode.click() // 模拟在按钮上的一次鼠标单击 URL.revokeObjectURL(linkNode.href) // 释放URL 对象 @@ -1042,8 +1043,8 @@ export default { }, childByValue(childValue) { // childValue就是子组件传过来的值 - this.fileList.push( childValue ) - this.insertFileList.push( childValue ) + this.fileList.push(childValue) + this.insertFileList.push(childValue) }, updateAuthorizeFlag(row) { let saveData = { diff --git a/src/views/modules/purchasingManagement/beginMaterialSlittedSet.vue b/src/views/modules/purchasingManagement/beginMaterialSlittedSet.vue index 0a7edaa..9decd3e 100644 --- a/src/views/modules/purchasingManagement/beginMaterialSlittedSet.vue +++ b/src/views/modules/purchasingManagement/beginMaterialSlittedSet.vue @@ -825,10 +825,10 @@ getPartNoDetail(inData).then(({data}) => { if (data.total > 0) { this.dataForm.partDescription=data.rows[0].partDescription; - this.dataForm = JSON.parse(JSON.stringify(this.dataForm)); + //this.dataForm = JSON.parse(JSON.stringify(this.dataForm)); } else { this.dataForm.partNo = ''; - this.dataForm = JSON.parse(JSON.stringify(this.dataForm)); + // this.dataForm = JSON.parse(JSON.stringify(this.dataForm)); this.$alert('该物料编码不存在', '错误', { confirmButtonText: '确定' }) @@ -859,8 +859,8 @@ getSupplierDetail(inData).then(({data}) => { let outList = data.rows if (outList.length>0){ - // this.modelData.supplierName=outList[0].supplierName; - this.$set(this.dataForm,'supplierName',outList[0].supplierName) + this.dataForm.supplierName=outList[0].supplierName; + // this.$set(this.dataForm,'supplierName',outList[0].supplierName) }else { this.dataForm.supplierName=''; this.dataForm.supplierID=''; diff --git a/src/views/modules/shopOrder/shopOrder/searchShopOrder.vue b/src/views/modules/shopOrder/shopOrder/searchShopOrder.vue index dbae5d2..9394c57 100644 --- a/src/views/modules/shopOrder/shopOrder/searchShopOrder.vue +++ b/src/views/modules/shopOrder/shopOrder/searchShopOrder.vue @@ -1,5 +1,6 @@