钉钉表单H5页面功能扩展

client/src/service/contract.ts

@@ -237,3 +237,15 @@ export const startUseMoney = async (payload: { projectId?: string; supplierId?:
     '/business'
   )
 }
+
+/***
+ * 软件产品列表
+ */
+export const productSoftpatent = async () => {
+  return await request.get(
+    {
+      url: '/productSoftpatent/list'
+    },
+    '/business'
+  )
+}

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

@@ -1,19 +1,43 @@
 <template>
   <div class="SevenDetailBox">
-    <ul>
-      <li v-for="(v, i) in 20" :key="i">
+    <ul v-if="!loading && listData.length > 0">
+      <li v-for="(item, i) in listData" :key="i">
         <div>
-          <span>已回款：</span>
-          <span>¥6200</span>
-          <span>生态修复行动方案</span>
+          <span>{{ item?.messageContent }}</span>
         </div>
         <span>10/28</span>
       </li>
     </ul>
+    <p v-else style="text-align: center; padding: 20px 0px">
+      <span>暂无回款记录</span>
+    </p>
   </div>
 </template>
 
-<script setup lang="ts"></script>
+<script setup lang="ts">
+import request from '@/config/axios'
+import { useUserStore } from '@/store/modules/user'
+
+const loading = ref<boolean>(false)
+const listData = ref([])
+const userStore = useUserStore()
+const year = 2023
+const queryContractMessageByPage = async (): Promise<void> => {
+  loading.value = true
+  const urlApi = `/contract-message/page`
+  const sendData = {
+    deptId: userStore.getUser.deptId,
+    year: year,
+    managerId: userStore.getUser.id
+  }
+  const result = await request.get({ url: urlApi, params: sendData }, '/business')
+  loading.value = false
+  if (result.records && result.records.length > 0) {
+    listData.value = result.records
+  }
+}
+queryContractMessageByPage()
+</script>
 
 <style lang="scss" scoped>
 .SevenDetailBox {

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

@@ -1,5 +1,5 @@
 <template>
-  <div class="SixDetailBox">
+  <!-- <div class="SixDetailBox">
     <ul>
       <li>
         <p class="number" style="color: #f83535">8</p>
@@ -14,7 +14,7 @@
         <p class="title">草稿</p>
       </li>
     </ul>
-  </div>
+  </div> -->
   <CardItemTwo />
 </template>
 

client/src/views/OaSystem/projectCenter/projectBook/deptProject.vue

@@ -120,7 +120,7 @@
           <el-table-column prop="lxsj" label="立项时间" width="120" />
           <el-table-column prop="yssj" label="验收时间" width="120" />
           <el-table-column prop="contractAmount" align="center" label="合同额" width="120">
-            <template #default="scope">{{ scope.contractAmount ?? 0 }}</template>
+            <template #default="scope">{{ scope.row.contractAmount ?? 0 }}</template>
           </el-table-column>
           <el-table-column prop="xmzt" label="项目状态" width="120">
             <template #default="scope">

client/src/views/OaSystem/projectCenter/projectBook/myProject.vue

@@ -120,7 +120,7 @@
           <el-table-column prop="lxsj" label="立项时间" width="120" />
           <el-table-column prop="yssj" label="验收时间" width="120" />
           <el-table-column prop="contractAmount" align="center" label="合同额" width="120">
-            <template #default="scope">{{ scope.contractAmount ?? 0 }}</template>
+            <template #default="scope">{{ scope.row.contractAmount ?? 0 }}</template>
           </el-table-column>
           <el-table-column prop="xmzt" label="项目状态" width="120">
             <template #default="scope">

client/src/views/OaSystem/projectCenter/projectBook/projectBook.vue

@@ -78,13 +78,13 @@
           <el-table-column prop="zrbm" label="责任部门" width="200" />
           <el-table-column prop="xmjl" label="项目经理" width="120" />
           <el-table-column prop="contractAmount" align="center" label="合同额" width="120">
-            <template #default="scope">{{ scope.contractAmount ?? 0 }}</template>
+            <template #default="scope">{{ scope.row.contractAmount ?? 0 }}</template>
           </el-table-column>
           <el-table-column prop="receivableAmount" align="center" label="应收款" width="120">
-            <template #default="scope">{{ scope.receivableAmount ?? 0 }}</template>
+            <template #default="scope">{{ scope.row.receivableAmount ?? 0 }}</template>
           </el-table-column>
           <el-table-column prop="contractBalance" align="center" label="合同余额" width="120">
-            <template #default="scope">{{ scope.contractBalance ?? 0 }}</template>
+            <template #default="scope">{{ scope.row.contractBalance ?? 0 }}</template>
           </el-table-column>
           <el-table-column prop="projectCost" align="center" label="项目总成本" width="120">
             <template #default="scope">{{ scope.projectCost ?? 0 }}</template>

client/src/views/OaSystem/projectCenter/projectDetail/components/xmht/index.vue

@@ -243,7 +243,19 @@
                   <!-- <el-input v-model="mContractDetail.taxBhsze" :disabled="!editor" /> -->
                 </td>
                 <td rowspan="5">
-                  <el-input v-model="mContractDetail.taxSoftpatent" :disabled="!editor" />
+                  <el-select
+                    v-model="mContractDetail.taxSoftpatent"
+                    style="width: 100%"
+                    placeholder=" "
+                    :disabled="!editor"
+                  >
+                    <el-option
+                      v-for="item in productSoftList"
+                      :key="item.id"
+                      :label="item.name"
+                      :value="item.id"
+                    />
+                  </el-select>
                 </td>
               </tr>
               <tr>
@@ -530,7 +542,8 @@ import {
   startContractInvoice,
   queryCustomerTree,
   queryCompanyTree,
-  getContractPaymentCalc
+  getContractPaymentCalc,
+  productSoftpatent
 } from '@/service/contract'
 import { useQuery, useMutation } from '@tanstack/vue-query'
 import { Contract } from '@/interface/contract'
@@ -552,6 +565,21 @@ const mContractDetail = ref<Contract>({} as Contract)
 const cContractDetail = ref<any>()
 const mContractDetails = ref<any[]>([])
 const childrenContracts = ref<any[]>([])
+
+/***
+ * 软件产品列表
+ */
+const productSoftList = ref<
+  {
+    id: string
+    name: string
+  }[]
+>([])
+const queryProductSoftpatent = async (): Promise<void> => {
+  const result = await productSoftpatent()
+  productSoftList.value = result
+}
+queryProductSoftpatent()
 /***
  * 查询主合同和子合同详情数据: 存在多个主合同（兼容之前项目合同），一般来说子合同只存在最新主合同
  * **/

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

@@ -23,6 +23,52 @@
                 }
             }
         });
+        var testList = []
+        $(".addCardBtn").on("click", function(){
+            testList.push({})
+            var index = testList.length - 1
+            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();
+            $(".card_del_"+uuid).on("touchstart", function(){
+                rowDom.remove();
+            })
+        })
+        function generateCardHtml(item, index, uuid){
+          var rowDom = document.createElement("div");
+          rowDom.setAttribute("class", "z-form-row");
+          var htmlStr = '<div class="z-form-row inline no_border">'+
+              '<div class="z-form-label z-col-30">起始时间</div>'+
+              '<div class="z-form-control inline z-col-70">'+
+              '<div class="z-comp-datetime z-readonly" name="createReqVO$startTime_'+uuid+'">'+
+              '<input type="text" value="">'+
+              '</div>'+
+              '</div>'+
+              '</div>'+
+              '<div class="z-form-row inline no_border">'+
+              '<div class="z-form-label z-col-30">截止时间</div>'+
+              '<div class="z-form-control z-col-70">'+
+              '<div class="z-comp-datetime z-readonly" name="createReqVO$createTime">'+
+              '<input type="text" value="">'+
+              '</div>'+
+              '</div>'+
+              '</div>'+
+              '<div class="z-form-row inline no_border">'+
+              '<div class="z-form-label z-col-30">备注</div>'+
+              '<div class="z-form-control z-col-70">'+
+              '<div class="z-comp-textarea">'+
+              '<textarea></textarea>'+
+              '</div>'+
+              '</div>'+
+              '</div>'+
+              '<div class="z-form-row inline no_border btn-group">'+
+              '<button class="card_save">保存</button>'+
+              '<button class="danger card_del_'+uuid+'" data-index="'+index+'">删除</button>'+
+              '</div>';
+          rowDom.innerHTML = htmlStr;
+          return rowDom;
+        }
         // z.ui.date("[name='createReqVO$createTime']").setValue(getDate());
         addDataThat = $("#addData")
         $("#addData").click(function () {

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

@@ -129,65 +129,9 @@
                     <div class="table_add">
                         <div class="title_box">
                             <span class="title">请假时间信息</span>
-                            <button>添加</button>
+                            <button class="addCardBtn">添加</button>
                         </div>
                         <div class="table_box_list">
-                           <div class="z-form-row">
-                               <div class="z-form-row inline no_border">
-                                   <div class="z-form-label z-col-30">起始时间</div>
-                                   <div class="z-form-control inline z-col-70">
-                                       <div class="z-comp-date z-readonly" name="createReqVO$createTime">
-                                           <input type="text" value="${(formEntity.createTime?date)!}">
-                                       </div>
-                                   </div>
-                               </div>
-                               <div class="z-form-row inline no_border">
-                                   <div class="z-form-label z-col-30">截止时间</div>
-                                   <div class="z-form-control z-col-70">
-                                       <div class="z-comp-date z-readonly" name="createReqVO$createTime">
-                                           <input type="text" value="${(formEntity.createTime?date)!}">
-                                       </div>
-                                   </div>
-                               </div>
-                               <div class="z-form-row inline no_border">
-                                   <div class="z-form-label z-col-30">备注</div>
-                                   <div class="z-form-control z-col-70">
-                                       <div class="z-comp-textarea">
-                                           <textarea></textarea>
-                                       </div>
-                                   </div>
-                               </div>
-                               <div class="z-form-row inline no_border btn-group">
-                                <button>保存</button>
-                                   <button class="danger">删除</button>
-                               </div>
-                           </div>
-                            <div class="z-form-row">
-                                <div class="z-form-row inline no_border">
-                                    <div class="z-form-label z-col-30">起始时间</div>
-                                    <div class="z-form-control z-col-70">
-                                        <div class="z-comp-date z-readonly" name="createReqVO$createTime">
-                                            <input type="text" value="${(formEntity.createTime?date)!}">
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="z-form-row inline no_border">
-                                    <div class="z-form-label z-col-30">截止时间</div>
-                                    <div class="z-form-control z-col-70">
-                                        <div class="z-comp-date z-readonly" name="createReqVO$createTime">
-                                            <input type="text" value="${(formEntity.createTime?date)!}">
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="z-form-row inline no_border">
-                                    <div class="z-form-label z-col-30">备注</div>
-                                    <div class="z-form-control z-col-70">
-                                        <div class="z-comp-textarea">
-                                            <textarea></textarea>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
                         </div>
                     </div>
                 </div>

zjugis-business/src/main/resources/templates/public/htmlMobile.ftl

@@ -23,8 +23,6 @@
         <script type="text/javascript"
                 src="${UIURL!}/jquery.1.11.3.min.js<#if allJsVserion != ''>?version=${allJsVserion}</#if>"></script>
         <script src="https://g.alicdn.com/dingding/dingtalk-jsapi/2.10.3/dingtalk.open.js"></script>
-        <script src="https://g.alicdn.com/gdt/jsapi/1.9.22/index.js"></script>
-        <script src="https://g.alicdn.com/gdt/jsapi-adapter-dingtalk-pc/1.2.10/index.js"></script>
         <script type="text/javascript"
                 src="${UIURL!}/all.mobile.min.js<#if allJsVserion != ''>?version=${allJsVserion}</#if>"></script>
         <#list javascripts as js>

zjugis-workflow/src/main/resources/templates/HandlerCaseCenter/js/mobileIndex.js

@@ -222,8 +222,6 @@
                 z.ui.loading(false);
                 var tabTitle = isView ? "流程查看" : "流程办理";
                 var url = ajaxData + "&sourcewindowid=";
-                console.log("ajaxDataUrl------------------")
-                console.log(ajaxData)
                 z.ui.navigation.openLink({
                     url: url
                 });