Merge branch 'master' of http://1.14.104.71:10880/root/ylrz_his_scrm_adminUI

.env.prod-zkzh

@@ -0,0 +1,39 @@
+# 页面标题
+VUE_APP_TITLE = 中康SCRM管理系统
+# 首页菜单标题
+VUE_APP_TITLE_INDEX = 陕西中康智慧
+# 公司名称
+VUE_APP_COMPANY_NAME = 陕西中康智慧药房有限公司
+# ICP备案号
+VUE_APP_ICP_RECORD = 陕ICP备2024048690号-2
+# ICP网站访问地址
+VUE_APP_ICP_URL =https://beian.miit.gov.cn
+# 网站LOG
+VUE_APP_LOG_URL =@/assets/logo/zkzh_logo.png
+# 存储桶配置
+VUE_APP_OBS_ACCESS_KEY_ID = K2UTJGIN7UTZJR2XMXYG
+# 存储桶配置
+VUE_APP_OBS_SECRET_ACCESS_KEY = sbyeNJLbcYmH6copxeFP9pAoksM4NIT9Zw4x0SRX
+# 存储桶配置
+VUE_APP_OBS_SERVER = https://obs.cn-north-4.myhuaweicloud.com
+# 存储桶配置
+VUE_APP_OBS_BUCKET = zkzh-hw079058881
+# 存储桶配置
+VUE_APP_COS_BUCKET = zkzh-1323137866
+# 存储桶配置
+VUE_APP_COS_REGION = ap-chongqing
+# 线路一地址
+VUE_APP_VIDEO_LINE_1 = https://zkzhtcpv.ylrzcloud.com
+# 线路二地址
+VUE_APP_VIDEO_LINE_2 = https://zkzhobs.ylrztop.com
+# 生产环境配置
+ENV = 'production'
+
+#FS管理系统/生产环境
+VUE_APP_BASE_API = '/prod-api'
+
+#默认 1、会员 2、企微
+VUE_APP_COURSE_DEFAULT = 1
+
+# 路由懒加载
+VUE_CLI_BABEL_TRANSPILE_MODULES = true

src/api/his/storeOrder.js

@@ -159,7 +159,7 @@ export function updateOrder(data) {
 // 修改订单
 export function updateStoreOrder(data) {
   return request({
-    url: '/his/storeOrder/updateStoreOrder',
+    url: '/his/storeOrder',
     method: 'put',
     data: data
   })
@@ -296,4 +296,4 @@ export function getErpAccount() {
     url: '/his/storeOrder/getErpAccount',
     method: 'get'
   })
-}
+}

src/views/components/his/storeOrderDetails.vue

@@ -559,7 +559,7 @@ import {getCitys} from "@/api/store/city";
         citys:[],
         userAddress:null,
       }
-      
+
     },
 
     created() {
@@ -643,7 +643,7 @@ import {getCitys} from "@/api/store/city";
         console.log(detail)
         return region && detail ? `${region} ${detail}` : (region || detail || '');
       },
-      
+
       followMsg(row){
          const userId = this.item.userId;
          const followDoctorId =this.item.followDoctorId;
@@ -673,8 +673,11 @@ import {getCitys} from "@/api/store/city";
       },
       editDelivery(){
         this.editDy.open = true;
+        console.log(this.item)
         this.editDyForm.orderId = this.item.orderId;
-
+        this.editDyForm.deliveryId = this.item.deliveryId;
+        this.editDyForm.deliveryCode = this.item.deliveryCode;
+        this.editDyForm.deliverySn = this.item.deliverySn;
       },
       showListD(){
         if(this.showList){
@@ -771,6 +774,10 @@ import {getCitys} from "@/api/store/city";
               this.$parent.$parent.getList();
             });
           }
+        }).finally(()=>{
+          this.editDyForm.deliveryCode = null;
+          this.editDyForm.orderId = null;
+          this.editDyForm.deliveryId = null;
         });
         });
     },
@@ -1091,7 +1098,12 @@ import {getCitys} from "@/api/store/city";
                       this.$parent.$parent.getList();
                   });
               }
-            });
+            }).finally(()=>{
+              this.editDyForm.deliveryCode = null;
+              this.editDyForm.orderId = null;
+              this.editDyForm.deliveryId = null;
+              this.editDyForm.deliverySn = null;
+            })
           }
         });
       },

src/views/components/his/storeOrderDetails2.vue

@@ -621,8 +621,10 @@ import { getTcmScheduleList } from "@/api/company/schedule";
       },
       editDelivery(){
         this.editDy.open = true;
+        console.log(this.item)
         this.editDyForm.orderId = this.item.orderId;
-
+        this.editDyForm.deliveryId = this.item.deliveryId;
+        this.editDyForm.deliveryCode = this.item.deliveryCode;
       },
       showListD(){
         if(this.showList){
@@ -1002,7 +1004,12 @@ import { getTcmScheduleList } from "@/api/company/schedule";
                       this.$parent.$parent.getList();
                   });
               }
-            });
+            }).finally(()=>{
+              this.editDyForm.deliveryCode = null;
+              this.editDyForm.orderId = null;
+              this.editDyForm.deliveryId = null;
+              this.editDyForm.deliverySn = null;
+            })
           }
         });
       },

src/views/system/config/config.vue

@@ -175,6 +175,9 @@
             <el-form-item label="会员服务协议" prop="vipService">
               <editor v-model="form3.vipService" :min-height="292"/>
             </el-form-item>
+            <el-form-item label="会员自动续费协议" prop="vipAutomaticService">
+              <editor v-model="form3.vipAutomaticService" :min-height="292"/>
+            </el-form-item>
 
             <div class="footer">
               <el-button type="primary" @click="submitForm3">提  交</el-button>