diff --git a/sub-government-affairs-service/src/router/modules/productOperateMain.js b/sub-government-affairs-service/src/router/modules/productOperateMain.js
index 25b8b5b..e29ed2a 100644
--- a/sub-government-affairs-service/src/router/modules/productOperateMain.js
+++ b/sub-government-affairs-service/src/router/modules/productOperateMain.js
@@ -6,7 +6,7 @@ export default [
name: 'productOperateMain',
component: Layout,
redirect: '/sub-government-affairs-service/individual',
- meta: { title: '生产经营主体', icon: 'icon-test' },
+ meta: { title: '生产经营主体', icon: 'icon-shop' },
children: [
{
path: '/sub-government-affairs-service/individual',
@@ -26,6 +26,24 @@ export default [
name: 'coop',
meta: { title: '合作社', icon: 'Document' },
},
+ {
+ path: '/sub-government-affairs-service/enterprise',
+ component: () => import('@/views/productOperateMain/enterprise/index.vue'),
+ name: 'enterprise',
+ meta: { title: '经营企业', icon: 'Document' },
+ },
+ {
+ path: '/sub-government-affairs-service/examineList',
+ component: () => import('@/views/productOperateMain/examine/list.vue'),
+ name: 'examineList',
+ meta: { title: '主体审核管理', icon: 'Document' },
+ },
+ {
+ path: '/sub-government-affairs-service/examineRecord',
+ component: () => import('@/views/productOperateMain/examine/record.vue'),
+ name: 'examineRecord',
+ meta: { title: '主体审核历史', icon: 'Document' },
+ },
],
},
];
diff --git a/sub-government-affairs-service/src/views/landManage/component/plantPlan/compoent/stage.vue b/sub-government-affairs-service/src/views/landManage/component/plantPlan/compoent/stage.vue
index e19b34a..ba2b0ed 100644
--- a/sub-government-affairs-service/src/views/landManage/component/plantPlan/compoent/stage.vue
+++ b/sub-government-affairs-service/src/views/landManage/component/plantPlan/compoent/stage.vue
@@ -1,6 +1,6 @@
-
+
{
+ if (isShowVal.value) {
+ console.info('loadList', props);
+ }
+};
onMounted(() => {
isShowVal.value = props.isShow;
- rowVal.value = props.rowOriginal;
+ currentRow = props.rowOriginal;
+ loadList();
+ // console.info('onMounted', props);
});
watch(
() => (props.isShow, props.rowOriginal),
- (val) => {
- isShowVal.value = val.isShow;
- rowVal.value = props.rowOriginal;
- console.info('watch', val.isShow);
- console.info('watch', val.rowOriginal);
+ () => {
+ isShowVal.value = props.isShow;
+ currentRow = props.rowOriginal;
+ console.info('watch', props);
+ loadList();
},
{ deep: true, immediate: true }
);
@@ -157,7 +166,7 @@ const stageState = reactive({
async function getStageList() {
stageState.loading = true;
- getPlantingStage({ ...stageState.query, planId: rowVal.value.currentRow.id })
+ getPlantingStage({ ...stageState.query, planId: currentRow.currentRow.id })
.then((res) => {
if (res.code === 200) {
const { current, size, total, records } = res.data;
@@ -228,7 +237,7 @@ const stageRowEdit = (row) => {
};
const onStateAdd = () => {
- if (!rowVal.value.currentRow.id) {
+ if (!currentRow.id) {
app.$message.error('请选择种植规划');
return;
}
@@ -236,7 +245,7 @@ const onStateAdd = () => {
};
const stageRowSave = (row, done, loading) => {
- row.planId = rowVal.value.currentRow.planId;
+ row.planId = currentRow.planId;
console.info('stageRowSave', row);
savePlantingStage({ ...row })
.then((res) => {
@@ -271,4 +280,8 @@ const stageRowUpdate = (row, index, done, loading) => {
loading();
});
};
+const stageClose = () => {
+ isShowVal.value = false;
+ emit('close');
+};
diff --git a/sub-government-affairs-service/src/views/landManage/component/plantPlan/index.vue b/sub-government-affairs-service/src/views/landManage/component/plantPlan/index.vue
index f5b462a..af319f3 100644
--- a/sub-government-affairs-service/src/views/landManage/component/plantPlan/index.vue
+++ b/sub-government-affairs-service/src/views/landManage/component/plantPlan/index.vue
@@ -51,40 +51,7 @@
- 种植阶段详情
-
-
+
diff --git a/sub-government-affairs-service/src/views/productOperateMain/coOp/index.vue b/sub-government-affairs-service/src/views/productOperateMain/coOp/index.vue
index 1cd141c..ab35a44 100644
--- a/sub-government-affairs-service/src/views/productOperateMain/coOp/index.vue
+++ b/sub-government-affairs-service/src/views/productOperateMain/coOp/index.vue
@@ -23,9 +23,12 @@
批量删除
-
+
+
+
+
+
+
@@ -34,7 +37,7 @@
diff --git a/sub-government-affairs-service/src/views/productOperateMain/components/uploadImg.vue b/sub-government-affairs-service/src/views/productOperateMain/components/uploadImg.vue
new file mode 100644
index 0000000..df97fc7
--- /dev/null
+++ b/sub-government-affairs-service/src/views/productOperateMain/components/uploadImg.vue
@@ -0,0 +1,84 @@
+
+
+
+
+
+
+
+
diff --git a/sub-government-affairs-service/src/views/productOperateMain/enterprise/index.vue b/sub-government-affairs-service/src/views/productOperateMain/enterprise/index.vue
new file mode 100644
index 0000000..cd99d08
--- /dev/null
+++ b/sub-government-affairs-service/src/views/productOperateMain/enterprise/index.vue
@@ -0,0 +1,663 @@
+
+
+
+
+
+ 批量删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/sub-government-affairs-service/src/views/productOperateMain/examine/list.vue b/sub-government-affairs-service/src/views/productOperateMain/examine/list.vue
new file mode 100644
index 0000000..380f9f3
--- /dev/null
+++ b/sub-government-affairs-service/src/views/productOperateMain/examine/list.vue
@@ -0,0 +1,575 @@
+
+
+
+
diff --git a/sub-government-affairs-service/src/views/productOperateMain/examine/record.vue b/sub-government-affairs-service/src/views/productOperateMain/examine/record.vue
new file mode 100644
index 0000000..c218fe2
--- /dev/null
+++ b/sub-government-affairs-service/src/views/productOperateMain/examine/record.vue
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/sub-government-affairs-service/src/views/productOperateMain/individual/index.vue b/sub-government-affairs-service/src/views/productOperateMain/individual/index.vue
index 9925683..5e7e9eb 100644
--- a/sub-government-affairs-service/src/views/productOperateMain/individual/index.vue
+++ b/sub-government-affairs-service/src/views/productOperateMain/individual/index.vue
@@ -194,7 +194,7 @@ const state = reactive({
},
},
{
- label: '户主身份证号',
+ label: '联系电话',
prop: 'crop',
search: false,
rules: {