From 7a953239bfd43149c0ffbe66dd24b45eab0f401a Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期四, 25 七月 2024 10:26:28 +0800
Subject: [PATCH] 修改名字
---
config/index.js | 2 +-
src/views/license/licenseInfo/index.vue | 10 +++++-----
src/views/usermng/product.vue | 4 ++--
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/config/index.js b/config/index.js
index a52ff93..f7cf3e5 100644
--- a/config/index.js
+++ b/config/index.js
@@ -15,7 +15,7 @@
// can be overwritten by process.env.HOST
// if you want dev by ip, please set host: '0.0.0.0'
- host: '192.168.0.65',
+ host: '192.168.2.13',
port: 8101, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
autoOpenBrowser: true,
errorOverlay: true,
diff --git a/src/views/license/licenseInfo/index.vue b/src/views/license/licenseInfo/index.vue
index 37ebacd..ca8024b 100644
--- a/src/views/license/licenseInfo/index.vue
+++ b/src/views/license/licenseInfo/index.vue
@@ -139,7 +139,7 @@
v-if="isSupervision==='null'?false:true">删除</el-button>
<br><el-button type="text" v-print="printObj1" @click="giveData(scope.row)"
v-if="isSupervision==='null' && scope.row.reviewstatus === 2?true:false">打印正本（新）</el-button>
- <el-button type="text" v-print="printObj1" @click="giveDetail(scope.row)"
+ <el-button type="text" v-print="printObj2" @click="giveDetail(scope.row)"
v-if="isSupervision==='null' && scope.row.reviewstatus === 2?true:false">打印副本（新）</el-button>
<el-button type="text" v-print="printObj3" @click="giveData(scope.row)"
v-if="isSupervision==='null' && scope.row.reviewstatus === 2?true:false">打印正本（旧）</el-button>
@@ -416,11 +416,11 @@
<el-row style="margin-top: 92px;padding-left: 120px">
<el-col :span="4" style="font-weight: bold;">
<span v-if="type === 2">主要负责人</span>
- <span v-if="type === 3">许可类型</span>
+ <span v-if="type === 3 || type === 4">许可类型</span>
</el-col>
<el-col :span="8">
<span v-if="type === 2">{{mainpersonname}}</span>
- <span v-if="type === 3">{{licensetype}}</span>
+ <span v-if="type === 3 || type === 4">{{licensetype}}</span>
</el-col>
</el-row>
<el-row style="margin-top: 48px;margin-left: 120px;">
@@ -997,9 +997,9 @@
this.area = val.dealingarea
this.powder = val.reservekg
if (val.licensetype === 1) {
- this.licensetype = '长期'
+ this.licensetype = '长期零售'
} else{
- this.licensetype = '短期'
+ this.licensetype = '短期零售'
}
if (val.dealingtype === 2 || val.dealingtype === 4) {
this.dealingtype = '专店'
diff --git a/src/views/usermng/product.vue b/src/views/usermng/product.vue
index 41dfafe..6634af6 100644
--- a/src/views/usermng/product.vue
+++ b/src/views/usermng/product.vue
@@ -124,7 +124,7 @@
<span>{{ scope.row.level }}</span>
</template>
</el-table-column>
- <el-table-column label="箱含量" prop="boxNumber" align="center" sortable="custom">
+ <el-table-column label="单个产品含量" prop="boxNumber" align="center" sortable="custom">
<template slot-scope="scope">
<span>{{ scope.row.boxNumber }}</span>
</template>
@@ -221,7 +221,7 @@
<br>
<span v-show="dialogStatus !== 'create'" style="font-size: 12px;color: red">(箱含药量 = 最小单位含药量×规格×箱含量，如单发鞭炮含药量为0.5g，则填写0.5)</span>
</el-form-item>
- <el-form-item label="箱含量:" prop="boxNumber">
+ <el-form-item label="单个产品含量:" prop="boxNumber">
<el-input-number v-model.number="dataForm.boxNumber" :controls="false" :disabled="dialogStatus==='editor'"/>
</el-form-item>
<el-form-item label="包装方式:" prop="packing">
--
Gitblit v1.9.2