diff --git a/sub-government-affairs-service/src/apis/inputSuppliesApi/index.js b/sub-government-affairs-service/src/apis/inputSuppliesApi/index.js index dcb4965..9f303ef 100644 --- a/sub-government-affairs-service/src/apis/inputSuppliesApi/index.js +++ b/sub-government-affairs-service/src/apis/inputSuppliesApi/index.js @@ -1,9 +1,11 @@ import * as redBlackApi from './redAndBlank'; import * as materialApi from './material'; import * as knowledgeApi from './knowledge'; +import * as leaseSuperviseApi from './leaseSupervise'; export default { ...materialApi, ...redBlackApi, ...knowledgeApi, + ...leaseSuperviseApi, }; diff --git a/sub-government-affairs-service/src/apis/inputSuppliesApi/leaseSupervise.js b/sub-government-affairs-service/src/apis/inputSuppliesApi/leaseSupervise.js new file mode 100644 index 0000000..0560804 --- /dev/null +++ b/sub-government-affairs-service/src/apis/inputSuppliesApi/leaseSupervise.js @@ -0,0 +1,16 @@ +import request from '@/utils/axios'; + +/* 租赁列表 */ +export function getLeaseSuperviseList(params) { + return request('/input/machineLease/page', { + params, + }); +} + +/* 新增租赁 */ +export function addLeaseSupervise(data) { + return request('/input/machineLease/save', { + method: 'POST', + data, + }); +} diff --git a/sub-government-affairs-service/src/config/index.js b/sub-government-affairs-service/src/config/index.js index 1fc2268..d52816e 100644 --- a/sub-government-affairs-service/src/config/index.js +++ b/sub-government-affairs-service/src/config/index.js @@ -40,3 +40,32 @@ export const CRUD_VIEW_OPTIONS = { selection: false, menu: false, }; + +/** + * @Title: 生成avue校验规则 + * @param {Object} set 校验配置对象 + * @param {string} set.msg 校验失败提示 + * @param {Array} set.trigger 校验触发条件 + * @param {Array} set.otherRules 其他校验规则 + * @returns {Array} 校验规则数组 + */ +export function customRules(set = {}) { + const obj = Object.assign( + { + msg: '必要参数,不能为空', + trigger: ['change', 'blur'], + otherRules: [], + }, + set + ); + const { msg, trigger, otherRules } = obj; + let rulesArr = [ + { + required: true, + message: msg, + trigger, + }, + ...otherRules, + ]; + return rulesArr; +} 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 a22cf86..d96b32d 100644 --- a/sub-government-affairs-service/src/router/modules/inputSupplies/index.js +++ b/sub-government-affairs-service/src/router/modules/inputSupplies/index.js @@ -99,24 +99,24 @@ const inputSuppliesRoutes = [ // }, // ], // }, - { - 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', // component: () => import('@/views/inputSuppliesManage/useSupervise/index.vue'), // meta: { title: '使用监管', icon: 'Document' }, // }, - // { - // path: '/sub-government-affairs-service/leaseSupervise', - // name: 'leaseSupervise', - // component: () => import('@/views/inputSuppliesManage/leaseSupervise/index.vue'), - // meta: { title: '农机租赁监管', icon: 'Document' }, - // }, + { + path: '/sub-government-affairs-service/leaseSupervise', + name: 'leaseSupervise', + component: () => import('@/views/inputSuppliesManage/leaseSupervise/index.vue'), + meta: { title: '农机租赁监管', icon: 'Document' }, + }, { path: '/sub-government-affairs-service/redBlackRank', name: 'redBlackRank', diff --git a/sub-government-affairs-service/src/views/inputSuppliesManage/common/Attrs.vue b/sub-government-affairs-service/src/views/inputSuppliesManage/common/Attrs.vue index 5c0717b..592afa5 100644 --- a/sub-government-affairs-service/src/views/inputSuppliesManage/common/Attrs.vue +++ b/sub-government-affairs-service/src/views/inputSuppliesManage/common/Attrs.vue @@ -1,5 +1,5 @@ + @@ -88,6 +96,13 @@ const params = ref({ const local_ = ref([102.833669, 24.88149, '昆明市']); const local = ref(JSON.parse(JSON.stringify(local_.value))); const landTreeDic = ref([]); +const landArea = ref(1); +const unitValue = ref('0'); +const unitOptions = reactive([ + { label: '平方米', value: '0' }, + { label: '亩', value: '1' }, + { label: '公顷', value: '2' }, +]); /* --------------- data --------------- */ // #region const loading = ref(false); @@ -150,6 +165,13 @@ const option = reactive({ addDisplay: false, display: false, editDisplay: false, + render: ({ row }) => { + let s = ''; + if (row.area && row.landUnit) { + s = row.area + unitOptions.find((v) => v.value == row.landUnit).label; + } + return s; + }, }, { label: '坐标', @@ -514,6 +536,8 @@ function handleCloseFrom(done) { landOwnerAttrs.value = []; attrs.value = []; landAttrs.value = []; + landArea.value = 1; + unitValue.value = '0'; local.value = JSON.parse(JSON.stringify(local_.value)); done(); } @@ -533,6 +557,8 @@ async function handleRowSave(val, done, loading) { if (landAttrs.value.length) { landAttrs.value.forEach((item) => landUrls.push(item.url)); } + data.area = landArea.value; + data.landUnit = unitValue.value; data.propertyCertificateUrl = urls.join(); data.landCertificateUrl = landOwnerUrls.join(); data.landUrl = landUrls.join(); @@ -611,4 +637,20 @@ function newTree(arr, i) { } } } +.area_form_ { + display: grid; + grid-template-columns: 75% 25%; + ::v-deep() { + .el-input-number { + width: 100%; + .el-input__wrapper { + border-radius: 4px 0 0 4px; + } + } + .el-select__wrapper { + border-radius: 0 4px 4px 0 !important; + border-left: none; + } + } +} diff --git a/sub-government-affairs-service/src/views/landManage/component/landsManage/useLandHook.js b/sub-government-affairs-service/src/views/landManage/component/landsManage/useLandHook.js index e80d1bb..b4d288b 100644 --- a/sub-government-affairs-service/src/views/landManage/component/landsManage/useLandHook.js +++ b/sub-government-affairs-service/src/views/landManage/component/landsManage/useLandHook.js @@ -15,29 +15,8 @@ export default function useLandHook() { label: '园林', }, ]); - const landClassificationType = reactive([ - { label: '耕地', value: '0' }, - { label: '果园', value: '1' }, - { label: '茶园', value: '2' }, - { label: '其他园地', value: '3' }, - { label: '林地', value: '4' }, - { label: '草地', value: '5' }, - { label: '其他农用地', value: '6' }, - { label: '农村宅基地', value: '7' }, - ]); - function handleIficationType(t = 0) { - let arr = landClassificationType.filter((v) => v.value == t); - - let txt = '--'; - if (arr.length > 0) { - txt = arr[0].label; - } - return txt; - } return { landType, landsType, - landClassificationType, - handleIficationType, }; }