diff --git a/sub-government-affairs-service/src/apis/inputSuppliesApi/enterpriseDealerCheck.js b/sub-government-affairs-service/src/apis/inputSuppliesApi/enterpriseDealerCheck.js new file mode 100644 index 0000000..4d6ea63 --- /dev/null +++ b/sub-government-affairs-service/src/apis/inputSuppliesApi/enterpriseDealerCheck.js @@ -0,0 +1,22 @@ +import request from '@/utils/axios'; + +export function getEnterpriseDealerCheck(params) { + return request('/inputGoods/distributorCheck/page', { + params, + }); +} +export function addEnterpriseDealerCheck(data) { + return request('/inputGoods/distributorCheck/page', { + method: 'POST', + data, + }); +} +export function delEnterpriseDealerCheck(ids) { + return request(`/inputGoods/distributorCheck/page/${ids}`); +} +export function editEnterpriseDealerCheck(data) { + return request('/inputGoods/distributorCheck/page', { + method: 'POST', + data, + }); +} diff --git a/sub-government-affairs-service/src/apis/inputSuppliesApi/index.js b/sub-government-affairs-service/src/apis/inputSuppliesApi/index.js index 80985a0..5deec1b 100644 --- a/sub-government-affairs-service/src/apis/inputSuppliesApi/index.js +++ b/sub-government-affairs-service/src/apis/inputSuppliesApi/index.js @@ -3,6 +3,8 @@ import * as materialApi from './material'; import * as knowledgeApi from './knowledge'; import * as leaseSuperviseApi from './leaseSupervise'; import * as productionDealerApi from './productionDealer'; +import * as useSuperviseApi from './useSupervise'; +import * as enteroriseDealerCheckApi from './enterpriseDealerCheck'; export default { ...materialApi, @@ -10,4 +12,6 @@ export default { ...knowledgeApi, ...leaseSuperviseApi, ...productionDealerApi, + ...useSuperviseApi, + ...enteroriseDealerCheckApi, }; diff --git a/sub-government-affairs-service/src/apis/inputSuppliesApi/useSupervise.js b/sub-government-affairs-service/src/apis/inputSuppliesApi/useSupervise.js new file mode 100644 index 0000000..a73a7a4 --- /dev/null +++ b/sub-government-affairs-service/src/apis/inputSuppliesApi/useSupervise.js @@ -0,0 +1,24 @@ +import request from '@/utils/axios'; + +export function getUseSuperviseList(params) { + return request('/inputGoods/supervise/page', { + params, + }); +} + +export function delUseSupervise(ids) { + return request(`/inputGoods/supervise/delete/${ids}`); +} +export function addUseSupervise(data) { + return request('/inputGoods/supervise/save', { + method: 'POST', + data, + }); +} + +export function editUseSupervise(data) { + return request('/inputGoods/supervise/edit', { + method: 'PUT', + data, + }); +} diff --git a/sub-government-affairs-service/src/router/modules/inputSupplies/index.js b/sub-government-affairs-service/src/router/modules/inputSupplies/index.js index 627f16e..5a55baf 100644 --- a/sub-government-affairs-service/src/router/modules/inputSupplies/index.js +++ b/sub-government-affairs-service/src/router/modules/inputSupplies/index.js @@ -15,12 +15,6 @@ const inputSuppliesRoutes = [ // component: () => import('@/views/inputSuppliesManage/inputDataView/index.vue'), // meta: { title: '投入品资源一张图', icon: 'Document' }, // }, - // { - // path: '/sub-government-affairs-service/materialManage', - // name: 'materialManage', - // component: () => import('@/views/inputSuppliesManage/materialManage/index.vue'), - // meta: { title: '物资管理融合', icon: 'Document' }, - // }, { path: '/sub-government-affairs-service/material', name: 'material', @@ -66,12 +60,12 @@ const inputSuppliesRoutes = [ component: () => import('@/views/inputSuppliesManage/productionDealer/index.vue'), meta: { title: '企业经销商管理', icon: 'Document' }, }, - // { - // path: '/sub-government-affairs-service/enterpriseDealerCheck', - // name: 'enterpriseDealerCheck', - // component: () => import('@/views/inputSuppliesManage/enterpriseDealerCheck/index.vue'), - // meta: { title: '企业经销商抽检', icon: 'Document' }, - // }, + { + path: '/sub-government-affairs-service/enterpriseDealerCheck', + name: 'enterpriseDealerCheck', + component: () => import('@/views/inputSuppliesManage/enterpriseDealerCheck/index.vue'), + meta: { title: '企业经销商抽检', icon: 'Document' }, + }, { path: '/sub-government-affairs-service/useSupervise', name: 'useSupervise', diff --git a/sub-government-affairs-service/src/views/inputSuppliesManage/common/NumberSelect.vue b/sub-government-affairs-service/src/views/inputSuppliesManage/common/NumberSelect.vue index 954a3f7..57a506e 100644 --- a/sub-government-affairs-service/src/views/inputSuppliesManage/common/NumberSelect.vue +++ b/sub-government-affairs-service/src/views/inputSuppliesManage/common/NumberSelect.vue @@ -7,14 +7,20 @@ :min="_numberSet.min" :controls-position="_numberSet.controlsPosition" @change="handleChange" - > + > + - + - - - diff --git a/sub-government-affairs-service/src/views/inputSuppliesManage/materialManage/useMaterialHook.js b/sub-government-affairs-service/src/views/inputSuppliesManage/materialManage/useMaterialHook.js deleted file mode 100644 index 689fef6..0000000 --- a/sub-government-affairs-service/src/views/inputSuppliesManage/materialManage/useMaterialHook.js +++ /dev/null @@ -1,197 +0,0 @@ -import { ref, reactive, onMounted } from 'vue'; -import { CRUD_OPTIONS } from '@/config'; -import inputSuppliesApis from '@/apis/inputSuppliesApi'; -const { getMaterailTypes } = inputSuppliesApis; -export const useMaterialHook = () => { - onMounted(() => { - getData(); - getTypes(); - }); - /* ------ data ------ */ - // #region - const currentType = ref('0'); - const curdRef = ref(); - const _loading = ref(false); - const materialTypes = reactive([ - { - id: '0', - dataName: '全部', - }, - ]); - const pageData = ref({ - currentPage: 1, - pageSize: 10, - total: 0, - }); - const testData = reactive([ - { type: '1', id: 1, name: '物资1', producer: '生产厂家1', dealer: '经销商1' }, - { type: '2', id: 2, name: '物资2', producer: '生产厂家2', dealer: '经销商2' }, - { type: '3', id: 3, name: '物资3', producer: '生产厂家3', dealer: '经销商3' }, - { type: '4', id: 4, name: '物资4', producer: '生产厂家4', dealer: '经销商4' }, - { type: '5', id: 4, name: '物资4', producer: '生产厂家4', dealer: '经销商4' }, - ]); - const data = ref([]); - const option = reactive({ - ...CRUD_OPTIONS, - selection: false, - column: [ - { - label: '物资类型', - prop: 'materailType', - hide: false, - search: true, - type: 'cascader', - dicData: materialTypes, - checkStrictly: true, - props: { - value: 'id', - label: 'dataName', - }, - }, - { - label: '物资编号', - prop: 'id', - }, - { - label: '物资编号', - prop: 'name', - }, - { - label: '生产厂家', - prop: 'producer', - }, - { - label: '经销商', - prop: 'dealer', - }, - // { - // label: '物资编号', - // prop: '', - // }, - // { - // label: '物资编号', - // prop: 'id', - // }, - // { - // label: '物资编号', - // prop: 'id', - // }, - ], - }); - const actions = reactive([ - { - auth: ({ row }) => row.type == '1', - name: 'custom', - icon: 'edit', - event: handleCustomFn, - }, - { - name: '编辑', - icon: 'edit', - event: handleEdit, - }, - { - type: 'danger', - name: '删除', - icon: 'delete', - event: handleDel, - }, - ]); - // #endregion - - /* ------ methods ------ */ - // #region - async function getTypes() { - let res = await getMaterailTypes(); - if (res.code == 200) { - materialTypes.push(...res.data); - console.log('types', materialTypes); - } - } - - function getData() { - let params = { - currentPage: pageData.value.currentPage, - pageSize: pageData.value.pageSize, - type: currentType.value, - }; - console.log('get params -- ', params); - if (currentType.value == '0') { - data.value = testData.map((v) => v); - } else { - data.value = testData.filter((item) => item.type == currentType.value); - } - console.log('data', data.value); - } - function handleSearch(form, done) { - if (!form.materailType || !form.materailType.length) { - currentType.value = '0'; - } else { - currentType.value = form.materailType[0]; - } - console.log('search --- ', form); - getData(); - done(); - } - function handleSearchReset() { - resetPage(); - } - async function handleDialogClose(done) { - done(); - console.log('dialog close'); - } - /* 新建行数据 */ - async function handleRowSave(form, done, loading) { - console.log('save', form); - loading(); - } - - /* */ - function handleCustomFn({ row }) { - console.log('custom', row); - } - /* 行编辑 */ - function handleEdit({ row }) { - console.log('edit', row); - } - /* 更新行数据 */ - async function handleRowUpdate(form, done, loading) { - console.log('update', form); - loading(); - } - /* 行删除 */ - function handleDel({ row }) { - console.log('del', row); - } - function handleCurrentChange(val) { - pageData.value.currentPage = val; - getData(); - } - function handleSizeChange(val) { - pageData.value.currentPage = 1; - pageData.value.size = val; - getData(); - } - function resetPage() { - currentType.value = '0'; - pageData.value.currentPage = 1; - pageData.value.pageSize = 10; - getData(); - } - // #endregion - return { - curdRef, - _loading, - data, - pageData, - option, - actions, - handleSearch, - handleDialogClose, - handleRowSave, - handleRowUpdate, - handleSearchReset, - handleCurrentChange, - handleSizeChange, - }; -}; diff --git a/sub-government-affairs-service/src/views/inputSuppliesManage/patrolCaseManage/index.vue b/sub-government-affairs-service/src/views/inputSuppliesManage/patrolCaseManage/index.vue index 64fd5f5..d0de85c 100644 --- a/sub-government-affairs-service/src/views/inputSuppliesManage/patrolCaseManage/index.vue +++ b/sub-government-affairs-service/src/views/inputSuppliesManage/patrolCaseManage/index.vue @@ -1,5 +1,5 @@ - - diff --git a/sub-government-affairs-service/src/views/landManage/component/landsManage/index.vue b/sub-government-affairs-service/src/views/landManage/component/landsManage/index.vue index 63b0cbc..c1abfdd 100644 --- a/sub-government-affairs-service/src/views/landManage/component/landsManage/index.vue +++ b/sub-government-affairs-service/src/views/landManage/component/landsManage/index.vue @@ -37,13 +37,16 @@ 导出 导入 -