Merge branch 'minJeecg' into 'master'

1.新增计划审核

See merge request cxcxt/jeecguniapp!31

env/.env.development

@@ -7,7 +7,7 @@ VITE_SHOW_SOURCEMAP = true
 # 是否启用读取配置文件 min
 #VITE_WEBAPP = 'D://opt//AppUpdateTest'
 VITE_WEBAPP = ''
-VITE_SERVER_BASEURL = 'http://10.75.15.246:8080/jeecg-boot'
+VITE_SERVER_BASEURL = 'http://10.75.15.247:8080/jeecg-boot'
 #websocket连接url-测试用
 VITE_WEBSOCKET_URL = 'ws://10.75.15.246:8899/mqttprod/ws/simple'
 #VITE_SERVER_BASEURL = 'https://36.112.48.190/jeecg-boot'

env/.env.production

@@ -8,9 +8,5 @@ VITE_SHOW_SOURCEMAP = false
 #VITE_WEBAPP = 'D://opt//AppUpdateTest'
 VITE_WEBAPP = ''
 VITE_SERVER_BASEURL = 'https://szcx.zyyt.sinopec.com/jeecg-boot'
-
-
-
-
 #VITE_SERVER_BASEURL = 'https://szcx.zyyt.sinopec.com/wwapi'
 #VITE_SERVER_BASEURL = 'https://szcx.zyyt.sinopec.com/yjapi'

src/api/plan/index.ts

@@ -0,0 +1,10 @@
+import { http } from '@/utils/http';
+
+/*通过id查询公文数据*/
+export function queryByIdBpm(id : string) {
+	return http({
+		url: '/cxcjhcwjswxjh/cxcJhcwJswxjh/queryByIdBpm',
+		method: 'GET',
+		data: { id }
+	})
+}

src/components/Mupload/Mupload.vue

@@ -1,10 +1,10 @@
 <template>
 	<view>
-		<wd-upload :accept="accept" multiple :file-list="fileList" :action="action" @change="handleChange" :disabled="disabled" @fail="fail"
+		<wd-upload :accept="accept" multiple :before-preview="beforeChoose" :file-list="fileList" :action="action" @change="handleChange" :disabled="disabled" @fail="fail"
 			:before-remove="beforeRemove" :multiple="multiple">
 			<template #preview-cover="{ file,index }">
 				<!-- 小程序拿不到文件 -->
-				<view class="preview-cover text-ellipsis" style="color: #0081ff;" @click="onLinePreview(file.name)">
+				<view class="preview-cover text-ellipsis" style="color: #0081ff;" @click="onLinePreview(file)">
 					{{ file?.name||`文件${index+1}` }}
 				</view>
 			</template>
@@ -82,6 +82,10 @@
 		{ immediate: true },
 	)
 
+	const beforeChoose = (val) =>{
+		onLinePreview(val.file);
+		return false;
+	}
 
 	const handleChange = (val) => { //文件发生变化
 		let pathArr = [];
@@ -143,9 +147,8 @@
 	}
 
 	const onLinePreview = (val) => { //在线预览
-		console.log(val)
-		let prex = props.path ? props.path : 'APP文件'
-		let usePath = prex + '/' + val
+		// let prex = props.path ? props.path : 'APP文件'
+		let usePath = JSON.parse( val.response).message
 		uni.navigateTo({
 			url: `/pages/onlinePreview/detail?data=${usePath}`
 		});

src/pages-bpm/planReview/index.vue

@@ -0,0 +1,65 @@
+<template>
+	<view>
+		<wd-cell-group>
+			<wd-cell title="建议计划类别" :value="info.jyjhlx_dictText" />
+			<wd-cell title="项目名称" :value="info.xmmc" />
+			<wd-cell title="年度批次" :value="info.nd+'+0'+info.pc" />
+			<wd-cell title="计划开工（执行）时间" :value="info.jhkgsj" />
+			<wd-cell title="完工时间" :value="info.wgsj" />
+			<wd-cell title="结算时间" :value="info.jssj" />
+			<wd-cell title="使用单位（部门）" :value="info.sydw_dictText" />
+			<wd-cell title="实施原因" :value="info.ssyy" />
+			<wd-cell title="主要工作内容及工程量" :value="info.nrgzl" />
+			<wd-cell title="费用明细构成" :value="info.mxgc" />
+			<wd-cell title="项目负责人" :value="info.xmfzr_dictText" />
+			<wd-cell title="主管部门" :value="info.zgbm_dictText" />
+			<wd-cell title="切块费用名称" :value="info.qkfymc" />
+			<wd-cell title="计划金额（万元）" :value="info.jhje" />
+			<wd-cell title="剩余预算（万元）" :value="info.remainder" />
+			<wd-cell title="承揽单位类别" :value="info.cldwlb_dictText" />
+			<wd-cell title="自营组织方式" :value="info.zyzzfs" />
+			<wd-cell title="自营意向单位" :value="info.zyysdw" />
+			<wd-cell title="项目经办人" :value="info.contactPerson_dictText" />
+			<wd-cell title="备注" :value="info.bz" />
+			<wd-cell title="上传请示文件" v-if="info.jyjhlx!='4'">
+				<Mupload v-model="info.qsbz" disabled></Mupload>
+			</wd-cell>
+		</wd-cell-group>
+		<wd-toast></wd-toast>
+	</view>
+</template> 
+
+<script setup>
+	import {
+		queryByIdBpm
+	} from '@/api/plan'
+	import { useToast, useMessage, useNotify, dayjs } from 'wot-design-uni'
+	import Mupload from '@/components/Mupload/Mupload.vue'
+	
+	const toast = useToast()
+	const info = ref({})
+	const image = ref([])
+	const props = defineProps({
+		formData: {
+			type: Object,
+			default: () => {},
+		}
+	})
+
+
+	// 申请信息
+	const queryByIdMount = () => {
+		queryByIdBpm(props.formData.dataId).then((res) => {
+			if (res.success) {
+				console.log(res)
+				info.value = res.result.records[0]
+			}else{
+				toast.error(res.message)
+			}
+		})
+	}
+
+	onMounted(() => {
+		queryByIdMount()
+	})
+</script>

src/pages.json

@@ -597,6 +597,10 @@
           "path": "OfficeEquipmentMaintenanceApplication/index",
           "type": "page"
         },
+        {
+          "path": "planReview/index",
+          "type": "page"
+        },
         {
           "path": "SuperiorSystem/index",
           "type": "page"

src/pages/login/login.vue

@@ -105,9 +105,9 @@
 		let pw = Base64.encode(encodeURIComponent(password.value))
 		loading.value = true
 		/*生产环境 begin */
-		loginApi({ username: un, password: pw })
+		// loginApi({ username: un, password: pw })
 		/*开发环境 begin */
-		// loginApi({ username: userName.value, password: password.value, captcha: 'app' })
+		loginApi({ username: userName.value, password: password.value, captcha: 'app' })
 			.then((res : any) => {
 				if (res.success) {
 					const { result } = res

src/types/uni-pages.d.ts

@@ -71,6 +71,7 @@ interface NavigateToOptions {
        "/pages-bpm/lawsAndRegulations/index" |
        "/pages-bpm/leaveApplication/index" |
        "/pages-bpm/OfficeEquipmentMaintenanceApplication/index" |
+       "/pages-bpm/planReview/index" |
        "/pages-bpm/SuperiorSystem/index" |
        "/pages-bpm/unconventional/index" |
        "/pages-bpm/unconventional/stamp" |