Merge branch 'dev-xiaole' into 'master'

Dev xiaole

See merge request !3

src/views/projectFront/epidemicPrevention/visitorsManage.vue

@@ -101,6 +101,15 @@
             </template>
           </el-table-column>
 
+           <el-table-column prop="idCard" align="lfet">
+            <template slot-scope="scope">
+              <div>
+                <div>疫苗(第几针):{{scope.row.vaccineStatus}}</div>
+                <div>核酸有效期:{{scope.row.nadTime}}</div>
+              </div>
+            </template>
+          </el-table-column>
+
           <!-- <el-table-column prop="sex" label="操作" align="center">
             <template slot-scope="scope">
               <div class="flex" style="width:40%;  margin: auto;">
@@ -491,6 +500,7 @@ export default {
         codeState:this.codeState
       };
       visitorManageRecordApi(data).then((res) => {
+        console.log('查询结果',res)
         if (res.code == 200) {
           this.total = res.result.total;
           this.tableData = JSON.parse(JSON.stringify(res.result.records));

src/views/projectFront/laborManage/personModule/administration.vue

@@ -342,6 +342,7 @@
                 type="primary"
                 :disabled="checkedWorker.length == 0"
                 @click="issuePersonFn"
+                v-if="key == 1"
                 >{{ $t("message.laborMange.aKeyIssued") }}</el-button
               >
             </el-form-item>
@@ -469,15 +470,33 @@
                     />
                     <span>{{ $t("message.laborMange.delete") }}</span>
                   </div>
-                  <el-button
+                  <!-- 此处注释是因为当时的需求 '上传到住建局' 和 '一键下发' 的按钮要去掉 所以更改判断条件-->
+                  <!-- <el-button
                     type="primary"
                     size="mini"
                     @click="issuePersonOneFn(scope.row.id)"
                     v-if="scope.row.inserviceType == 1"
                     >{{ $t("message.laborMange.aKeyIssued") }}</el-button
+                  > -->
+                <!-- <div v-if="isUploadToHouse" class="personItemBottom">
+                  <el-checkbox
+                    v-model="scope.row.isUploadHousing"
+                    :checked="scope.row.isUploadHousing == 1 ? true : false"
+                    @change="
+                      uploadToHouseFn(scope.row.isUploadHousing, scope.row.id)
+                    "
+                    >{{ $t("message.laborDev.uploadToGover") }}</el-checkbox
+                  >
+                </div> -->
+                <el-button
+                    type="primary"
+                    size="mini"
+                    @click="issuePersonOneFn(scope.row.id)"
+                    v-if="key == 1"
+                    >{{ $t("message.laborMange.aKeyIssued") }}</el-button
                   >
                 </div>
-                <div v-if="isUploadToHouse" class="personItemBottom">
+                <div v-if="key == 1">
                   <el-checkbox
                     v-model="scope.row.isUploadHousing"
                     :checked="scope.row.isUploadHousing == 1 ? true : false"
@@ -1706,6 +1725,7 @@ export default {
   },
   data() {
     return {
+      key:'',
       isCheckeedData: true, //判断一键下发是否有数据选中
       COMPANY: COMPANY,
       isIndeterminate2: false,
@@ -1842,6 +1862,18 @@ export default {
     this.projectSn = this.$store.state.projectSn;
     this.uploadUrl = this.$store.state.UPLOADURL;
     this.fileUrl = this.$store.state.FILEURL;
+    let data = JSON.parse(sessionStorage.getItem("vuex"));
+    // console.log('vuex信息',data)
+    data.menuList.forEach((item)=>{
+      if(item.actionList){
+         item.actionList.forEach((item2)=>{
+          if(item2.status==1){
+              this.key == 1 ;
+          }
+        })
+      }
+    })
+    // console.log('key',this.key)
     if (sessionStorage.getItem("personPage2")) {
       this.page = JSON.parse(sessionStorage.getItem("personPage2"));
     }

src/views/projectFront/laborManage/personModule/laborComponent.vue

@@ -471,7 +471,8 @@
                     >{{ $t("message.laborMange.aKeyIssued") }}</el-button
                   >
                 </div>
-                <div
+                <!-- 此处注释是因为当时的需求 '上传到住建局' 的按钮要去掉 所以更改判断条件-->
+                <!-- <div
                   class="personItemBottom"
                   v-if="isUploadToHouse && scope.row.inserviceType == 1"
                 >
@@ -483,6 +484,19 @@
                     "
                     >{{ $t("message.laborDev.uploadToGover") }}</el-checkbox
                   >
+                </div> -->
+                <div
+                  class="personItemBottom"
+                  v-if="key == 1"
+                >
+                  <el-checkbox
+                    v-model="scope.row.isUploadHousing"
+                    :checked="scope.row.isUploadHousing == 1 ? true : false"
+                    @change="
+                      uploadToHouseFn(scope.row.isUploadHousing, scope.row.id)
+                    "
+                    >{{ $t("message.laborDev.uploadToGover") }}</el-checkbox
+                  >
                 </div>
               </template>
             </el-table-column>
@@ -2253,6 +2267,7 @@ export default {
   data() {
     return {
       radio: "",
+      key:'',//判断是否显示一件下发按钮
       COMPANY: COMPANY,
       isCheckeedData: true, //判断一键下发是否有数据选中
       ufaceDevAllList: [], //所有人脸设备
@@ -2430,6 +2445,17 @@ export default {
     this.projectSn = this.$store.state.projectSn;
     this.uploadUrl = this.$store.state.UPLOADURL;
     this.fileUrl = this.$store.state.FILEURL;
+    let data = JSON.parse(sessionStorage.getItem("vuex"));
+    // console.log('vuex信息',data)
+    data.menuList.forEach((item)=>{
+      if(item.actionList){
+         item.actionList.forEach((item2)=>{
+          if(item2.status==1){
+              this.key == 1 ;
+          }
+        })
+      }
+    })
     if (sessionStorage.getItem("personPage")) {
       this.page = JSON.parse(sessionStorage.getItem("personPage"));
     }