diff --git a/src/api/govPlane/index.js b/src/api/govPlane/index.js new file mode 100644 index 0000000..ff0b40d --- /dev/null +++ b/src/api/govPlane/index.js @@ -0,0 +1,41 @@ +import request from "@/utils/request"; + +export function index (params) { + return request({ + url: '/api/admin/gov-plane/index', + method: 'get', + params + }) +} + +export function show (params) { + return request({ + url: '/api/admin/gov-plane/show', + method: 'get', + params + }) +} + +export function store (data) { + return request({ + url: '/api/admin/gov-plane/store', + method: 'post', + data + }) +} + +export function save (data) { + return request({ + url: '/api/admin/gov-plane/save', + method: 'post', + data + }) +} + +export function destroy (params) { + return request({ + url: '/api/admin/gov-plane/destroy', + method: 'get', + params + }) +} diff --git a/src/components/XyDialog/index.vue b/src/components/XyDialog/index.vue index 54604b9..9490ad0 100644 --- a/src/components/XyDialog/index.vue +++ b/src/components/XyDialog/index.vue @@ -75,6 +75,12 @@ export default { }, okClick(){ this.$emit('on-ok') + }, + clearValidate () { + this.$refs['elForm'].clearValidate() + }, + setCurrentRow (row) { + this.$refs['elForm'].setCurrentRow(row) } }, render(h) { diff --git a/src/components/XyTable/index.vue b/src/components/XyTable/index.vue index 5b7772a..6551681 100644 --- a/src/components/XyTable/index.vue +++ b/src/components/XyTable/index.vue @@ -24,6 +24,10 @@ export default { type:Function, default:()=>{} }, + highlightCurrentRow: { + type: Boolean, + default: false + }, headerRowStyle:{ type:Function, default:()=>{} @@ -129,6 +133,7 @@ export default { { tableItem && tableItem.length>0 ? ( { + for(let i in target){ + if(target.hasOwnProperty(i) && value.hasOwnProperty(i)){ + target[i] = value[i] + } + } +} new Vue({ el: '#app', router, diff --git a/src/views/contract/components/govPlane.vue b/src/views/contract/components/govPlane.vue new file mode 100644 index 0000000..ef2b2fd --- /dev/null +++ b/src/views/contract/components/govPlane.vue @@ -0,0 +1,174 @@ + + + + + diff --git a/src/views/contract/contractList.vue b/src/views/contract/contractList.vue index 68d300f..766082f 100644 --- a/src/views/contract/contractList.vue +++ b/src/views/contract/contractList.vue @@ -385,6 +385,23 @@ + @@ -464,6 +481,8 @@ + + @@ -503,9 +522,9 @@ import detail from "./components/detailContract" import paymentRegistration from "./components/paymentRegistration"; import contractSign from "@/views/contract/components/contractSign"; import contractPaymentRegistration from "@/views/contract/components/contractPaymentRegistration"; - - import { - download +import govPlane from './components/govPlane.vue' + import { + download } from '@/utils/downloadRequest' export default { components: { @@ -513,7 +532,8 @@ export default { detail, paymentRegistration, contractSign, - contractPaymentRegistration + contractPaymentRegistration, + govPlane }, data() { var planPass = (rule, value, callback) => { @@ -1087,6 +1107,7 @@ export default { isBudget: true, plan: [], is_substitute: 0, + gov_plane_id: '', }, plan: [], rules: { @@ -1701,7 +1722,8 @@ export default { is_simple:this.form.is_simple, supply:this.form.supply, money:this.form?.money, - status:this.form?.is_simple ? 2 : 1 + status:this.form?.is_simple ? 2 : 1, + gov_plane_id: this.form.gov_plane_id }).then(res => { this.isShowAdd = false Message({ diff --git a/src/views/statisticalReport/components/addGovPlane.vue b/src/views/statisticalReport/components/addGovPlane.vue new file mode 100644 index 0000000..bd00a58 --- /dev/null +++ b/src/views/statisticalReport/components/addGovPlane.vue @@ -0,0 +1,306 @@ + + + + + diff --git a/src/views/statisticalReport/govProcure.vue b/src/views/statisticalReport/govProcure.vue new file mode 100644 index 0000000..57d9232 --- /dev/null +++ b/src/views/statisticalReport/govProcure.vue @@ -0,0 +1,182 @@ + + + + +