Merge branch 'master' of http://git.xmmakeit.com/zhengyb/emaint-web-master

src/views/commonProblem/index.vue

@@ -372,6 +372,7 @@ export default {
         } else {
         } else {
           this.activeli.id = v[0].id;
           this.activeli.id = v[0].id;
           this.activeli.parentId = v[0].parentId;
           this.activeli.parentId = v[0].parentId;
+          this.searchSubmit()
         }
         }
       }
       }
     },
     },

src/views/workOrderEdit/index.vue

@@ -1184,9 +1184,38 @@ export default {
         that.remarkImgFiles.push(file);
         that.remarkImgFiles.push(file);
       };
       };
     },
     },
-
+    getProblemBaseList (parentId) {
+      this.$request.post(
+        "/api/emaint/problem-base/list",
+        qs.stringify({ parentId, label: '0' }),
+        res => {
+          if (res.statusCode === 200) {
+            this.questionList = res.responseResult;
+          }
+        },
+        res => { }
+      );
+    },
     // 加载常见问题
     // 加载常见问题
     getQuestionList (val) {
     getQuestionList (val) {
+      if (this.formItem.problemClass == '' || this.formItem.problemClass == null) {
+        this.$Message.error(
+          "请先选择一级菜单！"
+        );
+        return
+      }
+      let arr = this.sublevelList.filter(item => item.problem === val)
+      this.$request.post(
+        "/api/emaint/problem-base/list",
+        qs.stringify({ parentId: arr[0].id, label: '0' }),
+        res => {
+          if (res.statusCode === 200) {
+            this.questionList = res.responseResult;
+          }
+        },
+        res => { }
+      );
+      return
       let self = this;
       let self = this;
       this.problemTypeList.forEach(v => {
       this.problemTypeList.forEach(v => {
         if (v.problem == self.formItem.problemType) {
         if (v.problem == self.formItem.problemType) {
@@ -1646,7 +1675,7 @@ export default {
             dataSourceName = '轨道集团'
             dataSourceName = '轨道集团'
           }
           }
           self.workOrder = data
           self.workOrder = data
-          data.repairImgs = data.repairImgs == null ? null : this.getArrImgs(data.repairImgs, '|~|')
+          data.repairImgs = data.repairImgs == null || data.repairImgs == '' ? null : this.getArrImgs(data.repairImgs, '|~|')
           this.formItem = {
           this.formItem = {
             id: data.id,
             id: data.id,
             callID: data.callID,
             callID: data.callID,
@@ -1694,7 +1723,8 @@ export default {
             finishRemark: data.finishRemark,
             finishRemark: data.finishRemark,
             repairEstimate: data.repairEstimate ? data.repairEstimate : {},
             repairEstimate: data.repairEstimate ? data.repairEstimate : {},
             estimateLabel: data.estimateLabel,
             estimateLabel: data.estimateLabel,
-            repairImgs: data.repairImgs
+            repairImgs: data.repairImgs,
+            problemType: data.problemList
           };
           };
           this.getTreeList()
           this.getTreeList()
           // 历史报修
           // 历史报修
@@ -1708,6 +1738,7 @@ export default {
             self.getProblemList()
             self.getProblemList()
             self.getQuestionList()
             self.getQuestionList()
           })
           })
+          this.getProblemBaseList(data.problemBaseId)
 
 
           // 处理参与者id
           // 处理参与者id
           if (data.participatorids) {
           if (data.participatorids) {

src/views/workOrderManage/index.vue

@@ -964,6 +964,16 @@ export default {
       let arr = this.sublevelList.filter(item => item.problem === val)
       let arr = this.sublevelList.filter(item => item.problem === val)
       console.log(arr);
       console.log(arr);
       this.formItem.problemBaseId = arr[0].id
       this.formItem.problemBaseId = arr[0].id
+      this.$request.post(
+        "/api/emaint/problem-base/list",
+        qs.stringify({ parentId: arr[0].id, label: '0' }),
+        res => {
+          if (res.statusCode === 200) {
+            this.questionList = res.responseResult;
+          }
+        },
+        res => { }
+      );
       // console.log(this.formItem.problemType);
       // console.log(this.formItem.problemType);
       // this.childList.forEach(v => {
       // this.childList.forEach(v => {
       //   if (v.problem == this.formItem.problemType) {
       //   if (v.problem == this.formItem.problemType) {