Merge branch 'V0.0.5' of http://10.87.21.221:8000/jzyd_yyds/soc_app into V0.0.5

# Conflicts:
#	src/views/menu/problemItem/detail.vue

src/utils/globalMixins.js

@@ -7,8 +7,8 @@ import { imgUrl } from '@/utils/index'
 export default {
   data() {
     return {
-      fromPage:null,
-      toPage:null,
+      fromPages:null,
+      toPages:null,
       globalLoading:false,
     }
   },
@@ -23,8 +23,8 @@ export default {
     ...mapActions(['setDict']),
     getRouter(){
       let router = JSON.parse(sessionStorage.getItem('ROUTER'));
-      this.fromPage = router.from;
-      this.toPage = router.to;
+      this.fromPages = router.from;
+      this.toPages = router.to;
     },
     setDicts() {
       this.dicts.forEach(item => {

src/views/menu/problemItem/detail.vue

@@ -7,10 +7,10 @@
         <div class="card">
           <div class="mainItem">
             <van-row>
-              <van-col :span="8" class="label">
+              <van-col :span="7" class="label">
                 <div>问题名称</div>
               </van-col>
-              <van-col :span="16">
+              <van-col :span="17">
                 <span>
                   {{ taskInfo.srcTaskName }}
                 </span>
@@ -20,10 +20,10 @@
           <div class="bigbox">
             <div class="mainItem">
               <van-row>
-                <van-col :span="8" class="label">
+                <van-col :span="7" class="label">
                   <div>问题状态</div>
                 </van-col>
-                <van-col :span="16">
+                <van-col :span="17">
                   <span
                     v-if="taskInfo.overdueStatus"
                     :style="{ color: getState(getDictLabel(taskInfo.overdueStatus, 'app_question_status')) }"
@@ -47,10 +47,10 @@
             </div>
             <div class="mainItem">
               <van-row>
-                <van-col :span="8" class="label">
+                <van-col :span="7" class="label">
                   <div>隐患所在机构</div>
                 </van-col>
-                <van-col :span="16">
+                <van-col :span="17">
                   <span>
                     {{ taskInfo.orgName }}
                   </span>
@@ -60,10 +60,10 @@
 
             <div class="mainItem">
               <van-row>
-                <van-col :span="8" class="label">
+                <van-col :span="7" class="label">
                   <div>检查项</div>
                 </van-col>
-                <van-col :span="16">
+                <van-col :span="17">
                   <span>
                     {{ taskInfo.checkItem }}
                   </span>
@@ -73,10 +73,10 @@
 
             <div class="mainItem">
               <van-row>
-                <van-col :span="8" class="label">
+                <van-col :span="7" class="label">
                   <div>检查内容</div>
                 </van-col>
-                <van-col :span="16">
+                <van-col :span="17">
                   <span>
                     {{ taskInfo.checkContent }}
                   </span>
@@ -86,10 +86,10 @@
 
             <div class="mainItem">
               <van-row>
-                <van-col :span="8" class="label">
+                <van-col :span="7" class="label">
                   <div>隐患描述</div>
                 </van-col>
-                <van-col :span="16">
+                <van-col :span="17">
                   <span>
                     {{ taskInfo.questionDesc }}
                   </span>
@@ -99,10 +99,10 @@
 
             <div class="mainItem">
               <van-row>
-                <van-col :span="8" class="label">
+                <van-col :span="7" class="label">
                   <div>发现时间</div>
                 </van-col>
-                <van-col :span="16">
+                <van-col :span="17">
                   <span>
                     {{ taskInfo.submitTime }}
                   </span>
@@ -112,10 +112,10 @@
 
             <div class="mainItem">
               <van-row>
-                <van-col :span="8" class="label">
+                <van-col :span="7" class="label">
                   <div>提出人</div>
                 </van-col>
-                <van-col :span="16">
+                <van-col :span="17">
                   <span>
                     {{ taskInfo.submitorName }}
                   </span>
@@ -125,10 +125,10 @@
 
             <div class="mainItem">
               <van-row>
-                <van-col :span="8" class="label">
+                <van-col :span="7" class="label">
                   <div>整改期限</div>
                 </van-col>
-                <van-col :span="16">
+                <van-col :span="17">
                   <span>
                     {{ formatDate(taskInfo.reformDeadline, 'YYYY-MM-DD') }}
                   </span>
@@ -138,26 +138,16 @@
 
             <div class="mainItem" v-if="taskInfo.images && taskInfo.images.length > 0">
               <van-row>
-                <van-col :span="8" class="label">
+                <van-col :span="7" class="label">
                   <div>隐患图片</div>
                 </van-col>
-                <van-col :span="16">
-                  <div
-                    class="nfc-img"
-                    v-for="(v, i) in [
-                      '/2023/12/18/20231218165501A031.png',
-                      '/2023/12/18/20231218165501A031.png',
-                      '/statics/2023/12/18/20231218165501A031.png',
-                      '/statics/2023/12/18/20231218165501A031.png'
-                    ]"
-                    :key="v"
-                    @click="clickImage(taskInfo.images, i)"
-                  >
-                    <img :src="imgUrl(v)" alt="" />
-                  </div>
-                  <!-- <div class="nfc-img" v-for="(v,i) in taskInfo.images" :key="v" @click="clickImage(taskInfo.images,i)">
+                <van-col :span="17">
+<!--                  <div class="nfc-img" v-for="(v,i) in ['/2023/12/18/20231218165501A031.png','/2023/12/18/20231218165501A031.png','/statics/2023/12/18/20231218165501A031.png','/statics/2023/12/18/20231218165501A031.png']" :key="v" @click="clickImage(taskInfo.images,i)">-->
+<!--                    <img :src="imgUrl(v)" alt="" >-->
+<!--                  </div>-->
+                  <div class="nfc-img" v-for="(v,i) in taskInfo.images" :key="v" @click="clickImage(taskInfo.images,i)">
                     <img :src="imgUrl(v)" alt="" >
-                  </div> -->
+                  </div>
                 </van-col>
               </van-row>
             </div>
@@ -170,26 +160,22 @@
         <div class="card">
           <div class="mainItem">
             <van-row>
-              <van-col :span="8" class="label"><div>整改日期</div></van-col>
-              <van-col :span="16"
-                ><span>{{ formatDate(taskInfo.reform.reformDate, 'YYYY-MM-DD') }}</span></van-col
-              >
+              <van-col :span="7" class="label"><div>整改日期</div></van-col>
+              <van-col :span="17"><span>{{formatDate(taskInfo.reform.reformDate,'YYYY-MM-DD')}}</span></van-col>
             </van-row>
           </div>
 
           <div class="mainItem">
             <van-row>
-              <van-col :span="8" class="label"><div>整改描述</div></van-col>
-              <van-col :span="16"
-                ><span>{{ taskInfo.reform.description }}</span></van-col
-              >
+              <van-col :span="7" class="label"><div>整改描述</div></van-col>
+              <van-col :span="17"><span>{{taskInfo.reform.description}}</span></van-col>
             </van-row>
           </div>
 
           <div class="mainItem" v-if="taskInfo.reform.images">
             <van-row>
-              <van-col :span="8" class="label"><div>上传信息</div></van-col>
-              <van-col :span="16">
+              <van-col :span="7" class="label"><div>上传信息</div></van-col>
+              <van-col :span="17">
                 <div v-if="taskInfo.reform.images && taskInfo.reform.images.length > 0">
                   <div
                     class="nfc-img van-hairline--surround"
@@ -211,28 +197,22 @@
         <div class="card">
           <div class="mainItem">
             <van-row>
-              <van-col :span="8" class="label"><div>处理意见</div></van-col>
-              <van-col :span="16"
-                ><span>{{ taskInfo.confirm.executeStatus === 0 ? '确认' : '提出异议' }}</span></van-col
-              >
+              <van-col :span="7" class="label"><div>处理意见</div></van-col>
+              <van-col :span="17"><span>{{taskInfo.confirm.executeStatus === 0 ? '确认' : '提出异议'}}</span></van-col>
             </van-row>
           </div>
 
           <div class="mainItem" v-show="taskInfo.confirm.executeStatus === 1">
             <van-row>
-              <van-col :span="8" class="label"><div>异议内容</div></van-col>
-              <van-col :span="16"
-                ><span>{{ taskInfo.confirm.description }}</span></van-col
-              >
+              <van-col :span="7" class="label"><div>异议内容</div></van-col>
+              <van-col  :span="17"><span>{{taskInfo.confirm.description}}</span></van-col>
             </van-row>
           </div>
 
           <div class="mainItem">
             <van-row>
-              <van-col :span="8" class="label"><div>异议人</div></van-col>
-              <van-col :span="16"
-                ><span>{{ taskInfo.confirm.executorName }}</span></van-col
-              >
+              <van-col :span="7" class="label"><div>异议人</div></van-col>
+              <van-col  :span="17"><span>{{taskInfo.confirm.executorName}}</span></van-col>
             </van-row>
           </div>
         </div>
@@ -243,18 +223,14 @@
         <div class="card">
           <div class="mainItem">
             <van-row>
-              <van-col :span="8" class="label"><div>审核结果</div></van-col>
-              <van-col :span="16"
-                ><span>{{ taskInfo.confirmDissent.executeStatus === 0 ? '同意' : '不同意' }}</span></van-col
-              >
+              <van-col :span="7" class="label"><div>审核结果</div></van-col>
+              <van-col :span="17"><span>{{taskInfo.confirmDissent.executeStatus === 0 ? '同意' : '不同意'}}</span></van-col>
             </van-row>
           </div>
           <div class="mainItem" v-show="taskInfo.confirmDissent.executeStatus === 1">
             <van-row>
-              <van-col :span="8" class="label"><div>原因</div></van-col>
-              <van-col :span="16"
-                ><span>{{ taskInfo.confirmDissent.description }}</span></van-col
-              >
+              <van-col :span="7" class="label"><div>原因</div></van-col>
+              <van-col :span="17"><span>{{taskInfo.confirmDissent.description}}</span></van-col>
             </van-row>
           </div>
         </div>
@@ -567,7 +543,7 @@ export default {
   background-color: #f0f0f0;
   display: flex;
   align-items: center;
-  .van-col--8 {
+  .van-col--7 {
     min-height: 100px;
     display: flex;
     justify-content: center;
@@ -585,13 +561,13 @@ export default {
     flex: none !important;
     padding-left: 10px;
   }
-  .van-col--16 {
+  .van-col--17 {
     min-height: 100px;
     display: flex;
     align-items: center;
-    padding-left: 10px;
     background-color: #fff;
     padding: 10px;
+    padding-left: 10px;
     flex-flow: wrap;
     // opacity: 0.9;
   }
@@ -643,9 +619,9 @@ export default {
   height: 140px;
   margin: 10px;
   position: relative;
-  &:first-child {
-    margin-left: 0;
-  }
+  //&:first-child{
+  //  margin-left: 0;
+  //}
   > img {
     width: 100%;
     height: 100%;

src/views/menu/safetyBook/index.vue

@@ -3,7 +3,7 @@
     <NavBar />
     <div class="page-container">
       <div class="search-box">
-        <org-tree v-model="query.orgId" placeholder="选择检查机构" @change="refreshData"></org-tree>
+        <org-tree v-model="query.partyBOrg" placeholder="选择检查机构" @change="refreshData"></org-tree>
       </div>
       <div class="scroll-box">
         <Scroll
@@ -51,7 +51,7 @@ export default {
     return {
       pullup:true,
       query:{
-        orgId:null,
+        partyBOrg:null,
         pageNum:1,
         pageSize:10,
       },
@@ -64,7 +64,7 @@ export default {
     ...mapGetters(['orgId','dictionary'])
   },
   mounted(){
-    this.query.orgId = this.orgId;
+    this.query.partyBOrg = this.orgId;
   },
   methods:{
     dayjs,

src/views/menu/visitRegister/add.vue

@@ -33,7 +33,7 @@
               v-model="formData.reasons"
               placeholder="请输入"
               show-word-limit
-              :maxlength="200"/>
+              :maxlength="100"/>
             <date-cell
               v-if="visitType=='2'"
               is-row
@@ -340,7 +340,7 @@ export default {
         this.formData.status = 1;
         this.formData.type = this.visitType;
         this.formData.receptionOrgIds = [this.orgId];
-        this.formData.userInfos = this.pList;
+        this.formData.userInfos = JSON.parse(JSON.stringify(this.pList));
         let data = this.formData;
         if(this.formData.letterFile && this.formData.letterFile.length > 0){
           data.letterFile = this.formData.letterFile.map(v=>{

src/views/menu/workTime/index.vue

@@ -11,14 +11,14 @@
       </van-collapse>
 
       <!--   选择状态   -->
-      <van-radio-group :disabled="formData.isDisabled" v-model="formData.isEnable">
+      <van-radio-group :disabled="ifOrg() || formData.isDisabled" v-model="formData.isEnable">
         <van-cell-group>
-          <van-cell required title="营业" clickable @click="formData.isDisabled?null: changeRadio('1')">
+          <van-cell required title="营业" clickable @click=" ifOrg() || formData.isDisabled?null: changeRadio('1')">
             <template #right-icon>
               <van-radio name="1" />
             </template>
           </van-cell>
-          <van-cell required title="歇业" clickable @click="formData.isDisabled?null: changeRadio('0')">
+          <van-cell required title="歇业" clickable @click="ifOrg() || formData.isDisabled?null: changeRadio('0')">
             <template #right-icon>
               <van-radio name="0" />
             </template>
@@ -28,23 +28,23 @@
 
       <!--  选择时间    -->
       <van-cell-group>
-        <hours-cell required is-row :disabled="formData.isDisabled || !formData.isEnable || formData.isEnable =='0'" title="营业开始" v-model="formData.openTime"></hours-cell>
-        <hours-cell required is-row :disabled="formData.isDisabled || !formData.isEnable || formData.isEnable =='0'" title="营业结束" v-model="formData.closeTime"></hours-cell>
+        <hours-cell required is-row :disabled="ifOrg() || formData.isDisabled || !formData.isEnable || formData.isEnable =='0'" title="营业开始" v-model="formData.openTime"></hours-cell>
+        <hours-cell required is-row :disabled="ifOrg() || formData.isDisabled || !formData.isEnable || formData.isEnable =='0'" title="营业结束" v-model="formData.closeTime"></hours-cell>
       </van-cell-group>
       <!--  选择时间    -->
       <van-cell-group>
-        <hours-cell required is-row :disabled="formData.isDisabled || !formData.isEnable || formData.isEnable =='0'" title="上班时间" v-model="formData.workTime"></hours-cell>
-        <hours-cell required is-row :disabled="formData.isDisabled || !formData.isEnable || formData.isEnable =='0'" title="下班时间" v-model="formData.workOffTime"></hours-cell>
+        <hours-cell required is-row :disabled="ifOrg() || formData.isDisabled || !formData.isEnable || formData.isEnable =='0'" title="上班时间" v-model="formData.workTime"></hours-cell>
+        <hours-cell required is-row :disabled="ifOrg() || formData.isDisabled || !formData.isEnable || formData.isEnable =='0'" title="下班时间" v-model="formData.workOffTime"></hours-cell>
       </van-cell-group>
 
       <!--   操作     -->
       <van-cell-group>
-        <van-cell center title="是否值班打卡" v-if="!formData.isDisabled">
+        <van-cell center title="是否值班打卡" v-if="!ifOrg() && !formData.isDisabled">
           <template #right-icon>
             <van-switch :size="20" active-value="1" inactive-value="0" v-model="formData.isDuty"></van-switch>
           </template>
         </van-cell>
-        <van-cell center title="是否复制到全月" v-if="!formData.isDisabled">
+        <van-cell center title="是否复制到全月" v-if="!ifOrg() && !formData.isDisabled">
           <template #right-icon>
             <van-button size="mini" type="info" @click="copyMouth">点击复制</van-button>
           </template>
@@ -52,7 +52,7 @@
       </van-cell-group>
 
       <div class="button-box">
-        <van-button type="info" size="large" v-show="!formData.isDisabled" @click="onsubmit">提交</van-button>
+        <van-button type="info" size="large" v-show="!ifOrg() && !formData.isDisabled" @click="onsubmit">提交</van-button>
       </div>
     </div>
   </div>
@@ -64,10 +64,8 @@ import Calendar from '@/components/Calendar';
 import OrgTree from '@/components/orgTree';
 import HoursCell from '@/components/HoursCell';
 import {mapGetters} from "vuex";
-import {deptTreeList} from "@/api/public";
 import {editWorkTime} from "@/views/menu/workTime/api";
 import {timeCheck} from "@/utils/date"
-import {dataList} from "@/views/menu/educationStatistics/api";
 export default {
   components:{NavBar,Calendar,OrgTree,HoursCell},
   data(){
@@ -112,6 +110,9 @@ export default {
     ...mapGetters(['orgName','orgId']),
   },
   methods:{
+    ifOrg(){
+      return this.orgId != this.formData.orgId;
+    },
     //切换状态
     changeRadio(s){
       this.formData.isEnable = s;