antissoft / lvqianmeiye_ERP

Commit 12ed5973093325d7675a345fc44bd46266371e1d

Authored by 李宇
1 parent 33599f59

oss路径切换

Inline Side-by-side
Showing 27 changed files with 51 additions and 40 deletions
antis-ncc-admin/.env.development
  View file @12ed597
... ... @@ -2,7 +2,8 @@
2 2  
3 3 VUE_CLI_BABEL_TRANSPILE_MODULES = true
4 4 # VUE_APP_BASE_API = 'https://erp.lvqianmeiye.com'
5   -# VUE_APP_BASE_API = 'http://erp_test.lvqianmeiye.com'
6   -VUE_APP_BASE_API = 'http://localhost:2011'
  5 +VUE_APP_BASE_API = 'http://erp_test.lvqianmeiye.com'
7 6 # VUE_APP_BASE_API = 'http://localhost:2011'
  7 +# VUE_APP_BASE_API = 'http://localhost:2011'
  8 +VUE_APP_IMG_API = ''
8 9 VUE_APP_BASE_WSS = 'ws://192.168.110.45:2011/websocket'
... ...
antis-ncc-admin/.env.production
  View file @12ed597
1 1 #　生产默认配置
2 2 ENV = 'production'
3   -
  3 +VUE_APP_IMG_API = ''
4 4 VUE_APP_BASE_API = 'https://erp.lvqianmeiye.com'
5 5 VUE_APP_BASE_WSS = 'ws://lvqian.antissoft.com/api/message/websocket'
... ...
antis-ncc-admin/src/views/lqHytkHytk/detail.vue
  View file @12ed597
... ... @@ -255,7 +255,7 @@ export default {
255 255 props: [],
256 256 data() {
257 257 return {
258   - baseUrl: process.env.VUE_APP_BASE_API,
  258 + baseUrl: process.env.VUE_APP_IMG_API,
259 259 loading: false,
260 260 visible: false,
261 261 dataForm: {
... ...
antis-ncc-admin/src/views/lqHytkHytk/index.vue
  View file @12ed597
... ... @@ -176,6 +176,14 @@
176 176 </div>
177 177 </template>
178 178 </el-table-column>
  179 + <!-- 备注 -->
  180 + <el-table-column label="备注" show-overflow-tooltip>
  181 + <template slot-scope="scope">
  182 + <div class="remark-info">
  183 + <span class="text-nowrap">{{ scope.row.bz || '无' }}</span>
  184 + </div>
  185 + </template>
  186 + </el-table-column>
179 187 <el-table-column label="操作人" width="150" align="center" >
180 188 <template slot-scope="scope">
181 189 <div class="referrer-info">
... ...
antis-ncc-admin/src/views/lqKdKdjlb/detail.vue
  View file @12ed597
... ... @@ -351,7 +351,7 @@ export default {
351 351 props: [],
352 352 data() {
353 353 return {
354   - baseUrl: process.env.VUE_APP_BASE_API,
  354 + baseUrl: process.env.VUE_APP_IMG_API,
355 355 loading: false,
356 356 visible: false,
357 357 dataForm: {
... ...
antis-ncc-admin/src/views/lqReimbursementApplication copy/Form.vue
  View file @12ed597
... ... @@ -209,7 +209,7 @@
209 209 props: [],
210 210 data() {
211 211 return {
212   - baseUrl: process.env.VUE_APP_BASE_API,
  212 + baseUrl: process.env.VUE_APP_IMG_API,
213 213 loading: false,
214 214 visible: false,
215 215 isDetail: false,
... ...
antis-ncc-admin/src/views/lqReimbursementApplication copy/detail.vue
  View file @12ed597
... ... @@ -164,7 +164,7 @@ export default {
164 164 name: 'ReimbursementApplicationDetail',
165 165 data() {
166 166 return {
167   - baseUrl: process.env.VUE_APP_BASE_API,
  167 + baseUrl: process.env.VUE_APP_IMG_API,
168 168 visible: false,
169 169 loading: false,
170 170 dataForm: {},
... ...
antis-ncc-admin/src/views/lqReimbursementApplication/detail-dialog.vue
  View file @12ed597
... ... @@ -294,7 +294,7 @@ export default {
294 294 name: 'DetailDialog',
295 295 data() {
296 296 return {
297   - baseUrl: process.env.VUE_APP_BASE_API,
  297 + baseUrl: process.env.VUE_APP_IMG_API,
298 298 visible: false,
299 299 loading: false,
300 300 approving: false,
... ...
antis-ncc-admin/src/views/lqXhHyhk/ServiceLogDialog.vue
  View file @12ed597
... ... @@ -150,7 +150,7 @@ export default {
150 150 },
151 151 data() {
152 152 return {
153   - baseUrl: process.env.VUE_APP_BASE_API,
  153 + baseUrl: process.env.VUE_APP_IMG_API,
154 154 visible: false,
155 155 loading: false,
156 156 feedbackList: [],
... ...
antis-ncc-admin/src/views/lqXhHyhk/ServiceLogFormDialog.vue
  View file @12ed597
... ... @@ -92,7 +92,7 @@ export default {
92 92 name: 'ServiceLogFormDialog',
93 93 data() {
94 94 return {
95   - baseUrl: process.env.VUE_APP_BASE_API,
  95 + baseUrl: process.env.VUE_APP_IMG_API,
96 96 visible: false,
97 97 isEditMode: false,
98 98 submitting: false,
... ...
antis-ncc-admin/src/views/lqXhHyhk/detail.vue
  View file @12ed597
... ... @@ -267,7 +267,7 @@ export default {
267 267 props: [],
268 268 data() {
269 269 return {
270   - baseUrl: process.env.VUE_APP_BASE_API,
  270 + baseUrl: process.env.VUE_APP_IMG_API,
271 271 loading: false,
272 272 visible: false,
273 273 dataForm: {
... ...
绿纤uni-app/common/config.js
  View file @12ed597
... ... @@ -45,7 +45,10 @@ function switchEnvironment(env) {
45 45 return false;
46 46 }
47 47 }
48   -
  48 +// 获取图片基础地址
  49 +function getImgBaseUrl() {
  50 + return '';
  51 +}
49 52 // 导出配置
50 53 export default {
51 54 ENV_CONFIG,
... ... @@ -53,7 +56,8 @@ export default {
53 56 getCurrentConfig,
54 57 getApiBaseUrl,
55 58 getEnvName,
56   - switchEnvironment
  59 + switchEnvironment,
  60 + getImgBaseUrl
57 61 };
58 62  
59 63 // 兼容旧版本
... ...
绿纤uni-app/pages/addServiceLog/addServiceLog.vue
  View file @12ed597
... ... @@ -111,7 +111,7 @@
111 111 logId: '',
112 112 isEditMode: false,
113 113 isSubmitting: false,
114   - baseUrl: '',
  114 + baseUrl: config.getImgBaseUrl(),
115 115 formData: {
116 116 remark: '',
117 117 kjbRemark: ''
... ... @@ -127,9 +127,6 @@
127 127 this.logId = options.logId || ''
128 128 this.isEditMode = options.mode === 'edit'
129 129  
130   - // 初始化基础URL
131   - this.baseUrl = config.getApiBaseUrl()
132   -
133 130 // 如果是编辑模式，加载现有数据
134 131 if (this.isEditMode && this.logId) {
135 132 this.loadServiceLogDetail()
... ...
绿纤uni-app/pages/consume-detail/consume-detail.vue
  View file @12ed597
... ... @@ -243,7 +243,7 @@
243 243 data() {
244 244 return {
245 245 newuserInfo: uni.getStorageSync('newuserInfo'),
246   - baseUrl: config.getApiBaseUrl(),
  246 + baseUrl: config.getImgBaseUrl(),
247 247 loading: false,
248 248 error: '',
249 249 consumeId: null,
... ...
绿纤uni-app/pages/lx-detail/lx-detail.vue
  View file @12ed597
... ... @@ -184,7 +184,7 @@
184 184 <view class="file-title">收据文件</view>
185 185 <view class="file-list">
186 186 <view @click="previewSignature(lxData.scwj,index)" v-for="(file, index) in lxData.scwj" :key="index" class="file-item">
187   - <text class="file-icon">??️</text>
  187 + <text class="file-icon">🖼️</text>
188 188 <text class="file-name">{{ file.name || '未知文件' }}</text>
189 189 </view>
190 190 </view>
... ... @@ -193,7 +193,7 @@
193 193 <view class="file-title">其他文件</view>
194 194 <view class="file-list">
195 195 <view @click="previewSignature(lxData.f_FileUrl,index)" v-for="(file, index) in lxData.f_FileUrl" :key="index" class="file-item">
196   - <text class="file-icon">??️</text>
  196 + <text class="file-icon">🖼️</text>
197 197 <text class="file-name">{{ file.name || '未知文件' }}</text>
198 198 </view>
199 199 </view>
... ... @@ -297,7 +297,7 @@
297 297 data() {
298 298 return {
299 299 newuserInfo: uni.getStorageSync('newuserInfo'),
300   - baseUrl:config.getApiBaseUrl(),
  300 + baseUrl:config.getImgBaseUrl(),
301 301 loading: false,
302 302 error: '',
303 303 lxId: null,
... ... @@ -916,8 +916,12 @@
916 916 }
917 917  
918 918 .file-name {
  919 + // width: 300rpx;
919 920 font-size: 26rpx;
920 921 color: #2e7d32;
  922 + overflow: hidden;
  923 + text-overflow: ellipsis;
  924 + white-space: nowrap;
921 925 }
922 926  
923 927 /* 操作按钮样式 */
... ...
绿纤uni-app/pages/lx/lx.vue
  View file @12ed597
... ... @@ -452,7 +452,7 @@
452 452 return {
453 453 iskh:true,
454 454 issubmitOrder:true,
455   - baseUrl: config.getApiBaseUrl(),
  455 + baseUrl: config.getImgBaseUrl(),
456 456 // 表单数据
457 457 formData: {
458 458 kdhy: '',
... ...
绿纤uni-app/pages/member-consume/member-consume - 副本.vue
  View file @12ed597
... ... @@ -269,7 +269,7 @@
269 269 data() {
270 270 return {
271 271 issubmitOrder: true,
272   - baseUrl: config.getApiBaseUrl(),
  272 + baseUrl: config.getImgBaseUrl(),
273 273 // 表单数据
274 274 formData: {
275 275 hy: '',
... ...
绿纤uni-app/pages/member-consume/member-consume copy.vue
  View file @12ed597
... ... @@ -343,7 +343,7 @@
343 343 data() {
344 344 return {
345 345 issubmitOrder: true,
346   - baseUrl: config.getApiBaseUrl(),
  346 + baseUrl: config.getImgBaseUrl(),
347 347 // 表单数据
348 348 formData: {
349 349 hy: '',
... ...
绿纤uni-app/pages/member-consume/member-consume.vue
  View file @12ed597
... ... @@ -348,7 +348,7 @@
348 348 iskh:true,
349 349 appointmentId: null,
350 350 issubmitOrder: true,
351   - baseUrl: config.getApiBaseUrl(),
  351 + baseUrl: config.getImgBaseUrl(),
352 352 // 表单数据
353 353 formData: {
354 354 hy: '',
... ...
绿纤uni-app/pages/purchase-detail/purchase-detail.vue
  View file @12ed597
... ... @@ -196,7 +196,7 @@
196 196 // 预览文件
197 197 previewFile(file) {
198 198 if (file.url) {
199   - const baseUrl = config.getApiBaseUrl()
  199 + const baseUrl = config.getImgBaseUrl()
200 200 const fullUrl = file.url.startsWith('http') ? file.url : `${baseUrl}${file.url}`
201 201  
202 202 // 如果是图片，使用预览图片功能
... ...
绿纤uni-app/pages/refund-detail/refund-detail.vue
  View file @12ed597
... ... @@ -230,7 +230,7 @@
230 230 data() {
231 231 return {
232 232 newuserInfo: uni.getStorageSync('newuserInfo'),
233   - baseUrl: config.getApiBaseUrl(),
  233 + baseUrl: config.getImgBaseUrl(),
234 234 loading: false,
235 235 error: '',
236 236 refundId: null,
... ... @@ -793,6 +793,9 @@
793 793 color: #2e7d32;
794 794 font-weight: 500;
795 795 margin-bottom: 4rpx;
  796 + overflow: hidden;
  797 + text-overflow: ellipsis;
  798 + white-space: nowrap;
796 799 }
797 800  
798 801 .file-size {
... ...
绿纤uni-app/pages/reimbursement-audit-detail/reimbursement-audit-detail.vue
  View file @12ed597
... ... @@ -141,7 +141,7 @@
141 141 purchaseRecords: [],
142 142 reimbursementId: null,
143 143 storeOptions: [],
144   - baseUrl: config.getApiBaseUrl(),
  144 + baseUrl: config.getImgBaseUrl(),
145 145 approving: false,
146 146 rejecting: false
147 147 }
... ...
绿纤uni-app/pages/reimbursement-detail/reimbursement-detail - 副本.vue
  View file @12ed597
... ... @@ -123,7 +123,7 @@
123 123 purchaseRecords: [],
124 124 reimbursementId: null,
125 125 storeOptions: [],
126   - baseUrl: config.getApiBaseUrl()
  126 + baseUrl: config.getImgBaseUrl()
127 127 }
128 128 },
129 129  
... ...
绿纤uni-app/pages/reimbursement-detail/reimbursement-detail.vue
  View file @12ed597
... ... @@ -261,7 +261,7 @@
261 261 purchaseRecords: [],
262 262 reimbursementId: null,
263 263 storeOptions: [],
264   - baseUrl: config.getApiBaseUrl(),
  264 + baseUrl: config.getImgBaseUrl(),
265 265 userInfo: null, // 当前登录用户信息
266 266 // 审批操作表单
267 267 approvalForm: {
... ...
绿纤uni-app/pages/serviceDiary/serviceDiary.vue
  View file @12ed597
... ... @@ -86,7 +86,7 @@
86 86 consumeId: '',
87 87 memberName: '',
88 88 logList: [],
89   - baseUrl: ''
  89 + baseUrl: config.getImgBaseUrl()
90 90 }
91 91 },
92 92 onLoad(options) {
... ... @@ -94,9 +94,6 @@
94 94 this.consumeId = options.consumeId || ''
95 95 this.memberName = decodeURIComponent(options.memberName || '未知会员')
96 96  
97   - // 初始化基础URL
98   - this.baseUrl = config.getApiBaseUrl()
99   -
100 97 // 加载服务日志数据
101 98 // this.loadServiceLogs()
102 99 },
... ...
绿纤uni-app/pages/serviceDiary/serviceDiaryuser.vue
  View file @12ed597
... ... @@ -98,7 +98,7 @@
98 98 userid: '',
99 99 memberName: '',
100 100 logList: [],
101   - baseUrl: '',
  101 + baseUrl:config.getImgBaseUrl(),
102 102 // 分页相关
103 103 currentPage: 1,
104 104 pageSize: 10,
... ... @@ -112,10 +112,7 @@
112 112 // 获取传递的参数
113 113 this.userid = options.userid || ''
114 114 this.memberName = decodeURIComponent(options.memberName || '未知会员')
115   -
116   - // 初始化基础URL
117   - this.baseUrl = config.getApiBaseUrl()
118   -
  115 +
119 116 // 加载服务日志数据
120 117 // this.loadServiceLogs()
121 118 },
... ...
绿纤uni-app/pages/transferCard/transferCard.vue
  View file @12ed597
... ... @@ -133,7 +133,7 @@
133 133 data() {
134 134 return {
135 135 isSubmitting: true,
136   - baseUrl: config.getApiBaseUrl(),
  136 + baseUrl: config.getImgBaseUrl(),
137 137  
138 138 // 表单数据
139 139 formData: {
... ...