转件成功关闭窗口

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

@@ -425,8 +425,8 @@
               @click="
                 startUseMoneyMuate({
                   projectId: mContractDetail?.projectId,
-                  contractId: cContractDetail.contractId,
-                  supplierId: cContractDetail.supplierId
+                  contractId: cContractDetail.id,
+                  supplierId: cContractDetail.customerId
                 })
               "
             >
@@ -475,12 +475,23 @@
               </td>
             </tr>
             <tr>
-              <td class="th">是否需要签订合同：</td>
+              <!-- <td class="th">是否需要签订合同：</td>
               <td>
                 <el-radio-group v-model="cContractDetail.isSign" :disabled="!editor">
                   <el-radio :label="1">是</el-radio>
                   <el-radio :label="0">否</el-radio>
                 </el-radio-group>
+              </td> -->
+              <td class="th">签订时间：</td>
+              <td>
+                <el-date-picker
+                  style="width: 100%"
+                  :disabled="!editor"
+                  v-model="cContractDetail.qualityControllerId"
+                  type="date"
+                  @change="($evt) => (cContractDetail.contractOff = $evt)"
+                  placeholder="请选择合签订时间"
+                />
               </td>
               <td class="th">分包费用承担：</td>
               <td>
@@ -495,6 +506,12 @@
                 </el-select>
               </td>
             </tr>
+            <tr>
+              <td class="th">付款条件：</td>
+              <td colspan="3">
+                {{ cContractDetail?.paymentTerms ?? '' }}
+              </td>
+            </tr>
             <tr>
               <td class="th">分包采购内容需求：</td>
               <td colspan="3">
@@ -525,6 +542,47 @@
               </td>
             </tr>
             <tr>
+              <td class="th">合同拿出时间：</td>
+              <td>
+                <span v-if="!editor && !cContractDetail.contractOn"></span>
+                <el-date-picker
+                  v-else
+                  style="width: 100%"
+                  :disabled="!editor"
+                  v-model="cContractDetail.contractOn"
+                  type="date"
+                  value-format="YYYY-MM-DD"
+                  placeholder="请选择合同拿出时间"
+                />
+              </td>
+              <td class="th">合同拿回时间：</td>
+              <td>
+                <span v-if="!editor && !cContractDetail.contractOff"></span>
+                <el-date-picker
+                  v-else
+                  style="width: 100%"
+                  :disabled="!editor"
+                  v-model="cContractDetail.contractOff"
+                  type="date"
+                  value-format="YYYY-MM-DD"
+                  placeholder="请选择合同拿回时间"
+                />
+              </td>
+            </tr>
+            <tr>
+              <td class="th">签订时间：</td>
+              <td>
+                <span v-if="!editor && !cContractDetail.qualityControllerId"></span>
+                <el-date-picker
+                  v-else
+                  style="width: 100%"
+                  :disabled="!editor"
+                  v-model="cContractDetail.qualityControllerId"
+                  type="date"
+                  value-format="YYYY-MM-DD"
+                  placeholder="请选择签订时间"
+                />
+              </td>
               <td class="th">是否需要签订合同：</td>
               <td>
                 <el-radio-group v-model="cContractDetail.isSign" :disabled="!editor">
@@ -532,9 +590,11 @@
                   <el-radio :label="0">否</el-radio>
                 </el-radio-group>
               </td>
-              <td class="th">质量把控人：</td>
-              <td>
-                <UserOrgTree v-model="cContractDetail.qualityControllerId" :disabled="!editor" />
+            </tr>
+            <tr>
+              <td class="th">付款条件：</td>
+              <td colspan="3">
+                {{ cContractDetail?.paymentTerms ?? '' }}
               </td>
             </tr>
             <tr>
@@ -550,23 +610,14 @@
             </tr>
           </table>
         </div>
-        <div class="tableBox">
-          <h4 class="td_title"><i class="icon"></i>验收信息</h4>
-          <table>
-            <tr>
-              <td class="th">付款条件：</td>
-              <td colspan="3">{{ cContractDetail?.paymentTerms ?? '' }}</td>
-            </tr>
-          </table>
-        </div>
         <div class="tableBox">
           <h4 class="td_title"><i class="icon"></i>财务信息</h4>
           <table>
             <tr>
               <td class="th">已付款金额（元）：</td>
-              <td>{{ calcInfo?.pay }}</td>
+              <td>{{ calcInfo?.pay ?? 0 }}</td>
               <td class="th">合同余额（元）：</td>
-              <td>{{ calcInfo?.balance }}</td>
+              <td>{{ calcInfo?.balance ?? 0 }}</td>
             </tr>
           </table>
         </div>
@@ -642,8 +693,6 @@ const { refetch } = useQuery(
   async () => await getContractsByProject(unref(_currentProjectId)),
   {
     onSuccess: (tData: Contract[]) => {
-      console.log('tData---------------------')
-      console.log(tData)
       for (const contract of tData) {
         if (contract.contractSubList && contract.contractSubList.length > 0) {
           childrenContracts.value = contract.contractSubList

client_h5/index.html

@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width,initial-scale=1.0, maximum-scale=1">
     <script src='https://cdn.bootcss.com/vConsole/3.3.2/vconsole.min.js'></script>
     <script type="text/javascript">
-      // window.vConsole = new window.VConsole()
+      window.vConsole = new window.VConsole()
       window.locationBaseUrl = "/html_h5"
     </script>
     <title></title>

client_h5/src/components/flowForm.vue

@@ -103,7 +103,7 @@
 
 <script setup lang="ts">
 import { showNotify } from 'vant';
-
+import { closePage } from 'dingtalk-jsapi';
 import { formatDate, jsonToFormData } from "@/utils/common";
 import { FlowDTO, getNextActivity } from "@/service/flow";
 import { getTemplateOpinionListByFlowInstanceId, getOpinionListByFlowInstanceId } from '@/service/flow';
@@ -126,11 +126,12 @@ const tabs = ref<{
   title?: string
 }[]>([{}])
 const currentActive = ref<string>('基础信息')
-const { flowInstanceId, activityInstanceId, participant, _o } = route.query as {
+const { flowInstanceId, activityInstanceId, participant, _o, _top } = route.query as {
   flowInstanceId: string
   activityInstanceId: string
   participant: string
   _o: string
+  _top: string
 }
 if (_o && _o == 'v') {
   isSubmitVisabled.value = false
@@ -222,7 +223,11 @@ const submitHandle = async (): Promise<any> => {
           position: 'top',
           onClose() {
             isSubmitDisabled.value = false;
-            router.back();
+            if (_top == '1') {
+              closePage({})
+            } else {
+              router.back();
+            }
           }
         });
       }

client_h5/src/pages/home/index.vue

@@ -106,6 +106,11 @@ initAttendCount()
 }
 queryNoticeAndLearnCount()
 const toPageHandle = (path: string) => {
+  if (path === 'assetMy') {
+    console.log(router.getRoutes())
+  window.close()
+  return;
+  }
   router.push({
     path
   })