فهرست منبع

去掉请假时的审批人选择

seyason 2 سال پیش
والد
کامیت
69973f436b

+ 3 - 33
fhKeeper/formulahousekeeper/timesheet/src/views/leave/list.vue

@@ -126,19 +126,6 @@
                         <el-radio label="1" v-if="addForm.leaveType != 6">{{ $t('leavehour') }}</el-radio>
                     </el-radio-group>
                 </el-form-item>
-                <!-- 选择审批人 -->
-                <el-form-item :label="$t('approver')" style="width:300px" prop="projectAuditorJson">
-                    <el-select style="display:inline-block;width:250px;" multiple v-model="addForm.projectAuditorJson" :placeholder="$t('defaultText.pleaseChoose')" v-if="user.userNameNeedTranslate != 1">
-                      <el-option
-                      v-for="item in approverList"
-                      :key="item.id"
-                      :label="item.name"
-                      :value="item.id"
-                      ></el-option>
-                    </el-select>
-
-                     <selectCat v-if="user.userNameNeedTranslate == 1" :size="'medium'" :multiSelect="true" :widthStr="'250'" :subject="users" :subjectId="addForm.ownerId" :distinction="'2'" @selectCal="selectCal"></selectCat>
-                </el-form-item>
                 <!-- 时间选择 -->
                 <el-form-item :label="flg ? $t('optiondate') : $t('other.timeSelection')" style="width: 100%;">
                     <el-col style="display: inline-block; width: 240px">
@@ -742,8 +729,7 @@ export default {
         ownerId: [{ required: true, message: this.$t('pleaseselectthepersonaskingforleave'), trigger: "blur" }],
         tel: [{required: true, validator: checkTel, trigger: 'blur'}],
         timeDays: [{required: true, validator: checks, trigger: 'blur'}],
-        leaveType: [{ required: true, message: this.$t('pleaseselectthetypeofleave'), trigger: "blur" }],
-        projectAuditorJson: [{ required: true, message: this.$t('pleaseselectapprover'), trigger: "blur" }]
+        leaveType: [{ required: true, message: this.$t('pleaseselectthetypeofleave'), trigger: "blur" }]
       },
       user: JSON.parse(sessionStorage.getItem("user")),
       shuz: [this.$t('personalleaveisallowed'), this.$t('leaveisallowed'), this.$t('annualleaveisallowed'), this.$t('maternityleaveisallowed')],
@@ -758,8 +744,7 @@ export default {
         // indate: this.getCurrentTime(),
         timeHours: 8,
         tel: '',
-        remark: '',
-        projectAuditorJson: ''
+        remark: ''
       },
       displayTable: false,
       users: [], // 人员信息
@@ -1648,7 +1633,6 @@ export default {
         this.$refs.addForm.validate(valid => {
           this.addForm.endDate = this.buling(this.addForm.endDate)
           this.addForm.startDate = this.buling(this.addForm.startDate)
-          // this.addForm.projectAuditorJson = JSON.stringify(this.addForm.projectAuditorJson)
           if (valid) {
             this.http.post('/leave-sheet/add', this.addForm,
             res => {
@@ -1664,20 +1648,7 @@ export default {
                     this.addForm.leaveType = 0
                     this.addForm.timeHours = 8
                     this.addForm.remark = ''
-                    this.addForm.projectAuditorJson = ''
-                    // this.addForm = {
-                    //   timeType: '0',
-                    //   startDate: this.getCurrentTime(),
-                    //   endDate: this.getCurrentTime(),
-                    //   timeDays: 1,
-                    //   leaveType: 0,
-                    //   ownerId: '',
-                    //   // indate: this.getCurrentTime(),
-                    //   timeHours: 8,
-                    //   tel: '',
-                    //   remark: '',
-                    //   projectAuditorJson: ''
-                    // }
+                    
                     this.flg = true
                 } else {
                     this.$message({
@@ -1985,7 +1956,6 @@ export default {
         for(let i in obj.arrUserList) {
           arr.push(obj.arrUserList[i].id)
         }
-        this.addForm.projectAuditorJson = arr
       } else if(obj.distinction == '3') {
         this.ownerIds = obj.id
         this.chufas()

+ 1 - 0
fhKeeper/formulahousekeeper/timesheet_h5/src/views/my/children/center.vue

@@ -25,6 +25,7 @@
                 </template>
             </van-cell>
             <van-button class="logout" @click="logout" block round type="danger" v-if="!isCorpWX">退出登录</van-button>
+            <!-- <van-button class="logout" @click="logout" block round type="danger" >退出登录</van-button> -->
         </main>
 
         <Footer page="my" />