wsx 10 mesi fa
parent
commit
135bdb516f

+ 4 - 0
src/views/project-manage/planManage/components/addOrEditDialog.vue

@@ -18,6 +18,7 @@
       :deptTreeList="deptTreeList"
       :userList="userList"
       @changeProject="changeProject"
+      @allUser="allUser"
     ></plan-form>
     <headerTitle title="计划节点"></headerTitle>
     <plan-info-table
@@ -194,6 +195,9 @@
       },
       cancel() {
         this.$emit('update:addOrEditDialogFlag', false);
+      },
+      allUser(){
+       this.userList=this.allUserList
       }
     }
   };

+ 25 - 27
src/views/project-manage/planManage/components/plan-form.vue

@@ -129,24 +129,6 @@
             ></el-input>
           </el-form-item>
         </el-col>
-        <!--        <el-col :span="8">-->
-        <!--          &lt;!&ndash;          <el-form-item&ndash;&gt;-->
-        <!--          &lt;!&ndash;            label="申请部门"&ndash;&gt;-->
-        <!--          &lt;!&ndash;            prop="responsibleDeptId">&ndash;&gt;-->
-        <!--          &lt;!&ndash;            <ele-tree-select&ndash;&gt;-->
-        <!--          &lt;!&ndash;              :disabled="dialogType=='view'"&ndash;&gt;-->
-        <!--          &lt;!&ndash;              clearable&ndash;&gt;-->
-        <!--          &lt;!&ndash;              ref="deptRef"&ndash;&gt;-->
-        <!--          &lt;!&ndash;              :data="deptTreeList"&ndash;&gt;-->
-        <!--          &lt;!&ndash;              v-model="form.responsibleDeptId"&ndash;&gt;-->
-        <!--          &lt;!&ndash;              valueKey="id"&ndash;&gt;-->
-        <!--          &lt;!&ndash;              labelKey="name"&ndash;&gt;-->
-        <!--          &lt;!&ndash;              placeholder="请选择"&ndash;&gt;-->
-        <!--          &lt;!&ndash;              @change="changeDeptInfo"&ndash;&gt;-->
-        <!--          &lt;!&ndash;              default-expand-all&ndash;&gt;-->
-        <!--          &lt;!&ndash;            />&ndash;&gt;-->
-        <!--          &lt;!&ndash;          </el-form-item>&ndash;&gt;-->
-        <!--        </el-col>-->
       </el-row>
       <el-row>
         <el-col :span="8">
@@ -268,8 +250,11 @@
   export default {
     name: 'plan-form',
     components: {
-      //  fileUpload, 
-      ProjectForm, PersonSelect, userSelectDialog },
+      //  fileUpload,
+      ProjectForm,
+      PersonSelect,
+      userSelectDialog
+    },
     props: {
       dialogType: {
         type: String,
@@ -309,11 +294,13 @@
             ...this.form,
             ...this.dialogForm
           };
-          if(this.projectList.length==0){
-            this.projectList=[{
-              id:this.form.projectId,
-              name:this.form.projectName
-            }]
+          if (this.projectList.length == 0) {
+            this.projectList = [
+              {
+                id: this.form.projectId,
+                name: this.form.projectName
+              }
+            ];
           }
           this.$nextTick(async () => {
             //通过项目去查
@@ -403,7 +390,7 @@
     },
     async created() {
       this.planList = await this.getTargetPlanTree({
-        projectId: '',
+        projectId: ''
         // processStatus: [2],
         // status: [0, 1]
       });
@@ -418,17 +405,28 @@
     },
     methods: {
       async changeProjectInfo(val) {
+        // console.log(val);
+
         this.projectStageList = [];
         this.form.projectStageId = null;
         this.projectBOMList = [];
         this.form.projectBomId = null;
         this.form.parentId = null;
+        this.form.responsibleUserIds = [];
         this.planList = await this.getTargetPlanTree({
           projectId: val,
           processStatus: [2],
           status: [0, 1]
         });
-        if (!val) return;
+
+        // console.log(this.userList);
+
+        if (!val) {
+          this.$emit('allUser');
+          return;
+        }
+        // console.log('123');
+
         await this.getProjectsSelectTreeData(
           {
             treeType: 0,

+ 11 - 9
src/views/project-manage/planManage/components/planInfoTable.vue

@@ -31,7 +31,6 @@
           <el-popconfirm
             class="ele-action"
             title="确定要删除此信息吗?"
-            :disabled="form.datasource.length == 1"
             @confirm="handleDelInfo($index)"
           >
             <template v-slot:reference>
@@ -294,7 +293,7 @@
         type: Object,
         default: () => {
           return {
-            ...this.form
+            // ...this.form
           };
         }
       },
@@ -334,11 +333,14 @@
         deep: true
       },
       userList: {
-        handler(val) {
-          this.form.datasource.forEach((item) => {
-            item.responsibleUserIds = [];
-          });
-        }
+        handler(newVal, oldVal) {
+          if (newVal.length && oldVal.length) {
+            this.form.datasource.forEach((item) => {
+              item.responsibleUserIds = [];
+            });
+          }
+        },
+        // deep: true
       }
     },
     data() {
@@ -486,10 +488,10 @@
       }
     },
     created() {
-      console.log(this.dialogType);
+      // console.log(this.dialogType);
     },
     mounted() {
-      console.log(this.dialogType);
+      // console.log(this.dialogType);
     },
     methods: {
       downloadFile(file) {

+ 11 - 4
src/views/project-manage/project-initiation/components/projectInfoTable.vue

@@ -310,6 +310,13 @@
       }
     },
     watch: {
+      userList: {
+        handler(val) {
+          console.log(val);
+        },
+        deep: true
+      },
+
       dialogForm: {
         handler(val) {
           this.form.datasource = deepClone(this.dialogForm.stageList) || [];
@@ -629,11 +636,11 @@
         let findItem = form.find((item) => !item.id);
         console.log(findItem);
 
-        if(findItem){
-          this.$message('请先保存新增的数据')
-          return
+        if (findItem) {
+          this.$message('请先保存新增的数据');
+          return;
         }
-        
+
         let updateForm = form.filter((item) => !item.isEdit);
         console.log(updateForm);
 

+ 4 - 4
vue.config.js

@@ -32,10 +32,10 @@ module.exports = {
     proxy: {
       // 当我们的本地的请求 有/api的时候,就会代理我们的请求地址向另外一个服务器发出请求
       '/api': {
-        // target: 'http://192.168.1.125:18086',
-        // target: 'http://192.168.1.251:18086',
-        // target: 'http://192.168.1.176:18086',
-        target: 'http://192.168.1.158:18086',
+        target: 'http://192.168.1.251:18086',//开发
+        // target: 'http://192.168.1.251:18186',//测试
+        // target: 'http://192.168.1.144:18086',//付莉
+        // target: 'http://192.168.1.158:18086',//罗华林
 
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         pathRewrite: {