修改

CallCenterWeb.UI/RMYY/src/views/dashboard/index.vue

@@ -231,7 +231,7 @@
                 content: changeDept, // 传递的组件对象
                 parent: this, // 当前的vue对象
                 data: {
-                  isShow: 1
+                  isShow: '1'
                 }, // props
               },
               area: ["50%", "60%"],

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

@@ -346,7 +346,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogCooperation = false">取 消</el-button>
-        <el-button v-loading.fullscreen.lock="isloading" type="primary" @click="postCooperationOrder">
+        <el-button type="primary" @click="postCooperationOrder">
           确 定
         </el-button>
       </div>
@@ -375,7 +375,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogCooperationIn = false">取 消</el-button>
-        <el-button v-loading.fullscreen.lock="isloading" type="primary" @click="postCooperationOrderIn">
+        <el-button type="primary" @click="postCooperationOrderIn">
           确 定
         </el-button>
       </div>
@@ -414,7 +414,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogCooperationOut = false">取 消</el-button>
-        <el-button v-loading.fullscreen.lock="isloading" type="primary" @click="postCooperationOrderOut">
+        <el-button type="primary" @click="postCooperationOrderOut">
           确 定
         </el-button>
       </div>
@@ -546,7 +546,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogDone = false">取 消</el-button>
-        <el-button v-loading.fullscreen.lock="isloading" type="primary" @click="postDoneOrder">确 定</el-button>
+        <el-button type="primary" @click="postDoneOrder">确 定</el-button>
       </div>
     </el-dialog>
     <el-dialog :visible.sync="dialogVisible">
@@ -1186,8 +1186,7 @@
         this.dialogDone = true;
         this.doneForm.workordercode = code;
       },
-      postDoneOrder() {
-        this.isloading = true
+      postDoneOrder() {
         // 完工
         var equiplist = [];
         this.equipmodellist.find((item) => {
@@ -1218,7 +1217,6 @@
               type: "error",
               message: "请选择耗材信息！",
             });
-            this.isloading = false
             return
           }
         }
@@ -1246,7 +1244,6 @@
               const params = this.doneForm;
               postDealWorkOrder(params).then((response) => {
                 if (response.state === "success") {
-                  this.isloading = false
                   this.$message({
                     type: "success",
                     message: "操作成功!",
@@ -1263,7 +1260,6 @@
               })
               .catch((err)=>{
                 console.log(err)
-                this.isloading = false //关闭loading
               })
               resolve();
             });

CallCenterWeb.UI/RMYY/src/views/login/changeDept.vue

@@ -25,7 +25,7 @@
          default: ''
        },
        isShow: {
-        type: Number,
+        type: String,
         default: ''
        }
      },
@@ -60,10 +60,17 @@
            if (str.indexOf(',') >= 0) {
              for (var i = 0; i < str.split(",").length; i++) {
                if (this.$store.getters.deptmap[parseInt(str.split(",")[i])]) {
-                 arr.push({
-                   deptname: this.$store.getters.deptmap[parseInt(str.split(",")[i])].text,
-                   deptid: str.split(",")[i]
-                 })
+                 if(str.split(",")[i] == window.localStorage.getItem('deptId')){
+                   arr.unshift({
+                     deptname: this.$store.getters.deptmap[parseInt(str.split(",")[i])].text,
+                     deptid: str.split(",")[i]
+                   })
+                 }else{
+                   arr.push({
+                     deptname: this.$store.getters.deptmap[parseInt(str.split(",")[i])].text,
+                     deptid: str.split(",")[i]
+                   })
+                 }
                }
              }
              this.allowData = arr

CallCenterWeb.UI/RMYYAPP/manifest.json

@@ -2,8 +2,8 @@
     "name" : "郑州人民医院综合服务保障调度平台",
     "appid" : "__UNI__5A5207D",
     "description" : "",
-    "versionName" : "1.2.68",
-    "versionCode" : 168,
+    "versionName" : "1.2.69",
+    "versionCode" : 169,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

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

@@ -169,13 +169,18 @@
 				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])
-							})
+						for (var i = 0; i < str.split(",").length; i++) {							
 							if (uni.getStorageSync('deptId') == str.split(",")[i]) {
-								this.current = i;
+								this.current = 0;
+								arr.unshift({
+									deptid: str.split(",")[i],
+									deptname: this.$mHelper.findParents(this.departList, str.split(",")[i])
+								})
+							}else{
+								arr.push({
+									deptid: str.split(",")[i],
+									deptname: this.$mHelper.findParents(this.departList, str.split(",")[i])
+								})
 							}
 						}
 						this.allowData = arr

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

@@ -107,7 +107,7 @@
 	import pageData from "@/pages/myTask/repairList/addRepair/pageData.js"
 	const segmenterData = {
 		// 0: ["待接单", "待完成", "已完成", "紧急", "催单","返修"], // 已办待回访
-		0: ["待接单", "待完成", "已完成"], // 已办待回访
+		0: ["待接单", "待提交", "已提交"], // 已办待回访
 	}
 	export default {
 		data() {

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

@@ -227,7 +227,7 @@
 						</view>
 						<view class="contentTable">
 							<text class="contentTitle">处理结果：</text>
-							<text class="contentText">{{ item.F_Result }}</text>
+							<text class="contentText" v-html="item.F_Result"></text>
 						</view>
 						<view class="contentTable">
 							<text class="contentTitle">处理方式：</text>

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

@@ -198,15 +198,21 @@
 			},
 			btnChange(){
 				var str = uni.getStorageSync('storageAllowUserDept')//获取允用科室ids
+				console.log(str,'hhh',this.deptId)
 				var arr = []
 				if (str.indexOf(',') >= 0) {
-				  for (var i = 0; i < str.split(",").length; i++) {
-				      arr.push({
-				        deptname: '',
-				        deptid: str.split(",")[i]
-				      })
+				  for (var i = 0; i < str.split(",").length; i++) {				      
 					  if(this.deptId == str.split(",")[i]){
-					  	this.current = i;
+					  	this.current = 0;
+						arr.unshift({
+						  deptname: '',
+						  deptid: str.split(",")[i]
+						})
+					  }else{
+						 arr.push({
+						   deptname: '',
+						   deptid: str.split(",")[i]
+						 }) 
 					  }
 				  }
 				  this.allowData = arr