From 8f6a8545c3cf50ff0feac85f7b3c57db8fc3a0b4 Mon Sep 17 00:00:00 2001
From: 祖安之光 <11848914+light-of-zuan@user.noreply.gitee.com>
Date: Thu, 12 Mar 2026 09:35:13 +0800
Subject: [PATCH] 修改
---
config/dev.env.js | 8 ++++----
src/views/contract/components/setParam/editDialog.vue | 1 +
src/views/login/agreement.vue | 4 ++--
src/views/usermng/product.vue | 29 ++++++++++++++++++++---------
4 files changed, 27 insertions(+), 15 deletions(-)
diff --git a/config/dev.env.js b/config/dev.env.js
index 992bbc8..6c49206 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -14,15 +14,15 @@
// BASE_API: '"http://192.168.0.35:8100"',
// 最新
-// BASE_API: '"http://39.104.85.193:4105"',
-// IMG_API: '"http://39.104.85.193:4105/upload/"',
+ BASE_API: '"http://39.104.85.193:4115"',
+ IMG_API: '"http://39.104.85.193:4115/upload/"',
//
//
// BASE_API: '"http://192.168.0.12:4105"',
// IMG_API: '"http://192.168.0.12:4105/upload/"',
// 贺哥
- BASE_API: '"http://192.168.2.58:8100"',
- IMG_API: '"http://192.168.2.58:8100/upload/"',
+// BASE_API: '"http://192.168.2.58:8100"',
+// IMG_API: '"http://192.168.2.58:8100/upload/"',
// 正式地址
// BASE_API: '"http://39.104.85.193:4105"',
diff --git a/src/views/contract/components/setParam/editDialog.vue b/src/views/contract/components/setParam/editDialog.vue
index de37ca0..cc4454d 100644
--- a/src/views/contract/components/setParam/editDialog.vue
+++ b/src/views/contract/components/setParam/editDialog.vue
@@ -493,6 +493,7 @@
}else{
getOwnSelectType(type).then(res=>{
if (res.data.code === '200') {
+ console.log(this.userType,res.data.result,'data')
this.dataForm = res.data.result
}
else{
diff --git a/src/views/login/agreement.vue b/src/views/login/agreement.vue
index ac89fea..65d7dc8 100644
--- a/src/views/login/agreement.vue
+++ b/src/views/login/agreement.vue
@@ -7,7 +7,7 @@
</el-row>
<el-row class="agreement_body_main_row">
<el-col class="agreement_body_main_first">
- <span>一、烟花爆竹流向管理信息和实名登记系统是中国科学院苏州纳米技术与纳米仿生研究所受盐城市应急管理厅委托开发并由盐城市应急管理厅投入使用。</span>
+ <span>一、烟花爆竹流向管理信息和实名登记系统是中国科学院苏州纳米技术与纳米仿生研究所受盐城市委托开发并由盐城市投入使用。</span>
</el-col>
</el-row>
<el-row>
@@ -22,7 +22,7 @@
</el-row>
<el-row>
<el-col class="agreement_body_main">
- <span>2.2 本服务须知项下的烟花爆竹流向管理信息和实名登记系统（以下简称为“烟花爆竹系统”或“系统”）是指由苏州纳米所受盐城市应急管理厅委托开发的，用于烟花爆竹实名销售登记和流向管理系统，包括烟花爆竹流向管理信息实名登记系统、烟花爆竹实名销售流向管理系统、烟花爆竹实名销售流向管理系统(手持端)、烟花爆竹手持终端仓储管理系统、烟花爆竹大数据统计监管平台、烟花爆竹生产销售安全监管系统。</span>
+ <span>2.2 本服务须知项下的烟花爆竹流向管理信息和实名登记系统（以下简称为“烟花爆竹系统”或“系统”）是指由苏州纳米所受盐城市委托开发的，用于烟花爆竹实名销售登记和流向管理系统，包括烟花爆竹流向管理信息实名登记系统、烟花爆竹实名销售流向管理系统、烟花爆竹实名销售流向管理系统(手持端)、烟花爆竹手持终端仓储管理系统、烟花爆竹大数据统计监管平台、烟花爆竹生产销售安全监管系统。</span>
</el-col>
</el-row>
<el-row>
diff --git a/src/views/usermng/product.vue b/src/views/usermng/product.vue
index 781739b..bdcf5bd 100644
--- a/src/views/usermng/product.vue
+++ b/src/views/usermng/product.vue
@@ -94,7 +94,7 @@
<span>{{ scope.row.directionCode }}</span>
</template>
</el-table-column>
- <el-table-column label="生产厂家" prop="manufacturer" align="center" sortable="custom">
+ <el-table-column label="批发厂家" prop="manufacturer" align="center" sortable="custom">
<template slot-scope="scope">
<span>{{ scope.row.manufacturer }}</span>
</template>
@@ -199,13 +199,13 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="生产厂家:" prop="manufacturer">
+ <el-form-item label="批发厂家:" prop="manufacturer">
<el-select v-model="dataForm.manufacturer" filterable placeholder="请选择" :disabled="dialogStatus==='editor'">
<el-option
v-for="item in manufacturerTree"
- :key="item.attributes"
- :label="item.text"
- :value="item.attributes">
+ :key="item.enterprisenumber"
+ :label="item.enterprisename"
+ :value="item.enterprisenumber">
</el-option>
</el-select>
</el-form-item>
@@ -260,6 +260,7 @@
productList, updateOldProduct,
updateProduct
} from "../../api/product";
+ import { getSuperiorDepartmentList } from '@/api/enterprise'
import {parseError} from "../../utils/messageDialog";
import {computePageCount} from "../../utils";
import {mapGetters} from "vuex";
@@ -310,7 +311,7 @@
dataFormRules: {
name: [{required: true, message: '产品名不能为空', trigger: 'blur'}],
type: [{required: true, message: '产品类型不能为空', trigger: 'blur'}],
- manufacturer: [{required: true, message: '生产厂家不能为空', trigger: 'blur'}],
+ manufacturer: [{required: true, message: '批发厂家不能为空', trigger: 'blur'}],
specification: [{required: true, message: '规格不能为空', trigger: 'blur'}],
explosiveContent: [{required: true, message: '含药量不能为空', trigger: 'blur'}],
level: [{required: true, message: '产品级别不能为空', trigger: 'blur'}],
@@ -330,9 +331,10 @@
this.getProductMajorCategory();
},
mounted() {
- getManufacturerTree().then(res => {
- this.manufacturerTree = (res.data);
- })
+ // getManufacturerTree().then(res => {
+ // this.manufacturerTree = (res.data);
+ // })
+ this.getSuperiorDepartmentListData()
},
computed: {
...mapGetters([
@@ -344,6 +346,15 @@
}
},
methods: {
+ async getSuperiorDepartmentListData(){
+ let res = await getSuperiorDepartmentList({filter: {enterprisename:"",safetysupervision:"烟花爆竹批发经营",province:"",city:"",district:"",street:""},
+ pageIndex: 1,
+ pageSize:9999})
+ if(res.data.code === "200"){
+ this.manufacturerTree = res.data.result.records
+ }
+ },
+
async selectChange(second){
this.$forceUpdate();
this.dataForm.level = '';
--
Gitblit v1.9.2