调整项目管理

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

@@ -123,14 +123,30 @@
                         {{scope.$index+1+(page-1)*size}}
                     </template>
             </el-table-column> -->
-            <el-table-column prop="projectCode" label="项目编号" sortable="custom" width="120"></el-table-column>
+            <el-table-column prop="projectCode" label="项目编号" sortable="custom" width="150"></el-table-column>
+            <el-table-column prop="contractCode" label="合同编号" width="200" v-if="user.companyId == '936'">
+                <template slot-scope="scope">
+                    <!-- <div v-if="scope.row.projectSeparate">
+                        {{scope.row.projectSeparate.contractCode}}
+                    </div> -->
+                    <div v-if="scope.row.projectSeparate">
+                        <el-popover placement="top" width="400" trigger="hover" v-if="scope.row.projectName.length > 10">
+                            <div>
+                                <span>{{scope.row.projectSeparate.contractCode}}</span>
+                            </div>
+                            <div slot="reference" class="kans">
+                                <span>{{scope.row.projectSeparate.contractCode}}...</span>
+                            </div>
+                        </el-popover>
+                        <div v-else>
+                            <span>{{scope.row.projectSeparate.contractCode}}</span>
+                        </div>
+                     </div>
+                </template>
+            </el-table-column>
             <el-table-column prop="categoryName" label="项目分类" sortable="custom" width="120"></el-table-column>
             <el-table-column prop="projectName" label="项目名称" width="250" sortable="custom">
                  <template slot-scope="scope">
-                     <!-- <div class="kans">
-                         <el-link type="primary" v-if="user.company.packageProject==1" :href="'#/projectInside/'+scope.row.id">{{scope.row.projectName}}</el-link>
-                         <span v-if="user.company.packageProject==0" >{{scope.row.projectName}}</span>
-                     </div> -->
                      <el-popover placement="top" width="400" trigger="hover" v-if="scope.row.projectName.length > 15">
                          <div>
                              <el-link type="primary" v-if="user.company.packageProject==1" :underline="false" :href="'#/projectInside/'+scope.row.id">{{scope.row.projectName}}</el-link>
@@ -403,7 +419,7 @@
                 <!-- 单个公司的固定字段 -->
                 <div v-if="user.companyId == '936'">
                 <el-form-item label="合同编号" >
-                    <el-input v-model="addForm.contractCode" placeholder="请输入合同编号" clearable></el-input>
+                    <el-input v-model="addForm.contractCode" maxlength="50" show-word-limit placeholder="请输入合同编号" clearable></el-input>
                 </el-form-item>
                 <el-form-item label="质保开始时间">
                     <el-date-picker v-model="addForm.warrantyStartDate"