Merge branch 'fix_foton_20240619' into 'master'

Fix foton 20240619

See merge request laws-foton-slrs/foton-laws-system-front!210

src/pages/policyRegulation/policy/components/mainTable.vue

@@ -616,7 +616,8 @@ export default {
         }, e => {})
     },
     convert (value, dict) {
-      if (this.dict[dict]) {
+      if (this.dict[dict]&& value) {
+        console.log(value);
         return value.split(',').map(v => this.dict[dict].find(item => item.value === v)?.label || v).join(',')
         // return this.dict[dict].find(item => item.value === value)?.label || value
       } else {

src/pages/policyRegulation/policy/components/policyTable.vue

@@ -102,6 +102,7 @@ export default {
   data () {
     const lawsStandInfoSearch = {
       page:1,
+      lawsTextState:'',
       pageSize: this.$store.getters.userInfo.configContent,
     }
     return {

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue

@@ -15,7 +15,7 @@
           <el-col :span="12">
             <el-form-item label="选择合并标准1" prop="orgName" class="add-form-item form-item-disabled">
               <el-button
-                :disabled="disabledXX"
+                :disabled="disabledXX||disabled"
                 size="mini"
                 type="primary"
                 style="margin-left: 10px;"
@@ -28,7 +28,7 @@
             <el-form-item label="企标名称" prop="esName1" class="add-form-item form-item-disabled">
               <el-input
                 v-model="qbfsForm.esName1"
-                :disabled="disabledXX"
+                :disabled="disabledXX||disabled"
                 readonly
                 placeholder="请输入企标名称"
                 clearable
@@ -37,7 +37,7 @@
             <el-form-item label="制修订类型" prop="reviseStatus1" class="add-form-item form-item-disabled">
               <el-input
                 v-model="qbfsForm.reviseStatus1"
-                :disabled="disabledXX"
+                :disabled="disabledXX||disabled"
                 readonly
                 placeholder="请输入制修订类型"
                 clearable
@@ -47,7 +47,7 @@
           <el-col :span="12">
             <el-form-item label="选择合并标准2" prop="orgName" class="add-form-item form-item-disabled">
               <el-button
-                :disabled="disabledXX"
+                :disabled="disabledXX||disabled"
                 size="mini"
                 type="primary"
                 style="margin-left: 10px;"
@@ -59,7 +59,7 @@
             <el-form-item label="企标名称" prop="esName2" class="add-form-item form-item-disabled">
               <el-input
                 v-model="qbfsForm.esName2"
-                :disabled="disabledXX"
+                :disabled="disabledXX||disabled"
                 readonly
                 placeholder="请输入企标名称"
                 clearable
@@ -68,7 +68,7 @@
             <el-form-item label="制修订类型" prop="reviseStatus2" class="add-form-item form-item-disabled">
               <el-input
                 v-model="qbfsForm.reviseStatus2"
-                :disabled="disabledXX"
+                :disabled="disabledXX||disabled"
                 readonly
                 placeholder="请输入制修订类型"
                 clearable
@@ -84,14 +84,14 @@
             <el-form-item v-if="false" label="" prop="type" class="add-form-item form-item-disabled">
               <el-input
                 v-model="qbfsForm.type"
-                :disabled="disabledXX"
+                :disabled="disabledXX||disabled"
                 clearable
               />
             </el-form-item>
             <el-form-item prop="bussSort" label="企标类别" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
               <el-select
                 v-model="qbfsForm.bussSort"
-                :disabled="disabledXX"
+                :disabled="disabledXX||disabled"
                 filterable
                 placeholder="请选择企标类别"
                 style="width: 100%;"
@@ -107,13 +107,13 @@
             <el-form-item label="企标名称" prop="esName" class="add-form-item form-item-disabled">
               <el-input
                 v-model="qbfsForm.esName"
-                :disabled="disabledXX"
+                :disabled="disabledXX||disabled"
                 placeholder="请输入企标名称"
                 clearable
               />
             </el-form-item>
             <el-form-item prop="reviseStatus" label="制修订类型" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
-              <el-select v-model="qbfsForm.reviseStatus" :disabled="disabledXX" placeholder="请选择制修订类型">
+              <el-select v-model="qbfsForm.reviseStatus" :disabled="disabledXX||disabled" placeholder="请选择制修订类型">
                 <el-option label="制定" value="制定" />
                 <el-option label="修订" value="修订" />
               </el-select>
@@ -127,12 +127,12 @@
             >
               <el-input
                 v-model="qbfsForm.rqbJson"
-                :disabled="disabledXX"
+                :disabled="disabledXX||disabled"
                 style="display: none;"
               />
               <el-input
                 v-model="qbfsForm.rqbName"
-                :disabled="disabledXX"
+                :disabled="disabledXX||disabled"
                 clearable
                 placeholder="请选择代替企标编号"
                 readonly
@@ -147,7 +147,7 @@
             >
               <el-select
                 v-model="qbfsForm.area"
-                :disabled="disabledXX"
+                :disabled="disabledXX||disabled"
                 multiple
                 filterable
                 placeholder="请选择适用车型"
@@ -162,10 +162,10 @@
               </el-select>
             </el-form-item>
             <el-form-item label="评审责任人" prop="resPersonName" class="add-form-item form-item-disabled">
-              <el-input v-model="qbfsForm.resPerson" :disabled="disabledXX" style="display: none;" />
+              <el-input v-model="qbfsForm.resPerson" :disabled="disabledXX||disabled" style="display: none;" />
               <el-input
                 v-model="qbfsForm.resPersonName"
-                :disabled="disabledXX"
+                :disabled="disabledXX||disabled"
                 placeholder="请选择评审责任人"
                 @click.native="choiceZRRS('2')"
               />
@@ -173,7 +173,7 @@
             <el-form-item label="初稿完成时间" prop="draftTime" class="add-form-item form-item-disabled">
               <el-date-picker
                 v-model="qbfsForm.draftTime"
-                :disabled="disabledXX"
+                :disabled="disabledXX||disabled"
                 type="date"
                 value-format="yyyy-MM-dd"
                 placeholder="请选择初稿完成时间"
@@ -187,7 +187,7 @@
                 :placeholderText="'包括已有、应有的关联标准，如企业标准、行业标准、国家标准'"
                 :config="{attrName: '引用标准'}"
                 :labelWidth="'150px'"
-                :disabled="disabledXX"
+                :disabled="disabledXX||disabled"
               />
             </template>
             <el-form-item
@@ -199,7 +199,7 @@
             >
               <el-select
                 v-model="qbfsForm.useLevel"
-                :disabled="disabledXX"
+                :disabled="disabledXX||disabled"
                 filterable
                 placeholder="请选择采标程度"
                 style="width: 100%;"
@@ -221,7 +221,7 @@
             >
               <el-input
                 v-model="qbfsForm.technologic"
-                :disabled="disabledXX"
+                :disabled="disabledXX||disabled"
                 type="textarea"
                 placeholder="请输入指标依据"
                 :maxlength="500"
@@ -230,19 +230,19 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="起草人" prop="drafterName" class="add-form-item form-item-disabled">
-              <el-input v-model="qbfsForm.drafter" :disabled="disabledXX" style="display: none;" />
+              <el-input v-model="qbfsForm.drafter" :disabled="disabledXX||disabled" style="display: none;" />
               <el-input
                 v-model="qbfsForm.drafterName"
-                :disabled="disabledXX"
+                :disabled="disabledXX||disabled"
                 placeholder="请选择起草人"
                 @click.native="choiceZRRS('1')"
               />
             </el-form-item>
             <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px" prop="unitName" class="add-form-item form-item-disabled">
-              <el-input v-model="qbfsForm.unit" :disabled="disabledXX" style="display: none;" />
+              <el-input v-model="qbfsForm.unit" :disabled="disabledXX||disabled" style="display: none;" />
               <el-input
                 v-model="qbfsForm.unitName"
-                :disabled="disabledXX"
+                :disabled="disabledXX||disabled"
                 placeholder="请选择起草责任单位"
                 @click.native="choiceZRBM('unit', '选择起草责任单位', qbfsForm.unit)"
               />
@@ -253,10 +253,10 @@
                   <span>技术委员会评审负责人</span>
                 </el-tooltip>
               </template>
-              <el-input v-model="qbfsForm.wgLeader" :disabled="disabledXX" style="display: none;" />
+              <el-input v-model="qbfsForm.wgLeader" :disabled="disabledXX||disabled" style="display: none;" />
               <el-input
                 v-model="qbfsForm.wgLeaderName"
-                :disabled="disabledXX"
+                :disabled="disabledXX||disabled"
                 placeholder="请选择技术委员会评审负责人"
                 @click.native="workGroupUnfold('workLeader', '选择技术委员会评审负责人', qbfsForm.wgLeader)"
               />
@@ -264,7 +264,7 @@
             <el-form-item label="标准发布时间" prop="releaseTime" class="add-form-item form-item-disabled">
               <el-date-picker
                 v-model="qbfsForm.releaseTime"
-                :disabled="disabledXX"
+                :disabled="disabledXX||disabled"
                 type="date"
                 value-format="yyyy-MM-dd"
                 placeholder="请选择标准发布时间"
@@ -273,12 +273,12 @@
             <el-form-item prop="tsJson" label="标准体系" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
               <el-input
                 v-model="qbfsForm.tsJson"
-                :disabled="disabledXX"
+                :disabled="disabledXX||disabled"
                 style="display: none;"
               />
               <el-input
                 v-model="qbfsForm.tsJsonName"
-                :disabled="disabledXX"
+                :disabled="disabledXX||disabled"
                 clearable
                 placeholder="请选择标准体系"
                 readonly
@@ -291,7 +291,7 @@
               style="width: 100%; margin-right:10px"
               class="add-form-item form-item-disabled"
             >
-              <el-select v-model="qbfsForm.isRelate" :disabled="disabledXX" placeholder="请选择采用国内外标准情况">
+              <el-select v-model="qbfsForm.isRelate" :disabled="disabledXX||disabled" placeholder="请选择采用国内外标准情况">
                 <el-option label="是" value="是" />
                 <el-option label="否" value="否" />
               </el-select>
@@ -302,13 +302,13 @@
                 class="classDisplay"
                 :config="{attrName: '采用标准'}"
                 :labelWidth="'180px'"
-                :disabled="disabledXX"
+                :disabled="disabledXX||disabled"
               />
             </template>
             <el-form-item label="合并原因" prop="mergeReason" class="add-form-item form-item-disabled">
               <el-input
                 v-model="qbfsForm.mergeReason"
-                :disabled="disabledXX"
+                :disabled="disabledXX||disabled"
                 type="textarea"
                 placeholder="请输入合并原因"
                 clearable
@@ -778,7 +778,14 @@ export default {
     CustomInputForAllStandards,
     CustomInputForAllStandards2
   },
-  props: [ 'message' ],
+  props: {
+    message:{
+
+    },
+    disabled:{
+      default:false
+    }
+  },
   data () {
     return {
       disabledXX: !!this.$route.query.disabledXX,

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue

@@ -13,10 +13,11 @@
     </div>
     <div class="content" v-show="active === '1'">
       <div style="flex: auto; overflow: auto">
-        <process-title>
+        <process-title  v-if="type!=1">
           <template slot="title">基础信息</template>
         </process-title>
-        <el-form :model="qbfsForm" class="label-input-form prc-content-border"
+        <merge  v-if="type==1" :message="qbfsForm" :disabled="true" ></merge>
+        <el-form  v-else :model="qbfsForm" class="label-input-form prc-content-border"
                  label-width="150px">
           <el-form-item prop="bussSort" label="企标类别" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
             <el-input
@@ -339,11 +340,12 @@ import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
 import { changeAssigneeNew, inboundLiaisonDetail, saveTaskFirst } from "api/process";
-
+import merge from 'process/creatProcess/qbzxdjhgk/component/merge';
 
 export default {
   name: "qbzxdjhgkStep1-5",
   components:{
+    merge,
     ProcessHeader,
     ProcessFooter,
     ProcessTitle

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue

@@ -12,11 +12,17 @@
       <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
     </div>
     <div v-show="active === '1'" class="content">
+      <!-- <div>
+         <ReceiptDescription v-model="commentText" title="审批意见" />
+      </div> -->
+
       <div style="flex: auto; overflow: auto">
-        <process-title>
+        <process-title  v-if="type!=1">
           <template slot="title">基础信息</template>
         </process-title>
-        <el-form
+        <merge  v-if="type==1" :message="qbfsForm" :disabled="true" ></merge>
+
+        <el-form v-else
           :model="qbfsForm"
           class="label-input-form prc-content-border"
           label-width="150px"
@@ -313,21 +319,7 @@
         </el-form>
         <ReceiptDescription v-model="commentText" title="审批意见" />
       </div>
-      <!--<div>-->
+    
-      <!--  <el-collapse accordion>-->
-      <!--    <el-collapse-item title="审批意见">-->
-      <!--      <div style="margin: 10px 0;">-->
-      <!--        <el-input-->
-      <!--          type="textarea"-->
-      <!--          :rows="3"-->
-      <!--          resize="none"-->
-      <!--          placeholder="请输入意见"-->
-      <!--          v-model="commentText">-->
-      <!--        </el-input>-->
-      <!--      </div>-->
-      <!--    </el-collapse-item>-->
-      <!--  </el-collapse>-->
-      <!--</div>-->
     </div>
     <div v-show="active === '3'" class="content">
       <div class="flow-list" style="height: 100%">
@@ -432,10 +424,12 @@ import ProcessFooter from '../../components/ProcessFooter';
 import ProcessTitle from '../../components/ProcessTitle';
 import ReceiptDescription from '@/components/hzwlComponents/ReceiptDescription'
 import { changeAssigneeNew, inboundLiaisonDetail, saveTaskFirst } from 'api/process';
+import merge from 'process/creatProcess/qbzxdjhgk/component/merge';
 
 export default {
   name: 'QbzxdjhgkStep2',
   components: {
+    merge,
     ReceiptDescription,
     ProcessHeader,
     ProcessFooter,
@@ -770,4 +764,7 @@ export default {
     margin-top: 10px;
   }
 }
+.merge {
+  height: initial;
+}
 </style>

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue

@@ -13,10 +13,11 @@
     </div>
     <div v-show="active === '1'" class="content">
       <div style="flex: auto; overflow: auto">
-        <process-title>
+        <process-title  v-if="type!=1">
           <template slot="title">基础信息</template>
         </process-title>
-        <el-form
+        <merge  v-if="type==1" :message="qbfsForm" :disabled="true" ></merge>
+        <el-form v-else
           :model="qbfsForm"
           class="label-input-form prc-content-border"
           label-width="150px"
@@ -428,10 +429,12 @@ import ProcessFooter from '../../components/ProcessFooter';
 import ProcessTitle from '../../components/ProcessTitle';
 import ReceiptDescription from '@/components/hzwlComponents/ReceiptDescription'
 import { changeAssigneeNew, inboundLiaisonDetail, saveTaskFirst } from 'api/process';
+import merge from 'process/creatProcess/qbzxdjhgk/component/merge';
 
 export default {
   name: 'QbzxdjhgkStep3',
   components: {
+    merge,
     ReceiptDescription,
     ProcessHeader,
     ProcessFooter,
@@ -765,4 +768,7 @@ export default {
     margin-top: 10px;
   }
 }
+.merge {
+  height: initial;
+}
 </style>

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue

@@ -13,10 +13,11 @@
     </div>
     <div v-show="active === '1'" class="content">
       <div style="flex: auto; overflow: auto">
-        <process-title>
+        <process-title  v-if="type!=1">
           <template slot="title">基础信息</template>
         </process-title>
-        <el-form
+        <merge  v-if="type==1" :message="qbfsForm" :disabled="true" ></merge>
+        <el-form v-else
           :model="qbfsForm"
           class="label-input-form prc-content-border"
           label-width="150px"
@@ -430,10 +431,12 @@ import ProcessFooter from '../../components/ProcessFooter';
 import ProcessTitle from '../../components/ProcessTitle';
 import ReceiptDescription from '@/components/hzwlComponents/ReceiptDescription'
 import { changeAssigneeNew, inboundLiaisonDetail, saveTaskFirst } from 'api/process';
+import merge from 'process/creatProcess/qbzxdjhgk/component/merge';
 
 export default {
   name: 'QbzxdjhgkStep4',
   components: {
+    merge,
     ReceiptDescription,
     ProcessHeader,
     ProcessFooter,
@@ -768,4 +771,7 @@ export default {
     margin-top: 10px;
   }
 }
+.merge {
+  height: initial;
+}
 </style>

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue

@@ -13,10 +13,11 @@
     </div>
     <div v-show="active === '1'" class="content">
       <div style="flex: auto; overflow: auto">
-        <process-title>
+        <process-title v-if="type!=1" >
           <template slot="title">基础信息</template>
         </process-title>
-        <el-form
+        <merge  v-if="type==1" :message="qbfsForm" :disabled="true" ></merge>
+        <el-form v-else
           :model="qbfsForm"
           class="label-input-form prc-content-border"
           label-width="150px"
@@ -430,10 +431,12 @@ import ProcessFooter from '../../components/ProcessFooter';
 import ProcessTitle from '../../components/ProcessTitle';
 import ReceiptDescription from '@/components/hzwlComponents/ReceiptDescription'
 import { changeAssigneeNew, inboundLiaisonDetail, saveTaskFirst } from 'api/process';
+import merge from 'process/creatProcess/qbzxdjhgk/component/merge';
 
 export default {
   name: 'QbzxdjhgkStep5',
   components: {
+    merge,
     ReceiptDescription,
     ProcessHeader,
     ProcessFooter,
@@ -833,4 +836,7 @@ export default {
     margin-top: 10px;
   }
 }
+.merge {
+  height: initial;
+}
 </style>