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

src/components/popover-select-v2/index.vue

@@ -84,6 +84,17 @@ export default {
         return this.value;
       },
       set(value) {
+        // const {
+        //   $props: { source, dataMapping },
+        // } = this;
+
+        // for (let key in dataMapping) {
+        //   if (dataMapping[key] === "id" || dataMapping[key] === "code") {
+        //     if (source[key] && source[key] !== "") {
+        //       source[key] = undefined;
+        //     }
+        //   }
+        // }
         this.$emit("input", value);
       },
     },
@@ -237,6 +248,9 @@ export default {
         }
       }
     },
+    handleClear() {
+      this.innerValue = "";
+    },
     handleKeyupDel() {
       console.log("focus");
       const {
@@ -251,9 +265,7 @@ export default {
         }
       }
     },
-    handleClear() {
-      this.innerValue = "";
-    },
+
   },
   created() {},
   mounted() {},
@@ -272,6 +284,7 @@ export default {
       @clear="handleClear"
       @change="handleChange"
       @keyup.enter.native="handleChange"
+      @keyup.delete.native="handleKeyupDel"
     >
       <i :size="size" class="el-icon-search" slot="suffix" @click="open"> </i>
     </el-input>
@@ -284,7 +297,6 @@ export default {
       :fetch-suggestions="useAutocomplete"
       @blur="useBlur"
       @select="useConfirm([$event])"
-      @keyup.delete.native="handleKeyupDel"
       style="width: 100%"
     >
       <i class="el-icon-search" slot="suffix" @click="open"> </i>

src/components/popover-select/index.vue

@@ -109,6 +109,19 @@ export default {
         return multiple ? "" : value;
       },
       set(val) {
+        // const {
+        //   $props: { source, dataMapping, multiple },
+        // } = this;
+        // if (!multiple) {
+        //   for (let key in dataMapping) {
+        //     if (dataMapping[key] === "id" || dataMapping[key] === "code") {
+        //       if (source[key] && source[key] !== "") {
+        //         source[key] = undefined;
+        //       }
+        //     }
+        //   }
+        // }
+
         this.$emit("input", val);
       },
     },
@@ -127,10 +140,10 @@ export default {
     },
     innerValue: {
       handler: function (newValue) {
+        const {
+          $props: { source, dataMapping, multiple },
+        } = this;
         if (!newValue) {
-          const {
-            $props: { source, dataMapping },
-          } = this;
           for (let key in dataMapping) {
             source[key] = undefined;
           }
@@ -345,6 +358,7 @@ export default {
       @clear="handleClear"
       @change="handleChange"
       @keyup.enter.native="handleChange"
+      @keyup.delete.native="handleKeyupDel"
     >
       <i :size="size" class="el-icon-search" slot="suffix" @click="open"> </i>
     </el-input>
@@ -359,7 +373,6 @@ export default {
       :fetch-suggestions="useAutocomplete"
       @blur="useBlur"
       @select="useConfirm([$event])"
-      @keyup.delete.native="handleKeyupDel"
       style="width: 100%"
     >
       <i :size="size" class="el-icon-search" slot="suffix" @click="open"> </i>

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

@@ -159,12 +159,12 @@
           />
         </template>
       </el-table-column>
-      <el-table-column
+      <!-- <el-table-column
         label="调用目标字符串"
         align="center"
         prop="invokeTarget"
         :show-overflow-tooltip="true"
-      />
+      /> -->
       <el-table-column
         label="cron执行表达式"
         align="center"
@@ -300,11 +300,15 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="任务大类" prop="jobType">
-              <el-select v-model="form.jobType" placeholder="请选择任务大类">
+              <el-select
+                v-model="form.jobType"
+                placeholder="请选择任务大类"
+                @change="jobTypeChange"
+              >
                 <el-option
                   v-for="dict in dict.type.sys_oa"
                   :key="dict.value"
-                  :label="dict.label"
+                  :label="dict.value"
                   :value="dict.value"
                 ></el-option>
               </el-select>
@@ -314,9 +318,11 @@
             <el-form-item label="任务小类" prop="jobTypeS">
               <el-select v-model="form.jobTypeS" placeholder="请选择任务小类">
                 <el-option
-                  v-for="dict in dict.type.sys_oa_s"
+                  v-for="dict in dict.type.sys_oa_s.filter(
+                    ({ label }) => label === taskClassLabel
+                  )"
                   :key="dict.value"
-                  :label="dict.label"
+                  :label="dict.value"
                   :value="dict.value"
                 ></el-option>
               </el-select>
@@ -342,7 +348,7 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="24">
+          <el-col :span="0">
             <el-form-item prop="invokeTarget" readonly>
               <span slot="label">
                 调用方法
@@ -516,6 +522,7 @@ export default {
   ],
   data() {
     return {
+      taskClassLabel: "",
       pickerOptions: {
         shortcuts: [
           {
@@ -585,7 +592,10 @@ export default {
         duration: undefined,
       },
       // 表单参数
-      form: {},
+      form: {
+        jobType: "",
+        jobTypeS: "",
+      },
       // 表单校验
       rules: {
         duration: [{ required: true, message: "不能为空", trigger: "blur" }],
@@ -822,6 +832,22 @@ export default {
         `job_${new Date().getTime()}.xlsx`
       );
     },
+    // 任务大类
+    jobTypeChange(val) {
+      let {
+        dict,
+        form: { jobTypeS },
+      } = this;
+      this.taskClassLabel = dict.type.sys_oa.find(
+        ({ label, value }) => value === val
+      ).label;
+      jobTypeS && jobTypeS !== "" && (this.form.jobTypeS = "");
+    },
   },
 };
 </script>
+<style scoped>
+>>> .el-form-item__content {
+  line-height: 40px;
+}
+</style>