UI框架修改

client/src/views/OaSystem/components/DeptTree/index.vue

@@ -3,6 +3,7 @@
     style="width: 100%"
     v-model="receiveUserId"
     :data="allUserList"
+    :default-expand-all="true"
     :filter-node-method="filterNodeMethod"
     placeholder=" "
     @node-click="nodeClickHandler"

client/src/views/OaSystem/financialManagement/kpglPage/deptIndex.vue

@@ -136,8 +136,7 @@
         <el-table-column
           align="center"
           prop="invoiceDate"
-          :show-overflow-tooltip="true"
-          :formatter="dateFormatter"
+          :formatter="dateFormatter2"
           label="开票日期"
         />
         <el-table-column
@@ -223,7 +222,7 @@
 
 <script setup lang="ts">
 import * as kpglApi from '@/api/oa/kpgl'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter2 } from '@/utils/formatTime'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import TableLayout from '../../oaViews/layout/TableLayout.vue'
 

client/src/views/OaSystem/financialManagement/kpglPage/index.vue

@@ -20,19 +20,11 @@
       </div>
       <div class="form">
         <span class="formSpan">区域经理：</span>
-        <el-input
-          v-model="queryParams.commonCostNo"
-          placeholder="请输入区域经理"
-          style="width: 210px"
-        />
+        <UserOrgTree v-model="queryParams['userId']" />
       </div>
       <div class="form">
         <span class="formSpan">责任部门：</span>
-        <el-input
-          v-model="queryParams.commonCostNo"
-          placeholder="请输入责任部门"
-          style="width: 210px"
-        />
+        <DeptTree v-model="queryParams['deptId']" />
       </div>
       <div class="form">
         <span class="formSpan">项目名称：</span>
@@ -47,34 +39,10 @@
         />
       </div>
 
-      <div class="form">
-        <span class="formSpan">未回款金额：</span>
-        <el-input
-          v-model="queryParams.totalAmount"
-          placeholder="请输入报销总金额"
-          style="width: 160px"
-        />
-      </div>
       <div class="form">
         <span class="formSpan">开票状态：</span>
         <el-input v-model="queryParams.status" style="width: 160px" />
       </div>
-      <div class="form">
-        <span class="formSpan">开票金额：</span>
-        <el-input
-          v-model="queryParams.totalAmount"
-          placeholder="请输入开票金额"
-          style="width: 160px"
-        />
-      </div>
-      <div class="form">
-        <span class="formSpan">开票单位：</span>
-        <el-input
-          v-model="queryParams.totalAmount"
-          placeholder="请输入开票金额"
-          style="width: 160px"
-        />
-      </div>
 
       <div class="form" style="width: 380px">
         <span class="formSpan">开票日期：</span>
@@ -98,10 +66,10 @@
           end-placeholder="结束日期"
         />
       </div>
-      <div class="form" style="margin-right: 80px">
-        <el-radio-group v-model="queryParams.isSign">
-          <el-radio label="1">未回款</el-radio>
-        </el-radio-group>
+
+      <div class="form">
+        <span class="formSpan">是否回款：</span>
+        <el-input v-model="queryParams.status" style="width: 160px" />
       </div>
       <div class="from">
         <div class="btnBox">
@@ -130,8 +98,7 @@
         <el-table-column
           align="center"
           prop="invoiceDate"
-          :show-overflow-tooltip="true"
-          :formatter="dateFormatter"
+          :formatter="dateFormatter2"
           label="开票日期"
         />
         <el-table-column
@@ -208,8 +175,10 @@
 import * as kpglApi from '@/api/oa/kpgl'
 import { getFlowUrl } from '@/api/oa/index'
 import { openFlow } from '@/utils/flow'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter2 } from '@/utils/formatTime'
 import TableLayout from '../../oaViews/layout/TableLayout.vue'
+import UserOrgTree from '@/views/OaSystem/components/UserOrgTree/index.vue'
+import DeptTree from '@/views/OaSystem/components/DeptTree/index.vue'
 
 defineOptions({ name: 'CommonCost' })
 const xmztMap: any = {

client/src/views/OaSystem/financialManagement/kpglPage/myIndex.vue

@@ -135,8 +135,7 @@
         <el-table-column
           align="center"
           prop="invoiceDate"
-          show-overflow-tooltip="true"
-          :formatter="dateFormatter"
+          :formatter="dateFormatter2"
           label="开票日期"
         />
         <el-table-column
@@ -207,9 +206,8 @@
 
 <script setup lang="ts">
 import * as kpglApi from '@/api/oa/kpgl'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter2 } from '@/utils/formatTime'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
-import { UserFilled } from 'node_modules/_@element-plus_icons-vue@2.3.1@@element-plus/icons-vue/dist/types'
 import TableLayout from '../../oaViews/layout/TableLayout.vue'
 
 defineOptions({ name: 'CommonCost' })

client/src/views/OaSystem/home/components/CardItemThree.vue

@@ -29,10 +29,10 @@ interface SignInterface {
   unit: string
 }
 const signs = ref<SignInterface[]>([
-  { icon: '签', title: '2023年度签约', value: 0, unit: '万元' },
-  { icon: '回', title: '2023年度回款', value: 0, unit: '万元' },
-  { icon: '净', title: '2023年度净合同额', value: 0, unit: '万元' },
-  { icon: '拓', title: '2023年度新开拓', value: 0, unit: '万元' },
+  { icon: '签', title: '2024年度签约', value: 0, unit: '万元' },
+  { icon: '回', title: '2024年度回款', value: 0, unit: '万元' },
+  { icon: '净', title: '2024年度净合同额', value: 0, unit: '万元' },
+  { icon: '拓', title: '2024年度新开拓', value: 0, unit: '万元' },
   { icon: '分包', title: '待支付', value: 0, unit: '万元' },
   { icon: '外包', title: '待支付', value: 0, unit: '万元' }
 ])
@@ -50,7 +50,7 @@ const queryContractInfo = async (): Promise<void> => {
     {
       url: urlApi,
       data: {
-        year: 2023
+        year: 2024
       }
     },
     'business'

client/src/views/OaSystem/home/components/CardItemTwo.vue

@@ -30,13 +30,12 @@ const functions = ref<
     key: string
   }[]
 >([
-  { title: '驾驶舱', icon: 'jsc-icon', key: '' },
   { title: '差旅报销', icon: 'clvbx-icon', key: '' },
   { title: '普通报销', icon: 'ptbx-icon', key: '' },
   { title: '用款申请', icon: 'yksq-icon', key: '' },
   { title: '合同签订', icon: 'htqd-icon', key: '' },
-  { title: '开票申请', icon: 'kpsq-icon', key: '' },
-  { title: '添加功能', icon: 'tjgn-icon', key: 'addFunction' }
+  { title: '开票申请', icon: 'kpsq-icon', key: '' }
+  // { title: '添加功能', icon: 'tjgn-icon', key: 'addFunction' }
 ])
 const $emit = defineEmits<{
   (e: 'click', val: any): void

client/src/views/OaSystem/marketCenter/khglPage/components/CustomerTable.vue

@@ -132,8 +132,8 @@ const newCustomer = (isAdd: boolean, row?) => {
   const params = !isAdd
     ? `?id=${row.id}&name=${row.customerName}&edit=true`
     : row
-      ? `?id=${row.id}&name=${row.customerName}`
-      : ''
+    ? `?id=${row.id}&name=${row.customerName}`
+    : ''
   push(`/newCustomer${params}`)
 }
 // 查看客户详情

zjugis-business/src/main/resources/templates/Leave/js/all.mobile.min.js

@@ -5416,11 +5416,11 @@ window.pinyin_dict_notone = {
     function date(selector) {
         return dateComp.call(this, selector)
     }
-    date.prototype.init = function() {
-        dateCompInit.call(this, {
+    date.prototype.init = function(option) {
+        dateCompInit.call(this, $.extend(true, {
             type: "date",
             format: "yyyy-MM-dd"
-        })
+        }, option))
     }
     ;
     z.ui.datetime = function(selector) {
@@ -5440,11 +5440,11 @@ window.pinyin_dict_notone = {
     function datetime(selector) {
         return dateComp.call(this, selector)
     }
-    datetime.prototype.init = function() {
-        dateCompInit.call(this, {
+    datetime.prototype.init = function(option) {
+        dateCompInit.call(this, $.extend(true, {
             type: "datetime",
             format: "yyyy-MM-dd HH:mm:ss"
-        })
+        }, option));
     }
     ;
     z.ui.time = function(selector) {
@@ -5465,10 +5465,10 @@ window.pinyin_dict_notone = {
         return dateComp.call(this, selector)
     }
     time.prototype.init = function(option) {
-        dateCompInit.call(this, {
+        dateCompInit.call(this, $.extend(true, {
             type: "time",
             format: "HH:mm:ss"
-        })
+        }, option))
     }
     ;
     function dateComp(selector) {
@@ -5515,9 +5515,11 @@ window.pinyin_dict_notone = {
                             }
                         }
                         _this.elem.value = result.value;
-                        opt.done(result.value)
+                        opt.onSuccess && opt.onSuccess(result.value)
                     },
-                    onFail: function(err) {}
+                    onFail: function(err) {
+                        opt.onFail && opt.onFail(err)
+                    }
                 })
             });
             return

zjugis-business/src/main/resources/templates/Leave/js/mobileIndex.js

@@ -30,7 +30,11 @@
             var uuid = new Date().getTime();   //如果是显示：uuid用数据id
             var rowDom = generateCardHtml({}, index, uuid);
             $(".table_box_list").append(rowDom);
-            z.ui.datetime("[name='createReqVO$startTime_"+uuid+"']").init();
+            z.ui.datetime("[name='createReqVO$startTime_"+uuid+"']").init({
+                done: function(val){
+
+                }
+            });
             $(".card_del_"+uuid).on("touchstart", function(){
                 rowDom.remove();
             })