工号绑定

config/index.js

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

src/views/Login.vue

@@ -74,7 +74,8 @@ export default {
         that.login();
       } else {
         var code = {
-          code: url[1]
+          code: url[1],
+          type: 'user',
           // name: "微信处理人"
         };
         // alert("2--传code参数：");
@@ -104,6 +105,32 @@ export default {
                 icon: "cubeic-alert"
               })
               .show();
+          } else if (res.data.state == 403) {
+            // 没有填写微信和工号
+            this.$createDialog({
+              type: 'prompt',
+              title: '请填写工号',
+              prompt: {
+                value: '',
+                placeholder: '请填写工号'
+              },
+              onConfirm: (e, promptValue) => {
+                console.log(e, promptValue);
+                that.$http.post("service/auth/bindAccount", {account:promptValue,wechat:res.data.wechat}).then(res1=>{
+                  if(res1.data.status == 403){
+                    that
+                      .$createDialog({
+                        type: "alert",
+                        title: '请联系管理员进行添加',
+                        icon: "cubeic-alert"
+                      })
+                      .show();
+                  }else{
+                     this.login();
+                  }
+                })
+              }
+            }).show()
           } else {
             that
               .$createDialog({

src/views/newIncident.vue

@@ -35,7 +35,6 @@
           v-if="valConfig == 2"
           class="btn_plcaeholde btn_local"
         >
-          <!-- <cube-button @click="showPlacePicker()">{{selectedPlaceTxt?selectedPlaceTxt:'请输入故障地点'}}</cube-button> -->
           <input
             type="text"
             class="inp_local"
@@ -46,6 +45,20 @@
           />
         </cube-form-item>
         <cube-form-item
+          :field="fields[25]"
+          v-if="valConfig == 2"
+          class="btn_plcaeholde btn_local"
+        >
+          <input
+            type="text"
+            class="inp_local"
+            placeholder="请输入报修人"
+            v-model="userInpVal"
+            @input="changeUserList()"
+            @click="showUserPicker()"
+          />
+        </cube-form-item>
+        <cube-form-item
           v-if="valConfig == 1"
           :field="fields[0]"
         ></cube-form-item>
@@ -322,8 +335,9 @@ const solution = {
 export default {
   data() {
     return {
+      selectDeptIndex:[0],
+      selectUserIndex:[0],
       validity: {},
-
       valid: undefined,
       action: {
         target:
@@ -353,16 +367,20 @@ export default {
       incidentTitle: "", //事件主题
       referenceInfo: {}, //引用信息
       placeSelectData: [], //区域地点下拉框选项
-      inpLocalVal: "", //故障地点输入框
+      // inpLocalVal: "", //故障地点输入框
       faultLocationList: [], //区域地点拼接下拉框选项
       deptInpVal: "", //报修科室输入框
       deptList: [], //报修科室下拉选项
       deptRes: "", //下拉框科室信息
+      userInpVal: "", //报修人输入框
+      userList: [], //报修人下拉选项
+      userRes: "", //下拉框报修人信息
       model: {
         contactsInformation: "",
         placeValue: [],
         address: "", //故障地点
         requester: "", //报修科室
+        requesterUser: "", //报修人
         houseNumber: "", //详细地址
         description: "", //事件描述
         // bxcode: "",
@@ -700,7 +718,7 @@ export default {
           modelKey: "requester",
           label: "报修科室:",
           props: {
-            options: this.requesterList,
+            options: [],
             title: "请选择报修科室",
             placeholder: "请选择报修科室"
           },
@@ -752,10 +770,32 @@ export default {
             title: "请选择院区",
             placeholder: "请选择院区"
           },
+          events: {
+            change: (value, index, text) => {
+              console.log(value, index, text);
+              console.log(this.model);
+              if (this.valConfig == 2) {
+                this.getDept();
+              }
+            }
+          },
           rules: {
             required: true
           }
         },
+        {
+          type: "select",
+          modelKey: "requesterUser",
+          label: "报修人:",
+          props: {
+            options: [],
+            title: "请选择报修人",
+            placeholder: "请选择报修人"
+          },
+          rules: {
+            required: false
+          }
+        },
       ]
     };
   },
@@ -862,6 +902,10 @@ export default {
             }else if(this.loginUser.branch){
               this.model.branch = this.loginUser.branch.id;
             }
+            // 获取报修科室
+            // if (this.valConfig == 2) {
+            //   this.getDept();
+            // }
           }
         });
     },
@@ -1170,19 +1214,19 @@ export default {
             that.$route.params.abnormal;
         }
       } else {
-        that.name = that.loginUser.name;
-        that.model.contactsInformation = that.loginUser.phone;
-        that.model.contacts = that.loginUser.name;
-        that.model.houseNumber = that.loginUser.houseNumber;
-      }
-      if (that.loginUser.place && that.loginUser.place.length) {
-        if (that.loginUser.place.id) {
-          if (that.loginUser.place.area) {
-            that.model.placeValue[0] = that.loginUser.place.area.id;
-          }
-          that.model.placeValue[1] = that.loginUser.place.id;
-        }
+        // that.name = that.loginUser.name;
+        // that.model.contactsInformation = that.loginUser.phone;
+        // that.model.contacts = that.loginUser.name;
+        // that.model.houseNumber = that.loginUser.houseNumber;
       }
+      // if (that.loginUser.place && that.loginUser.place.length) {
+      //   if (that.loginUser.place.id) {
+      //     if (that.loginUser.place.area) {
+      //       that.model.placeValue[0] = that.loginUser.place.area.id;
+      //     }
+      //     that.model.placeValue[1] = that.loginUser.place.id;
+      //   }
+      // }
 
       if (localStorage.getItem("model")) {
         that.model = JSON.parse(localStorage.getItem("model"));
@@ -1705,25 +1749,38 @@ export default {
     },
     // 报修科室
     showDeptPicker() {
+      this.deptList = [];
       this.deptPicker.show();
+      this.getDept(true);
+    },
+    // 报修人
+    showUserPicker() {
+      this.userList = [];
+      this.userPicker.show();
+      this.getUser(true);
     },
     // 选中报修科室
     selectDeptHandler(selectedVal, selectedIndex, selectedTxt) {
       console.log(selectedVal, selectedIndex, selectedTxt);
-      this.deptInpVal = selectedTxt;
-      this.model.requester = this.deptRes[selectedIndex];
-      console.log(this.deptRes[selectedIndex]);
-      this.inpLocalVal = this.model.address = this.deptRes[selectedIndex].place
-        .area
-        ? this.deptRes[selectedIndex].place.area.area
-          ? this.deptRes[selectedIndex].place.place
-            ? this.deptRes[selectedIndex].place.area.area +
-              this.deptRes[selectedIndex].place.place
-            : this.deptRes[selectedIndex].place.area.area
-          : this.deptRes[selectedIndex].place.area
-        : this.deptRes[selectedIndex].place.place;
-      if (this.deptRes[selectedIndex].phone) {
-        this.model.contactsInformation = this.deptRes[selectedIndex].phone;
+      this.deptInpVal = selectedTxt[0];
+      this.selectDeptIndex = selectedIndex;
+      if(!selectedVal[0]){
+        return;
+      }
+      let index = selectedIndex[0].toString();
+      this.model.requester = this.deptRes[index];
+      console.log(this.deptRes[index]);
+      // this.inpLocalVal = this.model.address = this.deptRes[index].place
+      //   .area
+      //   ? this.deptRes[index].place.area.area
+      //     ? this.deptRes[index].place.place
+      //       ? this.deptRes[index].place.area.area +
+      //         this.deptRes[index].place.place
+      //       : this.deptRes[index].place.area.area
+      //     : this.deptRes[index].place.area
+      //   : this.deptRes[index].place.place;
+      if (this.deptRes[index].phone) {
+        this.model.contactsInformation = this.deptRes[index].phone;
       }
       // this.model.houseNumber = this.selectedPlaceTxt = selectedTxt.join(" ");
       // var place = {
@@ -1747,6 +1804,30 @@ export default {
       // };
       // localStorage.setItem("place", JSON.stringify(place));
     },
+    // 选中报修人
+    selectUserHandler(selectedVal, selectedIndex, selectedTxt) {
+      console.log(selectedVal, selectedIndex, selectedTxt);
+      this.userInpVal = selectedTxt[0];
+      this.selectUserIndex = selectedIndex;
+      if(!selectedVal[0]){
+        return;
+      }
+      let index = selectedIndex[0].toString();
+      this.model.requesterUser = this.userRes[index];
+      console.log(this.userRes[index]);
+      if (this.userRes[index].phone) {
+        this.model.contactsInformation = this.userRes[index].phone;
+      }
+    },
+    // 取消选中报修人
+    cancelUserHandler() {
+      if (this.model.requesterUser) {
+        this.userInpVal = this.model.requesterUser.name + '('+ this.model.requesterUser.account +')';
+      } else if (!this.model.requesterUser) {
+        this.userInpVal = "";
+        this.model.requesterUser = "";
+      }
+    },
     getAreaData() {
       this.$http
         .post("service/user/data/fetchDataList/area", {
@@ -1853,47 +1934,83 @@ export default {
       }, 600);
     },
     // 报修科室
-    getDept(type) {
-      var that = this;
+    getDept(isFirst) {
       this.$http
         .post("service/user/data/fetchDataList/department", {
           idx: 0,
-          sum: 50,
-          department: { dept: that.deptInpVal || "" }
+          sum: 1000,
+          department: {
+            branch: this.model.branch,
+            selectType:"pinyin_qs",
+            dept: isFirst ? '': (this.deptInpVal || "")
+          }
         })
-        .then(function(res) {
+        .then((res) => {
           var data = res.data.list;
-          if (type == 1) {
-            that.deptList.length = 0;
-            that.$set(that.deptList, true, []);
-            that.deptList;
-          }
-          that.deptRes = res.data.list;
+          this.deptRes = res.data.list;
+          this.deptList = [];
           for (var i = 0; i < data.length; i++) {
-            that.deptList.push({
+            this.deptList.push({
               text: data[i].dept,
               value: data[i].id
             });
           }
-
-          that.deptPicker = that.$createCascadePicker({
-            title: "报修科室选择",
-            data: that.deptList,
-            onSelect: that.selectDeptHandler,
-            onCancel: that.cancelDeptHandler
-          });
+          console.log(this.deptList)
+          this.deptPicker.setData(this.deptList, isFirst?this.selectDeptIndex:[0])
+        });
+    },
+    // 报修人
+    getUser(isFirst) {
+      this.$http
+        .post("service/user/data/fetchDataList/requester", {
+          idx: 0,
+          sum: 1000,
+          requester: {
+            searchKey: isFirst ? '': (this.userInpVal || "")
+          }
+        })
+        .then((res) => {
+          var data = res.data.list;
+          this.userRes = res.data.list;
+          this.userList = [];
+          for (var i = 0; i < data.length; i++) {
+            this.userList.push({
+              text: data[i].name + '('+ data[i].account +')',
+              value: data[i].id
+            });
+          }
+          console.log(this.userList)
+          this.userPicker.setData(this.userList, isFirst?this.selectUserIndex:[0])
         });
     },
     changeDeptList() {
       var that = this;
       clearTimeout(that.timer);
       that.timer = setTimeout(() => {
-        this.getDept(1);
+        this.getDept();
+      }, 600);
+    },
+    changeUserList() {
+      clearTimeout(this.timer);
+      this.timer = setTimeout(() => {
+        this.getUser();
       }, 600);
     }
   },
   created() {
     console.log(this.$route.params.data);
+    this.deptPicker = this.$createCascadePicker({
+      title: "报修科室选择",
+      data: this.deptList,
+      onSelect: this.selectDeptHandler,
+      onCancel: this.cancelDeptHandler
+    });
+    this.userPicker = this.$createCascadePicker({
+      title: "报修人选择",
+      data: this.userList,
+      onSelect: this.selectUserHandler,
+      onCancel: this.cancelUserHandler
+    });
     //获取院区
     this.getBranch();
     //获取事件来源
@@ -1922,9 +2039,6 @@ export default {
     this.getPlaceData();
     // 获取故障地点
     // this.getFaultLocation();
-    if (this.valConfig == 2) {
-      this.getDept();
-    }
   },
   beforeRouteLeave(to, from, next) {
     console.log(to);
@@ -1968,9 +2082,9 @@ export default {
   border: none;
 }
 
-.btn_local {
-  /* z-index: 101; */
-}
+/* .btn_local {
+  z-index: 101;
+} */
 .inp_local {
   outline: none;
   width: 100%;