人员目标管理、项目目标管理、项目商机新建、编辑调整

src/HManagement/clueManage/clue_private/modules/add.vue

@@ -148,10 +148,10 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="设计院:" prop="sys_enterpriseid" v-if="param.content.isuppictured === 1" :rules="{required:true,message:'请选择设计院',trigger:'change'}">
-                <designingInstitute ref="designingInstitute"  @designingInstitute="designingInstitute"></designingInstitute>
+                <designingInstitute ref="designingInstitute"  @designingInstitute="designingInstitute" :disabled="isuppictured === 1"></designingInstitute>
               </el-form-item>
               <el-form-item label="设计院:" prop="sys_enterpriseid" v-else >
-                <designingInstitute ref="designingInstitute"  @designingInstitute="designingInstitute"></designingInstitute>
+                <designingInstitute ref="designingInstitute"  @designingInstitute="designingInstitute" :disabled="isuppictured === 1"></designingInstitute>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -166,7 +166,7 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="关联项目:" prop="name">
-                <project ref="project" @project="selectProject" :sat_orderclueid="0"></project>
+                <project ref="project" @project="selectProject" :sat_orderclueid="0" :disabled="isuppictured === 1"></project>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -445,8 +445,9 @@ export default {
       this.param.content.contactsid = id
     },
     /*已选项目*/
-    selectProject(id){
+    selectProject(id,name){
       this.param.content.sa_projectid = id
+      this.param.content.projectname = name
     }
   },
 

src/HManagement/clueManage/clue_private/modules/edit.vue

@@ -148,10 +148,10 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="设计院:" prop="sys_enterpriseid" v-if="form.isuppictured === 1" :rules="{required:true,message:'请选择设计院',trigger:'change'}">
-                <designingInstitute ref="designingInstitute" :data="form.institute" @designingInstitute="designingInstitute"></designingInstitute>
+                <designingInstitute ref="designingInstitute" :data="form.institute" @designingInstitute="designingInstitute" :disabled="isuppictured === 1"></designingInstitute>
               </el-form-item>
               <el-form-item label="设计院:" prop="sys_enterpriseid" v-else >
-                <designingInstitute ref="designingInstitute" :data="form.institute"  @designingInstitute="designingInstitute"></designingInstitute>
+                <designingInstitute ref="designingInstitute" :data="form.institute"  @designingInstitute="designingInstitute" :disabled="isuppictured === 1"></designingInstitute>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -166,7 +166,7 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="关联项目:" prop="name">
-                <project ref="project" :data="form.projectname1" :sat_orderclueid="$route.query.id" @project="selectProject"></project>
+                <project ref="project" :data="form.projectname1" :sat_orderclueid="$route.query.id" @project="selectProject" :disabled="isuppictured === 1"></project>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -429,8 +429,9 @@ export default {
       this.form.contactsid = id
     },
     /*已选项目*/
-    selectProject(id){
+    selectProject(id,name){
       this.form.sa_projectid = id
+      this.form.projectname = name
     }
   },
   mounted () {

src/HManagement/personalTarget/target/modules/add.vue

@@ -101,7 +101,15 @@ export default {
       pickerOptions:{
         disabledDate(time){
           /*console.log(that.yearOpens,'已经开启的年份')*/
-          return time.getFullYear() < new Date().getFullYear()
+         /* return time.getFullYear() < new Date().getFullYear()*/
+          /*const timestamp = time.getTime(); // 将待比较的日期转换成时间戳格式*/
+          for (var i = 0;i<that.yearOpens.length;i++) {
+            /*const disabledTimestamp = new Date(date).getTime(); // 将禁用日期转换成时间戳格式*/
+            if (time.getFullYear() < new Date().getFullYear() || time.getFullYear() === that.yearOpens[i].year) {
+              return true; // 禁用日期
+            }
+          }
+          return false; // 可选日期
         }
       },
       yearOpens:[],
@@ -199,6 +207,7 @@ export default {
       const res = await this.$api.requested({
         "id": 20230728090204,
         "content": {
+          "type": 1,
           "targettype": "人员目标"
         },
       })

src/HManagement/projectTarget/target/modules/add.vue

@@ -47,13 +47,23 @@ export default {
     tablelayout
   },
   data () {
+    let that = this
     return {
       pickerOptions:{
         disabledDate(time){
           /*console.log(year.getFullYear(),'267655555555555555555555555')*/
-          return time.getFullYear() < new Date().getFullYear()
+          /*return time.getFullYear() < new Date().getFullYear()*/
+          for (var i = 0;i<that.yearOpens.length;i++) {
+            /*const disabledTimestamp = new Date(date).getTime(); // 将禁用日期转换成时间戳格式*/
+
+            if (time.getFullYear() < new Date().getFullYear() || time.getFullYear() === that.yearOpens[i].year) {
+              return true; // 禁用日期
+            }
+          }
+          return false; // 可选日期
         }
       },
+      yearOpens:[],
       dialogTableVisible:false,
       form:{
         "year": '',
@@ -126,11 +136,24 @@ export default {
       const nowDate = new Date()
       console.log(nowDate.getFullYear())
       this.form.year = String(nowDate.getFullYear() + 1)
-    }
+    },
+    /*已开启年度*/
+    async yearList(){
+      const res = await this.$api.requested({
+        "id": 20230728090204,
+        "content": {
+          "type": 1,
+          "targettype": "项目目标"
+        },
+      })
+      this.yearOpens = res.data
+      console.log(this.yearOpens,'年度列表')
+    },
   },
   mounted () {
     /*this.listData()*/
     this.yearData()
+    this.yearList()
   },
   created () {
     this.tablecols = this.tool.tabelCol(this.$route.name)['personalTable'].tablecols

src/template/clueModel/designer.vue

@@ -25,7 +25,7 @@
             :total="total">
         </el-pagination>
       </div>
-      <el-input v-model="contactsname" readonly  placeholder="请选择设计院" slot="reference"  :disabled="sys_enterpriseid === ''" @focus="listData"></el-input>
+      <el-input v-model="contactsname" readonly  placeholder="请选择设计院" slot="reference"  :disabled="sys_enterpriseid === '' || sys_enterpriseid === 0" @focus="listData"></el-input>
     </el-popover>
   </div>
 </template>

src/template/clueModel/designingInstitute.vue

@@ -57,7 +57,7 @@
             :total="total">
         </el-pagination>
       </div>
-      <el-input v-model="enterprisename" readonly  placeholder="请选择设计院" slot="reference"  ></el-input>
+      <el-input v-model="enterprisename" readonly  placeholder="请选择设计院" slot="reference"  :disabled="!disabled"></el-input>
     </el-popover>
 
   </div>
@@ -66,7 +66,7 @@
 <script>
 import tableList from '@/components/table/index5';
 export default {
-  props:['data'],
+  props:['data','disabled'],
   name: "designingInstitute",
   components:{tableList},
   data(){

src/template/clueModel/project.vue

@@ -28,7 +28,7 @@
             :total="total">
         </el-pagination>
       </div>
-      <el-input v-model="projectName" readonly  placeholder="请选择设计院" slot="reference"  ></el-input>
+      <el-input v-model="projectName" readonly  placeholder="请选择设计院" slot="reference"  :disabled="!disabled"></el-input>
     </el-popover>
   </div>
 </template>
@@ -37,7 +37,7 @@
 import tableList from '@/components/table/index5';
 export default {
   name: "project",
-  props:["data","sat_orderclueid"],
+  props:["data","sat_orderclueid",'disabled'],
   components:{tableList},
   data(){
     return {
@@ -79,7 +79,6 @@ export default {
       this.listData()
     },
     async rowClick(row){
-      console.log(row,'已选设计院')
       const res = await this.$api.requested({
         "id": 20230812100204,
         "content": {
@@ -87,7 +86,6 @@ export default {
           "sa_projectid":row.sa_projectid
         }
       })
-      console.log(res.data,'结果')
       if (res.data === 1){
         this.$confirm('该项目已有关联线索，是否取消关联原线索?', '提示', {
           confirmButtonText: '取消关联',
@@ -96,14 +94,14 @@ export default {
         }).then(() => {
           this.popoverShow = false
           this.projectName = row.projectname
-          this.$emit('project',row.sa_projectid)
+          this.$emit('project',row.sa_projectid,row.projectname)
         }).catch(() => {
           this.popoverShow = true
         });
       }else {
         this.popoverShow = false
         this.projectName = row.projectname
-        this.$emit('project',row.sa_projectid)
+        this.$emit('project',row.sa_projectid,row.projectname)
       }
 
       /*this.popoverShow = false