2.7.4

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

@@ -217,6 +217,7 @@ export default {
   watch: {
     telIsVisCallout: function (newVal, oldVal) {
       if (newVal) {
+        console.log(newVal,'777888')
         this.readCardModel();
         this.tabActiveName = "first";
         // this.getMailList()
@@ -239,7 +240,7 @@ export default {
     },
     telCallNum: function(newT,oldT){
       if(newT){
-        store.dispatch("UpdateCalloutScreen", !this.telIsVisCallout);
+        store.dispatch("UpdateCalloutScreen", false);
       }
     },
   },

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

@@ -55,6 +55,7 @@ function getDeptmentMap(depts, pName, deptMap, ids = [], deptcode) {
           text: thisName,
           phone: element.phone || '',
           ids: thisIds,
+          location: element.location || '',
           deptcode: element.identification
         }
         if (element.children && element.children.length > 0) {

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

@@ -52,6 +52,7 @@ function getDeptmentMap(depts, pName, deptMap, ids = [], deptcode) {
           text: thisName,
           phone: element.phone || '',
           ids: thisIds,
+
           deptcode: element.identification
         }
         if (element.children && element.children.length > 0) {

CallCenterWeb.UI/RMYY/src/utils/fieldsData.js

@@ -241,10 +241,18 @@ export default {
     value: '工单编号'
   },
   {
+    key: 'F_ProposerDeptName',
+    value: '申请科室'
+  },
+  {
     key: 'F_ProposerName',
     value: '申请人'
   },
   {
+    key: 'F_DeptLocation',
+    value: '科室位置'
+  },
+  {
     key: 'F_Type',
     value: '业务类别'
   },

CallCenterWeb.UI/RMYY/src/views/comDispatch/components/dispatchdetail.vue

@@ -38,10 +38,13 @@
                 <td v-if="orderDetailData.F_ApplicationDept && orderDetailData.F_ApplicationDept!='0'">
                   {{ $store.getters.deptmap[parseInt(orderDetailData.F_ApplicationDept)].text }}</td>
                 <td v-if="!orderDetailData.F_ApplicationDept || orderDetailData.F_ApplicationDept=='0'">-</td>
-                <th>申请时间:</th>
-                <td>{{ orderDetailData.F_CreateTime }}</td>
+                <th>科室位置:</th>
+                <td>{{ orderDetailData.F_Location }}</td>
+                
               </tr>
               <tr>
+                <th>申请时间:</th>
+                <td>{{ orderDetailData.F_CreateTime }}</td>
                 <th>接单人:</th>
                 <td>
                   {{ orderDetailData.DealManName }}-{{
@@ -50,8 +53,8 @@
                 </td>
                 <th>完成时间:</th>
                 <td>{{ orderDetailData.F_Endtime || "-" }}</td>
-                <th>完成时长:</th>
-                <td>{{ orderDetailData.SpendTime || "-" }}</td>
+               <!-- <th>完成时长:</th>
+                <td>{{ orderDetailData.SpendTime || "-" }}</td> -->
               </tr>
               <tr v-show="isDD.indexOf('DD')>=0 || isDD==='GLY'">
                 <th>接单时间:</th>

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

@@ -40,7 +40,7 @@
                     orderDetailData.F_Applicantsphone
                   }})
                 </td>
-                <th>申请部门:</th>
+                <th>申请科室:</th>
                 <td>{{ orderDetailData.F_MaintenanceDept }}</td>
                 <th>申请时间:</th>
                 <td>{{ orderDetailData.F_CreateTime }}</td>

CallCenterWeb.UI/RMYY/src/views/orderManage/orderList/index.vue

@@ -42,7 +42,9 @@
           <el-tag v-if="scope.row.F_UrgeCount > 0" type="success">催{{ scope.row.F_UrgeCount }}</el-tag>
         </template>
       </el-table-column>
+      <el-table-column v-if="fieldListFlag.F_ProposerDeptName" prop="F_ProposerDept" :formatter="formtDept" label="申请科室" align="center" min-width />
       <el-table-column v-if="fieldListFlag.F_ProposerName" prop="F_ProposerName" label="申请人" align="center" min-width />
+      <el-table-column v-if="fieldListFlag.F_DeptLocation" prop="F_ProposerDept" :formatter="formtLocation" label="科室位置" align="center" min-width />
       <el-table-column v-if="fieldListFlag.F_Type" prop="F_Type" label="业务类别" align="center" min-width>
         <template slot-scope="scope">
           <span v-if="scope.row.F_Type==1000">业务咨询</span>
@@ -223,6 +225,20 @@
       };
     },
     methods: {
+      formtDept(row, column) {
+        if (row.F_ProposerDept) {
+          console.log(this.$store.getters.deptmap, 'this.$store.getters.deptmap')
+          return this.$store.getters.deptmap[parseInt(row.F_ProposerDept)]
+            .text;
+        }
+      },
+      formtLocation(row, column) {
+        if (row.F_ProposerDept) {
+          console.log(this.$store.getters.deptmap, 'this.$store.getters.deptmap')
+          return this.$store.getters.deptmap[parseInt(row.F_ProposerDept)]
+            .location;
+        }
+      },
       refList() {
         this.getList();
       },