Merge remote-tracking branch 'origin/develop' into FOTON

public/index.html

@@ -33,6 +33,12 @@
       .p1Class {color: #fff;font-size: 25px;}
       .inner-header {height:65vh;width:100%;margin:0;padding:0;}
       .flex {display:flex;flex-direction:column;justify-content:center;align-items:center;text-align:center;}
+      .el-message{
+          position: absolute!important;
+          top: 40%!important;
+          left: 50%!important;
+          transform: translate(-50%,-50%)!important;
+      }
     </style>
     <!--     vconsole调试工具-->
 <!--    <script src="https://cdn.bootcss.com/vConsole/3.3.4/vconsole.min.js"></script>-->

src/common/index.js

@@ -6,6 +6,7 @@ import base64 from './base64'
 import dateFormat from './date'
 import hasPermission from './hasPermission'
 import preview from './preview'
+import previewZl from './previewZL'
 import onlineEdit from './onlineEdit'
 import onlinePreview from './onlinePreview'
 import onlineEditPreview from './onlineEditPreview'
@@ -42,6 +43,11 @@ const install = function (Vue) {
         return preview
       }
     },
+    $previewZl: {
+      get () {
+        return previewZl
+      }
+    },
     $onlinePreview: {
       get () {
         return onlinePreview

src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue

@@ -77,9 +77,10 @@
                   clearable
           ></el-input>
         </el-form-item>
-        <el-form-item v-show="form.reviseStatus === '1'" label="企标顺序号" prop="standNum" class="add-form-item form-item-disabled">
+        <el-form-item v-show="form.reviseStatus === '1'" label="企标顺序号" :prop="form.reviseStatus === '1'?standNum : ''" class="add-form-item form-item-disabled">
             <el-input
                     v-model="form.standNum"
+                    :maxLength="100"
                     placeholder="请输入企标顺序号"
                     clearable
             ></el-input>

src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue

@@ -300,7 +300,7 @@
     <ProcessTitle v-show="opinionsShow">
         <template slot="title">意见信息</template>
     </ProcessTitle>
-  <div class="effect" style="margin-bottom: 8px">
+  <div class="effect" style="margin-bottom: 8px" v-show="opinionsShow">
     <el-button type="primary" class="common-button-primary" size="mini"  @click="exportAll">导出</el-button>
   </div>
     <div class="prc-content-border" v-show="opinionsShow">

src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue

@@ -5453,9 +5453,8 @@ export default {
           let date = new Date(this.$moment(this.sarBussionessStandEO.issueTime).format('YYYY-MM-DD'))
           // const FSRQBUSS = date.getFullYear()+ 5 + '-' + date.getMonth() + '-' + date.getDate()
           // this.sarBussionessStandEO["FSRQBUSS"] = FSRQBUSS
-
+          let year = date.getMonth() == 0 ? date.getFullYear() + 4 : date.getFullYear() + 5;
-          let year = date.getFullYear() + 5;
+          let month = (date.getMonth()).toString() == 0 ? '12' : (date.getMonth()).toString();
-          let month = (date.getMonth()).toString();
           let day = (date.getDate()).toString();
           if (month.length == 1) {
             month = "0" + month;