1

.idea/workspace.xml

@@ -2,12 +2,13 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="b14f9fe1-d3c3-496a-8ebb-4789fe400212" name="默认更改列表" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pages/Workorder/AccessControl/AccessControl.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/Workorder/AccessControl/AccessControl.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pages/Workorder/Intelligentdoorlock/Intelligentdoorlock.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/Workorder/Intelligentdoorlock/Intelligentdoorlock.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pages/Workorder/Videosurveillance/Videosurveillance.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/Workorder/Videosurveillance/Videosurveillance.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pages/index/BillPending/BillPending.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/BillPending/BillPending.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pages/my/Myorder/Orderdetails/Orderdetails.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/Myorder/Orderdetails/Orderdetails.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pages.json" beforeDir="false" afterPath="$PROJECT_DIR$/pages.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pages/index/Onlinewarranty/Onlinewarranty.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/Onlinewarranty/Onlinewarranty.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pages/index/Workordertodone/Workordertodone.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/Workordertodone/Workordertodone.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pages/index/Workordertodone/hasrepaired/hasrepaired.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/Workordertodone/hasrepaired/hasrepaired.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/unpackage/cache/apk/__UNI__FF40C0C_cm.apk" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/cache/apk/__UNI__FF40C0C_cm.apk" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/unpackage/cache/apk/apkurl" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/cache/apk/apkurl" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/unpackage/cache/apk/cmManifestCache.json" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/cache/apk/cmManifestCache.json" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/unpackage/cache/wgt/__UNI__FF40C0C/app-config-service.js" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/cache/wgt/__UNI__FF40C0C/app-config-service.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/unpackage/cache/wgt/__UNI__FF40C0C/app-service.js" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/cache/wgt/__UNI__FF40C0C/app-service.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/unpackage/cache/wgt/__UNI__FF40C0C/app-view.js" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/cache/wgt/__UNI__FF40C0C/app-view.js" afterDir="false" />
@@ -42,8 +43,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/pages/my/my.vue">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="3420">
-              <caret line="114" column="114" selection-start-line="114" selection-start-column="114" selection-end-line="114" selection-end-column="114" />
+            <state relative-caret-position="3450">
+              <caret line="115" column="114" selection-start-line="115" selection-start-column="114" selection-end-line="115" selection-end-column="114" />
             </state>
           </provider>
         </entry>
@@ -51,8 +52,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/pages.json">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="10950">
-              <caret line="367" column="6" selection-start-line="367" selection-start-column="6" selection-end-line="367" selection-end-column="6" />
+            <state relative-caret-position="11010">
+              <caret line="377" column="6" selection-start-line="377" selection-start-column="6" selection-end-line="377" selection-end-column="6" />
             </state>
           </provider>
         </entry>
@@ -60,8 +61,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/pages/index/Workordertodone/Workordertodone.vue">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="5280">
-              <caret line="176" column="10" selection-start-line="176" selection-start-column="10" selection-end-line="176" selection-end-column="10" />
+            <state relative-caret-position="5910">
+              <caret line="197" column="10" selection-start-line="197" selection-start-column="10" selection-end-line="197" selection-end-column="10" />
             </state>
           </provider>
         </entry>
@@ -186,7 +187,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -341,6 +341,7 @@
           <select />
         </subPane>
       </pane>
+      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -392,11 +393,12 @@
       <workItem from="1682554138603" duration="592000" />
       <workItem from="1682641765071" duration="593000" />
       <workItem from="1683160641474" duration="594000" />
+      <workItem from="1683265707499" duration="595000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="101992000" />
+    <option name="totallyTimeSpent" value="102587000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="1912" y="-8" width="1936" height="1056" extended-state="1" />
@@ -595,22 +597,22 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/pages/my/my.vue">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="3420">
-          <caret line="114" column="114" selection-start-line="114" selection-start-column="114" selection-end-line="114" selection-end-column="114" />
+        <state relative-caret-position="3450">
+          <caret line="115" column="114" selection-start-line="115" selection-start-column="114" selection-end-line="115" selection-end-column="114" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/pages.json">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="10950">
-          <caret line="367" column="6" selection-start-line="367" selection-start-column="6" selection-end-line="367" selection-end-column="6" />
+        <state relative-caret-position="11010">
+          <caret line="377" column="6" selection-start-line="377" selection-start-column="6" selection-end-line="377" selection-end-column="6" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/pages/index/Workordertodone/Workordertodone.vue">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="5280">
-          <caret line="176" column="10" selection-start-line="176" selection-start-column="10" selection-end-line="176" selection-end-column="10" />
+        <state relative-caret-position="5910">
+          <caret line="197" column="10" selection-start-line="197" selection-start-column="10" selection-end-line="197" selection-end-column="10" />
         </state>
       </provider>
     </entry>

pages.json

@@ -338,7 +338,17 @@
             }
             
         }
-        ,{
+		,{
+		    "path" : "pages/index/Workordertodone/hasrepaired/hasrepaired",
+		    "style" :                                                                                    
+		    {
+		        "navigationBarTitleText": "已维修",
+		        "enablePullDownRefresh": false
+		    }
+		    
+		}
+        ,
+		{
             "path" : "pages/Workorder/Intelligentdoorlock/Intelligentdoorlock",
             "style" :                                                                                    
             {

pages/index/Onlinewarranty/Onlinewarranty.vue

@@ -44,7 +44,7 @@
 				<u-form-item labelWidth='180' label="上传照片:" prop="userInfo.faultPics" borderBottom ref="item1">
 					<view class="uploadPart">
 						<view class="allimg"  v-for="img in fileList1">
-							<image :src="img" mode="widthFix" class="newimg" >
+							<image :src="img" mode="heightFix" class="newimg" >
 
 							</image>
 							<u-icon @click="deletePic(img)" class="mytrash" name="trash" color="red" size="38"></u-icon>

pages/index/Workordertodone/Workordertodone.vue

@@ -102,7 +102,7 @@
 				<u-list  @scrolltolower="scrolltolower" :pagingEnabled='true'>
 					<u-list-item v-for="(item, index) in indexList" :key="index">
 
-						<view class="paisong"   @click="Workorderdetails2(item)">
+						<view class="paisong"   @click="Workorderdetails3(item)">
 							<view class="settled1" v-if="item.urgency==1">
 								非常紧急
 							</view>
@@ -150,7 +150,8 @@
 				cdshow: 0,
 				fatherparameter: {},
 				expensedata:'全部',
-				list: ['待指派', '已指派(待维修)','已维修' ],
+				list: [],
+				gly:true,
 				current: 0,
 				dataForm: {
 					status: "1",
@@ -168,11 +169,31 @@
 		},
 		//监听页面加载，其参数为上个页面传递的数据，参数类型为 Object（用于页面传参
 		onLoad: function(options) { //option为object类型，会序列化上个页面传递的参数
+		let permissions = uni.getStorageSync('ButtonPermissions');
+	
+		let isHave = permissions.includes('app:Tobeassigned');
+		this.gly=permissions.includes('app:Tobeassigned');
+		//  console.log('2222',isHave)
+		if(isHave){
+			this.list= ['待指派', '已指派(待维修)','已维修' ];
+			this.cdshow = 0;
+			 this.indexList=[];
+			 this.dataForm.page = 1;
+			 this.dataForm.status = 1;
+			 this.getpaisongdata();
+		}else{
+			this.list= [ '已指派(待维修)','已维修' ];
+			this.cdshow = 1;
+			this.indexList=[];
+			this.dataForm.page = 1;
+			this.dataForm.status = 2;
+			this.getpaisongdata();
+		}
+		
 
+			//this.getRepairTypeList();
 
-			this.getRepairTypeList();
-
-			this.getpaisongdata();
+		//	this.getpaisongdata();
 
 		},
 		//监听页面初次渲染完成。注意如果渲染速度快，会在页面进入动画完成前触发
@@ -207,35 +228,54 @@
 				             url: `/pages/index/Workordertodone/Toberepaired/Toberepaired?id=${e.id}`
 				          });
 			},
-			// Workorderdetails3(e){
-			// 	//  console.log('111111111111111111',e)
-			// 	   uni.navigateTo({
-			// 	             url: `/pages/index/Workordertodone/hasrepaired/hasrepaired?id=${e.id}`
-			// 	          });
-			// },
+			Workorderdetails3(e){
+				//  console.log('111111111111111111',e)
+				   uni.navigateTo({
+				             url: `/pages/index/Workordertodone/hasrepaired/hasrepaired?id=${e.id}`
+				          });
+			},
 
 			sectionChange(index) {
-				this.current = index;
-				if (index == 0) {
-					this.cdshow = 0;
-					 this.indexList=[];
-					 this.dataForm.page = 1;
-					 this.dataForm.status = 1;
-					 this.getpaisongdata();
-				} else if(index == 1) {
-					this.cdshow = 1;
-					this.indexList=[];
-					this.dataForm.page = 1;
-					this.dataForm.status = 2;
-					this.getpaisongdata();
-				} else if(index == 2) {
-					this.cdshow = 2;
-					this.indexList=[];
-					this.dataForm.page = 1;
-					this.dataForm.status = 3;
-					this.getpaisongdata();
-				}
-
+				//this.gly
+				  console.log('111111111111111111',index)
+				if(this.gly){
+					this.current = index;
+					if (index == 0) {
+						this.cdshow = 0;
+						 this.indexList=[];
+						 this.dataForm.page = 1;
+						 this.dataForm.status = 1;
+						 this.getpaisongdata();
+					} else if(index == 1) {
+						this.cdshow = 1;
+						this.indexList=[];
+						this.dataForm.page = 1;
+						this.dataForm.status = 2;
+						this.getpaisongdata();
+					} else if(index == 2) {
+						this.cdshow = 2;
+						this.indexList=[];
+						this.dataForm.page = 1;
+						this.dataForm.status = 3;
+						this.getpaisongdata();
+					}
+				}else{
+					this.current = index;
+					if (index == 0) {
+						this.cdshow = 1;
+						this.indexList=[];
+						this.dataForm.page = 1;
+						this.dataForm.status = 2;
+						this.getpaisongdata();
+					} else if(index == 1) {
+						this.cdshow = 2;
+						this.indexList=[];
+						this.dataForm.page = 1;
+						this.dataForm.status = 3;
+						this.getpaisongdata();
+					}
+					
+				}							
 			},
 			scrolltolower() {
 				if(this.pd){

pages/index/Workordertodone/hasrepaired/hasrepaired.vue

@@ -52,7 +52,9 @@
 			<u-cell icon="integral-fill" title="联系电话" :value="details.weixiudh" >
 				<u-icon slot="icon" size="40" name="phone"></u-icon>
 			</u-cell>
-
+	<u-cell icon="integral-fill" title="维修完成时间" :value="details.repairFinishTime" >
+				<u-icon slot="icon" size="40" name="bell"></u-icon>
+			</u-cell>
 
 
 
@@ -123,6 +125,7 @@
 					lxdh:'',
 					gzms:'',
 					gzimg:[],
+repairFinishTime:'',
 
 					jinji:'',
 					weixiury:'',
@@ -165,6 +168,8 @@
 							this.details.lxdh=res.data.data.contactPhone;
 							this.details.gzms=res.data.data.faultDes;
 							this.details.weixiury=res.data.data.repairPersonName;
+								this.details.repairFinishTime=res.data.data.repairFinishTime;
+							
 							res.data.data.faultPics=res.data.data.faultPics.split(",");
 
 							this.details.gzimg=res.data.data.faultPics;