2022.4.13bug修改

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

@@ -51,8 +51,8 @@
                         <el-input v-model="addform.reason" style="width: 555px" maxlength="25" type="text" show-word-limit></el-input>
                     </el-form-item>
                     <!-- 维度选择添加 -->
-                        <el-form-item label="投入项目" style="width:300px;margin-right:30px" prop="cityFrom">
-                            <el-select style="width:100%" @change="getwuduList()" v-model="addform.projectId" filterable clearable placeholder="请选择投入项目" >
+                        <el-form-item label="投入项目" style="width:300px;margin-right:30px" prop="projectId">
+                            <el-select style="width:100%" @change="getwuduList(1)" v-model="addform.projectId" filterable clearable placeholder="请选择投入项目" >
                                 <el-option
                                 v-for="item in projectList"
                                 :key="item.id"
@@ -64,8 +64,8 @@
                         <el-form-item :label="wuduData.customDegreeName"
                         v-if="addform.projectId != null && wuduData.customDegreeActive == 1"
                         style="width:300px;margin-right:30px"
-                        prop="cityFrom">
-                            <el-select style="width:100%" v-model="addform.wuduId" filterable clearable placeholder="请选择" >
+                        prop="degreeId">
+                            <el-select style="width:100%" v-model="addform.degreeId" filterable clearable placeholder="请选择" >
                                 <el-option
                                 v-for="item in wuduList"
                                 :key="item.id"
@@ -189,9 +189,10 @@
                 </div>
         <!-- 出差列表 -->
                 <el-table :data="tableList" style="width: 100%" height="90%">
-                    <el-table-column prop="ownerName" label="出差人员" width="120"></el-table-column>
-                    <el-table-column prop="reason" label="出差事由" width="200" header-align="center"></el-table-column>
-                    <el-table-column label="交通工具" width="120">
+                    <el-table-column prop="ownerName" label="出差人员" width="100" fixed="left" align="center"></el-table-column>
+                    <el-table-column prop="reason" label="出差事由" width="150" header-align="center"></el-table-column>
+                    <el-table-column prop="projectName" label="投入项目" width="150" align="center"></el-table-column>
+                    <el-table-column label="交通工具" width="120" align="center">
                         <template slot-scope="scope">
                             <span v-if="scope.row.way == 0">飞机</span>
                             <span v-if="scope.row.way == 1">火车</span>
@@ -200,11 +201,11 @@
                             <span v-if="scope.row.way == 4">其他</span>
                         </template>
                     </el-table-column>
-                    <el-table-column label="行程" width="120">
+                    <el-table-column label="行程" width="120" align="center">
                         <template slot-scope="scope">{{scope.row.cityFrom + '-' + scope.row.cityTo}}</template>
                     </el-table-column>
-                    <el-table-column prop="indate" label="申请时间" width="150"></el-table-column>
-                    <el-table-column label="出差天数" width="120">
+                    <el-table-column prop="indate" label="申请时间" width="150" align="center"></el-table-column>
+                    <el-table-column label="出差天数" width="120" align="center">
                         <template slot-scope="scope">
                             <div>{{scope.row.dayCount}}天</div>
                         </template>
@@ -232,9 +233,9 @@
                                 <el-button icon="el-icon-check" circle size="mini" @click="approve(scope.row)"></el-button>
                                 <el-button icon="el-icon-close" circle size="mini"  @click="deny(scope.row)"></el-button>
                             </div>
-                            <div v-if="!isAuditList && ((scope.row.status != 0 && scope.row.ownerId == user.id) || permissions.leaveAll)">
-                                <el-button icon="el-icon-delete" circle size="mini"  @click="deletes(scope.row)"></el-button>
-                                <el-button icon="el-icon-edit" circle size="mini" @click="editor(scope.row)"></el-button>
+                            <div v-if="!isAuditList">
+                                <el-button v-if="!isAuditList && ((scope.row.status != 0 && scope.row.ownerId == user.id) || permissions.leaveAll)" icon="el-icon-delete" circle size="mini"  @click="deletes(scope.row)"></el-button>
+                                <el-button v-if="((scope.row.status != 0 && scope.row.ownerId == user.id) || permissions.leaveAll) || scope.row.status == 1" icon="el-icon-edit" circle size="mini" @click="editor(scope.row)"></el-button>
                             </div>
                         </template>
                     </el-table-column>
@@ -367,9 +368,9 @@
         </div>
     </div>
     <!-- 编辑框 -->
-    <el-dialog title="出差详情" :visible.sync="editDialog" width="1000px">
+    <el-dialog title="出差详情" v-if="editDialog" :visible.sync="editDialog" width="1000px">
         <!-- <el-form ref="editItemForm" :model="editItemForm" label-width="80px" :rules="editItemFormRules"> -->
-        <el-form ref="editItemForm" :model="editItemForm" label-width="80px">
+        <el-form ref="editItemForm" :model="editItemForm" label-width="80px" :rules="editItemRules">
             <el-form-item label="出差人员" prop="ownerName"  style="width: 300px;display: inline-block;">
             <span>{{editItemForm.ownerName}}</span>
         </el-form-item>
@@ -389,6 +390,29 @@
                 <el-radio :label="4">其他</el-radio>
             </el-radio-group>
         </el-form-item>
+        <el-form-item label="投入项目" style="width:300px;margin-right:30px;display:inline-block;" prop="projectId">
+            <el-select style="width:100%" @change="getwuduList(0)" v-model="editItemForm.projectId" filterable clearable placeholder="请选择投入项目" >
+                <el-option
+                v-for="item in projectList"
+                :key="item.id"
+                :label="item.projectName"
+                :value="item.id">
+                </el-option>
+            </el-select>
+        </el-form-item>
+        <el-form-item :label="wuduData.customDegreeName"
+        v-if="editItemForm.projectId != null && wuduData.customDegreeActive == 1"
+        style="width:300px;margin-right:30px;display:inline-block;"
+        prop="degreeName">
+            <el-select style="width:100%" v-model="editItemForm.degreeId" filterable clearable placeholder="请选择" >
+                <el-option
+                v-for="item in wuduList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id">
+                </el-option>
+            </el-select>
+        </el-form-item>
         <el-form-item label="出发城市" style="width:300px;margin-right:30px;display: inline-block;" prop="cityFrom">
             <el-select style="width:100%" v-model="editItemForm.cityFrom" filterable clearable placeholder="请选择出发城市" >
                 <el-option
@@ -410,7 +434,7 @@
                 </el-option>
             </el-select>
         </el-form-item>
-        <el-form-item label="开始时间" style="width:300px;margin-right:30px" prop="startDate">
+        <el-form-item label="开始时间" style="width:300px;margin-right:30px;display:inline-block;" prop="startDate">
             <el-date-picker
             type="date"
             placeholder="开始日期"
@@ -421,7 +445,7 @@
             </el-date-picker>
         </el-form-item>
         <!-- 结束时间 -->
-        <el-form-item label="结束时间" style="width:300px" prop="endDate">
+        <el-form-item label="结束时间" style="width:300px;display:inline-block;" prop="endDate">
             <el-date-picker
             type="date"
             placeholder="结束日期"
@@ -439,7 +463,7 @@
         </el-form-item>
     </el-form>
     <span slot="footer" class="dialog-footer">
-      <el-button @click="editdialog = false">取 消</el-button>
+      <el-button @click="editDialog = false">取 消</el-button>
       <el-button type="primary" @click="determine()">确 定</el-button>
     </span>
     </el-dialog>
@@ -450,9 +474,10 @@
             <!-- <el-table-column prop="date" label="日期" width="150"></el-table-column>
             <el-table-column prop="name" label="姓名" width="200"></el-table-column>
             <el-table-column prop="address" label="地址"></el-table-column> -->
-            <el-table-column prop="ownerName" label="出差人员" width="120"></el-table-column>
-            <el-table-column prop="reason" label="出差事由" width="200" header-align="center"></el-table-column>
-            <el-table-column label="交通工具" width="120">
+            <el-table-column prop="ownerName" label="出差人员" width="100" fixed="left"></el-table-column>
+            <el-table-column prop="reason" label="出差事由" width="150" header-align="center"></el-table-column>
+            <el-table-column prop="projectName" label="投入项目" width="150" align="center"></el-table-column>
+            <el-table-column label="交通工具" width="120" align="center">
                 <template slot-scope="scope">
                     <span v-if="scope.row.way == 0">飞机</span>
                     <span v-if="scope.row.way == 1">火车</span>
@@ -461,15 +486,15 @@
                     <span v-if="scope.row.way == 4">其他</span>
                 </template>
             </el-table-column>
-            <el-table-column label="行程" width="120">
+            <el-table-column label="行程" width="120" align="center">
                 <template slot-scope="scope">{{scope.row.cityFrom + '-' + scope.row.cityTo}}</template>
             </el-table-column>
-            <el-table-column prop="indate" label="申请时间" width="150"></el-table-column>
-            <el-table-column label="出差天数" width="120">
+            <el-table-column prop="indate" label="申请时间" width="150" align="center"></el-table-column>
+            <el-table-column label="出差天数" width="80" align="center">
                 <template slot-scope="scope"><div>{{scope.row.dayCount}}天</div></template>
             </el-table-column>
-            <el-table-column prop="startDate" label="出差开始时间" width="150"></el-table-column>
-            <el-table-column prop="endDate" label="出差结束时间" width="150"></el-table-column>
+            <el-table-column prop="startDate" label="出差开始时间" width="150" align="center"></el-table-column>
+            <el-table-column prop="endDate" label="出差结束时间" width="150" align="center"></el-table-column>
             <el-table-column prop="remark" label="备注" width="200">
                 <template slot-scope="scope">
                     <el-popover placement="top-start" title="标题" width="200" trigger="hover" :content="scope.row.remark">
@@ -532,10 +557,16 @@ export default {
             },
             formrules:{
                 reason:[{ required: true, message: "请输入出差事由", trigger: "blur" }],
-                leaveCityCode:[{ required: true, message: "请选择出发城市", trigger: "change" }],
-                destCityCode:[{ required: true, message: "请选择目的城市", trigger: "change" }],
-                startDate:[{ required: true, message: "请选择开始时间", trigger: "change" }],
-                endDate:[{ required: true, message: "请选择开始时间", trigger: "change" }]
+                cityFrom:[{ required: true, message: "请选择出发城市", trigger: "blur" }],
+                cityTo:[{ required: true, message: "请选择目的城市", trigger: "blur" }],
+                startDate:[{ required: true, message: "请选择开始时间", trigger: "blur" }],
+                endDate:[{ required: true, message: "请选择开始时间", trigger: "blur" }]
+            },
+            editItemRules:{
+                cityFrom:[{ required: true, message: "请选择出发城市", trigger: "blur" }],
+                cityTo:[{ required: true, message: "请选择目的城市", trigger: "blur" }],
+                startDate:[{ required: true, message: "请选择开始时间", trigger: "blur" }],
+                endDate:[{ required: true, message: "请选择开始时间", trigger: "blur" }]
             },
             cityList:[],
             cityList2:[],
@@ -731,7 +762,7 @@ export default {
                                 dayCount: null,   //出差天数
                                 remark: '',  //备注
                                 projectId: null,  //项目id
-                                wuduId:null      //维度id
+                                degreeId:null      //维度id
                             }
                         } else {
                             this.formloading = false
@@ -888,7 +919,12 @@ export default {
         editor(e) {
             console.log("编辑",e);
             this.editDialog = true
+            if(e.degreeId != null){
+                e.degreeId = e.degreeId + ''
+                console.log("e.degreeId",e.degreeId);
+            }
             this.editItemForm = e
+            this.getwuduList(0)
         },
         // 编辑框确定
         determine(){
@@ -1227,14 +1263,24 @@ export default {
             },
 
         // 获取维度数据
-            getwuduList() {
-                this.addform.wuduId = null
-                console.log(this.addform.projectId);
-                if(this.addform.projectId == '') {
-                    return
+            getwuduList(e) {
+                
+                if(e == 1){
+                    this.addform.wuduId = null
+                    if(this.addform.projectId == '' || this.addform.projectId == null) {
+                        return
+                    }
+                    var pId = this.addform.projectId
+                }else{
+                    this.editItemForm.wuduId = null
+                    if(this.editItemForm.projectId == '' || this.editItemForm.projectId == null) {
+                        return
+                    }
+                    var pId = this.editItemForm.projectId
                 }
+                
                 this.http.post('/project/getDegreeList',{ 
-                    projectId: this.addform.projectId,
+                    projectId: pId,
                 },
                 res => {
                     if (res.code == "ok") {