xg

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

@@ -27,13 +27,14 @@
         min-width="130">
         <template slot-scope="scope">
           <span style="color: #409eff; cursor: pointer"
-            @click="hadndleOrderCode(scope.row.F_WorkOrderCode)">{{ scope.row.F_WorkOrderCode }}</span>
           <el-tag v-if="scope.row.F_IsBack == 1" type="danger">退</el-tag>
-           <el-tag v-if="scope.row.F_IsBack == 1" type="danger">退</el-tag>
-           <el-tag v-if="scope.row.F_ReturnNum > 0">返修{{ scope.row.F_ReturnNum }}</el-tag>
-           <el-tag v-if="scope.row.F_ReplayCount > 0" type="warning">延期{{ scope.row.F_ReplayCount }}</el-tag>
-           <el-tag v-if="scope.row.ishangup == '是'" type="info">挂起</el-tag>
-           <el-tag v-if="scope.row.F_EmergencyTypes == '紧急'" type="danger">紧急</el-tag>
-           <el-tag v-if="scope.row.GapTime && scope.row.GapTime.indexOf('超时')>=0" type="danger">超期</el-tag>
+            @click="hadndleOrderCode(scope.row.F_WorkOrderCode)">{{ scope.row.F_WorkOrderCode }}</span>
+           <el-tag v-if="scope.row.F_EmergencyTypes == '紧急'" style="color: #ff0000;border: 1px solid #ff0000;background: none;">紧急</el-tag>
+           <el-tag v-if="scope.row.F_ReturnNum > 0" style="color: #f56c6c;border: 1px solid #f56c6c;background: none;">返修{{ scope.row.F_ReturnNum }}</el-tag>
+           <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.F_IsBack == 1" style="color: #3478f6;border: 1px solid #3478f6;background: none;">退单</el-tag>
+           <el-tag v-if="scope.row.F_ReplayCount > 0" style="color: #ddb642;border: 1px solid #ddb642;background: none;">延期{{ scope.row.F_ReplayCount }}</el-tag>
+           <el-tag v-if="scope.row.ishangup == '是'" style="color: #4fa0f4;border: 1px solid #4fa0f4;background: none;">挂起</el-tag>
+           <el-tag v-if="scope.row.GapTime && scope.row.GapTime.indexOf('超时')>=0" style="color: #880000;border: 1px solid #880000;background: none;">超期</el-tag>
         </template>
       </el-table-column>
       <el-table-column v-if="fieldListFlag.F_WorkOrderCategory" :formatter="formtOrder" prop="F_WorkOrderCategory"
@@ -1091,7 +1092,7 @@
               const tagStr = this.$store.getters.workTypeMap[parseInt(ids[1])].tag;
               if (tagStr === "gzbx_jjhq") this.doneForm.showBeforePhoto = true;
             }
-          }        
+          }
         }
         this.dialogDone = true;
         this.doneForm.workordercode = code;

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

@@ -14,9 +14,9 @@
           end-placeholder="结束日期"
         />
       </el-form-item>
-      <el-form-item label="报工科室">
+      <!-- <el-form-item label="报工科室">
         <select-dept-tree :deptparam="deptidArr" @post-deptid="getDeptid" />
-      </el-form-item>
+      </el-form-item> -->
       <!-- <el-form-item label="业务类别">
         <el-select v-model="ruleForm.type">
           <el-option label="业务咨询" value="1000"></el-option>

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

@@ -10,17 +10,17 @@
                   orderDetailData.F_WorkOrderCode
                 }}
                 <span class="wostate">{{ orderDetailData.StateName }}</span>
-                <span v-if="orderDetailData.F_UrgeCount > 0" class="wostate"
-                  >催{{ orderDetailData.F_UrgeCount }}</span>
+                <span v-if="orderDetailData.F_UrgeCount > 0" class="wostate" style="color: #60c136;border: 1px solid #60c136; ">催办{{ orderDetailData.F_UrgeCount }}</span>
                 <span
                   v-if="isrework == true"
                   class="wostate"
-                  style="color: #f56c6c"
+                  style="color: #f56c6c;border: 1px solid #f56c6c;"
                   >返修</span>
-                  <span class="wostate" v-if="orderDetailData.F_ReplayCount > 0" style="color: #cfca25">延期{{ orderDetailData.F_ReplayCount }}</span>
-                  <span class="wostate" v-if="orderDetailData.ishangup == '是'" style="color: #00aaff">挂起</span>
-                  <span class="wostate" v-if="orderDetailData.F_EmergencyTypes == '紧急'" style="color: #f56c6c">紧急</span>
-                  <span class="wostate" v-if="orderDetailData.GapTime && orderDetailData.GapTime.indexOf('超时')>=0" style="color: #aa0000">超期</span>
+                  <span class="wostate" v-if="orderDetailData.F_IsBack == 1" style="color: #3478f6;border: 1px solid #3478f6; ">退单</span>
+                  <span class="wostate" v-if="orderDetailData.F_ReplayCount > 0" style="color: #ddb642;border: 1px solid #ddb642; ">延期{{ orderDetailData.F_ReplayCount }}</span>
+                  <span class="wostate" v-if="orderDetailData.ishangup == '是'" style="color: #4fa0f4;border: 1px solid #4fa0f4; ">挂起</span>
+                  <span class="wostate" v-if="orderDetailData.F_EmergencyTypes == '紧急'" style="color: #ff0000;border: 1px solid #ff0000; ">紧急</span>
+                  <span class="wostate" v-if="orderDetailData.GapTime && orderDetailData.GapTime.indexOf('超时')>=0" style="color: #880000;border: 1px solid #880000; ">超期</span>
               </h1>
             </el-col>
             <el-col :md="6" />

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

@@ -100,7 +100,7 @@
             >{{ scope.row.F_WoCode }}</span
           >
           <el-tag v-if="scope.row.F_UrgeCount > 0" type="success"
-            >催{{ scope.row.F_UrgeCount }}</el-tag
+            >催办{{ scope.row.F_UrgeCount }}</el-tag
           >
         </template>
       </el-table-column>

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

@@ -23,6 +23,7 @@
       </el-select>
       <el-cascader ref="cascader" v-model="searchData.orderids" :options="subclassData" :props="defaultProps"
         size="medium" placeholder="请选择工单类别" filterable clearable @change="handleChange" />
+      <select-dept-tree :deptparam="deptidArr" style="width: 15%" @post-deptid="getDeptid" />
       <el-button type="primary" class="filter-btn" icon="el-icon-search" @click="btn_search">
         搜索
       </el-button>
@@ -47,13 +48,13 @@
         <template slot-scope="scope">
           <span style="color: #409eff; cursor: pointer"
             @click="hadndleOrderCode(scope.row)">{{ scope.row.F_WoCode }}</span>
-          <el-tag v-if="scope.row.F_UrgeCount > 0" type="success">催{{ scope.row.F_UrgeCount }}</el-tag>
-          <el-tag v-if="scope.row.F_IsBack == 1" type="danger">退</el-tag>
-          <el-tag v-if="scope.row.F_ReturnNum > 0">返修{{ scope.row.F_ReturnNum }}</el-tag>
-          <el-tag v-if="scope.row.F_ReplayCount > 0" type="warning">延期{{ scope.row.F_ReplayCount }}</el-tag>
-          <el-tag v-if="scope.row.ishangup == '是'" type="info">挂起</el-tag>
-          <el-tag v-if="scope.row.F_EmergencyTypes == '紧急'" type="danger">紧急</el-tag>
-          <el-tag v-if="scope.row.GapTime && scope.row.GapTime.indexOf('超时')>=0" type="danger">超期</el-tag>
+          <el-tag v-if="scope.row.F_ReturnNum > 0" style="color: #f56c6c;border: 1px solid #f56c6c;background: none;">返修{{ scope.row.F_ReturnNum }}</el-tag>
+          <el-tag v-if="scope.row.F_EmergencyTypes == '紧急'" style="color: #ff0000;border: 1px solid #ff0000;background: none;">紧急</el-tag>
+          <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.F_IsBack == 1" style="color: #3478f6;border: 1px solid #3478f6;background: none;">退单</el-tag>
+          <el-tag v-if="scope.row.F_ReplayCount > 0" style="color: #ddb642;border: 1px solid #ddb642;background: none;">延期{{ scope.row.F_ReplayCount }}</el-tag>
+          <el-tag v-if="scope.row.ishangup == '是'" style="color: #4fa0f4;border: 1px solid #4fa0f4;background: none;">挂起</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>
         </template>
       </el-table-column>
       <el-table-column v-if="fieldListFlag.F_ProposerDeptName" prop="F_ProposerDept" :formatter="formtDept" label="申请科室" align="center" min-width />
@@ -193,6 +194,7 @@
     },
     data() {
       return {
+        deptidArr:[],
         sourceData:[],
         isloading:0,
         activeName: "0",
@@ -217,7 +219,8 @@
           myd: "",
           state: "", // 工单状态
           usercode: "",
-          OrderSource:""
+          OrderSource:"",
+          deptid:''
         },
         pageParams: {
           pageindex: 1, // 当前第几页
@@ -268,6 +271,9 @@
 
         }
       },
+      getDeptid(data) {
+        this.searchData.deptid = data[data.length - 1];
+      },
       getSource(){
         GetDicValue("QUDAO").then(res=>{
           this.sourceData = res.rows
@@ -335,6 +341,7 @@
             loweltype: this.searchData.orderids[this.searchData.orderids.length - 1],
             state: this.searchData.state, // 工单状态
             myd: this.searchData.myd,
+            deptid: this.searchData.deptid,
             pageindex: this.pageParams.pageindex, // int 第几页
             pagesize: this.pageParams.pagesize, // int 每页几条信息
           };
@@ -362,6 +369,7 @@
           pageindex: this.pageParams.pageindex, // int 第几页
           pagesize: this.pageParams.pagesize, // int 每页几条信息
           tab: this.searchData.tab,
+          deptid: this.searchData.deptid,
           isdc: 1,
         };
         exportExcel(exportparams, getListExpt);

CallCenterWeb.UI/RMYY/src/views/systemSetup/roleSetting/hospitalArea/component/addOrEditHospital.vue

@@ -4,6 +4,9 @@
       <el-form-item label="院区名称" prop="name">
         <el-input v-model="ruleForm.T_Woname" placeholder="请输入院区名称" />
       </el-form-item>
+      <el-form-item label="排序" prop="sore">
+        <el-input-number v-model="ruleForm.T_Wosort"></el-input-number>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" @click="submitForm">保存</el-button>
       </el-form-item>
@@ -38,7 +41,8 @@ export default {
     return {
       loading: false,
       ruleForm: {
-        T_Woname: ''
+        T_Woname: '',
+        T_Wosort:0
       },
       rules: {
         T_Woname: [{ required: true, message: '请输入院区名称' }]
@@ -58,6 +62,7 @@ export default {
       }
       getyqModule(params).then((res) => {
         this.ruleForm.T_Woname = res.data.T_Woname // 分类名称
+        this.ruleForm.T_Wosort = res.data.F_Sort //排序
       })
     },
     submitForm() {
@@ -66,7 +71,8 @@ export default {
           this.loading = true
           if (this.state === 0) {
             const params = {
-              T_Woname: this.ruleForm.T_Woname
+              T_Woname: this.ruleForm.T_Woname,
+              F_Sort: this.ruleForm.T_Wosort
             }
             addwotyq(params)
               .then((res) => {
@@ -88,6 +94,7 @@ export default {
             // 编辑
             const params = {
               T_Woname: this.ruleForm.T_Woname,
+              F_Sort: this.ruleForm.T_Wosort,
               T_Woid: Number(this.id)
             }
             edittyq(params)

CallCenterWeb.UI/RMYY/src/views/systemSetup/roleSetting/hospitalArea/index.vue

@@ -125,7 +125,7 @@ export default {
           parent: this, // 当前的vue对象
           data: { state: 0, id: "" }, // props//该方法会自动添加一个key为layerid的值， 该值为创建层的id， 可以直接使用
         },
-        area: ["40%", "20%"],
+        area: ["40%", "40%"],
         shadeClose: false,
         title: "添加院区分类",
       });
@@ -146,9 +146,9 @@ export default {
           parent: this, // 当前的vue对象
           data: { state: 1, id: T_Woid }, // props//该方法会自动添加一个key为layerid的值， 该值为创建层的id， 可以直接使用
         },
-        area: ["40%", "20%"],
+        area: ["40%", "40%"],
         shadeClose: false,
-        title: "编辑部门分类",
+        title: "编辑院区分类",
       });
     },
     // 删除

CallCenterWeb.UI/RMYYAPP/pages.json

@@ -307,6 +307,15 @@
             }
             
         }
+        ,{
+            "path" : "pages/myTask/Hardware/Hardware",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "硬件服务",
+                "enablePullDownRefresh": false
+            }
+            
+        }
     ],
     "globalStyle": {
         "navigationBarTextStyle": "white",

CallCenterWeb.UI/RMYYAPP/pages/myTask/Hardware/Hardware.vue

@@ -0,0 +1,146 @@
+<template>
+	<view class="wrapper">
+		<view class="contentbox">
+			<view class="titlebox">{{titlebox}}</view>
+			<view id="echartbox"></view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import * as echarts from '@/components/echarts/echarts.min.js'; // 引入 echarts
+	export default {
+		data() {
+			return {
+				titlebox: "硬件服务TOP20"
+			}
+		},
+		onLoad(option) {
+			if (option.waretype == 0) {
+				uni.setNavigationBarTitle({
+					title: '软件服务'
+				})
+				this.titlebox = "软件服务TOP20"
+			}
+			this.getListData(option)
+		},
+		onReady() {
+			this.chart = echarts.init(document.getElementById('echartbox'))
+			// this.chartData()
+		},
+		methods: {
+			getListData(option){
+				const params={
+					starttime: option.starttime,
+					endtime: option.endtime,
+					type: option.waretype
+				}
+				this.$http.get("FaultRepair/DayReportDetail", params).then((response) => {
+					if (response.state == "success") {
+						var rowData = []
+						var colData1 = []
+						var colData2 = []
+						var colData3 = []
+						if (response.data.length > 0) {
+							response.data.forEach((item, index) => {
+								rowData.push(item.deptname)
+								colData1.push(Number(item.finish))		
+								colData1.push(Number(item.unfinish))
+								colData1.push(Number(item.fx))
+								this.chartData(rowData, colData1, colData2, colData3)
+							})
+						} else {
+							rowData = ['科室名称', '科室名称', '科室名称']
+							colData1 = [0, 0, 0]
+							colData2 = [0, 0, 0]
+							colData3 = [0, 0, 0]
+							this.chartData(rowData, colData1, colData2, colData3)
+						}
+					}
+				})
+			},
+			//图表
+			chartData(rowd, cold1, cold2, cold3) {
+				this.chart.setOption({
+					tooltip: {
+						trigger: 'axis',
+						axisPointer: {
+							type: 'shadow'
+						}
+					},
+					legend: {
+						x:'left',
+						y:'left',
+						data:['完成量','未完成量','返修量'],
+						selectedMode:false
+					},
+					color:["#7b9df2","#8ebb75","#dabe4f"],
+					grid: {
+						left: '1%',
+						right: '1%',
+						bottom: '3%',
+						containLabel: true
+					},
+					xAxis: {
+						axisLine: false,
+						type: 'value'
+					},
+					yAxis: {
+						type: 'category',
+						data: rowd
+					},
+					series: [{
+							name: '完成量',
+							type: 'bar',
+							stack: 'total',
+							label: {
+								show: true
+							},
+							data: cold1
+						},
+						{
+							name: '未完成量',
+							type: 'bar',
+							stack: 'total',
+							label: {
+								show: true
+							},
+							data: cold2
+						},
+						{
+							name: '返修量',
+							type: 'bar',
+							stack: 'total',
+							label: {
+								show: true
+							},
+							data: cold3
+						},
+					]
+				})
+			},
+		}
+	}
+</script>
+
+<style scoped>
+	.contentbox {
+		padding: 10px 10px;
+		background-color: #f2f2f2;
+	}
+
+	.titlebox {
+		margin-bottom: 15px;
+		margin-left: 5px;
+	}
+
+	.wrapper {
+		padding: 10px 10px;
+		background-color: #fff;
+	}
+
+	#echartbox {
+		width: 100%;
+		height: 800rpx;
+	}
+</style>

CallCenterWeb.UI/RMYYAPP/pages/myTask/consultList/consultList.vue

@@ -38,7 +38,7 @@
 								</view>
 								
 							</view>
-							<view class="textStateOld" style="color: red;border:1px solid red;" v-if="item.StateName=='待接单'">{{ item.StateName}}</view>
+							<view class="textStateOld" style="color: #e19003;border:1px solid #e19003;" v-if="item.StateName=='待接单'">{{ item.StateName}}</view>
 							<view class="textStateOld" v-if="item.StateName!='待接单'">{{ item.StateName}}</view>				
 						</view>
 					</template>

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

@@ -23,7 +23,7 @@
 					<text>{{ item.text }}</text>
 				</view>
 			</view>
-			
+
 			<view v-if="isgly==1" class="orderTit" style="padding-left: 15px;color: rgb(126, 131, 125);">
 				<text
 					style="width: 4px;background-color: rgb(26, 188, 156);height: 20px;margin-top: 10px;margin-right: 5px;"></text>
@@ -35,7 +35,7 @@
 					<text>{{ item.text }}</text>
 				</view>
 			</view>
-			
+
 			<view class="orderTit" @click="changeStore" v-if="noticState">
 				<image style="background: #ff9600" src="/static/icon_noticefi.png"></image>
 				<text>公告通知</text>
@@ -55,17 +55,17 @@
 		<view>
 			<uni-popup ref="inputDialogs" type="dialog">
 				<uni-popup-dialog ref="inputClose" mode="input" :title="title" @confirm="dialogInputConfirm">
-					<view>
-						<!-- <uni-table style="height: 600rpx;" ref="table" border stripe type="selection" emptyText="暂无更多数据"
-							@selection-change="selectionChange">
-							<uni-tr>
-								<uni-th align="center">科室</uni-th>
-							</uni-tr>
-							<uni-tr v-for="(item, index) in allowData" :key="index">
-								<uni-td align="center">{{ $mHelper.findParents(departList, item.deptid) }}</uni-td>
-							</uni-tr>
-						</uni-table> -->
-						<uni-table style="height: 600rpx;" ref="table" border stripe emptyText="暂无更多数据">
+					<view style="height: 600rpx;overflow-y: auto;">
+						<radio-group @change="radioChange" style="width: 100%;height: 600rpx;">
+							<label class="uni-list-cell uni-list-cell-pd" v-for="(item, index) in allowData"
+								:key="index">
+								<view v-show="item.deptname" style="width:100%;line-height: 24px;color: #606266;margin-bottom: 10px;">
+									<radio style="width: 30px;" :value="item.deptid" :checked="index === current" />
+									<text class="yydepttit">{{ item.deptname }}</text>
+								</view>
+							</label>
+						</radio-group>
+						<!-- <uni-table style="height: 600rpx;" ref="table" border stripe emptyText="暂无更多数据">
 							<uni-tr>
 								<uni-th align="center">请选择</uni-th>
 							</uni-tr>
@@ -83,7 +83,7 @@
 									</radio-group>
 								</uni-td>
 							</uni-tr>
-						</uni-table>
+						</uni-table> -->
 					</view>
 				</uni-popup-dialog>
 			</uni-popup>
@@ -103,7 +103,7 @@
 	export default {
 		data() {
 			return {
-				isgly:0,
+				isgly: 0,
 				indicatorDots: true,
 				getFontSizeValue: '1rem',
 				autoplay: true,
@@ -112,8 +112,7 @@
 				duration: 500,
 				bannnerData: [],
 				orderListData: [],
-				reportListData:[
-					{
+				reportListData: [{
 						id: "15",
 						imagePath: "../../static/icon_vehicleScheduling.png",
 						imageBg: "#aaffff",
@@ -133,7 +132,7 @@
 				allowData: [],
 				title: "允用科室",
 				selectedIndexs: [],
-				current:"",
+				current: "",
 				onchangedept: ''
 			}
 		},
@@ -153,28 +152,46 @@
 			if (uni.getStorageSync("roleCode") === "APRY") {
 				uni.hideTabBar()
 			}
-			if(uni.getStorageSync("roleCode") === "GLY"){
+			if (uni.getStorageSync("roleCode") === "GLY") {
 				this.isgly = 1
 			}
 			if (uni.getStorageSync("isAllow") === "1") {
 				var str = uni.getStorageSync('storageAllowUserDept') //获取允用科室ids
 				var arr = []
-				if (str.indexOf(',') >= 0) {
-					for (var i = 0; i < str.split(",").length; i++) {
-						arr.push({
-							deptname: "",
-							deptid: str.split(",")[i]
-						})
-						if(uni.getStorageSync('deptId') == str.split(",")[i]){
-							this.current = i;
+				pageData.getDet((res, data) => {
+					this.departList = data
+					if (str.indexOf(',') >= 0) {
+						for (var i = 0; i < str.split(",").length; i++) {
+							arr.push({
+								deptid: str.split(",")[i],
+								deptname: this.$mHelper.findParents(this.departList, str.split(",")[i])
+							})
+							if (uni.getStorageSync('deptId') == str.split(",")[i]) {
+								this.current = i;
+							}
 						}
+						this.allowData = arr
 					}
-					this.allowData = arr
-				}
-				this.$nextTick(function() {
-					// DOM 更新了
-					this.$refs.inputDialogs.open()
+					this.$nextTick(function() {
+						this.$refs.inputDialogs.open()
+					})
 				})
+				// if (str.indexOf(',') >= 0) {
+				// 	for (var i = 0; i < str.split(",").length; i++) {
+				// 		arr.push({
+				// 			deptname: "",
+				// 			deptid: str.split(",")[i]
+				// 		})
+				// 		if (uni.getStorageSync('deptId') == str.split(",")[i]) {
+				// 			this.current = i;
+				// 		}
+				// 	}
+				// 	this.allowData = arr
+				// }
+				// this.$nextTick(function() {
+				// 	// DOM 更新了
+				// 	this.$refs.inputDialogs.open()
+				// })
 
 			}
 			// uni.hideTabBar()
@@ -185,7 +202,7 @@
 				console.log(evt.detail.value)
 				for (let i = 0; i < this.allowData.length; i++) {
 					if (this.allowData[i].deptid === evt.detail.value) {
-						this.current = i;					
+						this.current = i;
 						break;
 					}
 				}
@@ -316,7 +333,7 @@
 										if (res.confirm) {
 											plus.runtime.openURL(data.FileUrl[0].F_FileUrl, err => {
 												plus.runtime.openURL(data.FileUrl[0]
-												.F_FileUrl);
+													.F_FileUrl);
 											}, 'com.android.browser');
 										} else if (res.cancel) {
 											this.$mHelper.toast("取消更新");
@@ -384,6 +401,20 @@
 </script>
 
 <style lang="scss">
+	/deep/.uni-dialog-content {
+		margin: 0;
+		padding: 0;
+	}
+
+	.yydepttit {
+		display: inline-block;
+		width: 85%;
+		text-align: center;
+		font-size: 14px;
+		vertical-align: middle;
+		// height: 24px;
+	}
+
 	.equipmentInfo {
 		width: 100%;
 		margin-top: 15px;
@@ -518,4 +549,4 @@
 			}
 		}
 	}
-</style>
+</style>

CallCenterWeb.UI/RMYYAPP/pages/myTask/repairList/myRepairOrderList/myRepairOrderList.vue

@@ -34,14 +34,15 @@
 								<view class="uni-note">上报时间：{{item.F_CreateTime}}</view>
 								<!-- <view class="uni-note">上报地点：{{item.F_PlaceOfRepair}}</view> -->
 								<view>
-									<view class="textState" style="right: 62px;" v-show="item.F_UrgeCount>0">催办 {{item.F_UrgeCount}}</view>
-									<view class="textState" style="right: 62px;color:#cfca25;border:1px solid #cfca25;" v-show="item.F_ReplayCount>0">延期 {{item.F_ReplayCount}}</view>
+									<view class="textState" style="right: 62px;color:#60c136;border:1px solid #60c136;" v-show="item.F_UrgeCount>0">催办 {{item.F_UrgeCount}}</view>
+									<view class="textState" style="right: 62px;color:#ddb642;border:1px solid #ddb642;" v-show="item.F_ReplayCount>0">延期 {{item.F_ReplayCount}}</view>
 									<view class="textState" style="right: 62px;color:#ff5500;border:1px solid #ff5500;" v-show="item.F_ReturnNum>0">返修 {{item.F_ReturnNum}}</view>
-									<view class="textState" style="right: 62px;color:#00aaff;border:1px solid #00aaff;text-align: center;" v-show="item.ishangup=='是'">挂起</view>
-									<view class="textState" style="right: 62px;color:#aa0000;border:1px solid #aa0000;text-align: center;" v-show="item.GapTime.indexOf('超时')>=0">超期</view>
+									<view class="textState" style="right: 62px;color:#4fa0f4;border:1px solid #4fa0f4;text-align: center;" v-show="item.ishangup=='是'">挂起</view>
+									<view class="textState" style="right: 62px;color:#3478f6;border:1px solid #3478f6;text-align: center;" v-show="item.F_IsBack=='1'">退单</view>
+									<view class="textState" style="right: 62px;color:#880000;border:1px solid #880000;text-align: center;" v-show="item.GapTime.indexOf('超时')>=0">超期</view>
 								</view>								
 							</view>
-							<view class="textStateOld" style="color: red;border:1px solid red;" v-if="item.StateName=='待接单'">{{ item.StateName}}</view>
+							<view class="textStateOld" style="color: #e19003;border:1px solid #e19003;" v-if="item.StateName=='待接单'">{{ item.StateName}}</view>
 							<view class="textStateOld" v-if="item.StateName!='待接单'">{{ item.StateName}}</view>			
 						</view>
 					</template>

CallCenterWeb.UI/RMYYAPP/pages/myTask/repairList/repairList.vue

@@ -15,23 +15,8 @@
 			</view>
 			<uni-segmented-control :current="segmenter.current" :values="segmenter.items"
 				@clickItem="onClickSegmentedControl" styleType="text" activeColor="#007aff" />
-			<!-- <uni-badge class="uni-badge-left-margin" :text="8" absolute="rightTop" :offset="[18, 10]" size="small">
-				<view class="box"><text class="box-text">待接单</text></view>
-			</uni-badge>
-			<uni-badge class="uni-badge-left-margin" :text="8" absolute="rightTop" :offset="[18, 10]" size="small">
-				<view class="box"><text class="box-text">待完成</text></view>
-			</uni-badge>
-			<uni-badge class="uni-badge-left-margin" :text="8" absolute="rightTop" :offset="[18, 10]" size="small">
-				<view class="box"><text class="box-text">已完成</text></view>
-			</uni-badge>
-			<uni-badge class="uni-badge-left-margin" :text="8" absolute="rightTop" :offset="[15, 10]" size="small">
-				<view class="box"><text class="box-text">紧急列表</text></view>
-			</uni-badge>
-			<uni-badge class="uni-badge-left-margin" :text="8" absolute="rightTop" :offset="[15, 10]" size="small">
-				<view class="box"><text class="box-text">催单列表</text></view>
-			</uni-badge> -->
 		</view>
-		<view class="tableWrapper">
+		<view class="tableWrapper" style="margin-top: 10px;">
 			<!-- 基于 uni-list 的页面布局 -->
 			<uni-list>
 				<!-- to 属性携带参数跳转详情页面-->
@@ -57,21 +42,24 @@
 								<view class="uni-note">上报时间：{{item.F_CreateTime}}</view>
 								<view class="uni-note">上报地点：{{item.F_PlaceOfRepair}}</view>
 								<view>
-									<view class="textState" style="right: 62px;" v-show="item.F_UrgeCount>0">催办
+									<view class="textState" style="right: 62px;color: #60c136;border:1px solid #60c136;" v-show="item.F_UrgeCount>0">催办
 										{{item.F_UrgeCount}}</view>
-									<view class="textState" style="right: 62px;color:#cfca25;border:1px solid #cfca25;"
+									<view class="textState" style="right: 62px;color:#ddb642;border:1px solid #ddb642;"
 										v-show="item.F_ReplayCount>0">延期 {{item.F_ReplayCount}}</view>
 									<view class="textState" style="right: 62px;color:#ff5500;border:1px solid #ff5500;"
 										v-show="item.F_ReturnNum>0">返修 {{item.F_ReturnNum}}</view>
 									<view class="textState"
-										style="right: 62px;color:#00aaff;border:1px solid #00aaff;text-align: center;"
+										style="right: 62px;color:#4fa0f4;border:1px solid #4fa0f4;text-align: center;"
 										v-show="item.ishangup=='是'">挂起</view>
 									<view class="textState"
-										style="right: 62px;color:#aa0000;border:1px solid #aa0000;text-align: center;"
+										style="right: 62px;color:#3478f6;border:1px solid #3478f6;text-align: center;"
+										v-show="item.F_IsBack=='1'">退单</view>
+									<view class="textState"
+										style="right: 62px;color:#880000;border:1px solid #880000;text-align: center;"
 										v-show="item.GapTime.indexOf('超时')>=0">超期</view>
 								</view>
 							</view>
-							<view class="textStateOld" style="color: red;border:1px solid red;"
+							<view class="textStateOld" style="color: #e19003;border:1px solid #e19003;"
 								v-if="item.StateName=='待接单'">{{ item.StateName}}</view>
 							<view class="textStateOld" v-if="item.StateName!='待接单'">{{ item.StateName}}</view>
 						</view>

CallCenterWeb.UI/RMYYAPP/pages/myTask/reportForm/reportForm.vue

@@ -45,7 +45,7 @@
 					<text class="count">{{gecon}}</text>
 				</view>
 			</view>
-			<view class="btntopremark">
+			<view class="btntopremark" v-show="reportType==0">
 				<view class="btntopremarktime">较昨日（0:00~23:59）</view>
 				<view class="btntopremarkcount">
 					{{differcon}}
@@ -55,13 +55,13 @@
 			</view>
 			<view class="contentbox">
 				<view class="middlebox">
-					<view>
+					<view @click="gotoDetail(1)">
 						<text class="monicir cirone"></text><text class="contenttitle">硬件服务：</text><text
 							class="contentone">{{yjcon}}</text>
 					</view>
 				</view>
 				<view class="middlebox">
-					<view>
+					<view @click="gotoDetail(0)">
 						<text class="monicir cirtwo"></text><text class="contenttitle">软件服务：</text><text
 							class="contenttwo">{{rjcon}}</text>
 					</view>
@@ -256,6 +256,12 @@
 			this.chart = echarts.init(document.getElementById('echartbox'))
 		},
 		methods: {
+			gotoDetail(num){
+				console.log(num)
+				uni.navigateTo({
+					url: '/pages/myTask/Hardware/Hardware?waretype='+num+'&starttime='+this.defaultStartTime+'&endtime='+this.defaultEndTime
+				})
+			},
 			initReport(option) {
 				const params = {
 					starttime: this.defaultStartTime,
@@ -302,7 +308,7 @@
 						if (response.data.dt.length > 0) {
 							response.data.dt.forEach((item, index) => {
 								if(this.reportType==1){
-									rowData.push(item.dateshownew)
+									rowData.push(item.dateshownew.substring(5,10))
 									colData.push(Number(item.allcountnew))
 								}
 								if(this.reportType==0){
@@ -336,6 +342,7 @@
 						this.chaoshinum = data.overjdcount
 						this.chaoqinum = data.overcount
 						this.undonenum = data.overdaycount
+						// console.log(this.chaoshiper,this.chaoqiper,this.undoneper)
 					}
 				}).catch((e) => {
 					console.log(e);
@@ -353,8 +360,10 @@
 						this.morencon = data.defaultEvaluate
 						this.bmycon = data.bmycount
 						this.myper = Number(data.myrate.substring(0, data.myrate.length - 1))
-						this.morenper = Number(data.defaultrate.substring(0, data.defaultrate.length - 1)) + this
-							.myper
+						this.morenper = Number(data.defaultrate.substring(0, data.defaultrate.length - 1))
+						// this.morenper = Number(data.defaultrate.substring(0, data.defaultrate.length - 1)) + this
+						// 	.myper
+						console.log(this.myper,this.morenper)
 					}
 				}).catch((e) => {
 					console.log(e);
@@ -679,6 +688,7 @@
 
 	.btopcount {
 		margin-top: 20rpx;
+		margin-bottom: 5rpx;
 		width: 100%;
 		text-align: center;
 	}

CallCenterWeb.UI/RMYYAPP/pages/myTask/vehicleSchedulList/applicantsList/applicantsList.vue

@@ -26,7 +26,7 @@
 								<view class="textState" style="right: 85px;" v-show="item.F_UrgeCount">催办 {{item.F_UrgeCount}}</view>
 							</view>		
 						</view>
-						<view class="textStateOld" style="color: red;border:1px solid red;" v-if="item.StateName=='待接单'">{{ item.StateName}}</view>
+						<view class="textStateOld" style="color: #e19003;border:1px solid #e19003;" v-if="item.StateName=='待接单'">{{ item.StateName}}</view>
 						<view class="textStateOld" v-if="item.StateName!='待接单'">{{ item.StateName}}</view>
 						<view class="textState" style="bottom: 90px;color: red;border: red;position: absolute;right: -5px;" v-show="item.F_EmergencyTypes=='紧急'">{{ item.F_EmergencyTypes }}</view>
 						<!-- <view class="textState" style="right: 85px;" v-show="item.F_UrgeCount>0">催办 {{item.F_UrgeCount}}</view> -->

CallCenterWeb.UI/RMYYAPP/pages/myTask/vehicleSchedulList/driverList/driverList.vue

@@ -30,7 +30,7 @@
 								<view class="textState" style="right: 85px;" v-show="item.F_UrgeCount>0">催办 {{item.F_UrgeCount}}</view>
 							</view>
 						</view>
-						<view class="textStateOld" style="color: red;border:1px solid red;" v-if="item.StateName=='待接单'">{{ item.StateName}}</view>
+						<view class="textStateOld" style="color: #e19003;border:1px solid #e19003;" v-if="item.StateName=='待接单'">{{ item.StateName}}</view>
 						<view class="textStateOld" v-if="item.StateName!='待接单'">{{ item.StateName}}</view>
 						<!-- <view class="textState" style="right: 85px;" v-show="item.F_UrgeCount>0">催办 {{item.F_UrgeCount}}</view> -->
 					</view>

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

@@ -11,10 +11,11 @@
 			<view class="contentTable" v-show="detailContentData.StateName ">
 				<text class="contentTitle">工单状态：</text>
 				<text class="textState">{{ detailContentData.StateName }}</text>
-				<text class="textState" v-show="detailContentData.F_EmergencyTypes=='紧急'" style="color: red;border: 1px solid red;text-align: center;">紧急</text>
-				<text class="textState" v-show="detailContentData.F_ReplayCount>0" style="color:#cfca25;border:1px solid #cfca25;text-align: center;">延期 {{detailContentData.F_ReplayCount}}</text>
-				<text class="textState" v-show="detailContentData.ishangup=='是'" style="color:#00aaff;border:1px solid #00aaff;text-align: center;">挂起</text>
-				<text class="textState" v-show="detailContentData.GapTime && detailContentData.GapTime.indexOf('超时')>=0" style="color:#aa0000;border:1px solid #aa0000;text-align: center;">超期</text>
+				<text class="textState" v-show="detailContentData.F_EmergencyTypes=='紧急'" style="color: #ff0000;border: 1px solid #ff0000;text-align: center;">紧急</text>
+				<text class="textState" v-show="detailContentData.F_ReplayCount>0" style="color:#ddb642;border:1px solid #ddb642;text-align: center;">延期 {{detailContentData.F_ReplayCount}}</text>
+				<text class="textState" v-show="detailContentData.ishangup=='是'" style="color:#4fa0f4;border:1px solid #4fa0f4;text-align: center;">挂起</text>
+				<text class="textState" v-if="detailContentData.F_IsBack == 1" style="color: #3478f6;border: 1px solid #3478f6;text-align: center;">退单</text>
+				<text class="textState" v-show="detailContentData.GapTime && detailContentData.GapTime.indexOf('超时')>=0" style="color:#880000;border:1px solid #880000;text-align: center;">超期</text>
 				<text class="textState fx" v-show="backState == 1">返修</text>
 			</view>
 			<view class="contentTable">

CallCenterWeb.UI/RMYYAPP/pages/setting/setting.vue

@@ -41,8 +41,17 @@
 		<view>
 			<uni-popup ref="inputDialogs" type="dialog">
 				<uni-popup-dialog ref="inputClose" mode="input" :title="title" @confirm="dialogInputConfirm">
-					<view>
-						<uni-table style="height: 600rpx;" ref="table" border stripe emptyText="暂无更多数据">
+					<view style="height: 600rpx;overflow-y: auto;">
+						<radio-group @change="radioChange" style="width: 100%;height: 600rpx;">
+							<label class="uni-list-cell uni-list-cell-pd" v-for="(item, index) in allowData"
+								:key="index">
+								<view v-show="$mHelper.findParents(departList, item.deptid)" style="width:100%;line-height: 24px;color: #606266;margin-bottom: 10px;">
+									<radio style="width: 30px;" :value="item.deptid" :checked="index === current"/>
+									<text class="yydepttit">{{ $mHelper.findParents(departList, item.deptid) }}</text>
+								</view>
+							</label>
+						</radio-group>
+						<!-- <uni-table style="height: 600rpx;" ref="table" border stripe emptyText="暂无更多数据">
 							<uni-tr>
 								<uni-th align="center">请选择</uni-th>
 							</uni-tr>
@@ -60,7 +69,7 @@
 									</radio-group>
 								</uni-td>
 							</uni-tr>
-						</uni-table>
+						</uni-table> -->
 					</view>
 				</uni-popup-dialog>
 			</uni-popup>
@@ -191,7 +200,6 @@
 					  }
 				  }
 				  this.allowData = arr
-				  console.log(arr)
 				}
 				this.$refs.inputDialogs.open()
 			},
@@ -232,6 +240,18 @@
 </script>
 
 <style lang="scss">
+	/deep/.uni-dialog-content{
+		margin: 0;
+		padding: 0;
+	}
+	.yydepttit {
+		display: inline-block;
+		width: 85%;
+		text-align: center;
+		font-size: 14px;
+		vertical-align: middle;
+		// height: 24px;
+	}
 	.equipmentInfo {
 	  width: 100%;
 	  margin-top: 15px;