Merge branch 'dev' into 'purchaseDev'

Dev

See merge request new-business/drp-web!636

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

@@ -131,7 +131,7 @@
         <el-form-item label="加/减分项" prop="asItem">
           <el-checkbox v-model="rowData.asItem" @change="handleCheckedChange"></el-checkbox>
         </el-form-item>
-        <el-form-item label="权重(%)" prop="weight" v-if="!rowData.asItem">
+        <el-form-item label="权重(%)" prop="weight" v-show="!rowData.asItem">
           <el-input  v-model.number="rowData.weight" v-only-number="{max:100,min:0,precision:0}" size="mini">
             <i slot="suffix" style="color: #000;font-style:normal;margin-right: 10px;">%</i>
           </el-input>

src/views/monitor/job/index.vue

@@ -799,12 +799,11 @@ export default {
               this.getList();
             });
           } else {
-            console.log(this.form, "this.form");
-            // addJob(this.form).then((response) => {
-            //   this.$modal.msgSuccess("新增成功");
-            //   this.open = false;
-            //   this.getList();
-            // });
+            addJob(this.form).then((response) => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
           }
         }
       });
@@ -849,6 +848,6 @@ export default {
 </script>
 <style scoped>
 >>> .el-form-item__content {
-  line-height: 40px ;
+  line-height: 40px;
 }
 </style>