diff --git a/src/api/supplier/supplier.js b/src/api/supplier/supplier.js index 593b7cd..b095e09 100644 --- a/src/api/supplier/supplier.js +++ b/src/api/supplier/supplier.js @@ -14,8 +14,8 @@ return instance.post(`/supplierPreReview/listPage?${str}`, data) } // 历史预审不分页列表 -const historyInquiry = () => { - return instance.post(`/supplierPreReview/history`, {}) +const historyInquiry = (data) => { + return instance.post(`/supplierPreReview/history`, data) } // 新增 diff --git a/src/api/supplier/supplier.js b/src/api/supplier/supplier.js index 593b7cd..b095e09 100644 --- a/src/api/supplier/supplier.js +++ b/src/api/supplier/supplier.js @@ -14,8 +14,8 @@ return instance.post(`/supplierPreReview/listPage?${str}`, data) } // 历史预审不分页列表 -const historyInquiry = () => { - return instance.post(`/supplierPreReview/history`, {}) +const historyInquiry = (data) => { + return instance.post(`/supplierPreReview/history`, data) } // 新增 diff --git "a/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" "b/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" new file mode 100644 index 0000000..34ce236 --- /dev/null +++ "b/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" Binary files differ diff --git a/src/api/supplier/supplier.js b/src/api/supplier/supplier.js index 593b7cd..b095e09 100644 --- a/src/api/supplier/supplier.js +++ b/src/api/supplier/supplier.js @@ -14,8 +14,8 @@ return instance.post(`/supplierPreReview/listPage?${str}`, data) } // 历史预审不分页列表 -const historyInquiry = () => { - return instance.post(`/supplierPreReview/history`, {}) +const historyInquiry = (data) => { + return instance.post(`/supplierPreReview/history`, data) } // 新增 diff --git "a/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" "b/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" new file mode 100644 index 0000000..34ce236 --- /dev/null +++ "b/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" Binary files differ diff --git "a/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" "b/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" new file mode 100644 index 0000000..dd0c295 --- /dev/null +++ "b/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" Binary files differ diff --git a/src/api/supplier/supplier.js b/src/api/supplier/supplier.js index 593b7cd..b095e09 100644 --- a/src/api/supplier/supplier.js +++ b/src/api/supplier/supplier.js @@ -14,8 +14,8 @@ return instance.post(`/supplierPreReview/listPage?${str}`, data) } // 历史预审不分页列表 -const historyInquiry = () => { - return instance.post(`/supplierPreReview/history`, {}) +const historyInquiry = (data) => { + return instance.post(`/supplierPreReview/history`, data) } // 新增 diff --git "a/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" "b/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" new file mode 100644 index 0000000..34ce236 --- /dev/null +++ "b/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" Binary files differ diff --git "a/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" "b/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" new file mode 100644 index 0000000..dd0c295 --- /dev/null +++ "b/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" Binary files differ diff --git a/src/components/echart/barChart/verticalBarChart.vue b/src/components/echart/barChart/verticalBarChart.vue index 460d923..04a0090 100644 --- a/src/components/echart/barChart/verticalBarChart.vue +++ b/src/components/echart/barChart/verticalBarChart.vue @@ -2,21 +2,7 @@ - - diff --git a/src/api/supplier/supplier.js b/src/api/supplier/supplier.js index 593b7cd..b095e09 100644 --- a/src/api/supplier/supplier.js +++ b/src/api/supplier/supplier.js @@ -14,8 +14,8 @@ return instance.post(`/supplierPreReview/listPage?${str}`, data) } // 历史预审不分页列表 -const historyInquiry = () => { - return instance.post(`/supplierPreReview/history`, {}) +const historyInquiry = (data) => { + return instance.post(`/supplierPreReview/history`, data) } // 新增 diff --git "a/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" "b/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" new file mode 100644 index 0000000..34ce236 --- /dev/null +++ "b/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" Binary files differ diff --git "a/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" "b/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" new file mode 100644 index 0000000..dd0c295 --- /dev/null +++ "b/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" Binary files differ diff --git a/src/components/echart/barChart/verticalBarChart.vue b/src/components/echart/barChart/verticalBarChart.vue index 460d923..04a0090 100644 --- a/src/components/echart/barChart/verticalBarChart.vue +++ b/src/components/echart/barChart/verticalBarChart.vue @@ -2,21 +2,7 @@ - - diff --git a/src/components/mycomponent/dialog/inquiryDialog.vue b/src/components/mycomponent/dialog/inquiryDialog.vue deleted file mode 100644 index a8834ef..0000000 --- a/src/components/mycomponent/dialog/inquiryDialog.vue +++ /dev/null @@ -1,228 +0,0 @@ - - - - - - diff --git a/src/api/supplier/supplier.js b/src/api/supplier/supplier.js index 593b7cd..b095e09 100644 --- a/src/api/supplier/supplier.js +++ b/src/api/supplier/supplier.js @@ -14,8 +14,8 @@ return instance.post(`/supplierPreReview/listPage?${str}`, data) } // 历史预审不分页列表 -const historyInquiry = () => { - return instance.post(`/supplierPreReview/history`, {}) +const historyInquiry = (data) => { + return instance.post(`/supplierPreReview/history`, data) } // 新增 diff --git "a/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" "b/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" new file mode 100644 index 0000000..34ce236 --- /dev/null +++ "b/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" Binary files differ diff --git "a/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" "b/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" new file mode 100644 index 0000000..dd0c295 --- /dev/null +++ "b/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" Binary files differ diff --git a/src/components/echart/barChart/verticalBarChart.vue b/src/components/echart/barChart/verticalBarChart.vue index 460d923..04a0090 100644 --- a/src/components/echart/barChart/verticalBarChart.vue +++ b/src/components/echart/barChart/verticalBarChart.vue @@ -2,21 +2,7 @@ - - diff --git a/src/components/mycomponent/dialog/inquiryDialog.vue b/src/components/mycomponent/dialog/inquiryDialog.vue deleted file mode 100644 index a8834ef..0000000 --- a/src/components/mycomponent/dialog/inquiryDialog.vue +++ /dev/null @@ -1,228 +0,0 @@ - - - - - - diff --git a/src/components/mycomponent/dialog/server/operationAddDialog.vue b/src/components/mycomponent/dialog/server/operationAddDialog.vue index dfefe42..d436541 100644 --- a/src/components/mycomponent/dialog/server/operationAddDialog.vue +++ b/src/components/mycomponent/dialog/server/operationAddDialog.vue @@ -11,13 +11,14 @@ width="300px" class="inputWidth" style="justify-content: space-between;" + v-model="form.date" />
- +
- +
- +
@@ -100,16 +102,37 @@ RedStar, InputVue }, + data(){ + return{ + form:{ + date:'', // 服务运营编号 + name:'', // 服务名称 + address:'', // 收费 + address1:'', // 优惠 + address2:'', // 日期 + mark:'', // 备注 + } + } + }, props: { isShowInfo: { type: Boolean, default: true - } + }, }, methods: { close() { this.$emit('close') - } + }, + init(detail){ + if(detail.name){ + this.form.address = detail.address + this.form.address1 = detail.address1 + this.form.address2 = detail.address2 + this.form.date = detail.date + this.form.name = detail.name + } + }, } } diff --git a/src/api/supplier/supplier.js b/src/api/supplier/supplier.js index 593b7cd..b095e09 100644 --- a/src/api/supplier/supplier.js +++ b/src/api/supplier/supplier.js @@ -14,8 +14,8 @@ return instance.post(`/supplierPreReview/listPage?${str}`, data) } // 历史预审不分页列表 -const historyInquiry = () => { - return instance.post(`/supplierPreReview/history`, {}) +const historyInquiry = (data) => { + return instance.post(`/supplierPreReview/history`, data) } // 新增 diff --git "a/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" "b/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" new file mode 100644 index 0000000..34ce236 --- /dev/null +++ "b/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" Binary files differ diff --git "a/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" "b/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" new file mode 100644 index 0000000..dd0c295 --- /dev/null +++ "b/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" Binary files differ diff --git a/src/components/echart/barChart/verticalBarChart.vue b/src/components/echart/barChart/verticalBarChart.vue index 460d923..04a0090 100644 --- a/src/components/echart/barChart/verticalBarChart.vue +++ b/src/components/echart/barChart/verticalBarChart.vue @@ -2,21 +2,7 @@ - - diff --git a/src/components/mycomponent/dialog/inquiryDialog.vue b/src/components/mycomponent/dialog/inquiryDialog.vue deleted file mode 100644 index a8834ef..0000000 --- a/src/components/mycomponent/dialog/inquiryDialog.vue +++ /dev/null @@ -1,228 +0,0 @@ - - - - - - diff --git a/src/components/mycomponent/dialog/server/operationAddDialog.vue b/src/components/mycomponent/dialog/server/operationAddDialog.vue index dfefe42..d436541 100644 --- a/src/components/mycomponent/dialog/server/operationAddDialog.vue +++ b/src/components/mycomponent/dialog/server/operationAddDialog.vue @@ -11,13 +11,14 @@ width="300px" class="inputWidth" style="justify-content: space-between;" + v-model="form.date" />
- +
- +
- +
@@ -100,16 +102,37 @@ RedStar, InputVue }, + data(){ + return{ + form:{ + date:'', // 服务运营编号 + name:'', // 服务名称 + address:'', // 收费 + address1:'', // 优惠 + address2:'', // 日期 + mark:'', // 备注 + } + } + }, props: { isShowInfo: { type: Boolean, default: true - } + }, }, methods: { close() { this.$emit('close') - } + }, + init(detail){ + if(detail.name){ + this.form.address = detail.address + this.form.address1 = detail.address1 + this.form.address2 = detail.address2 + this.form.date = detail.date + this.form.name = detail.name + } + }, } } diff --git a/src/icons/svg/cockpit-approved.svg b/src/icons/svg/cockpit-approved.svg new file mode 100644 index 0000000..634d7a8 --- /dev/null +++ b/src/icons/svg/cockpit-approved.svg @@ -0,0 +1,18 @@ + + + + diff --git a/src/api/supplier/supplier.js b/src/api/supplier/supplier.js index 593b7cd..b095e09 100644 --- a/src/api/supplier/supplier.js +++ b/src/api/supplier/supplier.js @@ -14,8 +14,8 @@ return instance.post(`/supplierPreReview/listPage?${str}`, data) } // 历史预审不分页列表 -const historyInquiry = () => { - return instance.post(`/supplierPreReview/history`, {}) +const historyInquiry = (data) => { + return instance.post(`/supplierPreReview/history`, data) } // 新增 diff --git "a/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" "b/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" new file mode 100644 index 0000000..34ce236 --- /dev/null +++ "b/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" Binary files differ diff --git "a/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" "b/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" new file mode 100644 index 0000000..dd0c295 --- /dev/null +++ "b/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" Binary files differ diff --git a/src/components/echart/barChart/verticalBarChart.vue b/src/components/echart/barChart/verticalBarChart.vue index 460d923..04a0090 100644 --- a/src/components/echart/barChart/verticalBarChart.vue +++ b/src/components/echart/barChart/verticalBarChart.vue @@ -2,21 +2,7 @@ - - diff --git a/src/components/mycomponent/dialog/inquiryDialog.vue b/src/components/mycomponent/dialog/inquiryDialog.vue deleted file mode 100644 index a8834ef..0000000 --- a/src/components/mycomponent/dialog/inquiryDialog.vue +++ /dev/null @@ -1,228 +0,0 @@ - - - - - - diff --git a/src/components/mycomponent/dialog/server/operationAddDialog.vue b/src/components/mycomponent/dialog/server/operationAddDialog.vue index dfefe42..d436541 100644 --- a/src/components/mycomponent/dialog/server/operationAddDialog.vue +++ b/src/components/mycomponent/dialog/server/operationAddDialog.vue @@ -11,13 +11,14 @@ width="300px" class="inputWidth" style="justify-content: space-between;" + v-model="form.date" />
- +
- +
- +
@@ -100,16 +102,37 @@ RedStar, InputVue }, + data(){ + return{ + form:{ + date:'', // 服务运营编号 + name:'', // 服务名称 + address:'', // 收费 + address1:'', // 优惠 + address2:'', // 日期 + mark:'', // 备注 + } + } + }, props: { isShowInfo: { type: Boolean, default: true - } + }, }, methods: { close() { this.$emit('close') - } + }, + init(detail){ + if(detail.name){ + this.form.address = detail.address + this.form.address1 = detail.address1 + this.form.address2 = detail.address2 + this.form.date = detail.date + this.form.name = detail.name + } + }, } } diff --git a/src/icons/svg/cockpit-approved.svg b/src/icons/svg/cockpit-approved.svg new file mode 100644 index 0000000..634d7a8 --- /dev/null +++ b/src/icons/svg/cockpit-approved.svg @@ -0,0 +1,18 @@ + + + + diff --git a/src/icons/svg/cockpit-device-pan-check.svg b/src/icons/svg/cockpit-device-pan-check.svg new file mode 100644 index 0000000..5ad7f6b --- /dev/null +++ b/src/icons/svg/cockpit-device-pan-check.svg @@ -0,0 +1,13 @@ + + diff --git a/src/api/supplier/supplier.js b/src/api/supplier/supplier.js index 593b7cd..b095e09 100644 --- a/src/api/supplier/supplier.js +++ b/src/api/supplier/supplier.js @@ -14,8 +14,8 @@ return instance.post(`/supplierPreReview/listPage?${str}`, data) } // 历史预审不分页列表 -const historyInquiry = () => { - return instance.post(`/supplierPreReview/history`, {}) +const historyInquiry = (data) => { + return instance.post(`/supplierPreReview/history`, data) } // 新增 diff --git "a/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" "b/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" new file mode 100644 index 0000000..34ce236 --- /dev/null +++ "b/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" Binary files differ diff --git "a/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" "b/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" new file mode 100644 index 0000000..dd0c295 --- /dev/null +++ "b/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" Binary files differ diff --git a/src/components/echart/barChart/verticalBarChart.vue b/src/components/echart/barChart/verticalBarChart.vue index 460d923..04a0090 100644 --- a/src/components/echart/barChart/verticalBarChart.vue +++ b/src/components/echart/barChart/verticalBarChart.vue @@ -2,21 +2,7 @@ - - diff --git a/src/components/mycomponent/dialog/inquiryDialog.vue b/src/components/mycomponent/dialog/inquiryDialog.vue deleted file mode 100644 index a8834ef..0000000 --- a/src/components/mycomponent/dialog/inquiryDialog.vue +++ /dev/null @@ -1,228 +0,0 @@ - - - - - - diff --git a/src/components/mycomponent/dialog/server/operationAddDialog.vue b/src/components/mycomponent/dialog/server/operationAddDialog.vue index dfefe42..d436541 100644 --- a/src/components/mycomponent/dialog/server/operationAddDialog.vue +++ b/src/components/mycomponent/dialog/server/operationAddDialog.vue @@ -11,13 +11,14 @@ width="300px" class="inputWidth" style="justify-content: space-between;" + v-model="form.date" />
- +
- +
- +
@@ -100,16 +102,37 @@ RedStar, InputVue }, + data(){ + return{ + form:{ + date:'', // 服务运营编号 + name:'', // 服务名称 + address:'', // 收费 + address1:'', // 优惠 + address2:'', // 日期 + mark:'', // 备注 + } + } + }, props: { isShowInfo: { type: Boolean, default: true - } + }, }, methods: { close() { this.$emit('close') - } + }, + init(detail){ + if(detail.name){ + this.form.address = detail.address + this.form.address1 = detail.address1 + this.form.address2 = detail.address2 + this.form.date = detail.date + this.form.name = detail.name + } + }, } } diff --git a/src/icons/svg/cockpit-approved.svg b/src/icons/svg/cockpit-approved.svg new file mode 100644 index 0000000..634d7a8 --- /dev/null +++ b/src/icons/svg/cockpit-approved.svg @@ -0,0 +1,18 @@ + + + + diff --git a/src/icons/svg/cockpit-device-pan-check.svg b/src/icons/svg/cockpit-device-pan-check.svg new file mode 100644 index 0000000..5ad7f6b --- /dev/null +++ b/src/icons/svg/cockpit-device-pan-check.svg @@ -0,0 +1,13 @@ + + diff --git a/src/icons/svg/cockpit-device-pan-no.svg b/src/icons/svg/cockpit-device-pan-no.svg new file mode 100644 index 0000000..6713e2a --- /dev/null +++ b/src/icons/svg/cockpit-device-pan-no.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/api/supplier/supplier.js b/src/api/supplier/supplier.js index 593b7cd..b095e09 100644 --- a/src/api/supplier/supplier.js +++ b/src/api/supplier/supplier.js @@ -14,8 +14,8 @@ return instance.post(`/supplierPreReview/listPage?${str}`, data) } // 历史预审不分页列表 -const historyInquiry = () => { - return instance.post(`/supplierPreReview/history`, {}) +const historyInquiry = (data) => { + return instance.post(`/supplierPreReview/history`, data) } // 新增 diff --git "a/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" "b/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" new file mode 100644 index 0000000..34ce236 --- /dev/null +++ "b/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" Binary files differ diff --git "a/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" "b/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" new file mode 100644 index 0000000..dd0c295 --- /dev/null +++ "b/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" Binary files differ diff --git a/src/components/echart/barChart/verticalBarChart.vue b/src/components/echart/barChart/verticalBarChart.vue index 460d923..04a0090 100644 --- a/src/components/echart/barChart/verticalBarChart.vue +++ b/src/components/echart/barChart/verticalBarChart.vue @@ -2,21 +2,7 @@ - - diff --git a/src/components/mycomponent/dialog/inquiryDialog.vue b/src/components/mycomponent/dialog/inquiryDialog.vue deleted file mode 100644 index a8834ef..0000000 --- a/src/components/mycomponent/dialog/inquiryDialog.vue +++ /dev/null @@ -1,228 +0,0 @@ - - - - - - diff --git a/src/components/mycomponent/dialog/server/operationAddDialog.vue b/src/components/mycomponent/dialog/server/operationAddDialog.vue index dfefe42..d436541 100644 --- a/src/components/mycomponent/dialog/server/operationAddDialog.vue +++ b/src/components/mycomponent/dialog/server/operationAddDialog.vue @@ -11,13 +11,14 @@ width="300px" class="inputWidth" style="justify-content: space-between;" + v-model="form.date" />
- +
- +
- +
@@ -100,16 +102,37 @@ RedStar, InputVue }, + data(){ + return{ + form:{ + date:'', // 服务运营编号 + name:'', // 服务名称 + address:'', // 收费 + address1:'', // 优惠 + address2:'', // 日期 + mark:'', // 备注 + } + } + }, props: { isShowInfo: { type: Boolean, default: true - } + }, }, methods: { close() { this.$emit('close') - } + }, + init(detail){ + if(detail.name){ + this.form.address = detail.address + this.form.address1 = detail.address1 + this.form.address2 = detail.address2 + this.form.date = detail.date + this.form.name = detail.name + } + }, } } diff --git a/src/icons/svg/cockpit-approved.svg b/src/icons/svg/cockpit-approved.svg new file mode 100644 index 0000000..634d7a8 --- /dev/null +++ b/src/icons/svg/cockpit-approved.svg @@ -0,0 +1,18 @@ + + + + diff --git a/src/icons/svg/cockpit-device-pan-check.svg b/src/icons/svg/cockpit-device-pan-check.svg new file mode 100644 index 0000000..5ad7f6b --- /dev/null +++ b/src/icons/svg/cockpit-device-pan-check.svg @@ -0,0 +1,13 @@ + + diff --git a/src/icons/svg/cockpit-device-pan-no.svg b/src/icons/svg/cockpit-device-pan-no.svg new file mode 100644 index 0000000..6713e2a --- /dev/null +++ b/src/icons/svg/cockpit-device-pan-no.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-device-register.svg b/src/icons/svg/cockpit-device-register.svg new file mode 100644 index 0000000..baa2355 --- /dev/null +++ b/src/icons/svg/cockpit-device-register.svg @@ -0,0 +1,65 @@ + + + + diff --git a/src/api/supplier/supplier.js b/src/api/supplier/supplier.js index 593b7cd..b095e09 100644 --- a/src/api/supplier/supplier.js +++ b/src/api/supplier/supplier.js @@ -14,8 +14,8 @@ return instance.post(`/supplierPreReview/listPage?${str}`, data) } // 历史预审不分页列表 -const historyInquiry = () => { - return instance.post(`/supplierPreReview/history`, {}) +const historyInquiry = (data) => { + return instance.post(`/supplierPreReview/history`, data) } // 新增 diff --git "a/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" "b/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" new file mode 100644 index 0000000..34ce236 --- /dev/null +++ "b/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" Binary files differ diff --git "a/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" "b/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" new file mode 100644 index 0000000..dd0c295 --- /dev/null +++ "b/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" Binary files differ diff --git a/src/components/echart/barChart/verticalBarChart.vue b/src/components/echart/barChart/verticalBarChart.vue index 460d923..04a0090 100644 --- a/src/components/echart/barChart/verticalBarChart.vue +++ b/src/components/echart/barChart/verticalBarChart.vue @@ -2,21 +2,7 @@ - - diff --git a/src/components/mycomponent/dialog/inquiryDialog.vue b/src/components/mycomponent/dialog/inquiryDialog.vue deleted file mode 100644 index a8834ef..0000000 --- a/src/components/mycomponent/dialog/inquiryDialog.vue +++ /dev/null @@ -1,228 +0,0 @@ - - - - - - diff --git a/src/components/mycomponent/dialog/server/operationAddDialog.vue b/src/components/mycomponent/dialog/server/operationAddDialog.vue index dfefe42..d436541 100644 --- a/src/components/mycomponent/dialog/server/operationAddDialog.vue +++ b/src/components/mycomponent/dialog/server/operationAddDialog.vue @@ -11,13 +11,14 @@ width="300px" class="inputWidth" style="justify-content: space-between;" + v-model="form.date" />
- +
- +
- +
@@ -100,16 +102,37 @@ RedStar, InputVue }, + data(){ + return{ + form:{ + date:'', // 服务运营编号 + name:'', // 服务名称 + address:'', // 收费 + address1:'', // 优惠 + address2:'', // 日期 + mark:'', // 备注 + } + } + }, props: { isShowInfo: { type: Boolean, default: true - } + }, }, methods: { close() { this.$emit('close') - } + }, + init(detail){ + if(detail.name){ + this.form.address = detail.address + this.form.address1 = detail.address1 + this.form.address2 = detail.address2 + this.form.date = detail.date + this.form.name = detail.name + } + }, } } diff --git a/src/icons/svg/cockpit-approved.svg b/src/icons/svg/cockpit-approved.svg new file mode 100644 index 0000000..634d7a8 --- /dev/null +++ b/src/icons/svg/cockpit-approved.svg @@ -0,0 +1,18 @@ + + + + diff --git a/src/icons/svg/cockpit-device-pan-check.svg b/src/icons/svg/cockpit-device-pan-check.svg new file mode 100644 index 0000000..5ad7f6b --- /dev/null +++ b/src/icons/svg/cockpit-device-pan-check.svg @@ -0,0 +1,13 @@ + + diff --git a/src/icons/svg/cockpit-device-pan-no.svg b/src/icons/svg/cockpit-device-pan-no.svg new file mode 100644 index 0000000..6713e2a --- /dev/null +++ b/src/icons/svg/cockpit-device-pan-no.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-device-register.svg b/src/icons/svg/cockpit-device-register.svg new file mode 100644 index 0000000..baa2355 --- /dev/null +++ b/src/icons/svg/cockpit-device-register.svg @@ -0,0 +1,65 @@ + + + + diff --git a/src/icons/svg/cockpit-device-total.svg b/src/icons/svg/cockpit-device-total.svg new file mode 100644 index 0000000..aa7788c --- /dev/null +++ b/src/icons/svg/cockpit-device-total.svg @@ -0,0 +1,59 @@ + + + + diff --git a/src/api/supplier/supplier.js b/src/api/supplier/supplier.js index 593b7cd..b095e09 100644 --- a/src/api/supplier/supplier.js +++ b/src/api/supplier/supplier.js @@ -14,8 +14,8 @@ return instance.post(`/supplierPreReview/listPage?${str}`, data) } // 历史预审不分页列表 -const historyInquiry = () => { - return instance.post(`/supplierPreReview/history`, {}) +const historyInquiry = (data) => { + return instance.post(`/supplierPreReview/history`, data) } // 新增 diff --git "a/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" "b/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" new file mode 100644 index 0000000..34ce236 --- /dev/null +++ "b/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" Binary files differ diff --git "a/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" "b/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" new file mode 100644 index 0000000..dd0c295 --- /dev/null +++ "b/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" Binary files differ diff --git a/src/components/echart/barChart/verticalBarChart.vue b/src/components/echart/barChart/verticalBarChart.vue index 460d923..04a0090 100644 --- a/src/components/echart/barChart/verticalBarChart.vue +++ b/src/components/echart/barChart/verticalBarChart.vue @@ -2,21 +2,7 @@ - - diff --git a/src/components/mycomponent/dialog/inquiryDialog.vue b/src/components/mycomponent/dialog/inquiryDialog.vue deleted file mode 100644 index a8834ef..0000000 --- a/src/components/mycomponent/dialog/inquiryDialog.vue +++ /dev/null @@ -1,228 +0,0 @@ - - - - - - diff --git a/src/components/mycomponent/dialog/server/operationAddDialog.vue b/src/components/mycomponent/dialog/server/operationAddDialog.vue index dfefe42..d436541 100644 --- a/src/components/mycomponent/dialog/server/operationAddDialog.vue +++ b/src/components/mycomponent/dialog/server/operationAddDialog.vue @@ -11,13 +11,14 @@ width="300px" class="inputWidth" style="justify-content: space-between;" + v-model="form.date" />
- +
- +
- +
@@ -100,16 +102,37 @@ RedStar, InputVue }, + data(){ + return{ + form:{ + date:'', // 服务运营编号 + name:'', // 服务名称 + address:'', // 收费 + address1:'', // 优惠 + address2:'', // 日期 + mark:'', // 备注 + } + } + }, props: { isShowInfo: { type: Boolean, default: true - } + }, }, methods: { close() { this.$emit('close') - } + }, + init(detail){ + if(detail.name){ + this.form.address = detail.address + this.form.address1 = detail.address1 + this.form.address2 = detail.address2 + this.form.date = detail.date + this.form.name = detail.name + } + }, } } diff --git a/src/icons/svg/cockpit-approved.svg b/src/icons/svg/cockpit-approved.svg new file mode 100644 index 0000000..634d7a8 --- /dev/null +++ b/src/icons/svg/cockpit-approved.svg @@ -0,0 +1,18 @@ + + + + diff --git a/src/icons/svg/cockpit-device-pan-check.svg b/src/icons/svg/cockpit-device-pan-check.svg new file mode 100644 index 0000000..5ad7f6b --- /dev/null +++ b/src/icons/svg/cockpit-device-pan-check.svg @@ -0,0 +1,13 @@ + + diff --git a/src/icons/svg/cockpit-device-pan-no.svg b/src/icons/svg/cockpit-device-pan-no.svg new file mode 100644 index 0000000..6713e2a --- /dev/null +++ b/src/icons/svg/cockpit-device-pan-no.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-device-register.svg b/src/icons/svg/cockpit-device-register.svg new file mode 100644 index 0000000..baa2355 --- /dev/null +++ b/src/icons/svg/cockpit-device-register.svg @@ -0,0 +1,65 @@ + + + + diff --git a/src/icons/svg/cockpit-device-total.svg b/src/icons/svg/cockpit-device-total.svg new file mode 100644 index 0000000..aa7788c --- /dev/null +++ b/src/icons/svg/cockpit-device-total.svg @@ -0,0 +1,59 @@ + + + + diff --git a/src/icons/svg/cockpit-distributor-pan-check.svg b/src/icons/svg/cockpit-distributor-pan-check.svg new file mode 100644 index 0000000..f4fa54e --- /dev/null +++ b/src/icons/svg/cockpit-distributor-pan-check.svg @@ -0,0 +1,15 @@ + + + + diff --git a/src/api/supplier/supplier.js b/src/api/supplier/supplier.js index 593b7cd..b095e09 100644 --- a/src/api/supplier/supplier.js +++ b/src/api/supplier/supplier.js @@ -14,8 +14,8 @@ return instance.post(`/supplierPreReview/listPage?${str}`, data) } // 历史预审不分页列表 -const historyInquiry = () => { - return instance.post(`/supplierPreReview/history`, {}) +const historyInquiry = (data) => { + return instance.post(`/supplierPreReview/history`, data) } // 新增 diff --git "a/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" "b/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" new file mode 100644 index 0000000..34ce236 --- /dev/null +++ "b/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" Binary files differ diff --git "a/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" "b/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" new file mode 100644 index 0000000..dd0c295 --- /dev/null +++ "b/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" Binary files differ diff --git a/src/components/echart/barChart/verticalBarChart.vue b/src/components/echart/barChart/verticalBarChart.vue index 460d923..04a0090 100644 --- a/src/components/echart/barChart/verticalBarChart.vue +++ b/src/components/echart/barChart/verticalBarChart.vue @@ -2,21 +2,7 @@ - - diff --git a/src/components/mycomponent/dialog/inquiryDialog.vue b/src/components/mycomponent/dialog/inquiryDialog.vue deleted file mode 100644 index a8834ef..0000000 --- a/src/components/mycomponent/dialog/inquiryDialog.vue +++ /dev/null @@ -1,228 +0,0 @@ - - - - - - diff --git a/src/components/mycomponent/dialog/server/operationAddDialog.vue b/src/components/mycomponent/dialog/server/operationAddDialog.vue index dfefe42..d436541 100644 --- a/src/components/mycomponent/dialog/server/operationAddDialog.vue +++ b/src/components/mycomponent/dialog/server/operationAddDialog.vue @@ -11,13 +11,14 @@ width="300px" class="inputWidth" style="justify-content: space-between;" + v-model="form.date" />
- +
- +
- +
@@ -100,16 +102,37 @@ RedStar, InputVue }, + data(){ + return{ + form:{ + date:'', // 服务运营编号 + name:'', // 服务名称 + address:'', // 收费 + address1:'', // 优惠 + address2:'', // 日期 + mark:'', // 备注 + } + } + }, props: { isShowInfo: { type: Boolean, default: true - } + }, }, methods: { close() { this.$emit('close') - } + }, + init(detail){ + if(detail.name){ + this.form.address = detail.address + this.form.address1 = detail.address1 + this.form.address2 = detail.address2 + this.form.date = detail.date + this.form.name = detail.name + } + }, } } diff --git a/src/icons/svg/cockpit-approved.svg b/src/icons/svg/cockpit-approved.svg new file mode 100644 index 0000000..634d7a8 --- /dev/null +++ b/src/icons/svg/cockpit-approved.svg @@ -0,0 +1,18 @@ + + + + diff --git a/src/icons/svg/cockpit-device-pan-check.svg b/src/icons/svg/cockpit-device-pan-check.svg new file mode 100644 index 0000000..5ad7f6b --- /dev/null +++ b/src/icons/svg/cockpit-device-pan-check.svg @@ -0,0 +1,13 @@ + + diff --git a/src/icons/svg/cockpit-device-pan-no.svg b/src/icons/svg/cockpit-device-pan-no.svg new file mode 100644 index 0000000..6713e2a --- /dev/null +++ b/src/icons/svg/cockpit-device-pan-no.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-device-register.svg b/src/icons/svg/cockpit-device-register.svg new file mode 100644 index 0000000..baa2355 --- /dev/null +++ b/src/icons/svg/cockpit-device-register.svg @@ -0,0 +1,65 @@ + + + + diff --git a/src/icons/svg/cockpit-device-total.svg b/src/icons/svg/cockpit-device-total.svg new file mode 100644 index 0000000..aa7788c --- /dev/null +++ b/src/icons/svg/cockpit-device-total.svg @@ -0,0 +1,59 @@ + + + + diff --git a/src/icons/svg/cockpit-distributor-pan-check.svg b/src/icons/svg/cockpit-distributor-pan-check.svg new file mode 100644 index 0000000..f4fa54e --- /dev/null +++ b/src/icons/svg/cockpit-distributor-pan-check.svg @@ -0,0 +1,15 @@ + + + + diff --git a/src/icons/svg/cockpit-distributor-pan-no.svg b/src/icons/svg/cockpit-distributor-pan-no.svg new file mode 100644 index 0000000..b10bdfe --- /dev/null +++ b/src/icons/svg/cockpit-distributor-pan-no.svg @@ -0,0 +1,15 @@ + + + + diff --git a/src/api/supplier/supplier.js b/src/api/supplier/supplier.js index 593b7cd..b095e09 100644 --- a/src/api/supplier/supplier.js +++ b/src/api/supplier/supplier.js @@ -14,8 +14,8 @@ return instance.post(`/supplierPreReview/listPage?${str}`, data) } // 历史预审不分页列表 -const historyInquiry = () => { - return instance.post(`/supplierPreReview/history`, {}) +const historyInquiry = (data) => { + return instance.post(`/supplierPreReview/history`, data) } // 新增 diff --git "a/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" "b/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" new file mode 100644 index 0000000..34ce236 --- /dev/null +++ "b/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" Binary files differ diff --git "a/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" "b/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" new file mode 100644 index 0000000..dd0c295 --- /dev/null +++ "b/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" Binary files differ diff --git a/src/components/echart/barChart/verticalBarChart.vue b/src/components/echart/barChart/verticalBarChart.vue index 460d923..04a0090 100644 --- a/src/components/echart/barChart/verticalBarChart.vue +++ b/src/components/echart/barChart/verticalBarChart.vue @@ -2,21 +2,7 @@ - - diff --git a/src/components/mycomponent/dialog/inquiryDialog.vue b/src/components/mycomponent/dialog/inquiryDialog.vue deleted file mode 100644 index a8834ef..0000000 --- a/src/components/mycomponent/dialog/inquiryDialog.vue +++ /dev/null @@ -1,228 +0,0 @@ - - - - - - diff --git a/src/components/mycomponent/dialog/server/operationAddDialog.vue b/src/components/mycomponent/dialog/server/operationAddDialog.vue index dfefe42..d436541 100644 --- a/src/components/mycomponent/dialog/server/operationAddDialog.vue +++ b/src/components/mycomponent/dialog/server/operationAddDialog.vue @@ -11,13 +11,14 @@ width="300px" class="inputWidth" style="justify-content: space-between;" + v-model="form.date" />
- +
- +
- +
@@ -100,16 +102,37 @@ RedStar, InputVue }, + data(){ + return{ + form:{ + date:'', // 服务运营编号 + name:'', // 服务名称 + address:'', // 收费 + address1:'', // 优惠 + address2:'', // 日期 + mark:'', // 备注 + } + } + }, props: { isShowInfo: { type: Boolean, default: true - } + }, }, methods: { close() { this.$emit('close') - } + }, + init(detail){ + if(detail.name){ + this.form.address = detail.address + this.form.address1 = detail.address1 + this.form.address2 = detail.address2 + this.form.date = detail.date + this.form.name = detail.name + } + }, } } diff --git a/src/icons/svg/cockpit-approved.svg b/src/icons/svg/cockpit-approved.svg new file mode 100644 index 0000000..634d7a8 --- /dev/null +++ b/src/icons/svg/cockpit-approved.svg @@ -0,0 +1,18 @@ + + + + diff --git a/src/icons/svg/cockpit-device-pan-check.svg b/src/icons/svg/cockpit-device-pan-check.svg new file mode 100644 index 0000000..5ad7f6b --- /dev/null +++ b/src/icons/svg/cockpit-device-pan-check.svg @@ -0,0 +1,13 @@ + + diff --git a/src/icons/svg/cockpit-device-pan-no.svg b/src/icons/svg/cockpit-device-pan-no.svg new file mode 100644 index 0000000..6713e2a --- /dev/null +++ b/src/icons/svg/cockpit-device-pan-no.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-device-register.svg b/src/icons/svg/cockpit-device-register.svg new file mode 100644 index 0000000..baa2355 --- /dev/null +++ b/src/icons/svg/cockpit-device-register.svg @@ -0,0 +1,65 @@ + + + + diff --git a/src/icons/svg/cockpit-device-total.svg b/src/icons/svg/cockpit-device-total.svg new file mode 100644 index 0000000..aa7788c --- /dev/null +++ b/src/icons/svg/cockpit-device-total.svg @@ -0,0 +1,59 @@ + + + + diff --git a/src/icons/svg/cockpit-distributor-pan-check.svg b/src/icons/svg/cockpit-distributor-pan-check.svg new file mode 100644 index 0000000..f4fa54e --- /dev/null +++ b/src/icons/svg/cockpit-distributor-pan-check.svg @@ -0,0 +1,15 @@ + + + + diff --git a/src/icons/svg/cockpit-distributor-pan-no.svg b/src/icons/svg/cockpit-distributor-pan-no.svg new file mode 100644 index 0000000..b10bdfe --- /dev/null +++ b/src/icons/svg/cockpit-distributor-pan-no.svg @@ -0,0 +1,15 @@ + + + + diff --git a/src/icons/svg/cockpit-lot-count.svg b/src/icons/svg/cockpit-lot-count.svg new file mode 100644 index 0000000..b4e743f --- /dev/null +++ b/src/icons/svg/cockpit-lot-count.svg @@ -0,0 +1,92 @@ + + + + diff --git a/src/api/supplier/supplier.js b/src/api/supplier/supplier.js index 593b7cd..b095e09 100644 --- a/src/api/supplier/supplier.js +++ b/src/api/supplier/supplier.js @@ -14,8 +14,8 @@ return instance.post(`/supplierPreReview/listPage?${str}`, data) } // 历史预审不分页列表 -const historyInquiry = () => { - return instance.post(`/supplierPreReview/history`, {}) +const historyInquiry = (data) => { + return instance.post(`/supplierPreReview/history`, data) } // 新增 diff --git "a/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" "b/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" new file mode 100644 index 0000000..34ce236 --- /dev/null +++ "b/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" Binary files differ diff --git "a/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" "b/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" new file mode 100644 index 0000000..dd0c295 --- /dev/null +++ "b/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" Binary files differ diff --git a/src/components/echart/barChart/verticalBarChart.vue b/src/components/echart/barChart/verticalBarChart.vue index 460d923..04a0090 100644 --- a/src/components/echart/barChart/verticalBarChart.vue +++ b/src/components/echart/barChart/verticalBarChart.vue @@ -2,21 +2,7 @@ - - diff --git a/src/components/mycomponent/dialog/inquiryDialog.vue b/src/components/mycomponent/dialog/inquiryDialog.vue deleted file mode 100644 index a8834ef..0000000 --- a/src/components/mycomponent/dialog/inquiryDialog.vue +++ /dev/null @@ -1,228 +0,0 @@ - - - - - - diff --git a/src/components/mycomponent/dialog/server/operationAddDialog.vue b/src/components/mycomponent/dialog/server/operationAddDialog.vue index dfefe42..d436541 100644 --- a/src/components/mycomponent/dialog/server/operationAddDialog.vue +++ b/src/components/mycomponent/dialog/server/operationAddDialog.vue @@ -11,13 +11,14 @@ width="300px" class="inputWidth" style="justify-content: space-between;" + v-model="form.date" />
- +
- +
- +
@@ -100,16 +102,37 @@ RedStar, InputVue }, + data(){ + return{ + form:{ + date:'', // 服务运营编号 + name:'', // 服务名称 + address:'', // 收费 + address1:'', // 优惠 + address2:'', // 日期 + mark:'', // 备注 + } + } + }, props: { isShowInfo: { type: Boolean, default: true - } + }, }, methods: { close() { this.$emit('close') - } + }, + init(detail){ + if(detail.name){ + this.form.address = detail.address + this.form.address1 = detail.address1 + this.form.address2 = detail.address2 + this.form.date = detail.date + this.form.name = detail.name + } + }, } } diff --git a/src/icons/svg/cockpit-approved.svg b/src/icons/svg/cockpit-approved.svg new file mode 100644 index 0000000..634d7a8 --- /dev/null +++ b/src/icons/svg/cockpit-approved.svg @@ -0,0 +1,18 @@ + + + + diff --git a/src/icons/svg/cockpit-device-pan-check.svg b/src/icons/svg/cockpit-device-pan-check.svg new file mode 100644 index 0000000..5ad7f6b --- /dev/null +++ b/src/icons/svg/cockpit-device-pan-check.svg @@ -0,0 +1,13 @@ + + diff --git a/src/icons/svg/cockpit-device-pan-no.svg b/src/icons/svg/cockpit-device-pan-no.svg new file mode 100644 index 0000000..6713e2a --- /dev/null +++ b/src/icons/svg/cockpit-device-pan-no.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-device-register.svg b/src/icons/svg/cockpit-device-register.svg new file mode 100644 index 0000000..baa2355 --- /dev/null +++ b/src/icons/svg/cockpit-device-register.svg @@ -0,0 +1,65 @@ + + + + diff --git a/src/icons/svg/cockpit-device-total.svg b/src/icons/svg/cockpit-device-total.svg new file mode 100644 index 0000000..aa7788c --- /dev/null +++ b/src/icons/svg/cockpit-device-total.svg @@ -0,0 +1,59 @@ + + + + diff --git a/src/icons/svg/cockpit-distributor-pan-check.svg b/src/icons/svg/cockpit-distributor-pan-check.svg new file mode 100644 index 0000000..f4fa54e --- /dev/null +++ b/src/icons/svg/cockpit-distributor-pan-check.svg @@ -0,0 +1,15 @@ + + + + diff --git a/src/icons/svg/cockpit-distributor-pan-no.svg b/src/icons/svg/cockpit-distributor-pan-no.svg new file mode 100644 index 0000000..b10bdfe --- /dev/null +++ b/src/icons/svg/cockpit-distributor-pan-no.svg @@ -0,0 +1,15 @@ + + + + diff --git a/src/icons/svg/cockpit-lot-count.svg b/src/icons/svg/cockpit-lot-count.svg new file mode 100644 index 0000000..b4e743f --- /dev/null +++ b/src/icons/svg/cockpit-lot-count.svg @@ -0,0 +1,92 @@ + + + + diff --git a/src/icons/svg/cockpit-lot-online.svg b/src/icons/svg/cockpit-lot-online.svg new file mode 100644 index 0000000..0da6791 --- /dev/null +++ b/src/icons/svg/cockpit-lot-online.svg @@ -0,0 +1,62 @@ + + + + diff --git a/src/api/supplier/supplier.js b/src/api/supplier/supplier.js index 593b7cd..b095e09 100644 --- a/src/api/supplier/supplier.js +++ b/src/api/supplier/supplier.js @@ -14,8 +14,8 @@ return instance.post(`/supplierPreReview/listPage?${str}`, data) } // 历史预审不分页列表 -const historyInquiry = () => { - return instance.post(`/supplierPreReview/history`, {}) +const historyInquiry = (data) => { + return instance.post(`/supplierPreReview/history`, data) } // 新增 diff --git "a/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" "b/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" new file mode 100644 index 0000000..34ce236 --- /dev/null +++ "b/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" Binary files differ diff --git "a/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" "b/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" new file mode 100644 index 0000000..dd0c295 --- /dev/null +++ "b/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" Binary files differ diff --git a/src/components/echart/barChart/verticalBarChart.vue b/src/components/echart/barChart/verticalBarChart.vue index 460d923..04a0090 100644 --- a/src/components/echart/barChart/verticalBarChart.vue +++ b/src/components/echart/barChart/verticalBarChart.vue @@ -2,21 +2,7 @@ - - diff --git a/src/components/mycomponent/dialog/inquiryDialog.vue b/src/components/mycomponent/dialog/inquiryDialog.vue deleted file mode 100644 index a8834ef..0000000 --- a/src/components/mycomponent/dialog/inquiryDialog.vue +++ /dev/null @@ -1,228 +0,0 @@ - - - - - - diff --git a/src/components/mycomponent/dialog/server/operationAddDialog.vue b/src/components/mycomponent/dialog/server/operationAddDialog.vue index dfefe42..d436541 100644 --- a/src/components/mycomponent/dialog/server/operationAddDialog.vue +++ b/src/components/mycomponent/dialog/server/operationAddDialog.vue @@ -11,13 +11,14 @@ width="300px" class="inputWidth" style="justify-content: space-between;" + v-model="form.date" />
- +
- +
- +
@@ -100,16 +102,37 @@ RedStar, InputVue }, + data(){ + return{ + form:{ + date:'', // 服务运营编号 + name:'', // 服务名称 + address:'', // 收费 + address1:'', // 优惠 + address2:'', // 日期 + mark:'', // 备注 + } + } + }, props: { isShowInfo: { type: Boolean, default: true - } + }, }, methods: { close() { this.$emit('close') - } + }, + init(detail){ + if(detail.name){ + this.form.address = detail.address + this.form.address1 = detail.address1 + this.form.address2 = detail.address2 + this.form.date = detail.date + this.form.name = detail.name + } + }, } } diff --git a/src/icons/svg/cockpit-approved.svg b/src/icons/svg/cockpit-approved.svg new file mode 100644 index 0000000..634d7a8 --- /dev/null +++ b/src/icons/svg/cockpit-approved.svg @@ -0,0 +1,18 @@ + + + + diff --git a/src/icons/svg/cockpit-device-pan-check.svg b/src/icons/svg/cockpit-device-pan-check.svg new file mode 100644 index 0000000..5ad7f6b --- /dev/null +++ b/src/icons/svg/cockpit-device-pan-check.svg @@ -0,0 +1,13 @@ + + diff --git a/src/icons/svg/cockpit-device-pan-no.svg b/src/icons/svg/cockpit-device-pan-no.svg new file mode 100644 index 0000000..6713e2a --- /dev/null +++ b/src/icons/svg/cockpit-device-pan-no.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-device-register.svg b/src/icons/svg/cockpit-device-register.svg new file mode 100644 index 0000000..baa2355 --- /dev/null +++ b/src/icons/svg/cockpit-device-register.svg @@ -0,0 +1,65 @@ + + + + diff --git a/src/icons/svg/cockpit-device-total.svg b/src/icons/svg/cockpit-device-total.svg new file mode 100644 index 0000000..aa7788c --- /dev/null +++ b/src/icons/svg/cockpit-device-total.svg @@ -0,0 +1,59 @@ + + + + diff --git a/src/icons/svg/cockpit-distributor-pan-check.svg b/src/icons/svg/cockpit-distributor-pan-check.svg new file mode 100644 index 0000000..f4fa54e --- /dev/null +++ b/src/icons/svg/cockpit-distributor-pan-check.svg @@ -0,0 +1,15 @@ + + + + diff --git a/src/icons/svg/cockpit-distributor-pan-no.svg b/src/icons/svg/cockpit-distributor-pan-no.svg new file mode 100644 index 0000000..b10bdfe --- /dev/null +++ b/src/icons/svg/cockpit-distributor-pan-no.svg @@ -0,0 +1,15 @@ + + + + diff --git a/src/icons/svg/cockpit-lot-count.svg b/src/icons/svg/cockpit-lot-count.svg new file mode 100644 index 0000000..b4e743f --- /dev/null +++ b/src/icons/svg/cockpit-lot-count.svg @@ -0,0 +1,92 @@ + + + + diff --git a/src/icons/svg/cockpit-lot-online.svg b/src/icons/svg/cockpit-lot-online.svg new file mode 100644 index 0000000..0da6791 --- /dev/null +++ b/src/icons/svg/cockpit-lot-online.svg @@ -0,0 +1,62 @@ + + + + diff --git a/src/icons/svg/cockpit-supplier-pan-check.svg b/src/icons/svg/cockpit-supplier-pan-check.svg new file mode 100644 index 0000000..6d6756f --- /dev/null +++ b/src/icons/svg/cockpit-supplier-pan-check.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/api/supplier/supplier.js b/src/api/supplier/supplier.js index 593b7cd..b095e09 100644 --- a/src/api/supplier/supplier.js +++ b/src/api/supplier/supplier.js @@ -14,8 +14,8 @@ return instance.post(`/supplierPreReview/listPage?${str}`, data) } // 历史预审不分页列表 -const historyInquiry = () => { - return instance.post(`/supplierPreReview/history`, {}) +const historyInquiry = (data) => { + return instance.post(`/supplierPreReview/history`, data) } // 新增 diff --git "a/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" "b/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" new file mode 100644 index 0000000..34ce236 --- /dev/null +++ "b/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" Binary files differ diff --git "a/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" "b/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" new file mode 100644 index 0000000..dd0c295 --- /dev/null +++ "b/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" Binary files differ diff --git a/src/components/echart/barChart/verticalBarChart.vue b/src/components/echart/barChart/verticalBarChart.vue index 460d923..04a0090 100644 --- a/src/components/echart/barChart/verticalBarChart.vue +++ b/src/components/echart/barChart/verticalBarChart.vue @@ -2,21 +2,7 @@ - - diff --git a/src/components/mycomponent/dialog/inquiryDialog.vue b/src/components/mycomponent/dialog/inquiryDialog.vue deleted file mode 100644 index a8834ef..0000000 --- a/src/components/mycomponent/dialog/inquiryDialog.vue +++ /dev/null @@ -1,228 +0,0 @@ - - - - - - diff --git a/src/components/mycomponent/dialog/server/operationAddDialog.vue b/src/components/mycomponent/dialog/server/operationAddDialog.vue index dfefe42..d436541 100644 --- a/src/components/mycomponent/dialog/server/operationAddDialog.vue +++ b/src/components/mycomponent/dialog/server/operationAddDialog.vue @@ -11,13 +11,14 @@ width="300px" class="inputWidth" style="justify-content: space-between;" + v-model="form.date" />
- +
- +
- +
@@ -100,16 +102,37 @@ RedStar, InputVue }, + data(){ + return{ + form:{ + date:'', // 服务运营编号 + name:'', // 服务名称 + address:'', // 收费 + address1:'', // 优惠 + address2:'', // 日期 + mark:'', // 备注 + } + } + }, props: { isShowInfo: { type: Boolean, default: true - } + }, }, methods: { close() { this.$emit('close') - } + }, + init(detail){ + if(detail.name){ + this.form.address = detail.address + this.form.address1 = detail.address1 + this.form.address2 = detail.address2 + this.form.date = detail.date + this.form.name = detail.name + } + }, } } diff --git a/src/icons/svg/cockpit-approved.svg b/src/icons/svg/cockpit-approved.svg new file mode 100644 index 0000000..634d7a8 --- /dev/null +++ b/src/icons/svg/cockpit-approved.svg @@ -0,0 +1,18 @@ + + + + diff --git a/src/icons/svg/cockpit-device-pan-check.svg b/src/icons/svg/cockpit-device-pan-check.svg new file mode 100644 index 0000000..5ad7f6b --- /dev/null +++ b/src/icons/svg/cockpit-device-pan-check.svg @@ -0,0 +1,13 @@ + + diff --git a/src/icons/svg/cockpit-device-pan-no.svg b/src/icons/svg/cockpit-device-pan-no.svg new file mode 100644 index 0000000..6713e2a --- /dev/null +++ b/src/icons/svg/cockpit-device-pan-no.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-device-register.svg b/src/icons/svg/cockpit-device-register.svg new file mode 100644 index 0000000..baa2355 --- /dev/null +++ b/src/icons/svg/cockpit-device-register.svg @@ -0,0 +1,65 @@ + + + + diff --git a/src/icons/svg/cockpit-device-total.svg b/src/icons/svg/cockpit-device-total.svg new file mode 100644 index 0000000..aa7788c --- /dev/null +++ b/src/icons/svg/cockpit-device-total.svg @@ -0,0 +1,59 @@ + + + + diff --git a/src/icons/svg/cockpit-distributor-pan-check.svg b/src/icons/svg/cockpit-distributor-pan-check.svg new file mode 100644 index 0000000..f4fa54e --- /dev/null +++ b/src/icons/svg/cockpit-distributor-pan-check.svg @@ -0,0 +1,15 @@ + + + + diff --git a/src/icons/svg/cockpit-distributor-pan-no.svg b/src/icons/svg/cockpit-distributor-pan-no.svg new file mode 100644 index 0000000..b10bdfe --- /dev/null +++ b/src/icons/svg/cockpit-distributor-pan-no.svg @@ -0,0 +1,15 @@ + + + + diff --git a/src/icons/svg/cockpit-lot-count.svg b/src/icons/svg/cockpit-lot-count.svg new file mode 100644 index 0000000..b4e743f --- /dev/null +++ b/src/icons/svg/cockpit-lot-count.svg @@ -0,0 +1,92 @@ + + + + diff --git a/src/icons/svg/cockpit-lot-online.svg b/src/icons/svg/cockpit-lot-online.svg new file mode 100644 index 0000000..0da6791 --- /dev/null +++ b/src/icons/svg/cockpit-lot-online.svg @@ -0,0 +1,62 @@ + + + + diff --git a/src/icons/svg/cockpit-supplier-pan-check.svg b/src/icons/svg/cockpit-supplier-pan-check.svg new file mode 100644 index 0000000..6d6756f --- /dev/null +++ b/src/icons/svg/cockpit-supplier-pan-check.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-supplier-pan-no.svg b/src/icons/svg/cockpit-supplier-pan-no.svg new file mode 100644 index 0000000..c9c869e --- /dev/null +++ b/src/icons/svg/cockpit-supplier-pan-no.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/api/supplier/supplier.js b/src/api/supplier/supplier.js index 593b7cd..b095e09 100644 --- a/src/api/supplier/supplier.js +++ b/src/api/supplier/supplier.js @@ -14,8 +14,8 @@ return instance.post(`/supplierPreReview/listPage?${str}`, data) } // 历史预审不分页列表 -const historyInquiry = () => { - return instance.post(`/supplierPreReview/history`, {}) +const historyInquiry = (data) => { + return instance.post(`/supplierPreReview/history`, data) } // 新增 diff --git "a/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" "b/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" new file mode 100644 index 0000000..34ce236 --- /dev/null +++ "b/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" Binary files differ diff --git "a/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" "b/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" new file mode 100644 index 0000000..dd0c295 --- /dev/null +++ "b/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" Binary files differ diff --git a/src/components/echart/barChart/verticalBarChart.vue b/src/components/echart/barChart/verticalBarChart.vue index 460d923..04a0090 100644 --- a/src/components/echart/barChart/verticalBarChart.vue +++ b/src/components/echart/barChart/verticalBarChart.vue @@ -2,21 +2,7 @@ - - diff --git a/src/components/mycomponent/dialog/inquiryDialog.vue b/src/components/mycomponent/dialog/inquiryDialog.vue deleted file mode 100644 index a8834ef..0000000 --- a/src/components/mycomponent/dialog/inquiryDialog.vue +++ /dev/null @@ -1,228 +0,0 @@ - - - - - - diff --git a/src/components/mycomponent/dialog/server/operationAddDialog.vue b/src/components/mycomponent/dialog/server/operationAddDialog.vue index dfefe42..d436541 100644 --- a/src/components/mycomponent/dialog/server/operationAddDialog.vue +++ b/src/components/mycomponent/dialog/server/operationAddDialog.vue @@ -11,13 +11,14 @@ width="300px" class="inputWidth" style="justify-content: space-between;" + v-model="form.date" />
- +
- +
- +
@@ -100,16 +102,37 @@ RedStar, InputVue }, + data(){ + return{ + form:{ + date:'', // 服务运营编号 + name:'', // 服务名称 + address:'', // 收费 + address1:'', // 优惠 + address2:'', // 日期 + mark:'', // 备注 + } + } + }, props: { isShowInfo: { type: Boolean, default: true - } + }, }, methods: { close() { this.$emit('close') - } + }, + init(detail){ + if(detail.name){ + this.form.address = detail.address + this.form.address1 = detail.address1 + this.form.address2 = detail.address2 + this.form.date = detail.date + this.form.name = detail.name + } + }, } } diff --git a/src/icons/svg/cockpit-approved.svg b/src/icons/svg/cockpit-approved.svg new file mode 100644 index 0000000..634d7a8 --- /dev/null +++ b/src/icons/svg/cockpit-approved.svg @@ -0,0 +1,18 @@ + + + + diff --git a/src/icons/svg/cockpit-device-pan-check.svg b/src/icons/svg/cockpit-device-pan-check.svg new file mode 100644 index 0000000..5ad7f6b --- /dev/null +++ b/src/icons/svg/cockpit-device-pan-check.svg @@ -0,0 +1,13 @@ + + diff --git a/src/icons/svg/cockpit-device-pan-no.svg b/src/icons/svg/cockpit-device-pan-no.svg new file mode 100644 index 0000000..6713e2a --- /dev/null +++ b/src/icons/svg/cockpit-device-pan-no.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-device-register.svg b/src/icons/svg/cockpit-device-register.svg new file mode 100644 index 0000000..baa2355 --- /dev/null +++ b/src/icons/svg/cockpit-device-register.svg @@ -0,0 +1,65 @@ + + + + diff --git a/src/icons/svg/cockpit-device-total.svg b/src/icons/svg/cockpit-device-total.svg new file mode 100644 index 0000000..aa7788c --- /dev/null +++ b/src/icons/svg/cockpit-device-total.svg @@ -0,0 +1,59 @@ + + + + diff --git a/src/icons/svg/cockpit-distributor-pan-check.svg b/src/icons/svg/cockpit-distributor-pan-check.svg new file mode 100644 index 0000000..f4fa54e --- /dev/null +++ b/src/icons/svg/cockpit-distributor-pan-check.svg @@ -0,0 +1,15 @@ + + + + diff --git a/src/icons/svg/cockpit-distributor-pan-no.svg b/src/icons/svg/cockpit-distributor-pan-no.svg new file mode 100644 index 0000000..b10bdfe --- /dev/null +++ b/src/icons/svg/cockpit-distributor-pan-no.svg @@ -0,0 +1,15 @@ + + + + diff --git a/src/icons/svg/cockpit-lot-count.svg b/src/icons/svg/cockpit-lot-count.svg new file mode 100644 index 0000000..b4e743f --- /dev/null +++ b/src/icons/svg/cockpit-lot-count.svg @@ -0,0 +1,92 @@ + + + + diff --git a/src/icons/svg/cockpit-lot-online.svg b/src/icons/svg/cockpit-lot-online.svg new file mode 100644 index 0000000..0da6791 --- /dev/null +++ b/src/icons/svg/cockpit-lot-online.svg @@ -0,0 +1,62 @@ + + + + diff --git a/src/icons/svg/cockpit-supplier-pan-check.svg b/src/icons/svg/cockpit-supplier-pan-check.svg new file mode 100644 index 0000000..6d6756f --- /dev/null +++ b/src/icons/svg/cockpit-supplier-pan-check.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-supplier-pan-no.svg b/src/icons/svg/cockpit-supplier-pan-no.svg new file mode 100644 index 0000000..c9c869e --- /dev/null +++ b/src/icons/svg/cockpit-supplier-pan-no.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-supplier-register.svg b/src/icons/svg/cockpit-supplier-register.svg new file mode 100644 index 0000000..a6e193c --- /dev/null +++ b/src/icons/svg/cockpit-supplier-register.svg @@ -0,0 +1,17 @@ + + + + diff --git a/src/api/supplier/supplier.js b/src/api/supplier/supplier.js index 593b7cd..b095e09 100644 --- a/src/api/supplier/supplier.js +++ b/src/api/supplier/supplier.js @@ -14,8 +14,8 @@ return instance.post(`/supplierPreReview/listPage?${str}`, data) } // 历史预审不分页列表 -const historyInquiry = () => { - return instance.post(`/supplierPreReview/history`, {}) +const historyInquiry = (data) => { + return instance.post(`/supplierPreReview/history`, data) } // 新增 diff --git "a/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" "b/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" new file mode 100644 index 0000000..34ce236 --- /dev/null +++ "b/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" Binary files differ diff --git "a/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" "b/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" new file mode 100644 index 0000000..dd0c295 --- /dev/null +++ "b/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" Binary files differ diff --git a/src/components/echart/barChart/verticalBarChart.vue b/src/components/echart/barChart/verticalBarChart.vue index 460d923..04a0090 100644 --- a/src/components/echart/barChart/verticalBarChart.vue +++ b/src/components/echart/barChart/verticalBarChart.vue @@ -2,21 +2,7 @@ - - diff --git a/src/components/mycomponent/dialog/inquiryDialog.vue b/src/components/mycomponent/dialog/inquiryDialog.vue deleted file mode 100644 index a8834ef..0000000 --- a/src/components/mycomponent/dialog/inquiryDialog.vue +++ /dev/null @@ -1,228 +0,0 @@ - - - - - - diff --git a/src/components/mycomponent/dialog/server/operationAddDialog.vue b/src/components/mycomponent/dialog/server/operationAddDialog.vue index dfefe42..d436541 100644 --- a/src/components/mycomponent/dialog/server/operationAddDialog.vue +++ b/src/components/mycomponent/dialog/server/operationAddDialog.vue @@ -11,13 +11,14 @@ width="300px" class="inputWidth" style="justify-content: space-between;" + v-model="form.date" />
- +
- +
- +
@@ -100,16 +102,37 @@ RedStar, InputVue }, + data(){ + return{ + form:{ + date:'', // 服务运营编号 + name:'', // 服务名称 + address:'', // 收费 + address1:'', // 优惠 + address2:'', // 日期 + mark:'', // 备注 + } + } + }, props: { isShowInfo: { type: Boolean, default: true - } + }, }, methods: { close() { this.$emit('close') - } + }, + init(detail){ + if(detail.name){ + this.form.address = detail.address + this.form.address1 = detail.address1 + this.form.address2 = detail.address2 + this.form.date = detail.date + this.form.name = detail.name + } + }, } } diff --git a/src/icons/svg/cockpit-approved.svg b/src/icons/svg/cockpit-approved.svg new file mode 100644 index 0000000..634d7a8 --- /dev/null +++ b/src/icons/svg/cockpit-approved.svg @@ -0,0 +1,18 @@ + + + + diff --git a/src/icons/svg/cockpit-device-pan-check.svg b/src/icons/svg/cockpit-device-pan-check.svg new file mode 100644 index 0000000..5ad7f6b --- /dev/null +++ b/src/icons/svg/cockpit-device-pan-check.svg @@ -0,0 +1,13 @@ + + diff --git a/src/icons/svg/cockpit-device-pan-no.svg b/src/icons/svg/cockpit-device-pan-no.svg new file mode 100644 index 0000000..6713e2a --- /dev/null +++ b/src/icons/svg/cockpit-device-pan-no.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-device-register.svg b/src/icons/svg/cockpit-device-register.svg new file mode 100644 index 0000000..baa2355 --- /dev/null +++ b/src/icons/svg/cockpit-device-register.svg @@ -0,0 +1,65 @@ + + + + diff --git a/src/icons/svg/cockpit-device-total.svg b/src/icons/svg/cockpit-device-total.svg new file mode 100644 index 0000000..aa7788c --- /dev/null +++ b/src/icons/svg/cockpit-device-total.svg @@ -0,0 +1,59 @@ + + + + diff --git a/src/icons/svg/cockpit-distributor-pan-check.svg b/src/icons/svg/cockpit-distributor-pan-check.svg new file mode 100644 index 0000000..f4fa54e --- /dev/null +++ b/src/icons/svg/cockpit-distributor-pan-check.svg @@ -0,0 +1,15 @@ + + + + diff --git a/src/icons/svg/cockpit-distributor-pan-no.svg b/src/icons/svg/cockpit-distributor-pan-no.svg new file mode 100644 index 0000000..b10bdfe --- /dev/null +++ b/src/icons/svg/cockpit-distributor-pan-no.svg @@ -0,0 +1,15 @@ + + + + diff --git a/src/icons/svg/cockpit-lot-count.svg b/src/icons/svg/cockpit-lot-count.svg new file mode 100644 index 0000000..b4e743f --- /dev/null +++ b/src/icons/svg/cockpit-lot-count.svg @@ -0,0 +1,92 @@ + + + + diff --git a/src/icons/svg/cockpit-lot-online.svg b/src/icons/svg/cockpit-lot-online.svg new file mode 100644 index 0000000..0da6791 --- /dev/null +++ b/src/icons/svg/cockpit-lot-online.svg @@ -0,0 +1,62 @@ + + + + diff --git a/src/icons/svg/cockpit-supplier-pan-check.svg b/src/icons/svg/cockpit-supplier-pan-check.svg new file mode 100644 index 0000000..6d6756f --- /dev/null +++ b/src/icons/svg/cockpit-supplier-pan-check.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-supplier-pan-no.svg b/src/icons/svg/cockpit-supplier-pan-no.svg new file mode 100644 index 0000000..c9c869e --- /dev/null +++ b/src/icons/svg/cockpit-supplier-pan-no.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-supplier-register.svg b/src/icons/svg/cockpit-supplier-register.svg new file mode 100644 index 0000000..a6e193c --- /dev/null +++ b/src/icons/svg/cockpit-supplier-register.svg @@ -0,0 +1,17 @@ + + + + diff --git "a/src/icons/svg/cockpit-\344\276\233\345\272\224\345\225\206.svg" "b/src/icons/svg/cockpit-\344\276\233\345\272\224\345\225\206.svg" new file mode 100644 index 0000000..ca42dee --- /dev/null +++ "b/src/icons/svg/cockpit-\344\276\233\345\272\224\345\225\206.svg" @@ -0,0 +1,38 @@ + + + + diff --git a/src/api/supplier/supplier.js b/src/api/supplier/supplier.js index 593b7cd..b095e09 100644 --- a/src/api/supplier/supplier.js +++ b/src/api/supplier/supplier.js @@ -14,8 +14,8 @@ return instance.post(`/supplierPreReview/listPage?${str}`, data) } // 历史预审不分页列表 -const historyInquiry = () => { - return instance.post(`/supplierPreReview/history`, {}) +const historyInquiry = (data) => { + return instance.post(`/supplierPreReview/history`, data) } // 新增 diff --git "a/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" "b/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" new file mode 100644 index 0000000..34ce236 --- /dev/null +++ "b/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" Binary files differ diff --git "a/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" "b/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" new file mode 100644 index 0000000..dd0c295 --- /dev/null +++ "b/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" Binary files differ diff --git a/src/components/echart/barChart/verticalBarChart.vue b/src/components/echart/barChart/verticalBarChart.vue index 460d923..04a0090 100644 --- a/src/components/echart/barChart/verticalBarChart.vue +++ b/src/components/echart/barChart/verticalBarChart.vue @@ -2,21 +2,7 @@ - - diff --git a/src/components/mycomponent/dialog/inquiryDialog.vue b/src/components/mycomponent/dialog/inquiryDialog.vue deleted file mode 100644 index a8834ef..0000000 --- a/src/components/mycomponent/dialog/inquiryDialog.vue +++ /dev/null @@ -1,228 +0,0 @@ - - - - - - diff --git a/src/components/mycomponent/dialog/server/operationAddDialog.vue b/src/components/mycomponent/dialog/server/operationAddDialog.vue index dfefe42..d436541 100644 --- a/src/components/mycomponent/dialog/server/operationAddDialog.vue +++ b/src/components/mycomponent/dialog/server/operationAddDialog.vue @@ -11,13 +11,14 @@ width="300px" class="inputWidth" style="justify-content: space-between;" + v-model="form.date" />
- +
- +
- +
@@ -100,16 +102,37 @@ RedStar, InputVue }, + data(){ + return{ + form:{ + date:'', // 服务运营编号 + name:'', // 服务名称 + address:'', // 收费 + address1:'', // 优惠 + address2:'', // 日期 + mark:'', // 备注 + } + } + }, props: { isShowInfo: { type: Boolean, default: true - } + }, }, methods: { close() { this.$emit('close') - } + }, + init(detail){ + if(detail.name){ + this.form.address = detail.address + this.form.address1 = detail.address1 + this.form.address2 = detail.address2 + this.form.date = detail.date + this.form.name = detail.name + } + }, } } diff --git a/src/icons/svg/cockpit-approved.svg b/src/icons/svg/cockpit-approved.svg new file mode 100644 index 0000000..634d7a8 --- /dev/null +++ b/src/icons/svg/cockpit-approved.svg @@ -0,0 +1,18 @@ + + + + diff --git a/src/icons/svg/cockpit-device-pan-check.svg b/src/icons/svg/cockpit-device-pan-check.svg new file mode 100644 index 0000000..5ad7f6b --- /dev/null +++ b/src/icons/svg/cockpit-device-pan-check.svg @@ -0,0 +1,13 @@ + + diff --git a/src/icons/svg/cockpit-device-pan-no.svg b/src/icons/svg/cockpit-device-pan-no.svg new file mode 100644 index 0000000..6713e2a --- /dev/null +++ b/src/icons/svg/cockpit-device-pan-no.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-device-register.svg b/src/icons/svg/cockpit-device-register.svg new file mode 100644 index 0000000..baa2355 --- /dev/null +++ b/src/icons/svg/cockpit-device-register.svg @@ -0,0 +1,65 @@ + + + + diff --git a/src/icons/svg/cockpit-device-total.svg b/src/icons/svg/cockpit-device-total.svg new file mode 100644 index 0000000..aa7788c --- /dev/null +++ b/src/icons/svg/cockpit-device-total.svg @@ -0,0 +1,59 @@ + + + + diff --git a/src/icons/svg/cockpit-distributor-pan-check.svg b/src/icons/svg/cockpit-distributor-pan-check.svg new file mode 100644 index 0000000..f4fa54e --- /dev/null +++ b/src/icons/svg/cockpit-distributor-pan-check.svg @@ -0,0 +1,15 @@ + + + + diff --git a/src/icons/svg/cockpit-distributor-pan-no.svg b/src/icons/svg/cockpit-distributor-pan-no.svg new file mode 100644 index 0000000..b10bdfe --- /dev/null +++ b/src/icons/svg/cockpit-distributor-pan-no.svg @@ -0,0 +1,15 @@ + + + + diff --git a/src/icons/svg/cockpit-lot-count.svg b/src/icons/svg/cockpit-lot-count.svg new file mode 100644 index 0000000..b4e743f --- /dev/null +++ b/src/icons/svg/cockpit-lot-count.svg @@ -0,0 +1,92 @@ + + + + diff --git a/src/icons/svg/cockpit-lot-online.svg b/src/icons/svg/cockpit-lot-online.svg new file mode 100644 index 0000000..0da6791 --- /dev/null +++ b/src/icons/svg/cockpit-lot-online.svg @@ -0,0 +1,62 @@ + + + + diff --git a/src/icons/svg/cockpit-supplier-pan-check.svg b/src/icons/svg/cockpit-supplier-pan-check.svg new file mode 100644 index 0000000..6d6756f --- /dev/null +++ b/src/icons/svg/cockpit-supplier-pan-check.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-supplier-pan-no.svg b/src/icons/svg/cockpit-supplier-pan-no.svg new file mode 100644 index 0000000..c9c869e --- /dev/null +++ b/src/icons/svg/cockpit-supplier-pan-no.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-supplier-register.svg b/src/icons/svg/cockpit-supplier-register.svg new file mode 100644 index 0000000..a6e193c --- /dev/null +++ b/src/icons/svg/cockpit-supplier-register.svg @@ -0,0 +1,17 @@ + + + + diff --git "a/src/icons/svg/cockpit-\344\276\233\345\272\224\345\225\206.svg" "b/src/icons/svg/cockpit-\344\276\233\345\272\224\345\225\206.svg" new file mode 100644 index 0000000..ca42dee --- /dev/null +++ "b/src/icons/svg/cockpit-\344\276\233\345\272\224\345\225\206.svg" @@ -0,0 +1,38 @@ + + + + diff --git "a/src/icons/svg/cockpit-\345\210\206\345\255\220\345\205\254\345\217\270.svg" "b/src/icons/svg/cockpit-\345\210\206\345\255\220\345\205\254\345\217\270.svg" new file mode 100644 index 0000000..b39c00f --- /dev/null +++ "b/src/icons/svg/cockpit-\345\210\206\345\255\220\345\205\254\345\217\270.svg" @@ -0,0 +1,16 @@ + + + + diff --git a/src/api/supplier/supplier.js b/src/api/supplier/supplier.js index 593b7cd..b095e09 100644 --- a/src/api/supplier/supplier.js +++ b/src/api/supplier/supplier.js @@ -14,8 +14,8 @@ return instance.post(`/supplierPreReview/listPage?${str}`, data) } // 历史预审不分页列表 -const historyInquiry = () => { - return instance.post(`/supplierPreReview/history`, {}) +const historyInquiry = (data) => { + return instance.post(`/supplierPreReview/history`, data) } // 新增 diff --git "a/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" "b/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" new file mode 100644 index 0000000..34ce236 --- /dev/null +++ "b/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" Binary files differ diff --git "a/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" "b/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" new file mode 100644 index 0000000..dd0c295 --- /dev/null +++ "b/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" Binary files differ diff --git a/src/components/echart/barChart/verticalBarChart.vue b/src/components/echart/barChart/verticalBarChart.vue index 460d923..04a0090 100644 --- a/src/components/echart/barChart/verticalBarChart.vue +++ b/src/components/echart/barChart/verticalBarChart.vue @@ -2,21 +2,7 @@ - - diff --git a/src/components/mycomponent/dialog/inquiryDialog.vue b/src/components/mycomponent/dialog/inquiryDialog.vue deleted file mode 100644 index a8834ef..0000000 --- a/src/components/mycomponent/dialog/inquiryDialog.vue +++ /dev/null @@ -1,228 +0,0 @@ - - - - - - diff --git a/src/components/mycomponent/dialog/server/operationAddDialog.vue b/src/components/mycomponent/dialog/server/operationAddDialog.vue index dfefe42..d436541 100644 --- a/src/components/mycomponent/dialog/server/operationAddDialog.vue +++ b/src/components/mycomponent/dialog/server/operationAddDialog.vue @@ -11,13 +11,14 @@ width="300px" class="inputWidth" style="justify-content: space-between;" + v-model="form.date" />
- +
- +
- +
@@ -100,16 +102,37 @@ RedStar, InputVue }, + data(){ + return{ + form:{ + date:'', // 服务运营编号 + name:'', // 服务名称 + address:'', // 收费 + address1:'', // 优惠 + address2:'', // 日期 + mark:'', // 备注 + } + } + }, props: { isShowInfo: { type: Boolean, default: true - } + }, }, methods: { close() { this.$emit('close') - } + }, + init(detail){ + if(detail.name){ + this.form.address = detail.address + this.form.address1 = detail.address1 + this.form.address2 = detail.address2 + this.form.date = detail.date + this.form.name = detail.name + } + }, } } diff --git a/src/icons/svg/cockpit-approved.svg b/src/icons/svg/cockpit-approved.svg new file mode 100644 index 0000000..634d7a8 --- /dev/null +++ b/src/icons/svg/cockpit-approved.svg @@ -0,0 +1,18 @@ + + + + diff --git a/src/icons/svg/cockpit-device-pan-check.svg b/src/icons/svg/cockpit-device-pan-check.svg new file mode 100644 index 0000000..5ad7f6b --- /dev/null +++ b/src/icons/svg/cockpit-device-pan-check.svg @@ -0,0 +1,13 @@ + + diff --git a/src/icons/svg/cockpit-device-pan-no.svg b/src/icons/svg/cockpit-device-pan-no.svg new file mode 100644 index 0000000..6713e2a --- /dev/null +++ b/src/icons/svg/cockpit-device-pan-no.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-device-register.svg b/src/icons/svg/cockpit-device-register.svg new file mode 100644 index 0000000..baa2355 --- /dev/null +++ b/src/icons/svg/cockpit-device-register.svg @@ -0,0 +1,65 @@ + + + + diff --git a/src/icons/svg/cockpit-device-total.svg b/src/icons/svg/cockpit-device-total.svg new file mode 100644 index 0000000..aa7788c --- /dev/null +++ b/src/icons/svg/cockpit-device-total.svg @@ -0,0 +1,59 @@ + + + + diff --git a/src/icons/svg/cockpit-distributor-pan-check.svg b/src/icons/svg/cockpit-distributor-pan-check.svg new file mode 100644 index 0000000..f4fa54e --- /dev/null +++ b/src/icons/svg/cockpit-distributor-pan-check.svg @@ -0,0 +1,15 @@ + + + + diff --git a/src/icons/svg/cockpit-distributor-pan-no.svg b/src/icons/svg/cockpit-distributor-pan-no.svg new file mode 100644 index 0000000..b10bdfe --- /dev/null +++ b/src/icons/svg/cockpit-distributor-pan-no.svg @@ -0,0 +1,15 @@ + + + + diff --git a/src/icons/svg/cockpit-lot-count.svg b/src/icons/svg/cockpit-lot-count.svg new file mode 100644 index 0000000..b4e743f --- /dev/null +++ b/src/icons/svg/cockpit-lot-count.svg @@ -0,0 +1,92 @@ + + + + diff --git a/src/icons/svg/cockpit-lot-online.svg b/src/icons/svg/cockpit-lot-online.svg new file mode 100644 index 0000000..0da6791 --- /dev/null +++ b/src/icons/svg/cockpit-lot-online.svg @@ -0,0 +1,62 @@ + + + + diff --git a/src/icons/svg/cockpit-supplier-pan-check.svg b/src/icons/svg/cockpit-supplier-pan-check.svg new file mode 100644 index 0000000..6d6756f --- /dev/null +++ b/src/icons/svg/cockpit-supplier-pan-check.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-supplier-pan-no.svg b/src/icons/svg/cockpit-supplier-pan-no.svg new file mode 100644 index 0000000..c9c869e --- /dev/null +++ b/src/icons/svg/cockpit-supplier-pan-no.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-supplier-register.svg b/src/icons/svg/cockpit-supplier-register.svg new file mode 100644 index 0000000..a6e193c --- /dev/null +++ b/src/icons/svg/cockpit-supplier-register.svg @@ -0,0 +1,17 @@ + + + + diff --git "a/src/icons/svg/cockpit-\344\276\233\345\272\224\345\225\206.svg" "b/src/icons/svg/cockpit-\344\276\233\345\272\224\345\225\206.svg" new file mode 100644 index 0000000..ca42dee --- /dev/null +++ "b/src/icons/svg/cockpit-\344\276\233\345\272\224\345\225\206.svg" @@ -0,0 +1,38 @@ + + + + diff --git "a/src/icons/svg/cockpit-\345\210\206\345\255\220\345\205\254\345\217\270.svg" "b/src/icons/svg/cockpit-\345\210\206\345\255\220\345\205\254\345\217\270.svg" new file mode 100644 index 0000000..b39c00f --- /dev/null +++ "b/src/icons/svg/cockpit-\345\210\206\345\255\220\345\205\254\345\217\270.svg" @@ -0,0 +1,16 @@ + + + + diff --git "a/src/icons/svg/cockpit-\346\231\256\351\200\232\347\256\241\347\220\206\350\247\222\350\211\262.svg" "b/src/icons/svg/cockpit-\346\231\256\351\200\232\347\256\241\347\220\206\350\247\222\350\211\262.svg" new file mode 100644 index 0000000..99c6837 --- /dev/null +++ "b/src/icons/svg/cockpit-\346\231\256\351\200\232\347\256\241\347\220\206\350\247\222\350\211\262.svg" @@ -0,0 +1,15 @@ + + + + diff --git a/src/api/supplier/supplier.js b/src/api/supplier/supplier.js index 593b7cd..b095e09 100644 --- a/src/api/supplier/supplier.js +++ b/src/api/supplier/supplier.js @@ -14,8 +14,8 @@ return instance.post(`/supplierPreReview/listPage?${str}`, data) } // 历史预审不分页列表 -const historyInquiry = () => { - return instance.post(`/supplierPreReview/history`, {}) +const historyInquiry = (data) => { + return instance.post(`/supplierPreReview/history`, data) } // 新增 diff --git "a/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" "b/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" new file mode 100644 index 0000000..34ce236 --- /dev/null +++ "b/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" Binary files differ diff --git "a/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" "b/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" new file mode 100644 index 0000000..dd0c295 --- /dev/null +++ "b/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" Binary files differ diff --git a/src/components/echart/barChart/verticalBarChart.vue b/src/components/echart/barChart/verticalBarChart.vue index 460d923..04a0090 100644 --- a/src/components/echart/barChart/verticalBarChart.vue +++ b/src/components/echart/barChart/verticalBarChart.vue @@ -2,21 +2,7 @@ - - diff --git a/src/components/mycomponent/dialog/inquiryDialog.vue b/src/components/mycomponent/dialog/inquiryDialog.vue deleted file mode 100644 index a8834ef..0000000 --- a/src/components/mycomponent/dialog/inquiryDialog.vue +++ /dev/null @@ -1,228 +0,0 @@ - - - - - - diff --git a/src/components/mycomponent/dialog/server/operationAddDialog.vue b/src/components/mycomponent/dialog/server/operationAddDialog.vue index dfefe42..d436541 100644 --- a/src/components/mycomponent/dialog/server/operationAddDialog.vue +++ b/src/components/mycomponent/dialog/server/operationAddDialog.vue @@ -11,13 +11,14 @@ width="300px" class="inputWidth" style="justify-content: space-between;" + v-model="form.date" />
- +
- +
- +
@@ -100,16 +102,37 @@ RedStar, InputVue }, + data(){ + return{ + form:{ + date:'', // 服务运营编号 + name:'', // 服务名称 + address:'', // 收费 + address1:'', // 优惠 + address2:'', // 日期 + mark:'', // 备注 + } + } + }, props: { isShowInfo: { type: Boolean, default: true - } + }, }, methods: { close() { this.$emit('close') - } + }, + init(detail){ + if(detail.name){ + this.form.address = detail.address + this.form.address1 = detail.address1 + this.form.address2 = detail.address2 + this.form.date = detail.date + this.form.name = detail.name + } + }, } } diff --git a/src/icons/svg/cockpit-approved.svg b/src/icons/svg/cockpit-approved.svg new file mode 100644 index 0000000..634d7a8 --- /dev/null +++ b/src/icons/svg/cockpit-approved.svg @@ -0,0 +1,18 @@ + + + + diff --git a/src/icons/svg/cockpit-device-pan-check.svg b/src/icons/svg/cockpit-device-pan-check.svg new file mode 100644 index 0000000..5ad7f6b --- /dev/null +++ b/src/icons/svg/cockpit-device-pan-check.svg @@ -0,0 +1,13 @@ + + diff --git a/src/icons/svg/cockpit-device-pan-no.svg b/src/icons/svg/cockpit-device-pan-no.svg new file mode 100644 index 0000000..6713e2a --- /dev/null +++ b/src/icons/svg/cockpit-device-pan-no.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-device-register.svg b/src/icons/svg/cockpit-device-register.svg new file mode 100644 index 0000000..baa2355 --- /dev/null +++ b/src/icons/svg/cockpit-device-register.svg @@ -0,0 +1,65 @@ + + + + diff --git a/src/icons/svg/cockpit-device-total.svg b/src/icons/svg/cockpit-device-total.svg new file mode 100644 index 0000000..aa7788c --- /dev/null +++ b/src/icons/svg/cockpit-device-total.svg @@ -0,0 +1,59 @@ + + + + diff --git a/src/icons/svg/cockpit-distributor-pan-check.svg b/src/icons/svg/cockpit-distributor-pan-check.svg new file mode 100644 index 0000000..f4fa54e --- /dev/null +++ b/src/icons/svg/cockpit-distributor-pan-check.svg @@ -0,0 +1,15 @@ + + + + diff --git a/src/icons/svg/cockpit-distributor-pan-no.svg b/src/icons/svg/cockpit-distributor-pan-no.svg new file mode 100644 index 0000000..b10bdfe --- /dev/null +++ b/src/icons/svg/cockpit-distributor-pan-no.svg @@ -0,0 +1,15 @@ + + + + diff --git a/src/icons/svg/cockpit-lot-count.svg b/src/icons/svg/cockpit-lot-count.svg new file mode 100644 index 0000000..b4e743f --- /dev/null +++ b/src/icons/svg/cockpit-lot-count.svg @@ -0,0 +1,92 @@ + + + + diff --git a/src/icons/svg/cockpit-lot-online.svg b/src/icons/svg/cockpit-lot-online.svg new file mode 100644 index 0000000..0da6791 --- /dev/null +++ b/src/icons/svg/cockpit-lot-online.svg @@ -0,0 +1,62 @@ + + + + diff --git a/src/icons/svg/cockpit-supplier-pan-check.svg b/src/icons/svg/cockpit-supplier-pan-check.svg new file mode 100644 index 0000000..6d6756f --- /dev/null +++ b/src/icons/svg/cockpit-supplier-pan-check.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-supplier-pan-no.svg b/src/icons/svg/cockpit-supplier-pan-no.svg new file mode 100644 index 0000000..c9c869e --- /dev/null +++ b/src/icons/svg/cockpit-supplier-pan-no.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-supplier-register.svg b/src/icons/svg/cockpit-supplier-register.svg new file mode 100644 index 0000000..a6e193c --- /dev/null +++ b/src/icons/svg/cockpit-supplier-register.svg @@ -0,0 +1,17 @@ + + + + diff --git "a/src/icons/svg/cockpit-\344\276\233\345\272\224\345\225\206.svg" "b/src/icons/svg/cockpit-\344\276\233\345\272\224\345\225\206.svg" new file mode 100644 index 0000000..ca42dee --- /dev/null +++ "b/src/icons/svg/cockpit-\344\276\233\345\272\224\345\225\206.svg" @@ -0,0 +1,38 @@ + + + + diff --git "a/src/icons/svg/cockpit-\345\210\206\345\255\220\345\205\254\345\217\270.svg" "b/src/icons/svg/cockpit-\345\210\206\345\255\220\345\205\254\345\217\270.svg" new file mode 100644 index 0000000..b39c00f --- /dev/null +++ "b/src/icons/svg/cockpit-\345\210\206\345\255\220\345\205\254\345\217\270.svg" @@ -0,0 +1,16 @@ + + + + diff --git "a/src/icons/svg/cockpit-\346\231\256\351\200\232\347\256\241\347\220\206\350\247\222\350\211\262.svg" "b/src/icons/svg/cockpit-\346\231\256\351\200\232\347\256\241\347\220\206\350\247\222\350\211\262.svg" new file mode 100644 index 0000000..99c6837 --- /dev/null +++ "b/src/icons/svg/cockpit-\346\231\256\351\200\232\347\256\241\347\220\206\350\247\222\350\211\262.svg" @@ -0,0 +1,15 @@ + + + + diff --git "a/src/icons/svg/cockpit-\347\247\273\345\212\250\347\253\257\347\224\250\346\210\267.svg" "b/src/icons/svg/cockpit-\347\247\273\345\212\250\347\253\257\347\224\250\346\210\267.svg" new file mode 100644 index 0000000..e287570 --- /dev/null +++ "b/src/icons/svg/cockpit-\347\247\273\345\212\250\347\253\257\347\224\250\346\210\267.svg" @@ -0,0 +1,13 @@ + + + + diff --git a/src/api/supplier/supplier.js b/src/api/supplier/supplier.js index 593b7cd..b095e09 100644 --- a/src/api/supplier/supplier.js +++ b/src/api/supplier/supplier.js @@ -14,8 +14,8 @@ return instance.post(`/supplierPreReview/listPage?${str}`, data) } // 历史预审不分页列表 -const historyInquiry = () => { - return instance.post(`/supplierPreReview/history`, {}) +const historyInquiry = (data) => { + return instance.post(`/supplierPreReview/history`, data) } // 新增 diff --git "a/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" "b/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" new file mode 100644 index 0000000..34ce236 --- /dev/null +++ "b/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" Binary files differ diff --git "a/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" "b/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" new file mode 100644 index 0000000..dd0c295 --- /dev/null +++ "b/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" Binary files differ diff --git a/src/components/echart/barChart/verticalBarChart.vue b/src/components/echart/barChart/verticalBarChart.vue index 460d923..04a0090 100644 --- a/src/components/echart/barChart/verticalBarChart.vue +++ b/src/components/echart/barChart/verticalBarChart.vue @@ -2,21 +2,7 @@ - - diff --git a/src/components/mycomponent/dialog/inquiryDialog.vue b/src/components/mycomponent/dialog/inquiryDialog.vue deleted file mode 100644 index a8834ef..0000000 --- a/src/components/mycomponent/dialog/inquiryDialog.vue +++ /dev/null @@ -1,228 +0,0 @@ - - - - - - diff --git a/src/components/mycomponent/dialog/server/operationAddDialog.vue b/src/components/mycomponent/dialog/server/operationAddDialog.vue index dfefe42..d436541 100644 --- a/src/components/mycomponent/dialog/server/operationAddDialog.vue +++ b/src/components/mycomponent/dialog/server/operationAddDialog.vue @@ -11,13 +11,14 @@ width="300px" class="inputWidth" style="justify-content: space-between;" + v-model="form.date" />
- +
- +
- +
@@ -100,16 +102,37 @@ RedStar, InputVue }, + data(){ + return{ + form:{ + date:'', // 服务运营编号 + name:'', // 服务名称 + address:'', // 收费 + address1:'', // 优惠 + address2:'', // 日期 + mark:'', // 备注 + } + } + }, props: { isShowInfo: { type: Boolean, default: true - } + }, }, methods: { close() { this.$emit('close') - } + }, + init(detail){ + if(detail.name){ + this.form.address = detail.address + this.form.address1 = detail.address1 + this.form.address2 = detail.address2 + this.form.date = detail.date + this.form.name = detail.name + } + }, } } diff --git a/src/icons/svg/cockpit-approved.svg b/src/icons/svg/cockpit-approved.svg new file mode 100644 index 0000000..634d7a8 --- /dev/null +++ b/src/icons/svg/cockpit-approved.svg @@ -0,0 +1,18 @@ + + + + diff --git a/src/icons/svg/cockpit-device-pan-check.svg b/src/icons/svg/cockpit-device-pan-check.svg new file mode 100644 index 0000000..5ad7f6b --- /dev/null +++ b/src/icons/svg/cockpit-device-pan-check.svg @@ -0,0 +1,13 @@ + + diff --git a/src/icons/svg/cockpit-device-pan-no.svg b/src/icons/svg/cockpit-device-pan-no.svg new file mode 100644 index 0000000..6713e2a --- /dev/null +++ b/src/icons/svg/cockpit-device-pan-no.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-device-register.svg b/src/icons/svg/cockpit-device-register.svg new file mode 100644 index 0000000..baa2355 --- /dev/null +++ b/src/icons/svg/cockpit-device-register.svg @@ -0,0 +1,65 @@ + + + + diff --git a/src/icons/svg/cockpit-device-total.svg b/src/icons/svg/cockpit-device-total.svg new file mode 100644 index 0000000..aa7788c --- /dev/null +++ b/src/icons/svg/cockpit-device-total.svg @@ -0,0 +1,59 @@ + + + + diff --git a/src/icons/svg/cockpit-distributor-pan-check.svg b/src/icons/svg/cockpit-distributor-pan-check.svg new file mode 100644 index 0000000..f4fa54e --- /dev/null +++ b/src/icons/svg/cockpit-distributor-pan-check.svg @@ -0,0 +1,15 @@ + + + + diff --git a/src/icons/svg/cockpit-distributor-pan-no.svg b/src/icons/svg/cockpit-distributor-pan-no.svg new file mode 100644 index 0000000..b10bdfe --- /dev/null +++ b/src/icons/svg/cockpit-distributor-pan-no.svg @@ -0,0 +1,15 @@ + + + + diff --git a/src/icons/svg/cockpit-lot-count.svg b/src/icons/svg/cockpit-lot-count.svg new file mode 100644 index 0000000..b4e743f --- /dev/null +++ b/src/icons/svg/cockpit-lot-count.svg @@ -0,0 +1,92 @@ + + + + diff --git a/src/icons/svg/cockpit-lot-online.svg b/src/icons/svg/cockpit-lot-online.svg new file mode 100644 index 0000000..0da6791 --- /dev/null +++ b/src/icons/svg/cockpit-lot-online.svg @@ -0,0 +1,62 @@ + + + + diff --git a/src/icons/svg/cockpit-supplier-pan-check.svg b/src/icons/svg/cockpit-supplier-pan-check.svg new file mode 100644 index 0000000..6d6756f --- /dev/null +++ b/src/icons/svg/cockpit-supplier-pan-check.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-supplier-pan-no.svg b/src/icons/svg/cockpit-supplier-pan-no.svg new file mode 100644 index 0000000..c9c869e --- /dev/null +++ b/src/icons/svg/cockpit-supplier-pan-no.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-supplier-register.svg b/src/icons/svg/cockpit-supplier-register.svg new file mode 100644 index 0000000..a6e193c --- /dev/null +++ b/src/icons/svg/cockpit-supplier-register.svg @@ -0,0 +1,17 @@ + + + + diff --git "a/src/icons/svg/cockpit-\344\276\233\345\272\224\345\225\206.svg" "b/src/icons/svg/cockpit-\344\276\233\345\272\224\345\225\206.svg" new file mode 100644 index 0000000..ca42dee --- /dev/null +++ "b/src/icons/svg/cockpit-\344\276\233\345\272\224\345\225\206.svg" @@ -0,0 +1,38 @@ + + + + diff --git "a/src/icons/svg/cockpit-\345\210\206\345\255\220\345\205\254\345\217\270.svg" "b/src/icons/svg/cockpit-\345\210\206\345\255\220\345\205\254\345\217\270.svg" new file mode 100644 index 0000000..b39c00f --- /dev/null +++ "b/src/icons/svg/cockpit-\345\210\206\345\255\220\345\205\254\345\217\270.svg" @@ -0,0 +1,16 @@ + + + + diff --git "a/src/icons/svg/cockpit-\346\231\256\351\200\232\347\256\241\347\220\206\350\247\222\350\211\262.svg" "b/src/icons/svg/cockpit-\346\231\256\351\200\232\347\256\241\347\220\206\350\247\222\350\211\262.svg" new file mode 100644 index 0000000..99c6837 --- /dev/null +++ "b/src/icons/svg/cockpit-\346\231\256\351\200\232\347\256\241\347\220\206\350\247\222\350\211\262.svg" @@ -0,0 +1,15 @@ + + + + diff --git "a/src/icons/svg/cockpit-\347\247\273\345\212\250\347\253\257\347\224\250\346\210\267.svg" "b/src/icons/svg/cockpit-\347\247\273\345\212\250\347\253\257\347\224\250\346\210\267.svg" new file mode 100644 index 0000000..e287570 --- /dev/null +++ "b/src/icons/svg/cockpit-\347\247\273\345\212\250\347\253\257\347\224\250\346\210\267.svg" @@ -0,0 +1,13 @@ + + + + diff --git "a/src/icons/svg/cockpit-\347\273\217\351\224\200\345\225\206.svg" "b/src/icons/svg/cockpit-\347\273\217\351\224\200\345\225\206.svg" new file mode 100644 index 0000000..fef7f56 --- /dev/null +++ "b/src/icons/svg/cockpit-\347\273\217\351\224\200\345\225\206.svg" @@ -0,0 +1,13 @@ + + + + diff --git a/src/api/supplier/supplier.js b/src/api/supplier/supplier.js index 593b7cd..b095e09 100644 --- a/src/api/supplier/supplier.js +++ b/src/api/supplier/supplier.js @@ -14,8 +14,8 @@ return instance.post(`/supplierPreReview/listPage?${str}`, data) } // 历史预审不分页列表 -const historyInquiry = () => { - return instance.post(`/supplierPreReview/history`, {}) +const historyInquiry = (data) => { + return instance.post(`/supplierPreReview/history`, data) } // 新增 diff --git "a/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" "b/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" new file mode 100644 index 0000000..34ce236 --- /dev/null +++ "b/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" Binary files differ diff --git "a/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" "b/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" new file mode 100644 index 0000000..dd0c295 --- /dev/null +++ "b/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" Binary files differ diff --git a/src/components/echart/barChart/verticalBarChart.vue b/src/components/echart/barChart/verticalBarChart.vue index 460d923..04a0090 100644 --- a/src/components/echart/barChart/verticalBarChart.vue +++ b/src/components/echart/barChart/verticalBarChart.vue @@ -2,21 +2,7 @@ - - diff --git a/src/components/mycomponent/dialog/inquiryDialog.vue b/src/components/mycomponent/dialog/inquiryDialog.vue deleted file mode 100644 index a8834ef..0000000 --- a/src/components/mycomponent/dialog/inquiryDialog.vue +++ /dev/null @@ -1,228 +0,0 @@ - - - - - - diff --git a/src/components/mycomponent/dialog/server/operationAddDialog.vue b/src/components/mycomponent/dialog/server/operationAddDialog.vue index dfefe42..d436541 100644 --- a/src/components/mycomponent/dialog/server/operationAddDialog.vue +++ b/src/components/mycomponent/dialog/server/operationAddDialog.vue @@ -11,13 +11,14 @@ width="300px" class="inputWidth" style="justify-content: space-between;" + v-model="form.date" />
- +
- +
- +
@@ -100,16 +102,37 @@ RedStar, InputVue }, + data(){ + return{ + form:{ + date:'', // 服务运营编号 + name:'', // 服务名称 + address:'', // 收费 + address1:'', // 优惠 + address2:'', // 日期 + mark:'', // 备注 + } + } + }, props: { isShowInfo: { type: Boolean, default: true - } + }, }, methods: { close() { this.$emit('close') - } + }, + init(detail){ + if(detail.name){ + this.form.address = detail.address + this.form.address1 = detail.address1 + this.form.address2 = detail.address2 + this.form.date = detail.date + this.form.name = detail.name + } + }, } } diff --git a/src/icons/svg/cockpit-approved.svg b/src/icons/svg/cockpit-approved.svg new file mode 100644 index 0000000..634d7a8 --- /dev/null +++ b/src/icons/svg/cockpit-approved.svg @@ -0,0 +1,18 @@ + + + + diff --git a/src/icons/svg/cockpit-device-pan-check.svg b/src/icons/svg/cockpit-device-pan-check.svg new file mode 100644 index 0000000..5ad7f6b --- /dev/null +++ b/src/icons/svg/cockpit-device-pan-check.svg @@ -0,0 +1,13 @@ + + diff --git a/src/icons/svg/cockpit-device-pan-no.svg b/src/icons/svg/cockpit-device-pan-no.svg new file mode 100644 index 0000000..6713e2a --- /dev/null +++ b/src/icons/svg/cockpit-device-pan-no.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-device-register.svg b/src/icons/svg/cockpit-device-register.svg new file mode 100644 index 0000000..baa2355 --- /dev/null +++ b/src/icons/svg/cockpit-device-register.svg @@ -0,0 +1,65 @@ + + + + diff --git a/src/icons/svg/cockpit-device-total.svg b/src/icons/svg/cockpit-device-total.svg new file mode 100644 index 0000000..aa7788c --- /dev/null +++ b/src/icons/svg/cockpit-device-total.svg @@ -0,0 +1,59 @@ + + + + diff --git a/src/icons/svg/cockpit-distributor-pan-check.svg b/src/icons/svg/cockpit-distributor-pan-check.svg new file mode 100644 index 0000000..f4fa54e --- /dev/null +++ b/src/icons/svg/cockpit-distributor-pan-check.svg @@ -0,0 +1,15 @@ + + + + diff --git a/src/icons/svg/cockpit-distributor-pan-no.svg b/src/icons/svg/cockpit-distributor-pan-no.svg new file mode 100644 index 0000000..b10bdfe --- /dev/null +++ b/src/icons/svg/cockpit-distributor-pan-no.svg @@ -0,0 +1,15 @@ + + + + diff --git a/src/icons/svg/cockpit-lot-count.svg b/src/icons/svg/cockpit-lot-count.svg new file mode 100644 index 0000000..b4e743f --- /dev/null +++ b/src/icons/svg/cockpit-lot-count.svg @@ -0,0 +1,92 @@ + + + + diff --git a/src/icons/svg/cockpit-lot-online.svg b/src/icons/svg/cockpit-lot-online.svg new file mode 100644 index 0000000..0da6791 --- /dev/null +++ b/src/icons/svg/cockpit-lot-online.svg @@ -0,0 +1,62 @@ + + + + diff --git a/src/icons/svg/cockpit-supplier-pan-check.svg b/src/icons/svg/cockpit-supplier-pan-check.svg new file mode 100644 index 0000000..6d6756f --- /dev/null +++ b/src/icons/svg/cockpit-supplier-pan-check.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-supplier-pan-no.svg b/src/icons/svg/cockpit-supplier-pan-no.svg new file mode 100644 index 0000000..c9c869e --- /dev/null +++ b/src/icons/svg/cockpit-supplier-pan-no.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-supplier-register.svg b/src/icons/svg/cockpit-supplier-register.svg new file mode 100644 index 0000000..a6e193c --- /dev/null +++ b/src/icons/svg/cockpit-supplier-register.svg @@ -0,0 +1,17 @@ + + + + diff --git "a/src/icons/svg/cockpit-\344\276\233\345\272\224\345\225\206.svg" "b/src/icons/svg/cockpit-\344\276\233\345\272\224\345\225\206.svg" new file mode 100644 index 0000000..ca42dee --- /dev/null +++ "b/src/icons/svg/cockpit-\344\276\233\345\272\224\345\225\206.svg" @@ -0,0 +1,38 @@ + + + + diff --git "a/src/icons/svg/cockpit-\345\210\206\345\255\220\345\205\254\345\217\270.svg" "b/src/icons/svg/cockpit-\345\210\206\345\255\220\345\205\254\345\217\270.svg" new file mode 100644 index 0000000..b39c00f --- /dev/null +++ "b/src/icons/svg/cockpit-\345\210\206\345\255\220\345\205\254\345\217\270.svg" @@ -0,0 +1,16 @@ + + + + diff --git "a/src/icons/svg/cockpit-\346\231\256\351\200\232\347\256\241\347\220\206\350\247\222\350\211\262.svg" "b/src/icons/svg/cockpit-\346\231\256\351\200\232\347\256\241\347\220\206\350\247\222\350\211\262.svg" new file mode 100644 index 0000000..99c6837 --- /dev/null +++ "b/src/icons/svg/cockpit-\346\231\256\351\200\232\347\256\241\347\220\206\350\247\222\350\211\262.svg" @@ -0,0 +1,15 @@ + + + + diff --git "a/src/icons/svg/cockpit-\347\247\273\345\212\250\347\253\257\347\224\250\346\210\267.svg" "b/src/icons/svg/cockpit-\347\247\273\345\212\250\347\253\257\347\224\250\346\210\267.svg" new file mode 100644 index 0000000..e287570 --- /dev/null +++ "b/src/icons/svg/cockpit-\347\247\273\345\212\250\347\253\257\347\224\250\346\210\267.svg" @@ -0,0 +1,13 @@ + + + + diff --git "a/src/icons/svg/cockpit-\347\273\217\351\224\200\345\225\206.svg" "b/src/icons/svg/cockpit-\347\273\217\351\224\200\345\225\206.svg" new file mode 100644 index 0000000..fef7f56 --- /dev/null +++ "b/src/icons/svg/cockpit-\347\273\217\351\224\200\345\225\206.svg" @@ -0,0 +1,13 @@ + + + + diff --git "a/src/icons/svg/cockpit-\351\233\206\345\233\242.svg" "b/src/icons/svg/cockpit-\351\233\206\345\233\242.svg" new file mode 100644 index 0000000..48e8006 --- /dev/null +++ "b/src/icons/svg/cockpit-\351\233\206\345\233\242.svg" @@ -0,0 +1,14 @@ + + + + diff --git a/src/api/supplier/supplier.js b/src/api/supplier/supplier.js index 593b7cd..b095e09 100644 --- a/src/api/supplier/supplier.js +++ b/src/api/supplier/supplier.js @@ -14,8 +14,8 @@ return instance.post(`/supplierPreReview/listPage?${str}`, data) } // 历史预审不分页列表 -const historyInquiry = () => { - return instance.post(`/supplierPreReview/history`, {}) +const historyInquiry = (data) => { + return instance.post(`/supplierPreReview/history`, data) } // 新增 diff --git "a/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" "b/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" new file mode 100644 index 0000000..34ce236 --- /dev/null +++ "b/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" Binary files differ diff --git "a/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" "b/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" new file mode 100644 index 0000000..dd0c295 --- /dev/null +++ "b/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" Binary files differ diff --git a/src/components/echart/barChart/verticalBarChart.vue b/src/components/echart/barChart/verticalBarChart.vue index 460d923..04a0090 100644 --- a/src/components/echart/barChart/verticalBarChart.vue +++ b/src/components/echart/barChart/verticalBarChart.vue @@ -2,21 +2,7 @@ - - diff --git a/src/components/mycomponent/dialog/inquiryDialog.vue b/src/components/mycomponent/dialog/inquiryDialog.vue deleted file mode 100644 index a8834ef..0000000 --- a/src/components/mycomponent/dialog/inquiryDialog.vue +++ /dev/null @@ -1,228 +0,0 @@ - - - - - - diff --git a/src/components/mycomponent/dialog/server/operationAddDialog.vue b/src/components/mycomponent/dialog/server/operationAddDialog.vue index dfefe42..d436541 100644 --- a/src/components/mycomponent/dialog/server/operationAddDialog.vue +++ b/src/components/mycomponent/dialog/server/operationAddDialog.vue @@ -11,13 +11,14 @@ width="300px" class="inputWidth" style="justify-content: space-between;" + v-model="form.date" />
- +
- +
- +
@@ -100,16 +102,37 @@ RedStar, InputVue }, + data(){ + return{ + form:{ + date:'', // 服务运营编号 + name:'', // 服务名称 + address:'', // 收费 + address1:'', // 优惠 + address2:'', // 日期 + mark:'', // 备注 + } + } + }, props: { isShowInfo: { type: Boolean, default: true - } + }, }, methods: { close() { this.$emit('close') - } + }, + init(detail){ + if(detail.name){ + this.form.address = detail.address + this.form.address1 = detail.address1 + this.form.address2 = detail.address2 + this.form.date = detail.date + this.form.name = detail.name + } + }, } } diff --git a/src/icons/svg/cockpit-approved.svg b/src/icons/svg/cockpit-approved.svg new file mode 100644 index 0000000..634d7a8 --- /dev/null +++ b/src/icons/svg/cockpit-approved.svg @@ -0,0 +1,18 @@ + + + + diff --git a/src/icons/svg/cockpit-device-pan-check.svg b/src/icons/svg/cockpit-device-pan-check.svg new file mode 100644 index 0000000..5ad7f6b --- /dev/null +++ b/src/icons/svg/cockpit-device-pan-check.svg @@ -0,0 +1,13 @@ + + diff --git a/src/icons/svg/cockpit-device-pan-no.svg b/src/icons/svg/cockpit-device-pan-no.svg new file mode 100644 index 0000000..6713e2a --- /dev/null +++ b/src/icons/svg/cockpit-device-pan-no.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-device-register.svg b/src/icons/svg/cockpit-device-register.svg new file mode 100644 index 0000000..baa2355 --- /dev/null +++ b/src/icons/svg/cockpit-device-register.svg @@ -0,0 +1,65 @@ + + + + diff --git a/src/icons/svg/cockpit-device-total.svg b/src/icons/svg/cockpit-device-total.svg new file mode 100644 index 0000000..aa7788c --- /dev/null +++ b/src/icons/svg/cockpit-device-total.svg @@ -0,0 +1,59 @@ + + + + diff --git a/src/icons/svg/cockpit-distributor-pan-check.svg b/src/icons/svg/cockpit-distributor-pan-check.svg new file mode 100644 index 0000000..f4fa54e --- /dev/null +++ b/src/icons/svg/cockpit-distributor-pan-check.svg @@ -0,0 +1,15 @@ + + + + diff --git a/src/icons/svg/cockpit-distributor-pan-no.svg b/src/icons/svg/cockpit-distributor-pan-no.svg new file mode 100644 index 0000000..b10bdfe --- /dev/null +++ b/src/icons/svg/cockpit-distributor-pan-no.svg @@ -0,0 +1,15 @@ + + + + diff --git a/src/icons/svg/cockpit-lot-count.svg b/src/icons/svg/cockpit-lot-count.svg new file mode 100644 index 0000000..b4e743f --- /dev/null +++ b/src/icons/svg/cockpit-lot-count.svg @@ -0,0 +1,92 @@ + + + + diff --git a/src/icons/svg/cockpit-lot-online.svg b/src/icons/svg/cockpit-lot-online.svg new file mode 100644 index 0000000..0da6791 --- /dev/null +++ b/src/icons/svg/cockpit-lot-online.svg @@ -0,0 +1,62 @@ + + + + diff --git a/src/icons/svg/cockpit-supplier-pan-check.svg b/src/icons/svg/cockpit-supplier-pan-check.svg new file mode 100644 index 0000000..6d6756f --- /dev/null +++ b/src/icons/svg/cockpit-supplier-pan-check.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-supplier-pan-no.svg b/src/icons/svg/cockpit-supplier-pan-no.svg new file mode 100644 index 0000000..c9c869e --- /dev/null +++ b/src/icons/svg/cockpit-supplier-pan-no.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-supplier-register.svg b/src/icons/svg/cockpit-supplier-register.svg new file mode 100644 index 0000000..a6e193c --- /dev/null +++ b/src/icons/svg/cockpit-supplier-register.svg @@ -0,0 +1,17 @@ + + + + diff --git "a/src/icons/svg/cockpit-\344\276\233\345\272\224\345\225\206.svg" "b/src/icons/svg/cockpit-\344\276\233\345\272\224\345\225\206.svg" new file mode 100644 index 0000000..ca42dee --- /dev/null +++ "b/src/icons/svg/cockpit-\344\276\233\345\272\224\345\225\206.svg" @@ -0,0 +1,38 @@ + + + + diff --git "a/src/icons/svg/cockpit-\345\210\206\345\255\220\345\205\254\345\217\270.svg" "b/src/icons/svg/cockpit-\345\210\206\345\255\220\345\205\254\345\217\270.svg" new file mode 100644 index 0000000..b39c00f --- /dev/null +++ "b/src/icons/svg/cockpit-\345\210\206\345\255\220\345\205\254\345\217\270.svg" @@ -0,0 +1,16 @@ + + + + diff --git "a/src/icons/svg/cockpit-\346\231\256\351\200\232\347\256\241\347\220\206\350\247\222\350\211\262.svg" "b/src/icons/svg/cockpit-\346\231\256\351\200\232\347\256\241\347\220\206\350\247\222\350\211\262.svg" new file mode 100644 index 0000000..99c6837 --- /dev/null +++ "b/src/icons/svg/cockpit-\346\231\256\351\200\232\347\256\241\347\220\206\350\247\222\350\211\262.svg" @@ -0,0 +1,15 @@ + + + + diff --git "a/src/icons/svg/cockpit-\347\247\273\345\212\250\347\253\257\347\224\250\346\210\267.svg" "b/src/icons/svg/cockpit-\347\247\273\345\212\250\347\253\257\347\224\250\346\210\267.svg" new file mode 100644 index 0000000..e287570 --- /dev/null +++ "b/src/icons/svg/cockpit-\347\247\273\345\212\250\347\253\257\347\224\250\346\210\267.svg" @@ -0,0 +1,13 @@ + + + + diff --git "a/src/icons/svg/cockpit-\347\273\217\351\224\200\345\225\206.svg" "b/src/icons/svg/cockpit-\347\273\217\351\224\200\345\225\206.svg" new file mode 100644 index 0000000..fef7f56 --- /dev/null +++ "b/src/icons/svg/cockpit-\347\273\217\351\224\200\345\225\206.svg" @@ -0,0 +1,13 @@ + + + + diff --git "a/src/icons/svg/cockpit-\351\233\206\345\233\242.svg" "b/src/icons/svg/cockpit-\351\233\206\345\233\242.svg" new file mode 100644 index 0000000..48e8006 --- /dev/null +++ "b/src/icons/svg/cockpit-\351\233\206\345\233\242.svg" @@ -0,0 +1,14 @@ + + + + diff --git "a/src/icons/svg/cockpit-\351\233\206\345\233\242\347\224\250\346\210\267.svg" "b/src/icons/svg/cockpit-\351\233\206\345\233\242\347\224\250\346\210\267.svg" new file mode 100644 index 0000000..86f0776 --- /dev/null +++ "b/src/icons/svg/cockpit-\351\233\206\345\233\242\347\224\250\346\210\267.svg" @@ -0,0 +1,15 @@ + + + + diff --git a/src/api/supplier/supplier.js b/src/api/supplier/supplier.js index 593b7cd..b095e09 100644 --- a/src/api/supplier/supplier.js +++ b/src/api/supplier/supplier.js @@ -14,8 +14,8 @@ return instance.post(`/supplierPreReview/listPage?${str}`, data) } // 历史预审不分页列表 -const historyInquiry = () => { - return instance.post(`/supplierPreReview/history`, {}) +const historyInquiry = (data) => { + return instance.post(`/supplierPreReview/history`, data) } // 新增 diff --git "a/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" "b/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" new file mode 100644 index 0000000..34ce236 --- /dev/null +++ "b/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" Binary files differ diff --git "a/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" "b/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" new file mode 100644 index 0000000..dd0c295 --- /dev/null +++ "b/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" Binary files differ diff --git a/src/components/echart/barChart/verticalBarChart.vue b/src/components/echart/barChart/verticalBarChart.vue index 460d923..04a0090 100644 --- a/src/components/echart/barChart/verticalBarChart.vue +++ b/src/components/echart/barChart/verticalBarChart.vue @@ -2,21 +2,7 @@ - - diff --git a/src/components/mycomponent/dialog/inquiryDialog.vue b/src/components/mycomponent/dialog/inquiryDialog.vue deleted file mode 100644 index a8834ef..0000000 --- a/src/components/mycomponent/dialog/inquiryDialog.vue +++ /dev/null @@ -1,228 +0,0 @@ - - - - - - diff --git a/src/components/mycomponent/dialog/server/operationAddDialog.vue b/src/components/mycomponent/dialog/server/operationAddDialog.vue index dfefe42..d436541 100644 --- a/src/components/mycomponent/dialog/server/operationAddDialog.vue +++ b/src/components/mycomponent/dialog/server/operationAddDialog.vue @@ -11,13 +11,14 @@ width="300px" class="inputWidth" style="justify-content: space-between;" + v-model="form.date" />
- +
- +
- +
@@ -100,16 +102,37 @@ RedStar, InputVue }, + data(){ + return{ + form:{ + date:'', // 服务运营编号 + name:'', // 服务名称 + address:'', // 收费 + address1:'', // 优惠 + address2:'', // 日期 + mark:'', // 备注 + } + } + }, props: { isShowInfo: { type: Boolean, default: true - } + }, }, methods: { close() { this.$emit('close') - } + }, + init(detail){ + if(detail.name){ + this.form.address = detail.address + this.form.address1 = detail.address1 + this.form.address2 = detail.address2 + this.form.date = detail.date + this.form.name = detail.name + } + }, } } diff --git a/src/icons/svg/cockpit-approved.svg b/src/icons/svg/cockpit-approved.svg new file mode 100644 index 0000000..634d7a8 --- /dev/null +++ b/src/icons/svg/cockpit-approved.svg @@ -0,0 +1,18 @@ + + + + diff --git a/src/icons/svg/cockpit-device-pan-check.svg b/src/icons/svg/cockpit-device-pan-check.svg new file mode 100644 index 0000000..5ad7f6b --- /dev/null +++ b/src/icons/svg/cockpit-device-pan-check.svg @@ -0,0 +1,13 @@ + + diff --git a/src/icons/svg/cockpit-device-pan-no.svg b/src/icons/svg/cockpit-device-pan-no.svg new file mode 100644 index 0000000..6713e2a --- /dev/null +++ b/src/icons/svg/cockpit-device-pan-no.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-device-register.svg b/src/icons/svg/cockpit-device-register.svg new file mode 100644 index 0000000..baa2355 --- /dev/null +++ b/src/icons/svg/cockpit-device-register.svg @@ -0,0 +1,65 @@ + + + + diff --git a/src/icons/svg/cockpit-device-total.svg b/src/icons/svg/cockpit-device-total.svg new file mode 100644 index 0000000..aa7788c --- /dev/null +++ b/src/icons/svg/cockpit-device-total.svg @@ -0,0 +1,59 @@ + + + + diff --git a/src/icons/svg/cockpit-distributor-pan-check.svg b/src/icons/svg/cockpit-distributor-pan-check.svg new file mode 100644 index 0000000..f4fa54e --- /dev/null +++ b/src/icons/svg/cockpit-distributor-pan-check.svg @@ -0,0 +1,15 @@ + + + + diff --git a/src/icons/svg/cockpit-distributor-pan-no.svg b/src/icons/svg/cockpit-distributor-pan-no.svg new file mode 100644 index 0000000..b10bdfe --- /dev/null +++ b/src/icons/svg/cockpit-distributor-pan-no.svg @@ -0,0 +1,15 @@ + + + + diff --git a/src/icons/svg/cockpit-lot-count.svg b/src/icons/svg/cockpit-lot-count.svg new file mode 100644 index 0000000..b4e743f --- /dev/null +++ b/src/icons/svg/cockpit-lot-count.svg @@ -0,0 +1,92 @@ + + + + diff --git a/src/icons/svg/cockpit-lot-online.svg b/src/icons/svg/cockpit-lot-online.svg new file mode 100644 index 0000000..0da6791 --- /dev/null +++ b/src/icons/svg/cockpit-lot-online.svg @@ -0,0 +1,62 @@ + + + + diff --git a/src/icons/svg/cockpit-supplier-pan-check.svg b/src/icons/svg/cockpit-supplier-pan-check.svg new file mode 100644 index 0000000..6d6756f --- /dev/null +++ b/src/icons/svg/cockpit-supplier-pan-check.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-supplier-pan-no.svg b/src/icons/svg/cockpit-supplier-pan-no.svg new file mode 100644 index 0000000..c9c869e --- /dev/null +++ b/src/icons/svg/cockpit-supplier-pan-no.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-supplier-register.svg b/src/icons/svg/cockpit-supplier-register.svg new file mode 100644 index 0000000..a6e193c --- /dev/null +++ b/src/icons/svg/cockpit-supplier-register.svg @@ -0,0 +1,17 @@ + + + + diff --git "a/src/icons/svg/cockpit-\344\276\233\345\272\224\345\225\206.svg" "b/src/icons/svg/cockpit-\344\276\233\345\272\224\345\225\206.svg" new file mode 100644 index 0000000..ca42dee --- /dev/null +++ "b/src/icons/svg/cockpit-\344\276\233\345\272\224\345\225\206.svg" @@ -0,0 +1,38 @@ + + + + diff --git "a/src/icons/svg/cockpit-\345\210\206\345\255\220\345\205\254\345\217\270.svg" "b/src/icons/svg/cockpit-\345\210\206\345\255\220\345\205\254\345\217\270.svg" new file mode 100644 index 0000000..b39c00f --- /dev/null +++ "b/src/icons/svg/cockpit-\345\210\206\345\255\220\345\205\254\345\217\270.svg" @@ -0,0 +1,16 @@ + + + + diff --git "a/src/icons/svg/cockpit-\346\231\256\351\200\232\347\256\241\347\220\206\350\247\222\350\211\262.svg" "b/src/icons/svg/cockpit-\346\231\256\351\200\232\347\256\241\347\220\206\350\247\222\350\211\262.svg" new file mode 100644 index 0000000..99c6837 --- /dev/null +++ "b/src/icons/svg/cockpit-\346\231\256\351\200\232\347\256\241\347\220\206\350\247\222\350\211\262.svg" @@ -0,0 +1,15 @@ + + + + diff --git "a/src/icons/svg/cockpit-\347\247\273\345\212\250\347\253\257\347\224\250\346\210\267.svg" "b/src/icons/svg/cockpit-\347\247\273\345\212\250\347\253\257\347\224\250\346\210\267.svg" new file mode 100644 index 0000000..e287570 --- /dev/null +++ "b/src/icons/svg/cockpit-\347\247\273\345\212\250\347\253\257\347\224\250\346\210\267.svg" @@ -0,0 +1,13 @@ + + + + diff --git "a/src/icons/svg/cockpit-\347\273\217\351\224\200\345\225\206.svg" "b/src/icons/svg/cockpit-\347\273\217\351\224\200\345\225\206.svg" new file mode 100644 index 0000000..fef7f56 --- /dev/null +++ "b/src/icons/svg/cockpit-\347\273\217\351\224\200\345\225\206.svg" @@ -0,0 +1,13 @@ + + + + diff --git "a/src/icons/svg/cockpit-\351\233\206\345\233\242.svg" "b/src/icons/svg/cockpit-\351\233\206\345\233\242.svg" new file mode 100644 index 0000000..48e8006 --- /dev/null +++ "b/src/icons/svg/cockpit-\351\233\206\345\233\242.svg" @@ -0,0 +1,14 @@ + + + + diff --git "a/src/icons/svg/cockpit-\351\233\206\345\233\242\347\224\250\346\210\267.svg" "b/src/icons/svg/cockpit-\351\233\206\345\233\242\347\224\250\346\210\267.svg" new file mode 100644 index 0000000..86f0776 --- /dev/null +++ "b/src/icons/svg/cockpit-\351\233\206\345\233\242\347\224\250\346\210\267.svg" @@ -0,0 +1,15 @@ + + + + diff --git a/src/router/modules/supplierManagement.js b/src/router/modules/supplierManagement.js index 4ad2c80..224d6b8 100644 --- a/src/router/modules/supplierManagement.js +++ b/src/router/modules/supplierManagement.js @@ -22,7 +22,7 @@ path: '/inquiry', name: 'Inquiry', component: () => import('@/views/supplier/inquiry'), // 重定向的组件位置 - meta: { title: '资料预审', icon: '', permission: '/supplier/inquire' } + meta: { title: '资料预审', icon: '', permission: '/supplier/inquiry' } }, { path: '/review', diff --git a/src/api/supplier/supplier.js b/src/api/supplier/supplier.js index 593b7cd..b095e09 100644 --- a/src/api/supplier/supplier.js +++ b/src/api/supplier/supplier.js @@ -14,8 +14,8 @@ return instance.post(`/supplierPreReview/listPage?${str}`, data) } // 历史预审不分页列表 -const historyInquiry = () => { - return instance.post(`/supplierPreReview/history`, {}) +const historyInquiry = (data) => { + return instance.post(`/supplierPreReview/history`, data) } // 新增 diff --git "a/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" "b/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" new file mode 100644 index 0000000..34ce236 --- /dev/null +++ "b/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" Binary files differ diff --git "a/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" "b/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" new file mode 100644 index 0000000..dd0c295 --- /dev/null +++ "b/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" Binary files differ diff --git a/src/components/echart/barChart/verticalBarChart.vue b/src/components/echart/barChart/verticalBarChart.vue index 460d923..04a0090 100644 --- a/src/components/echart/barChart/verticalBarChart.vue +++ b/src/components/echart/barChart/verticalBarChart.vue @@ -2,21 +2,7 @@ - - diff --git a/src/components/mycomponent/dialog/inquiryDialog.vue b/src/components/mycomponent/dialog/inquiryDialog.vue deleted file mode 100644 index a8834ef..0000000 --- a/src/components/mycomponent/dialog/inquiryDialog.vue +++ /dev/null @@ -1,228 +0,0 @@ - - - - - - diff --git a/src/components/mycomponent/dialog/server/operationAddDialog.vue b/src/components/mycomponent/dialog/server/operationAddDialog.vue index dfefe42..d436541 100644 --- a/src/components/mycomponent/dialog/server/operationAddDialog.vue +++ b/src/components/mycomponent/dialog/server/operationAddDialog.vue @@ -11,13 +11,14 @@ width="300px" class="inputWidth" style="justify-content: space-between;" + v-model="form.date" />
- +
- +
- +
@@ -100,16 +102,37 @@ RedStar, InputVue }, + data(){ + return{ + form:{ + date:'', // 服务运营编号 + name:'', // 服务名称 + address:'', // 收费 + address1:'', // 优惠 + address2:'', // 日期 + mark:'', // 备注 + } + } + }, props: { isShowInfo: { type: Boolean, default: true - } + }, }, methods: { close() { this.$emit('close') - } + }, + init(detail){ + if(detail.name){ + this.form.address = detail.address + this.form.address1 = detail.address1 + this.form.address2 = detail.address2 + this.form.date = detail.date + this.form.name = detail.name + } + }, } } diff --git a/src/icons/svg/cockpit-approved.svg b/src/icons/svg/cockpit-approved.svg new file mode 100644 index 0000000..634d7a8 --- /dev/null +++ b/src/icons/svg/cockpit-approved.svg @@ -0,0 +1,18 @@ + + + + diff --git a/src/icons/svg/cockpit-device-pan-check.svg b/src/icons/svg/cockpit-device-pan-check.svg new file mode 100644 index 0000000..5ad7f6b --- /dev/null +++ b/src/icons/svg/cockpit-device-pan-check.svg @@ -0,0 +1,13 @@ + + diff --git a/src/icons/svg/cockpit-device-pan-no.svg b/src/icons/svg/cockpit-device-pan-no.svg new file mode 100644 index 0000000..6713e2a --- /dev/null +++ b/src/icons/svg/cockpit-device-pan-no.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-device-register.svg b/src/icons/svg/cockpit-device-register.svg new file mode 100644 index 0000000..baa2355 --- /dev/null +++ b/src/icons/svg/cockpit-device-register.svg @@ -0,0 +1,65 @@ + + + + diff --git a/src/icons/svg/cockpit-device-total.svg b/src/icons/svg/cockpit-device-total.svg new file mode 100644 index 0000000..aa7788c --- /dev/null +++ b/src/icons/svg/cockpit-device-total.svg @@ -0,0 +1,59 @@ + + + + diff --git a/src/icons/svg/cockpit-distributor-pan-check.svg b/src/icons/svg/cockpit-distributor-pan-check.svg new file mode 100644 index 0000000..f4fa54e --- /dev/null +++ b/src/icons/svg/cockpit-distributor-pan-check.svg @@ -0,0 +1,15 @@ + + + + diff --git a/src/icons/svg/cockpit-distributor-pan-no.svg b/src/icons/svg/cockpit-distributor-pan-no.svg new file mode 100644 index 0000000..b10bdfe --- /dev/null +++ b/src/icons/svg/cockpit-distributor-pan-no.svg @@ -0,0 +1,15 @@ + + + + diff --git a/src/icons/svg/cockpit-lot-count.svg b/src/icons/svg/cockpit-lot-count.svg new file mode 100644 index 0000000..b4e743f --- /dev/null +++ b/src/icons/svg/cockpit-lot-count.svg @@ -0,0 +1,92 @@ + + + + diff --git a/src/icons/svg/cockpit-lot-online.svg b/src/icons/svg/cockpit-lot-online.svg new file mode 100644 index 0000000..0da6791 --- /dev/null +++ b/src/icons/svg/cockpit-lot-online.svg @@ -0,0 +1,62 @@ + + + + diff --git a/src/icons/svg/cockpit-supplier-pan-check.svg b/src/icons/svg/cockpit-supplier-pan-check.svg new file mode 100644 index 0000000..6d6756f --- /dev/null +++ b/src/icons/svg/cockpit-supplier-pan-check.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-supplier-pan-no.svg b/src/icons/svg/cockpit-supplier-pan-no.svg new file mode 100644 index 0000000..c9c869e --- /dev/null +++ b/src/icons/svg/cockpit-supplier-pan-no.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-supplier-register.svg b/src/icons/svg/cockpit-supplier-register.svg new file mode 100644 index 0000000..a6e193c --- /dev/null +++ b/src/icons/svg/cockpit-supplier-register.svg @@ -0,0 +1,17 @@ + + + + diff --git "a/src/icons/svg/cockpit-\344\276\233\345\272\224\345\225\206.svg" "b/src/icons/svg/cockpit-\344\276\233\345\272\224\345\225\206.svg" new file mode 100644 index 0000000..ca42dee --- /dev/null +++ "b/src/icons/svg/cockpit-\344\276\233\345\272\224\345\225\206.svg" @@ -0,0 +1,38 @@ + + + + diff --git "a/src/icons/svg/cockpit-\345\210\206\345\255\220\345\205\254\345\217\270.svg" "b/src/icons/svg/cockpit-\345\210\206\345\255\220\345\205\254\345\217\270.svg" new file mode 100644 index 0000000..b39c00f --- /dev/null +++ "b/src/icons/svg/cockpit-\345\210\206\345\255\220\345\205\254\345\217\270.svg" @@ -0,0 +1,16 @@ + + + + diff --git "a/src/icons/svg/cockpit-\346\231\256\351\200\232\347\256\241\347\220\206\350\247\222\350\211\262.svg" "b/src/icons/svg/cockpit-\346\231\256\351\200\232\347\256\241\347\220\206\350\247\222\350\211\262.svg" new file mode 100644 index 0000000..99c6837 --- /dev/null +++ "b/src/icons/svg/cockpit-\346\231\256\351\200\232\347\256\241\347\220\206\350\247\222\350\211\262.svg" @@ -0,0 +1,15 @@ + + + + diff --git "a/src/icons/svg/cockpit-\347\247\273\345\212\250\347\253\257\347\224\250\346\210\267.svg" "b/src/icons/svg/cockpit-\347\247\273\345\212\250\347\253\257\347\224\250\346\210\267.svg" new file mode 100644 index 0000000..e287570 --- /dev/null +++ "b/src/icons/svg/cockpit-\347\247\273\345\212\250\347\253\257\347\224\250\346\210\267.svg" @@ -0,0 +1,13 @@ + + + + diff --git "a/src/icons/svg/cockpit-\347\273\217\351\224\200\345\225\206.svg" "b/src/icons/svg/cockpit-\347\273\217\351\224\200\345\225\206.svg" new file mode 100644 index 0000000..fef7f56 --- /dev/null +++ "b/src/icons/svg/cockpit-\347\273\217\351\224\200\345\225\206.svg" @@ -0,0 +1,13 @@ + + + + diff --git "a/src/icons/svg/cockpit-\351\233\206\345\233\242.svg" "b/src/icons/svg/cockpit-\351\233\206\345\233\242.svg" new file mode 100644 index 0000000..48e8006 --- /dev/null +++ "b/src/icons/svg/cockpit-\351\233\206\345\233\242.svg" @@ -0,0 +1,14 @@ + + + + diff --git "a/src/icons/svg/cockpit-\351\233\206\345\233\242\347\224\250\346\210\267.svg" "b/src/icons/svg/cockpit-\351\233\206\345\233\242\347\224\250\346\210\267.svg" new file mode 100644 index 0000000..86f0776 --- /dev/null +++ "b/src/icons/svg/cockpit-\351\233\206\345\233\242\347\224\250\346\210\267.svg" @@ -0,0 +1,15 @@ + + + + diff --git a/src/router/modules/supplierManagement.js b/src/router/modules/supplierManagement.js index 4ad2c80..224d6b8 100644 --- a/src/router/modules/supplierManagement.js +++ b/src/router/modules/supplierManagement.js @@ -22,7 +22,7 @@ path: '/inquiry', name: 'Inquiry', component: () => import('@/views/supplier/inquiry'), // 重定向的组件位置 - meta: { title: '资料预审', icon: '', permission: '/supplier/inquire' } + meta: { title: '资料预审', icon: '', permission: '/supplier/inquiry' } }, { path: '/review', diff --git a/src/views/business/historyBusiness.vue b/src/views/business/historyBusiness.vue index bddce18..4398baa 100644 --- a/src/views/business/historyBusiness.vue +++ b/src/views/business/historyBusiness.vue @@ -13,7 +13,7 @@
预计工期
- +
diff --git a/src/api/supplier/supplier.js b/src/api/supplier/supplier.js index 593b7cd..b095e09 100644 --- a/src/api/supplier/supplier.js +++ b/src/api/supplier/supplier.js @@ -14,8 +14,8 @@ return instance.post(`/supplierPreReview/listPage?${str}`, data) } // 历史预审不分页列表 -const historyInquiry = () => { - return instance.post(`/supplierPreReview/history`, {}) +const historyInquiry = (data) => { + return instance.post(`/supplierPreReview/history`, data) } // 新增 diff --git "a/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" "b/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" new file mode 100644 index 0000000..34ce236 --- /dev/null +++ "b/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" Binary files differ diff --git "a/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" "b/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" new file mode 100644 index 0000000..dd0c295 --- /dev/null +++ "b/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" Binary files differ diff --git a/src/components/echart/barChart/verticalBarChart.vue b/src/components/echart/barChart/verticalBarChart.vue index 460d923..04a0090 100644 --- a/src/components/echart/barChart/verticalBarChart.vue +++ b/src/components/echart/barChart/verticalBarChart.vue @@ -2,21 +2,7 @@ - - diff --git a/src/components/mycomponent/dialog/inquiryDialog.vue b/src/components/mycomponent/dialog/inquiryDialog.vue deleted file mode 100644 index a8834ef..0000000 --- a/src/components/mycomponent/dialog/inquiryDialog.vue +++ /dev/null @@ -1,228 +0,0 @@ - - - - - - diff --git a/src/components/mycomponent/dialog/server/operationAddDialog.vue b/src/components/mycomponent/dialog/server/operationAddDialog.vue index dfefe42..d436541 100644 --- a/src/components/mycomponent/dialog/server/operationAddDialog.vue +++ b/src/components/mycomponent/dialog/server/operationAddDialog.vue @@ -11,13 +11,14 @@ width="300px" class="inputWidth" style="justify-content: space-between;" + v-model="form.date" />
- +
- +
- +
@@ -100,16 +102,37 @@ RedStar, InputVue }, + data(){ + return{ + form:{ + date:'', // 服务运营编号 + name:'', // 服务名称 + address:'', // 收费 + address1:'', // 优惠 + address2:'', // 日期 + mark:'', // 备注 + } + } + }, props: { isShowInfo: { type: Boolean, default: true - } + }, }, methods: { close() { this.$emit('close') - } + }, + init(detail){ + if(detail.name){ + this.form.address = detail.address + this.form.address1 = detail.address1 + this.form.address2 = detail.address2 + this.form.date = detail.date + this.form.name = detail.name + } + }, } } diff --git a/src/icons/svg/cockpit-approved.svg b/src/icons/svg/cockpit-approved.svg new file mode 100644 index 0000000..634d7a8 --- /dev/null +++ b/src/icons/svg/cockpit-approved.svg @@ -0,0 +1,18 @@ + + + + diff --git a/src/icons/svg/cockpit-device-pan-check.svg b/src/icons/svg/cockpit-device-pan-check.svg new file mode 100644 index 0000000..5ad7f6b --- /dev/null +++ b/src/icons/svg/cockpit-device-pan-check.svg @@ -0,0 +1,13 @@ + + diff --git a/src/icons/svg/cockpit-device-pan-no.svg b/src/icons/svg/cockpit-device-pan-no.svg new file mode 100644 index 0000000..6713e2a --- /dev/null +++ b/src/icons/svg/cockpit-device-pan-no.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-device-register.svg b/src/icons/svg/cockpit-device-register.svg new file mode 100644 index 0000000..baa2355 --- /dev/null +++ b/src/icons/svg/cockpit-device-register.svg @@ -0,0 +1,65 @@ + + + + diff --git a/src/icons/svg/cockpit-device-total.svg b/src/icons/svg/cockpit-device-total.svg new file mode 100644 index 0000000..aa7788c --- /dev/null +++ b/src/icons/svg/cockpit-device-total.svg @@ -0,0 +1,59 @@ + + + + diff --git a/src/icons/svg/cockpit-distributor-pan-check.svg b/src/icons/svg/cockpit-distributor-pan-check.svg new file mode 100644 index 0000000..f4fa54e --- /dev/null +++ b/src/icons/svg/cockpit-distributor-pan-check.svg @@ -0,0 +1,15 @@ + + + + diff --git a/src/icons/svg/cockpit-distributor-pan-no.svg b/src/icons/svg/cockpit-distributor-pan-no.svg new file mode 100644 index 0000000..b10bdfe --- /dev/null +++ b/src/icons/svg/cockpit-distributor-pan-no.svg @@ -0,0 +1,15 @@ + + + + diff --git a/src/icons/svg/cockpit-lot-count.svg b/src/icons/svg/cockpit-lot-count.svg new file mode 100644 index 0000000..b4e743f --- /dev/null +++ b/src/icons/svg/cockpit-lot-count.svg @@ -0,0 +1,92 @@ + + + + diff --git a/src/icons/svg/cockpit-lot-online.svg b/src/icons/svg/cockpit-lot-online.svg new file mode 100644 index 0000000..0da6791 --- /dev/null +++ b/src/icons/svg/cockpit-lot-online.svg @@ -0,0 +1,62 @@ + + + + diff --git a/src/icons/svg/cockpit-supplier-pan-check.svg b/src/icons/svg/cockpit-supplier-pan-check.svg new file mode 100644 index 0000000..6d6756f --- /dev/null +++ b/src/icons/svg/cockpit-supplier-pan-check.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-supplier-pan-no.svg b/src/icons/svg/cockpit-supplier-pan-no.svg new file mode 100644 index 0000000..c9c869e --- /dev/null +++ b/src/icons/svg/cockpit-supplier-pan-no.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-supplier-register.svg b/src/icons/svg/cockpit-supplier-register.svg new file mode 100644 index 0000000..a6e193c --- /dev/null +++ b/src/icons/svg/cockpit-supplier-register.svg @@ -0,0 +1,17 @@ + + + + diff --git "a/src/icons/svg/cockpit-\344\276\233\345\272\224\345\225\206.svg" "b/src/icons/svg/cockpit-\344\276\233\345\272\224\345\225\206.svg" new file mode 100644 index 0000000..ca42dee --- /dev/null +++ "b/src/icons/svg/cockpit-\344\276\233\345\272\224\345\225\206.svg" @@ -0,0 +1,38 @@ + + + + diff --git "a/src/icons/svg/cockpit-\345\210\206\345\255\220\345\205\254\345\217\270.svg" "b/src/icons/svg/cockpit-\345\210\206\345\255\220\345\205\254\345\217\270.svg" new file mode 100644 index 0000000..b39c00f --- /dev/null +++ "b/src/icons/svg/cockpit-\345\210\206\345\255\220\345\205\254\345\217\270.svg" @@ -0,0 +1,16 @@ + + + + diff --git "a/src/icons/svg/cockpit-\346\231\256\351\200\232\347\256\241\347\220\206\350\247\222\350\211\262.svg" "b/src/icons/svg/cockpit-\346\231\256\351\200\232\347\256\241\347\220\206\350\247\222\350\211\262.svg" new file mode 100644 index 0000000..99c6837 --- /dev/null +++ "b/src/icons/svg/cockpit-\346\231\256\351\200\232\347\256\241\347\220\206\350\247\222\350\211\262.svg" @@ -0,0 +1,15 @@ + + + + diff --git "a/src/icons/svg/cockpit-\347\247\273\345\212\250\347\253\257\347\224\250\346\210\267.svg" "b/src/icons/svg/cockpit-\347\247\273\345\212\250\347\253\257\347\224\250\346\210\267.svg" new file mode 100644 index 0000000..e287570 --- /dev/null +++ "b/src/icons/svg/cockpit-\347\247\273\345\212\250\347\253\257\347\224\250\346\210\267.svg" @@ -0,0 +1,13 @@ + + + + diff --git "a/src/icons/svg/cockpit-\347\273\217\351\224\200\345\225\206.svg" "b/src/icons/svg/cockpit-\347\273\217\351\224\200\345\225\206.svg" new file mode 100644 index 0000000..fef7f56 --- /dev/null +++ "b/src/icons/svg/cockpit-\347\273\217\351\224\200\345\225\206.svg" @@ -0,0 +1,13 @@ + + + + diff --git "a/src/icons/svg/cockpit-\351\233\206\345\233\242.svg" "b/src/icons/svg/cockpit-\351\233\206\345\233\242.svg" new file mode 100644 index 0000000..48e8006 --- /dev/null +++ "b/src/icons/svg/cockpit-\351\233\206\345\233\242.svg" @@ -0,0 +1,14 @@ + + + + diff --git "a/src/icons/svg/cockpit-\351\233\206\345\233\242\347\224\250\346\210\267.svg" "b/src/icons/svg/cockpit-\351\233\206\345\233\242\347\224\250\346\210\267.svg" new file mode 100644 index 0000000..86f0776 --- /dev/null +++ "b/src/icons/svg/cockpit-\351\233\206\345\233\242\347\224\250\346\210\267.svg" @@ -0,0 +1,15 @@ + + + + diff --git a/src/router/modules/supplierManagement.js b/src/router/modules/supplierManagement.js index 4ad2c80..224d6b8 100644 --- a/src/router/modules/supplierManagement.js +++ b/src/router/modules/supplierManagement.js @@ -22,7 +22,7 @@ path: '/inquiry', name: 'Inquiry', component: () => import('@/views/supplier/inquiry'), // 重定向的组件位置 - meta: { title: '资料预审', icon: '', permission: '/supplier/inquire' } + meta: { title: '资料预审', icon: '', permission: '/supplier/inquiry' } }, { path: '/review', diff --git a/src/views/business/historyBusiness.vue b/src/views/business/historyBusiness.vue index bddce18..4398baa 100644 --- a/src/views/business/historyBusiness.vue +++ b/src/views/business/historyBusiness.vue @@ -13,7 +13,7 @@
预计工期
- +
diff --git a/src/views/business/report.vue b/src/views/business/report.vue index 33c1a3d..d833399 100644 --- a/src/views/business/report.vue +++ b/src/views/business/report.vue @@ -316,12 +316,12 @@
-
+
+
添加项目需求
-
@@ -421,22 +421,27 @@ }, methods: { save() { - this.addInfo.productList = { + if(this.valiateForm()){ + this.addInfo.productList = { productCode: this.addInfo.productList.productCode, productQuantity: this.addInfo.productList.productQuantity, productPrice: this.addInfo.productList.productPrice, productName: '' } add(this.addInfo).then(res => { - console.log(res) - if (res) { + this.setData() this.$message({ message: '保存成功', type: 'success' }) - } - }) - this.setData() + }) + } else { + this.$message({ + message: '请先完整填写报备信息', + type: 'error' + }) + } + }, close() { this.setData() @@ -462,7 +467,6 @@ this.form.countyList = res }) }, - handleAddBtn() { const obj = {} obj.brandName = '' @@ -525,6 +529,12 @@ this.$set(this.showEdit, index, false) // vue添加属性的方法 } }) + row.productCode = this.addInfo.productList.productCode + row.brandName = this.brandName + console.log(this.categoryIds) + row.categoryIds = this.categoryIds + row.productQuantity = this.addInfo.productList.productQuantity + row.productPrice = this.addInfo.productList.productPrice }, setData() { this.addInfo = { @@ -553,6 +563,17 @@ agentPhone: '', productList: [] } + }, + valiateForm() { + let arr = [] + for(var item in this.addInfo) { + if(this.addInfo[item]){ + arr.push(1) + }else{ + arr.push(0) + } + } + return arr.every(item => item === 1) } } } @@ -568,7 +589,7 @@ .report-from { .from-title { - font-size: 22px; + font-size: 16px; font-weight: bold; background-color: #28739e; color: white; diff --git a/src/api/supplier/supplier.js b/src/api/supplier/supplier.js index 593b7cd..b095e09 100644 --- a/src/api/supplier/supplier.js +++ b/src/api/supplier/supplier.js @@ -14,8 +14,8 @@ return instance.post(`/supplierPreReview/listPage?${str}`, data) } // 历史预审不分页列表 -const historyInquiry = () => { - return instance.post(`/supplierPreReview/history`, {}) +const historyInquiry = (data) => { + return instance.post(`/supplierPreReview/history`, data) } // 新增 diff --git "a/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" "b/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" new file mode 100644 index 0000000..34ce236 --- /dev/null +++ "b/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" Binary files differ diff --git "a/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" "b/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" new file mode 100644 index 0000000..dd0c295 --- /dev/null +++ "b/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" Binary files differ diff --git a/src/components/echart/barChart/verticalBarChart.vue b/src/components/echart/barChart/verticalBarChart.vue index 460d923..04a0090 100644 --- a/src/components/echart/barChart/verticalBarChart.vue +++ b/src/components/echart/barChart/verticalBarChart.vue @@ -2,21 +2,7 @@ - - diff --git a/src/components/mycomponent/dialog/inquiryDialog.vue b/src/components/mycomponent/dialog/inquiryDialog.vue deleted file mode 100644 index a8834ef..0000000 --- a/src/components/mycomponent/dialog/inquiryDialog.vue +++ /dev/null @@ -1,228 +0,0 @@ - - - - - - diff --git a/src/components/mycomponent/dialog/server/operationAddDialog.vue b/src/components/mycomponent/dialog/server/operationAddDialog.vue index dfefe42..d436541 100644 --- a/src/components/mycomponent/dialog/server/operationAddDialog.vue +++ b/src/components/mycomponent/dialog/server/operationAddDialog.vue @@ -11,13 +11,14 @@ width="300px" class="inputWidth" style="justify-content: space-between;" + v-model="form.date" />
- +
- +
- +
@@ -100,16 +102,37 @@ RedStar, InputVue }, + data(){ + return{ + form:{ + date:'', // 服务运营编号 + name:'', // 服务名称 + address:'', // 收费 + address1:'', // 优惠 + address2:'', // 日期 + mark:'', // 备注 + } + } + }, props: { isShowInfo: { type: Boolean, default: true - } + }, }, methods: { close() { this.$emit('close') - } + }, + init(detail){ + if(detail.name){ + this.form.address = detail.address + this.form.address1 = detail.address1 + this.form.address2 = detail.address2 + this.form.date = detail.date + this.form.name = detail.name + } + }, } } diff --git a/src/icons/svg/cockpit-approved.svg b/src/icons/svg/cockpit-approved.svg new file mode 100644 index 0000000..634d7a8 --- /dev/null +++ b/src/icons/svg/cockpit-approved.svg @@ -0,0 +1,18 @@ + + + + diff --git a/src/icons/svg/cockpit-device-pan-check.svg b/src/icons/svg/cockpit-device-pan-check.svg new file mode 100644 index 0000000..5ad7f6b --- /dev/null +++ b/src/icons/svg/cockpit-device-pan-check.svg @@ -0,0 +1,13 @@ + + diff --git a/src/icons/svg/cockpit-device-pan-no.svg b/src/icons/svg/cockpit-device-pan-no.svg new file mode 100644 index 0000000..6713e2a --- /dev/null +++ b/src/icons/svg/cockpit-device-pan-no.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-device-register.svg b/src/icons/svg/cockpit-device-register.svg new file mode 100644 index 0000000..baa2355 --- /dev/null +++ b/src/icons/svg/cockpit-device-register.svg @@ -0,0 +1,65 @@ + + + + diff --git a/src/icons/svg/cockpit-device-total.svg b/src/icons/svg/cockpit-device-total.svg new file mode 100644 index 0000000..aa7788c --- /dev/null +++ b/src/icons/svg/cockpit-device-total.svg @@ -0,0 +1,59 @@ + + + + diff --git a/src/icons/svg/cockpit-distributor-pan-check.svg b/src/icons/svg/cockpit-distributor-pan-check.svg new file mode 100644 index 0000000..f4fa54e --- /dev/null +++ b/src/icons/svg/cockpit-distributor-pan-check.svg @@ -0,0 +1,15 @@ + + + + diff --git a/src/icons/svg/cockpit-distributor-pan-no.svg b/src/icons/svg/cockpit-distributor-pan-no.svg new file mode 100644 index 0000000..b10bdfe --- /dev/null +++ b/src/icons/svg/cockpit-distributor-pan-no.svg @@ -0,0 +1,15 @@ + + + + diff --git a/src/icons/svg/cockpit-lot-count.svg b/src/icons/svg/cockpit-lot-count.svg new file mode 100644 index 0000000..b4e743f --- /dev/null +++ b/src/icons/svg/cockpit-lot-count.svg @@ -0,0 +1,92 @@ + + + + diff --git a/src/icons/svg/cockpit-lot-online.svg b/src/icons/svg/cockpit-lot-online.svg new file mode 100644 index 0000000..0da6791 --- /dev/null +++ b/src/icons/svg/cockpit-lot-online.svg @@ -0,0 +1,62 @@ + + + + diff --git a/src/icons/svg/cockpit-supplier-pan-check.svg b/src/icons/svg/cockpit-supplier-pan-check.svg new file mode 100644 index 0000000..6d6756f --- /dev/null +++ b/src/icons/svg/cockpit-supplier-pan-check.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-supplier-pan-no.svg b/src/icons/svg/cockpit-supplier-pan-no.svg new file mode 100644 index 0000000..c9c869e --- /dev/null +++ b/src/icons/svg/cockpit-supplier-pan-no.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-supplier-register.svg b/src/icons/svg/cockpit-supplier-register.svg new file mode 100644 index 0000000..a6e193c --- /dev/null +++ b/src/icons/svg/cockpit-supplier-register.svg @@ -0,0 +1,17 @@ + + + + diff --git "a/src/icons/svg/cockpit-\344\276\233\345\272\224\345\225\206.svg" "b/src/icons/svg/cockpit-\344\276\233\345\272\224\345\225\206.svg" new file mode 100644 index 0000000..ca42dee --- /dev/null +++ "b/src/icons/svg/cockpit-\344\276\233\345\272\224\345\225\206.svg" @@ -0,0 +1,38 @@ + + + + diff --git "a/src/icons/svg/cockpit-\345\210\206\345\255\220\345\205\254\345\217\270.svg" "b/src/icons/svg/cockpit-\345\210\206\345\255\220\345\205\254\345\217\270.svg" new file mode 100644 index 0000000..b39c00f --- /dev/null +++ "b/src/icons/svg/cockpit-\345\210\206\345\255\220\345\205\254\345\217\270.svg" @@ -0,0 +1,16 @@ + + + + diff --git "a/src/icons/svg/cockpit-\346\231\256\351\200\232\347\256\241\347\220\206\350\247\222\350\211\262.svg" "b/src/icons/svg/cockpit-\346\231\256\351\200\232\347\256\241\347\220\206\350\247\222\350\211\262.svg" new file mode 100644 index 0000000..99c6837 --- /dev/null +++ "b/src/icons/svg/cockpit-\346\231\256\351\200\232\347\256\241\347\220\206\350\247\222\350\211\262.svg" @@ -0,0 +1,15 @@ + + + + diff --git "a/src/icons/svg/cockpit-\347\247\273\345\212\250\347\253\257\347\224\250\346\210\267.svg" "b/src/icons/svg/cockpit-\347\247\273\345\212\250\347\253\257\347\224\250\346\210\267.svg" new file mode 100644 index 0000000..e287570 --- /dev/null +++ "b/src/icons/svg/cockpit-\347\247\273\345\212\250\347\253\257\347\224\250\346\210\267.svg" @@ -0,0 +1,13 @@ + + + + diff --git "a/src/icons/svg/cockpit-\347\273\217\351\224\200\345\225\206.svg" "b/src/icons/svg/cockpit-\347\273\217\351\224\200\345\225\206.svg" new file mode 100644 index 0000000..fef7f56 --- /dev/null +++ "b/src/icons/svg/cockpit-\347\273\217\351\224\200\345\225\206.svg" @@ -0,0 +1,13 @@ + + + + diff --git "a/src/icons/svg/cockpit-\351\233\206\345\233\242.svg" "b/src/icons/svg/cockpit-\351\233\206\345\233\242.svg" new file mode 100644 index 0000000..48e8006 --- /dev/null +++ "b/src/icons/svg/cockpit-\351\233\206\345\233\242.svg" @@ -0,0 +1,14 @@ + + + + diff --git "a/src/icons/svg/cockpit-\351\233\206\345\233\242\347\224\250\346\210\267.svg" "b/src/icons/svg/cockpit-\351\233\206\345\233\242\347\224\250\346\210\267.svg" new file mode 100644 index 0000000..86f0776 --- /dev/null +++ "b/src/icons/svg/cockpit-\351\233\206\345\233\242\347\224\250\346\210\267.svg" @@ -0,0 +1,15 @@ + + + + diff --git a/src/router/modules/supplierManagement.js b/src/router/modules/supplierManagement.js index 4ad2c80..224d6b8 100644 --- a/src/router/modules/supplierManagement.js +++ b/src/router/modules/supplierManagement.js @@ -22,7 +22,7 @@ path: '/inquiry', name: 'Inquiry', component: () => import('@/views/supplier/inquiry'), // 重定向的组件位置 - meta: { title: '资料预审', icon: '', permission: '/supplier/inquire' } + meta: { title: '资料预审', icon: '', permission: '/supplier/inquiry' } }, { path: '/review', diff --git a/src/views/business/historyBusiness.vue b/src/views/business/historyBusiness.vue index bddce18..4398baa 100644 --- a/src/views/business/historyBusiness.vue +++ b/src/views/business/historyBusiness.vue @@ -13,7 +13,7 @@
预计工期
- +
diff --git a/src/views/business/report.vue b/src/views/business/report.vue index 33c1a3d..d833399 100644 --- a/src/views/business/report.vue +++ b/src/views/business/report.vue @@ -316,12 +316,12 @@
-
+
+
添加项目需求
-
@@ -421,22 +421,27 @@ }, methods: { save() { - this.addInfo.productList = { + if(this.valiateForm()){ + this.addInfo.productList = { productCode: this.addInfo.productList.productCode, productQuantity: this.addInfo.productList.productQuantity, productPrice: this.addInfo.productList.productPrice, productName: '' } add(this.addInfo).then(res => { - console.log(res) - if (res) { + this.setData() this.$message({ message: '保存成功', type: 'success' }) - } - }) - this.setData() + }) + } else { + this.$message({ + message: '请先完整填写报备信息', + type: 'error' + }) + } + }, close() { this.setData() @@ -462,7 +467,6 @@ this.form.countyList = res }) }, - handleAddBtn() { const obj = {} obj.brandName = '' @@ -525,6 +529,12 @@ this.$set(this.showEdit, index, false) // vue添加属性的方法 } }) + row.productCode = this.addInfo.productList.productCode + row.brandName = this.brandName + console.log(this.categoryIds) + row.categoryIds = this.categoryIds + row.productQuantity = this.addInfo.productList.productQuantity + row.productPrice = this.addInfo.productList.productPrice }, setData() { this.addInfo = { @@ -553,6 +563,17 @@ agentPhone: '', productList: [] } + }, + valiateForm() { + let arr = [] + for(var item in this.addInfo) { + if(this.addInfo[item]){ + arr.push(1) + }else{ + arr.push(0) + } + } + return arr.every(item => item === 1) } } } @@ -568,7 +589,7 @@ .report-from { .from-title { - font-size: 22px; + font-size: 16px; font-weight: bold; background-color: #28739e; color: white; diff --git a/src/views/dashboard/components/dashboardHeader.vue b/src/views/dashboard/components/dashboardHeader.vue index a4262ae..93b1ca5 100644 --- a/src/views/dashboard/components/dashboardHeader.vue +++ b/src/views/dashboard/components/dashboardHeader.vue @@ -6,43 +6,42 @@ \ No newline at end of file + diff --git a/src/api/supplier/supplier.js b/src/api/supplier/supplier.js index 593b7cd..b095e09 100644 --- a/src/api/supplier/supplier.js +++ b/src/api/supplier/supplier.js @@ -14,8 +14,8 @@ return instance.post(`/supplierPreReview/listPage?${str}`, data) } // 历史预审不分页列表 -const historyInquiry = () => { - return instance.post(`/supplierPreReview/history`, {}) +const historyInquiry = (data) => { + return instance.post(`/supplierPreReview/history`, data) } // 新增 diff --git "a/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" "b/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" new file mode 100644 index 0000000..34ce236 --- /dev/null +++ "b/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" Binary files differ diff --git "a/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" "b/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" new file mode 100644 index 0000000..dd0c295 --- /dev/null +++ "b/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" Binary files differ diff --git a/src/components/echart/barChart/verticalBarChart.vue b/src/components/echart/barChart/verticalBarChart.vue index 460d923..04a0090 100644 --- a/src/components/echart/barChart/verticalBarChart.vue +++ b/src/components/echart/barChart/verticalBarChart.vue @@ -2,21 +2,7 @@ - - diff --git a/src/components/mycomponent/dialog/inquiryDialog.vue b/src/components/mycomponent/dialog/inquiryDialog.vue deleted file mode 100644 index a8834ef..0000000 --- a/src/components/mycomponent/dialog/inquiryDialog.vue +++ /dev/null @@ -1,228 +0,0 @@ - - - - - - diff --git a/src/components/mycomponent/dialog/server/operationAddDialog.vue b/src/components/mycomponent/dialog/server/operationAddDialog.vue index dfefe42..d436541 100644 --- a/src/components/mycomponent/dialog/server/operationAddDialog.vue +++ b/src/components/mycomponent/dialog/server/operationAddDialog.vue @@ -11,13 +11,14 @@ width="300px" class="inputWidth" style="justify-content: space-between;" + v-model="form.date" />
- +
- +
- +
@@ -100,16 +102,37 @@ RedStar, InputVue }, + data(){ + return{ + form:{ + date:'', // 服务运营编号 + name:'', // 服务名称 + address:'', // 收费 + address1:'', // 优惠 + address2:'', // 日期 + mark:'', // 备注 + } + } + }, props: { isShowInfo: { type: Boolean, default: true - } + }, }, methods: { close() { this.$emit('close') - } + }, + init(detail){ + if(detail.name){ + this.form.address = detail.address + this.form.address1 = detail.address1 + this.form.address2 = detail.address2 + this.form.date = detail.date + this.form.name = detail.name + } + }, } } diff --git a/src/icons/svg/cockpit-approved.svg b/src/icons/svg/cockpit-approved.svg new file mode 100644 index 0000000..634d7a8 --- /dev/null +++ b/src/icons/svg/cockpit-approved.svg @@ -0,0 +1,18 @@ + + + + diff --git a/src/icons/svg/cockpit-device-pan-check.svg b/src/icons/svg/cockpit-device-pan-check.svg new file mode 100644 index 0000000..5ad7f6b --- /dev/null +++ b/src/icons/svg/cockpit-device-pan-check.svg @@ -0,0 +1,13 @@ + + diff --git a/src/icons/svg/cockpit-device-pan-no.svg b/src/icons/svg/cockpit-device-pan-no.svg new file mode 100644 index 0000000..6713e2a --- /dev/null +++ b/src/icons/svg/cockpit-device-pan-no.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-device-register.svg b/src/icons/svg/cockpit-device-register.svg new file mode 100644 index 0000000..baa2355 --- /dev/null +++ b/src/icons/svg/cockpit-device-register.svg @@ -0,0 +1,65 @@ + + + + diff --git a/src/icons/svg/cockpit-device-total.svg b/src/icons/svg/cockpit-device-total.svg new file mode 100644 index 0000000..aa7788c --- /dev/null +++ b/src/icons/svg/cockpit-device-total.svg @@ -0,0 +1,59 @@ + + + + diff --git a/src/icons/svg/cockpit-distributor-pan-check.svg b/src/icons/svg/cockpit-distributor-pan-check.svg new file mode 100644 index 0000000..f4fa54e --- /dev/null +++ b/src/icons/svg/cockpit-distributor-pan-check.svg @@ -0,0 +1,15 @@ + + + + diff --git a/src/icons/svg/cockpit-distributor-pan-no.svg b/src/icons/svg/cockpit-distributor-pan-no.svg new file mode 100644 index 0000000..b10bdfe --- /dev/null +++ b/src/icons/svg/cockpit-distributor-pan-no.svg @@ -0,0 +1,15 @@ + + + + diff --git a/src/icons/svg/cockpit-lot-count.svg b/src/icons/svg/cockpit-lot-count.svg new file mode 100644 index 0000000..b4e743f --- /dev/null +++ b/src/icons/svg/cockpit-lot-count.svg @@ -0,0 +1,92 @@ + + + + diff --git a/src/icons/svg/cockpit-lot-online.svg b/src/icons/svg/cockpit-lot-online.svg new file mode 100644 index 0000000..0da6791 --- /dev/null +++ b/src/icons/svg/cockpit-lot-online.svg @@ -0,0 +1,62 @@ + + + + diff --git a/src/icons/svg/cockpit-supplier-pan-check.svg b/src/icons/svg/cockpit-supplier-pan-check.svg new file mode 100644 index 0000000..6d6756f --- /dev/null +++ b/src/icons/svg/cockpit-supplier-pan-check.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-supplier-pan-no.svg b/src/icons/svg/cockpit-supplier-pan-no.svg new file mode 100644 index 0000000..c9c869e --- /dev/null +++ b/src/icons/svg/cockpit-supplier-pan-no.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-supplier-register.svg b/src/icons/svg/cockpit-supplier-register.svg new file mode 100644 index 0000000..a6e193c --- /dev/null +++ b/src/icons/svg/cockpit-supplier-register.svg @@ -0,0 +1,17 @@ + + + + diff --git "a/src/icons/svg/cockpit-\344\276\233\345\272\224\345\225\206.svg" "b/src/icons/svg/cockpit-\344\276\233\345\272\224\345\225\206.svg" new file mode 100644 index 0000000..ca42dee --- /dev/null +++ "b/src/icons/svg/cockpit-\344\276\233\345\272\224\345\225\206.svg" @@ -0,0 +1,38 @@ + + + + diff --git "a/src/icons/svg/cockpit-\345\210\206\345\255\220\345\205\254\345\217\270.svg" "b/src/icons/svg/cockpit-\345\210\206\345\255\220\345\205\254\345\217\270.svg" new file mode 100644 index 0000000..b39c00f --- /dev/null +++ "b/src/icons/svg/cockpit-\345\210\206\345\255\220\345\205\254\345\217\270.svg" @@ -0,0 +1,16 @@ + + + + diff --git "a/src/icons/svg/cockpit-\346\231\256\351\200\232\347\256\241\347\220\206\350\247\222\350\211\262.svg" "b/src/icons/svg/cockpit-\346\231\256\351\200\232\347\256\241\347\220\206\350\247\222\350\211\262.svg" new file mode 100644 index 0000000..99c6837 --- /dev/null +++ "b/src/icons/svg/cockpit-\346\231\256\351\200\232\347\256\241\347\220\206\350\247\222\350\211\262.svg" @@ -0,0 +1,15 @@ + + + + diff --git "a/src/icons/svg/cockpit-\347\247\273\345\212\250\347\253\257\347\224\250\346\210\267.svg" "b/src/icons/svg/cockpit-\347\247\273\345\212\250\347\253\257\347\224\250\346\210\267.svg" new file mode 100644 index 0000000..e287570 --- /dev/null +++ "b/src/icons/svg/cockpit-\347\247\273\345\212\250\347\253\257\347\224\250\346\210\267.svg" @@ -0,0 +1,13 @@ + + + + diff --git "a/src/icons/svg/cockpit-\347\273\217\351\224\200\345\225\206.svg" "b/src/icons/svg/cockpit-\347\273\217\351\224\200\345\225\206.svg" new file mode 100644 index 0000000..fef7f56 --- /dev/null +++ "b/src/icons/svg/cockpit-\347\273\217\351\224\200\345\225\206.svg" @@ -0,0 +1,13 @@ + + + + diff --git "a/src/icons/svg/cockpit-\351\233\206\345\233\242.svg" "b/src/icons/svg/cockpit-\351\233\206\345\233\242.svg" new file mode 100644 index 0000000..48e8006 --- /dev/null +++ "b/src/icons/svg/cockpit-\351\233\206\345\233\242.svg" @@ -0,0 +1,14 @@ + + + + diff --git "a/src/icons/svg/cockpit-\351\233\206\345\233\242\347\224\250\346\210\267.svg" "b/src/icons/svg/cockpit-\351\233\206\345\233\242\347\224\250\346\210\267.svg" new file mode 100644 index 0000000..86f0776 --- /dev/null +++ "b/src/icons/svg/cockpit-\351\233\206\345\233\242\347\224\250\346\210\267.svg" @@ -0,0 +1,15 @@ + + + + diff --git a/src/router/modules/supplierManagement.js b/src/router/modules/supplierManagement.js index 4ad2c80..224d6b8 100644 --- a/src/router/modules/supplierManagement.js +++ b/src/router/modules/supplierManagement.js @@ -22,7 +22,7 @@ path: '/inquiry', name: 'Inquiry', component: () => import('@/views/supplier/inquiry'), // 重定向的组件位置 - meta: { title: '资料预审', icon: '', permission: '/supplier/inquire' } + meta: { title: '资料预审', icon: '', permission: '/supplier/inquiry' } }, { path: '/review', diff --git a/src/views/business/historyBusiness.vue b/src/views/business/historyBusiness.vue index bddce18..4398baa 100644 --- a/src/views/business/historyBusiness.vue +++ b/src/views/business/historyBusiness.vue @@ -13,7 +13,7 @@
预计工期
- +
diff --git a/src/views/business/report.vue b/src/views/business/report.vue index 33c1a3d..d833399 100644 --- a/src/views/business/report.vue +++ b/src/views/business/report.vue @@ -316,12 +316,12 @@
-
+
+
添加项目需求
-
@@ -421,22 +421,27 @@ }, methods: { save() { - this.addInfo.productList = { + if(this.valiateForm()){ + this.addInfo.productList = { productCode: this.addInfo.productList.productCode, productQuantity: this.addInfo.productList.productQuantity, productPrice: this.addInfo.productList.productPrice, productName: '' } add(this.addInfo).then(res => { - console.log(res) - if (res) { + this.setData() this.$message({ message: '保存成功', type: 'success' }) - } - }) - this.setData() + }) + } else { + this.$message({ + message: '请先完整填写报备信息', + type: 'error' + }) + } + }, close() { this.setData() @@ -462,7 +467,6 @@ this.form.countyList = res }) }, - handleAddBtn() { const obj = {} obj.brandName = '' @@ -525,6 +529,12 @@ this.$set(this.showEdit, index, false) // vue添加属性的方法 } }) + row.productCode = this.addInfo.productList.productCode + row.brandName = this.brandName + console.log(this.categoryIds) + row.categoryIds = this.categoryIds + row.productQuantity = this.addInfo.productList.productQuantity + row.productPrice = this.addInfo.productList.productPrice }, setData() { this.addInfo = { @@ -553,6 +563,17 @@ agentPhone: '', productList: [] } + }, + valiateForm() { + let arr = [] + for(var item in this.addInfo) { + if(this.addInfo[item]){ + arr.push(1) + }else{ + arr.push(0) + } + } + return arr.every(item => item === 1) } } } @@ -568,7 +589,7 @@ .report-from { .from-title { - font-size: 22px; + font-size: 16px; font-weight: bold; background-color: #28739e; color: white; diff --git a/src/views/dashboard/components/dashboardHeader.vue b/src/views/dashboard/components/dashboardHeader.vue index a4262ae..93b1ca5 100644 --- a/src/views/dashboard/components/dashboardHeader.vue +++ b/src/views/dashboard/components/dashboardHeader.vue @@ -6,43 +6,42 @@ \ No newline at end of file + diff --git a/src/views/dashboard/components/deviceList.vue b/src/views/dashboard/components/deviceList.vue index a7c11e1..23c5f15 100644 --- a/src/views/dashboard/components/deviceList.vue +++ b/src/views/dashboard/components/deviceList.vue @@ -1,21 +1,16 @@ - - - - \ No newline at end of file + diff --git a/src/api/supplier/supplier.js b/src/api/supplier/supplier.js index 593b7cd..b095e09 100644 --- a/src/api/supplier/supplier.js +++ b/src/api/supplier/supplier.js @@ -14,8 +14,8 @@ return instance.post(`/supplierPreReview/listPage?${str}`, data) } // 历史预审不分页列表 -const historyInquiry = () => { - return instance.post(`/supplierPreReview/history`, {}) +const historyInquiry = (data) => { + return instance.post(`/supplierPreReview/history`, data) } // 新增 diff --git "a/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" "b/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" new file mode 100644 index 0000000..34ce236 --- /dev/null +++ "b/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" Binary files differ diff --git "a/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" "b/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" new file mode 100644 index 0000000..dd0c295 --- /dev/null +++ "b/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" Binary files differ diff --git a/src/components/echart/barChart/verticalBarChart.vue b/src/components/echart/barChart/verticalBarChart.vue index 460d923..04a0090 100644 --- a/src/components/echart/barChart/verticalBarChart.vue +++ b/src/components/echart/barChart/verticalBarChart.vue @@ -2,21 +2,7 @@ - - diff --git a/src/components/mycomponent/dialog/inquiryDialog.vue b/src/components/mycomponent/dialog/inquiryDialog.vue deleted file mode 100644 index a8834ef..0000000 --- a/src/components/mycomponent/dialog/inquiryDialog.vue +++ /dev/null @@ -1,228 +0,0 @@ - - - - - - diff --git a/src/components/mycomponent/dialog/server/operationAddDialog.vue b/src/components/mycomponent/dialog/server/operationAddDialog.vue index dfefe42..d436541 100644 --- a/src/components/mycomponent/dialog/server/operationAddDialog.vue +++ b/src/components/mycomponent/dialog/server/operationAddDialog.vue @@ -11,13 +11,14 @@ width="300px" class="inputWidth" style="justify-content: space-between;" + v-model="form.date" />
- +
- +
- +
@@ -100,16 +102,37 @@ RedStar, InputVue }, + data(){ + return{ + form:{ + date:'', // 服务运营编号 + name:'', // 服务名称 + address:'', // 收费 + address1:'', // 优惠 + address2:'', // 日期 + mark:'', // 备注 + } + } + }, props: { isShowInfo: { type: Boolean, default: true - } + }, }, methods: { close() { this.$emit('close') - } + }, + init(detail){ + if(detail.name){ + this.form.address = detail.address + this.form.address1 = detail.address1 + this.form.address2 = detail.address2 + this.form.date = detail.date + this.form.name = detail.name + } + }, } } diff --git a/src/icons/svg/cockpit-approved.svg b/src/icons/svg/cockpit-approved.svg new file mode 100644 index 0000000..634d7a8 --- /dev/null +++ b/src/icons/svg/cockpit-approved.svg @@ -0,0 +1,18 @@ + + + + diff --git a/src/icons/svg/cockpit-device-pan-check.svg b/src/icons/svg/cockpit-device-pan-check.svg new file mode 100644 index 0000000..5ad7f6b --- /dev/null +++ b/src/icons/svg/cockpit-device-pan-check.svg @@ -0,0 +1,13 @@ + + diff --git a/src/icons/svg/cockpit-device-pan-no.svg b/src/icons/svg/cockpit-device-pan-no.svg new file mode 100644 index 0000000..6713e2a --- /dev/null +++ b/src/icons/svg/cockpit-device-pan-no.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-device-register.svg b/src/icons/svg/cockpit-device-register.svg new file mode 100644 index 0000000..baa2355 --- /dev/null +++ b/src/icons/svg/cockpit-device-register.svg @@ -0,0 +1,65 @@ + + + + diff --git a/src/icons/svg/cockpit-device-total.svg b/src/icons/svg/cockpit-device-total.svg new file mode 100644 index 0000000..aa7788c --- /dev/null +++ b/src/icons/svg/cockpit-device-total.svg @@ -0,0 +1,59 @@ + + + + diff --git a/src/icons/svg/cockpit-distributor-pan-check.svg b/src/icons/svg/cockpit-distributor-pan-check.svg new file mode 100644 index 0000000..f4fa54e --- /dev/null +++ b/src/icons/svg/cockpit-distributor-pan-check.svg @@ -0,0 +1,15 @@ + + + + diff --git a/src/icons/svg/cockpit-distributor-pan-no.svg b/src/icons/svg/cockpit-distributor-pan-no.svg new file mode 100644 index 0000000..b10bdfe --- /dev/null +++ b/src/icons/svg/cockpit-distributor-pan-no.svg @@ -0,0 +1,15 @@ + + + + diff --git a/src/icons/svg/cockpit-lot-count.svg b/src/icons/svg/cockpit-lot-count.svg new file mode 100644 index 0000000..b4e743f --- /dev/null +++ b/src/icons/svg/cockpit-lot-count.svg @@ -0,0 +1,92 @@ + + + + diff --git a/src/icons/svg/cockpit-lot-online.svg b/src/icons/svg/cockpit-lot-online.svg new file mode 100644 index 0000000..0da6791 --- /dev/null +++ b/src/icons/svg/cockpit-lot-online.svg @@ -0,0 +1,62 @@ + + + + diff --git a/src/icons/svg/cockpit-supplier-pan-check.svg b/src/icons/svg/cockpit-supplier-pan-check.svg new file mode 100644 index 0000000..6d6756f --- /dev/null +++ b/src/icons/svg/cockpit-supplier-pan-check.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-supplier-pan-no.svg b/src/icons/svg/cockpit-supplier-pan-no.svg new file mode 100644 index 0000000..c9c869e --- /dev/null +++ b/src/icons/svg/cockpit-supplier-pan-no.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-supplier-register.svg b/src/icons/svg/cockpit-supplier-register.svg new file mode 100644 index 0000000..a6e193c --- /dev/null +++ b/src/icons/svg/cockpit-supplier-register.svg @@ -0,0 +1,17 @@ + + + + diff --git "a/src/icons/svg/cockpit-\344\276\233\345\272\224\345\225\206.svg" "b/src/icons/svg/cockpit-\344\276\233\345\272\224\345\225\206.svg" new file mode 100644 index 0000000..ca42dee --- /dev/null +++ "b/src/icons/svg/cockpit-\344\276\233\345\272\224\345\225\206.svg" @@ -0,0 +1,38 @@ + + + + diff --git "a/src/icons/svg/cockpit-\345\210\206\345\255\220\345\205\254\345\217\270.svg" "b/src/icons/svg/cockpit-\345\210\206\345\255\220\345\205\254\345\217\270.svg" new file mode 100644 index 0000000..b39c00f --- /dev/null +++ "b/src/icons/svg/cockpit-\345\210\206\345\255\220\345\205\254\345\217\270.svg" @@ -0,0 +1,16 @@ + + + + diff --git "a/src/icons/svg/cockpit-\346\231\256\351\200\232\347\256\241\347\220\206\350\247\222\350\211\262.svg" "b/src/icons/svg/cockpit-\346\231\256\351\200\232\347\256\241\347\220\206\350\247\222\350\211\262.svg" new file mode 100644 index 0000000..99c6837 --- /dev/null +++ "b/src/icons/svg/cockpit-\346\231\256\351\200\232\347\256\241\347\220\206\350\247\222\350\211\262.svg" @@ -0,0 +1,15 @@ + + + + diff --git "a/src/icons/svg/cockpit-\347\247\273\345\212\250\347\253\257\347\224\250\346\210\267.svg" "b/src/icons/svg/cockpit-\347\247\273\345\212\250\347\253\257\347\224\250\346\210\267.svg" new file mode 100644 index 0000000..e287570 --- /dev/null +++ "b/src/icons/svg/cockpit-\347\247\273\345\212\250\347\253\257\347\224\250\346\210\267.svg" @@ -0,0 +1,13 @@ + + + + diff --git "a/src/icons/svg/cockpit-\347\273\217\351\224\200\345\225\206.svg" "b/src/icons/svg/cockpit-\347\273\217\351\224\200\345\225\206.svg" new file mode 100644 index 0000000..fef7f56 --- /dev/null +++ "b/src/icons/svg/cockpit-\347\273\217\351\224\200\345\225\206.svg" @@ -0,0 +1,13 @@ + + + + diff --git "a/src/icons/svg/cockpit-\351\233\206\345\233\242.svg" "b/src/icons/svg/cockpit-\351\233\206\345\233\242.svg" new file mode 100644 index 0000000..48e8006 --- /dev/null +++ "b/src/icons/svg/cockpit-\351\233\206\345\233\242.svg" @@ -0,0 +1,14 @@ + + + + diff --git "a/src/icons/svg/cockpit-\351\233\206\345\233\242\347\224\250\346\210\267.svg" "b/src/icons/svg/cockpit-\351\233\206\345\233\242\347\224\250\346\210\267.svg" new file mode 100644 index 0000000..86f0776 --- /dev/null +++ "b/src/icons/svg/cockpit-\351\233\206\345\233\242\347\224\250\346\210\267.svg" @@ -0,0 +1,15 @@ + + + + diff --git a/src/router/modules/supplierManagement.js b/src/router/modules/supplierManagement.js index 4ad2c80..224d6b8 100644 --- a/src/router/modules/supplierManagement.js +++ b/src/router/modules/supplierManagement.js @@ -22,7 +22,7 @@ path: '/inquiry', name: 'Inquiry', component: () => import('@/views/supplier/inquiry'), // 重定向的组件位置 - meta: { title: '资料预审', icon: '', permission: '/supplier/inquire' } + meta: { title: '资料预审', icon: '', permission: '/supplier/inquiry' } }, { path: '/review', diff --git a/src/views/business/historyBusiness.vue b/src/views/business/historyBusiness.vue index bddce18..4398baa 100644 --- a/src/views/business/historyBusiness.vue +++ b/src/views/business/historyBusiness.vue @@ -13,7 +13,7 @@
预计工期
- +
diff --git a/src/views/business/report.vue b/src/views/business/report.vue index 33c1a3d..d833399 100644 --- a/src/views/business/report.vue +++ b/src/views/business/report.vue @@ -316,12 +316,12 @@
-
+
+
添加项目需求
-
@@ -421,22 +421,27 @@ }, methods: { save() { - this.addInfo.productList = { + if(this.valiateForm()){ + this.addInfo.productList = { productCode: this.addInfo.productList.productCode, productQuantity: this.addInfo.productList.productQuantity, productPrice: this.addInfo.productList.productPrice, productName: '' } add(this.addInfo).then(res => { - console.log(res) - if (res) { + this.setData() this.$message({ message: '保存成功', type: 'success' }) - } - }) - this.setData() + }) + } else { + this.$message({ + message: '请先完整填写报备信息', + type: 'error' + }) + } + }, close() { this.setData() @@ -462,7 +467,6 @@ this.form.countyList = res }) }, - handleAddBtn() { const obj = {} obj.brandName = '' @@ -525,6 +529,12 @@ this.$set(this.showEdit, index, false) // vue添加属性的方法 } }) + row.productCode = this.addInfo.productList.productCode + row.brandName = this.brandName + console.log(this.categoryIds) + row.categoryIds = this.categoryIds + row.productQuantity = this.addInfo.productList.productQuantity + row.productPrice = this.addInfo.productList.productPrice }, setData() { this.addInfo = { @@ -553,6 +563,17 @@ agentPhone: '', productList: [] } + }, + valiateForm() { + let arr = [] + for(var item in this.addInfo) { + if(this.addInfo[item]){ + arr.push(1) + }else{ + arr.push(0) + } + } + return arr.every(item => item === 1) } } } @@ -568,7 +589,7 @@ .report-from { .from-title { - font-size: 22px; + font-size: 16px; font-weight: bold; background-color: #28739e; color: white; diff --git a/src/views/dashboard/components/dashboardHeader.vue b/src/views/dashboard/components/dashboardHeader.vue index a4262ae..93b1ca5 100644 --- a/src/views/dashboard/components/dashboardHeader.vue +++ b/src/views/dashboard/components/dashboardHeader.vue @@ -6,43 +6,42 @@ \ No newline at end of file + diff --git a/src/views/dashboard/components/deviceList.vue b/src/views/dashboard/components/deviceList.vue index a7c11e1..23c5f15 100644 --- a/src/views/dashboard/components/deviceList.vue +++ b/src/views/dashboard/components/deviceList.vue @@ -1,21 +1,16 @@ - - - - \ No newline at end of file + diff --git a/src/views/dashboard/components/layoutChartDoughnu.vue b/src/views/dashboard/components/layoutChartDoughnu.vue index 7906430..9d3214e 100644 --- a/src/views/dashboard/components/layoutChartDoughnu.vue +++ b/src/views/dashboard/components/layoutChartDoughnu.vue @@ -3,9 +3,9 @@
- + 设备分类统计
-
+
@@ -25,10 +25,6 @@ type: String, default: "", }, - width:{ - type: String, - default: "500px" - }, height:{ type: String, default: "250px" @@ -63,11 +59,14 @@ diff --git a/src/components/mycomponent/dialog/inquiryDialog.vue b/src/components/mycomponent/dialog/inquiryDialog.vue deleted file mode 100644 index a8834ef..0000000 --- a/src/components/mycomponent/dialog/inquiryDialog.vue +++ /dev/null @@ -1,228 +0,0 @@ - - - - - - diff --git a/src/components/mycomponent/dialog/server/operationAddDialog.vue b/src/components/mycomponent/dialog/server/operationAddDialog.vue index dfefe42..d436541 100644 --- a/src/components/mycomponent/dialog/server/operationAddDialog.vue +++ b/src/components/mycomponent/dialog/server/operationAddDialog.vue @@ -11,13 +11,14 @@ width="300px" class="inputWidth" style="justify-content: space-between;" + v-model="form.date" />
- +
- +
- +
@@ -100,16 +102,37 @@ RedStar, InputVue }, + data(){ + return{ + form:{ + date:'', // 服务运营编号 + name:'', // 服务名称 + address:'', // 收费 + address1:'', // 优惠 + address2:'', // 日期 + mark:'', // 备注 + } + } + }, props: { isShowInfo: { type: Boolean, default: true - } + }, }, methods: { close() { this.$emit('close') - } + }, + init(detail){ + if(detail.name){ + this.form.address = detail.address + this.form.address1 = detail.address1 + this.form.address2 = detail.address2 + this.form.date = detail.date + this.form.name = detail.name + } + }, } } diff --git a/src/icons/svg/cockpit-approved.svg b/src/icons/svg/cockpit-approved.svg new file mode 100644 index 0000000..634d7a8 --- /dev/null +++ b/src/icons/svg/cockpit-approved.svg @@ -0,0 +1,18 @@ + + + + diff --git a/src/icons/svg/cockpit-device-pan-check.svg b/src/icons/svg/cockpit-device-pan-check.svg new file mode 100644 index 0000000..5ad7f6b --- /dev/null +++ b/src/icons/svg/cockpit-device-pan-check.svg @@ -0,0 +1,13 @@ + + diff --git a/src/icons/svg/cockpit-device-pan-no.svg b/src/icons/svg/cockpit-device-pan-no.svg new file mode 100644 index 0000000..6713e2a --- /dev/null +++ b/src/icons/svg/cockpit-device-pan-no.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-device-register.svg b/src/icons/svg/cockpit-device-register.svg new file mode 100644 index 0000000..baa2355 --- /dev/null +++ b/src/icons/svg/cockpit-device-register.svg @@ -0,0 +1,65 @@ + + + + diff --git a/src/icons/svg/cockpit-device-total.svg b/src/icons/svg/cockpit-device-total.svg new file mode 100644 index 0000000..aa7788c --- /dev/null +++ b/src/icons/svg/cockpit-device-total.svg @@ -0,0 +1,59 @@ + + + + diff --git a/src/icons/svg/cockpit-distributor-pan-check.svg b/src/icons/svg/cockpit-distributor-pan-check.svg new file mode 100644 index 0000000..f4fa54e --- /dev/null +++ b/src/icons/svg/cockpit-distributor-pan-check.svg @@ -0,0 +1,15 @@ + + + + diff --git a/src/icons/svg/cockpit-distributor-pan-no.svg b/src/icons/svg/cockpit-distributor-pan-no.svg new file mode 100644 index 0000000..b10bdfe --- /dev/null +++ b/src/icons/svg/cockpit-distributor-pan-no.svg @@ -0,0 +1,15 @@ + + + + diff --git a/src/icons/svg/cockpit-lot-count.svg b/src/icons/svg/cockpit-lot-count.svg new file mode 100644 index 0000000..b4e743f --- /dev/null +++ b/src/icons/svg/cockpit-lot-count.svg @@ -0,0 +1,92 @@ + + + + diff --git a/src/icons/svg/cockpit-lot-online.svg b/src/icons/svg/cockpit-lot-online.svg new file mode 100644 index 0000000..0da6791 --- /dev/null +++ b/src/icons/svg/cockpit-lot-online.svg @@ -0,0 +1,62 @@ + + + + diff --git a/src/icons/svg/cockpit-supplier-pan-check.svg b/src/icons/svg/cockpit-supplier-pan-check.svg new file mode 100644 index 0000000..6d6756f --- /dev/null +++ b/src/icons/svg/cockpit-supplier-pan-check.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-supplier-pan-no.svg b/src/icons/svg/cockpit-supplier-pan-no.svg new file mode 100644 index 0000000..c9c869e --- /dev/null +++ b/src/icons/svg/cockpit-supplier-pan-no.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-supplier-register.svg b/src/icons/svg/cockpit-supplier-register.svg new file mode 100644 index 0000000..a6e193c --- /dev/null +++ b/src/icons/svg/cockpit-supplier-register.svg @@ -0,0 +1,17 @@ + + + + diff --git "a/src/icons/svg/cockpit-\344\276\233\345\272\224\345\225\206.svg" "b/src/icons/svg/cockpit-\344\276\233\345\272\224\345\225\206.svg" new file mode 100644 index 0000000..ca42dee --- /dev/null +++ "b/src/icons/svg/cockpit-\344\276\233\345\272\224\345\225\206.svg" @@ -0,0 +1,38 @@ + + + + diff --git "a/src/icons/svg/cockpit-\345\210\206\345\255\220\345\205\254\345\217\270.svg" "b/src/icons/svg/cockpit-\345\210\206\345\255\220\345\205\254\345\217\270.svg" new file mode 100644 index 0000000..b39c00f --- /dev/null +++ "b/src/icons/svg/cockpit-\345\210\206\345\255\220\345\205\254\345\217\270.svg" @@ -0,0 +1,16 @@ + + + + diff --git "a/src/icons/svg/cockpit-\346\231\256\351\200\232\347\256\241\347\220\206\350\247\222\350\211\262.svg" "b/src/icons/svg/cockpit-\346\231\256\351\200\232\347\256\241\347\220\206\350\247\222\350\211\262.svg" new file mode 100644 index 0000000..99c6837 --- /dev/null +++ "b/src/icons/svg/cockpit-\346\231\256\351\200\232\347\256\241\347\220\206\350\247\222\350\211\262.svg" @@ -0,0 +1,15 @@ + + + + diff --git "a/src/icons/svg/cockpit-\347\247\273\345\212\250\347\253\257\347\224\250\346\210\267.svg" "b/src/icons/svg/cockpit-\347\247\273\345\212\250\347\253\257\347\224\250\346\210\267.svg" new file mode 100644 index 0000000..e287570 --- /dev/null +++ "b/src/icons/svg/cockpit-\347\247\273\345\212\250\347\253\257\347\224\250\346\210\267.svg" @@ -0,0 +1,13 @@ + + + + diff --git "a/src/icons/svg/cockpit-\347\273\217\351\224\200\345\225\206.svg" "b/src/icons/svg/cockpit-\347\273\217\351\224\200\345\225\206.svg" new file mode 100644 index 0000000..fef7f56 --- /dev/null +++ "b/src/icons/svg/cockpit-\347\273\217\351\224\200\345\225\206.svg" @@ -0,0 +1,13 @@ + + + + diff --git "a/src/icons/svg/cockpit-\351\233\206\345\233\242.svg" "b/src/icons/svg/cockpit-\351\233\206\345\233\242.svg" new file mode 100644 index 0000000..48e8006 --- /dev/null +++ "b/src/icons/svg/cockpit-\351\233\206\345\233\242.svg" @@ -0,0 +1,14 @@ + + + + diff --git "a/src/icons/svg/cockpit-\351\233\206\345\233\242\347\224\250\346\210\267.svg" "b/src/icons/svg/cockpit-\351\233\206\345\233\242\347\224\250\346\210\267.svg" new file mode 100644 index 0000000..86f0776 --- /dev/null +++ "b/src/icons/svg/cockpit-\351\233\206\345\233\242\347\224\250\346\210\267.svg" @@ -0,0 +1,15 @@ + + + + diff --git a/src/router/modules/supplierManagement.js b/src/router/modules/supplierManagement.js index 4ad2c80..224d6b8 100644 --- a/src/router/modules/supplierManagement.js +++ b/src/router/modules/supplierManagement.js @@ -22,7 +22,7 @@ path: '/inquiry', name: 'Inquiry', component: () => import('@/views/supplier/inquiry'), // 重定向的组件位置 - meta: { title: '资料预审', icon: '', permission: '/supplier/inquire' } + meta: { title: '资料预审', icon: '', permission: '/supplier/inquiry' } }, { path: '/review', diff --git a/src/views/business/historyBusiness.vue b/src/views/business/historyBusiness.vue index bddce18..4398baa 100644 --- a/src/views/business/historyBusiness.vue +++ b/src/views/business/historyBusiness.vue @@ -13,7 +13,7 @@
预计工期
- +
diff --git a/src/views/business/report.vue b/src/views/business/report.vue index 33c1a3d..d833399 100644 --- a/src/views/business/report.vue +++ b/src/views/business/report.vue @@ -316,12 +316,12 @@
-
+
+
添加项目需求
-
@@ -421,22 +421,27 @@ }, methods: { save() { - this.addInfo.productList = { + if(this.valiateForm()){ + this.addInfo.productList = { productCode: this.addInfo.productList.productCode, productQuantity: this.addInfo.productList.productQuantity, productPrice: this.addInfo.productList.productPrice, productName: '' } add(this.addInfo).then(res => { - console.log(res) - if (res) { + this.setData() this.$message({ message: '保存成功', type: 'success' }) - } - }) - this.setData() + }) + } else { + this.$message({ + message: '请先完整填写报备信息', + type: 'error' + }) + } + }, close() { this.setData() @@ -462,7 +467,6 @@ this.form.countyList = res }) }, - handleAddBtn() { const obj = {} obj.brandName = '' @@ -525,6 +529,12 @@ this.$set(this.showEdit, index, false) // vue添加属性的方法 } }) + row.productCode = this.addInfo.productList.productCode + row.brandName = this.brandName + console.log(this.categoryIds) + row.categoryIds = this.categoryIds + row.productQuantity = this.addInfo.productList.productQuantity + row.productPrice = this.addInfo.productList.productPrice }, setData() { this.addInfo = { @@ -553,6 +563,17 @@ agentPhone: '', productList: [] } + }, + valiateForm() { + let arr = [] + for(var item in this.addInfo) { + if(this.addInfo[item]){ + arr.push(1) + }else{ + arr.push(0) + } + } + return arr.every(item => item === 1) } } } @@ -568,7 +589,7 @@ .report-from { .from-title { - font-size: 22px; + font-size: 16px; font-weight: bold; background-color: #28739e; color: white; diff --git a/src/views/dashboard/components/dashboardHeader.vue b/src/views/dashboard/components/dashboardHeader.vue index a4262ae..93b1ca5 100644 --- a/src/views/dashboard/components/dashboardHeader.vue +++ b/src/views/dashboard/components/dashboardHeader.vue @@ -6,43 +6,42 @@ \ No newline at end of file + diff --git a/src/views/dashboard/components/deviceList.vue b/src/views/dashboard/components/deviceList.vue index a7c11e1..23c5f15 100644 --- a/src/views/dashboard/components/deviceList.vue +++ b/src/views/dashboard/components/deviceList.vue @@ -1,21 +1,16 @@ - - - - \ No newline at end of file + diff --git a/src/views/dashboard/components/layoutChartDoughnu.vue b/src/views/dashboard/components/layoutChartDoughnu.vue index 7906430..9d3214e 100644 --- a/src/views/dashboard/components/layoutChartDoughnu.vue +++ b/src/views/dashboard/components/layoutChartDoughnu.vue @@ -3,9 +3,9 @@
- + 设备分类统计
-
+
@@ -25,10 +25,6 @@ type: String, default: "", }, - width:{ - type: String, - default: "500px" - }, height:{ type: String, default: "250px" @@ -63,11 +59,14 @@ diff --git a/src/components/mycomponent/dialog/inquiryDialog.vue b/src/components/mycomponent/dialog/inquiryDialog.vue deleted file mode 100644 index a8834ef..0000000 --- a/src/components/mycomponent/dialog/inquiryDialog.vue +++ /dev/null @@ -1,228 +0,0 @@ - - - - - - diff --git a/src/components/mycomponent/dialog/server/operationAddDialog.vue b/src/components/mycomponent/dialog/server/operationAddDialog.vue index dfefe42..d436541 100644 --- a/src/components/mycomponent/dialog/server/operationAddDialog.vue +++ b/src/components/mycomponent/dialog/server/operationAddDialog.vue @@ -11,13 +11,14 @@ width="300px" class="inputWidth" style="justify-content: space-between;" + v-model="form.date" />
- +
- +
- +
@@ -100,16 +102,37 @@ RedStar, InputVue }, + data(){ + return{ + form:{ + date:'', // 服务运营编号 + name:'', // 服务名称 + address:'', // 收费 + address1:'', // 优惠 + address2:'', // 日期 + mark:'', // 备注 + } + } + }, props: { isShowInfo: { type: Boolean, default: true - } + }, }, methods: { close() { this.$emit('close') - } + }, + init(detail){ + if(detail.name){ + this.form.address = detail.address + this.form.address1 = detail.address1 + this.form.address2 = detail.address2 + this.form.date = detail.date + this.form.name = detail.name + } + }, } } diff --git a/src/icons/svg/cockpit-approved.svg b/src/icons/svg/cockpit-approved.svg new file mode 100644 index 0000000..634d7a8 --- /dev/null +++ b/src/icons/svg/cockpit-approved.svg @@ -0,0 +1,18 @@ + + + + diff --git a/src/icons/svg/cockpit-device-pan-check.svg b/src/icons/svg/cockpit-device-pan-check.svg new file mode 100644 index 0000000..5ad7f6b --- /dev/null +++ b/src/icons/svg/cockpit-device-pan-check.svg @@ -0,0 +1,13 @@ + + diff --git a/src/icons/svg/cockpit-device-pan-no.svg b/src/icons/svg/cockpit-device-pan-no.svg new file mode 100644 index 0000000..6713e2a --- /dev/null +++ b/src/icons/svg/cockpit-device-pan-no.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-device-register.svg b/src/icons/svg/cockpit-device-register.svg new file mode 100644 index 0000000..baa2355 --- /dev/null +++ b/src/icons/svg/cockpit-device-register.svg @@ -0,0 +1,65 @@ + + + + diff --git a/src/icons/svg/cockpit-device-total.svg b/src/icons/svg/cockpit-device-total.svg new file mode 100644 index 0000000..aa7788c --- /dev/null +++ b/src/icons/svg/cockpit-device-total.svg @@ -0,0 +1,59 @@ + + + + diff --git a/src/icons/svg/cockpit-distributor-pan-check.svg b/src/icons/svg/cockpit-distributor-pan-check.svg new file mode 100644 index 0000000..f4fa54e --- /dev/null +++ b/src/icons/svg/cockpit-distributor-pan-check.svg @@ -0,0 +1,15 @@ + + + + diff --git a/src/icons/svg/cockpit-distributor-pan-no.svg b/src/icons/svg/cockpit-distributor-pan-no.svg new file mode 100644 index 0000000..b10bdfe --- /dev/null +++ b/src/icons/svg/cockpit-distributor-pan-no.svg @@ -0,0 +1,15 @@ + + + + diff --git a/src/icons/svg/cockpit-lot-count.svg b/src/icons/svg/cockpit-lot-count.svg new file mode 100644 index 0000000..b4e743f --- /dev/null +++ b/src/icons/svg/cockpit-lot-count.svg @@ -0,0 +1,92 @@ + + + + diff --git a/src/icons/svg/cockpit-lot-online.svg b/src/icons/svg/cockpit-lot-online.svg new file mode 100644 index 0000000..0da6791 --- /dev/null +++ b/src/icons/svg/cockpit-lot-online.svg @@ -0,0 +1,62 @@ + + + + diff --git a/src/icons/svg/cockpit-supplier-pan-check.svg b/src/icons/svg/cockpit-supplier-pan-check.svg new file mode 100644 index 0000000..6d6756f --- /dev/null +++ b/src/icons/svg/cockpit-supplier-pan-check.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-supplier-pan-no.svg b/src/icons/svg/cockpit-supplier-pan-no.svg new file mode 100644 index 0000000..c9c869e --- /dev/null +++ b/src/icons/svg/cockpit-supplier-pan-no.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-supplier-register.svg b/src/icons/svg/cockpit-supplier-register.svg new file mode 100644 index 0000000..a6e193c --- /dev/null +++ b/src/icons/svg/cockpit-supplier-register.svg @@ -0,0 +1,17 @@ + + + + diff --git "a/src/icons/svg/cockpit-\344\276\233\345\272\224\345\225\206.svg" "b/src/icons/svg/cockpit-\344\276\233\345\272\224\345\225\206.svg" new file mode 100644 index 0000000..ca42dee --- /dev/null +++ "b/src/icons/svg/cockpit-\344\276\233\345\272\224\345\225\206.svg" @@ -0,0 +1,38 @@ + + + + diff --git "a/src/icons/svg/cockpit-\345\210\206\345\255\220\345\205\254\345\217\270.svg" "b/src/icons/svg/cockpit-\345\210\206\345\255\220\345\205\254\345\217\270.svg" new file mode 100644 index 0000000..b39c00f --- /dev/null +++ "b/src/icons/svg/cockpit-\345\210\206\345\255\220\345\205\254\345\217\270.svg" @@ -0,0 +1,16 @@ + + + + diff --git "a/src/icons/svg/cockpit-\346\231\256\351\200\232\347\256\241\347\220\206\350\247\222\350\211\262.svg" "b/src/icons/svg/cockpit-\346\231\256\351\200\232\347\256\241\347\220\206\350\247\222\350\211\262.svg" new file mode 100644 index 0000000..99c6837 --- /dev/null +++ "b/src/icons/svg/cockpit-\346\231\256\351\200\232\347\256\241\347\220\206\350\247\222\350\211\262.svg" @@ -0,0 +1,15 @@ + + + + diff --git "a/src/icons/svg/cockpit-\347\247\273\345\212\250\347\253\257\347\224\250\346\210\267.svg" "b/src/icons/svg/cockpit-\347\247\273\345\212\250\347\253\257\347\224\250\346\210\267.svg" new file mode 100644 index 0000000..e287570 --- /dev/null +++ "b/src/icons/svg/cockpit-\347\247\273\345\212\250\347\253\257\347\224\250\346\210\267.svg" @@ -0,0 +1,13 @@ + + + + diff --git "a/src/icons/svg/cockpit-\347\273\217\351\224\200\345\225\206.svg" "b/src/icons/svg/cockpit-\347\273\217\351\224\200\345\225\206.svg" new file mode 100644 index 0000000..fef7f56 --- /dev/null +++ "b/src/icons/svg/cockpit-\347\273\217\351\224\200\345\225\206.svg" @@ -0,0 +1,13 @@ + + + + diff --git "a/src/icons/svg/cockpit-\351\233\206\345\233\242.svg" "b/src/icons/svg/cockpit-\351\233\206\345\233\242.svg" new file mode 100644 index 0000000..48e8006 --- /dev/null +++ "b/src/icons/svg/cockpit-\351\233\206\345\233\242.svg" @@ -0,0 +1,14 @@ + + + + diff --git "a/src/icons/svg/cockpit-\351\233\206\345\233\242\347\224\250\346\210\267.svg" "b/src/icons/svg/cockpit-\351\233\206\345\233\242\347\224\250\346\210\267.svg" new file mode 100644 index 0000000..86f0776 --- /dev/null +++ "b/src/icons/svg/cockpit-\351\233\206\345\233\242\347\224\250\346\210\267.svg" @@ -0,0 +1,15 @@ + + + + diff --git a/src/router/modules/supplierManagement.js b/src/router/modules/supplierManagement.js index 4ad2c80..224d6b8 100644 --- a/src/router/modules/supplierManagement.js +++ b/src/router/modules/supplierManagement.js @@ -22,7 +22,7 @@ path: '/inquiry', name: 'Inquiry', component: () => import('@/views/supplier/inquiry'), // 重定向的组件位置 - meta: { title: '资料预审', icon: '', permission: '/supplier/inquire' } + meta: { title: '资料预审', icon: '', permission: '/supplier/inquiry' } }, { path: '/review', diff --git a/src/views/business/historyBusiness.vue b/src/views/business/historyBusiness.vue index bddce18..4398baa 100644 --- a/src/views/business/historyBusiness.vue +++ b/src/views/business/historyBusiness.vue @@ -13,7 +13,7 @@
预计工期
- +
diff --git a/src/views/business/report.vue b/src/views/business/report.vue index 33c1a3d..d833399 100644 --- a/src/views/business/report.vue +++ b/src/views/business/report.vue @@ -316,12 +316,12 @@
-
+
+
添加项目需求
-
@@ -421,22 +421,27 @@ }, methods: { save() { - this.addInfo.productList = { + if(this.valiateForm()){ + this.addInfo.productList = { productCode: this.addInfo.productList.productCode, productQuantity: this.addInfo.productList.productQuantity, productPrice: this.addInfo.productList.productPrice, productName: '' } add(this.addInfo).then(res => { - console.log(res) - if (res) { + this.setData() this.$message({ message: '保存成功', type: 'success' }) - } - }) - this.setData() + }) + } else { + this.$message({ + message: '请先完整填写报备信息', + type: 'error' + }) + } + }, close() { this.setData() @@ -462,7 +467,6 @@ this.form.countyList = res }) }, - handleAddBtn() { const obj = {} obj.brandName = '' @@ -525,6 +529,12 @@ this.$set(this.showEdit, index, false) // vue添加属性的方法 } }) + row.productCode = this.addInfo.productList.productCode + row.brandName = this.brandName + console.log(this.categoryIds) + row.categoryIds = this.categoryIds + row.productQuantity = this.addInfo.productList.productQuantity + row.productPrice = this.addInfo.productList.productPrice }, setData() { this.addInfo = { @@ -553,6 +563,17 @@ agentPhone: '', productList: [] } + }, + valiateForm() { + let arr = [] + for(var item in this.addInfo) { + if(this.addInfo[item]){ + arr.push(1) + }else{ + arr.push(0) + } + } + return arr.every(item => item === 1) } } } @@ -568,7 +589,7 @@ .report-from { .from-title { - font-size: 22px; + font-size: 16px; font-weight: bold; background-color: #28739e; color: white; diff --git a/src/views/dashboard/components/dashboardHeader.vue b/src/views/dashboard/components/dashboardHeader.vue index a4262ae..93b1ca5 100644 --- a/src/views/dashboard/components/dashboardHeader.vue +++ b/src/views/dashboard/components/dashboardHeader.vue @@ -6,43 +6,42 @@ \ No newline at end of file + diff --git a/src/views/dashboard/components/deviceList.vue b/src/views/dashboard/components/deviceList.vue index a7c11e1..23c5f15 100644 --- a/src/views/dashboard/components/deviceList.vue +++ b/src/views/dashboard/components/deviceList.vue @@ -1,21 +1,16 @@ - - - - \ No newline at end of file + diff --git a/src/views/dashboard/components/layoutChartDoughnu.vue b/src/views/dashboard/components/layoutChartDoughnu.vue index 7906430..9d3214e 100644 --- a/src/views/dashboard/components/layoutChartDoughnu.vue +++ b/src/views/dashboard/components/layoutChartDoughnu.vue @@ -3,9 +3,9 @@
- + 设备分类统计
-
+
@@ -25,10 +25,6 @@ type: String, default: "", }, - width:{ - type: String, - default: "500px" - }, height:{ type: String, default: "250px" @@ -63,11 +59,14 @@ \ No newline at end of file diff --git a/src/api/supplier/supplier.js b/src/api/supplier/supplier.js index 593b7cd..b095e09 100644 --- a/src/api/supplier/supplier.js +++ b/src/api/supplier/supplier.js @@ -14,8 +14,8 @@ return instance.post(`/supplierPreReview/listPage?${str}`, data) } // 历史预审不分页列表 -const historyInquiry = () => { - return instance.post(`/supplierPreReview/history`, {}) +const historyInquiry = (data) => { + return instance.post(`/supplierPreReview/history`, data) } // 新增 diff --git "a/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" "b/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" new file mode 100644 index 0000000..34ce236 --- /dev/null +++ "b/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" Binary files differ diff --git "a/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" "b/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" new file mode 100644 index 0000000..dd0c295 --- /dev/null +++ "b/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" Binary files differ diff --git a/src/components/echart/barChart/verticalBarChart.vue b/src/components/echart/barChart/verticalBarChart.vue index 460d923..04a0090 100644 --- a/src/components/echart/barChart/verticalBarChart.vue +++ b/src/components/echart/barChart/verticalBarChart.vue @@ -2,21 +2,7 @@ - - diff --git a/src/components/mycomponent/dialog/inquiryDialog.vue b/src/components/mycomponent/dialog/inquiryDialog.vue deleted file mode 100644 index a8834ef..0000000 --- a/src/components/mycomponent/dialog/inquiryDialog.vue +++ /dev/null @@ -1,228 +0,0 @@ - - - - - - diff --git a/src/components/mycomponent/dialog/server/operationAddDialog.vue b/src/components/mycomponent/dialog/server/operationAddDialog.vue index dfefe42..d436541 100644 --- a/src/components/mycomponent/dialog/server/operationAddDialog.vue +++ b/src/components/mycomponent/dialog/server/operationAddDialog.vue @@ -11,13 +11,14 @@ width="300px" class="inputWidth" style="justify-content: space-between;" + v-model="form.date" />
- +
- +
- +
@@ -100,16 +102,37 @@ RedStar, InputVue }, + data(){ + return{ + form:{ + date:'', // 服务运营编号 + name:'', // 服务名称 + address:'', // 收费 + address1:'', // 优惠 + address2:'', // 日期 + mark:'', // 备注 + } + } + }, props: { isShowInfo: { type: Boolean, default: true - } + }, }, methods: { close() { this.$emit('close') - } + }, + init(detail){ + if(detail.name){ + this.form.address = detail.address + this.form.address1 = detail.address1 + this.form.address2 = detail.address2 + this.form.date = detail.date + this.form.name = detail.name + } + }, } } diff --git a/src/icons/svg/cockpit-approved.svg b/src/icons/svg/cockpit-approved.svg new file mode 100644 index 0000000..634d7a8 --- /dev/null +++ b/src/icons/svg/cockpit-approved.svg @@ -0,0 +1,18 @@ + + + + diff --git a/src/icons/svg/cockpit-device-pan-check.svg b/src/icons/svg/cockpit-device-pan-check.svg new file mode 100644 index 0000000..5ad7f6b --- /dev/null +++ b/src/icons/svg/cockpit-device-pan-check.svg @@ -0,0 +1,13 @@ + + diff --git a/src/icons/svg/cockpit-device-pan-no.svg b/src/icons/svg/cockpit-device-pan-no.svg new file mode 100644 index 0000000..6713e2a --- /dev/null +++ b/src/icons/svg/cockpit-device-pan-no.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-device-register.svg b/src/icons/svg/cockpit-device-register.svg new file mode 100644 index 0000000..baa2355 --- /dev/null +++ b/src/icons/svg/cockpit-device-register.svg @@ -0,0 +1,65 @@ + + + + diff --git a/src/icons/svg/cockpit-device-total.svg b/src/icons/svg/cockpit-device-total.svg new file mode 100644 index 0000000..aa7788c --- /dev/null +++ b/src/icons/svg/cockpit-device-total.svg @@ -0,0 +1,59 @@ + + + + diff --git a/src/icons/svg/cockpit-distributor-pan-check.svg b/src/icons/svg/cockpit-distributor-pan-check.svg new file mode 100644 index 0000000..f4fa54e --- /dev/null +++ b/src/icons/svg/cockpit-distributor-pan-check.svg @@ -0,0 +1,15 @@ + + + + diff --git a/src/icons/svg/cockpit-distributor-pan-no.svg b/src/icons/svg/cockpit-distributor-pan-no.svg new file mode 100644 index 0000000..b10bdfe --- /dev/null +++ b/src/icons/svg/cockpit-distributor-pan-no.svg @@ -0,0 +1,15 @@ + + + + diff --git a/src/icons/svg/cockpit-lot-count.svg b/src/icons/svg/cockpit-lot-count.svg new file mode 100644 index 0000000..b4e743f --- /dev/null +++ b/src/icons/svg/cockpit-lot-count.svg @@ -0,0 +1,92 @@ + + + + diff --git a/src/icons/svg/cockpit-lot-online.svg b/src/icons/svg/cockpit-lot-online.svg new file mode 100644 index 0000000..0da6791 --- /dev/null +++ b/src/icons/svg/cockpit-lot-online.svg @@ -0,0 +1,62 @@ + + + + diff --git a/src/icons/svg/cockpit-supplier-pan-check.svg b/src/icons/svg/cockpit-supplier-pan-check.svg new file mode 100644 index 0000000..6d6756f --- /dev/null +++ b/src/icons/svg/cockpit-supplier-pan-check.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-supplier-pan-no.svg b/src/icons/svg/cockpit-supplier-pan-no.svg new file mode 100644 index 0000000..c9c869e --- /dev/null +++ b/src/icons/svg/cockpit-supplier-pan-no.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-supplier-register.svg b/src/icons/svg/cockpit-supplier-register.svg new file mode 100644 index 0000000..a6e193c --- /dev/null +++ b/src/icons/svg/cockpit-supplier-register.svg @@ -0,0 +1,17 @@ + + + + diff --git "a/src/icons/svg/cockpit-\344\276\233\345\272\224\345\225\206.svg" "b/src/icons/svg/cockpit-\344\276\233\345\272\224\345\225\206.svg" new file mode 100644 index 0000000..ca42dee --- /dev/null +++ "b/src/icons/svg/cockpit-\344\276\233\345\272\224\345\225\206.svg" @@ -0,0 +1,38 @@ + + + + diff --git "a/src/icons/svg/cockpit-\345\210\206\345\255\220\345\205\254\345\217\270.svg" "b/src/icons/svg/cockpit-\345\210\206\345\255\220\345\205\254\345\217\270.svg" new file mode 100644 index 0000000..b39c00f --- /dev/null +++ "b/src/icons/svg/cockpit-\345\210\206\345\255\220\345\205\254\345\217\270.svg" @@ -0,0 +1,16 @@ + + + + diff --git "a/src/icons/svg/cockpit-\346\231\256\351\200\232\347\256\241\347\220\206\350\247\222\350\211\262.svg" "b/src/icons/svg/cockpit-\346\231\256\351\200\232\347\256\241\347\220\206\350\247\222\350\211\262.svg" new file mode 100644 index 0000000..99c6837 --- /dev/null +++ "b/src/icons/svg/cockpit-\346\231\256\351\200\232\347\256\241\347\220\206\350\247\222\350\211\262.svg" @@ -0,0 +1,15 @@ + + + + diff --git "a/src/icons/svg/cockpit-\347\247\273\345\212\250\347\253\257\347\224\250\346\210\267.svg" "b/src/icons/svg/cockpit-\347\247\273\345\212\250\347\253\257\347\224\250\346\210\267.svg" new file mode 100644 index 0000000..e287570 --- /dev/null +++ "b/src/icons/svg/cockpit-\347\247\273\345\212\250\347\253\257\347\224\250\346\210\267.svg" @@ -0,0 +1,13 @@ + + + + diff --git "a/src/icons/svg/cockpit-\347\273\217\351\224\200\345\225\206.svg" "b/src/icons/svg/cockpit-\347\273\217\351\224\200\345\225\206.svg" new file mode 100644 index 0000000..fef7f56 --- /dev/null +++ "b/src/icons/svg/cockpit-\347\273\217\351\224\200\345\225\206.svg" @@ -0,0 +1,13 @@ + + + + diff --git "a/src/icons/svg/cockpit-\351\233\206\345\233\242.svg" "b/src/icons/svg/cockpit-\351\233\206\345\233\242.svg" new file mode 100644 index 0000000..48e8006 --- /dev/null +++ "b/src/icons/svg/cockpit-\351\233\206\345\233\242.svg" @@ -0,0 +1,14 @@ + + + + diff --git "a/src/icons/svg/cockpit-\351\233\206\345\233\242\347\224\250\346\210\267.svg" "b/src/icons/svg/cockpit-\351\233\206\345\233\242\347\224\250\346\210\267.svg" new file mode 100644 index 0000000..86f0776 --- /dev/null +++ "b/src/icons/svg/cockpit-\351\233\206\345\233\242\347\224\250\346\210\267.svg" @@ -0,0 +1,15 @@ + + + + diff --git a/src/router/modules/supplierManagement.js b/src/router/modules/supplierManagement.js index 4ad2c80..224d6b8 100644 --- a/src/router/modules/supplierManagement.js +++ b/src/router/modules/supplierManagement.js @@ -22,7 +22,7 @@ path: '/inquiry', name: 'Inquiry', component: () => import('@/views/supplier/inquiry'), // 重定向的组件位置 - meta: { title: '资料预审', icon: '', permission: '/supplier/inquire' } + meta: { title: '资料预审', icon: '', permission: '/supplier/inquiry' } }, { path: '/review', diff --git a/src/views/business/historyBusiness.vue b/src/views/business/historyBusiness.vue index bddce18..4398baa 100644 --- a/src/views/business/historyBusiness.vue +++ b/src/views/business/historyBusiness.vue @@ -13,7 +13,7 @@
预计工期
- +
diff --git a/src/views/business/report.vue b/src/views/business/report.vue index 33c1a3d..d833399 100644 --- a/src/views/business/report.vue +++ b/src/views/business/report.vue @@ -316,12 +316,12 @@
-
+
+
添加项目需求
-
@@ -421,22 +421,27 @@ }, methods: { save() { - this.addInfo.productList = { + if(this.valiateForm()){ + this.addInfo.productList = { productCode: this.addInfo.productList.productCode, productQuantity: this.addInfo.productList.productQuantity, productPrice: this.addInfo.productList.productPrice, productName: '' } add(this.addInfo).then(res => { - console.log(res) - if (res) { + this.setData() this.$message({ message: '保存成功', type: 'success' }) - } - }) - this.setData() + }) + } else { + this.$message({ + message: '请先完整填写报备信息', + type: 'error' + }) + } + }, close() { this.setData() @@ -462,7 +467,6 @@ this.form.countyList = res }) }, - handleAddBtn() { const obj = {} obj.brandName = '' @@ -525,6 +529,12 @@ this.$set(this.showEdit, index, false) // vue添加属性的方法 } }) + row.productCode = this.addInfo.productList.productCode + row.brandName = this.brandName + console.log(this.categoryIds) + row.categoryIds = this.categoryIds + row.productQuantity = this.addInfo.productList.productQuantity + row.productPrice = this.addInfo.productList.productPrice }, setData() { this.addInfo = { @@ -553,6 +563,17 @@ agentPhone: '', productList: [] } + }, + valiateForm() { + let arr = [] + for(var item in this.addInfo) { + if(this.addInfo[item]){ + arr.push(1) + }else{ + arr.push(0) + } + } + return arr.every(item => item === 1) } } } @@ -568,7 +589,7 @@ .report-from { .from-title { - font-size: 22px; + font-size: 16px; font-weight: bold; background-color: #28739e; color: white; diff --git a/src/views/dashboard/components/dashboardHeader.vue b/src/views/dashboard/components/dashboardHeader.vue index a4262ae..93b1ca5 100644 --- a/src/views/dashboard/components/dashboardHeader.vue +++ b/src/views/dashboard/components/dashboardHeader.vue @@ -6,43 +6,42 @@ \ No newline at end of file + diff --git a/src/views/dashboard/components/deviceList.vue b/src/views/dashboard/components/deviceList.vue index a7c11e1..23c5f15 100644 --- a/src/views/dashboard/components/deviceList.vue +++ b/src/views/dashboard/components/deviceList.vue @@ -1,21 +1,16 @@ - - - - \ No newline at end of file + diff --git a/src/views/dashboard/components/layoutChartDoughnu.vue b/src/views/dashboard/components/layoutChartDoughnu.vue index 7906430..9d3214e 100644 --- a/src/views/dashboard/components/layoutChartDoughnu.vue +++ b/src/views/dashboard/components/layoutChartDoughnu.vue @@ -3,9 +3,9 @@
- + 设备分类统计
-
+
@@ -25,10 +25,6 @@ type: String, default: "", }, - width:{ - type: String, - default: "500px" - }, height:{ type: String, default: "250px" @@ -63,11 +59,14 @@ \ No newline at end of file diff --git a/src/views/dashboard/components/managementList.vue b/src/views/dashboard/components/managementList.vue index 88c7827..d27a0de 100644 --- a/src/views/dashboard/components/managementList.vue +++ b/src/views/dashboard/components/managementList.vue @@ -28,7 +28,7 @@ fetchData() { getUserCount().then((res) => { this.management = res.data.map(item => { - return{...item,icon:'icon-user-man'} + return{...item,icon:'cockpit-' + item.roleName} }) }); }, diff --git a/src/api/supplier/supplier.js b/src/api/supplier/supplier.js index 593b7cd..b095e09 100644 --- a/src/api/supplier/supplier.js +++ b/src/api/supplier/supplier.js @@ -14,8 +14,8 @@ return instance.post(`/supplierPreReview/listPage?${str}`, data) } // 历史预审不分页列表 -const historyInquiry = () => { - return instance.post(`/supplierPreReview/history`, {}) +const historyInquiry = (data) => { + return instance.post(`/supplierPreReview/history`, data) } // 新增 diff --git "a/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" "b/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" new file mode 100644 index 0000000..34ce236 --- /dev/null +++ "b/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" Binary files differ diff --git "a/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" "b/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" new file mode 100644 index 0000000..dd0c295 --- /dev/null +++ "b/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" Binary files differ diff --git a/src/components/echart/barChart/verticalBarChart.vue b/src/components/echart/barChart/verticalBarChart.vue index 460d923..04a0090 100644 --- a/src/components/echart/barChart/verticalBarChart.vue +++ b/src/components/echart/barChart/verticalBarChart.vue @@ -2,21 +2,7 @@ - - diff --git a/src/components/mycomponent/dialog/inquiryDialog.vue b/src/components/mycomponent/dialog/inquiryDialog.vue deleted file mode 100644 index a8834ef..0000000 --- a/src/components/mycomponent/dialog/inquiryDialog.vue +++ /dev/null @@ -1,228 +0,0 @@ - - - - - - diff --git a/src/components/mycomponent/dialog/server/operationAddDialog.vue b/src/components/mycomponent/dialog/server/operationAddDialog.vue index dfefe42..d436541 100644 --- a/src/components/mycomponent/dialog/server/operationAddDialog.vue +++ b/src/components/mycomponent/dialog/server/operationAddDialog.vue @@ -11,13 +11,14 @@ width="300px" class="inputWidth" style="justify-content: space-between;" + v-model="form.date" />
- +
- +
- +
@@ -100,16 +102,37 @@ RedStar, InputVue }, + data(){ + return{ + form:{ + date:'', // 服务运营编号 + name:'', // 服务名称 + address:'', // 收费 + address1:'', // 优惠 + address2:'', // 日期 + mark:'', // 备注 + } + } + }, props: { isShowInfo: { type: Boolean, default: true - } + }, }, methods: { close() { this.$emit('close') - } + }, + init(detail){ + if(detail.name){ + this.form.address = detail.address + this.form.address1 = detail.address1 + this.form.address2 = detail.address2 + this.form.date = detail.date + this.form.name = detail.name + } + }, } } diff --git a/src/icons/svg/cockpit-approved.svg b/src/icons/svg/cockpit-approved.svg new file mode 100644 index 0000000..634d7a8 --- /dev/null +++ b/src/icons/svg/cockpit-approved.svg @@ -0,0 +1,18 @@ + + + + diff --git a/src/icons/svg/cockpit-device-pan-check.svg b/src/icons/svg/cockpit-device-pan-check.svg new file mode 100644 index 0000000..5ad7f6b --- /dev/null +++ b/src/icons/svg/cockpit-device-pan-check.svg @@ -0,0 +1,13 @@ + + diff --git a/src/icons/svg/cockpit-device-pan-no.svg b/src/icons/svg/cockpit-device-pan-no.svg new file mode 100644 index 0000000..6713e2a --- /dev/null +++ b/src/icons/svg/cockpit-device-pan-no.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-device-register.svg b/src/icons/svg/cockpit-device-register.svg new file mode 100644 index 0000000..baa2355 --- /dev/null +++ b/src/icons/svg/cockpit-device-register.svg @@ -0,0 +1,65 @@ + + + + diff --git a/src/icons/svg/cockpit-device-total.svg b/src/icons/svg/cockpit-device-total.svg new file mode 100644 index 0000000..aa7788c --- /dev/null +++ b/src/icons/svg/cockpit-device-total.svg @@ -0,0 +1,59 @@ + + + + diff --git a/src/icons/svg/cockpit-distributor-pan-check.svg b/src/icons/svg/cockpit-distributor-pan-check.svg new file mode 100644 index 0000000..f4fa54e --- /dev/null +++ b/src/icons/svg/cockpit-distributor-pan-check.svg @@ -0,0 +1,15 @@ + + + + diff --git a/src/icons/svg/cockpit-distributor-pan-no.svg b/src/icons/svg/cockpit-distributor-pan-no.svg new file mode 100644 index 0000000..b10bdfe --- /dev/null +++ b/src/icons/svg/cockpit-distributor-pan-no.svg @@ -0,0 +1,15 @@ + + + + diff --git a/src/icons/svg/cockpit-lot-count.svg b/src/icons/svg/cockpit-lot-count.svg new file mode 100644 index 0000000..b4e743f --- /dev/null +++ b/src/icons/svg/cockpit-lot-count.svg @@ -0,0 +1,92 @@ + + + + diff --git a/src/icons/svg/cockpit-lot-online.svg b/src/icons/svg/cockpit-lot-online.svg new file mode 100644 index 0000000..0da6791 --- /dev/null +++ b/src/icons/svg/cockpit-lot-online.svg @@ -0,0 +1,62 @@ + + + + diff --git a/src/icons/svg/cockpit-supplier-pan-check.svg b/src/icons/svg/cockpit-supplier-pan-check.svg new file mode 100644 index 0000000..6d6756f --- /dev/null +++ b/src/icons/svg/cockpit-supplier-pan-check.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-supplier-pan-no.svg b/src/icons/svg/cockpit-supplier-pan-no.svg new file mode 100644 index 0000000..c9c869e --- /dev/null +++ b/src/icons/svg/cockpit-supplier-pan-no.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-supplier-register.svg b/src/icons/svg/cockpit-supplier-register.svg new file mode 100644 index 0000000..a6e193c --- /dev/null +++ b/src/icons/svg/cockpit-supplier-register.svg @@ -0,0 +1,17 @@ + + + + diff --git "a/src/icons/svg/cockpit-\344\276\233\345\272\224\345\225\206.svg" "b/src/icons/svg/cockpit-\344\276\233\345\272\224\345\225\206.svg" new file mode 100644 index 0000000..ca42dee --- /dev/null +++ "b/src/icons/svg/cockpit-\344\276\233\345\272\224\345\225\206.svg" @@ -0,0 +1,38 @@ + + + + diff --git "a/src/icons/svg/cockpit-\345\210\206\345\255\220\345\205\254\345\217\270.svg" "b/src/icons/svg/cockpit-\345\210\206\345\255\220\345\205\254\345\217\270.svg" new file mode 100644 index 0000000..b39c00f --- /dev/null +++ "b/src/icons/svg/cockpit-\345\210\206\345\255\220\345\205\254\345\217\270.svg" @@ -0,0 +1,16 @@ + + + + diff --git "a/src/icons/svg/cockpit-\346\231\256\351\200\232\347\256\241\347\220\206\350\247\222\350\211\262.svg" "b/src/icons/svg/cockpit-\346\231\256\351\200\232\347\256\241\347\220\206\350\247\222\350\211\262.svg" new file mode 100644 index 0000000..99c6837 --- /dev/null +++ "b/src/icons/svg/cockpit-\346\231\256\351\200\232\347\256\241\347\220\206\350\247\222\350\211\262.svg" @@ -0,0 +1,15 @@ + + + + diff --git "a/src/icons/svg/cockpit-\347\247\273\345\212\250\347\253\257\347\224\250\346\210\267.svg" "b/src/icons/svg/cockpit-\347\247\273\345\212\250\347\253\257\347\224\250\346\210\267.svg" new file mode 100644 index 0000000..e287570 --- /dev/null +++ "b/src/icons/svg/cockpit-\347\247\273\345\212\250\347\253\257\347\224\250\346\210\267.svg" @@ -0,0 +1,13 @@ + + + + diff --git "a/src/icons/svg/cockpit-\347\273\217\351\224\200\345\225\206.svg" "b/src/icons/svg/cockpit-\347\273\217\351\224\200\345\225\206.svg" new file mode 100644 index 0000000..fef7f56 --- /dev/null +++ "b/src/icons/svg/cockpit-\347\273\217\351\224\200\345\225\206.svg" @@ -0,0 +1,13 @@ + + + + diff --git "a/src/icons/svg/cockpit-\351\233\206\345\233\242.svg" "b/src/icons/svg/cockpit-\351\233\206\345\233\242.svg" new file mode 100644 index 0000000..48e8006 --- /dev/null +++ "b/src/icons/svg/cockpit-\351\233\206\345\233\242.svg" @@ -0,0 +1,14 @@ + + + + diff --git "a/src/icons/svg/cockpit-\351\233\206\345\233\242\347\224\250\346\210\267.svg" "b/src/icons/svg/cockpit-\351\233\206\345\233\242\347\224\250\346\210\267.svg" new file mode 100644 index 0000000..86f0776 --- /dev/null +++ "b/src/icons/svg/cockpit-\351\233\206\345\233\242\347\224\250\346\210\267.svg" @@ -0,0 +1,15 @@ + + + + diff --git a/src/router/modules/supplierManagement.js b/src/router/modules/supplierManagement.js index 4ad2c80..224d6b8 100644 --- a/src/router/modules/supplierManagement.js +++ b/src/router/modules/supplierManagement.js @@ -22,7 +22,7 @@ path: '/inquiry', name: 'Inquiry', component: () => import('@/views/supplier/inquiry'), // 重定向的组件位置 - meta: { title: '资料预审', icon: '', permission: '/supplier/inquire' } + meta: { title: '资料预审', icon: '', permission: '/supplier/inquiry' } }, { path: '/review', diff --git a/src/views/business/historyBusiness.vue b/src/views/business/historyBusiness.vue index bddce18..4398baa 100644 --- a/src/views/business/historyBusiness.vue +++ b/src/views/business/historyBusiness.vue @@ -13,7 +13,7 @@
预计工期
- +
diff --git a/src/views/business/report.vue b/src/views/business/report.vue index 33c1a3d..d833399 100644 --- a/src/views/business/report.vue +++ b/src/views/business/report.vue @@ -316,12 +316,12 @@
-
+
+
添加项目需求
-
@@ -421,22 +421,27 @@ }, methods: { save() { - this.addInfo.productList = { + if(this.valiateForm()){ + this.addInfo.productList = { productCode: this.addInfo.productList.productCode, productQuantity: this.addInfo.productList.productQuantity, productPrice: this.addInfo.productList.productPrice, productName: '' } add(this.addInfo).then(res => { - console.log(res) - if (res) { + this.setData() this.$message({ message: '保存成功', type: 'success' }) - } - }) - this.setData() + }) + } else { + this.$message({ + message: '请先完整填写报备信息', + type: 'error' + }) + } + }, close() { this.setData() @@ -462,7 +467,6 @@ this.form.countyList = res }) }, - handleAddBtn() { const obj = {} obj.brandName = '' @@ -525,6 +529,12 @@ this.$set(this.showEdit, index, false) // vue添加属性的方法 } }) + row.productCode = this.addInfo.productList.productCode + row.brandName = this.brandName + console.log(this.categoryIds) + row.categoryIds = this.categoryIds + row.productQuantity = this.addInfo.productList.productQuantity + row.productPrice = this.addInfo.productList.productPrice }, setData() { this.addInfo = { @@ -553,6 +563,17 @@ agentPhone: '', productList: [] } + }, + valiateForm() { + let arr = [] + for(var item in this.addInfo) { + if(this.addInfo[item]){ + arr.push(1) + }else{ + arr.push(0) + } + } + return arr.every(item => item === 1) } } } @@ -568,7 +589,7 @@ .report-from { .from-title { - font-size: 22px; + font-size: 16px; font-weight: bold; background-color: #28739e; color: white; diff --git a/src/views/dashboard/components/dashboardHeader.vue b/src/views/dashboard/components/dashboardHeader.vue index a4262ae..93b1ca5 100644 --- a/src/views/dashboard/components/dashboardHeader.vue +++ b/src/views/dashboard/components/dashboardHeader.vue @@ -6,43 +6,42 @@ \ No newline at end of file + diff --git a/src/views/dashboard/components/deviceList.vue b/src/views/dashboard/components/deviceList.vue index a7c11e1..23c5f15 100644 --- a/src/views/dashboard/components/deviceList.vue +++ b/src/views/dashboard/components/deviceList.vue @@ -1,21 +1,16 @@ - - - - \ No newline at end of file + diff --git a/src/views/dashboard/components/layoutChartDoughnu.vue b/src/views/dashboard/components/layoutChartDoughnu.vue index 7906430..9d3214e 100644 --- a/src/views/dashboard/components/layoutChartDoughnu.vue +++ b/src/views/dashboard/components/layoutChartDoughnu.vue @@ -3,9 +3,9 @@
- + 设备分类统计
-
+
@@ -25,10 +25,6 @@ type: String, default: "", }, - width:{ - type: String, - default: "500px" - }, height:{ type: String, default: "250px" @@ -63,11 +59,14 @@ \ No newline at end of file diff --git a/src/views/dashboard/components/managementList.vue b/src/views/dashboard/components/managementList.vue index 88c7827..d27a0de 100644 --- a/src/views/dashboard/components/managementList.vue +++ b/src/views/dashboard/components/managementList.vue @@ -28,7 +28,7 @@ fetchData() { getUserCount().then((res) => { this.management = res.data.map(item => { - return{...item,icon:'icon-user-man'} + return{...item,icon:'cockpit-' + item.roleName} }) }); }, diff --git a/src/views/dashboard/components/supplierList.vue b/src/views/dashboard/components/supplierList.vue index 978600e..3e41367 100644 --- a/src/views/dashboard/components/supplierList.vue +++ b/src/views/dashboard/components/supplierList.vue @@ -39,20 +39,20 @@ { title: "供应商注册设备总数量", count: "", - icon: "device-count", + icon: "cockpit-device-register", type: "deviceCount", }, { title: "供应商审核通过总数量", count: "", - icon: "supplier-panel", + icon: "cockpit-approved", type: "approvedCount", }, { title: "供应商注册总数量", count: "", - icon: "supplier-panel", - type: "supplierCount", + icon: "cockpit-supplier-register", + type: "approvedCount", }, ], }; diff --git a/src/api/supplier/supplier.js b/src/api/supplier/supplier.js index 593b7cd..b095e09 100644 --- a/src/api/supplier/supplier.js +++ b/src/api/supplier/supplier.js @@ -14,8 +14,8 @@ return instance.post(`/supplierPreReview/listPage?${str}`, data) } // 历史预审不分页列表 -const historyInquiry = () => { - return instance.post(`/supplierPreReview/history`, {}) +const historyInquiry = (data) => { + return instance.post(`/supplierPreReview/history`, data) } // 新增 diff --git "a/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" "b/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" new file mode 100644 index 0000000..34ce236 --- /dev/null +++ "b/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" Binary files differ diff --git "a/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" "b/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" new file mode 100644 index 0000000..dd0c295 --- /dev/null +++ "b/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" Binary files differ diff --git a/src/components/echart/barChart/verticalBarChart.vue b/src/components/echart/barChart/verticalBarChart.vue index 460d923..04a0090 100644 --- a/src/components/echart/barChart/verticalBarChart.vue +++ b/src/components/echart/barChart/verticalBarChart.vue @@ -2,21 +2,7 @@ - - diff --git a/src/components/mycomponent/dialog/inquiryDialog.vue b/src/components/mycomponent/dialog/inquiryDialog.vue deleted file mode 100644 index a8834ef..0000000 --- a/src/components/mycomponent/dialog/inquiryDialog.vue +++ /dev/null @@ -1,228 +0,0 @@ - - - - - - diff --git a/src/components/mycomponent/dialog/server/operationAddDialog.vue b/src/components/mycomponent/dialog/server/operationAddDialog.vue index dfefe42..d436541 100644 --- a/src/components/mycomponent/dialog/server/operationAddDialog.vue +++ b/src/components/mycomponent/dialog/server/operationAddDialog.vue @@ -11,13 +11,14 @@ width="300px" class="inputWidth" style="justify-content: space-between;" + v-model="form.date" />
- +
- +
- +
@@ -100,16 +102,37 @@ RedStar, InputVue }, + data(){ + return{ + form:{ + date:'', // 服务运营编号 + name:'', // 服务名称 + address:'', // 收费 + address1:'', // 优惠 + address2:'', // 日期 + mark:'', // 备注 + } + } + }, props: { isShowInfo: { type: Boolean, default: true - } + }, }, methods: { close() { this.$emit('close') - } + }, + init(detail){ + if(detail.name){ + this.form.address = detail.address + this.form.address1 = detail.address1 + this.form.address2 = detail.address2 + this.form.date = detail.date + this.form.name = detail.name + } + }, } } diff --git a/src/icons/svg/cockpit-approved.svg b/src/icons/svg/cockpit-approved.svg new file mode 100644 index 0000000..634d7a8 --- /dev/null +++ b/src/icons/svg/cockpit-approved.svg @@ -0,0 +1,18 @@ + + + + diff --git a/src/icons/svg/cockpit-device-pan-check.svg b/src/icons/svg/cockpit-device-pan-check.svg new file mode 100644 index 0000000..5ad7f6b --- /dev/null +++ b/src/icons/svg/cockpit-device-pan-check.svg @@ -0,0 +1,13 @@ + + diff --git a/src/icons/svg/cockpit-device-pan-no.svg b/src/icons/svg/cockpit-device-pan-no.svg new file mode 100644 index 0000000..6713e2a --- /dev/null +++ b/src/icons/svg/cockpit-device-pan-no.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-device-register.svg b/src/icons/svg/cockpit-device-register.svg new file mode 100644 index 0000000..baa2355 --- /dev/null +++ b/src/icons/svg/cockpit-device-register.svg @@ -0,0 +1,65 @@ + + + + diff --git a/src/icons/svg/cockpit-device-total.svg b/src/icons/svg/cockpit-device-total.svg new file mode 100644 index 0000000..aa7788c --- /dev/null +++ b/src/icons/svg/cockpit-device-total.svg @@ -0,0 +1,59 @@ + + + + diff --git a/src/icons/svg/cockpit-distributor-pan-check.svg b/src/icons/svg/cockpit-distributor-pan-check.svg new file mode 100644 index 0000000..f4fa54e --- /dev/null +++ b/src/icons/svg/cockpit-distributor-pan-check.svg @@ -0,0 +1,15 @@ + + + + diff --git a/src/icons/svg/cockpit-distributor-pan-no.svg b/src/icons/svg/cockpit-distributor-pan-no.svg new file mode 100644 index 0000000..b10bdfe --- /dev/null +++ b/src/icons/svg/cockpit-distributor-pan-no.svg @@ -0,0 +1,15 @@ + + + + diff --git a/src/icons/svg/cockpit-lot-count.svg b/src/icons/svg/cockpit-lot-count.svg new file mode 100644 index 0000000..b4e743f --- /dev/null +++ b/src/icons/svg/cockpit-lot-count.svg @@ -0,0 +1,92 @@ + + + + diff --git a/src/icons/svg/cockpit-lot-online.svg b/src/icons/svg/cockpit-lot-online.svg new file mode 100644 index 0000000..0da6791 --- /dev/null +++ b/src/icons/svg/cockpit-lot-online.svg @@ -0,0 +1,62 @@ + + + + diff --git a/src/icons/svg/cockpit-supplier-pan-check.svg b/src/icons/svg/cockpit-supplier-pan-check.svg new file mode 100644 index 0000000..6d6756f --- /dev/null +++ b/src/icons/svg/cockpit-supplier-pan-check.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-supplier-pan-no.svg b/src/icons/svg/cockpit-supplier-pan-no.svg new file mode 100644 index 0000000..c9c869e --- /dev/null +++ b/src/icons/svg/cockpit-supplier-pan-no.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-supplier-register.svg b/src/icons/svg/cockpit-supplier-register.svg new file mode 100644 index 0000000..a6e193c --- /dev/null +++ b/src/icons/svg/cockpit-supplier-register.svg @@ -0,0 +1,17 @@ + + + + diff --git "a/src/icons/svg/cockpit-\344\276\233\345\272\224\345\225\206.svg" "b/src/icons/svg/cockpit-\344\276\233\345\272\224\345\225\206.svg" new file mode 100644 index 0000000..ca42dee --- /dev/null +++ "b/src/icons/svg/cockpit-\344\276\233\345\272\224\345\225\206.svg" @@ -0,0 +1,38 @@ + + + + diff --git "a/src/icons/svg/cockpit-\345\210\206\345\255\220\345\205\254\345\217\270.svg" "b/src/icons/svg/cockpit-\345\210\206\345\255\220\345\205\254\345\217\270.svg" new file mode 100644 index 0000000..b39c00f --- /dev/null +++ "b/src/icons/svg/cockpit-\345\210\206\345\255\220\345\205\254\345\217\270.svg" @@ -0,0 +1,16 @@ + + + + diff --git "a/src/icons/svg/cockpit-\346\231\256\351\200\232\347\256\241\347\220\206\350\247\222\350\211\262.svg" "b/src/icons/svg/cockpit-\346\231\256\351\200\232\347\256\241\347\220\206\350\247\222\350\211\262.svg" new file mode 100644 index 0000000..99c6837 --- /dev/null +++ "b/src/icons/svg/cockpit-\346\231\256\351\200\232\347\256\241\347\220\206\350\247\222\350\211\262.svg" @@ -0,0 +1,15 @@ + + + + diff --git "a/src/icons/svg/cockpit-\347\247\273\345\212\250\347\253\257\347\224\250\346\210\267.svg" "b/src/icons/svg/cockpit-\347\247\273\345\212\250\347\253\257\347\224\250\346\210\267.svg" new file mode 100644 index 0000000..e287570 --- /dev/null +++ "b/src/icons/svg/cockpit-\347\247\273\345\212\250\347\253\257\347\224\250\346\210\267.svg" @@ -0,0 +1,13 @@ + + + + diff --git "a/src/icons/svg/cockpit-\347\273\217\351\224\200\345\225\206.svg" "b/src/icons/svg/cockpit-\347\273\217\351\224\200\345\225\206.svg" new file mode 100644 index 0000000..fef7f56 --- /dev/null +++ "b/src/icons/svg/cockpit-\347\273\217\351\224\200\345\225\206.svg" @@ -0,0 +1,13 @@ + + + + diff --git "a/src/icons/svg/cockpit-\351\233\206\345\233\242.svg" "b/src/icons/svg/cockpit-\351\233\206\345\233\242.svg" new file mode 100644 index 0000000..48e8006 --- /dev/null +++ "b/src/icons/svg/cockpit-\351\233\206\345\233\242.svg" @@ -0,0 +1,14 @@ + + + + diff --git "a/src/icons/svg/cockpit-\351\233\206\345\233\242\347\224\250\346\210\267.svg" "b/src/icons/svg/cockpit-\351\233\206\345\233\242\347\224\250\346\210\267.svg" new file mode 100644 index 0000000..86f0776 --- /dev/null +++ "b/src/icons/svg/cockpit-\351\233\206\345\233\242\347\224\250\346\210\267.svg" @@ -0,0 +1,15 @@ + + + + diff --git a/src/router/modules/supplierManagement.js b/src/router/modules/supplierManagement.js index 4ad2c80..224d6b8 100644 --- a/src/router/modules/supplierManagement.js +++ b/src/router/modules/supplierManagement.js @@ -22,7 +22,7 @@ path: '/inquiry', name: 'Inquiry', component: () => import('@/views/supplier/inquiry'), // 重定向的组件位置 - meta: { title: '资料预审', icon: '', permission: '/supplier/inquire' } + meta: { title: '资料预审', icon: '', permission: '/supplier/inquiry' } }, { path: '/review', diff --git a/src/views/business/historyBusiness.vue b/src/views/business/historyBusiness.vue index bddce18..4398baa 100644 --- a/src/views/business/historyBusiness.vue +++ b/src/views/business/historyBusiness.vue @@ -13,7 +13,7 @@
预计工期
- +
diff --git a/src/views/business/report.vue b/src/views/business/report.vue index 33c1a3d..d833399 100644 --- a/src/views/business/report.vue +++ b/src/views/business/report.vue @@ -316,12 +316,12 @@
-
+
+
添加项目需求
-
@@ -421,22 +421,27 @@ }, methods: { save() { - this.addInfo.productList = { + if(this.valiateForm()){ + this.addInfo.productList = { productCode: this.addInfo.productList.productCode, productQuantity: this.addInfo.productList.productQuantity, productPrice: this.addInfo.productList.productPrice, productName: '' } add(this.addInfo).then(res => { - console.log(res) - if (res) { + this.setData() this.$message({ message: '保存成功', type: 'success' }) - } - }) - this.setData() + }) + } else { + this.$message({ + message: '请先完整填写报备信息', + type: 'error' + }) + } + }, close() { this.setData() @@ -462,7 +467,6 @@ this.form.countyList = res }) }, - handleAddBtn() { const obj = {} obj.brandName = '' @@ -525,6 +529,12 @@ this.$set(this.showEdit, index, false) // vue添加属性的方法 } }) + row.productCode = this.addInfo.productList.productCode + row.brandName = this.brandName + console.log(this.categoryIds) + row.categoryIds = this.categoryIds + row.productQuantity = this.addInfo.productList.productQuantity + row.productPrice = this.addInfo.productList.productPrice }, setData() { this.addInfo = { @@ -553,6 +563,17 @@ agentPhone: '', productList: [] } + }, + valiateForm() { + let arr = [] + for(var item in this.addInfo) { + if(this.addInfo[item]){ + arr.push(1) + }else{ + arr.push(0) + } + } + return arr.every(item => item === 1) } } } @@ -568,7 +589,7 @@ .report-from { .from-title { - font-size: 22px; + font-size: 16px; font-weight: bold; background-color: #28739e; color: white; diff --git a/src/views/dashboard/components/dashboardHeader.vue b/src/views/dashboard/components/dashboardHeader.vue index a4262ae..93b1ca5 100644 --- a/src/views/dashboard/components/dashboardHeader.vue +++ b/src/views/dashboard/components/dashboardHeader.vue @@ -6,43 +6,42 @@ \ No newline at end of file + diff --git a/src/views/dashboard/components/deviceList.vue b/src/views/dashboard/components/deviceList.vue index a7c11e1..23c5f15 100644 --- a/src/views/dashboard/components/deviceList.vue +++ b/src/views/dashboard/components/deviceList.vue @@ -1,21 +1,16 @@ - - - - \ No newline at end of file + diff --git a/src/views/dashboard/components/layoutChartDoughnu.vue b/src/views/dashboard/components/layoutChartDoughnu.vue index 7906430..9d3214e 100644 --- a/src/views/dashboard/components/layoutChartDoughnu.vue +++ b/src/views/dashboard/components/layoutChartDoughnu.vue @@ -3,9 +3,9 @@
- + 设备分类统计
-
+
@@ -25,10 +25,6 @@ type: String, default: "", }, - width:{ - type: String, - default: "500px" - }, height:{ type: String, default: "250px" @@ -63,11 +59,14 @@ \ No newline at end of file diff --git a/src/views/dashboard/components/managementList.vue b/src/views/dashboard/components/managementList.vue index 88c7827..d27a0de 100644 --- a/src/views/dashboard/components/managementList.vue +++ b/src/views/dashboard/components/managementList.vue @@ -28,7 +28,7 @@ fetchData() { getUserCount().then((res) => { this.management = res.data.map(item => { - return{...item,icon:'icon-user-man'} + return{...item,icon:'cockpit-' + item.roleName} }) }); }, diff --git a/src/views/dashboard/components/supplierList.vue b/src/views/dashboard/components/supplierList.vue index 978600e..3e41367 100644 --- a/src/views/dashboard/components/supplierList.vue +++ b/src/views/dashboard/components/supplierList.vue @@ -39,20 +39,20 @@ { title: "供应商注册设备总数量", count: "", - icon: "device-count", + icon: "cockpit-device-register", type: "deviceCount", }, { title: "供应商审核通过总数量", count: "", - icon: "supplier-panel", + icon: "cockpit-approved", type: "approvedCount", }, { title: "供应商注册总数量", count: "", - icon: "supplier-panel", - type: "supplierCount", + icon: "cockpit-supplier-register", + type: "approvedCount", }, ], }; diff --git a/src/views/dashboard/components/switch.vue b/src/views/dashboard/components/switch.vue index 43ef875..db4efa7 100644 --- a/src/views/dashboard/components/switch.vue +++ b/src/views/dashboard/components/switch.vue @@ -1,9 +1,10 @@ - - diff --git a/src/components/mycomponent/dialog/inquiryDialog.vue b/src/components/mycomponent/dialog/inquiryDialog.vue deleted file mode 100644 index a8834ef..0000000 --- a/src/components/mycomponent/dialog/inquiryDialog.vue +++ /dev/null @@ -1,228 +0,0 @@ - - - - - - diff --git a/src/components/mycomponent/dialog/server/operationAddDialog.vue b/src/components/mycomponent/dialog/server/operationAddDialog.vue index dfefe42..d436541 100644 --- a/src/components/mycomponent/dialog/server/operationAddDialog.vue +++ b/src/components/mycomponent/dialog/server/operationAddDialog.vue @@ -11,13 +11,14 @@ width="300px" class="inputWidth" style="justify-content: space-between;" + v-model="form.date" />
- +
- +
- +
@@ -100,16 +102,37 @@ RedStar, InputVue }, + data(){ + return{ + form:{ + date:'', // 服务运营编号 + name:'', // 服务名称 + address:'', // 收费 + address1:'', // 优惠 + address2:'', // 日期 + mark:'', // 备注 + } + } + }, props: { isShowInfo: { type: Boolean, default: true - } + }, }, methods: { close() { this.$emit('close') - } + }, + init(detail){ + if(detail.name){ + this.form.address = detail.address + this.form.address1 = detail.address1 + this.form.address2 = detail.address2 + this.form.date = detail.date + this.form.name = detail.name + } + }, } } diff --git a/src/icons/svg/cockpit-approved.svg b/src/icons/svg/cockpit-approved.svg new file mode 100644 index 0000000..634d7a8 --- /dev/null +++ b/src/icons/svg/cockpit-approved.svg @@ -0,0 +1,18 @@ + + + + diff --git a/src/icons/svg/cockpit-device-pan-check.svg b/src/icons/svg/cockpit-device-pan-check.svg new file mode 100644 index 0000000..5ad7f6b --- /dev/null +++ b/src/icons/svg/cockpit-device-pan-check.svg @@ -0,0 +1,13 @@ + + diff --git a/src/icons/svg/cockpit-device-pan-no.svg b/src/icons/svg/cockpit-device-pan-no.svg new file mode 100644 index 0000000..6713e2a --- /dev/null +++ b/src/icons/svg/cockpit-device-pan-no.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-device-register.svg b/src/icons/svg/cockpit-device-register.svg new file mode 100644 index 0000000..baa2355 --- /dev/null +++ b/src/icons/svg/cockpit-device-register.svg @@ -0,0 +1,65 @@ + + + + diff --git a/src/icons/svg/cockpit-device-total.svg b/src/icons/svg/cockpit-device-total.svg new file mode 100644 index 0000000..aa7788c --- /dev/null +++ b/src/icons/svg/cockpit-device-total.svg @@ -0,0 +1,59 @@ + + + + diff --git a/src/icons/svg/cockpit-distributor-pan-check.svg b/src/icons/svg/cockpit-distributor-pan-check.svg new file mode 100644 index 0000000..f4fa54e --- /dev/null +++ b/src/icons/svg/cockpit-distributor-pan-check.svg @@ -0,0 +1,15 @@ + + + + diff --git a/src/icons/svg/cockpit-distributor-pan-no.svg b/src/icons/svg/cockpit-distributor-pan-no.svg new file mode 100644 index 0000000..b10bdfe --- /dev/null +++ b/src/icons/svg/cockpit-distributor-pan-no.svg @@ -0,0 +1,15 @@ + + + + diff --git a/src/icons/svg/cockpit-lot-count.svg b/src/icons/svg/cockpit-lot-count.svg new file mode 100644 index 0000000..b4e743f --- /dev/null +++ b/src/icons/svg/cockpit-lot-count.svg @@ -0,0 +1,92 @@ + + + + diff --git a/src/icons/svg/cockpit-lot-online.svg b/src/icons/svg/cockpit-lot-online.svg new file mode 100644 index 0000000..0da6791 --- /dev/null +++ b/src/icons/svg/cockpit-lot-online.svg @@ -0,0 +1,62 @@ + + + + diff --git a/src/icons/svg/cockpit-supplier-pan-check.svg b/src/icons/svg/cockpit-supplier-pan-check.svg new file mode 100644 index 0000000..6d6756f --- /dev/null +++ b/src/icons/svg/cockpit-supplier-pan-check.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-supplier-pan-no.svg b/src/icons/svg/cockpit-supplier-pan-no.svg new file mode 100644 index 0000000..c9c869e --- /dev/null +++ b/src/icons/svg/cockpit-supplier-pan-no.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-supplier-register.svg b/src/icons/svg/cockpit-supplier-register.svg new file mode 100644 index 0000000..a6e193c --- /dev/null +++ b/src/icons/svg/cockpit-supplier-register.svg @@ -0,0 +1,17 @@ + + + + diff --git "a/src/icons/svg/cockpit-\344\276\233\345\272\224\345\225\206.svg" "b/src/icons/svg/cockpit-\344\276\233\345\272\224\345\225\206.svg" new file mode 100644 index 0000000..ca42dee --- /dev/null +++ "b/src/icons/svg/cockpit-\344\276\233\345\272\224\345\225\206.svg" @@ -0,0 +1,38 @@ + + + + diff --git "a/src/icons/svg/cockpit-\345\210\206\345\255\220\345\205\254\345\217\270.svg" "b/src/icons/svg/cockpit-\345\210\206\345\255\220\345\205\254\345\217\270.svg" new file mode 100644 index 0000000..b39c00f --- /dev/null +++ "b/src/icons/svg/cockpit-\345\210\206\345\255\220\345\205\254\345\217\270.svg" @@ -0,0 +1,16 @@ + + + + diff --git "a/src/icons/svg/cockpit-\346\231\256\351\200\232\347\256\241\347\220\206\350\247\222\350\211\262.svg" "b/src/icons/svg/cockpit-\346\231\256\351\200\232\347\256\241\347\220\206\350\247\222\350\211\262.svg" new file mode 100644 index 0000000..99c6837 --- /dev/null +++ "b/src/icons/svg/cockpit-\346\231\256\351\200\232\347\256\241\347\220\206\350\247\222\350\211\262.svg" @@ -0,0 +1,15 @@ + + + + diff --git "a/src/icons/svg/cockpit-\347\247\273\345\212\250\347\253\257\347\224\250\346\210\267.svg" "b/src/icons/svg/cockpit-\347\247\273\345\212\250\347\253\257\347\224\250\346\210\267.svg" new file mode 100644 index 0000000..e287570 --- /dev/null +++ "b/src/icons/svg/cockpit-\347\247\273\345\212\250\347\253\257\347\224\250\346\210\267.svg" @@ -0,0 +1,13 @@ + + + + diff --git "a/src/icons/svg/cockpit-\347\273\217\351\224\200\345\225\206.svg" "b/src/icons/svg/cockpit-\347\273\217\351\224\200\345\225\206.svg" new file mode 100644 index 0000000..fef7f56 --- /dev/null +++ "b/src/icons/svg/cockpit-\347\273\217\351\224\200\345\225\206.svg" @@ -0,0 +1,13 @@ + + + + diff --git "a/src/icons/svg/cockpit-\351\233\206\345\233\242.svg" "b/src/icons/svg/cockpit-\351\233\206\345\233\242.svg" new file mode 100644 index 0000000..48e8006 --- /dev/null +++ "b/src/icons/svg/cockpit-\351\233\206\345\233\242.svg" @@ -0,0 +1,14 @@ + + + + diff --git "a/src/icons/svg/cockpit-\351\233\206\345\233\242\347\224\250\346\210\267.svg" "b/src/icons/svg/cockpit-\351\233\206\345\233\242\347\224\250\346\210\267.svg" new file mode 100644 index 0000000..86f0776 --- /dev/null +++ "b/src/icons/svg/cockpit-\351\233\206\345\233\242\347\224\250\346\210\267.svg" @@ -0,0 +1,15 @@ + + + + diff --git a/src/router/modules/supplierManagement.js b/src/router/modules/supplierManagement.js index 4ad2c80..224d6b8 100644 --- a/src/router/modules/supplierManagement.js +++ b/src/router/modules/supplierManagement.js @@ -22,7 +22,7 @@ path: '/inquiry', name: 'Inquiry', component: () => import('@/views/supplier/inquiry'), // 重定向的组件位置 - meta: { title: '资料预审', icon: '', permission: '/supplier/inquire' } + meta: { title: '资料预审', icon: '', permission: '/supplier/inquiry' } }, { path: '/review', diff --git a/src/views/business/historyBusiness.vue b/src/views/business/historyBusiness.vue index bddce18..4398baa 100644 --- a/src/views/business/historyBusiness.vue +++ b/src/views/business/historyBusiness.vue @@ -13,7 +13,7 @@
预计工期
- +
diff --git a/src/views/business/report.vue b/src/views/business/report.vue index 33c1a3d..d833399 100644 --- a/src/views/business/report.vue +++ b/src/views/business/report.vue @@ -316,12 +316,12 @@
-
+
+
添加项目需求
-
@@ -421,22 +421,27 @@ }, methods: { save() { - this.addInfo.productList = { + if(this.valiateForm()){ + this.addInfo.productList = { productCode: this.addInfo.productList.productCode, productQuantity: this.addInfo.productList.productQuantity, productPrice: this.addInfo.productList.productPrice, productName: '' } add(this.addInfo).then(res => { - console.log(res) - if (res) { + this.setData() this.$message({ message: '保存成功', type: 'success' }) - } - }) - this.setData() + }) + } else { + this.$message({ + message: '请先完整填写报备信息', + type: 'error' + }) + } + }, close() { this.setData() @@ -462,7 +467,6 @@ this.form.countyList = res }) }, - handleAddBtn() { const obj = {} obj.brandName = '' @@ -525,6 +529,12 @@ this.$set(this.showEdit, index, false) // vue添加属性的方法 } }) + row.productCode = this.addInfo.productList.productCode + row.brandName = this.brandName + console.log(this.categoryIds) + row.categoryIds = this.categoryIds + row.productQuantity = this.addInfo.productList.productQuantity + row.productPrice = this.addInfo.productList.productPrice }, setData() { this.addInfo = { @@ -553,6 +563,17 @@ agentPhone: '', productList: [] } + }, + valiateForm() { + let arr = [] + for(var item in this.addInfo) { + if(this.addInfo[item]){ + arr.push(1) + }else{ + arr.push(0) + } + } + return arr.every(item => item === 1) } } } @@ -568,7 +589,7 @@ .report-from { .from-title { - font-size: 22px; + font-size: 16px; font-weight: bold; background-color: #28739e; color: white; diff --git a/src/views/dashboard/components/dashboardHeader.vue b/src/views/dashboard/components/dashboardHeader.vue index a4262ae..93b1ca5 100644 --- a/src/views/dashboard/components/dashboardHeader.vue +++ b/src/views/dashboard/components/dashboardHeader.vue @@ -6,43 +6,42 @@ \ No newline at end of file + diff --git a/src/views/dashboard/components/deviceList.vue b/src/views/dashboard/components/deviceList.vue index a7c11e1..23c5f15 100644 --- a/src/views/dashboard/components/deviceList.vue +++ b/src/views/dashboard/components/deviceList.vue @@ -1,21 +1,16 @@ - - - - \ No newline at end of file + diff --git a/src/views/dashboard/components/layoutChartDoughnu.vue b/src/views/dashboard/components/layoutChartDoughnu.vue index 7906430..9d3214e 100644 --- a/src/views/dashboard/components/layoutChartDoughnu.vue +++ b/src/views/dashboard/components/layoutChartDoughnu.vue @@ -3,9 +3,9 @@
- + 设备分类统计
-
+
@@ -25,10 +25,6 @@ type: String, default: "", }, - width:{ - type: String, - default: "500px" - }, height:{ type: String, default: "250px" @@ -63,11 +59,14 @@ \ No newline at end of file diff --git a/src/views/dashboard/components/managementList.vue b/src/views/dashboard/components/managementList.vue index 88c7827..d27a0de 100644 --- a/src/views/dashboard/components/managementList.vue +++ b/src/views/dashboard/components/managementList.vue @@ -28,7 +28,7 @@ fetchData() { getUserCount().then((res) => { this.management = res.data.map(item => { - return{...item,icon:'icon-user-man'} + return{...item,icon:'cockpit-' + item.roleName} }) }); }, diff --git a/src/views/dashboard/components/supplierList.vue b/src/views/dashboard/components/supplierList.vue index 978600e..3e41367 100644 --- a/src/views/dashboard/components/supplierList.vue +++ b/src/views/dashboard/components/supplierList.vue @@ -39,20 +39,20 @@ { title: "供应商注册设备总数量", count: "", - icon: "device-count", + icon: "cockpit-device-register", type: "deviceCount", }, { title: "供应商审核通过总数量", count: "", - icon: "supplier-panel", + icon: "cockpit-approved", type: "approvedCount", }, { title: "供应商注册总数量", count: "", - icon: "supplier-panel", - type: "supplierCount", + icon: "cockpit-supplier-register", + type: "approvedCount", }, ], }; diff --git a/src/views/dashboard/components/switch.vue b/src/views/dashboard/components/switch.vue index 43ef875..db4efa7 100644 --- a/src/views/dashboard/components/switch.vue +++ b/src/views/dashboard/components/switch.vue @@ -1,9 +1,10 @@ - - diff --git a/src/components/mycomponent/dialog/inquiryDialog.vue b/src/components/mycomponent/dialog/inquiryDialog.vue deleted file mode 100644 index a8834ef..0000000 --- a/src/components/mycomponent/dialog/inquiryDialog.vue +++ /dev/null @@ -1,228 +0,0 @@ - - - - - - diff --git a/src/components/mycomponent/dialog/server/operationAddDialog.vue b/src/components/mycomponent/dialog/server/operationAddDialog.vue index dfefe42..d436541 100644 --- a/src/components/mycomponent/dialog/server/operationAddDialog.vue +++ b/src/components/mycomponent/dialog/server/operationAddDialog.vue @@ -11,13 +11,14 @@ width="300px" class="inputWidth" style="justify-content: space-between;" + v-model="form.date" />
- +
- +
- +
@@ -100,16 +102,37 @@ RedStar, InputVue }, + data(){ + return{ + form:{ + date:'', // 服务运营编号 + name:'', // 服务名称 + address:'', // 收费 + address1:'', // 优惠 + address2:'', // 日期 + mark:'', // 备注 + } + } + }, props: { isShowInfo: { type: Boolean, default: true - } + }, }, methods: { close() { this.$emit('close') - } + }, + init(detail){ + if(detail.name){ + this.form.address = detail.address + this.form.address1 = detail.address1 + this.form.address2 = detail.address2 + this.form.date = detail.date + this.form.name = detail.name + } + }, } } diff --git a/src/icons/svg/cockpit-approved.svg b/src/icons/svg/cockpit-approved.svg new file mode 100644 index 0000000..634d7a8 --- /dev/null +++ b/src/icons/svg/cockpit-approved.svg @@ -0,0 +1,18 @@ + + + + diff --git a/src/icons/svg/cockpit-device-pan-check.svg b/src/icons/svg/cockpit-device-pan-check.svg new file mode 100644 index 0000000..5ad7f6b --- /dev/null +++ b/src/icons/svg/cockpit-device-pan-check.svg @@ -0,0 +1,13 @@ + + diff --git a/src/icons/svg/cockpit-device-pan-no.svg b/src/icons/svg/cockpit-device-pan-no.svg new file mode 100644 index 0000000..6713e2a --- /dev/null +++ b/src/icons/svg/cockpit-device-pan-no.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-device-register.svg b/src/icons/svg/cockpit-device-register.svg new file mode 100644 index 0000000..baa2355 --- /dev/null +++ b/src/icons/svg/cockpit-device-register.svg @@ -0,0 +1,65 @@ + + + + diff --git a/src/icons/svg/cockpit-device-total.svg b/src/icons/svg/cockpit-device-total.svg new file mode 100644 index 0000000..aa7788c --- /dev/null +++ b/src/icons/svg/cockpit-device-total.svg @@ -0,0 +1,59 @@ + + + + diff --git a/src/icons/svg/cockpit-distributor-pan-check.svg b/src/icons/svg/cockpit-distributor-pan-check.svg new file mode 100644 index 0000000..f4fa54e --- /dev/null +++ b/src/icons/svg/cockpit-distributor-pan-check.svg @@ -0,0 +1,15 @@ + + + + diff --git a/src/icons/svg/cockpit-distributor-pan-no.svg b/src/icons/svg/cockpit-distributor-pan-no.svg new file mode 100644 index 0000000..b10bdfe --- /dev/null +++ b/src/icons/svg/cockpit-distributor-pan-no.svg @@ -0,0 +1,15 @@ + + + + diff --git a/src/icons/svg/cockpit-lot-count.svg b/src/icons/svg/cockpit-lot-count.svg new file mode 100644 index 0000000..b4e743f --- /dev/null +++ b/src/icons/svg/cockpit-lot-count.svg @@ -0,0 +1,92 @@ + + + + diff --git a/src/icons/svg/cockpit-lot-online.svg b/src/icons/svg/cockpit-lot-online.svg new file mode 100644 index 0000000..0da6791 --- /dev/null +++ b/src/icons/svg/cockpit-lot-online.svg @@ -0,0 +1,62 @@ + + + + diff --git a/src/icons/svg/cockpit-supplier-pan-check.svg b/src/icons/svg/cockpit-supplier-pan-check.svg new file mode 100644 index 0000000..6d6756f --- /dev/null +++ b/src/icons/svg/cockpit-supplier-pan-check.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-supplier-pan-no.svg b/src/icons/svg/cockpit-supplier-pan-no.svg new file mode 100644 index 0000000..c9c869e --- /dev/null +++ b/src/icons/svg/cockpit-supplier-pan-no.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-supplier-register.svg b/src/icons/svg/cockpit-supplier-register.svg new file mode 100644 index 0000000..a6e193c --- /dev/null +++ b/src/icons/svg/cockpit-supplier-register.svg @@ -0,0 +1,17 @@ + + + + diff --git "a/src/icons/svg/cockpit-\344\276\233\345\272\224\345\225\206.svg" "b/src/icons/svg/cockpit-\344\276\233\345\272\224\345\225\206.svg" new file mode 100644 index 0000000..ca42dee --- /dev/null +++ "b/src/icons/svg/cockpit-\344\276\233\345\272\224\345\225\206.svg" @@ -0,0 +1,38 @@ + + + + diff --git "a/src/icons/svg/cockpit-\345\210\206\345\255\220\345\205\254\345\217\270.svg" "b/src/icons/svg/cockpit-\345\210\206\345\255\220\345\205\254\345\217\270.svg" new file mode 100644 index 0000000..b39c00f --- /dev/null +++ "b/src/icons/svg/cockpit-\345\210\206\345\255\220\345\205\254\345\217\270.svg" @@ -0,0 +1,16 @@ + + + + diff --git "a/src/icons/svg/cockpit-\346\231\256\351\200\232\347\256\241\347\220\206\350\247\222\350\211\262.svg" "b/src/icons/svg/cockpit-\346\231\256\351\200\232\347\256\241\347\220\206\350\247\222\350\211\262.svg" new file mode 100644 index 0000000..99c6837 --- /dev/null +++ "b/src/icons/svg/cockpit-\346\231\256\351\200\232\347\256\241\347\220\206\350\247\222\350\211\262.svg" @@ -0,0 +1,15 @@ + + + + diff --git "a/src/icons/svg/cockpit-\347\247\273\345\212\250\347\253\257\347\224\250\346\210\267.svg" "b/src/icons/svg/cockpit-\347\247\273\345\212\250\347\253\257\347\224\250\346\210\267.svg" new file mode 100644 index 0000000..e287570 --- /dev/null +++ "b/src/icons/svg/cockpit-\347\247\273\345\212\250\347\253\257\347\224\250\346\210\267.svg" @@ -0,0 +1,13 @@ + + + + diff --git "a/src/icons/svg/cockpit-\347\273\217\351\224\200\345\225\206.svg" "b/src/icons/svg/cockpit-\347\273\217\351\224\200\345\225\206.svg" new file mode 100644 index 0000000..fef7f56 --- /dev/null +++ "b/src/icons/svg/cockpit-\347\273\217\351\224\200\345\225\206.svg" @@ -0,0 +1,13 @@ + + + + diff --git "a/src/icons/svg/cockpit-\351\233\206\345\233\242.svg" "b/src/icons/svg/cockpit-\351\233\206\345\233\242.svg" new file mode 100644 index 0000000..48e8006 --- /dev/null +++ "b/src/icons/svg/cockpit-\351\233\206\345\233\242.svg" @@ -0,0 +1,14 @@ + + + + diff --git "a/src/icons/svg/cockpit-\351\233\206\345\233\242\347\224\250\346\210\267.svg" "b/src/icons/svg/cockpit-\351\233\206\345\233\242\347\224\250\346\210\267.svg" new file mode 100644 index 0000000..86f0776 --- /dev/null +++ "b/src/icons/svg/cockpit-\351\233\206\345\233\242\347\224\250\346\210\267.svg" @@ -0,0 +1,15 @@ + + + + diff --git a/src/router/modules/supplierManagement.js b/src/router/modules/supplierManagement.js index 4ad2c80..224d6b8 100644 --- a/src/router/modules/supplierManagement.js +++ b/src/router/modules/supplierManagement.js @@ -22,7 +22,7 @@ path: '/inquiry', name: 'Inquiry', component: () => import('@/views/supplier/inquiry'), // 重定向的组件位置 - meta: { title: '资料预审', icon: '', permission: '/supplier/inquire' } + meta: { title: '资料预审', icon: '', permission: '/supplier/inquiry' } }, { path: '/review', diff --git a/src/views/business/historyBusiness.vue b/src/views/business/historyBusiness.vue index bddce18..4398baa 100644 --- a/src/views/business/historyBusiness.vue +++ b/src/views/business/historyBusiness.vue @@ -13,7 +13,7 @@
预计工期
- +
diff --git a/src/views/business/report.vue b/src/views/business/report.vue index 33c1a3d..d833399 100644 --- a/src/views/business/report.vue +++ b/src/views/business/report.vue @@ -316,12 +316,12 @@
-
+
+
添加项目需求
-
@@ -421,22 +421,27 @@ }, methods: { save() { - this.addInfo.productList = { + if(this.valiateForm()){ + this.addInfo.productList = { productCode: this.addInfo.productList.productCode, productQuantity: this.addInfo.productList.productQuantity, productPrice: this.addInfo.productList.productPrice, productName: '' } add(this.addInfo).then(res => { - console.log(res) - if (res) { + this.setData() this.$message({ message: '保存成功', type: 'success' }) - } - }) - this.setData() + }) + } else { + this.$message({ + message: '请先完整填写报备信息', + type: 'error' + }) + } + }, close() { this.setData() @@ -462,7 +467,6 @@ this.form.countyList = res }) }, - handleAddBtn() { const obj = {} obj.brandName = '' @@ -525,6 +529,12 @@ this.$set(this.showEdit, index, false) // vue添加属性的方法 } }) + row.productCode = this.addInfo.productList.productCode + row.brandName = this.brandName + console.log(this.categoryIds) + row.categoryIds = this.categoryIds + row.productQuantity = this.addInfo.productList.productQuantity + row.productPrice = this.addInfo.productList.productPrice }, setData() { this.addInfo = { @@ -553,6 +563,17 @@ agentPhone: '', productList: [] } + }, + valiateForm() { + let arr = [] + for(var item in this.addInfo) { + if(this.addInfo[item]){ + arr.push(1) + }else{ + arr.push(0) + } + } + return arr.every(item => item === 1) } } } @@ -568,7 +589,7 @@ .report-from { .from-title { - font-size: 22px; + font-size: 16px; font-weight: bold; background-color: #28739e; color: white; diff --git a/src/views/dashboard/components/dashboardHeader.vue b/src/views/dashboard/components/dashboardHeader.vue index a4262ae..93b1ca5 100644 --- a/src/views/dashboard/components/dashboardHeader.vue +++ b/src/views/dashboard/components/dashboardHeader.vue @@ -6,43 +6,42 @@ \ No newline at end of file + diff --git a/src/views/dashboard/components/deviceList.vue b/src/views/dashboard/components/deviceList.vue index a7c11e1..23c5f15 100644 --- a/src/views/dashboard/components/deviceList.vue +++ b/src/views/dashboard/components/deviceList.vue @@ -1,21 +1,16 @@ - - - - \ No newline at end of file + diff --git a/src/views/dashboard/components/layoutChartDoughnu.vue b/src/views/dashboard/components/layoutChartDoughnu.vue index 7906430..9d3214e 100644 --- a/src/views/dashboard/components/layoutChartDoughnu.vue +++ b/src/views/dashboard/components/layoutChartDoughnu.vue @@ -3,9 +3,9 @@
- + 设备分类统计
-
+
@@ -25,10 +25,6 @@ type: String, default: "", }, - width:{ - type: String, - default: "500px" - }, height:{ type: String, default: "250px" @@ -63,11 +59,14 @@ \ No newline at end of file diff --git a/src/views/dashboard/components/managementList.vue b/src/views/dashboard/components/managementList.vue index 88c7827..d27a0de 100644 --- a/src/views/dashboard/components/managementList.vue +++ b/src/views/dashboard/components/managementList.vue @@ -28,7 +28,7 @@ fetchData() { getUserCount().then((res) => { this.management = res.data.map(item => { - return{...item,icon:'icon-user-man'} + return{...item,icon:'cockpit-' + item.roleName} }) }); }, diff --git a/src/views/dashboard/components/supplierList.vue b/src/views/dashboard/components/supplierList.vue index 978600e..3e41367 100644 --- a/src/views/dashboard/components/supplierList.vue +++ b/src/views/dashboard/components/supplierList.vue @@ -39,20 +39,20 @@ { title: "供应商注册设备总数量", count: "", - icon: "device-count", + icon: "cockpit-device-register", type: "deviceCount", }, { title: "供应商审核通过总数量", count: "", - icon: "supplier-panel", + icon: "cockpit-approved", type: "approvedCount", }, { title: "供应商注册总数量", count: "", - icon: "supplier-panel", - type: "supplierCount", + icon: "cockpit-supplier-register", + type: "approvedCount", }, ], }; diff --git a/src/views/dashboard/components/switch.vue b/src/views/dashboard/components/switch.vue index 43ef875..db4efa7 100644 --- a/src/views/dashboard/components/switch.vue +++ b/src/views/dashboard/components/switch.vue @@ -1,9 +1,10 @@ - - diff --git a/src/components/mycomponent/dialog/inquiryDialog.vue b/src/components/mycomponent/dialog/inquiryDialog.vue deleted file mode 100644 index a8834ef..0000000 --- a/src/components/mycomponent/dialog/inquiryDialog.vue +++ /dev/null @@ -1,228 +0,0 @@ - - - - - - diff --git a/src/components/mycomponent/dialog/server/operationAddDialog.vue b/src/components/mycomponent/dialog/server/operationAddDialog.vue index dfefe42..d436541 100644 --- a/src/components/mycomponent/dialog/server/operationAddDialog.vue +++ b/src/components/mycomponent/dialog/server/operationAddDialog.vue @@ -11,13 +11,14 @@ width="300px" class="inputWidth" style="justify-content: space-between;" + v-model="form.date" />
- +
- +
- +
@@ -100,16 +102,37 @@ RedStar, InputVue }, + data(){ + return{ + form:{ + date:'', // 服务运营编号 + name:'', // 服务名称 + address:'', // 收费 + address1:'', // 优惠 + address2:'', // 日期 + mark:'', // 备注 + } + } + }, props: { isShowInfo: { type: Boolean, default: true - } + }, }, methods: { close() { this.$emit('close') - } + }, + init(detail){ + if(detail.name){ + this.form.address = detail.address + this.form.address1 = detail.address1 + this.form.address2 = detail.address2 + this.form.date = detail.date + this.form.name = detail.name + } + }, } } diff --git a/src/icons/svg/cockpit-approved.svg b/src/icons/svg/cockpit-approved.svg new file mode 100644 index 0000000..634d7a8 --- /dev/null +++ b/src/icons/svg/cockpit-approved.svg @@ -0,0 +1,18 @@ + + + + diff --git a/src/icons/svg/cockpit-device-pan-check.svg b/src/icons/svg/cockpit-device-pan-check.svg new file mode 100644 index 0000000..5ad7f6b --- /dev/null +++ b/src/icons/svg/cockpit-device-pan-check.svg @@ -0,0 +1,13 @@ + + diff --git a/src/icons/svg/cockpit-device-pan-no.svg b/src/icons/svg/cockpit-device-pan-no.svg new file mode 100644 index 0000000..6713e2a --- /dev/null +++ b/src/icons/svg/cockpit-device-pan-no.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-device-register.svg b/src/icons/svg/cockpit-device-register.svg new file mode 100644 index 0000000..baa2355 --- /dev/null +++ b/src/icons/svg/cockpit-device-register.svg @@ -0,0 +1,65 @@ + + + + diff --git a/src/icons/svg/cockpit-device-total.svg b/src/icons/svg/cockpit-device-total.svg new file mode 100644 index 0000000..aa7788c --- /dev/null +++ b/src/icons/svg/cockpit-device-total.svg @@ -0,0 +1,59 @@ + + + + diff --git a/src/icons/svg/cockpit-distributor-pan-check.svg b/src/icons/svg/cockpit-distributor-pan-check.svg new file mode 100644 index 0000000..f4fa54e --- /dev/null +++ b/src/icons/svg/cockpit-distributor-pan-check.svg @@ -0,0 +1,15 @@ + + + + diff --git a/src/icons/svg/cockpit-distributor-pan-no.svg b/src/icons/svg/cockpit-distributor-pan-no.svg new file mode 100644 index 0000000..b10bdfe --- /dev/null +++ b/src/icons/svg/cockpit-distributor-pan-no.svg @@ -0,0 +1,15 @@ + + + + diff --git a/src/icons/svg/cockpit-lot-count.svg b/src/icons/svg/cockpit-lot-count.svg new file mode 100644 index 0000000..b4e743f --- /dev/null +++ b/src/icons/svg/cockpit-lot-count.svg @@ -0,0 +1,92 @@ + + + + diff --git a/src/icons/svg/cockpit-lot-online.svg b/src/icons/svg/cockpit-lot-online.svg new file mode 100644 index 0000000..0da6791 --- /dev/null +++ b/src/icons/svg/cockpit-lot-online.svg @@ -0,0 +1,62 @@ + + + + diff --git a/src/icons/svg/cockpit-supplier-pan-check.svg b/src/icons/svg/cockpit-supplier-pan-check.svg new file mode 100644 index 0000000..6d6756f --- /dev/null +++ b/src/icons/svg/cockpit-supplier-pan-check.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-supplier-pan-no.svg b/src/icons/svg/cockpit-supplier-pan-no.svg new file mode 100644 index 0000000..c9c869e --- /dev/null +++ b/src/icons/svg/cockpit-supplier-pan-no.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-supplier-register.svg b/src/icons/svg/cockpit-supplier-register.svg new file mode 100644 index 0000000..a6e193c --- /dev/null +++ b/src/icons/svg/cockpit-supplier-register.svg @@ -0,0 +1,17 @@ + + + + diff --git "a/src/icons/svg/cockpit-\344\276\233\345\272\224\345\225\206.svg" "b/src/icons/svg/cockpit-\344\276\233\345\272\224\345\225\206.svg" new file mode 100644 index 0000000..ca42dee --- /dev/null +++ "b/src/icons/svg/cockpit-\344\276\233\345\272\224\345\225\206.svg" @@ -0,0 +1,38 @@ + + + + diff --git "a/src/icons/svg/cockpit-\345\210\206\345\255\220\345\205\254\345\217\270.svg" "b/src/icons/svg/cockpit-\345\210\206\345\255\220\345\205\254\345\217\270.svg" new file mode 100644 index 0000000..b39c00f --- /dev/null +++ "b/src/icons/svg/cockpit-\345\210\206\345\255\220\345\205\254\345\217\270.svg" @@ -0,0 +1,16 @@ + + + + diff --git "a/src/icons/svg/cockpit-\346\231\256\351\200\232\347\256\241\347\220\206\350\247\222\350\211\262.svg" "b/src/icons/svg/cockpit-\346\231\256\351\200\232\347\256\241\347\220\206\350\247\222\350\211\262.svg" new file mode 100644 index 0000000..99c6837 --- /dev/null +++ "b/src/icons/svg/cockpit-\346\231\256\351\200\232\347\256\241\347\220\206\350\247\222\350\211\262.svg" @@ -0,0 +1,15 @@ + + + + diff --git "a/src/icons/svg/cockpit-\347\247\273\345\212\250\347\253\257\347\224\250\346\210\267.svg" "b/src/icons/svg/cockpit-\347\247\273\345\212\250\347\253\257\347\224\250\346\210\267.svg" new file mode 100644 index 0000000..e287570 --- /dev/null +++ "b/src/icons/svg/cockpit-\347\247\273\345\212\250\347\253\257\347\224\250\346\210\267.svg" @@ -0,0 +1,13 @@ + + + + diff --git "a/src/icons/svg/cockpit-\347\273\217\351\224\200\345\225\206.svg" "b/src/icons/svg/cockpit-\347\273\217\351\224\200\345\225\206.svg" new file mode 100644 index 0000000..fef7f56 --- /dev/null +++ "b/src/icons/svg/cockpit-\347\273\217\351\224\200\345\225\206.svg" @@ -0,0 +1,13 @@ + + + + diff --git "a/src/icons/svg/cockpit-\351\233\206\345\233\242.svg" "b/src/icons/svg/cockpit-\351\233\206\345\233\242.svg" new file mode 100644 index 0000000..48e8006 --- /dev/null +++ "b/src/icons/svg/cockpit-\351\233\206\345\233\242.svg" @@ -0,0 +1,14 @@ + + + + diff --git "a/src/icons/svg/cockpit-\351\233\206\345\233\242\347\224\250\346\210\267.svg" "b/src/icons/svg/cockpit-\351\233\206\345\233\242\347\224\250\346\210\267.svg" new file mode 100644 index 0000000..86f0776 --- /dev/null +++ "b/src/icons/svg/cockpit-\351\233\206\345\233\242\347\224\250\346\210\267.svg" @@ -0,0 +1,15 @@ + + + + diff --git a/src/router/modules/supplierManagement.js b/src/router/modules/supplierManagement.js index 4ad2c80..224d6b8 100644 --- a/src/router/modules/supplierManagement.js +++ b/src/router/modules/supplierManagement.js @@ -22,7 +22,7 @@ path: '/inquiry', name: 'Inquiry', component: () => import('@/views/supplier/inquiry'), // 重定向的组件位置 - meta: { title: '资料预审', icon: '', permission: '/supplier/inquire' } + meta: { title: '资料预审', icon: '', permission: '/supplier/inquiry' } }, { path: '/review', diff --git a/src/views/business/historyBusiness.vue b/src/views/business/historyBusiness.vue index bddce18..4398baa 100644 --- a/src/views/business/historyBusiness.vue +++ b/src/views/business/historyBusiness.vue @@ -13,7 +13,7 @@
预计工期
- +
diff --git a/src/views/business/report.vue b/src/views/business/report.vue index 33c1a3d..d833399 100644 --- a/src/views/business/report.vue +++ b/src/views/business/report.vue @@ -316,12 +316,12 @@
-
+
+
添加项目需求
-
@@ -421,22 +421,27 @@ }, methods: { save() { - this.addInfo.productList = { + if(this.valiateForm()){ + this.addInfo.productList = { productCode: this.addInfo.productList.productCode, productQuantity: this.addInfo.productList.productQuantity, productPrice: this.addInfo.productList.productPrice, productName: '' } add(this.addInfo).then(res => { - console.log(res) - if (res) { + this.setData() this.$message({ message: '保存成功', type: 'success' }) - } - }) - this.setData() + }) + } else { + this.$message({ + message: '请先完整填写报备信息', + type: 'error' + }) + } + }, close() { this.setData() @@ -462,7 +467,6 @@ this.form.countyList = res }) }, - handleAddBtn() { const obj = {} obj.brandName = '' @@ -525,6 +529,12 @@ this.$set(this.showEdit, index, false) // vue添加属性的方法 } }) + row.productCode = this.addInfo.productList.productCode + row.brandName = this.brandName + console.log(this.categoryIds) + row.categoryIds = this.categoryIds + row.productQuantity = this.addInfo.productList.productQuantity + row.productPrice = this.addInfo.productList.productPrice }, setData() { this.addInfo = { @@ -553,6 +563,17 @@ agentPhone: '', productList: [] } + }, + valiateForm() { + let arr = [] + for(var item in this.addInfo) { + if(this.addInfo[item]){ + arr.push(1) + }else{ + arr.push(0) + } + } + return arr.every(item => item === 1) } } } @@ -568,7 +589,7 @@ .report-from { .from-title { - font-size: 22px; + font-size: 16px; font-weight: bold; background-color: #28739e; color: white; diff --git a/src/views/dashboard/components/dashboardHeader.vue b/src/views/dashboard/components/dashboardHeader.vue index a4262ae..93b1ca5 100644 --- a/src/views/dashboard/components/dashboardHeader.vue +++ b/src/views/dashboard/components/dashboardHeader.vue @@ -6,43 +6,42 @@ \ No newline at end of file + diff --git a/src/views/dashboard/components/deviceList.vue b/src/views/dashboard/components/deviceList.vue index a7c11e1..23c5f15 100644 --- a/src/views/dashboard/components/deviceList.vue +++ b/src/views/dashboard/components/deviceList.vue @@ -1,21 +1,16 @@ - - - - \ No newline at end of file + diff --git a/src/views/dashboard/components/layoutChartDoughnu.vue b/src/views/dashboard/components/layoutChartDoughnu.vue index 7906430..9d3214e 100644 --- a/src/views/dashboard/components/layoutChartDoughnu.vue +++ b/src/views/dashboard/components/layoutChartDoughnu.vue @@ -3,9 +3,9 @@
- + 设备分类统计
-
+
@@ -25,10 +25,6 @@ type: String, default: "", }, - width:{ - type: String, - default: "500px" - }, height:{ type: String, default: "250px" @@ -63,11 +59,14 @@ \ No newline at end of file diff --git a/src/views/dashboard/components/managementList.vue b/src/views/dashboard/components/managementList.vue index 88c7827..d27a0de 100644 --- a/src/views/dashboard/components/managementList.vue +++ b/src/views/dashboard/components/managementList.vue @@ -28,7 +28,7 @@ fetchData() { getUserCount().then((res) => { this.management = res.data.map(item => { - return{...item,icon:'icon-user-man'} + return{...item,icon:'cockpit-' + item.roleName} }) }); }, diff --git a/src/views/dashboard/components/supplierList.vue b/src/views/dashboard/components/supplierList.vue index 978600e..3e41367 100644 --- a/src/views/dashboard/components/supplierList.vue +++ b/src/views/dashboard/components/supplierList.vue @@ -39,20 +39,20 @@ { title: "供应商注册设备总数量", count: "", - icon: "device-count", + icon: "cockpit-device-register", type: "deviceCount", }, { title: "供应商审核通过总数量", count: "", - icon: "supplier-panel", + icon: "cockpit-approved", type: "approvedCount", }, { title: "供应商注册总数量", count: "", - icon: "supplier-panel", - type: "supplierCount", + icon: "cockpit-supplier-register", + type: "approvedCount", }, ], }; diff --git a/src/views/dashboard/components/switch.vue b/src/views/dashboard/components/switch.vue index 43ef875..db4efa7 100644 --- a/src/views/dashboard/components/switch.vue +++ b/src/views/dashboard/components/switch.vue @@ -1,9 +1,10 @@ - - diff --git a/src/components/mycomponent/dialog/inquiryDialog.vue b/src/components/mycomponent/dialog/inquiryDialog.vue deleted file mode 100644 index a8834ef..0000000 --- a/src/components/mycomponent/dialog/inquiryDialog.vue +++ /dev/null @@ -1,228 +0,0 @@ - - - - - - diff --git a/src/components/mycomponent/dialog/server/operationAddDialog.vue b/src/components/mycomponent/dialog/server/operationAddDialog.vue index dfefe42..d436541 100644 --- a/src/components/mycomponent/dialog/server/operationAddDialog.vue +++ b/src/components/mycomponent/dialog/server/operationAddDialog.vue @@ -11,13 +11,14 @@ width="300px" class="inputWidth" style="justify-content: space-between;" + v-model="form.date" />
- +
- +
- +
@@ -100,16 +102,37 @@ RedStar, InputVue }, + data(){ + return{ + form:{ + date:'', // 服务运营编号 + name:'', // 服务名称 + address:'', // 收费 + address1:'', // 优惠 + address2:'', // 日期 + mark:'', // 备注 + } + } + }, props: { isShowInfo: { type: Boolean, default: true - } + }, }, methods: { close() { this.$emit('close') - } + }, + init(detail){ + if(detail.name){ + this.form.address = detail.address + this.form.address1 = detail.address1 + this.form.address2 = detail.address2 + this.form.date = detail.date + this.form.name = detail.name + } + }, } } diff --git a/src/icons/svg/cockpit-approved.svg b/src/icons/svg/cockpit-approved.svg new file mode 100644 index 0000000..634d7a8 --- /dev/null +++ b/src/icons/svg/cockpit-approved.svg @@ -0,0 +1,18 @@ + + + + diff --git a/src/icons/svg/cockpit-device-pan-check.svg b/src/icons/svg/cockpit-device-pan-check.svg new file mode 100644 index 0000000..5ad7f6b --- /dev/null +++ b/src/icons/svg/cockpit-device-pan-check.svg @@ -0,0 +1,13 @@ + + diff --git a/src/icons/svg/cockpit-device-pan-no.svg b/src/icons/svg/cockpit-device-pan-no.svg new file mode 100644 index 0000000..6713e2a --- /dev/null +++ b/src/icons/svg/cockpit-device-pan-no.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-device-register.svg b/src/icons/svg/cockpit-device-register.svg new file mode 100644 index 0000000..baa2355 --- /dev/null +++ b/src/icons/svg/cockpit-device-register.svg @@ -0,0 +1,65 @@ + + + + diff --git a/src/icons/svg/cockpit-device-total.svg b/src/icons/svg/cockpit-device-total.svg new file mode 100644 index 0000000..aa7788c --- /dev/null +++ b/src/icons/svg/cockpit-device-total.svg @@ -0,0 +1,59 @@ + + + + diff --git a/src/icons/svg/cockpit-distributor-pan-check.svg b/src/icons/svg/cockpit-distributor-pan-check.svg new file mode 100644 index 0000000..f4fa54e --- /dev/null +++ b/src/icons/svg/cockpit-distributor-pan-check.svg @@ -0,0 +1,15 @@ + + + + diff --git a/src/icons/svg/cockpit-distributor-pan-no.svg b/src/icons/svg/cockpit-distributor-pan-no.svg new file mode 100644 index 0000000..b10bdfe --- /dev/null +++ b/src/icons/svg/cockpit-distributor-pan-no.svg @@ -0,0 +1,15 @@ + + + + diff --git a/src/icons/svg/cockpit-lot-count.svg b/src/icons/svg/cockpit-lot-count.svg new file mode 100644 index 0000000..b4e743f --- /dev/null +++ b/src/icons/svg/cockpit-lot-count.svg @@ -0,0 +1,92 @@ + + + + diff --git a/src/icons/svg/cockpit-lot-online.svg b/src/icons/svg/cockpit-lot-online.svg new file mode 100644 index 0000000..0da6791 --- /dev/null +++ b/src/icons/svg/cockpit-lot-online.svg @@ -0,0 +1,62 @@ + + + + diff --git a/src/icons/svg/cockpit-supplier-pan-check.svg b/src/icons/svg/cockpit-supplier-pan-check.svg new file mode 100644 index 0000000..6d6756f --- /dev/null +++ b/src/icons/svg/cockpit-supplier-pan-check.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-supplier-pan-no.svg b/src/icons/svg/cockpit-supplier-pan-no.svg new file mode 100644 index 0000000..c9c869e --- /dev/null +++ b/src/icons/svg/cockpit-supplier-pan-no.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-supplier-register.svg b/src/icons/svg/cockpit-supplier-register.svg new file mode 100644 index 0000000..a6e193c --- /dev/null +++ b/src/icons/svg/cockpit-supplier-register.svg @@ -0,0 +1,17 @@ + + + + diff --git "a/src/icons/svg/cockpit-\344\276\233\345\272\224\345\225\206.svg" "b/src/icons/svg/cockpit-\344\276\233\345\272\224\345\225\206.svg" new file mode 100644 index 0000000..ca42dee --- /dev/null +++ "b/src/icons/svg/cockpit-\344\276\233\345\272\224\345\225\206.svg" @@ -0,0 +1,38 @@ + + + + diff --git "a/src/icons/svg/cockpit-\345\210\206\345\255\220\345\205\254\345\217\270.svg" "b/src/icons/svg/cockpit-\345\210\206\345\255\220\345\205\254\345\217\270.svg" new file mode 100644 index 0000000..b39c00f --- /dev/null +++ "b/src/icons/svg/cockpit-\345\210\206\345\255\220\345\205\254\345\217\270.svg" @@ -0,0 +1,16 @@ + + + + diff --git "a/src/icons/svg/cockpit-\346\231\256\351\200\232\347\256\241\347\220\206\350\247\222\350\211\262.svg" "b/src/icons/svg/cockpit-\346\231\256\351\200\232\347\256\241\347\220\206\350\247\222\350\211\262.svg" new file mode 100644 index 0000000..99c6837 --- /dev/null +++ "b/src/icons/svg/cockpit-\346\231\256\351\200\232\347\256\241\347\220\206\350\247\222\350\211\262.svg" @@ -0,0 +1,15 @@ + + + + diff --git "a/src/icons/svg/cockpit-\347\247\273\345\212\250\347\253\257\347\224\250\346\210\267.svg" "b/src/icons/svg/cockpit-\347\247\273\345\212\250\347\253\257\347\224\250\346\210\267.svg" new file mode 100644 index 0000000..e287570 --- /dev/null +++ "b/src/icons/svg/cockpit-\347\247\273\345\212\250\347\253\257\347\224\250\346\210\267.svg" @@ -0,0 +1,13 @@ + + + + diff --git "a/src/icons/svg/cockpit-\347\273\217\351\224\200\345\225\206.svg" "b/src/icons/svg/cockpit-\347\273\217\351\224\200\345\225\206.svg" new file mode 100644 index 0000000..fef7f56 --- /dev/null +++ "b/src/icons/svg/cockpit-\347\273\217\351\224\200\345\225\206.svg" @@ -0,0 +1,13 @@ + + + + diff --git "a/src/icons/svg/cockpit-\351\233\206\345\233\242.svg" "b/src/icons/svg/cockpit-\351\233\206\345\233\242.svg" new file mode 100644 index 0000000..48e8006 --- /dev/null +++ "b/src/icons/svg/cockpit-\351\233\206\345\233\242.svg" @@ -0,0 +1,14 @@ + + + + diff --git "a/src/icons/svg/cockpit-\351\233\206\345\233\242\347\224\250\346\210\267.svg" "b/src/icons/svg/cockpit-\351\233\206\345\233\242\347\224\250\346\210\267.svg" new file mode 100644 index 0000000..86f0776 --- /dev/null +++ "b/src/icons/svg/cockpit-\351\233\206\345\233\242\347\224\250\346\210\267.svg" @@ -0,0 +1,15 @@ + + + + diff --git a/src/router/modules/supplierManagement.js b/src/router/modules/supplierManagement.js index 4ad2c80..224d6b8 100644 --- a/src/router/modules/supplierManagement.js +++ b/src/router/modules/supplierManagement.js @@ -22,7 +22,7 @@ path: '/inquiry', name: 'Inquiry', component: () => import('@/views/supplier/inquiry'), // 重定向的组件位置 - meta: { title: '资料预审', icon: '', permission: '/supplier/inquire' } + meta: { title: '资料预审', icon: '', permission: '/supplier/inquiry' } }, { path: '/review', diff --git a/src/views/business/historyBusiness.vue b/src/views/business/historyBusiness.vue index bddce18..4398baa 100644 --- a/src/views/business/historyBusiness.vue +++ b/src/views/business/historyBusiness.vue @@ -13,7 +13,7 @@
预计工期
- +
diff --git a/src/views/business/report.vue b/src/views/business/report.vue index 33c1a3d..d833399 100644 --- a/src/views/business/report.vue +++ b/src/views/business/report.vue @@ -316,12 +316,12 @@
-
+
+
添加项目需求
-
@@ -421,22 +421,27 @@ }, methods: { save() { - this.addInfo.productList = { + if(this.valiateForm()){ + this.addInfo.productList = { productCode: this.addInfo.productList.productCode, productQuantity: this.addInfo.productList.productQuantity, productPrice: this.addInfo.productList.productPrice, productName: '' } add(this.addInfo).then(res => { - console.log(res) - if (res) { + this.setData() this.$message({ message: '保存成功', type: 'success' }) - } - }) - this.setData() + }) + } else { + this.$message({ + message: '请先完整填写报备信息', + type: 'error' + }) + } + }, close() { this.setData() @@ -462,7 +467,6 @@ this.form.countyList = res }) }, - handleAddBtn() { const obj = {} obj.brandName = '' @@ -525,6 +529,12 @@ this.$set(this.showEdit, index, false) // vue添加属性的方法 } }) + row.productCode = this.addInfo.productList.productCode + row.brandName = this.brandName + console.log(this.categoryIds) + row.categoryIds = this.categoryIds + row.productQuantity = this.addInfo.productList.productQuantity + row.productPrice = this.addInfo.productList.productPrice }, setData() { this.addInfo = { @@ -553,6 +563,17 @@ agentPhone: '', productList: [] } + }, + valiateForm() { + let arr = [] + for(var item in this.addInfo) { + if(this.addInfo[item]){ + arr.push(1) + }else{ + arr.push(0) + } + } + return arr.every(item => item === 1) } } } @@ -568,7 +589,7 @@ .report-from { .from-title { - font-size: 22px; + font-size: 16px; font-weight: bold; background-color: #28739e; color: white; diff --git a/src/views/dashboard/components/dashboardHeader.vue b/src/views/dashboard/components/dashboardHeader.vue index a4262ae..93b1ca5 100644 --- a/src/views/dashboard/components/dashboardHeader.vue +++ b/src/views/dashboard/components/dashboardHeader.vue @@ -6,43 +6,42 @@ \ No newline at end of file + diff --git a/src/views/dashboard/components/deviceList.vue b/src/views/dashboard/components/deviceList.vue index a7c11e1..23c5f15 100644 --- a/src/views/dashboard/components/deviceList.vue +++ b/src/views/dashboard/components/deviceList.vue @@ -1,21 +1,16 @@ - - - - \ No newline at end of file + diff --git a/src/views/dashboard/components/layoutChartDoughnu.vue b/src/views/dashboard/components/layoutChartDoughnu.vue index 7906430..9d3214e 100644 --- a/src/views/dashboard/components/layoutChartDoughnu.vue +++ b/src/views/dashboard/components/layoutChartDoughnu.vue @@ -3,9 +3,9 @@
- + 设备分类统计
-
+
@@ -25,10 +25,6 @@ type: String, default: "", }, - width:{ - type: String, - default: "500px" - }, height:{ type: String, default: "250px" @@ -63,11 +59,14 @@ \ No newline at end of file diff --git a/src/views/dashboard/components/managementList.vue b/src/views/dashboard/components/managementList.vue index 88c7827..d27a0de 100644 --- a/src/views/dashboard/components/managementList.vue +++ b/src/views/dashboard/components/managementList.vue @@ -28,7 +28,7 @@ fetchData() { getUserCount().then((res) => { this.management = res.data.map(item => { - return{...item,icon:'icon-user-man'} + return{...item,icon:'cockpit-' + item.roleName} }) }); }, diff --git a/src/views/dashboard/components/supplierList.vue b/src/views/dashboard/components/supplierList.vue index 978600e..3e41367 100644 --- a/src/views/dashboard/components/supplierList.vue +++ b/src/views/dashboard/components/supplierList.vue @@ -39,20 +39,20 @@ { title: "供应商注册设备总数量", count: "", - icon: "device-count", + icon: "cockpit-device-register", type: "deviceCount", }, { title: "供应商审核通过总数量", count: "", - icon: "supplier-panel", + icon: "cockpit-approved", type: "approvedCount", }, { title: "供应商注册总数量", count: "", - icon: "supplier-panel", - type: "supplierCount", + icon: "cockpit-supplier-register", + type: "approvedCount", }, ], }; diff --git a/src/views/dashboard/components/switch.vue b/src/views/dashboard/components/switch.vue index 43ef875..db4efa7 100644 --- a/src/views/dashboard/components/switch.vue +++ b/src/views/dashboard/components/switch.vue @@ -1,9 +1,10 @@ - - diff --git a/src/components/mycomponent/dialog/inquiryDialog.vue b/src/components/mycomponent/dialog/inquiryDialog.vue deleted file mode 100644 index a8834ef..0000000 --- a/src/components/mycomponent/dialog/inquiryDialog.vue +++ /dev/null @@ -1,228 +0,0 @@ - - - - - - diff --git a/src/components/mycomponent/dialog/server/operationAddDialog.vue b/src/components/mycomponent/dialog/server/operationAddDialog.vue index dfefe42..d436541 100644 --- a/src/components/mycomponent/dialog/server/operationAddDialog.vue +++ b/src/components/mycomponent/dialog/server/operationAddDialog.vue @@ -11,13 +11,14 @@ width="300px" class="inputWidth" style="justify-content: space-between;" + v-model="form.date" />
- +
- +
- +
@@ -100,16 +102,37 @@ RedStar, InputVue }, + data(){ + return{ + form:{ + date:'', // 服务运营编号 + name:'', // 服务名称 + address:'', // 收费 + address1:'', // 优惠 + address2:'', // 日期 + mark:'', // 备注 + } + } + }, props: { isShowInfo: { type: Boolean, default: true - } + }, }, methods: { close() { this.$emit('close') - } + }, + init(detail){ + if(detail.name){ + this.form.address = detail.address + this.form.address1 = detail.address1 + this.form.address2 = detail.address2 + this.form.date = detail.date + this.form.name = detail.name + } + }, } } diff --git a/src/icons/svg/cockpit-approved.svg b/src/icons/svg/cockpit-approved.svg new file mode 100644 index 0000000..634d7a8 --- /dev/null +++ b/src/icons/svg/cockpit-approved.svg @@ -0,0 +1,18 @@ + + + + diff --git a/src/icons/svg/cockpit-device-pan-check.svg b/src/icons/svg/cockpit-device-pan-check.svg new file mode 100644 index 0000000..5ad7f6b --- /dev/null +++ b/src/icons/svg/cockpit-device-pan-check.svg @@ -0,0 +1,13 @@ + + diff --git a/src/icons/svg/cockpit-device-pan-no.svg b/src/icons/svg/cockpit-device-pan-no.svg new file mode 100644 index 0000000..6713e2a --- /dev/null +++ b/src/icons/svg/cockpit-device-pan-no.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-device-register.svg b/src/icons/svg/cockpit-device-register.svg new file mode 100644 index 0000000..baa2355 --- /dev/null +++ b/src/icons/svg/cockpit-device-register.svg @@ -0,0 +1,65 @@ + + + + diff --git a/src/icons/svg/cockpit-device-total.svg b/src/icons/svg/cockpit-device-total.svg new file mode 100644 index 0000000..aa7788c --- /dev/null +++ b/src/icons/svg/cockpit-device-total.svg @@ -0,0 +1,59 @@ + + + + diff --git a/src/icons/svg/cockpit-distributor-pan-check.svg b/src/icons/svg/cockpit-distributor-pan-check.svg new file mode 100644 index 0000000..f4fa54e --- /dev/null +++ b/src/icons/svg/cockpit-distributor-pan-check.svg @@ -0,0 +1,15 @@ + + + + diff --git a/src/icons/svg/cockpit-distributor-pan-no.svg b/src/icons/svg/cockpit-distributor-pan-no.svg new file mode 100644 index 0000000..b10bdfe --- /dev/null +++ b/src/icons/svg/cockpit-distributor-pan-no.svg @@ -0,0 +1,15 @@ + + + + diff --git a/src/icons/svg/cockpit-lot-count.svg b/src/icons/svg/cockpit-lot-count.svg new file mode 100644 index 0000000..b4e743f --- /dev/null +++ b/src/icons/svg/cockpit-lot-count.svg @@ -0,0 +1,92 @@ + + + + diff --git a/src/icons/svg/cockpit-lot-online.svg b/src/icons/svg/cockpit-lot-online.svg new file mode 100644 index 0000000..0da6791 --- /dev/null +++ b/src/icons/svg/cockpit-lot-online.svg @@ -0,0 +1,62 @@ + + + + diff --git a/src/icons/svg/cockpit-supplier-pan-check.svg b/src/icons/svg/cockpit-supplier-pan-check.svg new file mode 100644 index 0000000..6d6756f --- /dev/null +++ b/src/icons/svg/cockpit-supplier-pan-check.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-supplier-pan-no.svg b/src/icons/svg/cockpit-supplier-pan-no.svg new file mode 100644 index 0000000..c9c869e --- /dev/null +++ b/src/icons/svg/cockpit-supplier-pan-no.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-supplier-register.svg b/src/icons/svg/cockpit-supplier-register.svg new file mode 100644 index 0000000..a6e193c --- /dev/null +++ b/src/icons/svg/cockpit-supplier-register.svg @@ -0,0 +1,17 @@ + + + + diff --git "a/src/icons/svg/cockpit-\344\276\233\345\272\224\345\225\206.svg" "b/src/icons/svg/cockpit-\344\276\233\345\272\224\345\225\206.svg" new file mode 100644 index 0000000..ca42dee --- /dev/null +++ "b/src/icons/svg/cockpit-\344\276\233\345\272\224\345\225\206.svg" @@ -0,0 +1,38 @@ + + + + diff --git "a/src/icons/svg/cockpit-\345\210\206\345\255\220\345\205\254\345\217\270.svg" "b/src/icons/svg/cockpit-\345\210\206\345\255\220\345\205\254\345\217\270.svg" new file mode 100644 index 0000000..b39c00f --- /dev/null +++ "b/src/icons/svg/cockpit-\345\210\206\345\255\220\345\205\254\345\217\270.svg" @@ -0,0 +1,16 @@ + + + + diff --git "a/src/icons/svg/cockpit-\346\231\256\351\200\232\347\256\241\347\220\206\350\247\222\350\211\262.svg" "b/src/icons/svg/cockpit-\346\231\256\351\200\232\347\256\241\347\220\206\350\247\222\350\211\262.svg" new file mode 100644 index 0000000..99c6837 --- /dev/null +++ "b/src/icons/svg/cockpit-\346\231\256\351\200\232\347\256\241\347\220\206\350\247\222\350\211\262.svg" @@ -0,0 +1,15 @@ + + + + diff --git "a/src/icons/svg/cockpit-\347\247\273\345\212\250\347\253\257\347\224\250\346\210\267.svg" "b/src/icons/svg/cockpit-\347\247\273\345\212\250\347\253\257\347\224\250\346\210\267.svg" new file mode 100644 index 0000000..e287570 --- /dev/null +++ "b/src/icons/svg/cockpit-\347\247\273\345\212\250\347\253\257\347\224\250\346\210\267.svg" @@ -0,0 +1,13 @@ + + + + diff --git "a/src/icons/svg/cockpit-\347\273\217\351\224\200\345\225\206.svg" "b/src/icons/svg/cockpit-\347\273\217\351\224\200\345\225\206.svg" new file mode 100644 index 0000000..fef7f56 --- /dev/null +++ "b/src/icons/svg/cockpit-\347\273\217\351\224\200\345\225\206.svg" @@ -0,0 +1,13 @@ + + + + diff --git "a/src/icons/svg/cockpit-\351\233\206\345\233\242.svg" "b/src/icons/svg/cockpit-\351\233\206\345\233\242.svg" new file mode 100644 index 0000000..48e8006 --- /dev/null +++ "b/src/icons/svg/cockpit-\351\233\206\345\233\242.svg" @@ -0,0 +1,14 @@ + + + + diff --git "a/src/icons/svg/cockpit-\351\233\206\345\233\242\347\224\250\346\210\267.svg" "b/src/icons/svg/cockpit-\351\233\206\345\233\242\347\224\250\346\210\267.svg" new file mode 100644 index 0000000..86f0776 --- /dev/null +++ "b/src/icons/svg/cockpit-\351\233\206\345\233\242\347\224\250\346\210\267.svg" @@ -0,0 +1,15 @@ + + + + diff --git a/src/router/modules/supplierManagement.js b/src/router/modules/supplierManagement.js index 4ad2c80..224d6b8 100644 --- a/src/router/modules/supplierManagement.js +++ b/src/router/modules/supplierManagement.js @@ -22,7 +22,7 @@ path: '/inquiry', name: 'Inquiry', component: () => import('@/views/supplier/inquiry'), // 重定向的组件位置 - meta: { title: '资料预审', icon: '', permission: '/supplier/inquire' } + meta: { title: '资料预审', icon: '', permission: '/supplier/inquiry' } }, { path: '/review', diff --git a/src/views/business/historyBusiness.vue b/src/views/business/historyBusiness.vue index bddce18..4398baa 100644 --- a/src/views/business/historyBusiness.vue +++ b/src/views/business/historyBusiness.vue @@ -13,7 +13,7 @@
预计工期
- +
diff --git a/src/views/business/report.vue b/src/views/business/report.vue index 33c1a3d..d833399 100644 --- a/src/views/business/report.vue +++ b/src/views/business/report.vue @@ -316,12 +316,12 @@
-
+
+
添加项目需求
-
@@ -421,22 +421,27 @@ }, methods: { save() { - this.addInfo.productList = { + if(this.valiateForm()){ + this.addInfo.productList = { productCode: this.addInfo.productList.productCode, productQuantity: this.addInfo.productList.productQuantity, productPrice: this.addInfo.productList.productPrice, productName: '' } add(this.addInfo).then(res => { - console.log(res) - if (res) { + this.setData() this.$message({ message: '保存成功', type: 'success' }) - } - }) - this.setData() + }) + } else { + this.$message({ + message: '请先完整填写报备信息', + type: 'error' + }) + } + }, close() { this.setData() @@ -462,7 +467,6 @@ this.form.countyList = res }) }, - handleAddBtn() { const obj = {} obj.brandName = '' @@ -525,6 +529,12 @@ this.$set(this.showEdit, index, false) // vue添加属性的方法 } }) + row.productCode = this.addInfo.productList.productCode + row.brandName = this.brandName + console.log(this.categoryIds) + row.categoryIds = this.categoryIds + row.productQuantity = this.addInfo.productList.productQuantity + row.productPrice = this.addInfo.productList.productPrice }, setData() { this.addInfo = { @@ -553,6 +563,17 @@ agentPhone: '', productList: [] } + }, + valiateForm() { + let arr = [] + for(var item in this.addInfo) { + if(this.addInfo[item]){ + arr.push(1) + }else{ + arr.push(0) + } + } + return arr.every(item => item === 1) } } } @@ -568,7 +589,7 @@ .report-from { .from-title { - font-size: 22px; + font-size: 16px; font-weight: bold; background-color: #28739e; color: white; diff --git a/src/views/dashboard/components/dashboardHeader.vue b/src/views/dashboard/components/dashboardHeader.vue index a4262ae..93b1ca5 100644 --- a/src/views/dashboard/components/dashboardHeader.vue +++ b/src/views/dashboard/components/dashboardHeader.vue @@ -6,43 +6,42 @@ \ No newline at end of file + diff --git a/src/views/dashboard/components/deviceList.vue b/src/views/dashboard/components/deviceList.vue index a7c11e1..23c5f15 100644 --- a/src/views/dashboard/components/deviceList.vue +++ b/src/views/dashboard/components/deviceList.vue @@ -1,21 +1,16 @@ - - - - \ No newline at end of file + diff --git a/src/views/dashboard/components/layoutChartDoughnu.vue b/src/views/dashboard/components/layoutChartDoughnu.vue index 7906430..9d3214e 100644 --- a/src/views/dashboard/components/layoutChartDoughnu.vue +++ b/src/views/dashboard/components/layoutChartDoughnu.vue @@ -3,9 +3,9 @@
- + 设备分类统计
-
+
@@ -25,10 +25,6 @@ type: String, default: "", }, - width:{ - type: String, - default: "500px" - }, height:{ type: String, default: "250px" @@ -63,11 +59,14 @@ \ No newline at end of file diff --git a/src/views/dashboard/components/managementList.vue b/src/views/dashboard/components/managementList.vue index 88c7827..d27a0de 100644 --- a/src/views/dashboard/components/managementList.vue +++ b/src/views/dashboard/components/managementList.vue @@ -28,7 +28,7 @@ fetchData() { getUserCount().then((res) => { this.management = res.data.map(item => { - return{...item,icon:'icon-user-man'} + return{...item,icon:'cockpit-' + item.roleName} }) }); }, diff --git a/src/views/dashboard/components/supplierList.vue b/src/views/dashboard/components/supplierList.vue index 978600e..3e41367 100644 --- a/src/views/dashboard/components/supplierList.vue +++ b/src/views/dashboard/components/supplierList.vue @@ -39,20 +39,20 @@ { title: "供应商注册设备总数量", count: "", - icon: "device-count", + icon: "cockpit-device-register", type: "deviceCount", }, { title: "供应商审核通过总数量", count: "", - icon: "supplier-panel", + icon: "cockpit-approved", type: "approvedCount", }, { title: "供应商注册总数量", count: "", - icon: "supplier-panel", - type: "supplierCount", + icon: "cockpit-supplier-register", + type: "approvedCount", }, ], }; diff --git a/src/views/dashboard/components/switch.vue b/src/views/dashboard/components/switch.vue index 43ef875..db4efa7 100644 --- a/src/views/dashboard/components/switch.vue +++ b/src/views/dashboard/components/switch.vue @@ -1,9 +1,10 @@ @@ -103,21 +102,6 @@ address3: '0.5', address4: '每天必做' } - // { - // date: '2016-05-04', - // name: '王小虎', - // address: '上海市普陀区金沙江路 1517 弄' - // }, - // { - // date: '2016-05-01', - // name: '王小虎', - // address: '上海市普陀区金沙江路 1519 弄' - // }, - // { - // date: '2016-05-03', - // name: '王小虎', - // address: '上海市普陀区金沙江路 1516 弄' - // } ], options: [ { @@ -125,7 +109,8 @@ label: '黄金糕' } ], - value: '' + value: '', + input:'' } }, methods: { diff --git a/src/api/supplier/supplier.js b/src/api/supplier/supplier.js index 593b7cd..b095e09 100644 --- a/src/api/supplier/supplier.js +++ b/src/api/supplier/supplier.js @@ -14,8 +14,8 @@ return instance.post(`/supplierPreReview/listPage?${str}`, data) } // 历史预审不分页列表 -const historyInquiry = () => { - return instance.post(`/supplierPreReview/history`, {}) +const historyInquiry = (data) => { + return instance.post(`/supplierPreReview/history`, data) } // 新增 diff --git "a/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" "b/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" new file mode 100644 index 0000000..34ce236 --- /dev/null +++ "b/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" Binary files differ diff --git "a/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" "b/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" new file mode 100644 index 0000000..dd0c295 --- /dev/null +++ "b/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" Binary files differ diff --git a/src/components/echart/barChart/verticalBarChart.vue b/src/components/echart/barChart/verticalBarChart.vue index 460d923..04a0090 100644 --- a/src/components/echart/barChart/verticalBarChart.vue +++ b/src/components/echart/barChart/verticalBarChart.vue @@ -2,21 +2,7 @@ - - diff --git a/src/components/mycomponent/dialog/inquiryDialog.vue b/src/components/mycomponent/dialog/inquiryDialog.vue deleted file mode 100644 index a8834ef..0000000 --- a/src/components/mycomponent/dialog/inquiryDialog.vue +++ /dev/null @@ -1,228 +0,0 @@ - - - - - - diff --git a/src/components/mycomponent/dialog/server/operationAddDialog.vue b/src/components/mycomponent/dialog/server/operationAddDialog.vue index dfefe42..d436541 100644 --- a/src/components/mycomponent/dialog/server/operationAddDialog.vue +++ b/src/components/mycomponent/dialog/server/operationAddDialog.vue @@ -11,13 +11,14 @@ width="300px" class="inputWidth" style="justify-content: space-between;" + v-model="form.date" />
- +
- +
- +
@@ -100,16 +102,37 @@ RedStar, InputVue }, + data(){ + return{ + form:{ + date:'', // 服务运营编号 + name:'', // 服务名称 + address:'', // 收费 + address1:'', // 优惠 + address2:'', // 日期 + mark:'', // 备注 + } + } + }, props: { isShowInfo: { type: Boolean, default: true - } + }, }, methods: { close() { this.$emit('close') - } + }, + init(detail){ + if(detail.name){ + this.form.address = detail.address + this.form.address1 = detail.address1 + this.form.address2 = detail.address2 + this.form.date = detail.date + this.form.name = detail.name + } + }, } } diff --git a/src/icons/svg/cockpit-approved.svg b/src/icons/svg/cockpit-approved.svg new file mode 100644 index 0000000..634d7a8 --- /dev/null +++ b/src/icons/svg/cockpit-approved.svg @@ -0,0 +1,18 @@ + + + + diff --git a/src/icons/svg/cockpit-device-pan-check.svg b/src/icons/svg/cockpit-device-pan-check.svg new file mode 100644 index 0000000..5ad7f6b --- /dev/null +++ b/src/icons/svg/cockpit-device-pan-check.svg @@ -0,0 +1,13 @@ + + diff --git a/src/icons/svg/cockpit-device-pan-no.svg b/src/icons/svg/cockpit-device-pan-no.svg new file mode 100644 index 0000000..6713e2a --- /dev/null +++ b/src/icons/svg/cockpit-device-pan-no.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-device-register.svg b/src/icons/svg/cockpit-device-register.svg new file mode 100644 index 0000000..baa2355 --- /dev/null +++ b/src/icons/svg/cockpit-device-register.svg @@ -0,0 +1,65 @@ + + + + diff --git a/src/icons/svg/cockpit-device-total.svg b/src/icons/svg/cockpit-device-total.svg new file mode 100644 index 0000000..aa7788c --- /dev/null +++ b/src/icons/svg/cockpit-device-total.svg @@ -0,0 +1,59 @@ + + + + diff --git a/src/icons/svg/cockpit-distributor-pan-check.svg b/src/icons/svg/cockpit-distributor-pan-check.svg new file mode 100644 index 0000000..f4fa54e --- /dev/null +++ b/src/icons/svg/cockpit-distributor-pan-check.svg @@ -0,0 +1,15 @@ + + + + diff --git a/src/icons/svg/cockpit-distributor-pan-no.svg b/src/icons/svg/cockpit-distributor-pan-no.svg new file mode 100644 index 0000000..b10bdfe --- /dev/null +++ b/src/icons/svg/cockpit-distributor-pan-no.svg @@ -0,0 +1,15 @@ + + + + diff --git a/src/icons/svg/cockpit-lot-count.svg b/src/icons/svg/cockpit-lot-count.svg new file mode 100644 index 0000000..b4e743f --- /dev/null +++ b/src/icons/svg/cockpit-lot-count.svg @@ -0,0 +1,92 @@ + + + + diff --git a/src/icons/svg/cockpit-lot-online.svg b/src/icons/svg/cockpit-lot-online.svg new file mode 100644 index 0000000..0da6791 --- /dev/null +++ b/src/icons/svg/cockpit-lot-online.svg @@ -0,0 +1,62 @@ + + + + diff --git a/src/icons/svg/cockpit-supplier-pan-check.svg b/src/icons/svg/cockpit-supplier-pan-check.svg new file mode 100644 index 0000000..6d6756f --- /dev/null +++ b/src/icons/svg/cockpit-supplier-pan-check.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-supplier-pan-no.svg b/src/icons/svg/cockpit-supplier-pan-no.svg new file mode 100644 index 0000000..c9c869e --- /dev/null +++ b/src/icons/svg/cockpit-supplier-pan-no.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-supplier-register.svg b/src/icons/svg/cockpit-supplier-register.svg new file mode 100644 index 0000000..a6e193c --- /dev/null +++ b/src/icons/svg/cockpit-supplier-register.svg @@ -0,0 +1,17 @@ + + + + diff --git "a/src/icons/svg/cockpit-\344\276\233\345\272\224\345\225\206.svg" "b/src/icons/svg/cockpit-\344\276\233\345\272\224\345\225\206.svg" new file mode 100644 index 0000000..ca42dee --- /dev/null +++ "b/src/icons/svg/cockpit-\344\276\233\345\272\224\345\225\206.svg" @@ -0,0 +1,38 @@ + + + + diff --git "a/src/icons/svg/cockpit-\345\210\206\345\255\220\345\205\254\345\217\270.svg" "b/src/icons/svg/cockpit-\345\210\206\345\255\220\345\205\254\345\217\270.svg" new file mode 100644 index 0000000..b39c00f --- /dev/null +++ "b/src/icons/svg/cockpit-\345\210\206\345\255\220\345\205\254\345\217\270.svg" @@ -0,0 +1,16 @@ + + + + diff --git "a/src/icons/svg/cockpit-\346\231\256\351\200\232\347\256\241\347\220\206\350\247\222\350\211\262.svg" "b/src/icons/svg/cockpit-\346\231\256\351\200\232\347\256\241\347\220\206\350\247\222\350\211\262.svg" new file mode 100644 index 0000000..99c6837 --- /dev/null +++ "b/src/icons/svg/cockpit-\346\231\256\351\200\232\347\256\241\347\220\206\350\247\222\350\211\262.svg" @@ -0,0 +1,15 @@ + + + + diff --git "a/src/icons/svg/cockpit-\347\247\273\345\212\250\347\253\257\347\224\250\346\210\267.svg" "b/src/icons/svg/cockpit-\347\247\273\345\212\250\347\253\257\347\224\250\346\210\267.svg" new file mode 100644 index 0000000..e287570 --- /dev/null +++ "b/src/icons/svg/cockpit-\347\247\273\345\212\250\347\253\257\347\224\250\346\210\267.svg" @@ -0,0 +1,13 @@ + + + + diff --git "a/src/icons/svg/cockpit-\347\273\217\351\224\200\345\225\206.svg" "b/src/icons/svg/cockpit-\347\273\217\351\224\200\345\225\206.svg" new file mode 100644 index 0000000..fef7f56 --- /dev/null +++ "b/src/icons/svg/cockpit-\347\273\217\351\224\200\345\225\206.svg" @@ -0,0 +1,13 @@ + + + + diff --git "a/src/icons/svg/cockpit-\351\233\206\345\233\242.svg" "b/src/icons/svg/cockpit-\351\233\206\345\233\242.svg" new file mode 100644 index 0000000..48e8006 --- /dev/null +++ "b/src/icons/svg/cockpit-\351\233\206\345\233\242.svg" @@ -0,0 +1,14 @@ + + + + diff --git "a/src/icons/svg/cockpit-\351\233\206\345\233\242\347\224\250\346\210\267.svg" "b/src/icons/svg/cockpit-\351\233\206\345\233\242\347\224\250\346\210\267.svg" new file mode 100644 index 0000000..86f0776 --- /dev/null +++ "b/src/icons/svg/cockpit-\351\233\206\345\233\242\347\224\250\346\210\267.svg" @@ -0,0 +1,15 @@ + + + + diff --git a/src/router/modules/supplierManagement.js b/src/router/modules/supplierManagement.js index 4ad2c80..224d6b8 100644 --- a/src/router/modules/supplierManagement.js +++ b/src/router/modules/supplierManagement.js @@ -22,7 +22,7 @@ path: '/inquiry', name: 'Inquiry', component: () => import('@/views/supplier/inquiry'), // 重定向的组件位置 - meta: { title: '资料预审', icon: '', permission: '/supplier/inquire' } + meta: { title: '资料预审', icon: '', permission: '/supplier/inquiry' } }, { path: '/review', diff --git a/src/views/business/historyBusiness.vue b/src/views/business/historyBusiness.vue index bddce18..4398baa 100644 --- a/src/views/business/historyBusiness.vue +++ b/src/views/business/historyBusiness.vue @@ -13,7 +13,7 @@
预计工期
- +
diff --git a/src/views/business/report.vue b/src/views/business/report.vue index 33c1a3d..d833399 100644 --- a/src/views/business/report.vue +++ b/src/views/business/report.vue @@ -316,12 +316,12 @@
-
+
+
添加项目需求
-
@@ -421,22 +421,27 @@ }, methods: { save() { - this.addInfo.productList = { + if(this.valiateForm()){ + this.addInfo.productList = { productCode: this.addInfo.productList.productCode, productQuantity: this.addInfo.productList.productQuantity, productPrice: this.addInfo.productList.productPrice, productName: '' } add(this.addInfo).then(res => { - console.log(res) - if (res) { + this.setData() this.$message({ message: '保存成功', type: 'success' }) - } - }) - this.setData() + }) + } else { + this.$message({ + message: '请先完整填写报备信息', + type: 'error' + }) + } + }, close() { this.setData() @@ -462,7 +467,6 @@ this.form.countyList = res }) }, - handleAddBtn() { const obj = {} obj.brandName = '' @@ -525,6 +529,12 @@ this.$set(this.showEdit, index, false) // vue添加属性的方法 } }) + row.productCode = this.addInfo.productList.productCode + row.brandName = this.brandName + console.log(this.categoryIds) + row.categoryIds = this.categoryIds + row.productQuantity = this.addInfo.productList.productQuantity + row.productPrice = this.addInfo.productList.productPrice }, setData() { this.addInfo = { @@ -553,6 +563,17 @@ agentPhone: '', productList: [] } + }, + valiateForm() { + let arr = [] + for(var item in this.addInfo) { + if(this.addInfo[item]){ + arr.push(1) + }else{ + arr.push(0) + } + } + return arr.every(item => item === 1) } } } @@ -568,7 +589,7 @@ .report-from { .from-title { - font-size: 22px; + font-size: 16px; font-weight: bold; background-color: #28739e; color: white; diff --git a/src/views/dashboard/components/dashboardHeader.vue b/src/views/dashboard/components/dashboardHeader.vue index a4262ae..93b1ca5 100644 --- a/src/views/dashboard/components/dashboardHeader.vue +++ b/src/views/dashboard/components/dashboardHeader.vue @@ -6,43 +6,42 @@ \ No newline at end of file + diff --git a/src/views/dashboard/components/deviceList.vue b/src/views/dashboard/components/deviceList.vue index a7c11e1..23c5f15 100644 --- a/src/views/dashboard/components/deviceList.vue +++ b/src/views/dashboard/components/deviceList.vue @@ -1,21 +1,16 @@ - - - - \ No newline at end of file + diff --git a/src/views/dashboard/components/layoutChartDoughnu.vue b/src/views/dashboard/components/layoutChartDoughnu.vue index 7906430..9d3214e 100644 --- a/src/views/dashboard/components/layoutChartDoughnu.vue +++ b/src/views/dashboard/components/layoutChartDoughnu.vue @@ -3,9 +3,9 @@
- + 设备分类统计
-
+
@@ -25,10 +25,6 @@ type: String, default: "", }, - width:{ - type: String, - default: "500px" - }, height:{ type: String, default: "250px" @@ -63,11 +59,14 @@ \ No newline at end of file diff --git a/src/views/dashboard/components/managementList.vue b/src/views/dashboard/components/managementList.vue index 88c7827..d27a0de 100644 --- a/src/views/dashboard/components/managementList.vue +++ b/src/views/dashboard/components/managementList.vue @@ -28,7 +28,7 @@ fetchData() { getUserCount().then((res) => { this.management = res.data.map(item => { - return{...item,icon:'icon-user-man'} + return{...item,icon:'cockpit-' + item.roleName} }) }); }, diff --git a/src/views/dashboard/components/supplierList.vue b/src/views/dashboard/components/supplierList.vue index 978600e..3e41367 100644 --- a/src/views/dashboard/components/supplierList.vue +++ b/src/views/dashboard/components/supplierList.vue @@ -39,20 +39,20 @@ { title: "供应商注册设备总数量", count: "", - icon: "device-count", + icon: "cockpit-device-register", type: "deviceCount", }, { title: "供应商审核通过总数量", count: "", - icon: "supplier-panel", + icon: "cockpit-approved", type: "approvedCount", }, { title: "供应商注册总数量", count: "", - icon: "supplier-panel", - type: "supplierCount", + icon: "cockpit-supplier-register", + type: "approvedCount", }, ], }; diff --git a/src/views/dashboard/components/switch.vue b/src/views/dashboard/components/switch.vue index 43ef875..db4efa7 100644 --- a/src/views/dashboard/components/switch.vue +++ b/src/views/dashboard/components/switch.vue @@ -1,9 +1,10 @@ @@ -103,21 +102,6 @@ address3: '0.5', address4: '每天必做' } - // { - // date: '2016-05-04', - // name: '王小虎', - // address: '上海市普陀区金沙江路 1517 弄' - // }, - // { - // date: '2016-05-01', - // name: '王小虎', - // address: '上海市普陀区金沙江路 1519 弄' - // }, - // { - // date: '2016-05-03', - // name: '王小虎', - // address: '上海市普陀区金沙江路 1516 弄' - // } ], options: [ { @@ -125,7 +109,8 @@ label: '黄金糕' } ], - value: '' + value: '', + input:'' } }, methods: { diff --git a/src/views/operation/watchList.vue b/src/views/operation/watchList.vue index 1b06442..af68692 100644 --- a/src/views/operation/watchList.vue +++ b/src/views/operation/watchList.vue @@ -129,21 +129,6 @@ address4: '100元', address5: '是' } - // { - // date: '2016-05-04', - // name: '王小虎', - // address: '上海市普陀区金沙江路 1517 弄' - // }, - // { - // date: '2016-05-01', - // name: '王小虎', - // address: '上海市普陀区金沙江路 1519 弄' - // }, - // { - // date: '2016-05-03', - // name: '王小虎', - // address: '上海市普陀区金沙江路 1516 弄' - // } ], options: [ { diff --git a/src/api/supplier/supplier.js b/src/api/supplier/supplier.js index 593b7cd..b095e09 100644 --- a/src/api/supplier/supplier.js +++ b/src/api/supplier/supplier.js @@ -14,8 +14,8 @@ return instance.post(`/supplierPreReview/listPage?${str}`, data) } // 历史预审不分页列表 -const historyInquiry = () => { - return instance.post(`/supplierPreReview/history`, {}) +const historyInquiry = (data) => { + return instance.post(`/supplierPreReview/history`, data) } // 新增 diff --git "a/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" "b/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" new file mode 100644 index 0000000..34ce236 --- /dev/null +++ "b/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" Binary files differ diff --git "a/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" "b/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" new file mode 100644 index 0000000..dd0c295 --- /dev/null +++ "b/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" Binary files differ diff --git a/src/components/echart/barChart/verticalBarChart.vue b/src/components/echart/barChart/verticalBarChart.vue index 460d923..04a0090 100644 --- a/src/components/echart/barChart/verticalBarChart.vue +++ b/src/components/echart/barChart/verticalBarChart.vue @@ -2,21 +2,7 @@ - - diff --git a/src/components/mycomponent/dialog/inquiryDialog.vue b/src/components/mycomponent/dialog/inquiryDialog.vue deleted file mode 100644 index a8834ef..0000000 --- a/src/components/mycomponent/dialog/inquiryDialog.vue +++ /dev/null @@ -1,228 +0,0 @@ - - - - - - diff --git a/src/components/mycomponent/dialog/server/operationAddDialog.vue b/src/components/mycomponent/dialog/server/operationAddDialog.vue index dfefe42..d436541 100644 --- a/src/components/mycomponent/dialog/server/operationAddDialog.vue +++ b/src/components/mycomponent/dialog/server/operationAddDialog.vue @@ -11,13 +11,14 @@ width="300px" class="inputWidth" style="justify-content: space-between;" + v-model="form.date" />
- +
- +
- +
@@ -100,16 +102,37 @@ RedStar, InputVue }, + data(){ + return{ + form:{ + date:'', // 服务运营编号 + name:'', // 服务名称 + address:'', // 收费 + address1:'', // 优惠 + address2:'', // 日期 + mark:'', // 备注 + } + } + }, props: { isShowInfo: { type: Boolean, default: true - } + }, }, methods: { close() { this.$emit('close') - } + }, + init(detail){ + if(detail.name){ + this.form.address = detail.address + this.form.address1 = detail.address1 + this.form.address2 = detail.address2 + this.form.date = detail.date + this.form.name = detail.name + } + }, } } diff --git a/src/icons/svg/cockpit-approved.svg b/src/icons/svg/cockpit-approved.svg new file mode 100644 index 0000000..634d7a8 --- /dev/null +++ b/src/icons/svg/cockpit-approved.svg @@ -0,0 +1,18 @@ + + + + diff --git a/src/icons/svg/cockpit-device-pan-check.svg b/src/icons/svg/cockpit-device-pan-check.svg new file mode 100644 index 0000000..5ad7f6b --- /dev/null +++ b/src/icons/svg/cockpit-device-pan-check.svg @@ -0,0 +1,13 @@ + + diff --git a/src/icons/svg/cockpit-device-pan-no.svg b/src/icons/svg/cockpit-device-pan-no.svg new file mode 100644 index 0000000..6713e2a --- /dev/null +++ b/src/icons/svg/cockpit-device-pan-no.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-device-register.svg b/src/icons/svg/cockpit-device-register.svg new file mode 100644 index 0000000..baa2355 --- /dev/null +++ b/src/icons/svg/cockpit-device-register.svg @@ -0,0 +1,65 @@ + + + + diff --git a/src/icons/svg/cockpit-device-total.svg b/src/icons/svg/cockpit-device-total.svg new file mode 100644 index 0000000..aa7788c --- /dev/null +++ b/src/icons/svg/cockpit-device-total.svg @@ -0,0 +1,59 @@ + + + + diff --git a/src/icons/svg/cockpit-distributor-pan-check.svg b/src/icons/svg/cockpit-distributor-pan-check.svg new file mode 100644 index 0000000..f4fa54e --- /dev/null +++ b/src/icons/svg/cockpit-distributor-pan-check.svg @@ -0,0 +1,15 @@ + + + + diff --git a/src/icons/svg/cockpit-distributor-pan-no.svg b/src/icons/svg/cockpit-distributor-pan-no.svg new file mode 100644 index 0000000..b10bdfe --- /dev/null +++ b/src/icons/svg/cockpit-distributor-pan-no.svg @@ -0,0 +1,15 @@ + + + + diff --git a/src/icons/svg/cockpit-lot-count.svg b/src/icons/svg/cockpit-lot-count.svg new file mode 100644 index 0000000..b4e743f --- /dev/null +++ b/src/icons/svg/cockpit-lot-count.svg @@ -0,0 +1,92 @@ + + + + diff --git a/src/icons/svg/cockpit-lot-online.svg b/src/icons/svg/cockpit-lot-online.svg new file mode 100644 index 0000000..0da6791 --- /dev/null +++ b/src/icons/svg/cockpit-lot-online.svg @@ -0,0 +1,62 @@ + + + + diff --git a/src/icons/svg/cockpit-supplier-pan-check.svg b/src/icons/svg/cockpit-supplier-pan-check.svg new file mode 100644 index 0000000..6d6756f --- /dev/null +++ b/src/icons/svg/cockpit-supplier-pan-check.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-supplier-pan-no.svg b/src/icons/svg/cockpit-supplier-pan-no.svg new file mode 100644 index 0000000..c9c869e --- /dev/null +++ b/src/icons/svg/cockpit-supplier-pan-no.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-supplier-register.svg b/src/icons/svg/cockpit-supplier-register.svg new file mode 100644 index 0000000..a6e193c --- /dev/null +++ b/src/icons/svg/cockpit-supplier-register.svg @@ -0,0 +1,17 @@ + + + + diff --git "a/src/icons/svg/cockpit-\344\276\233\345\272\224\345\225\206.svg" "b/src/icons/svg/cockpit-\344\276\233\345\272\224\345\225\206.svg" new file mode 100644 index 0000000..ca42dee --- /dev/null +++ "b/src/icons/svg/cockpit-\344\276\233\345\272\224\345\225\206.svg" @@ -0,0 +1,38 @@ + + + + diff --git "a/src/icons/svg/cockpit-\345\210\206\345\255\220\345\205\254\345\217\270.svg" "b/src/icons/svg/cockpit-\345\210\206\345\255\220\345\205\254\345\217\270.svg" new file mode 100644 index 0000000..b39c00f --- /dev/null +++ "b/src/icons/svg/cockpit-\345\210\206\345\255\220\345\205\254\345\217\270.svg" @@ -0,0 +1,16 @@ + + + + diff --git "a/src/icons/svg/cockpit-\346\231\256\351\200\232\347\256\241\347\220\206\350\247\222\350\211\262.svg" "b/src/icons/svg/cockpit-\346\231\256\351\200\232\347\256\241\347\220\206\350\247\222\350\211\262.svg" new file mode 100644 index 0000000..99c6837 --- /dev/null +++ "b/src/icons/svg/cockpit-\346\231\256\351\200\232\347\256\241\347\220\206\350\247\222\350\211\262.svg" @@ -0,0 +1,15 @@ + + + + diff --git "a/src/icons/svg/cockpit-\347\247\273\345\212\250\347\253\257\347\224\250\346\210\267.svg" "b/src/icons/svg/cockpit-\347\247\273\345\212\250\347\253\257\347\224\250\346\210\267.svg" new file mode 100644 index 0000000..e287570 --- /dev/null +++ "b/src/icons/svg/cockpit-\347\247\273\345\212\250\347\253\257\347\224\250\346\210\267.svg" @@ -0,0 +1,13 @@ + + + + diff --git "a/src/icons/svg/cockpit-\347\273\217\351\224\200\345\225\206.svg" "b/src/icons/svg/cockpit-\347\273\217\351\224\200\345\225\206.svg" new file mode 100644 index 0000000..fef7f56 --- /dev/null +++ "b/src/icons/svg/cockpit-\347\273\217\351\224\200\345\225\206.svg" @@ -0,0 +1,13 @@ + + + + diff --git "a/src/icons/svg/cockpit-\351\233\206\345\233\242.svg" "b/src/icons/svg/cockpit-\351\233\206\345\233\242.svg" new file mode 100644 index 0000000..48e8006 --- /dev/null +++ "b/src/icons/svg/cockpit-\351\233\206\345\233\242.svg" @@ -0,0 +1,14 @@ + + + + diff --git "a/src/icons/svg/cockpit-\351\233\206\345\233\242\347\224\250\346\210\267.svg" "b/src/icons/svg/cockpit-\351\233\206\345\233\242\347\224\250\346\210\267.svg" new file mode 100644 index 0000000..86f0776 --- /dev/null +++ "b/src/icons/svg/cockpit-\351\233\206\345\233\242\347\224\250\346\210\267.svg" @@ -0,0 +1,15 @@ + + + + diff --git a/src/router/modules/supplierManagement.js b/src/router/modules/supplierManagement.js index 4ad2c80..224d6b8 100644 --- a/src/router/modules/supplierManagement.js +++ b/src/router/modules/supplierManagement.js @@ -22,7 +22,7 @@ path: '/inquiry', name: 'Inquiry', component: () => import('@/views/supplier/inquiry'), // 重定向的组件位置 - meta: { title: '资料预审', icon: '', permission: '/supplier/inquire' } + meta: { title: '资料预审', icon: '', permission: '/supplier/inquiry' } }, { path: '/review', diff --git a/src/views/business/historyBusiness.vue b/src/views/business/historyBusiness.vue index bddce18..4398baa 100644 --- a/src/views/business/historyBusiness.vue +++ b/src/views/business/historyBusiness.vue @@ -13,7 +13,7 @@
预计工期
- +
diff --git a/src/views/business/report.vue b/src/views/business/report.vue index 33c1a3d..d833399 100644 --- a/src/views/business/report.vue +++ b/src/views/business/report.vue @@ -316,12 +316,12 @@
-
+
+
添加项目需求
-
@@ -421,22 +421,27 @@ }, methods: { save() { - this.addInfo.productList = { + if(this.valiateForm()){ + this.addInfo.productList = { productCode: this.addInfo.productList.productCode, productQuantity: this.addInfo.productList.productQuantity, productPrice: this.addInfo.productList.productPrice, productName: '' } add(this.addInfo).then(res => { - console.log(res) - if (res) { + this.setData() this.$message({ message: '保存成功', type: 'success' }) - } - }) - this.setData() + }) + } else { + this.$message({ + message: '请先完整填写报备信息', + type: 'error' + }) + } + }, close() { this.setData() @@ -462,7 +467,6 @@ this.form.countyList = res }) }, - handleAddBtn() { const obj = {} obj.brandName = '' @@ -525,6 +529,12 @@ this.$set(this.showEdit, index, false) // vue添加属性的方法 } }) + row.productCode = this.addInfo.productList.productCode + row.brandName = this.brandName + console.log(this.categoryIds) + row.categoryIds = this.categoryIds + row.productQuantity = this.addInfo.productList.productQuantity + row.productPrice = this.addInfo.productList.productPrice }, setData() { this.addInfo = { @@ -553,6 +563,17 @@ agentPhone: '', productList: [] } + }, + valiateForm() { + let arr = [] + for(var item in this.addInfo) { + if(this.addInfo[item]){ + arr.push(1) + }else{ + arr.push(0) + } + } + return arr.every(item => item === 1) } } } @@ -568,7 +589,7 @@ .report-from { .from-title { - font-size: 22px; + font-size: 16px; font-weight: bold; background-color: #28739e; color: white; diff --git a/src/views/dashboard/components/dashboardHeader.vue b/src/views/dashboard/components/dashboardHeader.vue index a4262ae..93b1ca5 100644 --- a/src/views/dashboard/components/dashboardHeader.vue +++ b/src/views/dashboard/components/dashboardHeader.vue @@ -6,43 +6,42 @@ \ No newline at end of file + diff --git a/src/views/dashboard/components/deviceList.vue b/src/views/dashboard/components/deviceList.vue index a7c11e1..23c5f15 100644 --- a/src/views/dashboard/components/deviceList.vue +++ b/src/views/dashboard/components/deviceList.vue @@ -1,21 +1,16 @@ - - - - \ No newline at end of file + diff --git a/src/views/dashboard/components/layoutChartDoughnu.vue b/src/views/dashboard/components/layoutChartDoughnu.vue index 7906430..9d3214e 100644 --- a/src/views/dashboard/components/layoutChartDoughnu.vue +++ b/src/views/dashboard/components/layoutChartDoughnu.vue @@ -3,9 +3,9 @@
- + 设备分类统计
-
+
@@ -25,10 +25,6 @@ type: String, default: "", }, - width:{ - type: String, - default: "500px" - }, height:{ type: String, default: "250px" @@ -63,11 +59,14 @@ \ No newline at end of file diff --git a/src/views/dashboard/components/managementList.vue b/src/views/dashboard/components/managementList.vue index 88c7827..d27a0de 100644 --- a/src/views/dashboard/components/managementList.vue +++ b/src/views/dashboard/components/managementList.vue @@ -28,7 +28,7 @@ fetchData() { getUserCount().then((res) => { this.management = res.data.map(item => { - return{...item,icon:'icon-user-man'} + return{...item,icon:'cockpit-' + item.roleName} }) }); }, diff --git a/src/views/dashboard/components/supplierList.vue b/src/views/dashboard/components/supplierList.vue index 978600e..3e41367 100644 --- a/src/views/dashboard/components/supplierList.vue +++ b/src/views/dashboard/components/supplierList.vue @@ -39,20 +39,20 @@ { title: "供应商注册设备总数量", count: "", - icon: "device-count", + icon: "cockpit-device-register", type: "deviceCount", }, { title: "供应商审核通过总数量", count: "", - icon: "supplier-panel", + icon: "cockpit-approved", type: "approvedCount", }, { title: "供应商注册总数量", count: "", - icon: "supplier-panel", - type: "supplierCount", + icon: "cockpit-supplier-register", + type: "approvedCount", }, ], }; diff --git a/src/views/dashboard/components/switch.vue b/src/views/dashboard/components/switch.vue index 43ef875..db4efa7 100644 --- a/src/views/dashboard/components/switch.vue +++ b/src/views/dashboard/components/switch.vue @@ -1,9 +1,10 @@ @@ -103,21 +102,6 @@ address3: '0.5', address4: '每天必做' } - // { - // date: '2016-05-04', - // name: '王小虎', - // address: '上海市普陀区金沙江路 1517 弄' - // }, - // { - // date: '2016-05-01', - // name: '王小虎', - // address: '上海市普陀区金沙江路 1519 弄' - // }, - // { - // date: '2016-05-03', - // name: '王小虎', - // address: '上海市普陀区金沙江路 1516 弄' - // } ], options: [ { @@ -125,7 +109,8 @@ label: '黄金糕' } ], - value: '' + value: '', + input:'' } }, methods: { diff --git a/src/views/operation/watchList.vue b/src/views/operation/watchList.vue index 1b06442..af68692 100644 --- a/src/views/operation/watchList.vue +++ b/src/views/operation/watchList.vue @@ -129,21 +129,6 @@ address4: '100元', address5: '是' } - // { - // date: '2016-05-04', - // name: '王小虎', - // address: '上海市普陀区金沙江路 1517 弄' - // }, - // { - // date: '2016-05-01', - // name: '王小虎', - // address: '上海市普陀区金沙江路 1519 弄' - // }, - // { - // date: '2016-05-03', - // name: '王小虎', - // address: '上海市普陀区金沙江路 1516 弄' - // } ], options: [ { diff --git a/src/views/order/orderShop.vue b/src/views/order/orderShop.vue index 1874202..36c7c50 100644 --- a/src/views/order/orderShop.vue +++ b/src/views/order/orderShop.vue @@ -2,30 +2,52 @@ \ No newline at end of file + diff --git a/src/views/dashboard/components/deviceList.vue b/src/views/dashboard/components/deviceList.vue index a7c11e1..23c5f15 100644 --- a/src/views/dashboard/components/deviceList.vue +++ b/src/views/dashboard/components/deviceList.vue @@ -1,21 +1,16 @@ - - - - \ No newline at end of file + diff --git a/src/views/dashboard/components/layoutChartDoughnu.vue b/src/views/dashboard/components/layoutChartDoughnu.vue index 7906430..9d3214e 100644 --- a/src/views/dashboard/components/layoutChartDoughnu.vue +++ b/src/views/dashboard/components/layoutChartDoughnu.vue @@ -3,9 +3,9 @@
- + 设备分类统计
-
+
@@ -25,10 +25,6 @@ type: String, default: "", }, - width:{ - type: String, - default: "500px" - }, height:{ type: String, default: "250px" @@ -63,11 +59,14 @@ \ No newline at end of file diff --git a/src/views/dashboard/components/managementList.vue b/src/views/dashboard/components/managementList.vue index 88c7827..d27a0de 100644 --- a/src/views/dashboard/components/managementList.vue +++ b/src/views/dashboard/components/managementList.vue @@ -28,7 +28,7 @@ fetchData() { getUserCount().then((res) => { this.management = res.data.map(item => { - return{...item,icon:'icon-user-man'} + return{...item,icon:'cockpit-' + item.roleName} }) }); }, diff --git a/src/views/dashboard/components/supplierList.vue b/src/views/dashboard/components/supplierList.vue index 978600e..3e41367 100644 --- a/src/views/dashboard/components/supplierList.vue +++ b/src/views/dashboard/components/supplierList.vue @@ -39,20 +39,20 @@ { title: "供应商注册设备总数量", count: "", - icon: "device-count", + icon: "cockpit-device-register", type: "deviceCount", }, { title: "供应商审核通过总数量", count: "", - icon: "supplier-panel", + icon: "cockpit-approved", type: "approvedCount", }, { title: "供应商注册总数量", count: "", - icon: "supplier-panel", - type: "supplierCount", + icon: "cockpit-supplier-register", + type: "approvedCount", }, ], }; diff --git a/src/views/dashboard/components/switch.vue b/src/views/dashboard/components/switch.vue index 43ef875..db4efa7 100644 --- a/src/views/dashboard/components/switch.vue +++ b/src/views/dashboard/components/switch.vue @@ -1,9 +1,10 @@ @@ -103,21 +102,6 @@ address3: '0.5', address4: '每天必做' } - // { - // date: '2016-05-04', - // name: '王小虎', - // address: '上海市普陀区金沙江路 1517 弄' - // }, - // { - // date: '2016-05-01', - // name: '王小虎', - // address: '上海市普陀区金沙江路 1519 弄' - // }, - // { - // date: '2016-05-03', - // name: '王小虎', - // address: '上海市普陀区金沙江路 1516 弄' - // } ], options: [ { @@ -125,7 +109,8 @@ label: '黄金糕' } ], - value: '' + value: '', + input:'' } }, methods: { diff --git a/src/views/operation/watchList.vue b/src/views/operation/watchList.vue index 1b06442..af68692 100644 --- a/src/views/operation/watchList.vue +++ b/src/views/operation/watchList.vue @@ -129,21 +129,6 @@ address4: '100元', address5: '是' } - // { - // date: '2016-05-04', - // name: '王小虎', - // address: '上海市普陀区金沙江路 1517 弄' - // }, - // { - // date: '2016-05-01', - // name: '王小虎', - // address: '上海市普陀区金沙江路 1519 弄' - // }, - // { - // date: '2016-05-03', - // name: '王小虎', - // address: '上海市普陀区金沙江路 1516 弄' - // } ], options: [ { diff --git a/src/views/order/orderShop.vue b/src/views/order/orderShop.vue index 1874202..36c7c50 100644 --- a/src/views/order/orderShop.vue +++ b/src/views/order/orderShop.vue @@ -2,30 +2,52 @@ \ No newline at end of file + diff --git a/src/views/dashboard/components/deviceList.vue b/src/views/dashboard/components/deviceList.vue index a7c11e1..23c5f15 100644 --- a/src/views/dashboard/components/deviceList.vue +++ b/src/views/dashboard/components/deviceList.vue @@ -1,21 +1,16 @@ - - - - \ No newline at end of file + diff --git a/src/views/dashboard/components/layoutChartDoughnu.vue b/src/views/dashboard/components/layoutChartDoughnu.vue index 7906430..9d3214e 100644 --- a/src/views/dashboard/components/layoutChartDoughnu.vue +++ b/src/views/dashboard/components/layoutChartDoughnu.vue @@ -3,9 +3,9 @@
- + 设备分类统计
-
+
@@ -25,10 +25,6 @@ type: String, default: "", }, - width:{ - type: String, - default: "500px" - }, height:{ type: String, default: "250px" @@ -63,11 +59,14 @@ \ No newline at end of file diff --git a/src/views/dashboard/components/managementList.vue b/src/views/dashboard/components/managementList.vue index 88c7827..d27a0de 100644 --- a/src/views/dashboard/components/managementList.vue +++ b/src/views/dashboard/components/managementList.vue @@ -28,7 +28,7 @@ fetchData() { getUserCount().then((res) => { this.management = res.data.map(item => { - return{...item,icon:'icon-user-man'} + return{...item,icon:'cockpit-' + item.roleName} }) }); }, diff --git a/src/views/dashboard/components/supplierList.vue b/src/views/dashboard/components/supplierList.vue index 978600e..3e41367 100644 --- a/src/views/dashboard/components/supplierList.vue +++ b/src/views/dashboard/components/supplierList.vue @@ -39,20 +39,20 @@ { title: "供应商注册设备总数量", count: "", - icon: "device-count", + icon: "cockpit-device-register", type: "deviceCount", }, { title: "供应商审核通过总数量", count: "", - icon: "supplier-panel", + icon: "cockpit-approved", type: "approvedCount", }, { title: "供应商注册总数量", count: "", - icon: "supplier-panel", - type: "supplierCount", + icon: "cockpit-supplier-register", + type: "approvedCount", }, ], }; diff --git a/src/views/dashboard/components/switch.vue b/src/views/dashboard/components/switch.vue index 43ef875..db4efa7 100644 --- a/src/views/dashboard/components/switch.vue +++ b/src/views/dashboard/components/switch.vue @@ -1,9 +1,10 @@ @@ -103,21 +102,6 @@ address3: '0.5', address4: '每天必做' } - // { - // date: '2016-05-04', - // name: '王小虎', - // address: '上海市普陀区金沙江路 1517 弄' - // }, - // { - // date: '2016-05-01', - // name: '王小虎', - // address: '上海市普陀区金沙江路 1519 弄' - // }, - // { - // date: '2016-05-03', - // name: '王小虎', - // address: '上海市普陀区金沙江路 1516 弄' - // } ], options: [ { @@ -125,7 +109,8 @@ label: '黄金糕' } ], - value: '' + value: '', + input:'' } }, methods: { diff --git a/src/views/operation/watchList.vue b/src/views/operation/watchList.vue index 1b06442..af68692 100644 --- a/src/views/operation/watchList.vue +++ b/src/views/operation/watchList.vue @@ -129,21 +129,6 @@ address4: '100元', address5: '是' } - // { - // date: '2016-05-04', - // name: '王小虎', - // address: '上海市普陀区金沙江路 1517 弄' - // }, - // { - // date: '2016-05-01', - // name: '王小虎', - // address: '上海市普陀区金沙江路 1519 弄' - // }, - // { - // date: '2016-05-03', - // name: '王小虎', - // address: '上海市普陀区金沙江路 1516 弄' - // } ], options: [ { diff --git a/src/views/order/orderShop.vue b/src/views/order/orderShop.vue index 1874202..36c7c50 100644 --- a/src/views/order/orderShop.vue +++ b/src/views/order/orderShop.vue @@ -2,30 +2,52 @@ - - diff --git a/src/components/mycomponent/dialog/inquiryDialog.vue b/src/components/mycomponent/dialog/inquiryDialog.vue deleted file mode 100644 index a8834ef..0000000 --- a/src/components/mycomponent/dialog/inquiryDialog.vue +++ /dev/null @@ -1,228 +0,0 @@ - - - - - - diff --git a/src/components/mycomponent/dialog/server/operationAddDialog.vue b/src/components/mycomponent/dialog/server/operationAddDialog.vue index dfefe42..d436541 100644 --- a/src/components/mycomponent/dialog/server/operationAddDialog.vue +++ b/src/components/mycomponent/dialog/server/operationAddDialog.vue @@ -11,13 +11,14 @@ width="300px" class="inputWidth" style="justify-content: space-between;" + v-model="form.date" />
- +
- +
- +
@@ -100,16 +102,37 @@ RedStar, InputVue }, + data(){ + return{ + form:{ + date:'', // 服务运营编号 + name:'', // 服务名称 + address:'', // 收费 + address1:'', // 优惠 + address2:'', // 日期 + mark:'', // 备注 + } + } + }, props: { isShowInfo: { type: Boolean, default: true - } + }, }, methods: { close() { this.$emit('close') - } + }, + init(detail){ + if(detail.name){ + this.form.address = detail.address + this.form.address1 = detail.address1 + this.form.address2 = detail.address2 + this.form.date = detail.date + this.form.name = detail.name + } + }, } } diff --git a/src/icons/svg/cockpit-approved.svg b/src/icons/svg/cockpit-approved.svg new file mode 100644 index 0000000..634d7a8 --- /dev/null +++ b/src/icons/svg/cockpit-approved.svg @@ -0,0 +1,18 @@ + + + + diff --git a/src/icons/svg/cockpit-device-pan-check.svg b/src/icons/svg/cockpit-device-pan-check.svg new file mode 100644 index 0000000..5ad7f6b --- /dev/null +++ b/src/icons/svg/cockpit-device-pan-check.svg @@ -0,0 +1,13 @@ + + diff --git a/src/icons/svg/cockpit-device-pan-no.svg b/src/icons/svg/cockpit-device-pan-no.svg new file mode 100644 index 0000000..6713e2a --- /dev/null +++ b/src/icons/svg/cockpit-device-pan-no.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-device-register.svg b/src/icons/svg/cockpit-device-register.svg new file mode 100644 index 0000000..baa2355 --- /dev/null +++ b/src/icons/svg/cockpit-device-register.svg @@ -0,0 +1,65 @@ + + + + diff --git a/src/icons/svg/cockpit-device-total.svg b/src/icons/svg/cockpit-device-total.svg new file mode 100644 index 0000000..aa7788c --- /dev/null +++ b/src/icons/svg/cockpit-device-total.svg @@ -0,0 +1,59 @@ + + + + diff --git a/src/icons/svg/cockpit-distributor-pan-check.svg b/src/icons/svg/cockpit-distributor-pan-check.svg new file mode 100644 index 0000000..f4fa54e --- /dev/null +++ b/src/icons/svg/cockpit-distributor-pan-check.svg @@ -0,0 +1,15 @@ + + + + diff --git a/src/icons/svg/cockpit-distributor-pan-no.svg b/src/icons/svg/cockpit-distributor-pan-no.svg new file mode 100644 index 0000000..b10bdfe --- /dev/null +++ b/src/icons/svg/cockpit-distributor-pan-no.svg @@ -0,0 +1,15 @@ + + + + diff --git a/src/icons/svg/cockpit-lot-count.svg b/src/icons/svg/cockpit-lot-count.svg new file mode 100644 index 0000000..b4e743f --- /dev/null +++ b/src/icons/svg/cockpit-lot-count.svg @@ -0,0 +1,92 @@ + + + + diff --git a/src/icons/svg/cockpit-lot-online.svg b/src/icons/svg/cockpit-lot-online.svg new file mode 100644 index 0000000..0da6791 --- /dev/null +++ b/src/icons/svg/cockpit-lot-online.svg @@ -0,0 +1,62 @@ + + + + diff --git a/src/icons/svg/cockpit-supplier-pan-check.svg b/src/icons/svg/cockpit-supplier-pan-check.svg new file mode 100644 index 0000000..6d6756f --- /dev/null +++ b/src/icons/svg/cockpit-supplier-pan-check.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-supplier-pan-no.svg b/src/icons/svg/cockpit-supplier-pan-no.svg new file mode 100644 index 0000000..c9c869e --- /dev/null +++ b/src/icons/svg/cockpit-supplier-pan-no.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-supplier-register.svg b/src/icons/svg/cockpit-supplier-register.svg new file mode 100644 index 0000000..a6e193c --- /dev/null +++ b/src/icons/svg/cockpit-supplier-register.svg @@ -0,0 +1,17 @@ + + + + diff --git "a/src/icons/svg/cockpit-\344\276\233\345\272\224\345\225\206.svg" "b/src/icons/svg/cockpit-\344\276\233\345\272\224\345\225\206.svg" new file mode 100644 index 0000000..ca42dee --- /dev/null +++ "b/src/icons/svg/cockpit-\344\276\233\345\272\224\345\225\206.svg" @@ -0,0 +1,38 @@ + + + + diff --git "a/src/icons/svg/cockpit-\345\210\206\345\255\220\345\205\254\345\217\270.svg" "b/src/icons/svg/cockpit-\345\210\206\345\255\220\345\205\254\345\217\270.svg" new file mode 100644 index 0000000..b39c00f --- /dev/null +++ "b/src/icons/svg/cockpit-\345\210\206\345\255\220\345\205\254\345\217\270.svg" @@ -0,0 +1,16 @@ + + + + diff --git "a/src/icons/svg/cockpit-\346\231\256\351\200\232\347\256\241\347\220\206\350\247\222\350\211\262.svg" "b/src/icons/svg/cockpit-\346\231\256\351\200\232\347\256\241\347\220\206\350\247\222\350\211\262.svg" new file mode 100644 index 0000000..99c6837 --- /dev/null +++ "b/src/icons/svg/cockpit-\346\231\256\351\200\232\347\256\241\347\220\206\350\247\222\350\211\262.svg" @@ -0,0 +1,15 @@ + + + + diff --git "a/src/icons/svg/cockpit-\347\247\273\345\212\250\347\253\257\347\224\250\346\210\267.svg" "b/src/icons/svg/cockpit-\347\247\273\345\212\250\347\253\257\347\224\250\346\210\267.svg" new file mode 100644 index 0000000..e287570 --- /dev/null +++ "b/src/icons/svg/cockpit-\347\247\273\345\212\250\347\253\257\347\224\250\346\210\267.svg" @@ -0,0 +1,13 @@ + + + + diff --git "a/src/icons/svg/cockpit-\347\273\217\351\224\200\345\225\206.svg" "b/src/icons/svg/cockpit-\347\273\217\351\224\200\345\225\206.svg" new file mode 100644 index 0000000..fef7f56 --- /dev/null +++ "b/src/icons/svg/cockpit-\347\273\217\351\224\200\345\225\206.svg" @@ -0,0 +1,13 @@ + + + + diff --git "a/src/icons/svg/cockpit-\351\233\206\345\233\242.svg" "b/src/icons/svg/cockpit-\351\233\206\345\233\242.svg" new file mode 100644 index 0000000..48e8006 --- /dev/null +++ "b/src/icons/svg/cockpit-\351\233\206\345\233\242.svg" @@ -0,0 +1,14 @@ + + + + diff --git "a/src/icons/svg/cockpit-\351\233\206\345\233\242\347\224\250\346\210\267.svg" "b/src/icons/svg/cockpit-\351\233\206\345\233\242\347\224\250\346\210\267.svg" new file mode 100644 index 0000000..86f0776 --- /dev/null +++ "b/src/icons/svg/cockpit-\351\233\206\345\233\242\347\224\250\346\210\267.svg" @@ -0,0 +1,15 @@ + + + + diff --git a/src/router/modules/supplierManagement.js b/src/router/modules/supplierManagement.js index 4ad2c80..224d6b8 100644 --- a/src/router/modules/supplierManagement.js +++ b/src/router/modules/supplierManagement.js @@ -22,7 +22,7 @@ path: '/inquiry', name: 'Inquiry', component: () => import('@/views/supplier/inquiry'), // 重定向的组件位置 - meta: { title: '资料预审', icon: '', permission: '/supplier/inquire' } + meta: { title: '资料预审', icon: '', permission: '/supplier/inquiry' } }, { path: '/review', diff --git a/src/views/business/historyBusiness.vue b/src/views/business/historyBusiness.vue index bddce18..4398baa 100644 --- a/src/views/business/historyBusiness.vue +++ b/src/views/business/historyBusiness.vue @@ -13,7 +13,7 @@
预计工期
- +
diff --git a/src/views/business/report.vue b/src/views/business/report.vue index 33c1a3d..d833399 100644 --- a/src/views/business/report.vue +++ b/src/views/business/report.vue @@ -316,12 +316,12 @@
-
+
+
添加项目需求
-
@@ -421,22 +421,27 @@ }, methods: { save() { - this.addInfo.productList = { + if(this.valiateForm()){ + this.addInfo.productList = { productCode: this.addInfo.productList.productCode, productQuantity: this.addInfo.productList.productQuantity, productPrice: this.addInfo.productList.productPrice, productName: '' } add(this.addInfo).then(res => { - console.log(res) - if (res) { + this.setData() this.$message({ message: '保存成功', type: 'success' }) - } - }) - this.setData() + }) + } else { + this.$message({ + message: '请先完整填写报备信息', + type: 'error' + }) + } + }, close() { this.setData() @@ -462,7 +467,6 @@ this.form.countyList = res }) }, - handleAddBtn() { const obj = {} obj.brandName = '' @@ -525,6 +529,12 @@ this.$set(this.showEdit, index, false) // vue添加属性的方法 } }) + row.productCode = this.addInfo.productList.productCode + row.brandName = this.brandName + console.log(this.categoryIds) + row.categoryIds = this.categoryIds + row.productQuantity = this.addInfo.productList.productQuantity + row.productPrice = this.addInfo.productList.productPrice }, setData() { this.addInfo = { @@ -553,6 +563,17 @@ agentPhone: '', productList: [] } + }, + valiateForm() { + let arr = [] + for(var item in this.addInfo) { + if(this.addInfo[item]){ + arr.push(1) + }else{ + arr.push(0) + } + } + return arr.every(item => item === 1) } } } @@ -568,7 +589,7 @@ .report-from { .from-title { - font-size: 22px; + font-size: 16px; font-weight: bold; background-color: #28739e; color: white; diff --git a/src/views/dashboard/components/dashboardHeader.vue b/src/views/dashboard/components/dashboardHeader.vue index a4262ae..93b1ca5 100644 --- a/src/views/dashboard/components/dashboardHeader.vue +++ b/src/views/dashboard/components/dashboardHeader.vue @@ -6,43 +6,42 @@ \ No newline at end of file + diff --git a/src/views/dashboard/components/deviceList.vue b/src/views/dashboard/components/deviceList.vue index a7c11e1..23c5f15 100644 --- a/src/views/dashboard/components/deviceList.vue +++ b/src/views/dashboard/components/deviceList.vue @@ -1,21 +1,16 @@ - - - - \ No newline at end of file + diff --git a/src/views/dashboard/components/layoutChartDoughnu.vue b/src/views/dashboard/components/layoutChartDoughnu.vue index 7906430..9d3214e 100644 --- a/src/views/dashboard/components/layoutChartDoughnu.vue +++ b/src/views/dashboard/components/layoutChartDoughnu.vue @@ -3,9 +3,9 @@
- + 设备分类统计
-
+
@@ -25,10 +25,6 @@ type: String, default: "", }, - width:{ - type: String, - default: "500px" - }, height:{ type: String, default: "250px" @@ -63,11 +59,14 @@ \ No newline at end of file diff --git a/src/views/dashboard/components/managementList.vue b/src/views/dashboard/components/managementList.vue index 88c7827..d27a0de 100644 --- a/src/views/dashboard/components/managementList.vue +++ b/src/views/dashboard/components/managementList.vue @@ -28,7 +28,7 @@ fetchData() { getUserCount().then((res) => { this.management = res.data.map(item => { - return{...item,icon:'icon-user-man'} + return{...item,icon:'cockpit-' + item.roleName} }) }); }, diff --git a/src/views/dashboard/components/supplierList.vue b/src/views/dashboard/components/supplierList.vue index 978600e..3e41367 100644 --- a/src/views/dashboard/components/supplierList.vue +++ b/src/views/dashboard/components/supplierList.vue @@ -39,20 +39,20 @@ { title: "供应商注册设备总数量", count: "", - icon: "device-count", + icon: "cockpit-device-register", type: "deviceCount", }, { title: "供应商审核通过总数量", count: "", - icon: "supplier-panel", + icon: "cockpit-approved", type: "approvedCount", }, { title: "供应商注册总数量", count: "", - icon: "supplier-panel", - type: "supplierCount", + icon: "cockpit-supplier-register", + type: "approvedCount", }, ], }; diff --git a/src/views/dashboard/components/switch.vue b/src/views/dashboard/components/switch.vue index 43ef875..db4efa7 100644 --- a/src/views/dashboard/components/switch.vue +++ b/src/views/dashboard/components/switch.vue @@ -1,9 +1,10 @@ @@ -103,21 +102,6 @@ address3: '0.5', address4: '每天必做' } - // { - // date: '2016-05-04', - // name: '王小虎', - // address: '上海市普陀区金沙江路 1517 弄' - // }, - // { - // date: '2016-05-01', - // name: '王小虎', - // address: '上海市普陀区金沙江路 1519 弄' - // }, - // { - // date: '2016-05-03', - // name: '王小虎', - // address: '上海市普陀区金沙江路 1516 弄' - // } ], options: [ { @@ -125,7 +109,8 @@ label: '黄金糕' } ], - value: '' + value: '', + input:'' } }, methods: { diff --git a/src/views/operation/watchList.vue b/src/views/operation/watchList.vue index 1b06442..af68692 100644 --- a/src/views/operation/watchList.vue +++ b/src/views/operation/watchList.vue @@ -129,21 +129,6 @@ address4: '100元', address5: '是' } - // { - // date: '2016-05-04', - // name: '王小虎', - // address: '上海市普陀区金沙江路 1517 弄' - // }, - // { - // date: '2016-05-01', - // name: '王小虎', - // address: '上海市普陀区金沙江路 1519 弄' - // }, - // { - // date: '2016-05-03', - // name: '王小虎', - // address: '上海市普陀区金沙江路 1516 弄' - // } ], options: [ { diff --git a/src/views/order/orderShop.vue b/src/views/order/orderShop.vue index 1874202..36c7c50 100644 --- a/src/views/order/orderShop.vue +++ b/src/views/order/orderShop.vue @@ -2,30 +2,52 @@ - - diff --git a/src/components/mycomponent/dialog/inquiryDialog.vue b/src/components/mycomponent/dialog/inquiryDialog.vue deleted file mode 100644 index a8834ef..0000000 --- a/src/components/mycomponent/dialog/inquiryDialog.vue +++ /dev/null @@ -1,228 +0,0 @@ - - - - - - diff --git a/src/components/mycomponent/dialog/server/operationAddDialog.vue b/src/components/mycomponent/dialog/server/operationAddDialog.vue index dfefe42..d436541 100644 --- a/src/components/mycomponent/dialog/server/operationAddDialog.vue +++ b/src/components/mycomponent/dialog/server/operationAddDialog.vue @@ -11,13 +11,14 @@ width="300px" class="inputWidth" style="justify-content: space-between;" + v-model="form.date" />
- +
- +
- +
@@ -100,16 +102,37 @@ RedStar, InputVue }, + data(){ + return{ + form:{ + date:'', // 服务运营编号 + name:'', // 服务名称 + address:'', // 收费 + address1:'', // 优惠 + address2:'', // 日期 + mark:'', // 备注 + } + } + }, props: { isShowInfo: { type: Boolean, default: true - } + }, }, methods: { close() { this.$emit('close') - } + }, + init(detail){ + if(detail.name){ + this.form.address = detail.address + this.form.address1 = detail.address1 + this.form.address2 = detail.address2 + this.form.date = detail.date + this.form.name = detail.name + } + }, } } diff --git a/src/icons/svg/cockpit-approved.svg b/src/icons/svg/cockpit-approved.svg new file mode 100644 index 0000000..634d7a8 --- /dev/null +++ b/src/icons/svg/cockpit-approved.svg @@ -0,0 +1,18 @@ + + + + diff --git a/src/icons/svg/cockpit-device-pan-check.svg b/src/icons/svg/cockpit-device-pan-check.svg new file mode 100644 index 0000000..5ad7f6b --- /dev/null +++ b/src/icons/svg/cockpit-device-pan-check.svg @@ -0,0 +1,13 @@ + + diff --git a/src/icons/svg/cockpit-device-pan-no.svg b/src/icons/svg/cockpit-device-pan-no.svg new file mode 100644 index 0000000..6713e2a --- /dev/null +++ b/src/icons/svg/cockpit-device-pan-no.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-device-register.svg b/src/icons/svg/cockpit-device-register.svg new file mode 100644 index 0000000..baa2355 --- /dev/null +++ b/src/icons/svg/cockpit-device-register.svg @@ -0,0 +1,65 @@ + + + + diff --git a/src/icons/svg/cockpit-device-total.svg b/src/icons/svg/cockpit-device-total.svg new file mode 100644 index 0000000..aa7788c --- /dev/null +++ b/src/icons/svg/cockpit-device-total.svg @@ -0,0 +1,59 @@ + + + + diff --git a/src/icons/svg/cockpit-distributor-pan-check.svg b/src/icons/svg/cockpit-distributor-pan-check.svg new file mode 100644 index 0000000..f4fa54e --- /dev/null +++ b/src/icons/svg/cockpit-distributor-pan-check.svg @@ -0,0 +1,15 @@ + + + + diff --git a/src/icons/svg/cockpit-distributor-pan-no.svg b/src/icons/svg/cockpit-distributor-pan-no.svg new file mode 100644 index 0000000..b10bdfe --- /dev/null +++ b/src/icons/svg/cockpit-distributor-pan-no.svg @@ -0,0 +1,15 @@ + + + + diff --git a/src/icons/svg/cockpit-lot-count.svg b/src/icons/svg/cockpit-lot-count.svg new file mode 100644 index 0000000..b4e743f --- /dev/null +++ b/src/icons/svg/cockpit-lot-count.svg @@ -0,0 +1,92 @@ + + + + diff --git a/src/icons/svg/cockpit-lot-online.svg b/src/icons/svg/cockpit-lot-online.svg new file mode 100644 index 0000000..0da6791 --- /dev/null +++ b/src/icons/svg/cockpit-lot-online.svg @@ -0,0 +1,62 @@ + + + + diff --git a/src/icons/svg/cockpit-supplier-pan-check.svg b/src/icons/svg/cockpit-supplier-pan-check.svg new file mode 100644 index 0000000..6d6756f --- /dev/null +++ b/src/icons/svg/cockpit-supplier-pan-check.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-supplier-pan-no.svg b/src/icons/svg/cockpit-supplier-pan-no.svg new file mode 100644 index 0000000..c9c869e --- /dev/null +++ b/src/icons/svg/cockpit-supplier-pan-no.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-supplier-register.svg b/src/icons/svg/cockpit-supplier-register.svg new file mode 100644 index 0000000..a6e193c --- /dev/null +++ b/src/icons/svg/cockpit-supplier-register.svg @@ -0,0 +1,17 @@ + + + + diff --git "a/src/icons/svg/cockpit-\344\276\233\345\272\224\345\225\206.svg" "b/src/icons/svg/cockpit-\344\276\233\345\272\224\345\225\206.svg" new file mode 100644 index 0000000..ca42dee --- /dev/null +++ "b/src/icons/svg/cockpit-\344\276\233\345\272\224\345\225\206.svg" @@ -0,0 +1,38 @@ + + + + diff --git "a/src/icons/svg/cockpit-\345\210\206\345\255\220\345\205\254\345\217\270.svg" "b/src/icons/svg/cockpit-\345\210\206\345\255\220\345\205\254\345\217\270.svg" new file mode 100644 index 0000000..b39c00f --- /dev/null +++ "b/src/icons/svg/cockpit-\345\210\206\345\255\220\345\205\254\345\217\270.svg" @@ -0,0 +1,16 @@ + + + + diff --git "a/src/icons/svg/cockpit-\346\231\256\351\200\232\347\256\241\347\220\206\350\247\222\350\211\262.svg" "b/src/icons/svg/cockpit-\346\231\256\351\200\232\347\256\241\347\220\206\350\247\222\350\211\262.svg" new file mode 100644 index 0000000..99c6837 --- /dev/null +++ "b/src/icons/svg/cockpit-\346\231\256\351\200\232\347\256\241\347\220\206\350\247\222\350\211\262.svg" @@ -0,0 +1,15 @@ + + + + diff --git "a/src/icons/svg/cockpit-\347\247\273\345\212\250\347\253\257\347\224\250\346\210\267.svg" "b/src/icons/svg/cockpit-\347\247\273\345\212\250\347\253\257\347\224\250\346\210\267.svg" new file mode 100644 index 0000000..e287570 --- /dev/null +++ "b/src/icons/svg/cockpit-\347\247\273\345\212\250\347\253\257\347\224\250\346\210\267.svg" @@ -0,0 +1,13 @@ + + + + diff --git "a/src/icons/svg/cockpit-\347\273\217\351\224\200\345\225\206.svg" "b/src/icons/svg/cockpit-\347\273\217\351\224\200\345\225\206.svg" new file mode 100644 index 0000000..fef7f56 --- /dev/null +++ "b/src/icons/svg/cockpit-\347\273\217\351\224\200\345\225\206.svg" @@ -0,0 +1,13 @@ + + + + diff --git "a/src/icons/svg/cockpit-\351\233\206\345\233\242.svg" "b/src/icons/svg/cockpit-\351\233\206\345\233\242.svg" new file mode 100644 index 0000000..48e8006 --- /dev/null +++ "b/src/icons/svg/cockpit-\351\233\206\345\233\242.svg" @@ -0,0 +1,14 @@ + + + + diff --git "a/src/icons/svg/cockpit-\351\233\206\345\233\242\347\224\250\346\210\267.svg" "b/src/icons/svg/cockpit-\351\233\206\345\233\242\347\224\250\346\210\267.svg" new file mode 100644 index 0000000..86f0776 --- /dev/null +++ "b/src/icons/svg/cockpit-\351\233\206\345\233\242\347\224\250\346\210\267.svg" @@ -0,0 +1,15 @@ + + + + diff --git a/src/router/modules/supplierManagement.js b/src/router/modules/supplierManagement.js index 4ad2c80..224d6b8 100644 --- a/src/router/modules/supplierManagement.js +++ b/src/router/modules/supplierManagement.js @@ -22,7 +22,7 @@ path: '/inquiry', name: 'Inquiry', component: () => import('@/views/supplier/inquiry'), // 重定向的组件位置 - meta: { title: '资料预审', icon: '', permission: '/supplier/inquire' } + meta: { title: '资料预审', icon: '', permission: '/supplier/inquiry' } }, { path: '/review', diff --git a/src/views/business/historyBusiness.vue b/src/views/business/historyBusiness.vue index bddce18..4398baa 100644 --- a/src/views/business/historyBusiness.vue +++ b/src/views/business/historyBusiness.vue @@ -13,7 +13,7 @@
预计工期
- +
diff --git a/src/views/business/report.vue b/src/views/business/report.vue index 33c1a3d..d833399 100644 --- a/src/views/business/report.vue +++ b/src/views/business/report.vue @@ -316,12 +316,12 @@
-
+
+
添加项目需求
-
@@ -421,22 +421,27 @@ }, methods: { save() { - this.addInfo.productList = { + if(this.valiateForm()){ + this.addInfo.productList = { productCode: this.addInfo.productList.productCode, productQuantity: this.addInfo.productList.productQuantity, productPrice: this.addInfo.productList.productPrice, productName: '' } add(this.addInfo).then(res => { - console.log(res) - if (res) { + this.setData() this.$message({ message: '保存成功', type: 'success' }) - } - }) - this.setData() + }) + } else { + this.$message({ + message: '请先完整填写报备信息', + type: 'error' + }) + } + }, close() { this.setData() @@ -462,7 +467,6 @@ this.form.countyList = res }) }, - handleAddBtn() { const obj = {} obj.brandName = '' @@ -525,6 +529,12 @@ this.$set(this.showEdit, index, false) // vue添加属性的方法 } }) + row.productCode = this.addInfo.productList.productCode + row.brandName = this.brandName + console.log(this.categoryIds) + row.categoryIds = this.categoryIds + row.productQuantity = this.addInfo.productList.productQuantity + row.productPrice = this.addInfo.productList.productPrice }, setData() { this.addInfo = { @@ -553,6 +563,17 @@ agentPhone: '', productList: [] } + }, + valiateForm() { + let arr = [] + for(var item in this.addInfo) { + if(this.addInfo[item]){ + arr.push(1) + }else{ + arr.push(0) + } + } + return arr.every(item => item === 1) } } } @@ -568,7 +589,7 @@ .report-from { .from-title { - font-size: 22px; + font-size: 16px; font-weight: bold; background-color: #28739e; color: white; diff --git a/src/views/dashboard/components/dashboardHeader.vue b/src/views/dashboard/components/dashboardHeader.vue index a4262ae..93b1ca5 100644 --- a/src/views/dashboard/components/dashboardHeader.vue +++ b/src/views/dashboard/components/dashboardHeader.vue @@ -6,43 +6,42 @@ \ No newline at end of file + diff --git a/src/views/dashboard/components/deviceList.vue b/src/views/dashboard/components/deviceList.vue index a7c11e1..23c5f15 100644 --- a/src/views/dashboard/components/deviceList.vue +++ b/src/views/dashboard/components/deviceList.vue @@ -1,21 +1,16 @@ - - - - \ No newline at end of file + diff --git a/src/views/dashboard/components/layoutChartDoughnu.vue b/src/views/dashboard/components/layoutChartDoughnu.vue index 7906430..9d3214e 100644 --- a/src/views/dashboard/components/layoutChartDoughnu.vue +++ b/src/views/dashboard/components/layoutChartDoughnu.vue @@ -3,9 +3,9 @@
- + 设备分类统计
-
+
@@ -25,10 +25,6 @@ type: String, default: "", }, - width:{ - type: String, - default: "500px" - }, height:{ type: String, default: "250px" @@ -63,11 +59,14 @@ \ No newline at end of file diff --git a/src/views/dashboard/components/managementList.vue b/src/views/dashboard/components/managementList.vue index 88c7827..d27a0de 100644 --- a/src/views/dashboard/components/managementList.vue +++ b/src/views/dashboard/components/managementList.vue @@ -28,7 +28,7 @@ fetchData() { getUserCount().then((res) => { this.management = res.data.map(item => { - return{...item,icon:'icon-user-man'} + return{...item,icon:'cockpit-' + item.roleName} }) }); }, diff --git a/src/views/dashboard/components/supplierList.vue b/src/views/dashboard/components/supplierList.vue index 978600e..3e41367 100644 --- a/src/views/dashboard/components/supplierList.vue +++ b/src/views/dashboard/components/supplierList.vue @@ -39,20 +39,20 @@ { title: "供应商注册设备总数量", count: "", - icon: "device-count", + icon: "cockpit-device-register", type: "deviceCount", }, { title: "供应商审核通过总数量", count: "", - icon: "supplier-panel", + icon: "cockpit-approved", type: "approvedCount", }, { title: "供应商注册总数量", count: "", - icon: "supplier-panel", - type: "supplierCount", + icon: "cockpit-supplier-register", + type: "approvedCount", }, ], }; diff --git a/src/views/dashboard/components/switch.vue b/src/views/dashboard/components/switch.vue index 43ef875..db4efa7 100644 --- a/src/views/dashboard/components/switch.vue +++ b/src/views/dashboard/components/switch.vue @@ -1,9 +1,10 @@ @@ -103,21 +102,6 @@ address3: '0.5', address4: '每天必做' } - // { - // date: '2016-05-04', - // name: '王小虎', - // address: '上海市普陀区金沙江路 1517 弄' - // }, - // { - // date: '2016-05-01', - // name: '王小虎', - // address: '上海市普陀区金沙江路 1519 弄' - // }, - // { - // date: '2016-05-03', - // name: '王小虎', - // address: '上海市普陀区金沙江路 1516 弄' - // } ], options: [ { @@ -125,7 +109,8 @@ label: '黄金糕' } ], - value: '' + value: '', + input:'' } }, methods: { diff --git a/src/views/operation/watchList.vue b/src/views/operation/watchList.vue index 1b06442..af68692 100644 --- a/src/views/operation/watchList.vue +++ b/src/views/operation/watchList.vue @@ -129,21 +129,6 @@ address4: '100元', address5: '是' } - // { - // date: '2016-05-04', - // name: '王小虎', - // address: '上海市普陀区金沙江路 1517 弄' - // }, - // { - // date: '2016-05-01', - // name: '王小虎', - // address: '上海市普陀区金沙江路 1519 弄' - // }, - // { - // date: '2016-05-03', - // name: '王小虎', - // address: '上海市普陀区金沙江路 1516 弄' - // } ], options: [ { diff --git a/src/views/order/orderShop.vue b/src/views/order/orderShop.vue index 1874202..36c7c50 100644 --- a/src/views/order/orderShop.vue +++ b/src/views/order/orderShop.vue @@ -2,30 +2,52 @@ + + diff --git a/src/api/supplier/supplier.js b/src/api/supplier/supplier.js index 593b7cd..b095e09 100644 --- a/src/api/supplier/supplier.js +++ b/src/api/supplier/supplier.js @@ -14,8 +14,8 @@ return instance.post(`/supplierPreReview/listPage?${str}`, data) } // 历史预审不分页列表 -const historyInquiry = () => { - return instance.post(`/supplierPreReview/history`, {}) +const historyInquiry = (data) => { + return instance.post(`/supplierPreReview/history`, data) } // 新增 diff --git "a/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" "b/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" new file mode 100644 index 0000000..34ce236 --- /dev/null +++ "b/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" Binary files differ diff --git "a/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" "b/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" new file mode 100644 index 0000000..dd0c295 --- /dev/null +++ "b/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" Binary files differ diff --git a/src/components/echart/barChart/verticalBarChart.vue b/src/components/echart/barChart/verticalBarChart.vue index 460d923..04a0090 100644 --- a/src/components/echart/barChart/verticalBarChart.vue +++ b/src/components/echart/barChart/verticalBarChart.vue @@ -2,21 +2,7 @@ - - diff --git a/src/components/mycomponent/dialog/inquiryDialog.vue b/src/components/mycomponent/dialog/inquiryDialog.vue deleted file mode 100644 index a8834ef..0000000 --- a/src/components/mycomponent/dialog/inquiryDialog.vue +++ /dev/null @@ -1,228 +0,0 @@ - - - - - - diff --git a/src/components/mycomponent/dialog/server/operationAddDialog.vue b/src/components/mycomponent/dialog/server/operationAddDialog.vue index dfefe42..d436541 100644 --- a/src/components/mycomponent/dialog/server/operationAddDialog.vue +++ b/src/components/mycomponent/dialog/server/operationAddDialog.vue @@ -11,13 +11,14 @@ width="300px" class="inputWidth" style="justify-content: space-between;" + v-model="form.date" />
- +
- +
- +
@@ -100,16 +102,37 @@ RedStar, InputVue }, + data(){ + return{ + form:{ + date:'', // 服务运营编号 + name:'', // 服务名称 + address:'', // 收费 + address1:'', // 优惠 + address2:'', // 日期 + mark:'', // 备注 + } + } + }, props: { isShowInfo: { type: Boolean, default: true - } + }, }, methods: { close() { this.$emit('close') - } + }, + init(detail){ + if(detail.name){ + this.form.address = detail.address + this.form.address1 = detail.address1 + this.form.address2 = detail.address2 + this.form.date = detail.date + this.form.name = detail.name + } + }, } } diff --git a/src/icons/svg/cockpit-approved.svg b/src/icons/svg/cockpit-approved.svg new file mode 100644 index 0000000..634d7a8 --- /dev/null +++ b/src/icons/svg/cockpit-approved.svg @@ -0,0 +1,18 @@ + + + + diff --git a/src/icons/svg/cockpit-device-pan-check.svg b/src/icons/svg/cockpit-device-pan-check.svg new file mode 100644 index 0000000..5ad7f6b --- /dev/null +++ b/src/icons/svg/cockpit-device-pan-check.svg @@ -0,0 +1,13 @@ + + diff --git a/src/icons/svg/cockpit-device-pan-no.svg b/src/icons/svg/cockpit-device-pan-no.svg new file mode 100644 index 0000000..6713e2a --- /dev/null +++ b/src/icons/svg/cockpit-device-pan-no.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-device-register.svg b/src/icons/svg/cockpit-device-register.svg new file mode 100644 index 0000000..baa2355 --- /dev/null +++ b/src/icons/svg/cockpit-device-register.svg @@ -0,0 +1,65 @@ + + + + diff --git a/src/icons/svg/cockpit-device-total.svg b/src/icons/svg/cockpit-device-total.svg new file mode 100644 index 0000000..aa7788c --- /dev/null +++ b/src/icons/svg/cockpit-device-total.svg @@ -0,0 +1,59 @@ + + + + diff --git a/src/icons/svg/cockpit-distributor-pan-check.svg b/src/icons/svg/cockpit-distributor-pan-check.svg new file mode 100644 index 0000000..f4fa54e --- /dev/null +++ b/src/icons/svg/cockpit-distributor-pan-check.svg @@ -0,0 +1,15 @@ + + + + diff --git a/src/icons/svg/cockpit-distributor-pan-no.svg b/src/icons/svg/cockpit-distributor-pan-no.svg new file mode 100644 index 0000000..b10bdfe --- /dev/null +++ b/src/icons/svg/cockpit-distributor-pan-no.svg @@ -0,0 +1,15 @@ + + + + diff --git a/src/icons/svg/cockpit-lot-count.svg b/src/icons/svg/cockpit-lot-count.svg new file mode 100644 index 0000000..b4e743f --- /dev/null +++ b/src/icons/svg/cockpit-lot-count.svg @@ -0,0 +1,92 @@ + + + + diff --git a/src/icons/svg/cockpit-lot-online.svg b/src/icons/svg/cockpit-lot-online.svg new file mode 100644 index 0000000..0da6791 --- /dev/null +++ b/src/icons/svg/cockpit-lot-online.svg @@ -0,0 +1,62 @@ + + + + diff --git a/src/icons/svg/cockpit-supplier-pan-check.svg b/src/icons/svg/cockpit-supplier-pan-check.svg new file mode 100644 index 0000000..6d6756f --- /dev/null +++ b/src/icons/svg/cockpit-supplier-pan-check.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-supplier-pan-no.svg b/src/icons/svg/cockpit-supplier-pan-no.svg new file mode 100644 index 0000000..c9c869e --- /dev/null +++ b/src/icons/svg/cockpit-supplier-pan-no.svg @@ -0,0 +1,16 @@ + + + + diff --git a/src/icons/svg/cockpit-supplier-register.svg b/src/icons/svg/cockpit-supplier-register.svg new file mode 100644 index 0000000..a6e193c --- /dev/null +++ b/src/icons/svg/cockpit-supplier-register.svg @@ -0,0 +1,17 @@ + + + + diff --git "a/src/icons/svg/cockpit-\344\276\233\345\272\224\345\225\206.svg" "b/src/icons/svg/cockpit-\344\276\233\345\272\224\345\225\206.svg" new file mode 100644 index 0000000..ca42dee --- /dev/null +++ "b/src/icons/svg/cockpit-\344\276\233\345\272\224\345\225\206.svg" @@ -0,0 +1,38 @@ + + + + diff --git "a/src/icons/svg/cockpit-\345\210\206\345\255\220\345\205\254\345\217\270.svg" "b/src/icons/svg/cockpit-\345\210\206\345\255\220\345\205\254\345\217\270.svg" new file mode 100644 index 0000000..b39c00f --- /dev/null +++ "b/src/icons/svg/cockpit-\345\210\206\345\255\220\345\205\254\345\217\270.svg" @@ -0,0 +1,16 @@ + + + + diff --git "a/src/icons/svg/cockpit-\346\231\256\351\200\232\347\256\241\347\220\206\350\247\222\350\211\262.svg" "b/src/icons/svg/cockpit-\346\231\256\351\200\232\347\256\241\347\220\206\350\247\222\350\211\262.svg" new file mode 100644 index 0000000..99c6837 --- /dev/null +++ "b/src/icons/svg/cockpit-\346\231\256\351\200\232\347\256\241\347\220\206\350\247\222\350\211\262.svg" @@ -0,0 +1,15 @@ + + + + diff --git "a/src/icons/svg/cockpit-\347\247\273\345\212\250\347\253\257\347\224\250\346\210\267.svg" "b/src/icons/svg/cockpit-\347\247\273\345\212\250\347\253\257\347\224\250\346\210\267.svg" new file mode 100644 index 0000000..e287570 --- /dev/null +++ "b/src/icons/svg/cockpit-\347\247\273\345\212\250\347\253\257\347\224\250\346\210\267.svg" @@ -0,0 +1,13 @@ + + + + diff --git "a/src/icons/svg/cockpit-\347\273\217\351\224\200\345\225\206.svg" "b/src/icons/svg/cockpit-\347\273\217\351\224\200\345\225\206.svg" new file mode 100644 index 0000000..fef7f56 --- /dev/null +++ "b/src/icons/svg/cockpit-\347\273\217\351\224\200\345\225\206.svg" @@ -0,0 +1,13 @@ + + + + diff --git "a/src/icons/svg/cockpit-\351\233\206\345\233\242.svg" "b/src/icons/svg/cockpit-\351\233\206\345\233\242.svg" new file mode 100644 index 0000000..48e8006 --- /dev/null +++ "b/src/icons/svg/cockpit-\351\233\206\345\233\242.svg" @@ -0,0 +1,14 @@ + + + + diff --git "a/src/icons/svg/cockpit-\351\233\206\345\233\242\347\224\250\346\210\267.svg" "b/src/icons/svg/cockpit-\351\233\206\345\233\242\347\224\250\346\210\267.svg" new file mode 100644 index 0000000..86f0776 --- /dev/null +++ "b/src/icons/svg/cockpit-\351\233\206\345\233\242\347\224\250\346\210\267.svg" @@ -0,0 +1,15 @@ + + + + diff --git a/src/router/modules/supplierManagement.js b/src/router/modules/supplierManagement.js index 4ad2c80..224d6b8 100644 --- a/src/router/modules/supplierManagement.js +++ b/src/router/modules/supplierManagement.js @@ -22,7 +22,7 @@ path: '/inquiry', name: 'Inquiry', component: () => import('@/views/supplier/inquiry'), // 重定向的组件位置 - meta: { title: '资料预审', icon: '', permission: '/supplier/inquire' } + meta: { title: '资料预审', icon: '', permission: '/supplier/inquiry' } }, { path: '/review', diff --git a/src/views/business/historyBusiness.vue b/src/views/business/historyBusiness.vue index bddce18..4398baa 100644 --- a/src/views/business/historyBusiness.vue +++ b/src/views/business/historyBusiness.vue @@ -13,7 +13,7 @@
预计工期
- +
diff --git a/src/views/business/report.vue b/src/views/business/report.vue index 33c1a3d..d833399 100644 --- a/src/views/business/report.vue +++ b/src/views/business/report.vue @@ -316,12 +316,12 @@
-
+
+
添加项目需求
-
@@ -421,22 +421,27 @@ }, methods: { save() { - this.addInfo.productList = { + if(this.valiateForm()){ + this.addInfo.productList = { productCode: this.addInfo.productList.productCode, productQuantity: this.addInfo.productList.productQuantity, productPrice: this.addInfo.productList.productPrice, productName: '' } add(this.addInfo).then(res => { - console.log(res) - if (res) { + this.setData() this.$message({ message: '保存成功', type: 'success' }) - } - }) - this.setData() + }) + } else { + this.$message({ + message: '请先完整填写报备信息', + type: 'error' + }) + } + }, close() { this.setData() @@ -462,7 +467,6 @@ this.form.countyList = res }) }, - handleAddBtn() { const obj = {} obj.brandName = '' @@ -525,6 +529,12 @@ this.$set(this.showEdit, index, false) // vue添加属性的方法 } }) + row.productCode = this.addInfo.productList.productCode + row.brandName = this.brandName + console.log(this.categoryIds) + row.categoryIds = this.categoryIds + row.productQuantity = this.addInfo.productList.productQuantity + row.productPrice = this.addInfo.productList.productPrice }, setData() { this.addInfo = { @@ -553,6 +563,17 @@ agentPhone: '', productList: [] } + }, + valiateForm() { + let arr = [] + for(var item in this.addInfo) { + if(this.addInfo[item]){ + arr.push(1) + }else{ + arr.push(0) + } + } + return arr.every(item => item === 1) } } } @@ -568,7 +589,7 @@ .report-from { .from-title { - font-size: 22px; + font-size: 16px; font-weight: bold; background-color: #28739e; color: white; diff --git a/src/views/dashboard/components/dashboardHeader.vue b/src/views/dashboard/components/dashboardHeader.vue index a4262ae..93b1ca5 100644 --- a/src/views/dashboard/components/dashboardHeader.vue +++ b/src/views/dashboard/components/dashboardHeader.vue @@ -6,43 +6,42 @@ \ No newline at end of file + diff --git a/src/views/dashboard/components/deviceList.vue b/src/views/dashboard/components/deviceList.vue index a7c11e1..23c5f15 100644 --- a/src/views/dashboard/components/deviceList.vue +++ b/src/views/dashboard/components/deviceList.vue @@ -1,21 +1,16 @@ - - - - \ No newline at end of file + diff --git a/src/views/dashboard/components/layoutChartDoughnu.vue b/src/views/dashboard/components/layoutChartDoughnu.vue index 7906430..9d3214e 100644 --- a/src/views/dashboard/components/layoutChartDoughnu.vue +++ b/src/views/dashboard/components/layoutChartDoughnu.vue @@ -3,9 +3,9 @@
- + 设备分类统计
-
+
@@ -25,10 +25,6 @@ type: String, default: "", }, - width:{ - type: String, - default: "500px" - }, height:{ type: String, default: "250px" @@ -63,11 +59,14 @@ \ No newline at end of file diff --git a/src/views/dashboard/components/managementList.vue b/src/views/dashboard/components/managementList.vue index 88c7827..d27a0de 100644 --- a/src/views/dashboard/components/managementList.vue +++ b/src/views/dashboard/components/managementList.vue @@ -28,7 +28,7 @@ fetchData() { getUserCount().then((res) => { this.management = res.data.map(item => { - return{...item,icon:'icon-user-man'} + return{...item,icon:'cockpit-' + item.roleName} }) }); }, diff --git a/src/views/dashboard/components/supplierList.vue b/src/views/dashboard/components/supplierList.vue index 978600e..3e41367 100644 --- a/src/views/dashboard/components/supplierList.vue +++ b/src/views/dashboard/components/supplierList.vue @@ -39,20 +39,20 @@ { title: "供应商注册设备总数量", count: "", - icon: "device-count", + icon: "cockpit-device-register", type: "deviceCount", }, { title: "供应商审核通过总数量", count: "", - icon: "supplier-panel", + icon: "cockpit-approved", type: "approvedCount", }, { title: "供应商注册总数量", count: "", - icon: "supplier-panel", - type: "supplierCount", + icon: "cockpit-supplier-register", + type: "approvedCount", }, ], }; diff --git a/src/views/dashboard/components/switch.vue b/src/views/dashboard/components/switch.vue index 43ef875..db4efa7 100644 --- a/src/views/dashboard/components/switch.vue +++ b/src/views/dashboard/components/switch.vue @@ -1,9 +1,10 @@ @@ -103,21 +102,6 @@ address3: '0.5', address4: '每天必做' } - // { - // date: '2016-05-04', - // name: '王小虎', - // address: '上海市普陀区金沙江路 1517 弄' - // }, - // { - // date: '2016-05-01', - // name: '王小虎', - // address: '上海市普陀区金沙江路 1519 弄' - // }, - // { - // date: '2016-05-03', - // name: '王小虎', - // address: '上海市普陀区金沙江路 1516 弄' - // } ], options: [ { @@ -125,7 +109,8 @@ label: '黄金糕' } ], - value: '' + value: '', + input:'' } }, methods: { diff --git a/src/views/operation/watchList.vue b/src/views/operation/watchList.vue index 1b06442..af68692 100644 --- a/src/views/operation/watchList.vue +++ b/src/views/operation/watchList.vue @@ -129,21 +129,6 @@ address4: '100元', address5: '是' } - // { - // date: '2016-05-04', - // name: '王小虎', - // address: '上海市普陀区金沙江路 1517 弄' - // }, - // { - // date: '2016-05-01', - // name: '王小虎', - // address: '上海市普陀区金沙江路 1519 弄' - // }, - // { - // date: '2016-05-03', - // name: '王小虎', - // address: '上海市普陀区金沙江路 1516 弄' - // } ], options: [ { diff --git a/src/views/order/orderShop.vue b/src/views/order/orderShop.vue index 1874202..36c7c50 100644 --- a/src/views/order/orderShop.vue +++ b/src/views/order/orderShop.vue @@ -2,30 +2,52 @@ + + diff --git a/src/views/supplier/review.vue b/src/views/supplier/review.vue index 94f125c..41180e5 100644 --- a/src/views/supplier/review.vue +++ b/src/views/supplier/review.vue @@ -108,8 +108,8 @@ inputReviewResult: '' }, options: [ - { label: '预审通过', value: '预审通过' }, - { label: '预审不通过', value: '预审不通过' } + { label: '评审通过', value: '3' }, + { label: '评审不通过', value: '4' } ] } },