调整项目的供应商

fhKeeper/formulahousekeeper/timesheet/src/views/project/list.vue

@@ -206,8 +206,20 @@
                 </template>
             </el-table-column>
             <!-- 供应商 -->
-            <el-table-column prop="providerNames" label="供应商" min-width="190" v-if="user.company.packageProvider">
-            </el-table-column>
+            <!-- <el-table-column prop="providerNames" label="供应商" min-width="190" v-if="user.company.packageProvider">
+            </el-table-column> -->
+            <!-- <div v-if="user.company.packageProvider"> -->
+            <template>
+                <div v-for="(item, index) in listHeader" :key="index">
+                    <el-table-column prop="providerNames" :label="item" min-width="190" v-if="user.company.packageProvider">
+                        <template slot-scope="scope">
+                            <div>
+                                {{item | mobans(scope.row.providerInfoList)}}
+                            </div>
+                        </template>
+                    </el-table-column>
+                </div>
+            </template>
 
             <el-table-column prop="status" label="状态" min-width="100" sortable="custom">
                 <template slot-scope="scope">
@@ -934,6 +946,7 @@ a {
                 phaseList: [],
                 phaseProjectId: '', // 阶段项目id
                 phaseProjectValie: null, // 阶段项目值
+                listHeader: [], // 列表表头
             };
         },
         // 过滤器
@@ -956,6 +969,13 @@ a {
                 }
                 return intPartFormat + floatPart
             },
+            mobans(value, valueList) {
+                for(var i in valueList) {
+                    if(valueList[i].providerCateGoryName == value) {
+                        return valueList[i].providerInfoName
+                    }
+                }
+            },
         },
         watch: {
             filterText(val) {
@@ -2451,6 +2471,7 @@ a {
                         this.$nextTick(()=>{
                             this.$refs.projectlistOfWudulist.doLayout();
                         })
+                        this.listHeader = res.data.nameList
                     } else {
                         this.$message({
                         message: res.msg,
@@ -2801,7 +2822,7 @@ a {
                         if(this.addForm.category != null) {
                             formData.append("category", this.addForm.category);
                         }
-                        if(this.user.timeType.mainProjectState == '1') {
+                        if(this.user.timeType.mainProjectState == '1' && this.addForm.projectMainId) {
                             formData.append("projectMainId", this.addForm.projectMainId);
                         }