coys 2 anni fa
parent
commit
474b217b20

+ 23 - 32
src/views/menu/monitoringCall/index.vue

@@ -126,16 +126,19 @@ import NavBar from '@/components/NavBar'
 import { Col, Row, Cascader, Dialog, DatetimePicker, Icon, Picker } from 'vant'
 import { deptTreeList, selectListApp, registration } from '@/api/toConsult.js'
 import { Toast } from 'vant'
+import { newDateMonth } from '@/utils/date.js'
+
 export default {
   data() {
     return {
       str: '',
-      fieldValue: '',
+      fieldValue: '全部',
       monitor: ['monitor', 'monitored', 'monitoring'], //状态样式
-      value1: '', //输入框model
-      currentDate: '',
-      cascaderValue: '',
-      columns: ['调阅中', '待调阅', '已调阅'],
+      value1: JSON.parse(sessionStorage.getItem('SET_USER_ORGNAME')) || '', //输入框model
+      currentDate: newDateMonth(),
+      cascaderValue: JSON.parse(sessionStorage.getItem('SET_USER_ORGID')) || '',
+      columns: ['全部'],
+      statusList: [], //调阅状态字典数组
       show: false,
       showStatus: false,
       showDate: false,
@@ -208,6 +211,13 @@ export default {
           this.options = data
         }
       })
+      //获取调阅状态字典
+      this.getDictHandler('retrieval_task_status', res => {
+        this.statusList = res
+        res.forEach(item => {
+          this.columns.push(item.dictLabel)
+        })
+      })
       this.selectListAppHandler()
     },
     selectListAppHandler() {
@@ -263,13 +273,7 @@ export default {
       this.taskId = taskId
       this.showDialog = true
     },
-    // //已调阅事件
-    // endMonitorHandler(status, taskId) {
-    //   // 0待调阅,1调阅中,2已调阅,3已超期
-    //   //跳转详情
-    //   if (status <= 1) return
-    //   this.$router.push('/consultInfo/' + taskId+'_d')
-    // },
+
     //查看调阅详情
     lookInfoHandler(taskId, status) {
       this.taskId = taskId
@@ -288,24 +292,11 @@ export default {
     //搜索选择状态时触发
     onConfirm(value, index) {
       this.fieldValue = value
-
-      switch (value) {
-        case '待调阅':
-          this.str = '0'
-
-          break
-        case '调阅中':
-          this.str = '1'
-          break
-
-        case '已调阅':
-          this.str = '2'
-          break
-
-        case '已超期':
-          this.str = '3'
-          break
-      }
+      this.statusList.forEach(item=>{
+        if(value==item.dictLabel){
+          this.str=item.dictValue
+        }
+      })
       this.showStatus = false
       this.selectListAppHandler()
     },
@@ -323,7 +314,7 @@ export default {
       m = m < 10 ? '0' + m : m
       var d = date.getDate()
       d = d < 10 ? '0' + d : d
-      return y + '-' + m + '-' + d
+      return y + '-' + m
     },
     onChange(picker, value, index) {},
     onCancel() {
@@ -363,7 +354,7 @@ export default {
   padding-right: 10px;
   bottom: 5%;
   right: 2%;
-  
+
   position: absolute;
   font-size: 20px;
   border-radius: 10px;

+ 1 - 1
src/views/menu/training/components/personnelSignature.vue

@@ -129,7 +129,7 @@ export default {
         .then(res => {
           console.log(process.env.NODE_ENV);
           /*上传成功*/
-          let imgUrl = process.env.NODE_ENV === 'development' ? config.baseUrl + res.data.url :res.data.url
+          let imgUrl = process.env.NODE_ENV === 'development' ?  res.data.url : window.origin + res.data.url
          this.submitSign(imgUrl)
           
           // this.$emit("imgUrl", res.data.url);