Merge branch 'feature-project' of gitee.com:hhyykk/ipms-sjy-ui into yx-dev-from-feature-project

Signed-off-by: Zweihander <978345079@qq.com>

.env.local

@@ -5,7 +5,7 @@ VITE_DEV=true
 
 # 请求路径
 VITE_BASE_URL='http://localhost:48080'
-#VITE_BASE_URL='http://16ba17bc.r2.cpolar.cn'
+#VITE_BASE_URL='https://1107bc6b.r21.vip.cpolar.cn'
 
 # 文件上传类型：server - 后端上传， client - 前端直连上传，仅支持 S3 服务
 VITE_UPLOAD_TYPE=server
@@ -32,4 +32,4 @@ VITE_BASE_PATH=/
 VITE_MALL_H5_DOMAIN='http://localhost:3000'
 
 # 验证码的开关
-VITE_APP_CAPTCHA_ENABLE=false
+VITE_APP_CAPTCHA_ENABLE=true

src/views/Login/SocialLogin.vue

@@ -196,7 +196,7 @@ const loginData = reactive({
   captchaEnable: import.meta.env.VITE_APP_CAPTCHA_ENABLE !== 'false',
   tenantEnable: import.meta.env.VITE_APP_TENANT_ENABLE !== 'false',
   loginForm: {
-    tenantName: '芋道源码',
+    tenantName: '设计院',
     username: 'admin',
     password: 'admin123',
     captchaVerification: '',

src/views/pms/project/ProjectForm.vue

@@ -15,17 +15,29 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="跟踪编号" prop="trackingCode">
-            <el-input v-model="formData.trackingCode" placeholder="请输入跟踪编号" />
+            <el-input
+              v-model="formData.trackingCode"
+              placeholder="请输入跟踪编号"
+              :disabled="formType !== 'create'"
+            />
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col :span="12" v-if="formType !== 'create'">
           <el-form-item label="项目编号" prop="code">
-            <el-input v-model="formData.code" placeholder="请输入项目编号" />
+            <el-input
+              v-model="formData.code"
+              placeholder="请输入项目编号"
+              :disabled="formType !== 'create'"
+            />
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="类型" prop="type">
-            <el-select v-model="formData.type" placeholder="请选择类型">
+            <el-select
+              v-model="formData.type"
+              placeholder="请选择类型"
+              :disabled="formType !== 'create'"
+            >
               <el-option
                 v-for="dict in getStrDictOptions(DICT_TYPE.PROJECT_TYPE)"
                 :key="dict.value"
@@ -43,6 +55,7 @@
               placeholder="请选择省份"
               v-model="formData.provinceId"
               @change="onProvinceChange"
+              :disabled="formType !== 'create'"
             >
               <el-option
                 v-for="item in areaList"
@@ -60,6 +73,7 @@
               filterable
               placeholder="请选择城市"
               v-model="formData.cityId"
+              :disabled="formType !== 'create'"
             >
               <el-option
                 v-for="item in cityList"
@@ -106,7 +120,10 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="跟踪部门" prop="trackingDepId">
+          <el-form-item
+            label="跟踪部门"
+            prop="trackingDepId"
+          >
             <el-tree-select
               v-model=formData.trackingDepId
               :data="deptOptions"
@@ -118,6 +135,7 @@
               empty-text="加载中，请稍后"
               default-expand-all
               style="width: 240px"
+              :disabled="formType !== 'create'"
             />
           </el-form-item>
         </el-col>
@@ -139,7 +157,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="开始时间" prop="startTime">
+          <el-form-item
+            label="开始时间"
+            prop="startTime"
+            :disabled="formType !== 'create'"
+          >
             <el-date-picker
               v-model="formData.startTime"
               type="date"
@@ -172,7 +194,11 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="委托方式" prop="entrustMethod">
-            <el-select v-model="formData.entrustMethod" placeholder="请选择委托方式">
+            <el-select
+              v-model="formData.entrustMethod"
+              placeholder="请选择委托方式"
+              :disabled="formType !== 'create'"
+            >
               <el-option
                 v-for="dict in getStrDictOptions(DICT_TYPE.ENTRUST_METHOD)"
                 :key="dict.value"
@@ -182,7 +208,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col :span="12" v-if="formType !== 'create'">
           <el-form-item label="是否落地" prop="confirmation">
             <el-select v-model="formData.confirmation" placeholder="请选择是否落地">
               <el-option

src/views/pms/project/bpm/ProjectBpmCreate.vue

@@ -17,11 +17,11 @@
           <el-input v-model="formData.trackingCode" placeholder="请输入跟踪编号" />
         </el-form-item>
       </el-col>
-      <el-col :span="12">
-        <el-form-item label="项目编号" prop="code">
-          <el-input v-model="formData.code" placeholder="请输入项目编号" />
-        </el-form-item>
-      </el-col>
+<!--      <el-col :span="12">-->
+<!--        <el-form-item label="项目编号" prop="code">-->
+<!--          <el-input v-model="formData.code" placeholder="请输入项目编号" />-->
+<!--        </el-form-item>-->
+<!--      </el-col>-->
       <el-col :span="12">
         <el-form-item label="类型" prop="type">
           <el-select v-model="formData.type" placeholder="请选择类型">
@@ -180,18 +180,18 @@
           </el-select>
         </el-form-item>
       </el-col>
-      <el-col :span="12">
-        <el-form-item label="是否落地" prop="confirmation">
-          <el-select v-model="formData.confirmation" placeholder="请选择是否落地">
-            <el-option
-              v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            />
-          </el-select>
-        </el-form-item>
-      </el-col>
+<!--      <el-col :span="12">-->
+<!--        <el-form-item label="是否落地" prop="confirmation">-->
+<!--          <el-select v-model="formData.confirmation" placeholder="请选择是否落地">-->
+<!--            <el-option-->
+<!--              v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"-->
+<!--              :key="dict.value"-->
+<!--              :label="dict.label"-->
+<!--              :value="dict.value"-->
+<!--            />-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
+<!--      </el-col>-->
 <!--      <el-col :span="12">-->
 <!--        <el-form-item label="审批状态" prop="processStatus">-->
 <!--          <el-select-->
@@ -208,21 +208,21 @@
 <!--          </el-select>-->
 <!--        </el-form-item>-->
 <!--      </el-col>-->
-      <el-col :span="12" v-if="formData.confirmation === '是' || formData.confirmation === true">
-        <el-form-item label="落地时间" prop="endTime">
-          <el-date-picker
-            v-model="formData.endTime"
-            type="date"
-            value-format="x"
-            placeholder="选择落地时间"
-          />
-        </el-form-item>
-      </el-col>
-      <el-col :span="24"  v-if="formData.confirmation === '否' || formData.confirmation === false">
-        <el-form-item label="未落地原因" prop="reason">
-          <el-input v-model="formData.reason" type="textarea" placeholder="请输入未落地原因" />
-        </el-form-item>
-      </el-col>
+<!--      <el-col :span="12" v-if="formData.confirmation === '是' || formData.confirmation === true">-->
+<!--        <el-form-item label="落地时间" prop="endTime">-->
+<!--          <el-date-picker-->
+<!--            v-model="formData.endTime"-->
+<!--            type="date"-->
+<!--            value-format="x"-->
+<!--            placeholder="选择落地时间"-->
+<!--          />-->
+<!--        </el-form-item>-->
+<!--      </el-col>-->
+<!--      <el-col :span="24"  v-if="formData.confirmation === '否' || formData.confirmation === false">-->
+<!--        <el-form-item label="未落地原因" prop="reason">-->
+<!--          <el-input v-model="formData.reason" type="textarea" placeholder="请输入未落地原因" />-->
+<!--        </el-form-item>-->
+<!--      </el-col>-->
       <el-col :span="24">
         <el-form-item label="评审附件" prop="reviewFileUrl">
           <UploadFile v-model="formData.reviewFileUrl" />

src/views/pms/project/index.vue

@@ -104,7 +104,6 @@
             编辑
           </el-button>
           <el-button
-            v-if="scope.row.entrustMethod === 'public_bidding' || scope.row.entrustMethod === 'invited_bidding'"
             v-hasPermi="['bpm:oa-leave:query']"
             link
             type="primary"