asd26269546 1 rok temu
rodzic
commit
5cf0ce8f9a

+ 4 - 2
src/views/processApproval/components/SendSubscribe.vue

@@ -143,11 +143,11 @@
 						>{{$t('common.addDetails')}}</van-button
 						>
 					</div>
-					<div style="margin: 16px" v-if="!route.query.id">
+					<!-- <div style="margin: 16px" v-if="!route.query.id">
 						<van-button round block type="primary" native-type="submit">
 							{{$t('common.submit')}}
 						</van-button>
-					</div>
+					</div> -->
 					<div class="common-mobile-table">
 						<table>
 							<thead>
@@ -212,6 +212,8 @@ const formData = ref({
 	subscribeDetailList: [],
 })
 const handleAddRow = () => {
+	console.log(formData.value)
+	if(!formData.value.subscribeDetailList) formData.value.subscribeDetailList = []
 	formData.value.subscribeDetailList.push({
 		bussinessId: '',
 		bussinessName: '',

+ 8 - 5
src/views/processApproval/processDtl.vue

@@ -46,7 +46,7 @@
 				更多 <van-icon name="arrow-up" />
 			</div>
 			<div class="foot-btn-warp">
-				<div class="agree-btn"  @click="handleSubmit(1)">同意</div>
+				<div class="agree-btn" @click="handleSubmit(1)">同意</div>
 				<div class="next-btn" @click="nextFn">下一步</div>
 			</div>
 		</div>
@@ -142,7 +142,7 @@ const handleResult = (res) => {
 	}
 }
 const skipPage = () => {
-	router.replace({
+	proxy.$router({
 		path:
 			route.query.processType === 10
 				? '/main/processApproval'
@@ -174,7 +174,7 @@ const handleSubmit = async (_type) => {
 					flowId: route.query.id,
 				})
 				.then((res) => {
-					handleResult(res)
+					handleResult(res.data)
 				})
 			if (_type && _type == 1) {
 				proxy
@@ -192,7 +192,7 @@ const handleSubmit = async (_type) => {
 					childrenData,
 				})
 				.then((res) => {
-					handleResult(res)
+					handleResult(res.data)
 				})
 		}
 	}
@@ -205,6 +205,7 @@ const getRecords = (_id) => {
 				id: _id,
 			})
 			.then((res) => {
+				console.log(res, 123123)
 				for (let i = 0; i < res.data.recordList.length; i++) {
 					const element = res.data.recordList[i]
 					if (element.status === 2) {
@@ -215,6 +216,7 @@ const getRecords = (_id) => {
 				recordList.value = res.data.recordList
 				queryData.data.recordList = res.data.recordList
 				approvalRecordData.value = res.data
+
 			})
 	} else {
 		proxy
@@ -230,7 +232,8 @@ const getRecords = (_id) => {
 onMounted(async () => {
 	//processType 10 为修改 20为查看 30回退发起 无为发起
 	if (!componentObj.value[route.query.flowKey]) {
-		return showSuccessToast('代码未配置此流程!')
+		showSuccessToast('代码未配置此流程!')
+		return
 	}
 	if (
 		route.query.processType == 10 ||

+ 1 - 1
src/views/procurementManagement/subscribe/index.vue

@@ -72,7 +72,7 @@ const onLoad = () => {
 const onClickLeft = () => proxy.$router.push("/main/working");
 
 const onClickRight = () => {
-  proxy.$router.push("/main/subscribeAdd");
+  proxy.$router.push("/main/processDtl?flowKey=subscribe_flow");
 };
 proxy.uploadDdRightBtn(onClickRight,'发起申购')
 const toDtl = (row) => {