上传

components/work/WorkOrderitem.vue

@@ -43,7 +43,7 @@
 				工单状态：
 			</view>
 			<view class="text">
-				{{ obj.statusId_dictText }}
+				{{ obj.statusId_dictText || '' }}
 			</view>
 		</view>
 		

pages_order/order/ModifyMembers.vue

@@ -79,7 +79,6 @@
 			upload(){
 				this.$Oss.ossUploadImage({
 					success : url => {
-						console.log(url);
 						this.detail.image = url
 					}
 				})
@@ -89,7 +88,7 @@
 					userId : this.id
 				}, res =>{
 					if(res.code == 200){
-						this.detail = res.result
+						this.detail = res.result.user
 					}
 				})
 			},

pages_order/order/ModifyWorkOrder.vue

@@ -81,7 +81,7 @@
 		
 		<uv-picker ref="picker" 
 		:columns="columns" 
-		keyName="name"
+		keyName="statusId_dictText"
 		@confirm="confirm"></uv-picker>
 
 		<view class="modify">
@@ -122,12 +122,12 @@
 			}
 		},
 		computed : {
-			...mapState(['workDetail', 'statusList']),
+			...mapState(['workDetail', 'permissionStatusList']),
 			columns(){
 				
-				let list = JSON.parse(JSON.stringify(this.statusList))
+				let list = JSON.parse(JSON.stringify(this.permissionStatusList))
 				
-				list.splice(0, 1)
+				// list.splice(0, 1)
 				
 				return [
 					list
@@ -155,6 +155,12 @@
 				delete data.createBy
 				delete data.createTime
 				
+				for (let k in data) {
+					if(!data[k] || data[k] == 'null'){
+						data[k] = ''
+					}
+				}
+				
 				this.$api('updateTemplate', data, res => {
 					if(res.code == 200){
 						uni.showToast({
@@ -167,8 +173,8 @@
 				})
 			},
 			confirm(e){
-				this.detail.statusId = e.value[0].id
-				this.detail.statusDescribe = e.value[0].name
+				this.detail.statusId = e.value[0].statusId
+				this.detail.statusDescribe = e.value[0].statusId_dictText
 			},
 		}
 	}

pages_order/order/WorkOrders.vue

@@ -60,7 +60,7 @@
 					状态：
 				</view>
 				<view class="index">
-					{{TemplateById.statusDescribe}}
+					{{TemplateById.statusDescribe || ''}}
 				</view>
 			</view>
 			<view class="work-box">
@@ -68,7 +68,7 @@
 					备注：
 				</view>
 				<view class="index">
-					{{TemplateById.remark}}
+					{{TemplateById.remark || ''}}
 				</view>
 			</view>
 		</view>

store/store.js

@@ -12,6 +12,7 @@ const store = new Vuex.Store({
 		userInfo : {}, //用户信息
 		permissions : [],//权限列表
 		statusList : [],//工单状态列表
+		permissionStatusList : [],//权限允许操作的状态
 		// workDetail : {},//工单详情
 	},
 	getters: {
@@ -38,9 +39,11 @@ const store = new Vuex.Store({
 		accountLogin(state, form){
 			api('login', form, res => {
 				if(res.code == 200){
-					state.userInfo = res.result
+					console.log(res);
+					state.userInfo = res.result.user
+					state.permissionStatusList = res.result.permissionStatusList
 					// state.permissions = res.result.permissionRoleList.map(n => n.permissionName)
-					uni.setStorageSync('token', res.result.id)
+					uni.setStorageSync('token', state.userInfo.id)
 					uni.navigateBack(-1)
 				}
 			})
@@ -67,7 +70,11 @@ const store = new Vuex.Store({
 				userId : uni.getStorageSync('token')
 			}, res => {
 				if(res.code == 200){
-					state.userInfo = res.result
+					state.userInfo = res.result.user
+					state.permissionStatusList = res.result.permissionStatusList
+					
+					console.log(res);
+					
 					// state.permissions = res.result.permissionRoleList.map(n => n.permissionName)
 				}
 			})