瀏覽代碼

工作流表单H5办件中心Header配置修改

songxy 1 年之前
父節點
當前提交
8c8c244546

+ 11 - 15
client/src/views/OaSystem/financialManagement/kpglPage/index.vue

@@ -185,7 +185,7 @@
           <template #default="scope">
             <div class="operateBtnGroup">
               <span @click="processHandler(scope.row)">查看</span>
-              <span @click="remittanceRegistration(scope.row)">回款登记</span>
+              <span @click="processHandler(scope.row)">回款登记</span>
             </div>
           </template>
         </el-table-column>
@@ -210,7 +210,6 @@ import { getFlowUrl } from '@/api/oa/index'
 import { openFlow } from '@/utils/flow'
 import { dateFormatter } from '@/utils/formatTime'
 import TableLayout from '../../oaViews/layout/TableLayout.vue'
-import { useMutation } from '@tanstack/vue-query'
 
 defineOptions({ name: 'CommonCost' })
 const xmztMap: any = {
@@ -284,22 +283,19 @@ const handleQuery = () => {
  * 发起开票流程
  */
 const router = useRouter()
-const { mutate: getFlowUrlMutate } = useMutation(getFlowUrl, {
-  onSuccess: (data) => {
-    if (data) {
-      openFlow(router, data, '开票流程')
-    }
-  }
-})
-const processHandler = (row: any) => {
-  getFlowUrlMutate({
+/**
+ * 发起查看和回款登记流程
+ */
+const processHandler = async (row: any) => {
+  const flowUrl = await getFlowUrl({
     flowInstanceId: row.instanceId
   })
+  if (flowUrl) {
+    openFlow(router, flowUrl, '回款登记')
+  } else {
+    ElMessage.error('未查询到相关数据')
+  }
 }
-/**
- * 发起回款登记
- */
-const remittanceRegistration = (row: any) => {}
 /** 初始化 */
 onMounted(() => {
   getList()

+ 10 - 17
client/src/views/OaSystem/projectCenter/projectBook/projectBook.vue

@@ -183,8 +183,7 @@ const searchHandle: () => void = () => {
   queryProjectCalculate()
   queryProjectListAjax()
 }
-const queryProjectListAjax = async (): Promise<void> => {
-  const urlApi = `/project/page`
+const setSearchParams = (): void => {
   if (lxsjObj.value && lxsjObj.value.length > 0) {
     queryParams.lxsjOn = moment(lxsjObj.value[0]).format('YYYY-MM-DD')
     queryParams.lxsjOff = moment(lxsjObj.value[1]).format('YYYY-MM-DD')
@@ -192,13 +191,17 @@ const queryProjectListAjax = async (): Promise<void> => {
     queryParams.lxsjOn = ''
     queryParams.lxsjOff = ''
   }
+  if (queryParams.hyId == 0) {
+    queryParams.hyId = null
+  }
+}
+const queryProjectListAjax = async (): Promise<void> => {
+  const urlApi = `/project/page`
+  setSearchParams()
   const sendData = {
     ...queryParams,
     pageSize: 15
   }
-  if (sendData['hyId'] == 0) {
-    sendData['hyId'] = null
-  }
   const result = await request.get({ url: urlApi, params: sendData }, '/business')
   tableData.value = result['records']
   total.value = result['total']
@@ -210,19 +213,9 @@ queryProjectListAjax()
  */
 const queryProjectCalculate = async (): Promise<void> => {
   const urlApi = `/project/calculate`
-  if (lxsjObj.value && lxsjObj.value.length > 0) {
-    queryParams.lxsjOn = moment(lxsjObj.value[0]).format('YYYY-MM-DD')
-    queryParams.lxsjOff = moment(lxsjObj.value[1]).format('YYYY-MM-DD')
-  } else {
-    queryParams.lxsjOn = ''
-    queryParams.lxsjOff = ''
-  }
+  setSearchParams()
   const sendData = {
-    ...queryParams,
-    pageSize: 15
-  }
-  if (sendData['hyId'] == 0) {
-    sendData['hyId'] = null
+    ...queryParams
   }
   const result = await request.get({ url: urlApi, params: sendData }, '/business')
   if (result) {

+ 1 - 2
zjugis-workflow/src/main/resources/static/all.mobile.js

@@ -2271,8 +2271,7 @@ window.pinyin_dict_notone = {"a":"阿啊呵腌嗄吖锕","e":"额阿俄恶鹅遏
         }
         var aStr = localStorage.getItem('ACCESS_TOKEN');
         if(aStr){
-            var a = JSON.parse(aStr);
-            a['v'] && (headers['Authorization'] = 'Bearer '+JSON.parse(a['v']));
+            headers['Authorization'] = 'Bearer '+aStr;
         }
         var opt=$.extend(true,
         {

File diff suppressed because it is too large
+ 0 - 0
zjugis-workflow/src/main/resources/static/all.mobile.min.js


Some files were not shown because too many files changed in this diff