bug修改

src/main.js

@@ -9,6 +9,8 @@ app.use(i18n).mount("#app");
 import { uploadDdRightBtn } from "@/utils/ddAdapter";
 import { post, get } from "@/utils/axios";
 
+import store from './store'
+
 app.config.globalProperties.get = get;
 app.config.globalProperties.post = post;
 // 金额千分符
@@ -23,6 +25,9 @@ app.config.globalProperties.uploadDdRightBtn = uploadDdRightBtn;
 // form组件 select change事件回填
 app.config.globalProperties.formChange = formChange;
 app.config.globalProperties.formChangeTwo = formChangeTwo;
+//pinia
+app.use(store);
+
 
 //中英文全局挂载
 app.config.globalProperties.t = i18n.global.t;

src/store/index.js

@@ -0,0 +1,3 @@
+import { createPinia } from "pinia";
+const store = createPinia();
+export default store;

src/views/processApproval/components/SendSubscribe.vue

@@ -4,7 +4,11 @@
 			<van-tab title="申购信息">
 				<div class="common-process-card">
 					<div class="common-title">申购信息</div>
-					<van-form @submit="onSubmit" label-align="top" style="margin-top: 20px">
+					<van-form 
+						@submit="onSubmit" 
+						label-align="top" 
+						style="margin-top: 20px" 
+						:readonly="route.query.processType == 10 || route.query.processType == 20">
 						<van-cell-group inset>
 							<van-field
 								v-model="formData.deptName"
@@ -13,8 +17,7 @@
 								:label="$t('purchased.procurementDepartment')"
 								:placeholder="$t('purchased.selectProcurementDepartment')"
 								:rules="[{ required: true, message: $t('purchased.procurementDepartmentCanNotBeEmpty') }]"
-								@click="submitType === 'edit' ? typeModal = false : typeModal = true"
-								:readonly="submitType === 'edit'"
+								@click="route.query.processType == 10 || route.query.processType == 20 ? typeModal = false : typeModal = true"
 								required
 							/>
 							<van-popup v-model:show="typeModal" round position="bottom">
@@ -32,7 +35,6 @@
 								:placeholder="$t('purchased.pleaseFillInTheProcurementPersonName')"
 								:rules="[{ required: true, message: $t('purchased.procurementPersonNameCanNotBeEmpty') }]"
 								required
-								:readonly="submitType === 'edit'"
 							/>
 							<van-field
 								v-model="formData.subcribeTime"
@@ -42,9 +44,8 @@
 								:label="$t('purchased.procurementTime')"
 								:placeholder="$t('purchased.clickToSelectTime')"
 								:rules="[{ required: true, message: $t('purchased.procurementTimeCanNotBeEmpty') }]"
-								@click="submitType === 'edit' ? timePicker = false : timePicker = true"
+								@click="route.query.processType == 10 || route.query.processType == 20 ? timePicker = false : timePicker = true"
 								required
-								:readonly="submitType === 'edit'"
 							/>
 							<van-popup v-model:show="timePicker" position="bottom">
 								<van-date-picker
@@ -60,7 +61,6 @@
 								:placeholder="$t('purchased.pleaseFillInTheProcurementDescription')"
 								:rules="[{ required: true, message: $t('purchased.procurementDescriptionCanNotBeEmpty') }]"
 								required
-								:readonly="submitType === 'edit'"
 								rows="3"
 							/>
 						</van-cell-group>
@@ -73,115 +73,103 @@
 				<div class="common-process-card">
 					<div class="common-title">明细</div>
 					<!-- 明细列表 -->
-					<div
-						v-for="(item, index) in formData.subscribeDetailList"
-						:key="index"
-					>
-						<div class="commons-delete">
-							<div class="title">{{$t('common.details')}}{{ index + 1 }}</div>
-							<div
-								class="delete"
-								@click.native="handleDel(index)"
-								v-if="!route.query.id"
-							>
-								<van-icon name="cross" />
+					<div  v-if="route.query.processType != 10 && route.query.processType != 20">
+						<div
+							v-for="(item, index) in formData.subscribeDetailList"
+							:key="index"
+						>
+							<div class="commons-delete">
+								<div class="title">{{$t('common.details')}}{{ index + 1 }}</div>
+								<div
+									class="delete"
+									@click.native="handleDel(index)"
+									v-if="!route.query.id"
+								>
+									<van-icon name="cross" />
+								</div>
 							</div>
-						</div>
-						<van-cell-group inset>
-							<van-field
-								v-model="formData.subscribeDetailList[index].bussinessName"
-								is-link
-								readonly
-								:label="$t('purchased.procurementProduct')"
-								:placeholder="$t('purchased.selectProcurementProduct')"
-								:readonly="submitType === 'edit'"
-								@click="handleSelect(index)"
-								:rules="[
-									{ required: true, message: $t('purchased.procurementProductCanNotBeEmpty') },
-								]"
-								required
-							/>
-							<van-field
-								v-model="formData.subscribeDetailList[index].count"
-								:label="$t('subscribe.quantity')"
-								:placeholder="$t('subscribe.pleaseEnterTheQuantity')"
-								:rules="[{ required: true, message: $t('subscribe.quantityCanNotBeEmpty') }]"
-								required
-								type="number"
-								:readonly="submitType === 'edit'"
-							/>
+							<van-cell-group inset>
+								<van-field
+									v-model="formData.subscribeDetailList[index].bussinessName"
+									is-link
+									readonly
+									:label="$t('purchased.procurementProduct')"
+									:placeholder="$t('purchased.selectProcurementProduct')"
+									:readonly="submitType === 'edit'"
+									@click="handleSelect(index)"
+									:rules="[
+										{ required: true, message: $t('purchased.procurementProductCanNotBeEmpty') },
+									]"
+									required
+								/>
+								<van-field
+									v-model="formData.subscribeDetailList[index].count"
+									:label="$t('subscribe.quantity')"
+									:placeholder="$t('subscribe.pleaseEnterTheQuantity')"
+									:rules="[{ required: true, message: $t('subscribe.quantityCanNotBeEmpty') }]"
+									required
+									type="number"
+									:readonly="submitType === 'edit'"
+								/>
 
-							<van-field
-								v-model="formData.subscribeDetailList[index].content"
-								:label="$t('subscribe.cause')"
-								:placeholder="$t('subscribe.pleaseEnterTheCause')"
-								:rules="[
-									{ required: true, message: $t('subscribe.causeCanNotBeEmpty') },
-								]"
-								:readonly="submitType === 'edit'"
-								rows="3"
-								type="textarea"
-								required
+								<van-field
+									v-model="formData.subscribeDetailList[index].content"
+									:label="$t('subscribe.cause')"
+									:placeholder="$t('subscribe.pleaseEnterTheCause')"
+									:rules="[
+										{ required: true, message: $t('subscribe.causeCanNotBeEmpty') },
+									]"
+									:readonly="submitType === 'edit'"
+									rows="3"
+									type="textarea"
+									required
+								/>
+							</van-cell-group>
+						</div>
+						<van-popup v-model:show="typeModalOne" round position="bottom">
+							<van-picker
+								:columns="columnsOne"
+								@cancel="typeModalOne = false"
+								@confirm="(data) => onConfirmOne(data)"
 							/>
-						</van-cell-group>
-					</div>
-					<van-popup v-model:show="typeModalOne" round position="bottom">
-						<van-picker
-							:columns="columnsOne"
-							@cancel="typeModalOne = false"
-							@confirm="(data) => onConfirmOne(data)"
-						/>
-					</van-popup>
-					<div class="commons-add-btn"  v-if="!route.query.id">
-						<van-button
-						icon="plus"
-						type="default"
-						size="small"
-						style="margin-top: 10px"
-						block
-						@click="handleAddRow"
-						>{{$t('common.addDetails')}}</van-button
-						>
+						</van-popup>
+						<div class="commons-add-btn"  v-if="!route.query.id">
+							<van-button
+							icon="plus"
+							type="default"
+							size="small"
+							style="margin-top: 10px"
+							block
+							@click="handleAddRow"
+							>{{$t('common.addDetails')}}</van-button
+							>
+						</div>
 					</div>
 					<!-- <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 class="common-mobile-table">
+					<div class="common-mobile-table" v-else>
 						<table>
 							<thead>
 								<tr>
-									<th>物料编码</th>
-									<th>物料名称</th>
-									<th>规格型号</th>
-									<th>规格型号</th>
-									<th>规格型号</th>
-									<th>规格型号</th>
-									<th>规格型号</th>
+									<th>申购产品</th>
+									<th>数量</th>
+									<th>事由</th>
 								</tr>
 							</thead>
 							<tbody>
-								<tr>
-									<td>1000000001</td>
-									<td>电脑</td>
-									<td>台</td>
-								</tr>
-								<tr>
-									<td>1000000002</td>
-									<td>显示器</td>
-									<td>台</td>
+								<tr v-for="(i,index) in formData.subscribeDetailList" :key="index">
+									<td>{{ i.name }}</td>
+									<td>{{ i.count }}</td>
+									<td>{{ i.remark }}</td>
 								</tr>
 							</tbody>
 						</table>
 					</div>
 				</div>
-				
 			</van-tab>
-			<van-tab title="标签 3">内容 3</van-tab>
-			<van-tab title="标签 4">内容 4</van-tab>
-			<van-tab title="标签 4">内容 4</van-tab>
-			<van-tab title="标签 4">内容 4</van-tab>
 		</van-tabs>
 		
 	</div>
@@ -211,6 +199,12 @@ const formData = ref({
 	dueDate: '',
 	subscribeDetailList: [],
 })
+
+const active = ref(0)
+const tabsChange = () => {
+	active.value ++
+}
+
 const handleAddRow = () => {
 	console.log(formData.value)
 	if(!formData.value.subscribeDetailList) formData.value.subscribeDetailList = []
@@ -347,6 +341,7 @@ const onSubmit = () => {
 }
 defineExpose({
   handleSubmit,
+  tabsChange
 });
 onMounted(() => {
     

src/views/processApproval/index.vue

@@ -110,27 +110,31 @@ const toDtl = (row) => {
 			})
 		}
 	})
-	proxy.$router.push({
-		path: 'processDtl',
-		query: {
-			flowKey: row.flowKey,
-			id: row.id,
-			processType: 10,
-		},
-	})
+	// proxy.$router.push({
+	// 	path: 'processDtl',
+	// 	query: {
+	// 		flowKey: row.flowKey,
+	// 		id: row.id,
+	// 		processType: 10,
+	// 	},
+	// })
 }
 onMounted(() => {
 	if (route.query) {
-		console.log(route.query)
-		req.value.status = route.query.status
+		
 		getList()
 	}
 })
 
 const getList = (type) => {
 	loading.value = true
+	const postUrl = {
+		"1":'/flowExample/getToBeProcessedPage',
+		"2":'/flowExample/getHaveInitiatedPage',
+		"3":'/flowExample/getProcessedPage',
+	}
 	proxy
-		.post('/flowExample/getToBeProcessedPage', req.value)
+		.post(postUrl[route.query.status], req.value)
 		.then((res) => {
 			listData.value =
 				type === 'refresh'

src/views/processApproval/processDtl.vue

@@ -9,38 +9,6 @@
 						: SendSubscribe
 				"></component>
 		</div>
-
-		<!-- <div class="card">
-			<div class="common-title border-btm">申购信息</div>
-			<div class="common-form-text">
-				<div class="common-form-text-item">
-					<div class="common-form-text-item-label">申购单号</div>
-					<div class="common-form-text-item-value">
-						PR-221101-170404-296
-					</div>
-				</div>
-				<div class="common-form-text-item">
-					<div class="common-form-text-item-label">申购时间</div>
-					<div class="common-form-text-item-value">
-						2022-11-01 17:04:04
-					</div>
-				</div>
-				<div class="common-form-text-item">
-					<div class="common-form-text-item-label">申购部门</div>
-					<div class="common-form-text-item-value">仓库</div>
-				</div>
-				<div class="common-form-text-item">
-					<div class="common-form-text-item-label">申购人</div>
-					<div class="common-form-text-item-value">阮平芳</div>
-				</div>
-				<div class="common-form-text-item">
-					<div class="common-form-text-item-label">申购类型</div>
-					<div class="common-form-text-item-value">物料</div>
-				</div>
-				
-			</div>
-		</div> -->
-
 		<div class="btn-warp" :class="footerMoreType ? 'open-more' : ''">
 			<div class="more-btn" @click="footerMoreType = true">
 				更多 <van-icon name="arrow-up" />
@@ -102,7 +70,8 @@ import SendPurchasePayment from './components/SendPurchasePayment'
 import { showSuccessToast, showFailToast } from 'vant'
 const route = useRoute()
 const proxy = getCurrentInstance().proxy
-const onClickLeft = () => proxy.$router.push(componentObj.value[route.query.flowKey].backUrl)
+// const onClickLeft = () => proxy.$router.push(componentObj.value[route.query.flowKey].backUrl)
+const onClickLeft = () => proxy.$router.go(-1)
 const message = ref('')
 const onClickRight = () => {
 	proxy.$router.push('/main/working')
@@ -228,6 +197,11 @@ const handleSubmit = async (_type) => {
 				})
 		}
 	}
+	proxy.$router.go(-1)
+}
+
+const nextFn = () => {
+	makeDom.value.tabsChange()
 }
 
 const getRecords = (_id) => {