工序管理增加备注，供应商的列表调接口排序，组织架构入职时间更改不了，项目报表服务掉下来等问题

fhKeeper/formulahousekeeper/timesheet/src/views/centerManage/centerManage.vue

@@ -33,11 +33,14 @@
                 </template>
             </el-table-column>
         </el-table>
-        <el-dialog title="新增/修改维护数据" v-if="addSubProject" :visible.sync="addSubProject" :close-on-click-modal="false" customClass="customWidth" width="500px">
+        <el-dialog title="新增/修改维护数据" v-if="addSubProject" :visible.sync="addSubProject" :close-on-click-modal="false" customClass="customWidth" width="600px">
             <el-form ref="form2" :model="addfm" :rules="ruless" label-width="100px">
                 <el-form-item label="名称" prop="name">
                     <el-input v-model="addfm.name" placeholder="请输入名称" clearable></el-input>
                 </el-form-item>
+                <el-form-item label="备注">
+                    <el-input type="textarea" :rows="4" placeholder="请输入备注" v-model="addfm.rmark" clearable  maxlength="150" show-word-limit> </el-input>
+                </el-form-item>
             </el-form>
             <div slot="footer" class="dialog-footer">
                 <el-button @click.native="addSubProject = false">取消</el-button>
@@ -76,6 +79,7 @@
                 listLoading: false,
                 addfm: {
                     name: '',
+                    rmark: ''
                 },
                 addSubProject: false,
                 ruless: {
@@ -239,6 +243,9 @@
                 if(subProject) {
                     this.addfm.name = subProject.name
                     this.addfm.id = subProject.id
+                    this.addfm.rmark = subProject.rmark
+                } else {
+                    this.addfm = {name: '',rmark: ''}
                 }
                 this.addSubProject = true;
             },
@@ -293,7 +300,7 @@
                                     message: '成功',
                                     type: "success"
                                 });
-                                this.addfm = {name: ''}
+                                this.addfm = {name: '',rmark: ''}
                                 this.addSubProject = false
                                 this.getSub()
                             } else {

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

@@ -330,19 +330,18 @@
             <!--项目阶段汇总工时报表 -->
             <el-table v-if="ins == 5" border :data="list5" key="5"
             highlight-current-row v-loading="listLoading" :height="tableHeight" 
-             style="width: 100%;">
+             style="width: 100%;" ref="table">
                 <el-table-column prop="projectCode" label="项目编号"  width="120" fixed ></el-table-column>
                 <el-table-column prop="projectName" label="项目名称" width="240" fixed  >
                   <template slot-scope="scope" >
                     {{scope.row.projectName}}
                   </template>
                 </el-table-column>
-                <el-table-column v-for="item in stages" :label="item" min-width="150" :key="item" align="right" show-overflow-tooltip="true" >
+                <el-table-column v-for="(item,indexs) in stages" :label="item" min-width="150" :key="indexs" align="right" show-overflow-tooltip="true" >
                   <template slot-scope="scope" >
                     {{scope.row.stageCostList.filter(s=>s.stageName == item).length == 0?'0':scope.row.stageCostList.filter(s=>s.stageName == item)[0].workingTime.toFixed(1)}}h
                     <span v-if="permissions.reportPhaseCost">/￥{{scope.row.stageCostList.filter(s=>s.stageName == item).length == 0?'0':scope.row.stageCostList.filter(s=>s.stageName == item)[0].cost.toFixed(1)}}</span>
                   </template>
-                 
                 </el-table-column>
             </el-table>
 
@@ -1287,6 +1286,7 @@ export default {
                 this.total = res.data.total;
                 this.stages = res.data.stages;
                 this.listLoading = false; 
+                this.$nextTick(()=>{this.$refs.table.doLayout()})
             } else {
                 this.$message({
                 message: res.msg,

fhKeeper/formulahousekeeper/timesheet/src/views/provider/provider.vue

@@ -22,20 +22,20 @@
         </el-col>
 
         <!--列表-->
-        <el-table :data="list" highlight-current-row v-loading="listLoading" :height="tableHeight" style="width: 100%;" @selection-change="selectionChange">
+        <el-table :data="list" highlight-current-row v-loading="listLoading" :height="tableHeight" style="width: 100%;" @selection-change="selectionChange" @sort-change="tableSort">
             <el-table-column type="selection" width="60">
                 <!-- <template slot-scope="scope" >
                         {{scope.$index+1+(page-1)*size}}
                     </template> -->
             </el-table-column>
-            <el-table-column prop="providerCode" label="供应商编码"  width="200"></el-table-column>
-            <el-table-column prop="providerName" label="供应商名称" width="200"></el-table-column>
-            <el-table-column prop="providerCategoryName" label="供应商分类" width="200"></el-table-column>
+            <el-table-column prop="providerCode" label="供应商编码"  width="200" sortable="custom"></el-table-column>
+            <el-table-column prop="providerName" label="供应商名称" width="200" sortable="custom"></el-table-column>
+            <el-table-column prop="providerCategoryName" label="供应商分类" width="200" sortable="custom"></el-table-column>
             <el-table-column prop="contactName" label="联系人"  width="120"></el-table-column>
             <el-table-column prop="contactPhone" label="联系电话"  width="150"></el-table-column>
             <el-table-column prop="email" label="邮箱"  width="180"></el-table-column>
             <el-table-column prop="address" label="地址" width="200"></el-table-column>
-            <el-table-column prop="remark" label="备注" width="300"></el-table-column>
+            <!-- <el-table-column prop="remark" label="备注" width="300"></el-table-column> -->
             
             <el-table-column label="操作" width="150" fixed="right">
                 <template slot-scope="scope">
@@ -86,7 +86,7 @@
                     <el-input v-model="addForm.address" :max="50"  placeholder="请输入供应商联系地址" clearable></el-input>
                 </el-form-item>
                 <el-form-item label="备注" prop="remark ">
-                    <el-input type="textarea" :rows="4" v-model="addForm.remark " maxlength="100" show-word-limit placeholder="请输入备注" clearable></el-input>
+                    <el-input type="textarea" :rows="4" v-model="addForm.remark " maxlength="1000" show-word-limit placeholder="请输入备注" clearable></el-input>
                 </el-form-item>
 
             </el-form>
@@ -215,7 +215,9 @@
                 showClfDialog: false,
                 baseClfList: [],
                 addClf: {providerCategoryName: '', companyId: ''},
-                addClfDialog: false
+                addClfDialog: false,
+                sortOrder: '',
+                sortProp: ''
             };
         },
         // 过滤器
@@ -240,6 +242,14 @@
             }
         },
         methods: {
+            // 列表排序
+            tableSort({column, prop, order}){
+                if(prop == 'providerCode' || prop == 'providerName' || prop == 'providerCategoryName') {
+                    this.sortOrder = order
+                    this.sortProp = prop
+                    this.getList()
+                }
+            },
             // 新增/编辑 分类条目
             addNewClf(row) {
                 this.addClfDialog = true;
@@ -593,11 +603,27 @@
             //获取项目列表
             getList() {
                 this.listLoading = true;
-                this.http.post('/provider-info/list', {
+                let fomrs = {
                     pageIndex: this.page,
                     pageSize: this.size,
                     keyword:this.keyword
-                },
+                }
+                if(this.sortOrder){
+                    if(this.sortProp == 'providerCode'){
+                        fomrs.sortProp = 'provider_code'
+                    }else if(this.sortProp == 'providerName'){
+                        fomrs.sortProp = 'provider_name'
+                    }else if(this.sortProp == 'providerCategoryName'){
+                        fomrs.sortProp = 'provider_category_name'
+                    }
+
+                    if(this.sortOrder == 'descending'){
+                        fomrs.sortOrder = 0
+                    }else if(this.sortOrder == 'ascending'){
+                        fomrs.sortOrder = 1
+                    }
+                }
+                this.http.post('/provider-info/list', fomrs,
                 res => {
                     this.listLoading = false;
                     if (res.code == "ok") {

fhKeeper/formulahousekeeper/timesheet/src/views/team/index.vue

@@ -1997,7 +1997,7 @@ export default {
                 departmentId: array.reverse(),
                 salaryType: res.data.salaryType,
                 costApplyDate: res.data.costApplyDate,
-                inductionDate: res.data.inductionDate,
+                // inductionDate: res.data.inductionDate,
                 position: res.data.position,
                 certJson: res.data.certList,
                 plateMap: {},
@@ -2008,6 +2008,7 @@ export default {
                 plate4: res.data.plate4,
                 plate5: res.data.plate5,
               };
+              this.$set(this.insertForm, 'inductionDate', res.data.inductionDate)
               this.getUserCustomConfig(1);
             } else {
               this.$message({