指派

config/index.js

@@ -14,7 +14,7 @@ module.exports = {
     proxyTable: {
       '/service': {//自定义名字，代表的是以下target中的内容
         // target: host.host+'/service/',//微信
-        target: 'http://weixintest11.ngser.dashitech.com',//微信
+        target: 'http://192.168.3.105',//微信
         changeOrigin: true,//是否允许跨域
         // pathRewrite: {
         //   '^/service': ''

src/components/showModel/showModel.vue

@@ -20,16 +20,30 @@
         <div v-if="info" class="showModel__info">{{ info }}</div>
         <div class="select-wrap" v-if="selectName === 'user'">
           <cube-select
+            v-model="selectBranchId"
+            :options="selectDataBranch"
+            placeholder="请选择院区"
+            @change="changeBranch($event)"
+          ></cube-select>
+          <cube-select
+            v-model="selectDutyId"
+            :options="selectDataDuty"
+            placeholder="请选择责任科室"
+            @change="changeDuty($event)"
+            style="margin-top:0.2rem;"
+          ></cube-select>
+          <cube-select
             v-model="selectGroupId"
             :options="selectDataGroup"
             placeholder="请选择工作组"
             @change="changeGroup($event)"
+            style="margin-top:0.2rem;"
           ></cube-select>
           <cube-select
             v-model="selectUserId"
             :options="selectDataUser"
             placeholder="请选择指派对象"
-            style="margin-top:0.5rem;"
+            style="margin-top:0.2rem;"
           ></cube-select>
         </div>
         <div v-if="textName === 'textarea'">
@@ -73,23 +87,24 @@
 export default {
   data() {
     return {
+      loginUser: JSON.parse(localStorage.getItem("loginUser")),
       logs: [],
       time: 5, //5秒后自动关闭
       timer: null, //5秒后自动关闭，定时器
       timerFlag: true, //是否显示取消自动关闭按钮
       selectDataUser: [], //select数据-用户
-      selectUserId: 0, //select选中的数据-用户
+      selectUserId: undefined, //select选中的数据-用户
       selectDataGroup: [], //select数据-工作组
-      selectGroupId: 0, //select选中的数据-工作组
+      selectGroupId: undefined, //select选中的数据-工作组
+      selectDataBranch: [], //select数据-院区
+      selectBranchId: undefined, //select选中的数据-院区
+      selectDataDuty: [], //select数据-责任科室
+      selectDutyId: undefined, //select选中的数据-责任科室
       textareaData: "" //textarea的数据
     };
   },
   watch: {
     disjunctor(newValue) {
-      if (newValue && this.selectName === "user") {
-        this.selectGroupId = 0;
-        this.selectUserId = 0;
-      }
       if (newValue && this.textName === "textarea") {
         this.textareaData = "";
       }
@@ -168,6 +183,16 @@ export default {
     changeGroup(groupId) {
       this.getZpUser(groupId);
     },
+    //选择院区
+    changeBranch(branchId) {
+      console.log(branchId);
+      this.getZpDuty(branchId);
+    },
+    //选择责任科室
+    changeDuty(dutyId) {
+      console.log(dutyId);
+      this.getZpGroup(dutyId);
+    },
     // 获取指派对象
     getZpUser(groupId) {
       this.selectDataUser = [];
@@ -197,12 +222,17 @@ export default {
         });
     },
     // 获取工作组
-    getZpGroup() {
+    getZpGroup(dutyId) {
       this.selectDataGroup = [];
+      this.selectDataUser = [];
+      this.selectUserId = undefined;
       var postData = {
         idx: 0,
         sum: 1000,
-        group: {}
+        group: {
+          duty:{id:dutyId},
+          selectType: "nouser"
+        }
       };
       this.$http
         .post("service/user/data/fetchDataList/group", postData)
@@ -216,6 +246,63 @@ export default {
           });
         });
     },
+    // 获取院区
+    getZpBranch() {
+      this.selectDataBranch = [];
+      this.selectDataBranch = [];
+      this.selectBranchId = undefined;
+      this.selectDataGroup = [];
+      this.selectGroupId = undefined;
+      this.selectDataUser = [];
+      this.selectUserId = undefined;
+      var postData = {
+        idx: 0,
+        sum: 1000
+      };
+      this.$http
+        .post("service/user/data/fetchDataList/branch", postData)
+        .then(res => {
+          res.data.list = res.data.list || [];
+          this.selectDataBranch = res.data.list.map(v => {
+            return {
+              text: v.hosName,
+              value: v.id
+            };
+          });
+          if(this.loginUser.duty){
+            this.selectBranchId = this.loginUser.duty.branch;
+          }else if(this.loginUser.branch){
+            this.selectBranchId = this.loginUser.branch?this.loginUser.branch.id:undefined;
+          }
+          this.getZpDuty(this.selectBranchId);
+        });
+    },
+    // 获取责任科室
+    getZpDuty(branchId) {
+      this.selectDataDuty = [];
+      this.selectDataGroup = [];
+      this.selectGroupId = undefined;
+      this.selectDataUser = [];
+      this.selectUserId = undefined;
+      var postData = {
+        idx: 0,
+        sum: 1000,
+        dutyDepartment:{
+          branch:branchId
+        }
+      };
+      this.$http
+        .post("service/user/data/fetchDataList/dutyDepartment", postData)
+        .then(res => {
+          res.data.list = res.data.list || [];
+          this.selectDataDuty = res.data.list.map(v => {
+            return {
+              text: v.dept,
+              value: v.id
+            };
+          });
+        });
+    },
     // 单选框选中
     radioChange(item) {
       this.$emit("radioChange", item.target.value);
@@ -247,8 +334,9 @@ export default {
   },
   created() {
     if (this.selectName === "user") {
-      this.getZpGroup();
-      this.getZpUser();
+      this.getZpBranch();
+      // this.getZpGroup();
+      // this.getZpUser();
     }
     if (this.textName === "textarea") {
       this.getLogs();

src/views/incidentList.vue

@@ -144,7 +144,8 @@
     </div>
     <load-ing v-show="loadShow"></load-ing>
     <!-- 指派弹窗 -->
-    <showModel
+    <showModel 
+      v-if="models.disjunctor"
       :title="models.title"
       :icon="models.icon"
       :disjunctor="models.disjunctor"