前面图片上传和字段添加

client/src/views/OaSystem/home/index.vue

@@ -49,8 +49,6 @@ if (roles) {
     currentIndex.value = '2'
   }
 }
-console.log('userStore------------------------')
-console.log(userStore)
 const server = ref(import.meta.env.VITE_SOCKET + '?userId=' + userStore.getUser.id)
 
 const { data } = useWebSocket(server.value, {

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

@@ -105,6 +105,26 @@
           <el-table-column prop="contractBalance" align="center" label="合同余额" width="120">
             <template #default="scope">{{ scope.row.contractBalance ?? 0 }}</template>
           </el-table-column>
+          <el-table-column prop="contractApplyAmount" align="center" label="分包额" width="120">
+            <template #default="scope">{{ scope.row.contractApplyAmount ?? 0 }}</template>
+          </el-table-column>
+          <el-table-column prop="applyPayAmount" align="center" label="已支付" width="120">
+            <template #default="scope">{{ scope.row.applyPayAmount ?? 0 }}</template>
+          </el-table-column>
+          <el-table-column prop="qualityMoney" align="center" label="质保金" width="120">
+            <template #default="scope">{{ scope.row.qualityMoney ?? 0 }}</template>
+          </el-table-column>
+          <el-table-column prop="qualityMoneyStatus" align="center" label="质保金状态" width="120">
+            <template #default="scope">
+              {{
+                scope.row.qualityMoneyStatus
+                  ? scope.row.qualityMoneyStatus === 1
+                    ? '已核销'
+                    : '未核销'
+                  : ''
+              }}
+            </template>
+          </el-table-column>
           <el-table-column prop="projectCost" align="center" label="项目总成本" width="120">
             <template #default="scope">{{ scope.row.projectCost ?? 0 }}</template>
           </el-table-column>

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

@@ -197,19 +197,21 @@
               </tr>
             </table>
           </div>
-          <!-- <div class="tableBox" v-show="isMaster">
+          <div class="tableBox" v-show="isMaster">
             <h4><i class="icon"></i>分包信息</h4>
             <table>
               <tr>
                 <td class="th">分包费（元）：</td>
-                <td>{{ projectDetail['yssj'] }}</td>
+                <td colspan="3">{{ projectDetail['contractApplyAmount'] }}</td>
+              </tr>
+              <tr>
                 <td class="th">已支付（元）：</td>
-                <td>{{ projectDetail['ysdyxx'] }}</td>
+                <td>{{ projectDetail['applyPayAmount'] }}</td>
                 <td class="th">未支付（元）：</td>
-                <td>{{ projectDetail['ysdyxx'] }}</td>
+                <td>{{ projectDetail['applyUnPayAmount'] }}</td>
               </tr>
             </table>
-          </div> -->
+          </div>
           <div class="tableBox">
             <h4><i class="icon"></i>产值信息</h4>
             <table>

client/src/views/system/user/UserForm.vue

@@ -204,6 +204,7 @@ const open = async (type: string, id?: number) => {
   dialogTitle.value = t('action.' + type)
   formType.value = type
   resetForm()
+  fileList.value = []
   // 修改时，设置数据
   if (id) {
     formLoading.value = true

client_h5/src/router/index.ts

@@ -14,6 +14,8 @@ const router = createRouter({
 })
 // 路由加载前
 router.beforeEach((to, from, next) => {
+  next()
+  return
   getUserInfoPromise(true).then((isLogin) => {
     next(); 
     if (!isLogin) {