no message

src/views/workOrder/completedToBeSettled/index.vue

@@ -618,10 +618,10 @@ export default {
 										label: '操作',
 										prop: '',
 										fixed: 'right',
-										width: "100px"
+										width: "120px"
 									},
 									render: (h, { row, column, index }) => {
-										return expandDataForm.settleStatus == 'YWG' || (expandDataForm.settleStatus == 'YJS' && expandDataForm?.normList[row.pfuqinid]?.workerList.find(item => item.poolStatus == "NO")) ? (<div class="redbordererr" style="padding:0 6px;display:flex;align-items:center;">
+										return expandDataForm.settleStatus == 'YWG' || (expandDataForm.settleStatus == 'YJS' && expandDataForm?.normList[row.pfuqinid]?.workerList.find(item => item.poolStatus == "NO")) ? (<div class="redbordererr redbordererranniuright" style="padding:0 6px;">
 											{expandDataForm.normList[row.pfuqinid].bianji ? <el-button type="text" onClick={
 												() => {
 													var yjsje = [0, 0, 0, expandDataForm?.normList[row.pfuqinid]?.workerList.filter(item => item.poolStatus == "YES").map(item => item.settleAmount)].reduce(function (prev, curr, idx, arr) {
@@ -651,6 +651,11 @@ export default {
 													expandDataForm.normList[row.pfuqinid].bianji = true
 												}
 											}>修改</el-button> : null}
+											{!expandDataForm.showOtherNormList ? <el-button type="text" onClick={
+												() => {
+													expandDataForm.showOtherNormList = true
+												}
+											}>添加其他费用</el-button> : null}
 										</div>) : null
 									}
 								}]
@@ -681,6 +686,7 @@ export default {
 						},
 						{
 							md: 24,
+							isShow: expandDataForm.showOtherNormList,
 							name: 'slot-component',
 							formItemAttributes: {
 								label: '其他费用结算',
@@ -923,10 +929,10 @@ export default {
 										label: '操作',
 										prop: '',
 										fixed: 'right',
-										width: "100px"
+										width: "120px"
 									},
 									render: (h, { row, column, index }) => {
-										return expandDataForm.settleStatus == 'YWG' || (expandDataForm.settleStatus == 'YJS' && expandDataForm?.otherNormList[row.pfuqinid]?.workerList.find(item => item.poolStatus == "NO")) ? (<div class="redbordererr" style="padding:0 6px;display:flex;align-items:center;">
+										return expandDataForm.settleStatus == 'YWG' || (expandDataForm.settleStatus == 'YJS' && expandDataForm?.otherNormList[row.pfuqinid]?.workerList.find(item => item.poolStatus == "NO")) ? (<div class="redbordererr redbordererranniuright" style="padding:0 6px;display:flex;align-items:center;">
 											{expandDataForm.otherNormList[row.pfuqinid].bianji ? <el-button type="text" onClick={
 												() => {
 													var yjsje = [0, 0, 0, expandDataForm?.otherNormList[row.pfuqinid]?.workerList.filter(item => item.poolStatus == "YES").map(item => item.settleAmount)].reduce(function (prev, curr, idx, arr) {
@@ -989,7 +995,6 @@ export default {
 		},
 
 		itemOrderBaseSettleNormReset(data, type, cb) {
-			console.log(data, cb)
 			try {
 				data.expandData.normList.filter(item => !!item.id).map(item => {
 					if ([0, 0, 0, ...item.workerList?.map(val => Number(val.settleAmount))].reduce(function (prev, curr, idx, arr) {
@@ -1009,7 +1014,8 @@ export default {
 				this.$message.warning(err.message)
 				return
 			}
-			var { classifyList, gonglr, gonglv, otherList, ...pam } = data.expandData;
+
+			var { classifyList, gonglr, gonglv, otherList, normListBj, otherNormListBj, showOtherNormList, ...pam } = data.expandData;
 
 			([orderBaseSettleNormConfirm, orderBaseSettleNormReset])[pam.settleStatus == 'YWG' ? 0 : 1]({
 				...pam,
@@ -1057,10 +1063,11 @@ export default {
 				var pfuqinid = 0
 				data.normListBj = false
 				data.otherNormListBj = false
+				data.showOtherNormList = false
 				data.normList.map((item, index) => {
 					if (!orderChannelId) { orderChannelId = item.orderChannelId }
 					item.settleNum = item.settleNum || ""
-					normList.push({ ...item, pfuqinid: pfuqinid, zijideid: 0, bianji: data.settleStatus == 'YJS' ? false : true })
+					normList.push({ ...item, pfuqinid: pfuqinid, zijideid: 0, bianji: !item.workerList.find(resdata => !!resdata.settleOrderId) })
 					item.workerList?.map((resdata, ind_) => {
 						if (resdata.settleOrderId) { data.normListBj = true }
 						if (ind_ !== 0) { normList.push({ pfuqinid: pfuqinid, zijideid: ind_ }) }
@@ -1071,7 +1078,10 @@ export default {
 				var qtpfuqinid = 0
 				data.otherNormList.map((item, index) => {
 					item.settleNum = item.settleNum || ""
-					otherNormList.push({ ...item, pfuqinid: qtpfuqinid, zijideid: 0, bianji: data.settleStatus == 'YJS' ? false : true })
+					otherNormList.push({ ...item, pfuqinid: qtpfuqinid, zijideid: 0, bianji: !item.workerList.find(resdata => !!resdata.settleOrderId) })
+					if (!data.showOtherNormList) {
+						data.showOtherNormList = !!item.workerList.find(resdata => !!resdata.settleOrderId)
+					}
 					item.workerList?.map((resdata, ind_) => {
 						if (resdata.settleOrderId) { data.otherNormListBj = true }
 						if (ind_ !== 0) { otherNormList.push({ pfuqinid: qtpfuqinid, zijideid: ind_ }) }
@@ -1165,4 +1175,11 @@ export default {
 }
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss">
+.redbordererranniuright {
+	.el-button {
+		margin-left: 0px;
+		margin-right: 10px;
+	}
+}
+</style>