liuzhihui лет назад: 2
Родитель
Сommit
fb862e8a8e

+ 88 - 49
CallCenterWeb.UI/RMYY/src/components/button/orderList.vue

284
           <el-rate v-model="consumablesConfirmForm.Efficiency" :texts="evaluateText" show-text />
284
           <el-rate v-model="consumablesConfirmForm.Efficiency" :texts="evaluateText" show-text />
285
         </el-form-item>
285
         </el-form-item>
286
         <el-form-item v-show="consumablesConfirmForm.confirmtype=='1'" label="文字评价" prop="EvaluateContent">
286
         <el-form-item v-show="consumablesConfirmForm.confirmtype=='1'" label="文字评价" prop="EvaluateContent">
287
-          <el-input :autosize="{ minRows: 4, maxRows: 8 }" v-model="consumablesConfirmForm.EvaluateContent" show-word-limit
288
-            maxlength="100" type="textarea" />
287
+          <el-input :autosize="{ minRows: 4, maxRows: 8 }" v-model="consumablesConfirmForm.EvaluateContent"
288
+            show-word-limit maxlength="100" type="textarea" />
289
         </el-form-item>
289
         </el-form-item>
290
         <!-- 有误返修 -->
290
         <!-- 有误返修 -->
291
         <el-form-item v-show="consumablesConfirmForm.confirmtype=='0'" label="返修原因">
291
         <el-form-item v-show="consumablesConfirmForm.confirmtype=='0'" label="返修原因">
295
           </el-select>
295
           </el-select>
296
         </el-form-item>
296
         </el-form-item>
297
         <el-form-item v-show="consumablesConfirmForm.confirmtype=='0'">
297
         <el-form-item v-show="consumablesConfirmForm.confirmtype=='0'">
298
-          <el-input placeholder="请输入其他返修原因" :autosize="{ minRows: 4, maxRows: 8 }" v-model="consumablesConfirmForm.ReturnReason" show-word-limit
299
-            maxlength="100" type="textarea" />
298
+          <el-input placeholder="请输入其他返修原因" :autosize="{ minRows: 4, maxRows: 8 }"
299
+            v-model="consumablesConfirmForm.ReturnReason" show-word-limit maxlength="100" type="textarea" />
300
         </el-form-item>
300
         </el-form-item>
301
       </el-form>
301
       </el-form>
302
       <div slot="footer" class="dialog-footer">
302
       <div slot="footer" class="dialog-footer">
459
           <el-input placeholder="科室交接人" v-model="dealWorkForm.recipient"></el-input>
459
           <el-input placeholder="科室交接人" v-model="dealWorkForm.recipient"></el-input>
460
         </el-form-item>
460
         </el-form-item>
461
         <el-form-item label="附件" v-if="bbtags.indexOf('急查标本') < 0">
461
         <el-form-item label="附件" v-if="bbtags.indexOf('急查标本') < 0">
462
-          <el-upload :before-upload="beforeUpload" :headers="headers" :on-remove="handle_remove" :on-success="handle_success"
463
-            :file-list="dealWorkFormFile" :action="imgUrl" list-type="picture-card" accept=".mp4, .jpg, .jpeg, .png">
462
+          <el-upload :before-upload="beforeUpload" :headers="headers" :on-remove="handle_remove"
463
+            :on-success="handle_success" :file-list="dealWorkFormFile" :action="imgUrl" list-type="picture-card"
464
+            accept=".mp4, .jpg, .jpeg, .png">
464
             <i class="el-icon-plus" />
465
             <i class="el-icon-plus" />
465
           </el-upload>
466
           </el-upload>
466
         </el-form-item>
467
         </el-form-item>
521
           <el-input placeholder="科室交接人" v-model="dealEditWorkForm.recipient"></el-input>
522
           <el-input placeholder="科室交接人" v-model="dealEditWorkForm.recipient"></el-input>
522
         </el-form-item>
523
         </el-form-item>
523
         <el-form-item label="附件" v-if="bbtags.indexOf('急查标本') < 0">
524
         <el-form-item label="附件" v-if="bbtags.indexOf('急查标本') < 0">
524
-          <el-upload :before-upload="beforeUpload" :headers="headers" :on-remove="handle_removeEdit" :on-success="handle_successEdit"
525
-            :file-list="dealEditWorkFormFile" :action="imgUrl" list-type="picture-card" accept=".mp4, .jpg, .jpeg, .png">
525
+          <el-upload :before-upload="beforeUpload" :headers="headers" :on-remove="handle_removeEdit"
526
+            :on-success="handle_successEdit" :file-list="dealEditWorkFormFile" :action="imgUrl" list-type="picture-card"
527
+            accept=".mp4, .jpg, .jpeg, .png">
526
             <i class="el-icon-plus" />
528
             <i class="el-icon-plus" />
527
           </el-upload>
529
           </el-upload>
528
         </el-form-item>
530
         </el-form-item>
546
           <el-input-number v-model="collectForm.fjcnum" :min="0" size="medium" class="inputNumber" />
548
           <el-input-number v-model="collectForm.fjcnum" :min="0" size="medium" class="inputNumber" />
547
         </el-form-item>
549
         </el-form-item>
548
         <el-form-item label="附件">
550
         <el-form-item label="附件">
549
-          <el-upload :before-upload="beforeUpload" :headers="headers" :on-remove="handle_removecol" :on-success="handle_successcol"
550
-            :file-list="collectFormFile" :action="imgUrl" list-type="picture-card" accept=".mp4, .jpg, .jpeg, .png">
551
+          <el-upload :before-upload="beforeUpload" :headers="headers" :on-remove="handle_removecol"
552
+            :on-success="handle_successcol" :file-list="collectFormFile" :action="imgUrl" list-type="picture-card"
553
+            accept=".mp4, .jpg, .jpeg, .png">
551
             <i class="el-icon-plus" />
554
             <i class="el-icon-plus" />
552
           </el-upload>
555
           </el-upload>
553
         </el-form-item>
556
         </el-form-item>
853
           dialog_zhdd_finish: false,
856
           dialog_zhdd_finish: false,
854
           dialog_gzbx_finish: false,
857
           dialog_gzbx_finish: false,
855
           dialog_cldd_finish: false,
858
           dialog_cldd_finish: false,
856
-          dialog_ywzx_wanjie:false,
857
-          dialog_zhdd_wanjie:false,
858
-          dialog_gzbx_wanjie:false,
859
+          dialog_ywzx_wanjie: false,
860
+          dialog_zhdd_wanjie: false,
861
+          dialog_gzbx_wanjie: false,
859
           dialog_dispatch_jiedan: {
862
           dialog_dispatch_jiedan: {
860
             text: "确定接单吗?",
863
             text: "确定接单吗?",
861
             action: postDispatchCheckWorkOrder,
864
             action: postDispatchCheckWorkOrder,
908
         transferForm: {
911
         transferForm: {
909
           todept: "",
912
           todept: "",
910
           tousercode: "",
913
           tousercode: "",
914
+          datetime: ""
911
         },
915
         },
912
         zhddtransferForm: {
916
         zhddtransferForm: {
913
           DealMan: "",
917
           DealMan: "",
944
           confirmtype: "1",
948
           confirmtype: "1",
945
           reason: "",
949
           reason: "",
946
         },
950
         },
947
-        consumablesConfirmForm:{
951
+        consumablesConfirmForm: {
948
           confirmtype: "1",
952
           confirmtype: "1",
949
           Attitude: 0,
953
           Attitude: 0,
950
           Quality: 0,
954
           Quality: 0,
953
           ReturnReason: "",
957
           ReturnReason: "",
954
           key: "",
958
           key: "",
955
           value: "",
959
           value: "",
956
-          youwureason:""
960
+          youwureason: ""
957
         },
961
         },
958
         backWorkForm: {
962
         backWorkForm: {
959
           key: "",
963
           key: "",
982
         dealWorkForm: {
986
         dealWorkForm: {
983
           file: "",
987
           file: "",
984
           remark: "",
988
           remark: "",
985
-          recipient:"",
989
+          recipient: "",
986
           isabnormal: "0",
990
           isabnormal: "0",
987
         },
991
         },
988
         dealEditWorkForm: {
992
         dealEditWorkForm: {
1000
         zhddbackWorkForm: {
1004
         zhddbackWorkForm: {
1001
           BackReason: "",
1005
           BackReason: "",
1002
         },
1006
         },
1003
-        finishtitle:"完成",
1007
+        finishtitle: "完成",
1004
         finishForm: {
1008
         finishForm: {
1005
           type: "",
1009
           type: "",
1006
           reason: "",
1010
           reason: "",
1074
       this.getTreebiaoben();
1078
       this.getTreebiaoben();
1075
     },
1079
     },
1076
     methods: {
1080
     methods: {
1081
+      getNowDate() {
1082
+        var dt = new Date();
1083
+        var y = dt.getFullYear();
1084
+        var mt = dt.getMonth() + 1;
1085
+        if (mt < 10) {
1086
+          mt = '0' + mt
1087
+        }
1088
+        var day = dt.getDate();
1089
+        if (day < 10) {
1090
+          day = '0' + day
1091
+        }
1092
+        var h = dt.getHours(); //获取时
1093
+        if (h < 10) {
1094
+          h = '0' + h
1095
+        }
1096
+        var m = dt.getMinutes(); //获取分
1097
+        if (m < 10) {
1098
+          m = '0' + m
1099
+        }
1100
+        var s = dt.getSeconds(); //获取秒
1101
+        if (s < 10) {
1102
+          s = '0' + s
1103
+        }
1104
+        return y + '-' + mt + '-' + day + ' ' + h + ':' + m + ':' + s
1105
+      },
1077
       getReason(flag) {
1106
       getReason(flag) {
1078
         const params = {
1107
         const params = {
1079
           Flag: flag,
1108
           Flag: flag,
1151
           this.dispatchhaocaiarrEdit[index].F_DicName = ""
1180
           this.dispatchhaocaiarrEdit[index].F_DicName = ""
1152
         }
1181
         }
1153
       },
1182
       },
1154
-      changeConfirmType(val){
1155
-        if(val == "1"){
1183
+      changeConfirmType(val) {
1184
+        if (val == "1") {
1156
           this.reason5 = ""
1185
           this.reason5 = ""
1157
           this.consumablesConfirmForm.key = ""
1186
           this.consumablesConfirmForm.key = ""
1158
           this.consumablesConfirmForm.value = ""
1187
           this.consumablesConfirmForm.value = ""
1159
           this.consumablesConfirmForm.ReturnReason = ""
1188
           this.consumablesConfirmForm.ReturnReason = ""
1160
-        }else{
1189
+        } else {
1161
           this.consumablesConfirmForm.Attitude = 0
1190
           this.consumablesConfirmForm.Attitude = 0
1162
           this.consumablesConfirmForm.Quality = 0
1191
           this.consumablesConfirmForm.Quality = 0
1163
           this.consumablesConfirmForm.Efficiency = 0
1192
           this.consumablesConfirmForm.Efficiency = 0
1164
           this.consumablesConfirmForm.EvaluateContent = ""
1193
           this.consumablesConfirmForm.EvaluateContent = ""
1165
         }
1194
         }
1166
       },
1195
       },
1167
-      handleChange5(data){
1196
+      handleChange5(data) {
1168
         this.consumablesConfirmForm.key = data.split(",")[0];
1197
         this.consumablesConfirmForm.key = data.split(",")[0];
1169
         this.consumablesConfirmForm.value = data.split(",")[1];
1198
         this.consumablesConfirmForm.value = data.split(",")[1];
1170
       },
1199
       },
1185
         this.zhddBackForm.value = data.split(",")[1];
1214
         this.zhddBackForm.value = data.split(",")[1];
1186
       },
1215
       },
1187
       //上传附件验证
1216
       //上传附件验证
1188
-      beforeUpload(file){
1217
+      beforeUpload(file) {
1189
         const FILE_NAME = file.name
1218
         const FILE_NAME = file.name
1190
-          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') {
1191
-            this.$message.warning('仅支持.mp4,.jpg,.jpeg,.png文件')
1192
-            return false
1193
-          }
1194
-          const isLt1M = file.size / 1024 / 1024 < 20
1195
-          if (isLt1M) {
1196
-            this.file = file
1197
-            return true
1198
-          }
1199
-          this.$message.warning('请上传不超过20M的文件.')
1219
+        if (FILE_NAME.substring(FILE_NAME.lastIndexOf('.')) !== '.mp4' && FILE_NAME.substring(FILE_NAME.lastIndexOf(
1220
+            '.')) !== '.jpg' && FILE_NAME.substring(FILE_NAME.lastIndexOf('.')) !== '.jpeg' && FILE_NAME.substring(
1221
+            FILE_NAME.lastIndexOf('.')) !== '.png') {
1222
+          this.$message.warning('仅支持.mp4,.jpg,.jpeg,.png文件')
1200
           return false
1223
           return false
1224
+        }
1225
+        const isLt1M = file.size / 1024 / 1024 < 20
1226
+        if (isLt1M) {
1227
+          this.file = file
1228
+          return true
1229
+        }
1230
+        this.$message.warning('请上传不超过20M的文件.')
1231
+        return false
1201
       },
1232
       },
1202
       handle_success(res) {
1233
       handle_success(res) {
1203
         this.dealWorkForm.file += res.data[0].F_FileId + ",";
1234
         this.dealWorkForm.file += res.data[0].F_FileId + ",";
1258
           if (res.data.length > 0 && res.data[0].F_OperationType == 9 && res.data[0].F_LogContent.length > 3) {
1289
           if (res.data.length > 0 && res.data[0].F_OperationType == 9 && res.data[0].F_LogContent.length > 3) {
1259
             this.dealEditWorkForm.remark = res.data[0].F_LogContent.slice(res.data[0].F_LogContent.indexOf(',') + 1,
1290
             this.dealEditWorkForm.remark = res.data[0].F_LogContent.slice(res.data[0].F_LogContent.indexOf(',') + 1,
1260
               res.data[0].F_LogContent.length)
1291
               res.data[0].F_LogContent.length)
1261
-          }else{
1292
+          } else {
1262
             this.dealEditWorkForm.remark = ""
1293
             this.dealEditWorkForm.remark = ""
1263
           }
1294
           }
1264
         })
1295
         })
1358
         this.fid = row.F_ID;
1389
         this.fid = row.F_ID;
1359
         this.rowdata = row;
1390
         this.rowdata = row;
1360
         console.log(name, "name");
1391
         console.log(name, "name");
1392
+        console.log(this.getNowDate());
1361
         if (name === "dispatch_zhuantongshi") {
1393
         if (name === "dispatch_zhuantongshi") {
1362
           console.log(111);
1394
           console.log(111);
1363
           // 综合调度转同事
1395
           // 综合调度转同事
1608
         if (name === "gzbx_wanjie") {
1640
         if (name === "gzbx_wanjie") {
1609
           this.finishForm.type = 3000;
1641
           this.finishForm.type = 3000;
1610
         }
1642
         }
1611
-        if(name === "ywzx_wanjie" || name === "zhdd_wanjie" || name === "gzbx_wanjie"){
1643
+        if (name === "ywzx_wanjie" || name === "zhdd_wanjie" || name === "gzbx_wanjie") {
1612
           this.finishtitle = "完结"
1644
           this.finishtitle = "完结"
1613
         }
1645
         }
1614
         if (this.dialogStatus[`dialog_${name}`] === false) {
1646
         if (this.dialogStatus[`dialog_${name}`] === false) {
1735
           const params = {
1767
           const params = {
1736
             deptid: id, // 字典管理的工单标识
1768
             deptid: id, // 字典管理的工单标识
1737
           };
1769
           };
1738
-          GetPerson(params).then((res) => {
1770
+          getClassByDeptId(params).then((res) => {
1739
             if (state === 0) {
1771
             if (state === 0) {
1740
               this.repairman = res.rows;
1772
               this.repairman = res.rows;
1741
             } else if (state === 1) {
1773
             } else if (state === 1) {
1750
           const params = {
1782
           const params = {
1751
             deptid: id, // 字典管理的工单标识
1783
             deptid: id, // 字典管理的工单标识
1752
           };
1784
           };
1753
-          GetPerson(params).then((res) => {
1785
+          getClassByDeptId(params).then((res) => {
1754
             this.zhddrepairman = res.rows;
1786
             this.zhddrepairman = res.rows;
1755
           });
1787
           });
1756
           resolve();
1788
           resolve();
1761
           const params = {
1793
           const params = {
1762
             deptid: id, // 字典管理的工单标识
1794
             deptid: id, // 字典管理的工单标识
1763
           };
1795
           };
1764
-          GetPerson(params).then((res) => {
1796
+          getClassByDeptId(params).then((res) => {
1765
             this.dispatchrepairman = res.rows;
1797
             this.dispatchrepairman = res.rows;
1766
           });
1798
           });
1767
           resolve();
1799
           resolve();
1783
       submitForm(formName) {
1815
       submitForm(formName) {
1784
         // console.log(this.dispatchhaocaiarrError)
1816
         // console.log(this.dispatchhaocaiarrError)
1785
         // return;
1817
         // return;
1818
+        if (formName === "transferForm"){
1819
+          this.transferForm.datetime = this.getNowDate()
1820
+        }
1786
         if (formName === "dealWorkForm") {
1821
         if (formName === "dealWorkForm") {
1787
           if (this.dispatchhaocaiarrError.length > 0) {
1822
           if (this.dispatchhaocaiarrError.length > 0) {
1788
             if (this.dealWorkForm.isabnormal === '1' && this.bbtags.indexOf('急查标本') >= 0) {
1823
             if (this.dealWorkForm.isabnormal === '1' && this.bbtags.indexOf('急查标本') >= 0) {
1825
           this.zhddtransferForm.detailists = arrlist;
1860
           this.zhddtransferForm.detailists = arrlist;
1826
         }
1861
         }
1827
         if (formName === "evaluateForm") {
1862
         if (formName === "evaluateForm") {
1828
-          if(this.evaluateForm.Attitude == 0 || this.evaluateForm.Quality == 0 || this.evaluateForm.Efficiency == 0){
1863
+          if (this.evaluateForm.Attitude == 0 || this.evaluateForm.Quality == 0 || this.evaluateForm.Efficiency == 0) {
1829
             this.$message.warning("请选择星级评价");
1864
             this.$message.warning("请选择星级评价");
1830
             return;
1865
             return;
1831
           }
1866
           }
1841
           }
1876
           }
1842
         }
1877
         }
1843
         if (formName === "schedulingEvaluateForm") {
1878
         if (formName === "schedulingEvaluateForm") {
1844
-          if(this.schedulingEvaluateForm.Attitude == 0 || this.schedulingEvaluateForm.Quality == 0 || this.schedulingEvaluateForm.Efficiency == 0){
1879
+          if (this.schedulingEvaluateForm.Attitude == 0 || this.schedulingEvaluateForm.Quality == 0 || this
1880
+            .schedulingEvaluateForm.Efficiency == 0) {
1845
             this.$message.warning("请选择星级评价");
1881
             this.$message.warning("请选择星级评价");
1846
             return;
1882
             return;
1847
           }
1883
           }
1857
           }
1893
           }
1858
         }
1894
         }
1859
         if (formName === "carEvaluteForm") {
1895
         if (formName === "carEvaluteForm") {
1860
-          if(this.carEvaluteForm.Attitude == 0 || this.carEvaluteForm.Quality == 0 || this.carEvaluteForm.Efficiency == 0){
1896
+          if (this.carEvaluteForm.Attitude == 0 || this.carEvaluteForm.Quality == 0 || this.carEvaluteForm.Efficiency ==
1897
+            0) {
1861
             this.$message.warning("请选择星级评价");
1898
             this.$message.warning("请选择星级评价");
1862
             return;
1899
             return;
1863
           }
1900
           }
1872
             }
1909
             }
1873
           }
1910
           }
1874
         }
1911
         }
1875
-        if(formName === "consumablesConfirmForm"){
1876
-          if(this.consumablesConfirmForm.confirmtype == '1'){//无误
1877
-            if(this.consumablesConfirmForm.Attitude == 0 || this.consumablesConfirmForm.Quality == 0 || this.consumablesConfirmForm.Efficiency == 0){
1912
+        if (formName === "consumablesConfirmForm") {
1913
+          if (this.consumablesConfirmForm.confirmtype == '1') { //无误
1914
+            if (this.consumablesConfirmForm.Attitude == 0 || this.consumablesConfirmForm.Quality == 0 || this
1915
+              .consumablesConfirmForm.Efficiency == 0) {
1878
               this.$message.warning("请选择星级评价");
1916
               this.$message.warning("请选择星级评价");
1879
               return;
1917
               return;
1880
             }
1918
             }
1881
-            if(this.consumablesConfirmForm.Attitude < 3 || this.consumablesConfirmForm.Quality < 3 || this.consumablesConfirmForm.Efficiency < 3) {
1919
+            if (this.consumablesConfirmForm.Attitude < 3 || this.consumablesConfirmForm.Quality < 3 || this
1920
+              .consumablesConfirmForm.Efficiency < 3) {
1882
               if (this.consumablesConfirmForm.EvaluateContent === "") {
1921
               if (this.consumablesConfirmForm.EvaluateContent === "") {
1883
                 this.$message.warning("请输入文字评价");
1922
                 this.$message.warning("请输入文字评价");
1884
                 return;
1923
                 return;
1885
               }
1924
               }
1886
             }
1925
             }
1887
-          }else{//有误
1888
-            if(!this.reason5){
1926
+          } else { //有误
1927
+            if (!this.reason5) {
1889
               this.$message.warning("请选择原因");
1928
               this.$message.warning("请选择原因");
1890
               return;
1929
               return;
1891
             }
1930
             }
1908
                 this.dealWorkForm.recipient = "";
1947
                 this.dealWorkForm.recipient = "";
1909
                 this.dealWorkForm.isabnormal = "";
1948
                 this.dealWorkForm.isabnormal = "";
1910
               }
1949
               }
1911
-              if(this.dealWorkForm.isabnormal == "0"){
1950
+              if (this.dealWorkForm.isabnormal == "0") {
1912
                 this.dealWorkForm.pslist = [];
1951
                 this.dealWorkForm.pslist = [];
1913
                 this.dealWorkForm.recipient = ""
1952
                 this.dealWorkForm.recipient = ""
1914
               }
1953
               }
1930
                 this.dealEditWorkForm.recipient = "";
1969
                 this.dealEditWorkForm.recipient = "";
1931
                 this.dealEditWorkForm.isabnormal = "";
1970
                 this.dealEditWorkForm.isabnormal = "";
1932
               }
1971
               }
1933
-              if(this.dealEditWorkForm.isabnormal == "0"){
1972
+              if (this.dealEditWorkForm.isabnormal == "0") {
1934
                 this.dealEditWorkForm.pslist = [];
1973
                 this.dealEditWorkForm.pslist = [];
1935
                 this.dealEditWorkForm.recipient = ""
1974
                 this.dealEditWorkForm.recipient = ""
1936
               }
1975
               }
2092
                       type: "success",
2131
                       type: "success",
2093
                       message: "操作成功!",
2132
                       message: "操作成功!",
2094
                     });
2133
                     });
2095
-                    if(this.optionName == 'repairconfirm'){
2134
+                    if (this.optionName == 'repairconfirm') {
2096
                       this.consumablesConfirmForm.confirmtype = "1"
2135
                       this.consumablesConfirmForm.confirmtype = "1"
2097
                       this.consumablesConfirmForm.Attitude = 0
2136
                       this.consumablesConfirmForm.Attitude = 0
2098
                       this.consumablesConfirmForm.Efficiency = 0
2137
                       this.consumablesConfirmForm.Efficiency = 0

+ 8 - 5
CallCenterWeb.UI/RMYY/src/components/context/Dialplate/index.vue

470
       this.telNumber = this.telNumber.substr(0, this.telNumber.length - 1);
470
       this.telNumber = this.telNumber.substr(0, this.telNumber.length - 1);
471
       if (this.telNumber.length === 0) {
471
       if (this.telNumber.length === 0) {
472
         this.isShowDelNum = false;
472
         this.isShowDelNum = false;
473
+        store.dispatch('ChangeCallNum', this.telNumber)
474
+      }
475
+    },
476
+    callOutInssput() {
477
+      this.telNumber = this.telNumber.substr(0, this.telNumber.length - 1);
478
+      if (this.telNumber.length === 0) {
479
+        this.isShowDelNum = false;
480
+        store.dispatch('ChangeCallNum', this.telNumber)
473
       }
481
       }
474
-      // store.dispatch('ChangeCallNum', this.telNumber)
475
     },
482
     },
476
-    // callOutInssput() {
477
-    //   console.log(11122)
478
-    //   this.getCallList()
479
-    // },
480
     // 外呼
483
     // 外呼
481
     callOut() {
484
     callOut() {
482
       if (this.telNumber) {
485
       if (this.telNumber) {

+ 3 - 2
CallCenterWeb.UI/RMYY/src/components/workOrder/dispatching/addOrEditDispatch.vue

637
   GetPerson,
637
   GetPerson,
638
   GetDicValue,
638
   GetDicValue,
639
   getClassByDeptId,
639
   getClassByDeptId,
640
-  GetBBXXList
640
+  GetBBXXList,
641
+  GetUsersByDeptId
641
 } from '@/api/commonAPI'
642
 } from '@/api/commonAPI'
642
 import { getTypeDetail } from '@/api/systemSetup/roleSetting/department'
643
 import { getTypeDetail } from '@/api/systemSetup/roleSetting/department'
643
 import { Send, ws } from '../../../utils/telWebsocket.js'
644
 import { Send, ws } from '../../../utils/telWebsocket.js'
1077
         const params = {
1078
         const params = {
1078
           deptid: id // 字典管理的工单标识
1079
           deptid: id // 字典管理的工单标识
1079
         }
1080
         }
1080
-        GetPerson(params).then((res) => {
1081
+        GetUsersByDeptId(params).then((res) => {
1081
           if (state === 0) {
1082
           if (state === 0) {
1082
             this.repairman = res.rows
1083
             this.repairman = res.rows
1083
           } else if (state === 1) {
1084
           } else if (state === 1) {

+ 2 - 2
CallCenterWeb.UI/RMYY/src/components/workOrder/repairbase/addRepairbase.vue

262
 <script>
262
 <script>
263
 import selectDeptTree from '@/components/context/commonSelect/selectDeptTree.vue'
263
 import selectDeptTree from '@/components/context/commonSelect/selectDeptTree.vue'
264
 import selectOrderTypeTwo from '@/components/context/commonSelect/selectOrderTypeTwo.vue'
264
 import selectOrderTypeTwo from '@/components/context/commonSelect/selectOrderTypeTwo.vue'
265
-import { GetPerson, getClassByDeptId } from '@/api/commonAPI'
265
+import { GetPerson, getClassByDeptId, GetUsersByDeptId } from '@/api/commonAPI'
266
 import { getUserMsg } from '@/api/orderManagement/orderList'
266
 import { getUserMsg } from '@/api/orderManagement/orderList'
267
 import {
267
 import {
268
   GetFaultRepairDetail,
268
   GetFaultRepairDetail,
624
         const params = {
624
         const params = {
625
           deptid: id // 字典管理的工单标识
625
           deptid: id // 字典管理的工单标识
626
         }
626
         }
627
-        GetPerson(params).then((res) => {
627
+        GetUsersByDeptId(params).then((res) => {
628
           if (res.state == 'error') {
628
           if (res.state == 'error') {
629
             this.$message.warning(res.message)
629
             this.$message.warning(res.message)
630
           }
630
           }

+ 2 - 2
CallCenterWeb.UI/RMYY/src/components/workOrder/vehicleDispatch/addOrEdit.vue

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

+ 53 - 0
CallCenterWeb.UI/RMYY/src/store/modules/alluser.js

1
+import {
2
+  getUserAccountLists
3
+} from "@/api/systemSetup/roleSetting/userManage";
4
+const allusers = {
5
+  state: {
6
+    alluser: [],
7
+    alluserMap: []
8
+  },
9
+
10
+  mutations: {
11
+    SET_ALLUSER: (state, alluser) => {
12
+      state.alluser = alluser
13
+    },
14
+    SET_ALLUSERMAP: (state, alluserMap) => {
15
+      state.alluserMap = alluserMap
16
+    }
17
+  },
18
+
19
+  actions: {
20
+    // 获取工单类别信息
21
+    getTypeTree({
22
+      commit
23
+    }) {
24
+      return new Promise((resolve, reject) => {
25
+        const params = {
26
+          // page: 1,
27
+          // pagesize: 999999999,
28
+          // deptid:''
29
+        }
30
+        getUserAccountLists(params).then(response => {
31
+          var map = getTypeMap(response.rows, '')
32
+          commit('SET_ALLUSERMAP', map)
33
+          commit('SET_ALLUSER', response.rows)
34
+          resolve()
35
+        }).catch(error => {
36
+          reject(error)
37
+        })
38
+      })
39
+    }
40
+  }
41
+}
42
+
43
+function getTypeMap(arr, id) {
44
+  var resArr = []
45
+  arr.forEach(v => {
46
+    if (v.F_DeptId == id) {
47
+      resArr.push(v)
48
+    }
49
+  })
50
+  return resArr
51
+}
52
+
53
+export default allusers

+ 4 - 2
CallCenterWeb.UI/RMYY/src/views/comDispatch/scheduleList/index.vue

122
   import fieldDATA from "@/utils/fieldsData.js";
122
   import fieldDATA from "@/utils/fieldsData.js";
123
   import addDefinedList from "@/components/context/addDefinedList";
123
   import addDefinedList from "@/components/context/addDefinedList";
124
   import {
124
   import {
125
-    GetPerson
125
+    GetPerson,GetUsersByDeptId
126
   } from "@/api/commonAPI";
126
   } from "@/api/commonAPI";
127
   import addOrEditOrder from "../../callScreen/components/AddOrEditOrder.vue";
127
   import addOrEditOrder from "../../callScreen/components/AddOrEditOrder.vue";
128
   import detail from "../components/dispatchdetail.vue";
128
   import detail from "../components/dispatchdetail.vue";
220
       },
220
       },
221
       getDeptid(data) {
221
       getDeptid(data) {
222
         this.searchData.dept = data[data.length - 1];
222
         this.searchData.dept = data[data.length - 1];
223
+        this.repairman = []
224
+        this.searchData.name = ""
223
         this.getRepairman(data[data.length - 1], 0);
225
         this.getRepairman(data[data.length - 1], 0);
224
       },
226
       },
225
       getRepairman(id, state) {
227
       getRepairman(id, state) {
227
           const params = {
229
           const params = {
228
             deptid: id, // 字典管理的工单标识
230
             deptid: id, // 字典管理的工单标识
229
           };
231
           };
230
-          GetPerson(params).then((res) => {
232
+          GetUsersByDeptId(params).then((res) => {
231
             if (state === 0) {
233
             if (state === 0) {
232
               this.repairman = res.rows;
234
               this.repairman = res.rows;
233
             } else if (state === 1) {
235
             } else if (state === 1) {

+ 4 - 3
CallCenterWeb.UI/RMYY/src/views/faultRepairManagement/addRepairbase/index.vue

173
 <script>
173
 <script>
174
 import selectDeptTree from '@/components/context/commonSelect/selectDeptTree.vue'
174
 import selectDeptTree from '@/components/context/commonSelect/selectDeptTree.vue'
175
 import selectOrderTypeTwo from '@/components/context/commonSelect/selectOrderTypeTwo.vue'
175
 import selectOrderTypeTwo from '@/components/context/commonSelect/selectOrderTypeTwo.vue'
176
-import { GetPerson, getClassByDeptId } from '@/api/commonAPI'
176
+import { GetPerson, getClassByDeptId,GetUsersByDeptId } from '@/api/commonAPI'
177
 import { getAddRepairbase } from '@/api/faultRepairManagement/faultRepair'
177
 import { getAddRepairbase } from '@/api/faultRepairManagement/faultRepair'
178
 import { getOrderTypeLists } from '@/api/systemSetup/roleSetting/orderTypeManage'
178
 import { getOrderTypeLists } from '@/api/systemSetup/roleSetting/orderTypeManage'
179
 import { encrypt, decrypt } from '@/utils/secretKey'
179
 import { encrypt, decrypt } from '@/utils/secretKey'
307
     getDeptid(data) {
307
     getDeptid(data) {
308
       this.ruleForm.repairDeptid = data[data.length - 1]
308
       this.ruleForm.repairDeptid = data[data.length - 1]
309
       this.deptidArr = data
309
       this.deptidArr = data
310
+      this.repairman = []
311
+      this.ruleForm.repairmanid = ""
310
       this.getRepairman(this.ruleForm.repairDeptid, 0)
312
       this.getRepairman(this.ruleForm.repairDeptid, 0)
311
     },
313
     },
312
     getDeptid1(data) {
314
     getDeptid1(data) {
313
       this.ruleForm.assignDepart = data[data.length - 1]
315
       this.ruleForm.assignDepart = data[data.length - 1]
314
       this.assignArr = data
316
       this.assignArr = data
315
       this.getClassUser(data[data.length - 1])
317
       this.getClassUser(data[data.length - 1])
316
-      // this.getRepairman(this.ruleForm.assignDepart, 1)
317
     },
318
     },
318
     getClassUser(id) {
319
     getClassUser(id) {
319
       this.ruleForm.assignMant = ''
320
       this.ruleForm.assignMant = ''
332
         const params = {
333
         const params = {
333
           deptid: id // 字典管理的工单标识
334
           deptid: id // 字典管理的工单标识
334
         }
335
         }
335
-        GetPerson(params).then((res) => {
336
+        GetUsersByDeptId(params).then((res) => {
336
           if (state === 0) {
337
           if (state === 0) {
337
             this.repairman = res.rows
338
             this.repairman = res.rows
338
           } else if (state === 1) {
339
           } else if (state === 1) {

+ 15 - 0
CallCenterWeb.UI/RMYY/src/views/knowledgeBase/knowledgeList/components/addOrEdit.vue

132
             trigger: "blur",
132
             trigger: "blur",
133
           },
133
           },
134
         ],
134
         ],
135
+        con: [
136
+          {
137
+            required: true,
138
+            message: "请输入内容",
139
+            trigger: "blur",
140
+          },
141
+        ],
135
       },
142
       },
136
       editorOption: {},
143
       editorOption: {},
137
       ruleForm: {
144
       ruleForm: {
155
       this.tid = this.typeid;
162
       this.tid = this.typeid;
156
       this.getTypeTreeListss(this.tid, "edit");
163
       this.getTypeTreeListss(this.tid, "edit");
157
     }
164
     }
165
+    this.getTypeTreeList()
158
   },
166
   },
159
   methods: {
167
   methods: {
168
+    getTypeTreeList() {
169
+      GetTypeTreeNewList().then((response) => {
170
+        if (response.state.toLowerCase() === 'success') {
171
+          this.dataTree = response.data
172
+        }
173
+      })
174
+    },
160
     submitForm() {
175
     submitForm() {
161
       this.$refs.ruleForm.validate((valid) => {
176
       this.$refs.ruleForm.validate((valid) => {
162
         if (valid) {
177
         if (valid) {

+ 50 - 21
CallCenterWeb.UI/RMYY/src/views/knowledgeBase/knowledgeList/index.vue

12
         <el-alert :closable="false" title="知识库列表" type="success" />
12
         <el-alert :closable="false" title="知识库列表" type="success" />
13
         <div class="filter-container">
13
         <div class="filter-container">
14
           <el-input v-model="keyword" size="medium" clearable placeholder="请输入关键字" class="filter-item" />
14
           <el-input v-model="keyword" size="medium" clearable placeholder="请输入关键字" class="filter-item" />
15
-          <el-button type="primary" class="filter-item" size="mini" icon="el-icon-search" @click="btn_search_task">搜索
15
+          <el-cascader
16
+            v-model="knowType"
17
+            ref="cascader"
18
+            placeholder="请选择知识库类别"
19
+            size="medium"
20
+            :options="dataTree"
21
+            :props="TagProps"
22
+            clearable
23
+            filterable
24
+            style="width: 200px;"
25
+            @change="handleChange"
26
+          />
27
+          <el-button type="primary" class="filter-item" size="mini" @click="btn_search_task">搜索
16
           </el-button>
28
           </el-button>
17
           <el-button v-permission="'add_knowledgeList'" type="primary" class="filter-item" size="mini" @click="btn_add">
29
           <el-button v-permission="'add_knowledgeList'" type="primary" class="filter-item" size="mini" @click="btn_add">
18
             添加</el-button>
30
             添加</el-button>
58
     },
70
     },
59
     data() {
71
     data() {
60
       return {
72
       return {
73
+        knowType: '',
61
         keyword: '',
74
         keyword: '',
62
         typeid: '',
75
         typeid: '',
63
         pageParams: {
76
         pageParams: {
70
         defaultProps: {
83
         defaultProps: {
71
           children: 'children',
84
           children: 'children',
72
           label: 'text'
85
           label: 'text'
73
-        }
86
+        },
87
+        TagProps: {
88
+          emitPath: false,
89
+          checkStrictly: true,
90
+          value: "id",
91
+          label: "text",
92
+          children: "children",
93
+        },
74
       }
94
       }
75
     },
95
     },
76
     computed: {},
96
     computed: {},
77
     created() {
97
     created() {
78
       this.getTypeTreeList()
98
       this.getTypeTreeList()
99
+      this.getListTask()
79
     },
100
     },
80
     methods: {
101
     methods: {
81
       handleNodeClick(data) {
102
       handleNodeClick(data) {
82
         this.typeid = data.id
103
         this.typeid = data.id
104
+        this.knowType = data.id
83
         this.getListTask()
105
         this.getListTask()
84
       },
106
       },
107
+      handleChange(data){
108
+        this.knowType = data
109
+        this.typeid = data
110
+        // this.getListTask()
111
+      },
85
       getTypeTreeList() {
112
       getTypeTreeList() {
86
         return new Promise((resolve) => {
113
         return new Promise((resolve) => {
87
           GetTypeTreeNewList().then((response) => {
114
           GetTypeTreeNewList().then((response) => {
108
         })
135
         })
109
       },
136
       },
110
       btn_search_task() {
137
       btn_search_task() {
111
-        if (this.typeid) {
112
-          this.keyword = this.keyword
113
-          this.getListTask()
114
-        } else {
115
-          this.$message({
116
-            message: '请选择知识库类别',
117
-            type: 'warning'
118
-          })
119
-          return
120
-        }
138
+        this.keyword = this.keyword
139
+        this.getListTask()
140
+        // if (this.typeid) {
141
+        //   this.keyword = this.keyword
142
+        //   this.getListTask()
143
+        // } else {
144
+        //   this.$message({
145
+        //     message: '请选择知识库类别',
146
+        //     type: 'warning'
147
+        //   })
148
+        //   return
149
+        // }
121
       },
150
       },
122
       addType() {
151
       addType() {
123
         this.$layer.iframe({
152
         this.$layer.iframe({
186
           })
215
           })
187
       },
216
       },
188
       btn_add() {
217
       btn_add() {
189
-        if (this.typeid) {
190
-          console.log(typeof this.typeid)
218
+        // if (this.typeid) {
219
+          // console.log(typeof this.typeid)
191
           this.$layer.iframe({
220
           this.$layer.iframe({
192
             content: {
221
             content: {
193
               content: addOrEdit, // 传递的组件对象
222
               content: addOrEdit, // 传递的组件对象
200
             area: ['70%', '75%'],
229
             area: ['70%', '75%'],
201
             title: '添加知识库'
230
             title: '添加知识库'
202
           })
231
           })
203
-        } else {
204
-          this.$message({
205
-            message: '请选择知识库类别',
206
-            type: 'warning'
207
-          })
208
-          return
209
-        }
232
+        // } else {
233
+          // this.$message({
234
+          //   message: '请选择知识库类别',
235
+          //   type: 'warning'
236
+          // })
237
+          // return
238
+        // }
210
       },
239
       },
211
       btn_edit(F_Id) {
240
       btn_edit(F_Id) {
212
         this.$layer.iframe({
241
         this.$layer.iframe({

+ 0 - 6
CallCenterWeb.UI/RMYY/src/views/orderManage/components/addOrEditInfOrder.vue

825
     // 重置工单
825
     // 重置工单
826
     resetForm() {
826
     resetForm() {
827
       this.ruleForm.F_Source = ""; // 业务类别
827
       this.ruleForm.F_Source = ""; // 业务类别
828
-      // this.ruleForm.F_Type1 = '' // 工单类别
829
-      // this.ruleForm.F_TypeName1 = '' // 工单类别
830
-      // this.ruleForm.F_Type2 = '' // 工单子类
831
-      // this.ruleForm.F_TypeName2 = '' // 工单子类
832
-      // this.ruleForm.F_Type3 = '' // 工单三类
833
-      // this.ruleForm.F_TypeName3 = '' // 工单三类
834
       this.ruleForm.F_Customer = ""; // 姓名
828
       this.ruleForm.F_Customer = ""; // 姓名
835
       this.ruleForm.F_Sex = "0"; // 性别
829
       this.ruleForm.F_Sex = "0"; // 性别
836
       this.ruleForm.F_Phon = ""; // 电话
830
       this.ruleForm.F_Phon = ""; // 电话

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

125
         label="车辆类型"
125
         label="车辆类型"
126
         align="center"
126
         align="center"
127
       />
127
       />
128
-      <el-table-column
128
+     <!-- <el-table-column
129
         :show-overflow-tooltip="true"
129
         :show-overflow-tooltip="true"
130
         prop="F_AssignTime"
130
         prop="F_AssignTime"
131
         label="派单时间"
131
         label="派单时间"
135
         prop="F_SpendTime"
135
         prop="F_SpendTime"
136
         label="运输时长"
136
         label="运输时长"
137
         align="center"
137
         align="center"
138
-      />
138
+      /> -->
139
       <el-table-column
139
       <el-table-column
140
         :show-overflow-tooltip="true"
140
         :show-overflow-tooltip="true"
141
         prop="StateName"
141
         prop="StateName"