代码合并提交

src/pages/business/common/projectMange/list/addEdit.vue

@@ -57,6 +57,19 @@
           />
           <u-button class="mt20" type="primary" style="width: 100px; height: 25px" @click="handleAction('项目状态', project_status)" shape="circle" icon="plus" size="mini"> 选择项目状态 </u-button>
         </view>
+        <view class="content-area-item mt10 p10 bg-white">
+          <view class="font14 weight mb10 required">公开状态</view>
+          <u-input
+            :modelValue="proxy.$common.mapping('label', 'value', form.visibleRange, project_displayType)"
+            fontSize="14px"
+            placeholderStyle="color:#909399;font-size:12px"
+            placeholder="请选择"
+            border="none"
+            disabledColor="transparent"
+            disabled
+          />
+          <u-button class="mt20" type="primary" style="width: 100px; height: 25px" @click="handleAction('公开状态', project_displayType)" shape="circle" icon="plus" size="mini"> 选择公开状态 </u-button>
+        </view>
         <view class="content-area-item mt10 p10 bg-white">
           <view class="font14 weight mb10 required">项目负责人</view>
           <avatarList :userList="projectHeadList" @deleteUsers="(value) => deleteUsers(value, 'projectHeadList')" />
@@ -127,7 +140,7 @@ import { storageSystem } from "@/utils/storage"; // 公共方法引用
 /*----------------------------------公共变量-----------------------------------*/
 const systemStore = systemStores();
 const { proxy } = getCurrentInstance();
-const { project_status, project_type, project_ascription } = proxy.useDict("project_status", "project_type", "project_ascription");
+const { project_status, project_type, project_ascription,project_displayType } = proxy.useDict("project_status", "project_type", "project_ascription","project_displayType");
 const props = defineProps({
   id: {
     type: String,
@@ -196,9 +209,11 @@ function handleAction(title, event, index, ind) {
  */
 function selectAction(e) {
   if (state.actionTitle == "项目类型") {
-    state.form.projectType = e.value[0].value; //项目名称
+    state.form.projectType = e.value[0].value;
   } else if (state.actionTitle == "项目状态") {
-    state.form.projectStatus = e.value[0].value; //项目名称
+    state.form.projectStatus = e.value[0].value; 
+  } else if (state.actionTitle == "公开状态") {
+    state.form.visibleRange = e.value[0].value;
   }
   state.actionShow = false;
 }
@@ -221,6 +236,7 @@ function selectListApi() {
         state.form.projectName = data.projectName;
         state.form.projectType = data.projectType;
         state.form.projectStatus = data.projectStatus;
+        state.form.visibleRange = data.visibleRange;
         state.form.projectWorkload = data.projectWorkload ? data.projectWorkload : "";
         state.form.projectHead = data.projectHead;
         state.form.projectMember = data.projectMember;
@@ -303,6 +319,7 @@ function handleSubmit(value) {
       projectHead: state.form.projectHead, //项目负责人
       projectMember: state.form.projectMember, //项目成员
       projectDescribe: state.form.projectDescribe, //项目描述
+      visibleRange: state.form.visibleRange, //公开状态
       // startTime: "2022-10-01T01:00:00",
       // endTime: "2023-03-31T23:59:59",
     })

src/pages/business/common/projectMange/list/index.vue

@@ -83,10 +83,22 @@
           </view>
           <view class="content-area-row_wrap menu-item">
             <view class="content-area-row_wrap-view"> 负责人： {{ proxy.$common.mapping("nickName", "userId", base.projectHead, userDate) }} </view>
+            <view class="content-area-row_wrap-view">
+              状态：
+              <span :style="{ color: proxy.$common.mapping('elTagClass', 'value', base.projectStatus, project_status) }">{{
+                proxy.$common.mapping("label", "value", base.projectStatus, project_status)
+              }}</span>
+            </view>
             <view class="content-area-row_wrap-view">
               类型：
               {{ proxy.$common.mapping("label", "value", base.projectStatus, project_type) }}
             </view>
+            <view class="content-area-row_wrap-view">
+              公开状态：
+              <span :style="{ color: proxy.$common.mapping('elTagClass', 'value', base.visibleRange, project_displayType) }">{{
+                proxy.$common.mapping("label", "value", base.visibleRange, project_displayType)
+              }}</span>
+            </view>
             <view class="content-area-row_wrap-view" style="display: block">
               成员：<span>{{ proxy.$common.mapping("nickName", "userId", base.projectMember, userDate) }} </span>
             </view>
@@ -206,10 +218,8 @@ import { useStores } from "@/store/modules/index";
 /*----------------------------------公共方法引入-----------------------------------*/
 /*----------------------------------公共变量-----------------------------------*/
 const { proxy } = getCurrentInstance();
-
 const useStore = useStores();
-const { project_type, project_status } = proxy.useDict("project_type", "project_status");
-
+const { project_type, project_status, project_displayType } = proxy.useDict("project_type", "project_status", "project_displayType");
 /*----------------------------------变量声明-----------------------------------*/
 const state = reactive({
   loading: false,
@@ -368,7 +378,6 @@ function selectListApi() {
  */
 function load() {
   state.pageSize += 10;
-  init();
 }
 
 /**
@@ -376,7 +385,6 @@ function load() {
  */
 function refresh() {
   state.pageSize = 20;
-  init();
 }
 
 /**
@@ -387,7 +395,6 @@ function tabsClick(e) {
   state.projectName = "";
   state.projectType = "";
   state.projectTypeName = "";
-  init();
 }
 /**
  * 跳转项目概览

src/pages/business/common/projectMange/overview/index.vue

@@ -47,7 +47,7 @@
           <view class="menu-item">
             <span style="color:#559AFF;font-weight:bold;">丨 背景</span>
           </view>
-          <view class="menu-item">
+          <view class="menu-item textExceeds">
             <span>{{ project.projectDescribe ? project.projectDescribe : "无" }}</span>
           </view>
         </view>

src/static/scss/global.scss

@@ -108,4 +108,8 @@
       }
     }
   }
+}
+.textExceeds{
+  word-wrap: break-word; 
+  word-break: break-all; 
 }