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

public/static/pdf/web/viewer.css

@@ -462,7 +462,7 @@ html[dir='rtl'] #outerContainer.sidebarOpen > #sidebarContainer {
 html[dir='ltr'] #outerContainer.sidebarOpen > #mainContainer {
   -webkit-transition-property: left;
   transition-property: left;
-  left: 200px;
+  /*left: 200px;*/
 }
 html[dir='rtl'] #outerContainer.sidebarOpen > #mainContainer {
   -webkit-transition-property: right;

public/static/pdf/web/viewer.html

@@ -232,7 +232,7 @@ See https://github.com/adobe-type-tools/cmap-resources
 <!--    </div>-->
     <div id="outerContainer">
 
-      <div id="sidebarContainer">
+      <div id="sidebarContainer" style="display: none">
         <div id="toolbarSidebar">
           <div class="splitToolbarButton toggled">
             <button id="viewThumbnail" class="toolbarButton toggled" title="Show Thumbnails" tabindex="2" data-l10n-id="thumbs">

src/pages/phone/domesticStand.vue

@@ -28,7 +28,7 @@
          <div v-else class="title">{{item.standSort + '&nbsp&nbsp' + item.standNumber }}</div>
        </div>
        <div class="standContent">
-         <div class="standState">{{item.standName}}</div>
+         <div class="standState">{{item.standName && item.standName !== '' ? item.standName : item.standEnName}}</div>
 <!--         <div class="standSubTime">标准性质:-->
 <!--           <span v-if="natureMap[item.standNature] === '强制性' "-->
 <!--                 style="color: #F56C6C; padding-left: 5px;">-->

src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue

@@ -373,6 +373,8 @@
                 this.foldFormFlag = !this.foldFormFlag
             },
             getData () {
+              const queryId = this.$route.query.bpnId
+              if(queryId !== null && queryId !== undefined && queryId !==''){
                 queryTaskFirst({
                   bpnId: this.$route.query.bpnId
                 }).then(res => {
@@ -387,6 +389,7 @@
                   this.roleForm = mes.roleForm
                   this.commentText1 = mes.commentText1 || ''
                 })
+              }
             },
             checkedRole2 (data) {
                 var idList = ''
@@ -597,9 +600,11 @@
                                                 let taskId = {
                                                     id: this.$route.query.bpnId
                                                 }
+                                                if(taskId !=='' && taskId !== undefined && taskId !== null){
                                                   taskDel(taskId).then(res=>{
                                                     return res
                                                   })
+                                                }
                                                 this.$router.push('/processCenter')
                                             }
                                             this.isSubmit = false

src/pages/processCenter/pages/creatProcess/bzdy/step1.vue

@@ -589,9 +589,11 @@ export default {
                       let taskId = {
                         id: this.$route.query.bpnId
                       }
+                      if(taskId !== '' && taskId !== undefined && taskId !== null){
                         taskDel(taskId).then(res=>{
                           return res
                         })
+                      }
                       this.$router.push('/processCenter')
                     }
                     this.isSubmit = false

src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue

@@ -862,6 +862,8 @@
                 this.itermsConditionsTitle = row.replace(/''/g, '\'')
             },
             getData () {
+              const queryId =this.$route.query.bpnId
+              if(queryId !== null && queryId !== undefined && queryId !==''){
                 queryTaskFirst({
                   bpnId: this.$route.query.bpnId
                 }).then(res => {
@@ -878,6 +880,7 @@
                   this.itemList = mes.itemList
                   this.sarType = mes.sarType
                 })
+              }
             },
             setMap(data){
                 data.forEach(item => {
@@ -1136,9 +1139,11 @@
                                                     let taskId = {
                                                         id: this.$route.query.bpnId
                                                     }
+                                                  if(taskId !== '' && taskId !== undefined && taskId !== null){
                                                     taskDel(taskId).then(res=>{
                                                       return res
                                                     })
+                                                  }
                                                     this.$router.push('/processCenter')
                                                 }
                                             })

src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue

@@ -661,6 +661,8 @@ export default {
       window.open(routeUrl.href, '_blank')
     },
     getData() {
+      const queryId = this.$route.query.bpnId
+      if(queryId !== null && queryId !== undefined && queryId !==''){
         queryTaskFirst({
           bpnId: this.$route.query.bpnId
         }).then(res => {
@@ -685,6 +687,7 @@ export default {
             })
           }
         })
+      }
     },
     addZqyjList() {
       this.title = '国内外标准库'
@@ -860,9 +863,11 @@ export default {
                       let taskId = {
                         id: this.$route.query.bpnId
                       }
+                      if(taskId !== '' && taskId !== undefined && taskId !== null){
                         taskDel(taskId).then(res=>{
                           return res
                         })
+                      }
                       this.$router.push('/processCenter')
                     }
                   })

src/pages/processCenter/pages/creatProcess/qbrk/step1.vue

@@ -337,7 +337,10 @@
                     <div class="prc-content-border"  v-show="verifySarStandard">
                         <el-row :gutter="24">
                             <el-col :span="12">
-                                <el-form-item label="代替企标编号" prop="DTQBBHBUSS" class="add-form-item form-item-disabled">
+                                <el-form-item label="代替企标编号"
+                                    prop="DTQBBHBUSS"
+                                    :rules="form.reviseStatus === '1' ? rules.DTQBBHBUSSNot : rules.DTQBBHBUSS"
+                                    class="add-form-item form-item-disabled">
                                     <el-input :disabled="disabledXX"
                                             v-model="form.DTQBBHBUSS"
                                             placeholder="请输入代替标准号"
@@ -1543,6 +1546,7 @@
                     DTQBBHBUSS: [
                         { required: true, message: '请选择代替企标编号', trigger: 'change' }
                     ],
+                    DTQBBHBUSSNot: [],
                 },
                 zrUserIds: [], // 选择多个会签责任人
                 userType:'', // 选择用户ID判断