Merge branch '娄底高职分支' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 娄底高职分支

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/Sys_UpdateRecord/Form.js

@@ -18,7 +18,7 @@ var bootstrap = function ($, learun) {
             $('#IsApp').lrDataItemSelect({
                 code: 'YesOrNoBit',
             });
-            $('#AppUrl').lrUploader();
+            $('#AppUrl').lrUploader({ extensions: 'apk' });
         },
         initData: function () {
             if (!!keyValue) {

Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js

@@ -16,12 +16,12 @@ export default {
 	//   "http://localhost:8088/"
 	// ],
 	"apiHost": [
-		// "http://fwh.ldyesz.edu.cn:9000/",//H5打包
-		//"http://192.168.10.245:8000/",//app打包
-		"http://192.168.10.122:8002/",
+		"http://fwh.ldyesz.edu.cn:9000/",//H5打包
+		// "http://10.10.4.45:9000/"//app打包,
+		// "http://192.168.10.122:8002/",
 	],
-	// "webHost": "http://10.10.4.45:8000/",
-	"webHost": "http://192.168.10.122:8001/",
+	"webHost": "http://fwh.ldyesz.edu.cn:8000/",
+	// "webHost": "http://192.168.10.122:8001/",
 	// 开发环境下自动填充登录账号密码，与接口地址一一对应，只在开发环境下显示
 	"devAccount": [{
 		username: "system",

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Purchase_Print/single.vue

@@ -136,6 +136,7 @@ export default {
     return { 
       // 页面相关参数 
       id: null, 
+	  ProcessId:null,
       mode: null, 
       edit: null, 
       ready: false, 
@@ -179,16 +180,17 @@ export default {
     } 
   }, 
   
-  async onLoad({ type, id }) { 
-    await this.init(type, id) 
+  async onLoad({ type, id, ProcessId}) { 
+    await this.init(type, id, ProcessId) 
   }, 
   
   methods: { 
     // 页面初始化 
-    async init(type, id) { 
+    async init(type, id, ProcessId) { 
       this.LOADING('加载数据中...') 
 	  
       this.id = id 
+	  this.ProcessId = ProcessId
       this.mode = type 
       this.edit = ['create', 'edit'].includes(this.mode) 
   
@@ -215,8 +217,10 @@ export default {
 		let userInfo = this.GET_GLOBAL('loginUser');
 		this.origin.Purchase_Print.DepartmentId = userInfo.departmentId
 		this.origin.Purchase_Print.CreatorId = userInfo.userId
-      } else { 
-        const result = await this.HTTP_GET('learun/adms/purchaseprint/form', this.id)
+      } else {
+			  const result = this.id ? await this.HTTP_GET('learun/adms/purchaseprint/form', this.id) :
+			  await this.HTTP_GET('learun/adms/purchaseprint/GetshList', this.ProcessId)
+        
         this.origin = await this.formatFormData({Purchase_Print:{...result.Purchase_Print,Purchase_Print_Details:result.Purchase_Print_Details||[]}})
       }
       this.current = this.COPY(this.origin)