zxr 3 年之前
父节点
当前提交
bd115b7b77
共有 2 个文件被更改,包括 32 次插入8 次删除
  1. 1 1
      src/layout/components/TagsView/index.vue
  2. 31 7
      src/views/combatduty/basedutyinfo/index.vue

+ 1 - 1
src/layout/components/TagsView/index.vue

@@ -70,6 +70,7 @@ export default {
   mounted() {
     this.initTags()
     this.addTags()
+     console.log()
   },
   methods: {
     isActive(route) {
@@ -163,7 +164,6 @@ export default {
       })
     },
     closeSelectedTag(view) {
-      this.$store.state.tagsView.visitedViews=[];
       this.$store.dispatch('tagsView/delView', view).then(({ visitedViews }) => {
         if (this.isActive(view)) {
           this.toLastView(visitedViews, view)

+ 31 - 7
src/views/combatduty/basedutyinfo/index.vue

@@ -19,7 +19,7 @@
           ></el-date-picker>
       </el-form-item>
       <el-form-item label="值班首长" prop="chiefDutyName">
-        <el-select v-model="queryParams.chiefDutyId" filterable clearable placeholder="请选择值班首长">
+        <el-select v-model="queryParams.chiefDutyName"  filterable clearable placeholder="请选择值班首长">
             <el-option v-for="item in rylist" :key="item.id" :label="item.name" :value="item.id"></el-option>
           </el-select>
       </el-form-item>
@@ -354,9 +354,9 @@
              v-if="qdflg==1"
           ></el-date-picker>
         </el-form-item>
-        <el-form-item label="值班首长" prop="chiefDutyId">
-          <el-select v-model="form.chiefDutyId" filterable clearable placeholder="请选择值班首长">
-            <el-option v-for="item in rylist" :key="item.id" :label="item.name" :value="item.id"></el-option>
+        <el-form-item label="值班首长" prop="chiefDutyName">
+          <el-select v-model="form.chiefDutyName" @change="chiefDutyNamefun" filterable clearable placeholder="请选择值班首长">
+            <el-option v-for="item in rylist" :key="item.id" :label="item.name" :value="item"></el-option>
           </el-select>
         </el-form-item>
         <!-- <el-form-item label="值班首长ID" prop="chiefDutyId">
@@ -365,9 +365,9 @@
         <el-form-item label="值班首长电话" prop="chiefDutyPhone">
           <el-input v-model="form.chiefDutyPhone" placeholder="请输入值班首长电话" />
         </el-form-item>
-        <el-form-item label="作战值班员" prop="combatDutyId">
-          <el-select v-model="form.combatDutyId" filterable clearable placeholder="请选择作战值班员">
-            <el-option v-for="item in rylist" :key="item.id" :label="item.name" :value="item.id"></el-option>
+        <el-form-item label="作战值班员" prop="combatDutyName">
+          <el-select v-model="form.combatDutyId" @change="combatDutyNamefun" filterable clearable placeholder="请选择作战值班员">
+            <el-option v-for="item in rylist" :key="item.id" :label="item.name" :value="item"></el-option>
           </el-select>
         </el-form-item>
         <!-- <el-form-item label="作战值班员Id" prop="combatDutyId">
@@ -774,7 +774,31 @@ export default {
     //值班分类
     caoZuoTypefun(){
        this.getList();
+    },
+    //首长电话
+    chiefDutyNamefun(val){
+        this.form.chiefDutyId=val.id;
+        this.form.chiefDutyName=val.name;
+        this.form.chiefDutyPhone=val.phone;
+    },
+    //作战值班电话
+    combatDutyNamefun(val){
+        this.form.combatDutyId=val.id;
+        this.form.combatDutyName=val.name;
+        this.form.combatDutyPhone=val.phone;
     }
+    //首长电话
+    // chiefDutyNamefun(val){
+    //     this.form.chiefDutyId=val.id;
+    //     this.form.chiefDutyName=val.name;
+    //     this.form.chiefDutyPhone=val.phone;
+    // }
+    // //首长电话
+    // chiefDutyNamefun(val){
+    //     this.form.chiefDutyId=val.id;
+    //     this.form.chiefDutyName=val.name;
+    //     this.form.chiefDutyPhone=val.phone;
+    // }
   }
 };
 </script>