结算单修改

src/views/workOrder/basicConfiguration/settlementStandard/components/install.vue

@@ -84,10 +84,11 @@ export default {
 			defaultData.render = (h, { row, index, column }) => {
 			  	return this.editIndex == index?(
 					<div class="redbordererr">
-						<el-form-item prop={`tableData.${index}.types`} rules={[{required: true, message: '工单类型不能为空', trigger: 'blur'}]}>
-							<el-select value-key="orderSmallTypeText" value={row.types} placeholder="请选择"
+						<el-form-item prop={`tableData.${index}.type`} rules={[{required: true, message: '工单类型不能为空', trigger: 'blur'}]}>
+							<el-select value={{orderSmallTypeText:row.typeName,id: row.type}} value-key="id" placeholder="请选择"
 								onInput={(val)=>{
-									row.types=val
+									row.type = val.id
+									row.typeName = val.orderSmallTypeText
 								}}>
 								{
 									this.typeList.map((item, index) => {
@@ -104,11 +105,14 @@ export default {
 			defaultData.render = (h, { row, index, column }) => {
 			  	return this.editIndex == index?(
 					<div class="redbordererr">
-						<el-form-item prop={`tableData.${index}.parentCategory`} rules={[{required: true, message: '产品大类不能为空', trigger: 'blur'}]}>
-							<el-select value={row.parentCategory} value-key="name" placeholder="请选择"
+						<el-form-item prop={`tableData.${index}.parentCategoryId`} rules={[{required: true, message: '产品大类不能为空', trigger: 'blur'}]}>
+							<el-select value={{categoryId:row.parentCategoryId,name: row.parentCategoryName}} value-key="categoryId" placeholder="请选择"
 									onInput={(val)=>{
-										row.parentCategory=val
-										this.smallList = [...[{name: '通用', categoryId: 0}],...val.children]
+										row.parentCategoryId=val.categoryId
+										row.parentCategoryName=val.name
+										row.categoryName = ''
+										row.categoryId = ''
+										this.smallList = [...[{name: '通用', categoryId: '0'}],...(val.children?val.children:[])]
 									}}>
 								{
 									this.mainList.map((item, index) => {
@@ -125,10 +129,11 @@ export default {
 			defaultData.render = (h, { row, index, column }) => {
 			  	return this.editIndex == index? (
 					<div class="redbordererr">
-						<el-form-item prop={`tableData.${index}.category`} rules={[{required: true, message: '产品小类不能为空', trigger: 'blur'}]}>
-							<el-select value={row.category} value-key="name" placeholder="请选择"
+						<el-form-item prop={`tableData.${index}.categoryId`} rules={[{required: true, message: '产品小类不能为空', trigger: 'blur'}]}>
+							<el-select value={{categoryId: row.categoryId,name: row.categoryName}} value-key="categoryId" placeholder="请选择"
 									onInput={(val)=>{
-										row.category=val
+										row.categoryName=val.name
+										row.categoryId=val.categoryId
 									}}>
 								{
 									this.smallList.map((item, index) => {
@@ -201,14 +206,9 @@ export default {
 				this.$refs.pageRef.tableForm().validate((valid) => {
 					if (valid) {
 						if(this.editIndex != index){
-							row = Object.assign(row,{
-								types: {orderSmallTypeText: row.typeName,id: row.type},
-								parentCategory: {name: row.parentCategoryName,categoryId: row.parentCategoryId},
-								category: {name: row.categoryName,categoryId: row.categoryId},
-							})
 							this.mainList.forEach(item =>{
 								if(item.categoryId == row.parentCategoryId){
-									this.smallList = [...[{name: '通用', categoryId: 0}],...item.children]
+									this.smallList = [...[{name: '通用', categoryId: '0'}],...(item.children?item.children:[])]
 								}
 							})
 							this.editIndex = index
@@ -254,7 +254,8 @@ export default {
     },
 	getMainList(){
 		getMainList({type: 2}).then(res => {
-			this.mainList = [...[{name: '通用', categoryId: 0}],...res.data]
+			this.mainList = [...[{name: '通用', categoryId: '0'}],...res.data]
+			console.log(this.mainList)
 		})
 	},
 	getTypeList(){
@@ -268,9 +269,12 @@ export default {
 				this.editIndex = 0
 				this.$refs.pageRef.insertionData(0,{
 					settleNormType: 'INSTALL',
-					types: '',
-					parentCategory: '',
-					category: '',
+					typeName: '',
+					type: '',
+					categoryName: '',
+					categoryId: '',
+					parentCategoryName: '',
+					parentCategoryId: '',
 					label: '',
 					normAmount: '',
 					remark: ''
@@ -287,12 +291,12 @@ export default {
     add(row){
 		add({
 			settleNormType: 'INSTALL',
-			typeName: row.types.orderSmallTypeText,
-			type: row.types.id,
-			parentCategoryName: row.parentCategory.name,
-			parentCategoryId: row.parentCategory.categoryId,
-			categoryName: row.category.name,
-			categoryId: row.category.categoryId,
+			typeName: row.typeName,
+			type: row.type,
+			parentCategoryName: row.parentCategoryName,
+			parentCategoryId: row.parentCategoryId,
+			categoryName: row.categoryName,
+			categoryId: row.categoryId,
 			label: row.label,
 			normAmount: row.normAmount,
 			remark: row.remark
@@ -308,12 +312,12 @@ export default {
 		edit({
 			id: row.id,
 			settleNormType: 'INSTALL',
-			typeName: row.types.orderSmallTypeText,
-			type: row.types.id,
-			parentCategoryName: row.parentCategory.name,
-			parentCategoryId: row.parentCategory.categoryId,
-			categoryName: row.category.name,
-			categoryId: row.category.categoryId,
+			typeName: row.typeName,
+			type: row.type,
+			parentCategoryName: row.parentCategoryName,
+			parentCategoryId: row.parentCategoryId,
+			categoryName: row.categoryName,
+			categoryId: row.categoryId,
 			label: row.label,
 			normAmount: row.normAmount,
 			remark: row.remark

src/views/workOrder/basicConfiguration/settlementStandard/components/repair.vue

@@ -85,10 +85,11 @@ export default {
 			defaultData.render = (h, { row, index, column }) => {
 			  	return this.editIndex == index?(
 					<div class="redbordererr">
-						<el-form-item prop={`tableData.${index}.types`} rules={[{required: true, message: '工单类型不能为空', trigger: 'blur'}]}>
-							<el-select value-key="orderSmallTypeText" value={row.types} placeholder="请选择"
+						<el-form-item prop={`tableData.${index}.type`} rules={[{required: true, message: '工单类型不能为空', trigger: 'blur'}]}>
+							<el-select value-key="id" value={{orderSmallTypeText:row.typeName,id: row.type}} placeholder="请选择"
 								onInput={(val)=>{
-									row.types=val
+									row.type = val.id
+									row.typeName = val.orderSmallTypeText
 								}}>
 								{
 									this.typeList.map((item, index) => {
@@ -105,11 +106,14 @@ export default {
 			defaultData.render = (h, { row, index, column }) => {
 			  	return this.editIndex == index?(
 					<div class="redbordererr">
-						<el-form-item prop={`tableData.${index}.parentCategory`} rules={[{required: true, message: '产品大类不能为空', trigger: 'blur'}]}>
-							<el-select value={row.parentCategory} value-key="name" placeholder="请选择"
+						<el-form-item prop={`tableData.${index}.parentCategoryId`} rules={[{required: true, message: '产品大类不能为空', trigger: 'blur'}]}>
+							<el-select value={{categoryId:row.parentCategoryId,name: row.parentCategoryName}} value-key="name" placeholder="请选择"
 									onInput={(val)=>{
-										row.parentCategory=val
-										this.smallList = [...[{name: '通用', categoryId: 0}],...val.children]
+										row.parentCategoryId=val.categoryId
+										row.parentCategoryName=val.name
+										row.categoryName = ''
+										row.categoryId = ''
+										this.smallList = [...[{name: '通用', categoryId: '0'}],...(val.children?val.children:[])]
 									}}>
 								{
 									this.mainList.map((item, index) => {
@@ -126,10 +130,11 @@ export default {
 			defaultData.render = (h, { row, index, column }) => {
 			  	return this.editIndex == index? (
 					<div class="redbordererr">
-						<el-form-item prop={`tableData.${index}.category`} rules={[{required: true, message: '产品小类不能为空', trigger: 'blur'}]}>
-							<el-select value={row.category} value-key="name" placeholder="请选择"
+						<el-form-item prop={`tableData.${index}.categoryId`} rules={[{required: true, message: '产品小类不能为空', trigger: 'blur'}]}>
+							<el-select value={{categoryId: row.categoryId,name: row.categoryName}} value-key="name" placeholder="请选择"
 									onInput={(val)=>{
-										row.category=val
+										row.categoryName=val.name
+										row.categoryId=val.categoryId
 									}}>
 								{
 									this.smallList.map((item, index) => {
@@ -225,14 +230,11 @@ export default {
 					if (valid) {
 						if(this.editIndex != index){
 							row = Object.assign(row,{
-								types: {orderSmallTypeText: row.typeName,id: row.type},
-								parentCategory: {name: row.parentCategoryName,categoryId: row.parentCategoryId},
-								category: {name: row.categoryName,categoryId: row.categoryId},
 								label: row.label =='保内'?'INSIDE':'OUT'
 							})
 							this.mainList.forEach(item =>{
 								if(item.categoryId == row.parentCategoryId){
-									this.smallList = [...[{name: '通用', categoryId: 0}],...item.children]
+									this.smallList = [...[{name: '通用', categoryId: '0'}],...(item.children?item.children:[])]
 								}
 							})
 							this.editIndex = index
@@ -293,9 +295,12 @@ export default {
 				this.$refs.pageRef.insertionData(0,{
 					companyWechatName: JSON.parse(localStorage.getItem('greemall_user')).companyName,
 					settleNormType: 'REPAIR',
-					types: '',
-					parentCategory: '',
-					category: '',
+					typeName: '',
+					type: '',
+					categoryName: '',
+					categoryId: '',
+					parentCategoryName: '',
+					parentCategoryId: '',
 					label: '',
 					normAmount: '',
 					repairAmount: '',
@@ -313,12 +318,12 @@ export default {
     add(row){
 		add({
 			settleNormType: 'REPAIR',
-			typeName: row.types.orderSmallTypeText,
-			type: row.types.id,
-			parentCategoryName: row.parentCategory.name,
-			parentCategoryId: row.parentCategory.categoryId,
-			categoryName: row.category.name,
-			categoryId: row.category.categoryId,
+			typeName: row.typeName,
+			type: row.type,
+			parentCategoryName: row.parentCategoryName,
+			parentCategoryId: row.parentCategoryId,
+			categoryName: row.categoryName,
+			categoryId: row.categoryId,
 			label: row.label,
 			normAmount: row.normAmount,
 			repairAmount: row.repairAmount,
@@ -335,12 +340,12 @@ export default {
 		edit({
 			id: row.id,
 			settleNormType: 'REPAIR',
-			typeName: row.types.orderSmallTypeText,
-			type: row.types.id,
-			parentCategoryName: row.parentCategory.name,
-			parentCategoryId: row.parentCategory.categoryId,
-			categoryName: row.category.name,
-			categoryId: row.category.categoryId,
+			typeName: row.typeName,
+			type: row.type,
+			parentCategoryName: row.parentCategoryName,
+			parentCategoryId: row.parentCategoryId,
+			categoryName: row.categoryName,
+			categoryId: row.categoryId,
 			label: row.label,
 			normAmount: row.normAmount,
 			repairAmount: row.repairAmount,

src/views/workOrder/settleAccountsManagement/rewardsPunishmentsOrder/index.vue

@@ -186,7 +186,7 @@ export default {
 				label: '联系电话',
 				prop: 'mobile',
 				rules: this.formData.mobile?[
-					{ pattern:/^((0\d{2,3}-\d{7,8})|(1[34578]\d{9}))$/, message: '电话号码格式不正确', trigger: 'blur' }
+					{ pattern:/^((0\d{2,3}-\d{7,8})|(1[3456789]\d{9}))$/, message: '电话号码格式不正确', trigger: 'blur' }
 				]:[]
 			}
 		}, {
@@ -283,6 +283,11 @@ export default {
 		}]
     }
   },
+  created(){
+	  if(this.$route.query.id){
+		  this.openDetail(this.$route.query.id)
+	  }
+  },
   methods: {
     // 列表请求函数
 	getList: listPageV2,
@@ -310,23 +315,26 @@ export default {
       return (
         <div class='operation-btns'>
 		  <el-button type="text" onClick={() => {
-		    getDetail({ id: row.id }).then(res => {
-		      Object.assign(this.formData, res.data,{
-		        fileUrl:res.data?.fileUrl ? res.data?.fileUrl?.split(",").map(item=>({url:item})) : [],
-				worker: {workerId: row.workerId,nickName: row.workerName},
-				websit: {websitId: row.websitId,websitName: row.websitName},
-				examineProject: {name: row.examineProjectName}
-		      })
-			  this.getExamine()
-			  this.getWebsit()
-			  this.getWorker()
-		      this.formDialogType = 2
-		      this.openForm()
-		    })
+		    this.openDetail(row.id)
 		  }}>详情</el-button>
         </div>
       )
     },
+	openDetail(id){
+		getDetail({ id }).then(res => {
+		  Object.assign(this.formData, res.data,{
+		    fileUrl:res.data?.fileUrl ? res.data?.fileUrl?.split(",").map(item=>({url:item})) : [],
+		    worker: {workerId: res.data.workerId,nickName: res.data.workerName},
+		    websit: {websitId: res.data.websitId,websitName: res.data.websitName},
+		    examineProject: {name: res.data.examineProjectName}
+		  })
+		  this.getExamine()
+		  this.getWebsit()
+		  this.getWorker()
+		  this.formDialogType = 2
+		  this.openForm()
+		})
+	},
 	getExamine(){
 		getExamine({pageNum: 1,pageSize: -1,params: []}).then(res => {
 			this.examineList = res.data.records

src/views/workOrder/settleAccountsManagement/settleAccountsOrder/index.vue

@@ -160,13 +160,22 @@ export default {
       return (
         <div class='operation-btns'>
 		  <el-button type="text" onClick={() => {
-		    this.$router.push({
-		    		name: "workOrderPool",
-		    		query: {
-		    			id:row.orderBaseId,
-		    			activeName: "SettleAccounts",
-		    		}
-		    })
+				if(row.settleOrderType == 'EXAMINE'){
+					this.$router.push({
+							name: "rewardsPunishmentsOrder",
+							query: {
+								id:row.examineProjectId
+							}
+					})
+				}else{
+					this.$router.push({
+							name: "workOrderPool",
+							query: {
+								id:row.orderBaseId,
+								activeName: "SettleAccounts",
+							}
+					})
+				}
 		  }}>详情</el-button>
         </div>
       )

src/views/workOrder/settleAccountsManagement/summaryBill/detailList.vue

@@ -103,10 +103,14 @@
 			<el-table-column prop="customerName" align="center" label="客户名字"></el-table-column>
 			<el-table-column prop="customerMobile" align="center" label="客户电话" width="110"></el-table-column>
 			<el-table-column prop="customerAddress" align="center" label="详细地址" width="180"></el-table-column>
-			<el-table-column prop="orderStatus" align="center" label="工单状态"></el-table-column>
+			<el-table-column prop="orderStatus" align="center" label="工单状态">
+				<template slot-scope="scope">
+					{{scope.row.orderStatus == 'DYY'?'待预约':scope.row.orderStatus == 'DSHPG'?'待商户派工':scope.row.orderStatus == 'DWDPG'?'待网点派工':scope.row.orderStatus == 'DJD'?'待接单':scope.row.orderStatus == 'FWZ'?'服务中':scope.row.orderStatus == 'YCD'?'异常单':scope.row.orderStatus == 'YWG'?'已完工待结算':scope.row.orderStatus == 'YJS'?'已结算':scope.row.orderStatus == 'YQX'?'已取消':''}}
+				</template>
+			</el-table-column>
 			<el-table-column prop="orderCreateTime" align="center" label="创建时间" width="160"></el-table-column>
 			<el-table-column prop="workerEndTime" align="center" label="完工时间" width="160"></el-table-column>
-			<el-table-column prop="orderType" align="center" label="工单类型"></el-table-column>
+			<el-table-column prop="orderTypeText" align="center" label="工单类型"></el-table-column>
 			<el-table-column prop="brand" align="center" label="产品品牌"></el-table-column>
 			<el-table-column prop="orderSource" align="center" label="工单来源"></el-table-column>
 			<el-table-column prop="parentCategoryName" align="center" label="产品大类"></el-table-column>