优化

src/views/newIncident.vue

@@ -27,14 +27,11 @@
     >
       <cube-form-group>
         <cube-form-item
-          :field="fields[24]"
-          class="btn_plcaeholde"
-        ></cube-form-item>
-        <cube-form-item
           :field="fields[20]"
           v-if="valConfig == 2"
           class="btn_plcaeholde btn_local"
         >
+          <!-- <cube-button @click="showPlacePicker()">{{selectedPlaceTxt?selectedPlaceTxt:'请输入故障地点'}}</cube-button> -->
           <input
             type="text"
             class="inp_local"
@@ -45,20 +42,6 @@
           />
         </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>
@@ -69,20 +52,43 @@
         <cube-form-item :field="fields[1]"></cube-form-item>
         <cube-form-item :field="fields[2]" class="btn_plcaeholde">
           <cube-button @click="showPlacePicker()">{{
-            selectedPlaceTxt ? selectedPlaceTxt : "请选择院区楼栋"
+            selectedPlaceTxt ? selectedPlaceTxt : "请选择区域地点"
           }}</cube-button>
         </cube-form-item>
         <cube-form-item :field="fields[23]" v-if="ifRoom == 1"></cube-form-item>
+        <!-- 故障地点： -->
+        <!-- <cube-form-item :field="fields[19]" class="btn_plcaeholde btn_local"> -->
+        <!-- <cube-button @click="showPlacePicker()">{{selectedPlaceTxt?selectedPlaceTxt:'请输入故障地点'}}</cube-button> -->
+        <!-- <input
+            type="text"
+            class="inp_local"
+            placeholder="请输入故障地点"
+            v-model="inpLocalVal"
+            @input="changeLocalList()"
+            @click="showPlacePicker()"
+          />
+        </cube-form-item> -->
         <cube-form-item :field="fields[3]"></cube-form-item>
         <cube-form-item :field="fields[4]" class="btn_plcaeholde">
           <cube-button @click="showCategoryPicker()">{{
-            selectedCategoryTxt ? selectedCategoryTxt : "请选择故障现象"
+            selectedCategoryTxt ? selectedCategoryTxt : "请选择事件分类"
           }}</cube-button>
         </cube-form-item>
         <cube-form-item
           :field="fields[5]"
           class="btn_plcaeholde"
         ></cube-form-item>
+        <!-- <cube-form-item :field="fields[6]" class="btn_plcaeholde incidentTitle">
+          <div class="titleRefer">
+            <textarea
+              class="titleTxtArea fl"
+              placeholder="请输入事件主题"
+              v-model="incidentTitle"
+              @input="inpTitle()"
+            ></textarea>
+            <span class="abtn fl" @click="referKnowledge()">引入知识库</span>
+          </div>
+        </cube-form-item>-->
         <cube-form-item :field="fields[7]"></cube-form-item>
         <div class="label formLabel">
           报修图片
@@ -90,8 +96,7 @@
         </div>
         <div class="uplod">
           <cube-upload
-            ref="upload" 
-            v-model="imgFiles"
+            ref="upload"
             :max="3"
             :action="action"
             :simultaneous-uploads="3"
@@ -99,6 +104,8 @@
             @file-submitted="fileSubmitted"
           />
         </div>
+        <!-- <cube-form-item :field="fields[8]" class="btn_plcaeholde"></cube-form-item>
+        <cube-form-item :field="fields[9]" class="btn_plcaeholde"></cube-form-item>-->
         <cube-form-item
           :field="fields[10]"
           class="btn_plcaeholde"
@@ -110,11 +117,6 @@
           ></cube-form-item>
           <span class="icon dash dash-saoyisao zc-sao" @click="scan()"></span>
         </div>
-        <cube-form-item :field="fields[26]" class="btn_plcaeholde">
-          <cube-button @click="showTimePicker()">{{
-            selectedYytimeTxt ? selectedYytimeTxt : "请选择预约时间"
-          }}</cube-button>
-        </cube-form-item>
         <div class="label" id="handlerInfo">处理信息</div>
         <div class="handleRadio">
           <cube-radio-group
@@ -126,11 +128,11 @@
           />
         </div>
         <!-- 直接处理 begin -->
-        <!-- <cube-form-item
+        <cube-form-item
           v-if="order == 1"
           :field="fields[11]"
           class="btn_plcaeholde"
-        ></cube-form-item> -->
+        ></cube-form-item>
         <cube-form-item
           v-if="order == 1"
           :field="fields[12]"
@@ -141,7 +143,7 @@
           :field="fields[13]"
           class="btn_plcaeholde"
         ></cube-form-item>
-        <!-- <div v-if="order == 1" class="label formLabel">
+        <div v-if="order == 1" class="label formLabel">
           报修图片
           <span>(最多可上传3张JPG或PNG,每张不能超过10M)</span>
         </div>
@@ -154,8 +156,8 @@
             @files-added="filesAdded1"
             @file-submitted="fileSubmitted1"
           />
-        </div> -->
-        <!-- <cube-form-item v-if="order == 1" :field="fields[14]"></cube-form-item> -->
+        </div>
+        <cube-form-item v-if="order == 1" :field="fields[14]"></cube-form-item>
         <cube-form-item
           v-if="order == 1 && model.knowledge == true"
           :field="fields[15]"
@@ -190,7 +192,6 @@
   </div>
 </template>
 <script>
-import dateFormat from 'seiminutils/es/dateFormat';
 import seiminModel from "./../custom/seiminModel";
 import CubePage from "./../components/cube-page.vue";
 import CubeButtonGroup from "./../components/cube-button-group.vue";
@@ -213,7 +214,7 @@ const solution = {
     return {
       selected: [],
       selectData: [],
-      initVal: [0, 0, 0],
+      initVal: JSON.parse(localStorage.getItem("solution")) || [0, 0, 0],
       allPlace: {}, //存放请求到的所有区域地点
       sleectHouseNumber: {}, //区域地点
       initSjList: [], //原始事件列表
@@ -250,6 +251,7 @@ const solution = {
       });
       this.selected = selected;
       this.$emit("input", selectedVal);
+      localStorage.setItem("solution", JSON.stringify(selectedIndex));
     },
     // 获取事件分类数据
     getTree() {
@@ -316,11 +318,8 @@ const solution = {
 export default {
   data() {
     return {
-      imgFiles: [],
-      selectDeptIndex:[0],
-      selectUserIndex:[0],
-      selectedPlaceIndex:[0, 0],
       validity: {},
+
       valid: undefined,
       action: {
         target:
@@ -350,28 +349,22 @@ export default {
       incidentTitle: "", //事件主题
       referenceInfo: {}, //引用信息
       placeSelectData: [], //区域地点下拉框选项
-      // inpLocalVal: "", //故障地点输入框
+      inpLocalVal: "", //故障地点输入框
       faultLocationList: [], //区域地点拼接下拉框选项
       deptInpVal: "", //报修科室输入框
       deptList: [], //报修科室下拉选项
       deptRes: "", //下拉框科室信息
-      userInpVal: "", //报修人输入框
-      userList: [], //报修人下拉选项
-      userRes: "", //下拉框报修人信息
       model: {
-        contacts: "",
         contactsInformation: "",
         placeValue: [],
         address: "", //故障地点
         requester: "", //报修科室
-        requesterUser: "", //报修人
         houseNumber: "", //详细地址
         description: "", //事件描述
         // bxcode: "",
         assetId: "", //资产
         category: [],
         source: "", //事件来源
-        branch: "", //院区
         title: "", //事件主题
         priority: "", //优先级
         emergency: "", //紧急度
@@ -384,17 +377,14 @@ export default {
         candidateGroups: "", //处理组
         solutionType: [], //知识库类型
         handleUserOrGroup: false, //处理人or处理组
-        room: "", //房间号
+        room: "" //房间号
       },
       selectedCategoryTxt: "", //事件分类选中展示
       selectedPlaceTxt: "", //区域地点选中展示
-      selectedYytimeTxt: dateFormat(Date.now(),'yyyy-MM-dd hh:mm'), //预约时间
-      selectedYytimeStamp: 0, //预约时间戳
       // showPrompting:false,
       promptingConent: "",
       promptingStatus: "",
       order: 1, //处理方式  1：直接处理，2:派单
-      branchArr: [], //院区数组
       sourceArr: [], //事件来源数组
       priorityArr: [], //优先级数组
       emergencyArr: [], //紧急度数组
@@ -441,12 +431,12 @@ export default {
         {
           component: "button",
           modelKey: "placeValue",
-          label: "院区楼栋:",
+          label: "区域地点:",
           rules: {
             required: false
           },
           messages: {
-            required: "请选择院区楼栋"
+            required: "请选择区域地点"
           }
         },
         {
@@ -464,7 +454,7 @@ export default {
         {
           component: "button",
           modelKey: "category",
-          label: "故障现象:",
+          label: "事件分类:",
           rules: {
             required: true
           }
@@ -482,7 +472,7 @@ export default {
             placeholder: "请选择事件来源"
           },
           rules: {
-            required: false
+            required: true
           }
         },
         {
@@ -500,7 +490,7 @@ export default {
         {
           type: "textarea",
           modelKey: "description",
-          label: "故障描述:",
+          label: "事件描述:",
           props: {
             placeholder: "请详细描述故障，并上传故障图片，例如：网络故障。"
           },
@@ -704,7 +694,7 @@ export default {
           modelKey: "requester",
           label: "报修科室:",
           props: {
-            options: [],
+            options: this.requesterList,
             title: "请选择报修科室",
             placeholder: "请选择报修科室"
           },
@@ -746,56 +736,7 @@ export default {
           rules: {
             required: false
           }
-        },
-        {
-          type: "select",
-          modelKey: "branch",
-          label: "院区:",
-          props: {
-            options: this.branchArr,
-            title: "请选择院区",
-            placeholder: "请选择院区"
-          },
-          events: {
-            change: (value, index, text) => {
-              console.log(value, index, text);
-              console.log(this.model);
-              if (this.valConfig == 2) {
-                this.getDept();
-                this.getAreaData();
-                this.model.contactsInformation = '';
-                this.model.requester = '';
-                this.deptInpVal = '';
-                this.model.placeValue = [];
-                this.selectedPlaceTxt = '';
-              }
-            }
-          },
-          rules: {
-            required: true
-          }
-        },
-        {
-          type: "select",
-          modelKey: "requesterUser",
-          label: "报修人:",
-          props: {
-            options: [],
-            title: "请选择报修人",
-            placeholder: "请选择报修人"
-          },
-          rules: {
-            required: false
-          }
-        },
-        {
-          component: "button",
-          modelKey: "yyTime",
-          label: "预约时间:",
-          rules: {
-            required: false
-          }
-        },
+        }
       ]
     };
   },
@@ -824,28 +765,11 @@ export default {
     }
   },
   methods: {
-    // 选择预约时间
-    showTimePicker() {
-      let timePicker = this.$createTimePicker({
-        title: '选择预约时间',
-        showNow: false,
-        delay: 1,
-        minuteStep: 1,
-        onSelect: (selectedTime, selectedText, formatedTime) => {
-          console.log(selectedTime, selectedText, formatedTime);
-          this.selectedYytimeTxt = formatedTime;
-          this.selectedYytimeStamp = selectedTime;
-        },
-        onCancel: () => {}
-      }).show();
-      timePicker.setTime(this.selectedYytimeStamp)
-    },
     // 切换处理方式
     changeHandleTypes() {
-      // let reverseArr = this.model.category.filter(Boolean).reverse(); //数组翻转，取第一项不为空的
-      // let sjId = reverseArr[0]; //事件Id baba
-      // let sj = this.initSjList.filter(v => v.id == sjId)[0];
-      let sj = this.model.category;
+      let reverseArr = this.model.category.filter(Boolean).reverse(); //数组翻转，取第一项不为空的
+      let sjId = reverseArr[0]; //事件Id baba
+      let sj = this.initSjList.filter(v => v.id == sjId)[0];
       console.log(this.order, sj);
       this.isShowDes = !(this.order == 1 && sj && sj.hasSimple == 1);
     },
@@ -899,33 +823,6 @@ export default {
             });
           });
           that.fields[5].props.options = that.sourceArr;
-          that.model.source = 1547;//默认电话
-        });
-    },
-    // 获取院区
-    getBranch() {
-      this.$http
-        .post("service/user/data/fetchDataList/branch", {"idx":0,"sum":100})
-        .then((res) => {
-          if(res.data.status == 200){
-            res.data.list.forEach((v) => {
-              this.branchArr.push({
-                text: v.hosName,
-                value: v.id
-              });
-            });
-            this.fields[24].props.options = this.branchArr;
-            if(this.loginUser.duty){
-              this.model.branch = this.loginUser.duty.branch;
-            }else if(this.loginUser.branch){
-              this.model.branch = this.loginUser.branch.id;
-            }
-            // 获取报修科室
-            if (this.valConfig == 2) {
-              this.getDept();
-              this.getAreaData();
-            }
-          }
         });
     },
     // 获取优先级
@@ -1016,7 +913,6 @@ export default {
             });
           });
           that.fields[12].props.options = that.closecodeArr;
-          that.model.closecode = 1572;//设计如此，默认“完全解决”
         });
     },
     // 获取处理人
@@ -1067,7 +963,12 @@ export default {
         a2 = [],
         category = [],
         solutionType = [];
-      category = that.model.category;
+      that.model.category.forEach(function(v, i) {
+        if (v) {
+          a1.push(v);
+        }
+      });
+      category = a1;
       that.model.solutionType.forEach(function(v, i) {
         if (v) {
           a2.push(v);
@@ -1188,6 +1089,9 @@ export default {
       var that = this;
       if (!that.model.title) return;
       that.setLocalStroageData();
+      localStorage.setItem("modelData", JSON.stringify(that.modelData));
+      localStorage.setItem("model", JSON.stringify(that.model));
+      localStorage.setItem("order", that.order);
 
       this.$router.push({
         name: "ReferenceList",
@@ -1216,12 +1120,55 @@ export default {
         if (inspecInfo.handlerUser) {
           that.model.handlerUser = inspecInfo.handlerUser.id;
         }
+        // that.modelData.incident.handlingPersonnelUser = {
+        //   id: that.model.handlerUser
+        // };
 
         if (that.$route.params.abnormal) {
           that.model.description = that.modelData.incident.description =
             that.$route.params.abnormal;
         }
-      } else {}
+      } 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;
+        }
+      }
+
+      if (localStorage.getItem("model")) {
+        that.model = JSON.parse(localStorage.getItem("model"));
+        that.incidentTitle = that.model.title;
+      }
+      if (localStorage.getItem("modelData")) {
+        that.modelData = JSON.parse(localStorage.getItem("modelData"));
+      }
+      if (localStorage.getItem("referenceInfo")) {
+        that.referenceInfo = JSON.parse(localStorage.getItem("referenceInfo"));
+        that.incidentTitle = that.model.title = that.referenceInfo.title;
+        that.model.handleDescription = that.referenceInfo.content;
+      }
+      if (localStorage.getItem("order")) {
+        that.order = localStorage.getItem("order") - 0;
+      }
+
+      // if (localStorage.getItem("category")) {
+      //   that.selectedCategoryTxt = JSON.parse(
+      //     localStorage.getItem("category")
+      //   ).txt;
+      //   console.log(that.selectedCategoryTxt);
+      // }
+      // if (localStorage.getItem("place")) {
+      //   that.selectedPlaceTxt = JSON.parse(localStorage.getItem("place")).txt;
+      //   console.log(that.selectedPlaceTxt);
+      // }
     },
     // 提交
     submitHandler() {
@@ -1403,6 +1350,15 @@ export default {
 
       that.validity = result.validity;
       that.valid = result.valid;
+      // if (that.vali == true) {
+      //   $("#fade").fadeIn();
+      //   that.promptingConent = "提交失败,请填写必填信息!";
+      //   that.promptingStatus = false;
+      //   setTimeout(function() {
+      //     $("#fade").fadeOut();
+      //   }, 2000);
+      // }
+      // that.vali = false;
     },
 
     dateSelectHandler(selectedVal) {
@@ -1414,7 +1370,7 @@ export default {
     },
     filesAdded(files) {
       let hasIgnore = false;
-      const maxSize = 10000 * 1024 * 1024; // 1M
+      const maxSize = 1000 * 1024 * 1024; // 1M
       for (let k in files) {
         const file = files[k];
         if (file.size > maxSize) {
@@ -1426,7 +1382,7 @@ export default {
         this.$createToast({
           type: "warn",
           time: 1000,
-          txt: "不能上传超过10M的文件"
+          txt: "不能上传超过100M的文件"
         }).show();
     },
     filesAdded1(files) {
@@ -1454,51 +1410,31 @@ export default {
     },
     // 展示事件分类选择器
     showCategoryPicker() {
-      let other = {
-        selectedPlaceTxt: this.selectedPlaceTxt,
-        userInpVal: this.userInpVal,
-        deptInpVal: this.deptInpVal,
-        selectUserIndex: this.selectUserIndex,
-        selectDeptIndex: this.selectDeptIndex,
-        selectedPlaceIndex: this.selectedPlaceIndex,
-        order: this.order,
-        imgFiles: this.imgFiles,
-        selectedYytimeTxt: this.selectedYytimeTxt,
-        selectedYytimeStamp: this.selectedYytimeStamp,
-      }
-      console.log(this.model, '传');
-      console.log(this.imgFiles);
-      console.log(other)
-      this.$router.push(`/searchDept?model=${JSON.stringify(this.model)}&other=${JSON.stringify(other)}`)
-      // this.categoryPicker.show();
+      this.categoryPicker.show();
     },
     // 选择事件分类
-    selectCategoryHandler() {
-      this.$createDialog({
-        type: 'confirm',
-        icon: 'cubeic-alert',
-        title: '提示',
-        content: '是否覆盖故障描述？',
-        confirmBtn: {
-          text: '确认覆盖',
-          active: true,
-          disabled: false,
-          href: 'javascript:;'
-        },
-        cancelBtn: {
-          text: '取消操作',
-          active: false,
-          disabled: false,
-          href: 'javascript:;'
-        },
-        onConfirm: () => {
-          this.model.description = this.model.title = this.incidentTitle = this.model.category.mutiCategory;
-        },
-        onCancel: () => {}
-      }).show()
-      this.selectedCategoryTxt = this.model.category.mutiCategory;
+    selectCategoryHandler(selectedVal, selectedIndex, selectedTxt) {
+      // console.log(this.initSjList, "事件分类列表");
+      // console.log(this.model.category.slice(-1)[0], "事件分类");
+      var selected = [];
+      selectedTxt.forEach(function(v, i) {
+        if (v != "") {
+          selected.push(v);
+        }
+      });
+      this.selectedCategoryTxt = this.model.title = this.model.description = this.incidentTitle =
+        selected[selected.length - 1];
+      this.model.category = selectedVal;
+      // var category = {
+      //   index: selectedIndex,
+      //   txt: this.selectedCategoryTxt
+      // };
+      // localStorage.setItem("category", JSON.stringify(category));
       // ----------------------回显其他数据---------------------
-      let sj = this.model.category;
+      console.log(selectedVal, "seimin");
+      let reverseArr = selectedVal.filter(Boolean).reverse(); //数组翻转，取第一项不为空的
+      let sjId = reverseArr[0]; //事件Id baba
+      let sj = this.initSjList.filter(v => v.id == sjId)[0];
       console.log(sj);
       this.model.priority = sj.priority?sj.priority.id:null;
       if (sj.branchType == 0) {
@@ -1622,7 +1558,9 @@ export default {
           that.categoryPicker = that.$createCascadePicker({
             title: "事件分类选择",
             data: that.selectData,
-            // selectedIndex: [0, 0, 0],
+            // selectedIndex: localStorage.getItem("category")
+            //   ? JSON.parse(localStorage.getItem("category")).index
+            //   : [0, 0, 0],
             selectedIndex:[0, 0, 0],
             onSelect: that.selectCategoryHandler
           });
@@ -1658,8 +1596,7 @@ export default {
       console.log(selectedVal, selectedIndex, selectedTxt);
       console.log(selectedVal[0], "区域");
       console.log(this.initSjList, "事件分类列表");
-      this.selectedPlaceIndex = selectedIndex;
-      // console.log(this.model.category.slice(-1)[0], "事件分类");
+      console.log(this.model.category.slice(-1)[0], "事件分类");
       if (this.ifRoom == 1) {
         this.getRoomData(selectedVal[1]);
       }
@@ -1667,11 +1604,10 @@ export default {
       this.selectedPlaceTxt = selectedTxt.join(" ");
       // 分院区
       // --------------------start---------------------
-      // let categoryId = this.model.category.slice(-1)[0];
-      let categoryId = this.model.category.id;
+      let categoryId = this.model.category.slice(-1)[0];
       if (categoryId) {
-        // 选择了事件分类
-        let categoryObj = this.model.category;
+        // 选择了事件分类 liaomingming
+        let categoryObj = this.initSjList.find(v => v.id == categoryId);
         if (categoryObj) {
           if (categoryObj.branchType == 1) {
             // 分院区开关打开的情况下
@@ -1720,42 +1656,40 @@ export default {
         this.model.candidateGroups = "";
       }
       // --------------------end---------------------
+      // var place = {
+      //   index: selectedIndex,
+      //   txt: this.model.houseNumber
+      // };
+      // localStorage.setItem("place", JSON.stringify(place));
     },
     // 报修科室
     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[0];
-      this.selectDeptIndex = selectedIndex;
-      if(!selectedVal[0]){
-        return;
-      }
-      let index = selectedIndex[0].toString();
-      this.model.requester = this.deptRes[index];
-      console.log(this.deptRes[index]);
-      console.log(this.model);
-      if(this.deptRes[index].place){
-        console.log(this.placeSelectData);
-        this.model.placeValue = [this.deptRes[index].place.area.id, this.deptRes[index].place.id];
-        this.selectedPlaceTxt = `${this.deptRes[index].place.area.area} ${this.deptRes[index].place.place}`;
-        let areaIndex = this.placeSelectData.findIndex(v=>v.value == this.deptRes[index].place.area.id);
-        let placeIndex = this.placeSelectData[areaIndex].children.findIndex(v=>v.value == this.deptRes[index].place.id);
-        this.placePicker.setData(this.placeSelectData, [areaIndex, placeIndex]);
-      }
-      if (this.deptRes[index].phone) {
-        this.model.contactsInformation = this.deptRes[index].phone;
+      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.model.houseNumber = this.selectedPlaceTxt = selectedTxt.join(" ");
+      // var place = {
+      //   index: selectedIndex,
+      //   txt: this.model.houseNumber
+      // };
+      // localStorage.setItem("place", JSON.stringify(place));
     },
     // 取消选中报修科室
     cancelDeptHandler() {
@@ -1765,53 +1699,12 @@ export default {
         this.deptInpVal = "";
         this.model.requester = "";
       }
-    },
-    // 选中报修人
-    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();
-      console.log(this.model,'model');
-      this.model.contacts = this.userRes[index].name;
-      this.model.requesterUser = this.userRes[index];
-      console.log(this.userRes[index]);
-      // if (this.userRes[index].mphone) {
-      this.$createDialog({
-        type: 'confirm',
-        icon: 'cubeic-alert',
-        title: '提示',
-        content: '是否覆盖联系电话？',
-        confirmBtn: {
-          text: '确认覆盖',
-          active: true,
-          disabled: false,
-          href: 'javascript:;'
-        },
-        cancelBtn: {
-          text: '取消操作',
-          active: false,
-          disabled: false,
-          href: 'javascript:;'
-        },
-        onConfirm: () => {
-          this.model.contactsInformation = this.userRes[index].mphone;
-        },
-        onCancel: () => {}
-      }).show()
-      // }
-    },
-    // 取消选中报修人
-    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 = "";
-      }
+      // this.model.houseNumber = this.selectedPlaceTxt = selectedTxt.join(" ");
+      // var place = {
+      //   index: selectedIndex,
+      //   txt: this.model.houseNumber
+      // };
+      // localStorage.setItem("place", JSON.stringify(place));
     },
     getAreaData() {
       this.$http
@@ -1819,14 +1712,12 @@ export default {
           idx: 0,
           sum: 1000,
           area: {
-            branch: this.model.branch,
             wechatArea: true
           }
         })
         .then(res => {
           this.initAreaList = JSON.parse(JSON.stringify(res.data.list));
           var data = res.data.list;
-          this.placeSelectData = [];
           for (var i = 0; i < data.length; i++) {
             this.placeSelectData.push({
               text: data[i].area,
@@ -1834,7 +1725,6 @@ export default {
               children: []
             });
           }
-          this.getPlaceData();
         });
     },
     getPlaceData() {
@@ -1847,7 +1737,7 @@ export default {
             wechatAreaId: ""
           }
         })
-        .then((res) => {
+        .then(function(res) {
           var data = res.data.list;
           for (var i = 0; i < data.length; i++) {
             for (var j = 0; j < that.placeSelectData.length; j++) {
@@ -1861,37 +1751,14 @@ export default {
           }
 
           that.placePicker = that.$createCascadePicker({
-            title: "院区楼栋选择",
+            title: "区域地点选择",
             data: that.placeSelectData,
-            selectedIndex: this.selectedPlaceIndex || [0, 0],
+            // selectedIndex: localStorage.getItem("place")
+            //   ? JSON.parse(localStorage.getItem("place")).index
+            //   : [0, 0],
             selectedIndex: [0, 0],
             onSelect: that.selectPlaceHandler
           });
-          console.log(this.$route,'路由参数');
-          if(this.$route.params.id){
-            let other = this.$route.params.other;
-            this.model = this.$route.params.model;
-            this.selectedPlaceTxt = other.selectedPlaceTxt;
-            this.userInpVal = other.userInpVal;
-            this.deptInpVal = other.deptInpVal;
-            this.selectUserIndex = other.selectUserIndex;
-            this.selectDeptIndex = other.selectDeptIndex;
-            this.selectedPlaceIndex = other.selectedPlaceIndex;
-            this.order = other.order;
-            this.imgFiles = other.imgFiles;
-            this.selectedYytimeTxt = other.selectedYytimeTxt,
-            this.selectedYytimeStamp = other.selectedYytimeStamp,
-
-
-            this.placePicker.setData(this.placeSelectData, this.selectedPlaceIndex);
-            console.log(this.model);
-            console.log(other);
-            this.selectCategoryHandler();
-            //回显事件分类
-            // this.$http.get(`service/bpm/data/fetchData/incidentcategory/${this.$route.query.id}`).then(res=>{
-            //   console.log(res);
-            // })
-          }
         });
     },
     // 故障地点
@@ -1926,7 +1793,9 @@ export default {
           that.placePicker = that.$createCascadePicker({
             title: "区域地点选择",
             data: that.faultLocationList,
-            // selectedIndex: [0, 0],
+            // selectedIndex: localStorage.getItem("place")
+            //   ? JSON.parse(localStorage.getItem("place")).index
+            //   : [0, 0],
             onSelect: that.selectPlaceHandler
           });
           // that.fields[19].props.options = that.faultLocationList;
@@ -1943,85 +1812,47 @@ export default {
       }, 600);
     },
     // 报修科室
-    getDept(isFirst) {
+    getDept(type) {
+      var that = this;
       this.$http
         .post("service/user/data/fetchDataList/department", {
           idx: 0,
-          sum: 1000,
-          department: {
-            branch: this.model.branch,
-            selectType:"pinyin_qs",
-            dept: isFirst ? '': (this.deptInpVal || "")
-          }
+          sum: 50,
+          department: { dept: that.deptInpVal || "" }
         })
-        .then((res) => {
+        .then(function(res) {
           var data = res.data.list;
-          this.deptRes = res.data.list;
-          this.deptList = [];
-          for (var i = 0; i < data.length; i++) {
-            this.deptList.push({
-              text: data[i].dept,
-              value: data[i].id
-            });
-          }
-          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 || "")
+          if (type == 1) {
+            that.deptList.length = 0;
+            that.$set(that.deptList, true, []);
+            that.deptList;
           }
-        })
-        .then((res) => {
-          var data = res.data.list;
-          this.userRes = res.data.list;
-          this.userList = [];
+          that.deptRes = res.data.list;
           for (var i = 0; i < data.length; i++) {
-            this.userList.push({
-              text: data[i].name + '('+ data[i].account +')',
+            that.deptList.push({
+              text: data[i].dept,
               value: data[i].id
             });
           }
-          console.log(this.userList)
-          this.userPicker.setData(this.userList, isFirst?this.selectUserIndex:[0])
+
+          that.deptPicker = that.$createCascadePicker({
+            title: "报修科室选择",
+            data: that.deptList,
+            onSelect: that.selectDeptHandler,
+            onCancel: that.cancelDeptHandler
+          });
         });
     },
     changeDeptList() {
       var that = this;
       clearTimeout(that.timer);
       that.timer = setTimeout(() => {
-        this.getDept();
-      }, 600);
-    },
-    changeUserList() {
-      clearTimeout(this.timer);
-      this.timer = setTimeout(() => {
-        this.getUser();
+        this.getDept(1);
       }, 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();
     //获取事件来源
     this.getSource();
     // 优先级
@@ -2043,11 +1874,14 @@ export default {
     // 事件单号
     this.getsjnum();
     // 事件分类
-    // this.getIncidentcategory();
-    // this.getAreaData();
-    // this.getPlaceData();
+    this.getIncidentcategory();
+    this.getAreaData();
+    this.getPlaceData();
     // 获取故障地点
     // this.getFaultLocation();
+    if (this.valConfig == 2) {
+      this.getDept();
+    }
   },
   beforeRouteLeave(to, from, next) {
     console.log(to);
@@ -2091,9 +1925,9 @@ export default {
   border: none;
 }
 
-/* .btn_local {
-  z-index: 101;
-} */
+.btn_local {
+  /* z-index: 101; */
+}
 .inp_local {
   outline: none;
   width: 100%;