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

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

@@ -3,139 +3,151 @@
     <nav-bar></nav-bar>
     <div class="page-container">
       <!--   基本信息   -->
-      <div  v-if="taskInfo">
+      <div v-if="taskInfo">
         <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">
-              <span>
-                {{taskInfo.srcTaskName}}
-              </span>
+              <van-col :span="17">
+                <span>
+                  {{ taskInfo.srcTaskName }}
+                </span>
               </van-col>
             </van-row>
           </div>
           <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">
-                 <span v-if="taskInfo.reformStatus" :style="{color:getState(getDictLabel(taskInfo.reformStatus,'app_question_status'))}">
-                  {{getDictLabel(taskInfo.reformStatus,'app_question_status')}}
+                <van-col :span="17">
+                  <span
+                    v-if="taskInfo.overdueStatus"
+                    :style="{ color: getState(getDictLabel(taskInfo.overdueStatus, 'app_question_status')) }"
+                  >
+                    {{ getDictLabel(taskInfo.overdueStatus, 'app_question_status') }}
+                  </span>
+                  <span
+                    v-else-if="taskInfo.reformStatus"
+                    :style="{ color: getState(getDictLabel(taskInfo.reformStatus, 'app_question_status')) }"
+                  >
+                    {{ getDictLabel(taskInfo.reformStatus, 'app_question_status') }}
                   </span>
-                  <span v-else :style="{color:getState(getDictLabel(taskInfo.confirmStatus,'app_question_status'))}">
-                  {{getDictLabel(taskInfo.confirmStatus,'app_question_status')}}
+                  <span
+                    v-else
+                    :style="{ color: getState(getDictLabel(taskInfo.confirmStatus, 'app_question_status')) }"
+                  >
+                    {{ getDictLabel(taskInfo.confirmStatus, 'app_question_status') }}
                   </span>
                 </van-col>
               </van-row>
             </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">
-                <span>
-                  {{taskInfo.orgName}}
-                </span>
+                <van-col :span="17">
+                  <span>
+                    {{ taskInfo.orgName }}
+                  </span>
                 </van-col>
               </van-row>
             </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">
-                 <span>
-                  {{taskInfo.checkItem}}
-                </span>
+                <van-col :span="17">
+                  <span>
+                    {{ taskInfo.checkItem }}
+                  </span>
                 </van-col>
               </van-row>
             </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">
-                 <span>
-                  {{taskInfo.checkContent}}
-                </span>
+                <van-col :span="17">
+                  <span>
+                    {{ taskInfo.checkContent }}
+                  </span>
                 </van-col>
               </van-row>
             </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">
-                 <span>
-                  {{taskInfo.questionDesc}}
-                </span>
+                <van-col :span="17">
+                  <span>
+                    {{ taskInfo.questionDesc }}
+                  </span>
                 </van-col>
               </van-row>
             </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">
-                 <span>
-                  {{taskInfo.submitTime}}
-                </span>
+                <van-col :span="17">
+                  <span>
+                    {{ taskInfo.submitTime }}
+                  </span>
                 </van-col>
               </van-row>
             </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">
-                 <span>
-                  {{taskInfo.submitorName}}
-                </span>
+                <van-col :span="17">
+                  <span>
+                    {{ taskInfo.submitorName }}
+                  </span>
                 </van-col>
               </van-row>
             </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">
-                 <span>
-                  {{formatDate(taskInfo.reformDeadline,'YYYY-MM-DD')}}
-                </span>
+                <van-col :span="17">
+                  <span>
+                    {{ formatDate(taskInfo.reformDeadline, 'YYYY-MM-DD') }}
+                  </span>
                 </van-col>
               </van-row>
             </div>
 
             <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)">
+                <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 class="nfc-img" v-for="(v,i) in taskInfo.images" :key="v" @click="clickImage(taskInfo.images,i)">
-                    <img :src="imgUrl(v)" alt="" >
-                  </div> -->
                 </van-col>
               </van-row>
             </div>
@@ -143,30 +155,35 @@
         </div>
       </div>
 
-      <div  v-if="taskInfo.reform">
+      <div v-if="taskInfo.reform">
         <p class="info-title">整改情况</p>
-        <div class="card" >
+        <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">
-                <div  v-if="taskInfo.reform.images && taskInfo.reform.images.length > 0">
-                  <div class="nfc-img van-hairline--surround" v-for="(v,i) in taskInfo.reform.images" :key="v" @click="clickImage(taskInfo.reform.images,i)">
-                    <img :src="imgUrl(v)" alt="" >
+              <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"
+                    v-for="(v, i) in taskInfo.reform.images"
+                    :key="v"
+                    @click="clickImage(taskInfo.reform.images, i)"
+                  >
+                    <img :src="imgUrl(v)" alt="" />
                   </div>
                 </div>
               </van-col>
@@ -175,30 +192,29 @@
         </div>
       </div>
 
-      <div v-if="taskInfo.confirm" >
+      <div v-if="taskInfo.confirm">
         <p class="info-title">处理情况</p>
         <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>
+          <div class="mainItem" v-show="taskInfo.confirm.executeStatus === 1">
+            <van-row>
+              <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-row>
+              <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>
       </div>
 
@@ -207,14 +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">
+          <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>
@@ -223,7 +239,7 @@
       <div class="card edit-panel" v-if="type === 'confirm'">
         <van-panel title="确认">
           <div class="panel-box">
-            <van-radio-group  v-model="confirmData.status" required>
+            <van-radio-group v-model="confirmData.status" required>
               <van-cell-group>
                 <van-cell title="确认情况" clickable>
                   <template #right-icon>
@@ -248,9 +264,10 @@
               label="异议内容"
               type="textarea"
               show-word-limit
-              placeholder="请输入"/>
-            <div class="big-btn-box"  v-if="taskInfo.orgId == orgId && taskInfo.confirmStatus==0">
-              <van-button  type="info" size="large"  @click="onSubmit('确认')">提交</van-button>
+              placeholder="请输入"
+            />
+            <div class="big-btn-box" v-if="taskInfo.orgId == orgId && taskInfo.confirmStatus == 0">
+              <van-button type="info" size="large" @click="onSubmit('确认')">提交</van-button>
             </div>
           </div>
         </van-panel>
@@ -285,9 +302,10 @@
               :rules="[{ required: true, message: '请输入' }]"
               type="textarea"
               show-word-limit
-              placeholder="请输入"/>
-            <div class="big-btn-box" v-if="taskInfo.submitorId == id && taskInfo.confirmStatus==1">
-              <van-button  type="info" size="large"  @click="onSubmit('审核')">提交</van-button>
+              placeholder="请输入"
+            />
+            <div class="big-btn-box" v-if="taskInfo.submitorId == id && taskInfo.confirmStatus == 1">
+              <van-button type="info" size="large" @click="onSubmit('审核')">提交</van-button>
             </div>
           </div>
         </van-panel>
@@ -296,7 +314,15 @@
       <div class="card edit-panel" v-if="type === 'reform'">
         <van-panel title="整改情况">
           <div class="panel-box">
-            <date-cell required :min-date="dayjs(taskInfo.submitTime).toDate()" :max-date="maxDate" is-row title="整改日期" v-model="reformData.reformDate" dateType="date" />
+            <date-cell
+              required
+              :min-date="dayjs(taskInfo.submitTime).toDate()"
+              :max-date="maxDate"
+              is-row
+              title="整改日期"
+              v-model="reformData.reformDate"
+              dateType="date"
+            />
             <van-field
               required
               v-model="reformData.description"
@@ -306,199 +332,202 @@
               label="整改描述："
               type="textarea"
               show-word-limit
-              placeholder="请输入"/>
-            <div class="upload-box" >
-              <uploader :maxCount="5" v-model="reformData.images"/>
+              placeholder="请输入"
+            />
+            <div class="upload-box">
+              <uploader :maxCount="5" v-model="reformData.images" />
             </div>
-            <div class="big-btn-box" v-if="taskInfo.orgId==orgId && taskInfo.confirmStatus==2 && taskInfo.reformStatus!=11">
-              <van-button  type="info" size="large"  @click="onSubmit('整改')">提交</van-button>
+            <div
+              class="big-btn-box"
+              v-if="taskInfo.orgId == orgId && taskInfo.confirmStatus == 2 && taskInfo.reformStatus != 11"
+            >
+              <van-button type="info" size="large" @click="onSubmit('整改')">提交</van-button>
             </div>
           </div>
         </van-panel>
       </div>
-
-      </div>
+    </div>
   </div>
 </template>
 
 <script>
-import NavBar from '@/components/NavBar';
-import SelectCell from '@/components/selectCell';
-import DateCell from '@/components/dateCell';
-import Uploader from '@/components/upload/gxuploader.vue';
-import {taskDetails,confirm, confirmDissent, reform,} from "./api";
-import {formatDate} from "@/filters/filter";
-import { ImagePreview } from 'vant';
-import {mapGetters} from "vuex";
-import {imgUrl} from "@/utils";
-import dayjs from "dayjs";
+import NavBar from '@/components/NavBar'
+import SelectCell from '@/components/selectCell'
+import DateCell from '@/components/dateCell'
+import Uploader from '@/components/upload/gxuploader.vue'
+import { taskDetails, confirm, confirmDissent, reform } from './api'
+import { formatDate } from '@/filters/filter'
+import { ImagePreview } from 'vant'
+import { mapGetters } from 'vuex'
+import { imgUrl } from '@/utils'
+import dayjs from 'dayjs'
 export default {
-  components:{NavBar,SelectCell,DateCell,Uploader},
-  data(){
+  components: { NavBar, SelectCell, DateCell, Uploader },
+  data() {
     return {
-      maxDate:new Date(),
+      maxDate: new Date(),
       //基本信息
-      taskInfo:[],
-      formData:{},
+      taskInfo: [],
+      formData: {},
       //确认
       confirmData: {
         status: 0,
-        description: null,
+        description: null
       },
       //审核
       confirmDissentData: {
         status: 0,
-        description: null,
+        description: null
       },
       //整改
       reformData: {
         reformDate: null,
         description: null,
-        images: null,
+        images: null
       },
-      type:null,
-      preViewImages:{},
-      dicts:['resumption_status'],
+      type: null,
+      preViewImages: {},
+      dicts: ['resumption_status']
     }
   },
   mounted() {
-    console.log('系统信息：'+window.navigator.platform);
-    this.getData();
+    console.log('系统信息：' + window.navigator.platform)
+    this.getData()
   },
-  computed:{
-    ...mapGetters(['orgId','id','dictionary'])
+  computed: {
+    ...mapGetters(['orgId', 'id', 'dictionary'])
   },
-  methods:{
-    dayjs,formatDate,
-    getState(state){
-      switch (state){
+  methods: {
+    dayjs,
+    formatDate,
+    getState(state) {
+      switch (state) {
         case '待整改':
-          return '#008cd6';
+          return '#008cd6'
         case '已整改':
-          return '#009240';
+          return '#009240'
         case '已逾期':
-          return '#D7000F';
+          return '#D7000F'
       }
     },
     //图片预览
-    clickImage(arr,i){
-      this.preViewImages.images = arr.map(v=>imgUrl(v));
-      this.preViewImages.startPosition = i;
-      ImagePreview(this.preViewImages);
+    clickImage(arr, i) {
+      this.preViewImages.images = arr.map(v => imgUrl(v))
+      this.preViewImages.startPosition = i
+      ImagePreview(this.preViewImages)
     },
     //提交
-    onSubmit(type){
-      let data,queryMethod;
-      switch (type){
+    onSubmit(type) {
+      let data, queryMethod
+      switch (type) {
         case '确认':
-          data = this.confirmData;
-          queryMethod = confirm;
-          break;
+          data = this.confirmData
+          queryMethod = confirm
+          break
         case '审核':
-          data = this.confirmDissentData;
-          queryMethod = confirmDissent;
+          data = this.confirmDissentData
+          queryMethod = confirmDissent
           break
         case '整改':
-          data = this.reformData;
-          queryMethod = reform;
+          data = this.reformData
+          queryMethod = reform
       }
-      if(type === '确认' || type === '审核'){
-        if(data.status == 1 && !data.description) {
-          return this.$toast("请填写信息");
+      if (type === '确认' || type === '审核') {
+        if (data.status == 1 && !data.description) {
+          return this.$toast('请填写信息')
         }
-      }else {
-        if(!data.reformDate || !data.description){
-          return this.$toast("请填写完整信息");
+      } else {
+        if (!data.reformDate || !data.description) {
+          return this.$toast('请填写完整信息')
         }
-        if(data.images){
-          let img = data.images.map(v=>{return v.imgPath});
-          data.images = img.toString();
+        if (data.images) {
+          let img = data.images.map(v => {
+            return v.imgPath
+          })
+          data.images = img.toString()
         }
       }
-      data.id = this.taskInfo.id;
-      queryMethod(data).then((r) => {
-        this.$toast("提交成功");
+      data.id = this.taskInfo.id
+      queryMethod(data).then(r => {
+        this.$toast('提交成功')
         this.$router.replace({
-          name:'problemItem',
-          path:'/problemItem',
-          params:{event:'refresh'}
-        });
-      });
+          name: 'problemItem',
+          path: '/problemItem',
+          params: { event: 'refresh' }
+        })
+      })
     },
 
     //初始化数据
     getData() {
-      let id = this.$route.query.id;
-      this.type = this.$route.query.type;
-      taskDetails(id).then(res=>{
-        this.taskInfo = res.data;
-        this.taskInfo.confirm = res.data.flows.find((d) => d.executeStep === 1);
-        this.taskInfo.confirmDissent = res.data.flows.find((d) => d.executeStep === 2);
-        this.taskInfo.reform = res.data.flows.find((d) => d.executeStep === 11);
-        if(this.taskInfo.reform && this.taskInfo.reform.images)     {
-          this.taskInfo.reform.images=this.taskInfo.reform.images.split(",")
+      let id = this.$route.query.id
+      this.type = this.$route.query.type
+      taskDetails(id).then(res => {
+        this.taskInfo = res.data
+        this.taskInfo.confirm = res.data.flows.find(d => d.executeStep === 1)
+        this.taskInfo.confirmDissent = res.data.flows.find(d => d.executeStep === 2)
+        this.taskInfo.reform = res.data.flows.find(d => d.executeStep === 11)
+        if (this.taskInfo.reform && this.taskInfo.reform.images) {
+          this.taskInfo.reform.images = this.taskInfo.reform.images.split(',')
         }
       })
     },
 
     //返回
-    goBack(){
-      this.$router.go(-1);
-      this.clearData();
+    goBack() {
+      this.$router.go(-1)
+      this.clearData()
     },
 
     //清空数据
-    clearData(){
-      this.taskInfo= [];
+    clearData() {
+      this.taskInfo = []
       //确认
       this.confirmData = {
         status: 0,
-        description: null,
+        description: null
       }
       //审核
       this.confirmDissentData = {
         status: 0,
-        description: null,
+        description: null
       }
       //整改
       this.reformData = {
         reformDate: null,
         description: null,
-        images: null,
+        images: null
       }
-    },
+    }
   }
 }
 </script>
 
 <style lang="scss">
-.question-edit{
-  .panel-box{
-
+.question-edit {
+  .panel-box {
   }
 }
-
 </style>
 <style lang="scss" scoped>
-
-.question-edit{
+.question-edit {
   height: 100%;
   overflow: hidden;
 }
-.page-container{
+.page-container {
   height: calc(100vh - 194px);
   overflow: auto;
   padding: 20px;
 }
-.flex-box{
+.flex-box {
   display: flex;
   justify-content: space-between;
   align-items: center;
-  >span{
+  > span {
     margin: 0 20px;
   }
 }
-.info-title{
+.info-title {
   height: 100px;
   line-height: 120px;
 }
@@ -510,21 +539,20 @@ export default {
   justify-content: end;
 }
 
-
 .van-row {
   background-color: #f0f0f0;
   display: flex;
   align-items: center;
-  .van-col--8 {
+  .van-col--7 {
     min-height: 100px;
     display: flex;
     justify-content: center;
     align-items: center;
     padding: 10px;
-    background-color: rgb(230, 230, 230,0.4);
+    background-color: rgb(230, 230, 230, 0.4);
     opacity: 1;
   }
-  .van-col{
+  .van-col {
     text-align: justify;
     white-space: pre-wrap;
   }
@@ -533,80 +561,80 @@ 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;
   }
   .tagCls {
     margin-top: 10px;
   }
-  .bgc{
+  .bgc {
     background-color: #fff;
     padding: 10px;
   }
 }
 
-.edit-panel{
+.edit-panel {
   margin-top: 20px;
 }
 
-.card{
+.card {
   margin-bottom: 20px;
   box-shadow: 0 10px 10px #eaeaea;
 }
-.card:last-child{
+.card:last-child {
   margin-bottom: 0;
 }
-.panel-box{
-  padding:0 20px;
+.panel-box {
+  padding: 0 20px;
 }
-.panel-box-item{
+.panel-box-item {
   height: 36px;
   line-height: 36px;
 }
-.item-label{
+.item-label {
   width: 100%;
   display: flex;
   justify-content: right;
   align-items: center;
 }
-.item-value{
+.item-value {
   width: 100%;
   display: flex;
   justify-content: left;
   align-items: center;
 }
-.upload-box{
+.upload-box {
   padding: 20px 30px;
 }
-.nfc-img{
+.nfc-img {
   display: inline-block;
   width: 140px;
   height: 140px;
   margin: 10px;
   position: relative;
-  &:first-child{
-    margin-left: 0;
-  }
-  >img{
+  //&:first-child{
+  //  margin-left: 0;
+  //}
+  > img {
     width: 100%;
     height: 100%;
     border: none;
   }
-  >span{
+  > span {
     position: absolute;
     padding: 0 10px;
     bottom: 0;
     left: 0;
     display: block;
     width: 100%;
-    background-color: rgba(0,0,0,.2 );
+    background-color: rgba(0, 0, 0, 0.2);
     color: #eaeaea;
     font-size: 20px;
     overflow: hidden;
@@ -616,7 +644,7 @@ export default {
     height: 30px;
   }
 }
-.big-btn-box{
+.big-btn-box {
   padding-bottom: 20px;
 }
 </style>

src/views/menu/problemItem/index.vue

@@ -67,7 +67,10 @@
                 <template #default>
                   <div class="info-box">
                     <div class="info-desc">问题状态:
-                      <span v-if="v.reformStatus" :style="{color:getState(getDictLabel(v.reformStatus,'app_question_status'))}">
+                      <span v-if="v.overdueStatus" :style="{color:getState(getDictLabel(v.overdueStatus,'app_question_status'))}">
+                        {{getDictLabel(v.overdueStatus,'app_question_status')}}
+                      </span>
+                      <span v-else-if="v.reformStatus" :style="{color:getState(getDictLabel(v.reformStatus,'app_question_status'))}">
                         {{getDictLabel(v.reformStatus,'app_question_status')}}
                       </span>
                       <span v-else :style="{color:getState(getDictLabel(v.confirmStatus,'app_question_status'))}">

src/views/menu/protection/components/item.vue

@@ -66,7 +66,7 @@ export default {
           api.updateStatus(data.id, status).then(r => {
             if (r.data) {
               data.status = status
-              data.statusUpdateTime = dayjs(r.data).format('YYYY-MM-DD HH:MM:ss')
+              data.statusUpdateTime = dayjs(r.data).format('YYYY-MM-DD HH:mm')
             }
           })
         })

src/views/menu/safetyBook/detail.vue

@@ -6,7 +6,7 @@
         <van-cell-group>
           <van-cell class="item-cell" title="签署层级" :value="getDictLabel(dataInfo.signLevel,'sign_level')" ></van-cell>
           <van-cell class="item-cell" title="责任书类型" :value="getDictLabel(dataInfo.type,'safety_book_type')" ></van-cell>
-          <van-cell class="item-cell" title="所属年度" :value="`${dataInfo.year}年`" ></van-cell>
+          <van-cell class="item-cell" title="所属年份" :value="`${dataInfo.year}年`" ></van-cell>
           <van-cell class="item-cell" title="甲方姓名" :value="dataInfo.partyA" ></van-cell>
           <van-cell class="item-cell" title="甲方机构" :value="dataInfo.partyAOrgName"></van-cell>
           <van-cell class="item-cell" title="乙方姓名" :value="dataInfo.partyB" ></van-cell>

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
@@ -15,12 +15,14 @@
           <card class="list-item" v-else v-for="(v,i) in dataList" :key="i">
             <p class="item-title">{{getDictLabel(v.type,'safety_book_type')}}</p>
             <div :title="v.orgName" @click="clickItem(v)">
-              <van-cell class="item-cell" title="签署机构" :value="v.partyAOrgName" >
-              </van-cell>
+              <van-cell class="item-cell" title="甲方姓名" :value="v.partyA" ></van-cell>
+              <van-cell class="item-cell" title="甲方机构" :value="v.partyAOrgName"></van-cell>
+              <van-cell class="item-cell" title="乙方姓名" :value="v.partyB" ></van-cell>
+              <van-cell class="item-cell" title="乙方机构" :value="v.partyBOrgName" ></van-cell>
               <van-cell class="item-cell" title="所属年份" :value="`${v.year} 年`" >
               </van-cell>
-              <van-cell class="item-cell" title="添加时间" :value="dayjs(v.createTime).format('YYYY-MM-DD HH:mm')">
-              </van-cell>
+<!--              <van-cell class="item-cell" title="添加时间" :value="dayjs(v.createTime).format('YYYY-MM-DD HH:mm')">-->
+<!--              </van-cell>-->
             </div>
           </card>
         </Scroll>
@@ -51,7 +53,7 @@ export default {
     return {
       pullup:true,
       query:{
-        orgId:null,
+        partyBOrg:null,
         pageNum:1,
         pageSize:10,
       },
@@ -64,7 +66,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;