Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper

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

@@ -374,6 +374,10 @@
                     <div v-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='departmentName' :openid='depForm.name'></TranslationOpenDataText></div>
                 </el-form-item>
 
+                <el-form-item label="部门编码" prop="deptCode">
+                    <el-input v-model.trim="depForm.deptCode" :placeholder="$t('peaseenterthe')" clearable style="width: 100%"></el-input>
+                </el-form-item>
+
                 <!-- 主要负责人 -->
                 <el-form-item :label="$t('Principalpersoninharge')" prop="managerId">
                     <el-select v-model="depForm.managerId" filterable v-if="user.userNameNeedTranslate != '1'" clearable  :placeholder="$t('defaultText.pleaseChoose')" style="width: 100%">
@@ -3355,6 +3359,7 @@ export default {
             managerId: that.depData.managerId,
             reportAuditUserid: that.depData.reportAuditUserid,
             pushToSap:that.depData.pushToSap,
+            deptCode: that.depData.deptCode,
             isEnableMulti: 0
           }
           if(that.depData.otherManagerIds) {
@@ -3419,6 +3424,9 @@ export default {
           if (this.user.timeType.type == 2 && this.user.timeType.multiWorktime == 1) {
             form.isEnableMulti = this.depForm.isEnableMulti;
           }
+          if(this.depForm.deptCode) {
+            form.deptCode = this.depForm.deptCode;
+          }
           this.http.post(
             this.depForm.id == null
               ? this.port.manage.add

fhKeeper/formulahousekeeper/timesheet_h5/src/views/edit/index.vue

@@ -783,8 +783,8 @@ export default {
             this.showQrcode = false
         },
         determineQrcode(val) {
-            this.clickIndex = val
-            // const { line, orderId, projectId, projectName, trueProjectId } = JSON.parse(`{"id":1,"line":1,"orderId":"MO-2021-08-0004","projectId":"HH-EQ-2101003","projectName":"行走轴样机","status":4,"trueProjectId":"64218"}`)
+            // this.clickIndex = val
+            // const { line, orderId, projectId, projectName, trueProjectId } = JSON.parse(`{"id":1,"line":1,"orderId":"MO-2021-08-0004","projectId":"HH-EQ-2101003","projectName":"行走轴样机","status":4,"trueProjectId":"642188"}`)
             // const { line, orderId, projectId, projectName, trueProjectId } = JSON.parse(localStorage.getItem('scanTheCode') || `{}`)
             const { line, orderId, projectId, projectName, trueProjectId } = JSON.parse(val || '{}')
             if(!trueProjectId) {
@@ -795,6 +795,14 @@ export default {
                 this.$toast.fail(`待审核的日报扫码无效`);
                 return
             }
+
+            const projectList = this.projectss || []
+            const rows = projectList.filter(item => item.id == trueProjectId)
+            if(rows.length <= 0) {
+                this.$toast.fail(`暂未参与该项目`);
+                return
+            }
+
             this.form.domains[this.clickIndex] = {
                 ...this.form.domains[this.clickIndex],
                 extraField4: orderId,