Merge branch 'dev' of http://172.16.100.139/new-business/drp-web into dev

src/views/business/ehr/pm/awaitMarkPm/detail.vue

@@ -246,9 +246,6 @@ export default {
     },
     //评写完成
     async btnverify(){
-      if("000001,000002".includes(this.$store.state.user.name)){
-        this.form.comment = '-';
-      }
       if(this.form.staffDivide == 'C1' && this.lldMark > 150){
         this.$modal.msgWarning("业务组总评分不能超过150！");
         return;

src/views/business/ehr/pm/myPm/detail.vue

@@ -430,7 +430,11 @@ export default {
       selfScoring = selfScoring.toFixed(1);
       this.saMark = selfScoring;
       if(this.form.isTwoEvaluation){
-        return ['合计','','',weight,'','','',selfScoring,'','',this.form.ldMark];
+        if(this.form.status == 0){
+          return ['合计','','',weight,'','','',''];
+        }else{
+          return ['合计','','',weight,'','','',selfScoring,'','',this.form.ldMark];
+        }
       }else{
         return ['合计','','',weight,'','','',selfScoring,'',this.form.ldMark];
       }

src/views/ehrentrance.vue

@@ -32,10 +32,10 @@ export default {
         console.log('arr[0]',arr[0]);
         let resUrl = "";
         //移动端判断环境
-        if(arr[0].includes('dev') || arr[0].includes('test') || arr[0].includes('localhost')){
-          resUrl = "https://sy.derom.com/test-drp-mobile/#/pages/public-entrance?path=" + query.mobilePath + window.location.search;
-        }else{
+        if(arr[0].includes('//sy.derom.com/')){
           resUrl = "https://sy.derom.com/drp-mobile/#/pages/public-entrance?path=" + query.mobilePath + window.location.search;
+        }else{
+          resUrl = "https://sy.derom.com/test-drp-mobile/#/pages/public-entrance?path=" + query.mobilePath + window.location.search;
         }
         console.log('resUrl',resUrl);
         location.replace(resUrl);

src/views/purchase/ownership/index.vue

@@ -198,6 +198,7 @@ export default {
     btnResetQuery() {
       this.params = this.$init.params(this.SearchColumns);
       this.page = this.$init.page();
+      this.getList(this.params, this.page);
     },
     /** 修改按钮操作 */
     btnUpdate(row) {
@@ -247,5 +248,4 @@ export default {
 .el-button-group + .el-button-group {
   margin: 0 0 0 8px;
 }
-
 </style>