修改

CallCenterWeb.UI/RMYY/src/components/button/orderList.vue

@@ -284,8 +284,8 @@
           <el-rate v-model="consumablesConfirmForm.Efficiency" :texts="evaluateText" show-text />
         </el-form-item>
         <el-form-item v-show="consumablesConfirmForm.confirmtype=='1'" label="文字评价" prop="EvaluateContent">
-          <el-input :autosize="{ minRows: 4, maxRows: 8 }" v-model="consumablesConfirmForm.EvaluateContent" show-word-limit
-            maxlength="100" type="textarea" />
+          <el-input :autosize="{ minRows: 4, maxRows: 8 }" v-model="consumablesConfirmForm.EvaluateContent"
+            show-word-limit maxlength="100" type="textarea" />
         </el-form-item>
         <!-- 有误返修 -->
         <el-form-item v-show="consumablesConfirmForm.confirmtype=='0'" label="返修原因">
@@ -295,8 +295,8 @@
           </el-select>
         </el-form-item>
         <el-form-item v-show="consumablesConfirmForm.confirmtype=='0'">
-          <el-input placeholder="请输入其他返修原因" :autosize="{ minRows: 4, maxRows: 8 }" v-model="consumablesConfirmForm.ReturnReason" show-word-limit
-            maxlength="100" type="textarea" />
+          <el-input placeholder="请输入其他返修原因" :autosize="{ minRows: 4, maxRows: 8 }"
+            v-model="consumablesConfirmForm.ReturnReason" show-word-limit maxlength="100" type="textarea" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -459,8 +459,9 @@
           <el-input placeholder="科室交接人" v-model="dealWorkForm.recipient"></el-input>
         </el-form-item>
         <el-form-item label="附件" v-if="bbtags.indexOf('急查标本') < 0">
-          <el-upload :before-upload="beforeUpload" :headers="headers" :on-remove="handle_remove" :on-success="handle_success"
-            :file-list="dealWorkFormFile" :action="imgUrl" list-type="picture-card" accept=".mp4, .jpg, .jpeg, .png">
+          <el-upload :before-upload="beforeUpload" :headers="headers" :on-remove="handle_remove"
+            :on-success="handle_success" :file-list="dealWorkFormFile" :action="imgUrl" list-type="picture-card"
+            accept=".mp4, .jpg, .jpeg, .png">
             <i class="el-icon-plus" />
           </el-upload>
         </el-form-item>
@@ -521,8 +522,9 @@
           <el-input placeholder="科室交接人" v-model="dealEditWorkForm.recipient"></el-input>
         </el-form-item>
         <el-form-item label="附件" v-if="bbtags.indexOf('急查标本') < 0">
-          <el-upload :before-upload="beforeUpload" :headers="headers" :on-remove="handle_removeEdit" :on-success="handle_successEdit"
-            :file-list="dealEditWorkFormFile" :action="imgUrl" list-type="picture-card" accept=".mp4, .jpg, .jpeg, .png">
+          <el-upload :before-upload="beforeUpload" :headers="headers" :on-remove="handle_removeEdit"
+            :on-success="handle_successEdit" :file-list="dealEditWorkFormFile" :action="imgUrl" list-type="picture-card"
+            accept=".mp4, .jpg, .jpeg, .png">
             <i class="el-icon-plus" />
           </el-upload>
         </el-form-item>
@@ -546,8 +548,9 @@
           <el-input-number v-model="collectForm.fjcnum" :min="0" size="medium" class="inputNumber" />
         </el-form-item>
         <el-form-item label="附件">
-          <el-upload :before-upload="beforeUpload" :headers="headers" :on-remove="handle_removecol" :on-success="handle_successcol"
-            :file-list="collectFormFile" :action="imgUrl" list-type="picture-card" accept=".mp4, .jpg, .jpeg, .png">
+          <el-upload :before-upload="beforeUpload" :headers="headers" :on-remove="handle_removecol"
+            :on-success="handle_successcol" :file-list="collectFormFile" :action="imgUrl" list-type="picture-card"
+            accept=".mp4, .jpg, .jpeg, .png">
             <i class="el-icon-plus" />
           </el-upload>
         </el-form-item>
@@ -853,9 +856,9 @@
           dialog_zhdd_finish: false,
           dialog_gzbx_finish: false,
           dialog_cldd_finish: false,
-          dialog_ywzx_wanjie:false,
-          dialog_zhdd_wanjie:false,
-          dialog_gzbx_wanjie:false,
+          dialog_ywzx_wanjie: false,
+          dialog_zhdd_wanjie: false,
+          dialog_gzbx_wanjie: false,
           dialog_dispatch_jiedan: {
             text: "确定接单吗？",
             action: postDispatchCheckWorkOrder,
@@ -908,6 +911,7 @@
         transferForm: {
           todept: "",
           tousercode: "",
+          datetime: ""
         },
         zhddtransferForm: {
           DealMan: "",
@@ -944,7 +948,7 @@
           confirmtype: "1",
           reason: "",
         },
-        consumablesConfirmForm:{
+        consumablesConfirmForm: {
           confirmtype: "1",
           Attitude: 0,
           Quality: 0,
@@ -953,7 +957,7 @@
           ReturnReason: "",
           key: "",
           value: "",
-          youwureason:""
+          youwureason: ""
         },
         backWorkForm: {
           key: "",
@@ -982,7 +986,7 @@
         dealWorkForm: {
           file: "",
           remark: "",
-          recipient:"",
+          recipient: "",
           isabnormal: "0",
         },
         dealEditWorkForm: {
@@ -1000,7 +1004,7 @@
         zhddbackWorkForm: {
           BackReason: "",
         },
-        finishtitle:"完成",
+        finishtitle: "完成",
         finishForm: {
           type: "",
           reason: "",
@@ -1074,6 +1078,31 @@
       this.getTreebiaoben();
     },
     methods: {
+      getNowDate() {
+        var dt = new Date();
+        var y = dt.getFullYear();
+        var mt = dt.getMonth() + 1;
+        if (mt < 10) {
+          mt = '0' + mt
+        }
+        var day = dt.getDate();
+        if (day < 10) {
+          day = '0' + day
+        }
+        var h = dt.getHours(); //获取时
+        if (h < 10) {
+          h = '0' + h
+        }
+        var m = dt.getMinutes(); //获取分
+        if (m < 10) {
+          m = '0' + m
+        }
+        var s = dt.getSeconds(); //获取秒
+        if (s < 10) {
+          s = '0' + s
+        }
+        return y + '-' + mt + '-' + day + ' ' + h + ':' + m + ':' + s
+      },
       getReason(flag) {
         const params = {
           Flag: flag,
@@ -1151,20 +1180,20 @@
           this.dispatchhaocaiarrEdit[index].F_DicName = ""
         }
       },
-      changeConfirmType(val){
-        if(val == "1"){
+      changeConfirmType(val) {
+        if (val == "1") {
           this.reason5 = ""
           this.consumablesConfirmForm.key = ""
           this.consumablesConfirmForm.value = ""
           this.consumablesConfirmForm.ReturnReason = ""
-        }else{
+        } else {
           this.consumablesConfirmForm.Attitude = 0
           this.consumablesConfirmForm.Quality = 0
           this.consumablesConfirmForm.Efficiency = 0
           this.consumablesConfirmForm.EvaluateContent = ""
         }
       },
-      handleChange5(data){
+      handleChange5(data) {
         this.consumablesConfirmForm.key = data.split(",")[0];
         this.consumablesConfirmForm.value = data.split(",")[1];
       },
@@ -1185,19 +1214,21 @@
         this.zhddBackForm.value = data.split(",")[1];
       },
       //上传附件验证
-      beforeUpload(file){
+      beforeUpload(file) {
         const FILE_NAME = file.name
-          if (FILE_NAME.substring(FILE_NAME.lastIndexOf('.')) !== '.mp4' && FILE_NAME.substring(FILE_NAME.lastIndexOf('.')) !== '.jpg' && FILE_NAME.substring(FILE_NAME.lastIndexOf('.')) !== '.jpeg' && FILE_NAME.substring(FILE_NAME.lastIndexOf('.')) !== '.png') {
-            this.$message.warning('仅支持.mp4,.jpg,.jpeg,.png文件')
-            return false
-          }
-          const isLt1M = file.size / 1024 / 1024 < 20
-          if (isLt1M) {
-            this.file = file
-            return true
-          }
-          this.$message.warning('请上传不超过20M的文件.')
+        if (FILE_NAME.substring(FILE_NAME.lastIndexOf('.')) !== '.mp4' && FILE_NAME.substring(FILE_NAME.lastIndexOf(
+            '.')) !== '.jpg' && FILE_NAME.substring(FILE_NAME.lastIndexOf('.')) !== '.jpeg' && FILE_NAME.substring(
+            FILE_NAME.lastIndexOf('.')) !== '.png') {
+          this.$message.warning('仅支持.mp4,.jpg,.jpeg,.png文件')
           return false
+        }
+        const isLt1M = file.size / 1024 / 1024 < 20
+        if (isLt1M) {
+          this.file = file
+          return true
+        }
+        this.$message.warning('请上传不超过20M的文件.')
+        return false
       },
       handle_success(res) {
         this.dealWorkForm.file += res.data[0].F_FileId + ",";
@@ -1258,7 +1289,7 @@
           if (res.data.length > 0 && res.data[0].F_OperationType == 9 && res.data[0].F_LogContent.length > 3) {
             this.dealEditWorkForm.remark = res.data[0].F_LogContent.slice(res.data[0].F_LogContent.indexOf(',') + 1,
               res.data[0].F_LogContent.length)
-          }else{
+          } else {
             this.dealEditWorkForm.remark = ""
           }
         })
@@ -1358,6 +1389,7 @@
         this.fid = row.F_ID;
         this.rowdata = row;
         console.log(name, "name");
+        console.log(this.getNowDate());
         if (name === "dispatch_zhuantongshi") {
           console.log(111);
           // 综合调度转同事
@@ -1608,7 +1640,7 @@
         if (name === "gzbx_wanjie") {
           this.finishForm.type = 3000;
         }
-        if(name === "ywzx_wanjie" || name === "zhdd_wanjie" || name === "gzbx_wanjie"){
+        if (name === "ywzx_wanjie" || name === "zhdd_wanjie" || name === "gzbx_wanjie") {
           this.finishtitle = "完结"
         }
         if (this.dialogStatus[`dialog_${name}`] === false) {
@@ -1735,7 +1767,7 @@
           const params = {
             deptid: id, // 字典管理的工单标识
           };
-          GetPerson(params).then((res) => {
+          getClassByDeptId(params).then((res) => {
             if (state === 0) {
               this.repairman = res.rows;
             } else if (state === 1) {
@@ -1750,7 +1782,7 @@
           const params = {
             deptid: id, // 字典管理的工单标识
           };
-          GetPerson(params).then((res) => {
+          getClassByDeptId(params).then((res) => {
             this.zhddrepairman = res.rows;
           });
           resolve();
@@ -1761,7 +1793,7 @@
           const params = {
             deptid: id, // 字典管理的工单标识
           };
-          GetPerson(params).then((res) => {
+          getClassByDeptId(params).then((res) => {
             this.dispatchrepairman = res.rows;
           });
           resolve();
@@ -1783,6 +1815,9 @@
       submitForm(formName) {
         // console.log(this.dispatchhaocaiarrError)
         // return;
+        if (formName === "transferForm"){
+          this.transferForm.datetime = this.getNowDate()
+        }
         if (formName === "dealWorkForm") {
           if (this.dispatchhaocaiarrError.length > 0) {
             if (this.dealWorkForm.isabnormal === '1' && this.bbtags.indexOf('急查标本') >= 0) {
@@ -1825,7 +1860,7 @@
           this.zhddtransferForm.detailists = arrlist;
         }
         if (formName === "evaluateForm") {
-          if(this.evaluateForm.Attitude == 0 || this.evaluateForm.Quality == 0 || this.evaluateForm.Efficiency == 0){
+          if (this.evaluateForm.Attitude == 0 || this.evaluateForm.Quality == 0 || this.evaluateForm.Efficiency == 0) {
             this.$message.warning("请选择星级评价");
             return;
           }
@@ -1841,7 +1876,8 @@
           }
         }
         if (formName === "schedulingEvaluateForm") {
-          if(this.schedulingEvaluateForm.Attitude == 0 || this.schedulingEvaluateForm.Quality == 0 || this.schedulingEvaluateForm.Efficiency == 0){
+          if (this.schedulingEvaluateForm.Attitude == 0 || this.schedulingEvaluateForm.Quality == 0 || this
+            .schedulingEvaluateForm.Efficiency == 0) {
             this.$message.warning("请选择星级评价");
             return;
           }
@@ -1857,7 +1893,8 @@
           }
         }
         if (formName === "carEvaluteForm") {
-          if(this.carEvaluteForm.Attitude == 0 || this.carEvaluteForm.Quality == 0 || this.carEvaluteForm.Efficiency == 0){
+          if (this.carEvaluteForm.Attitude == 0 || this.carEvaluteForm.Quality == 0 || this.carEvaluteForm.Efficiency ==
+            0) {
             this.$message.warning("请选择星级评价");
             return;
           }
@@ -1872,20 +1909,22 @@
             }
           }
         }
-        if(formName === "consumablesConfirmForm"){
-          if(this.consumablesConfirmForm.confirmtype == '1'){//无误
-            if(this.consumablesConfirmForm.Attitude == 0 || this.consumablesConfirmForm.Quality == 0 || this.consumablesConfirmForm.Efficiency == 0){
+        if (formName === "consumablesConfirmForm") {
+          if (this.consumablesConfirmForm.confirmtype == '1') { //无误
+            if (this.consumablesConfirmForm.Attitude == 0 || this.consumablesConfirmForm.Quality == 0 || this
+              .consumablesConfirmForm.Efficiency == 0) {
               this.$message.warning("请选择星级评价");
               return;
             }
-            if(this.consumablesConfirmForm.Attitude < 3 || this.consumablesConfirmForm.Quality < 3 || this.consumablesConfirmForm.Efficiency < 3) {
+            if (this.consumablesConfirmForm.Attitude < 3 || this.consumablesConfirmForm.Quality < 3 || this
+              .consumablesConfirmForm.Efficiency < 3) {
               if (this.consumablesConfirmForm.EvaluateContent === "") {
                 this.$message.warning("请输入文字评价");
                 return;
               }
             }
-          }else{//有误
-            if(!this.reason5){
+          } else { //有误
+            if (!this.reason5) {
               this.$message.warning("请选择原因");
               return;
             }
@@ -1908,7 +1947,7 @@
                 this.dealWorkForm.recipient = "";
                 this.dealWorkForm.isabnormal = "";
               }
-              if(this.dealWorkForm.isabnormal == "0"){
+              if (this.dealWorkForm.isabnormal == "0") {
                 this.dealWorkForm.pslist = [];
                 this.dealWorkForm.recipient = ""
               }
@@ -1930,7 +1969,7 @@
                 this.dealEditWorkForm.recipient = "";
                 this.dealEditWorkForm.isabnormal = "";
               }
-              if(this.dealEditWorkForm.isabnormal == "0"){
+              if (this.dealEditWorkForm.isabnormal == "0") {
                 this.dealEditWorkForm.pslist = [];
                 this.dealEditWorkForm.recipient = ""
               }
@@ -2092,7 +2131,7 @@
                       type: "success",
                       message: "操作成功!",
                     });
-                    if(this.optionName == 'repairconfirm'){
+                    if (this.optionName == 'repairconfirm') {
                       this.consumablesConfirmForm.confirmtype = "1"
                       this.consumablesConfirmForm.Attitude = 0
                       this.consumablesConfirmForm.Efficiency = 0

CallCenterWeb.UI/RMYY/src/components/context/Dialplate/index.vue

@@ -470,13 +470,16 @@ export default {
       this.telNumber = this.telNumber.substr(0, this.telNumber.length - 1);
       if (this.telNumber.length === 0) {
         this.isShowDelNum = false;
+        store.dispatch('ChangeCallNum', this.telNumber)
+      }
+    },
+    callOutInssput() {
+      this.telNumber = this.telNumber.substr(0, this.telNumber.length - 1);
+      if (this.telNumber.length === 0) {
+        this.isShowDelNum = false;
+        store.dispatch('ChangeCallNum', this.telNumber)
       }
-      // store.dispatch('ChangeCallNum', this.telNumber)
     },
-    // callOutInssput() {
-    //   console.log(11122)
-    //   this.getCallList()
-    // },
     // 外呼
     callOut() {
       if (this.telNumber) {

CallCenterWeb.UI/RMYY/src/components/workOrder/dispatching/addOrEditDispatch.vue

@@ -637,7 +637,8 @@ import {
   GetPerson,
   GetDicValue,
   getClassByDeptId,
-  GetBBXXList
+  GetBBXXList,
+  GetUsersByDeptId
 } from '@/api/commonAPI'
 import { getTypeDetail } from '@/api/systemSetup/roleSetting/department'
 import { Send, ws } from '../../../utils/telWebsocket.js'
@@ -1077,7 +1078,7 @@ export default {
         const params = {
           deptid: id // 字典管理的工单标识
         }
-        GetPerson(params).then((res) => {
+        GetUsersByDeptId(params).then((res) => {
           if (state === 0) {
             this.repairman = res.rows
           } else if (state === 1) {

CallCenterWeb.UI/RMYY/src/components/workOrder/repairbase/addRepairbase.vue

@@ -262,7 +262,7 @@
 <script>
 import selectDeptTree from '@/components/context/commonSelect/selectDeptTree.vue'
 import selectOrderTypeTwo from '@/components/context/commonSelect/selectOrderTypeTwo.vue'
-import { GetPerson, getClassByDeptId } from '@/api/commonAPI'
+import { GetPerson, getClassByDeptId, GetUsersByDeptId } from '@/api/commonAPI'
 import { getUserMsg } from '@/api/orderManagement/orderList'
 import {
   GetFaultRepairDetail,
@@ -624,7 +624,7 @@ export default {
         const params = {
           deptid: id // 字典管理的工单标识
         }
-        GetPerson(params).then((res) => {
+        GetUsersByDeptId(params).then((res) => {
           if (res.state == 'error') {
             this.$message.warning(res.message)
           }

CallCenterWeb.UI/RMYY/src/components/workOrder/vehicleDispatch/addOrEdit.vue

@@ -186,7 +186,7 @@ import { getOrderTypeList } from '@/api/commonAPI.js'
 // import selectDeptTree from '@/components/context/commonSelect/selectDeptTree.vue'
 import { getUserMsg } from '@/api/orderManagement/orderList'
 import { getCartype } from '@/api/vehicleDispatch/vehicleManagement'
-import { GetPerson } from '@/api/commonAPI'
+import { GetPerson,GetUsersByDeptId } from '@/api/commonAPI'
 import { getTypeDetail } from '@/api/systemSetup/roleSetting/department'
 import { GetYuanqu } from '@/api/telCall/report'
 import { Send, ws } from '../../../utils/telWebsocket.js'
@@ -446,7 +446,7 @@ export default {
         const params = {
           deptid: id // 字典管理的工单标识
         }
-        GetPerson(params).then((res) => {
+        GetUsersByDeptId(params).then((res) => {
           this.repairman = res.rows
         })
         resolve()

CallCenterWeb.UI/RMYY/src/store/modules/alluser.js

@@ -0,0 +1,53 @@
+import {
+  getUserAccountLists
+} from "@/api/systemSetup/roleSetting/userManage";
+const allusers = {
+  state: {
+    alluser: [],
+    alluserMap: []
+  },
+
+  mutations: {
+    SET_ALLUSER: (state, alluser) => {
+      state.alluser = alluser
+    },
+    SET_ALLUSERMAP: (state, alluserMap) => {
+      state.alluserMap = alluserMap
+    }
+  },
+
+  actions: {
+    // 获取工单类别信息
+    getTypeTree({
+      commit
+    }) {
+      return new Promise((resolve, reject) => {
+        const params = {
+          // page: 1,
+          // pagesize: 999999999,
+          // deptid:''
+        }
+        getUserAccountLists(params).then(response => {
+          var map = getTypeMap(response.rows, '')
+          commit('SET_ALLUSERMAP', map)
+          commit('SET_ALLUSER', response.rows)
+          resolve()
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    }
+  }
+}
+
+function getTypeMap(arr, id) {
+  var resArr = []
+  arr.forEach(v => {
+    if (v.F_DeptId == id) {
+      resArr.push(v)
+    }
+  })
+  return resArr
+}
+
+export default allusers

CallCenterWeb.UI/RMYY/src/views/comDispatch/scheduleList/index.vue

@@ -122,7 +122,7 @@
   import fieldDATA from "@/utils/fieldsData.js";
   import addDefinedList from "@/components/context/addDefinedList";
   import {
-    GetPerson
+    GetPerson,GetUsersByDeptId
   } from "@/api/commonAPI";
   import addOrEditOrder from "../../callScreen/components/AddOrEditOrder.vue";
   import detail from "../components/dispatchdetail.vue";
@@ -220,6 +220,8 @@
       },
       getDeptid(data) {
         this.searchData.dept = data[data.length - 1];
+        this.repairman = []
+        this.searchData.name = ""
         this.getRepairman(data[data.length - 1], 0);
       },
       getRepairman(id, state) {
@@ -227,7 +229,7 @@
           const params = {
             deptid: id, // 字典管理的工单标识
           };
-          GetPerson(params).then((res) => {
+          GetUsersByDeptId(params).then((res) => {
             if (state === 0) {
               this.repairman = res.rows;
             } else if (state === 1) {

CallCenterWeb.UI/RMYY/src/views/faultRepairManagement/addRepairbase/index.vue

@@ -173,7 +173,7 @@
 <script>
 import selectDeptTree from '@/components/context/commonSelect/selectDeptTree.vue'
 import selectOrderTypeTwo from '@/components/context/commonSelect/selectOrderTypeTwo.vue'
-import { GetPerson, getClassByDeptId } from '@/api/commonAPI'
+import { GetPerson, getClassByDeptId,GetUsersByDeptId } from '@/api/commonAPI'
 import { getAddRepairbase } from '@/api/faultRepairManagement/faultRepair'
 import { getOrderTypeLists } from '@/api/systemSetup/roleSetting/orderTypeManage'
 import { encrypt, decrypt } from '@/utils/secretKey'
@@ -307,13 +307,14 @@ export default {
     getDeptid(data) {
       this.ruleForm.repairDeptid = data[data.length - 1]
       this.deptidArr = data
+      this.repairman = []
+      this.ruleForm.repairmanid = ""
       this.getRepairman(this.ruleForm.repairDeptid, 0)
     },
     getDeptid1(data) {
       this.ruleForm.assignDepart = data[data.length - 1]
       this.assignArr = data
       this.getClassUser(data[data.length - 1])
-      // this.getRepairman(this.ruleForm.assignDepart, 1)
     },
     getClassUser(id) {
       this.ruleForm.assignMant = ''
@@ -332,7 +333,7 @@ export default {
         const params = {
           deptid: id // 字典管理的工单标识
         }
-        GetPerson(params).then((res) => {
+        GetUsersByDeptId(params).then((res) => {
           if (state === 0) {
             this.repairman = res.rows
           } else if (state === 1) {

CallCenterWeb.UI/RMYY/src/views/knowledgeBase/knowledgeList/components/addOrEdit.vue

@@ -132,6 +132,13 @@ export default {
             trigger: "blur",
           },
         ],
+        con: [
+          {
+            required: true,
+            message: "请输入内容",
+            trigger: "blur",
+          },
+        ],
       },
       editorOption: {},
       ruleForm: {
@@ -155,8 +162,16 @@ export default {
       this.tid = this.typeid;
       this.getTypeTreeListss(this.tid, "edit");
     }
+    this.getTypeTreeList()
   },
   methods: {
+    getTypeTreeList() {
+      GetTypeTreeNewList().then((response) => {
+        if (response.state.toLowerCase() === 'success') {
+          this.dataTree = response.data
+        }
+      })
+    },
     submitForm() {
       this.$refs.ruleForm.validate((valid) => {
         if (valid) {

CallCenterWeb.UI/RMYY/src/views/knowledgeBase/knowledgeList/index.vue

@@ -12,7 +12,19 @@
         <el-alert :closable="false" title="知识库列表" type="success" />
         <div class="filter-container">
           <el-input v-model="keyword" size="medium" clearable placeholder="请输入关键字" class="filter-item" />
-          <el-button type="primary" class="filter-item" size="mini" icon="el-icon-search" @click="btn_search_task">搜索
+          <el-cascader
+            v-model="knowType"
+            ref="cascader"
+            placeholder="请选择知识库类别"
+            size="medium"
+            :options="dataTree"
+            :props="TagProps"
+            clearable
+            filterable
+            style="width: 200px;"
+            @change="handleChange"
+          />
+          <el-button type="primary" class="filter-item" size="mini" @click="btn_search_task">搜索
           </el-button>
           <el-button v-permission="'add_knowledgeList'" type="primary" class="filter-item" size="mini" @click="btn_add">
             添加</el-button>
@@ -58,6 +70,7 @@
     },
     data() {
       return {
+        knowType: '',
         keyword: '',
         typeid: '',
         pageParams: {
@@ -70,18 +83,32 @@
         defaultProps: {
           children: 'children',
           label: 'text'
-        }
+        },
+        TagProps: {
+          emitPath: false,
+          checkStrictly: true,
+          value: "id",
+          label: "text",
+          children: "children",
+        },
       }
     },
     computed: {},
     created() {
       this.getTypeTreeList()
+      this.getListTask()
     },
     methods: {
       handleNodeClick(data) {
         this.typeid = data.id
+        this.knowType = data.id
         this.getListTask()
       },
+      handleChange(data){
+        this.knowType = data
+        this.typeid = data
+        // this.getListTask()
+      },
       getTypeTreeList() {
         return new Promise((resolve) => {
           GetTypeTreeNewList().then((response) => {
@@ -108,16 +135,18 @@
         })
       },
       btn_search_task() {
-        if (this.typeid) {
-          this.keyword = this.keyword
-          this.getListTask()
-        } else {
-          this.$message({
-            message: '请选择知识库类别',
-            type: 'warning'
-          })
-          return
-        }
+        this.keyword = this.keyword
+        this.getListTask()
+        // if (this.typeid) {
+        //   this.keyword = this.keyword
+        //   this.getListTask()
+        // } else {
+        //   this.$message({
+        //     message: '请选择知识库类别',
+        //     type: 'warning'
+        //   })
+        //   return
+        // }
       },
       addType() {
         this.$layer.iframe({
@@ -186,8 +215,8 @@
           })
       },
       btn_add() {
-        if (this.typeid) {
-          console.log(typeof this.typeid)
+        // if (this.typeid) {
+          // console.log(typeof this.typeid)
           this.$layer.iframe({
             content: {
               content: addOrEdit, // 传递的组件对象
@@ -200,13 +229,13 @@
             area: ['70%', '75%'],
             title: '添加知识库'
           })
-        } else {
-          this.$message({
-            message: '请选择知识库类别',
-            type: 'warning'
-          })
-          return
-        }
+        // } else {
+          // this.$message({
+          //   message: '请选择知识库类别',
+          //   type: 'warning'
+          // })
+          // return
+        // }
       },
       btn_edit(F_Id) {
         this.$layer.iframe({

CallCenterWeb.UI/RMYY/src/views/orderManage/components/addOrEditInfOrder.vue

@@ -825,12 +825,6 @@ export default {
     // 重置工单
     resetForm() {
       this.ruleForm.F_Source = ""; // 业务类别
-      // this.ruleForm.F_Type1 = '' // 工单类别
-      // this.ruleForm.F_TypeName1 = '' // 工单类别
-      // this.ruleForm.F_Type2 = '' // 工单子类
-      // this.ruleForm.F_TypeName2 = '' // 工单子类
-      // this.ruleForm.F_Type3 = '' // 工单三类
-      // this.ruleForm.F_TypeName3 = '' // 工单三类
       this.ruleForm.F_Customer = ""; // 姓名
       this.ruleForm.F_Sex = "0"; // 性别
       this.ruleForm.F_Phon = ""; // 电话

CallCenterWeb.UI/RMYY/src/views/vehicleDispatch/vehicleScheduling/vehicleSchedulingList/index.vue

@@ -125,7 +125,7 @@
         label="车辆类型"
         align="center"
       />
-      <el-table-column
+     <!-- <el-table-column
         :show-overflow-tooltip="true"
         prop="F_AssignTime"
         label="派单时间"
@@ -135,7 +135,7 @@
         prop="F_SpendTime"
         label="运输时长"
         align="center"
-      />
+      /> -->
       <el-table-column
         :show-overflow-tooltip="true"
         prop="StateName"