diff --git a/src/api/model/setup.js b/src/api/model/setup.js index 7be9989..810dcf7 100644 --- a/src/api/model/setup.js +++ b/src/api/model/setup.js @@ -235,6 +235,29 @@ export default { }, } }, + spare:{ + list:{ + url: `${config.API_URL}/spare.parts.failure.rate.list`, + name: "备件故障率列表", + get: async function (data) { + return await http.post(this.url, data); + }, + }, + add:{ + url: `${config.API_URL}/spare.parts.failure.rate.add`, + name: "备件故障率新增", + post: async function (data) { + return await http.post(this.url, data); + }, + }, + delete:{ + url: `${config.API_URL}/spare.parts.failure.rate.delete`, + name: "备件故障率删除", + post: async function (data) { + return await http.post(this.url, data); + }, + }, + }, bom:{ list:{ url: `${config.API_URL}/bom.list`, diff --git a/src/assets/icons/SpareParts.vue b/src/assets/icons/SpareParts.vue new file mode 100644 index 0000000..8041a26 --- /dev/null +++ b/src/assets/icons/SpareParts.vue @@ -0,0 +1,13 @@ + + + + + + + diff --git a/src/assets/icons/index.js b/src/assets/icons/index.js index aed9b86..e020f0b 100644 --- a/src/assets/icons/index.js +++ b/src/assets/icons/index.js @@ -47,6 +47,7 @@ export { default as SmallBell } from './SmallBell.vue' export { default as Right } from './Right.vue' export { default as Customer } from './Customer.vue' export { default as Region } from './Region.vue' +export { default as SpareParts } from './SpareParts.vue' export { default as File7z } from './file/7z.vue' export { default as FileBmp } from './file/Bmp.vue' diff --git a/src/components/scExport/index.vue b/src/components/scExport/index.vue index 1aebc30..58f782c 100644 --- a/src/components/scExport/index.vue +++ b/src/components/scExport/index.vue @@ -31,12 +31,7 @@ export default { type:{type: String, default: ""} }, watch:{ - // show:{ - // handler(){ - // }, - // immediate:true, - // deep:true - // } + }, data(){ return{ @@ -92,12 +87,18 @@ export default { this.list[9] = item; break; } + + if(res.data && res.data.status == 1100){ + this.$message.warning(res.data.msg); + } + this.$emit('updateShow', item); if(res.data.status==1){ this.down(res.data); } } + }, down(item){ const link = document.createElement('a'); diff --git a/src/style/fix.scss b/src/style/fix.scss index 4159620..469e387 100644 --- a/src/style/fix.scss +++ b/src/style/fix.scss @@ -115,13 +115,14 @@ .el-main.nopadding .scTable .scTable-total .totalView .total-item .text{margin-right: 4px;} /** 列表上面的检索 */ -.el-main.nopadding .searchMain{display: flex;flex-wrap: wrap;align-items: self-end;padding-bottom: 10px;margin: 15px 0 0 0; border-bottom: 1px solid var(--el-border-color-light);} +.el-main.nopadding .searchMain{position: relative;display: flex;flex-wrap: wrap;align-items: self-end;padding-bottom: 10px;margin: 15px 0 0 0; border-bottom: 1px solid var(--el-border-color-light);} .el-main.nopadding .searchMainNoTop{margin-top: 0;} .el-main.nopadding .searchMain .searchItem{display: flex;flex-direction: column;align-items: flex-start;margin-right: 20px;margin-bottom: 10px;} .el-main.nopadding .searchMain .searchItem .name{white-space: nowrap;overflow: hidden;text-overflow: ellipsis;color: #303133;padding-bottom: 5px;text-align: right;} .el-main.nopadding .searchMain .searchItem .input{width: 230px;height: 28px;} .el-main.nopadding .searchMain .searchItem .el-select--small .el-select__wrapper{height: 100%;} .el-main.nopadding .searchMain .searchItem.searchBtn{display: flex;flex-direction: row;} +.el-main.nopadding .searchMain .exportBtn{position: absolute;bottom: 20px;right: 0;} .el-drawer__body {overflow: auto;padding:0;} .el-popconfirm__main {margin: 14px 0;} diff --git a/src/views/cost/shipmentStatistics/index.vue b/src/views/cost/shipmentStatistics/index.vue index f64d1f8..975498f 100644 --- a/src/views/cost/shipmentStatistics/index.vue +++ b/src/views/cost/shipmentStatistics/index.vue @@ -21,6 +21,8 @@