diff --git a/main/.env.development b/main/.env.development index c6fa8c2..3aa18c8 100644 --- a/main/.env.development +++ b/main/.env.development @@ -16,6 +16,6 @@ VITE_APP_UPLOAD_API = '/uploadApis' # VITE_APP_BASE_URL = 'http://47.109.205.240:8080' # VITE_APP_UPLOAD_URL = 'http://47.109.205.240:9300' # 内网接口地址 -VITE_APP_BASE_URL = 'http://192.168.18.74:8080' +VITE_APP_BASE_URL = 'http://192.168.18.99:8080' VITE_APP_UPLOAD_URL = 'http://192.168.18.74:8080' # VITE_APP_VIST_URL = 'http://192.168.18.99' diff --git a/sub-government-affairs-service/.env.development b/sub-government-affairs-service/.env.development index 9ba5ee0..8b97e98 100644 --- a/sub-government-affairs-service/.env.development +++ b/sub-government-affairs-service/.env.development @@ -13,5 +13,5 @@ VITE_APP_UPLOAD_API = '/uploadApis' # VITE_APP_UPLOAD_URL = 'http://47.109.205.240:9300' # 内网接口地址 -VITE_APP_BASE_URL = 'http://192.168.18.74:8080' +VITE_APP_BASE_URL = 'http://192.168.18.99:8080' VITE_APP_UPLOAD_URL = 'http://192.168.18.74:8080' diff --git a/sub-government-affairs-service/src/apis/landResourceManagement/landManagement/index.js b/sub-government-affairs-service/src/apis/landResourceManagement/landManagement/index.js index 5800c7a..f6f1f7f 100644 --- a/sub-government-affairs-service/src/apis/landResourceManagement/landManagement/index.js +++ b/sub-government-affairs-service/src/apis/landResourceManagement/landManagement/index.js @@ -18,6 +18,13 @@ export function getLandList(params) { params, }); } +// 新增全部土地信息（POST） +export function createLand(data = {}) { + return request('/land-resource/landManage/v1/save', { + method: 'POST', + data, + }); +} /** * 保存土地基础信息 diff --git a/sub-government-affairs-service/src/components/AreaCascader/index.vue b/sub-government-affairs-service/src/components/AreaCascader/index.vue index 25ff12c..81d74f2 100644 --- a/sub-government-affairs-service/src/components/AreaCascader/index.vue +++ b/sub-government-affairs-service/src/components/AreaCascader/index.vue @@ -120,6 +120,8 @@ const containerStyle = computed(() => ({ text-align: right; line-height: 32px; width: 120px; + box-sizing: border-box; + padding-right: 12px; } .controls { display: flex; diff --git a/sub-government-affairs-service/src/store/modules/coop.js b/sub-government-affairs-service/src/store/modules/coop.js new file mode 100644 index 0000000..b87a2f5 --- /dev/null +++ b/sub-government-affairs-service/src/store/modules/coop.js @@ -0,0 +1,15 @@ +import { defineStore } from 'pinia'; +import { getEnterList } from '@/apis/businessEntity'; + +export const useCoop = defineStore('useCoop', { + state: () => ({ + data: {}, + }), + actions: { + //订单 + getData(params) { + return Promise.resolve((useCoop().$state.data = params)); + }, + }, + getters: {}, +}); 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 9176bd1..c9e12ed 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 @@ -30,154 +30,96 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +

编辑基本信息

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - +

编辑产权信息

+ + + + + + + + + + + + + + + + + + - + 取消 - - - -

土地基本信息

- - - - - - - - - - - - - - - - - - - - - - - - - - + + -

土地产权信息

- - - - - - - - - - - - - - - @@ -187,8 +129,9 @@ diff --git a/sub-government-affairs-service/src/views/productOperateMain/coOp/components/TabBasicInfo.vue b/sub-government-affairs-service/src/views/productOperateMain/coOp/components/TabBasicInfo.vue index a7f06d0..14f0296 100644 --- a/sub-government-affairs-service/src/views/productOperateMain/coOp/components/TabBasicInfo.vue +++ b/sub-government-affairs-service/src/views/productOperateMain/coOp/components/TabBasicInfo.vue @@ -32,6 +32,7 @@ + @@ -72,6 +73,8 @@ import cloneDeep from 'lodash/cloneDeep'; import { CommonUpload } from '@/apis/index'; import { ElMessage } from 'element-plus'; import Attrs from './Attrs.vue'; +import { useCoop } from '../../../../store/modules/coop'; +const localForm = useCoop().$state.data; const props = defineProps({ modelValue: { @@ -79,7 +82,7 @@ const props = defineProps({ required: true, default: () => ({}), }, - readonly: Boolean, + // readonly: Boolean, }); const ossUrl = 'http://gov-cloud.oss-cn-chengdu.aliyuncs.com/'; @@ -89,16 +92,16 @@ const businessLicenceList = ref([]); const emit = defineEmits(['update:modelValue']); // 建立本地副本，避免直接修改 props -const localForm = ref({ ...props.modelValue }); +// const localForm = ref({ ...props.modelValue }); // 深度监听本地副本的变化，实时更新父组件 -watch( - localForm, - (newVal) => { - emit('update:modelValue', { ...newVal }); - }, - { deep: true } -); +// watch( +// localForm, +// (newVal) => { +// emit('update:modelValue', { ...newVal }); +// }, +// { deep: true } +// ); // watch( // () => props.modelValue, // (newVal) => { @@ -151,21 +154,21 @@ const handleExceed = () => { }; // 初始化时如果有图片，设置预览 -if (localForm.value.cooperativePhoto) { +if (localForm.cooperativePhoto) { cooperativePhotoList.value = [ { name: '合作社照片', - url: ossUrl + localForm.value.cooperativePhoto, + url: ossUrl + localForm.cooperativePhoto, status: 'success', }, ]; } -if (localForm.value.businessLicence) { +if (localForm.businessLicence) { businessLicenceList.value = [ { name: '营业执照', - url: ossUrl + localForm.value.businessLicence, + url: ossUrl + localForm.businessLicence, status: 'success', }, ]; diff --git a/sub-government-affairs-service/src/views/productOperateMain/coOp/components/TabBusinessInfo.vue b/sub-government-affairs-service/src/views/productOperateMain/coOp/components/TabBusinessInfo.vue index 2d829c1..c92b8a2 100644 --- a/sub-government-affairs-service/src/views/productOperateMain/coOp/components/TabBusinessInfo.vue +++ b/sub-government-affairs-service/src/views/productOperateMain/coOp/components/TabBusinessInfo.vue @@ -71,6 +71,8 @@ import { reactive, watch } from 'vue'; import { Plus } from '@element-plus/icons-vue'; import cloneDeep from 'lodash/cloneDeep'; +import { useCoop } from '../../../../store/modules/coop'; +const localForm = useCoop().$state.data; const props = defineProps({ modelValue: { @@ -86,23 +88,23 @@ const props = defineProps({ const emit = defineEmits(['update:modelValue']); // 本地副本，存放各表的文件列表 -const localForm = reactive(cloneDeep(props.modelValue)); +// const localForm = reactive(cloneDeep(props.modelValue)); // watch 同步回父组件 -watch( - () => localForm, - (val) => { - emit('update:modelValue', { ...val }); - }, - { deep: true } -); -watch( - () => props.modelValue, - (newVal) => { - Object.assign(localForm, cloneDeep(newVal)); - }, - { deep: true } -); +// watch( +// () => localForm, +// (val) => { +// emit('update:modelValue', { ...val }); +// }, +// { deep: true } +// ); +// watch( +// () => props.modelValue, +// (newVal) => { +// Object.assign(localForm, cloneDeep(newVal)); +// }, +// { deep: true } +// ); // 下载模板（可替换为真实下载地址） function downloadTemplate(type) { diff --git a/sub-government-affairs-service/src/views/productOperateMain/coOp/components/TabCreditEvaluation.vue b/sub-government-affairs-service/src/views/productOperateMain/coOp/components/TabCreditEvaluation.vue index 572772d..f84a48f 100644 --- a/sub-government-affairs-service/src/views/productOperateMain/coOp/components/TabCreditEvaluation.vue +++ b/sub-government-affairs-service/src/views/productOperateMain/coOp/components/TabCreditEvaluation.vue @@ -28,6 +28,8 @@ diff --git a/sub-operation-service/src/apis/brand.js b/sub-operation-service/src/apis/brand.js index 6f01572..8c264f9 100644 --- a/sub-operation-service/src/apis/brand.js +++ b/sub-operation-service/src/apis/brand.js @@ -39,6 +39,12 @@ export function authList(params) { params, }); } +export function usageList(params) { + return request('brand/applicationrecord/pageByGoodsStatus', { + method: 'GET', + params, + }); +} export function authDetail(id, params) { return request(`brand/brandbase/detail/${id}`, { method: 'GET', @@ -51,6 +57,18 @@ export function getStatisticsData(id, params) { params, }); } +export function brandUsingSystem(params) { + return request('brand/brandUsingSystem/viewPage', { + method: 'GET', + params, + }); +} +export function brandUsingSystemDetail(id, params) { + return request(`brand/brandUsingSystem/detail/${id}`, { + method: 'GET', + params, + }); +} export function saveRecords(data) { return request('brand/applicationrecord/save', { diff --git a/sub-operation-service/src/router/index.js b/sub-operation-service/src/router/index.js index bbf008b..da763f3 100644 --- a/sub-operation-service/src/router/index.js +++ b/sub-operation-service/src/router/index.js @@ -502,6 +502,21 @@ export const constantRoutes = [ }, ], }, + { + path: 'monitor', + component: BrandLayout, + meta: { title: '使用监管' }, + name: 'authUse', + redirect: '/sub-operation-service/brand/monitor', + children: [ + { + path: '', + component: () => import('@/views/brand/components/Monitor.vue'), + meta: { title: '使用监管', hideInBread: true }, + name: 'brandMonitor', + }, + ], + }, ], }, diff --git a/sub-operation-service/src/views/brand/components/Auth.vue b/sub-operation-service/src/views/brand/components/Auth.vue index 93df1d4..cb6909e 100644 --- a/sub-operation-service/src/views/brand/components/Auth.vue +++ b/sub-operation-service/src/views/brand/components/Auth.vue @@ -62,7 +62,7 @@
- product + product
{{ product.productName }}
@@ -99,8 +99,8 @@ > 授权证书 - 溯源报告 - 取消授权 + +
diff --git a/sub-operation-service/src/views/brand/components/BrandSystem.vue b/sub-operation-service/src/views/brand/components/BrandSystem.vue index 6f06922..3a4fd35 100644 --- a/sub-operation-service/src/views/brand/components/BrandSystem.vue +++ b/sub-operation-service/src/views/brand/components/BrandSystem.vue @@ -4,24 +4,17 @@
-
+
{{ item.title }}
-
发布日期： {{ item.effectiveDate }}
- - - +
发布日期： {{ item.createTime ? item.createTime.split(' ')[0] : '' }}
-

{{ item.desc }}

+

{{ item.descStr }}

- - - -
@@ -34,7 +27,7 @@

{{ currentDetail.title }}

- {{ currentDetail.status }} +
@@ -45,7 +38,16 @@
-
+ +
+ +
@@ -60,8 +62,10 @@