Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-uniapp into master_hella

.env.hella13

@@ -1,5 +1,5 @@
-VITE_BASE_URL=https://wmsccapp.faway-hella.com:81/api/admin-api
-VITE_BASE_URL_IMAGE=https://wmsccapp.faway-hella.com:81/api/admin-api
+VITE_BASE_URL=https://wmsccapp.faway-hella.com:80/api/admin-api
+VITE_BASE_URL_IMAGE=https://wmsccapp.faway-hella.com:80/api/admin-api
 
 # 租户配置
 VITE_TENANT='[{"text":"长春1379","value":1}]'
@@ -8,4 +8,4 @@ VITE_TENANT='[{"text":"长春1379","value":1}]'
 VITE_isDevelopment=false
 
 # 积木报表请求路径
-VITE_JMREPORT_BASE_URL='https://wmsccapp.faway-hella.com:81'
+VITE_JMREPORT_BASE_URL='https://wmsccapp.faway-hella.com:80'

.env.hella8

@@ -1,5 +1,5 @@
-VITE_BASE_URL=https://wmscdapp.faway-hella.com:81/api/admin-api
-VITE_BASE_URL_IMAGE=https://wmscdapp.faway-hella.com:81/api/admin-api
+VITE_BASE_URL=https://wmscdapp.faway-hella.com:80/api/admin-api
+VITE_BASE_URL_IMAGE=https://wmscdapp.faway-hella.com:80/api/admin-api
 
 # 租户配置
 VITE_TENANT='[{"text":"成都1397","value":2},{"text":"长春2379","value":3}]'
@@ -9,4 +9,4 @@ VITE_isDevelopment=false
 
 
 # 积木报表请求路径
-VITE_JMREPORT_BASE_URL='https://wmscdapp.faway-hella.com:81'
+VITE_JMREPORT_BASE_URL='https://wmscdapp.faway-hella.com:80'

.env.production

@@ -1,5 +1,5 @@
-VITE_BASE_URL=http://172.22.32.8:81/api/admin-api
-VITE_BASE_URL_IMAGE=http://172.22.32.8:81/admin-api
+VITE_BASE_URL=https://wmscdapp.faway-hella.com:80/api/admin-api
+VITE_BASE_URL_IMAGE=https://wmscdapp.faway-hella.com:80/api/admin-api
 
 # 租户配置
 VITE_TENANT='[{"text":"成都1397","value":2},{"text":"长春2379","value":3}]'
@@ -9,4 +9,4 @@ VITE_isDevelopment=false
 
 
 # 积木报表请求路径
-VITE_JMREPORT_BASE_URL='http://172.22.32.8:90'
+VITE_JMREPORT_BASE_URL='https://wmscdapp.faway-hella.com:80'

src/manifest.json

@@ -3,8 +3,8 @@
     "package" : "uni.UNI43932FE",
     "appid" : "__UNI__C9CF4BF",
     "description" : "",
-    "versionName" : "1.0.93",
-    "versionCode" : 93,
+    "versionName" : "1.0.95",
+    "versionCode" : 95,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

src/pages/issue/job/issueJob.vue

@@ -309,6 +309,7 @@
 						action: "==",
 						value: queryParams.productionLineCode
 					})
+					this.productionLineCode =queryParams.productionLineCode
 				}
 				//物料代码
 				if (queryParams.itemCode) {