feat : 项目管理表单缓存,文件回显,个人中心icon排版

2024-07-16 20:36:06 +08:00
parent d4ba4bc7c2
commit b77253b0cb
13 changed files with 389 additions and 128 deletions
--- a/src/views/auth/index.vue
+++ b/src/views/auth/index.vue
@@ -6,55 +6,91 @@
          <!-- 标题 -->
          <template #header>
            <div class="card-header">
-              <span>个人信息</span>
+              <div>个人信息</div>
            </div>
          </template>
          <div class="userDetail">
            <div class="userInfo_item">
-              用户名: <span>{{ userParams.userName }}</span>
+              <div style="display: flex;align-items: center">
+                <el-icon size="18" style="margin-right: 5px">
+                  <User/>
+                </el-icon>
+                用户名:
+              </div>
+              <div>{{ userParams.userName }}</div>
            </div>
            <div class="userInfo_item">
-              用户名称: <span>{{ userParams.nickName }}</span>
+              <div style="display: flex;align-items: center">
+                <el-icon size="18" style="margin-right: 5px">
+                  <User/>
+                </el-icon>
+                用户名称:
+              </div>
+              <div>{{ userParams.nickName }}</div>
            </div>
            <div class="userInfo_item">
-              工号: <span>{{ userParams.workCode }}</span>
+              <div style="display: flex;align-items: center">
+                <el-icon size="18" style="margin-right: 5px">
+                  <Notification/>
+                </el-icon>
+                工号:
+              </div>
+              <div>{{ userParams.workCode }}</div>
            </div>
            <div class="userInfo_item">
-              <el-icon>
-                <Iphone/>
-              </el-icon>
-              电话号码: <span>{{ userParams.mobile }}</span></div>
-            <div class="userInfo_item">
-              <el-icon>
-                <HomeFilled/>
-              </el-icon>
-              所属公司: <span>{{ userParams.subCompanyName }}</span>
+              <div style="display: flex;align-items: center">
+                <el-icon size="18" style="margin-right: 5px">
+                  <Phone/>
+                </el-icon>
+                电话号码:
+              </div>
+              <div>{{ userParams.mobile }}</div>
            </div>
            <div class="userInfo_item">
-              <el-icon>
-                <HomeFilled/>
-              </el-icon>
-              所属部门: <span>{{ userParams.departmentName }}</span>
+              <div style="display: flex;align-items: center">
+                <el-icon size="18" style="margin-right: 5px">
+                  <House/>
+                </el-icon>
+                所属公司:
+              </div>
+              <div>{{ userParams.subCompanyName }}</div>
            </div>
            <div class="userInfo_item">
-              <el-icon>
-                <HomeFilled/>
-              </el-icon>
-              岗位: <span>{{ userParams.jobActivityDesc }}</span>
+              <div style="display: flex;align-items: center">
+                <el-icon size="18" style="margin-right: 5px">
+                  <FolderOpened/>
+                </el-icon>
+                所属部门:
+              </div>
+              <div>{{ userParams.departmentName }}</div>
            </div>
            <div class="userInfo_item">
-              <el-icon>
-                <HomeFilled/>
-              </el-icon>
-              账号类型: <span>{{ userParams.accountType === '0' ? '主账号' : '次账号' }}</span>
+              <div style="display: flex;align-items: center">
+                <el-icon size="18" style="margin-right: 5px">
+                  <Folder/>
+                </el-icon>
+                岗位:
+              </div>
+              <div>{{ userParams.jobActivityDesc }}</div>
            </div>
            <div class="userInfo_item">
-              <el-icon>
-                <OfficeBuilding/>
-              </el-icon>
-              所属角色: <span>{{ belongToRole(userParams.roles) }}</span></div>
-          </div>
-          <div>
+              <div style="display: flex;align-items: center">
+                <el-icon size="18" style="margin-right: 5px">
+                  <Wallet/>
+                </el-icon>
+                账号类型:
+              </div>
+              <div>{{ userParams.accountType === '0' ? '主账号' : '次账号' }}</div>
+            </div>
+            <div class="userInfo_item">
+              <div style="display: flex;align-items: center">
+                <el-icon size="18" style="margin-right: 5px">
+                  <User/>
+                </el-icon>
+                所属角色:
+              </div>
+              <div>{{ belongToRole(userParams.roles) }}</div>
+            </div>
          </div>
        </el-card>
      </el-col>
@@ -63,7 +99,7 @@
          <!-- 标题 -->
          <template #header>
            <div class="card-header">
-              <span>{{ isInitPassword ? '修改密码' : '初始化密码' }}</span>
+              <div>{{ isInitPassword ? '修改密码' : '初始化密码' }}</div>
            </div>
          </template>
          <el-form label-width="120px" ref="passwordRef" :model="userPassword" :rules="rules">
@@ -220,17 +256,21 @@ body, div {
  }

  .userInfo_item {
+    display: flex;align-items: center;
+    justify-content: space-between;
    height: 40px;
    border-bottom-style: solid;
    border-color: #daddd2;
    border-width: 1px;
-    text-align: left;
-    line-height: 40px;
+    //text-align: left;
+    //line-height: 40px;
+
  }

-  .userInfo_item > span {
-    float: right;
-  }
+  //
+  //.userInfo_item > div {
+  //  float: right;
+  //}
 }

 </style>
--- a/src/views/plan/detail.vue
+++ b/src/views/plan/detail.vue
@@ -159,8 +159,10 @@ const formData = ref({})
 const table = ref()
 const route = useRoute()
 const isEdit = ref(false)
-const editVisible = ref(true)
-
+const editVisible = ref(false)
+if(route.query.type=='summary'){
+  editVisible.value=true
+}
 const exportTable = () => {
  const $e = table.value.$el
  let $table = $e.querySelector('.el-table__fixed')
--- a/src/views/project-demand/requirement/detail.vue
+++ b/src/views/project-demand/requirement/detail.vue
@@ -87,7 +87,7 @@ const init = async () => {
    nextTick(() => {
      processViewer.value = true
      showTable.value = true
-      if (data.formPermMap["fileList"]) {
+      if (data.formPermMap&&data.formPermMap["fileList"]) {
        fileListShow.value = data.formPermMap["fileList"].perm
      }
    })
--- a/src/views/project-demand/summary/add.vue
+++ b/src/views/project-demand/summary/add.vue
@@ -244,8 +244,8 @@
        </el-col>
      </el-row>
    </el-form>
-    <AttachmentUpload ref="attachment" label="需求申请书附件" :showTable="showTable" :otherFileList="otherFileList"
-                      @getAttachment="getAttachment" :singleList="singleList" :showSingleTable="showSingleTable"
+    <AttachmentUpload ref="attachment" label="需求申请书附件" :showTable="showTable" v-model:otherFileList="otherFileList"
+                      @getAttachment="getAttachment" v-model:singleList="singleList" :showSingleTable="showSingleTable"
                      @getOtherFile="getOtherFile" :showFileList="true" :formData="formData" tag="需求上报"
                      :preview="name === 'Summary/edit'"/>
    <div class="approval-record" style="margin-left: 70px">
--- a/src/views/project-demand/summary/detail.vue
+++ b/src/views/project-demand/summary/detail.vue
@@ -48,6 +48,8 @@ const getInfo = async (state) => {
    loading.value = true
    const {code, data, msg} = await getMapProjectStateInfo(projectId, state)
    if (code === 1000) {
+      data.formData.preProcess = data.formData.preProcess ? JSON.parse(data.formData.preProcess) : undefined
+
      summaryData.value = data;
      loading.value = false
      if(data.runningList===null) {
--- a/src/views/project-demand/summary/index.vue
+++ b/src/views/project-demand/summary/index.vue
@@ -312,7 +312,8 @@ const handleExport = () => {
        router.push({
          name: 'Plan/detail',
          query: {
-            annualPlanId: res.data
+            annualPlanId: res.data,
+            type:'summary'
          }
        })
      }
--- a/src/views/project-management/implementation/detail.vue
+++ b/src/views/project-management/implementation/detail.vue
@@ -75,7 +75,12 @@ route.query.step == '50' && (currentStep.value = 4)
 const showActive = ref()
 const detailData = ref({})
 const commonProvessViewer = ref(true)
-
+console.log('刷新详情')
+localStorage.removeItem('singleFile')
+localStorage.removeItem('otherFileList')
+localStorage.removeItem('preProcess')
+localStorage.removeItem('projectChargePersonUserList')
+localStorage.removeItem('projectPersonUserList')
 const getAllInfo = async (state) => {
  const loading = ElLoading.service({fullscreen: true})
  try {
--- a/src/views/project-management/implementation/phase.vue
+++ b/src/views/project-management/implementation/phase.vue
@@ -8,8 +8,8 @@
      </el-form-item>
    </el-form>
    <user-picker :multiple="true" ref="userPicker" title="请选择抄送人员" v-model:value="userList" @ok="selected"/>
-    <AttachmentUpload ref="attachment" label="阶段变更附件" :showTable="showTable" :otherFileList="otherFileList"
-                      @getAttachment="getAttachment"  :singleList="singleList" :showSingleTable="showSingleTable"
+    <AttachmentUpload ref="attachment" label="阶段变更附件" :showTable="showTable" v-model:otherFileList="otherFileList"
+                      @getAttachment="getAttachment"  v-model:singleList="singleList" :showSingleTable="showSingleTable"
                      @getOtherFile="getOtherFile" :showFileList="true" :formData="formData" tag="阶段变更"
                      :preview="name === 'Phase/edit'"/>
    <div class="approval-record"  style="margin-left: 68px">
--- a/src/views/project-management/mobledetail/ProjectApplyMoblie.vue
+++ b/src/views/project-management/mobledetail/ProjectApplyMoblie.vue
@@ -16,7 +16,7 @@
      </el-row>
    </el-form>
    <AttachmentUpload ref="attachment" :label="getTitleName(title)+'附件'" :showTable="showTable"
-                      :otherFileList="otherFileList" :tag="getTitleName(props.title)"
+                      v-model:otherFileList="otherFileList" :tag="getTitleName(props.title)"
                      @getAttachment="getAttachment" :labelPosition="'top'"
                      @getOtherFile="getOtherFile" :showFileList="true" :formData="localFormData"
                      :preview="mode == 'resubmit'"/>