协作

CallCenterWeb.UI/RMYY/src/api/orderManagement/orderList.js

@@ -7,6 +7,13 @@ export function postzhddToColleagueForm(data) {
     data
   })
 }
+export function postzhddCooperationForm(data) {
+  return request({
+    url: 'Scheduling/Cooperation',
+    method: 'post',
+    data
+  })
+}
 // 获取当前部门用户
 export function getCurrentDeptUsers(params) {
   return request({

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

@@ -715,6 +715,28 @@
         <el-button v-loading.fullscreen.lock="loading" type="primary" @click="submitForm('zhddToColleagueForm')">确 定</el-button>
       </div>
     </el-dialog>
+    <!-- 综合调度菜单-协作 -->
+    <el-dialog :visible.sync="dialogStatus.dialog_dispatch_xiezuo" title="协作">
+      <el-form ref="zhddCooperationForm" :model="zhddCooperationForm" :rules="rules" label-width="100px">
+        <el-row>
+          <el-form-item label="协作人">
+            <el-select v-model="zhddCooperationForm.ToUserCode" filterable placeholder="请选择协作人"
+              @click="zhddCooperationFormChange">
+              <el-option v-for="item in currentDeptUsers" :key="item.F_UserCode" :label="item.F_UserName"
+                :value="item.F_UserCode" :disabled="item.F_UserCode === curusercode"/>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="内容">
+            <el-input :autosize="{ minRows: 4, maxRows: 8 }" v-model="zhddCooperationForm.note" show-word-limit maxlength="100"
+              type="textarea" />
+          </el-form-item>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogStatus.dialog_dispatch_xiezuo = false">取 消</el-button>
+        <el-button v-loading.fullscreen.lock="loading" type="primary" @click="submitForm('zhddCooperationForm')">确 定</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -741,6 +763,7 @@
     postFinishWorkOrder,
     getCurrentDeptUsers,
     postzhddToColleagueForm,
+    postzhddCooperationForm
   } from "@/api/orderManagement/orderList";
   import {
     getSureWorkOrder,
@@ -780,6 +803,7 @@
     props: {},
     data() {
       return {
+        curusercode: "",
         loading: false,
         isxylx: "",
         xylxdatas: [],
@@ -864,6 +888,7 @@
           dialog_zhdd_cuidanOL: false,
           dialog_cldd_cuidanOL: false,
           dialog_dispatch_zhuantongshi: false,
+          dialog_dispatch_xiezuo: false,
           dialog_cldu_chehui: {
             text: "确定要撤回吗？",
             action: getCarWithdrawWorkOrder,
@@ -970,6 +995,10 @@
         zhddToColleagueForm: {
           ToUserCode: "",
         },
+        zhddCooperationForm: {
+          ToUserCode: "",
+          note: ""
+        },
         dispatchtransferForm: {
           DealMan: "",
           DealDept: "",
@@ -1143,6 +1172,7 @@
       };
     },
     created() {
+      this.curusercode = this.$store.getters.usercode;
       // this.getReason('FXYY')
       console.log("调用了");
       this.getTreebiaoben();
@@ -1224,6 +1254,9 @@
       zhddToColleagueFormChange(data) {
         this.zhddToColleagueForm.ToUserCode = data;
       },
+      zhddCooperationFormChange(data) {
+        this.zhddCooperationForm.ToUserCode = data;
+      },
       removeItem(index) {
         this.dispatchhaocaiarrError.splice(index, 1);
       },
@@ -1458,7 +1491,9 @@
         this.wocode = code;
         this.fid = row.F_ID;
         this.rowdata = row;
-        this.worktypeInfo = this.$store.getters.workTypeMap[parseInt(row.F_SonType || row.F_WorkOrderCategory || row.F_type2)].tag
+        if(this.$store.getters.workTypeMap[parseInt(row.F_SonType || row.F_WorkOrderCategory || row.F_type2)]){         
+          this.worktypeInfo = this.$store.getters.workTypeMap[parseInt(row.F_SonType || row.F_WorkOrderCategory || row.F_type2)].tag
+        }
         console.log(name, "name",row.F_SonType,row.F_WorkOrderCategory,this.worktypeInfo);
         console.log(this.getNowDate());
         if (name === "dispatch_zhuantongshi") {
@@ -1468,6 +1503,13 @@
           this.dialogStatus.dialog_dispatch_zhuantongshi = true;
           return;
         }
+        if (name === "dispatch_xiezuo") {
+          // 综合调度协作
+          this.getDepUsers();
+          this.dialogStatus.dialog_dispatch_xiezuo = true;
+          this.zhddCooperationForm.note = row.F_Content
+          return;
+        }
         if (name === "zhipai") {
           //清空
           this.deptidArr = [];
@@ -2195,6 +2237,9 @@
               case "zhddToColleagueForm":
                 this.postEvent = postzhddToColleagueForm;
                 break;
+              case "zhddCooperationForm":
+                this.postEvent = postzhddCooperationForm;
+                break;
               default:
                 break;
             }
@@ -2292,6 +2337,10 @@
                       this.dispatchtransferForm.DealDept = "";
                       this.dispatchtransferForm.DealMan = "";
                     }
+                    if(this.optionName == "dispatch_xiezuo"){
+                      this.zhddCooperationForm.ToUserCode = ""
+                      this.zhddCooperationForm.note = ""
+                    }
                     if (this.optionName == "ywzx_finish") {
                       this.finishForm.reason = "";
                       this.finishForm.type = "";

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

@@ -13,7 +13,8 @@
                   orderDetailData.StateName
                 }}</span>
                 <span v-if="orderDetailData.F_UrgeCount > 0" class="wostate" style="color: #60c136;border: 1px solid #60c136; ">催办{{ orderDetailData.F_UrgeCount }}</span>
-                <span class="wostate" v-if="orderDetailData.GapTime && orderDetailData.GapTime.indexOf('超时')>=0" style="color: #880000;border: 1px solid #880000; ">超期</span>
+                <span class="wostate" v-if="orderDetailData.GapTime && orderDetailData.GapTime.indexOf('超时')>=0" style="color: #880000;border: 1px solid #880000; ">超期</span>
+                <span class="wostate" v-if="orderDetailData.F_IsCollaborate && orderDetailData.F_IsCollaborate == 1" style="color: #e1ad3a;border: 1px solid #e1ad3a; ">协作</span>
               </h1>
             </el-col>
           </el-col>
@@ -75,7 +76,9 @@
               </tr>
               <tr>
                 <th>科室位置:</th>
-                <td colspan="5">{{ orderDetailData.F_LocationNew }}</td>
+                <td colspan="2">{{ orderDetailData.F_LocationNew }}</td>
+                <th>协作人:</th>
+                <td colspan="2">{{orderDetailData.Collaborator }} - {{ orderDetailData.F_Collaborator }}</td>
               </tr>
               <tr v-show="isDD.indexOf('DD') >= 0 || isDD === 'GLY'">
                 <th>接单时间:</th>

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

@@ -33,6 +33,7 @@
             @click="hadndleOrderCode(scope.row)">{{ scope.row.F_WorkOrderCode }}</span>
           <el-tag v-if="scope.row.F_UrgeCount > 0" style="color: #60c136;border: 1px solid #60c136;background: none;">催办{{ scope.row.F_UrgeCount }}</el-tag>
           <el-tag v-if="scope.row.GapTime && scope.row.GapTime.indexOf('超时')>=0"  style="color: #880000;border: 1px solid #a80000;background: none;">超期</el-tag>
+          <el-tag v-if="scope.row.F_IsCollaborate == 1" style="color: #e1ad3a;border: 1px solid #e1ad3a;background: none;">协作</el-tag>
         </template>
       </el-table-column>
       <el-table-column v-if="fieldListFlag.F_WorkOrderCategory" :formatter="formtOrder" prop="F_WorkOrderCategory"
@@ -204,15 +205,19 @@
       },
       formtOrder(row, column) {
         if (row.F_WorkOrderCategory) {
-          return this.$store.getters.workTypeMap[
-            parseInt(row.F_WorkOrderCategory)
-          ].text;
+          if(this.$store.getters.workTypeMap[parseInt(row.F_WorkOrderCategory)]){
+            return this.$store.getters.workTypeMap[
+              parseInt(row.F_WorkOrderCategory)
+            ].text;
+          }
         }
       },
       formtOrderDept(row, column) {
         if (row.F_ApplicationDept && row.F_ApplicationDept != "0") {
-          return this.$store.getters.deptmap[parseInt(row.F_ApplicationDept)]
-            .text;
+          if(this.$store.getters.deptmap[parseInt(row.F_ApplicationDept)]){
+            return this.$store.getters.deptmap[parseInt(row.F_ApplicationDept)]
+              .text;
+          }
         }
       },
       btnClickEvents(button, wocode, row) {

CallCenterWeb.UI/RMYY/src/views/leadConcernNew/officeServiceReport/index.vue

@@ -29,7 +29,7 @@
             v-for="item in repairman1"
             :key="item.usercode"
             :label="item.username + '(' + item.count + ')'"
-            :value="item.username"
+            :value="item.usercode"
           />
         </el-select>
       </el-form-item>

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

@@ -65,6 +65,7 @@
           <el-tag v-if="scope.row.GapTime && scope.row.GapTime.indexOf('超时')>=0"
             style="color: #880000;border: 1px solid #a80000;background: none;">超期</el-tag>
             <el-tag v-if="scope.row.F_TransferCount && scope.row.F_TransferCount>1" style="color: #55aa7f;border: 1px solid #55aa7f;background: none;">转{{ scope.row.F_TransferCount-1 }}</el-tag>
+          <el-tag v-if="scope.row.F_IsCollaborate == 1" style="color: #e1ad3a;border: 1px solid #e1ad3a;background: none;">协作</el-tag>
         </template>
       </el-table-column>
       <el-table-column v-if="fieldListFlag.F_ProposerDeptName" prop="F_ProposerDept" :formatter="formtDept" label="申请科室"

CallCenterWeb.UI/RMYYAPP/config/buttons.config.js

@@ -368,6 +368,12 @@ export default {
 		annotation:	"转同事",
 		eventName: "disTrunCollBtn"
 	},
+	'dispatch_xiezuo': {
+		id: 54,
+		text: "协作",
+		annotation:	"协作",
+		eventName: "disCoppernBtn"
+	},
 	'zhuandiaodu': {
 		id: 52,
 		text: "转调度",

CallCenterWeb.UI/RMYYAPP/pages/myTask/comDispatch/applicantList/applicantList.vue

@@ -38,6 +38,7 @@
 									<!-- <view class="textState" style="color: red;border:1px solid red;" v-if="item.StateName=='待接单'">{{ item.StateName}}</view> -->
 									<!-- <view class="textState" v-if="item.StateName!='待接单'">{{ item.StateName}}</view> -->
 									<view class="textState" style="right: 85px;" v-show="item.F_UrgeCount>0">催办 {{item.F_UrgeCount}}</view>
+									<view class="textState" style="right: 62px;color: #e1ad3a;border:1px solid #e1ad3a;text-align: center;" v-show="item.F_IsCollaborate==1">协作</view>
 								</view>							
 							</view>
 							<view class="textStateOld" style="color: red;border:1px solid red;" v-if="item.StateName=='待接单'">{{ item.StateName}}</view>

CallCenterWeb.UI/RMYYAPP/pages/myTask/comDispatch/comDispatchDetail/comDispatchDetail.vue

@@ -12,6 +12,7 @@
 				<text class="textState" style="margin-left: 10px">{{
           detailContentData.StateName
         }}</text>
+			<text class="textState" v-show="detailContentData.F_IsCollaborate==1" style="color: #e1ad3a;border: 1px solid #e1ad3a;text-align: center;">协作</text>
 			</view>
 			<view class="contentTable">
 				<text class="contentTitle">工单类型：</text>
@@ -95,6 +96,10 @@
 				<text class="contentText">{{ detailContentData.F_AcceptTime }}</text>
 			</view>
 			<view class="contentTable">
+				<text class="contentTitle">协作人：</text>
+				<text class="contentText">{{ detailContentData.Collaborator }} - {{ detailContentData.F_Collaborator }}</text>
+			</view>
+			<view class="contentTable">
 				<text class="contentTitle">完成时间：</text>
 				<text class="contentText">{{ detailContentData.F_Endtime }}</text>
 			</view>
@@ -235,7 +240,7 @@
 			<view>
 				<text class="operationButtonTitle">操作</text>
 				<buttonsComponents class="buttons" :order-button-data="orderButtonData" :wid="workorderid"
-					:orderType="workOrdertype" :departid="departid" :applicationDept="applicationDept" />
+					:orderType="workOrdertype" :departid="departid" :applicationDept="applicationDept" :workerCon="workerCon" />
 			</view>
 		</view>
 
@@ -358,6 +363,7 @@
 				departid: "",
 				applicationDept: "",
 				workOrdertype: "",
+				workerCon: "",
 				sonData: [],
 				findIndex: -1,
 				evaluateDate: [], // 评价
@@ -538,6 +544,7 @@
 								console.log(this.detailContentData.F_WorkOrderCategory, '88999')
 								this.workOrdertype = this.detailContentData.F_WorkOrderCategory;
 								this.applicationDept = this.detailContentData.F_ApplicationDept;
+								this.workerCon = this.detailContentData.F_Content;
 								const identification = this.$mHelper.findParents(
 									this.orderTypeList,
 									this.detailContentData.F_WorkOrderCategory
@@ -692,6 +699,7 @@
 					color: #52c41a;
 					background-color: rgba(195, 239, 161, 0.2);
 					border-radius: 5px;
+					margin-left: 10px;
 				}
 
 				.fx {

CallCenterWeb.UI/RMYYAPP/pages/myTask/workOrderDetail/button/button.vue

@@ -12,8 +12,8 @@
 				<uni-popup-dialog ref="inputClose" mode="input" :title="title" @confirm="dialogInputConfirm">
 					<view style="width:100%;">
 						<!-- <uni-data-checkbox v-model="assignType" :localdata="assignTypeVisit" style="margin-bottom: 20px;" v-show="auditPlaceholder === 'show'"/> -->
-						<uni-data-select v-model="Maintenancer" :localdata="maintenancerDate" @change="maintenancerChange" v-show="auditPlaceholder === 'show' || auditPlaceholder === 'show_users'"/>
-						<uni-easyinput type="textarea" autoHeight maxlength="100" v-model="cbreason" :placeholder="auditPlaceholder" v-show="!(auditPlaceholder === 'show' || auditPlaceholder === 'show_users')"/>
+						<uni-data-select style="margin-bottom: 10px;" v-model="Maintenancer" :localdata="maintenancerDate" @change="maintenancerChange" v-show="auditPlaceholder === 'show' || auditPlaceholder === 'show_users' || auditPlaceholder === 'show_xzusers'"/>
+						<uni-easyinput type="textarea" autoHeight maxlength="100" placeholder="请输入内容" v-model="cbreason" v-show="!(auditPlaceholder === 'show' || auditPlaceholder === 'show_users')"/>
 					</view>
 				</uni-popup-dialog>
 			</uni-popup>
@@ -111,7 +111,11 @@
 			fid:{
 				type:String,
 				default:''
-			}
+			},
+			workerCon: {
+				type: String,
+				default: ''
+			},
 		},
 		data() {
 			return {
@@ -176,6 +180,24 @@
 				this.auditPlaceholder = 'show_users'
 				this.$refs.inputDialog.open()
 			},
+			disCoppernBtn(){
+				this.cbreason = this.workerCon
+				const dept = uni.getStorageSync("deptId");
+				const curcode = uni.getStorageSync("userCode");
+				console.log(dept, 'dept');
+				pageData.getCurrentDeptUsers(dept, (res) => {
+					console.log(res,dept)
+					res.forEach(v => {
+						if(v.value == curcode ) {
+							v.disable = true
+						}
+					})
+					this.maintenancerDate = res
+				})
+				this.title = '协作'
+				this.auditPlaceholder = 'show_xzusers'
+				this.$refs.inputDialog.open()
+			},
 			callBtnMethods(methodName) {
 				console.log(methodName, 'methodName')
 				this[methodName]();
@@ -589,11 +611,22 @@
 				uni.showLoading({
 					title: '加载中'
 				})
+				// console.log(this.auditPlaceholder)
+				// console.log(this.Maintenancer, 'this.Maintenancer')
+				// return
 				// 关闭窗口后，恢复默认内容
 				if (this.auditPlaceholder !== 'show_users' && !this.cbreason) {
 					this.$mHelper.toast(this.auditPlaceholder)
 					return
 				}
+				if (this.auditPlaceholder == 'show_xzusers') {
+					if(!this.Maintenancer) {
+						this.$mHelper.toast('请选择协作人');
+						return
+					}
+					const addParams = {ToUserCode: this.Maintenancer,WorkOrderCode: this.wid,note: this.cbreason}
+					this.workOrderContent("Scheduling/Cooperation",addParams)
+				}
 				if(this.auditPlaceholder === 'show_users') {
 					console.log(this.Maintenancer, 'this.Maintenancer')
 					if(!this.Maintenancer) {

CallCenterWeb.UI/RMYYAPP/unpackage/cache/apk/apkurl

@@ -1 +1 @@
-https://ide.dcloud.net.cn/build/download/331a8200-6c91-11ee-a899-9d2438a0c6f8
+https://ide.dcloud.net.cn/build/download/1e1b4eb0-7306-11ee-a47b-17c17218b4e6

CallCenterWeb.UI/rmyyechartsNew/src/components/IVRSatisfactionByNow.vue

@@ -300,7 +300,7 @@
 		width: 90px;
 		text-align: center;
 		position: absolute;
-		right: 5px;
+		right: 2px;
 		bottom: 30px;
 		color: #38acac;
 		font-size: 14px;

CallCenterWeb.UI/rmyyechartsNew/src/components/connectionRate.vue

@@ -106,7 +106,7 @@
 					},
 					legend: {
 						icon: "circle",
-						top: '10%',
+						top: '-20%',
 						left: 'right',
 						orient: 'vertical',
 						padding: [80, 20, 0, 0],
@@ -115,7 +115,7 @@
 						textStyle: {
 							//图例文字的样式
 							color: ["#ffffff", "#ffffff"],
-							fontSize: 14,
+							fontSize: 12,
 						},
 					},
 					// graphic: {
@@ -147,7 +147,7 @@
 							labelLine: {
 								normal: {
 									length:20,
-									length:10,
+									length:5,
 									lineStyle: {
 										color: '#8098cd'
 									},

CallCenterWeb.UI/rmyyechartsNew/src/components/traffic.vue

@@ -102,7 +102,7 @@
 					},
 					legend: {
 						icon: "circle",
-						top: '10%',
+						top: '-20',
 						left: 'right',
 						orient: 'vertical',
 						padding: [80, 20, 0, 0],
@@ -111,7 +111,7 @@
 						textStyle: {
 							//图例文字的样式
 							color: ["#ffffff", "#ffffff"],
-							fontSize: 14,
+							fontSize: 12,
 						},
 					},
 					color: ['#09dae7', "#ff957c"],
@@ -215,6 +215,6 @@
 	#traffic {
 		background-image: url("../assets/imgs/来电服务评价.png");
 		background-size: 100% 100%;
-		padding-top: 10px;
+		padding-top: 10px;		
 	}
 </style>

CallCenterWeb.UI/rmyyechartsNew/src/views/Home.vue

@@ -16,17 +16,17 @@
 				<!-- 话务 -->
 				<el-col :span="6">
 					<!-- 来电服务评价 -->
-					<div class="grid-content">
+					<div class="grid-content" style="position: relative;right: 20px;">
 						<traffic :searchData='searchType'></traffic>
 					</div>
 					<!-- 工单满意度 -->
-					<div class="grid-content">
+					<div class="grid-content" style="position: relative;right: 20px;">
 						<connection-rate :searchData='searchType'></connection-rate>
 					</div>
 				</el-col>
 				<el-col :span="12">
 					<!-- 地图 -->
-					<div class="grid-content">
+					<div class="grid-content" style="position: relative;right: 5px;">
 						<conversation-by-now :searchData='searchType'></conversation-by-now>
 					</div>
 				</el-col>
@@ -40,7 +40,7 @@
 			<el-row :gutter="20">
 				<!-- 调度平台 -->
 				<el-col :span="12">
-					<div class="grid-content">
+					<div class="grid-content" style="position: relative;right: 20px;">
 						<car-type :searchData='searchType'></car-type>
 					</div>
 				</el-col>
@@ -156,8 +156,8 @@
 
 	.grid-content {
 		// padding: 10px;
-		border-radius: 4px;
-		min-height: 36px;
+		// border-radius: 4px;
+		// min-height: 36px;
 		// background-color: rgba(0,45,92,.6)
 	}
 </style>