Merge branch 'develop' into FOTON

# Conflicts:
#	src/pages/processCenter/pages/newProcess/index.vue

src/components/CustomFormComponents/Input.vue

@@ -12,6 +12,9 @@
         :value="value"
         :placeholder="placeholder"
         :disabled="disabled"
+        type="textarea"
+        resize="none"
+        :autosize="true"
         clearable
         @input="handleChange"
       ></el-input>
@@ -63,6 +66,15 @@ export default {
 }
 </script>
 
-<style scoped>
+<style lang="less"  scoped>
-
+.add-form-item{
+  /deep/.el-form-item__content{
+    .el-textarea{
+      width: calc(~'100% - 90px');
+    }
+  }
+}
+/deep/.el-dialog__body{
+  padding: 15px 20px;
+}
 </style>

src/components/CustomFormComponents/InputForStandardsForEnterprise.vue

@@ -9,6 +9,9 @@
         :class="{'form-item-disabled': disabled}"
     >
       <el-input
+          type="textarea"
+          resize="none"
+          :autosize="true"
           :value="value"
           :placeholder="placeholder"
           :disabled="disabled"
@@ -22,7 +25,8 @@
           style="position:absolute;top: 10px;right: 0;"
           @click="selectLaws"
           v-if="(processModel && !disabled) || !processModel"
-      >手动查找</el-button>
+      >手动查找
+      </el-button>
     </el-form-item>
     <el-dialog
         :title="config.attrName"
@@ -34,7 +38,8 @@
     >
       <div class="search-area">
         <div class="left">
-          <el-form :modal="replaceLawsNumForm" :inline="true" class="label-input-form" @keyup.enter.native="getReplaceLawsNumRowSearch">
+          <el-form :modal="replaceLawsNumForm" :inline="true" class="label-input-form"
+                   @keyup.enter.native="getReplaceLawsNumRowSearch">
             <!--            <el-form-item label="数据来源" class="search-item">-->
             <!--              <el-select v-model="replaceLawsNumForm.dataSource" filterable>-->
             <!--                <el-option-->
@@ -100,12 +105,19 @@
             min-width="130">
           <template slot-scope="scope">
             <span v-if="dataSource === 'BUSINESS'">
-              <a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standCode }}-{{ scope.row.standYear }}</a>
+              <a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{
+                  scope.row.standCode
+                }}-{{ scope.row.standYear }}</a>
               <a v-else class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standCode }}</a>
             </span>
             <span v-else>
-              <a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
+              <a v-if="scope.row.standYear" class="table-jump"
-              <a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}</a>
+                 @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
+                  scope.row.standNumber
+                }}-{{ scope.row.standYear }}</a>
+              <a v-else @click="handlePreview(scope.row)" class="table-jump">{{
+                  scope.row.standSortShow
+                }} {{ scope.row.standNumber }}</a>
             </span>
           </template>
         </el-table-column>
@@ -139,8 +151,11 @@
           @pageChange="pageChangeReplace"
           @pageSizeChange="pageSizeChangeReplace"></pagination>
       <div slot="footer" class="demo-drawer-footer">
-        <el-button class="common-button-default" round icon="el-icon-close" @click="replaceLawsNumModel = false">取消</el-button>
+        <el-button class="common-button-default" round icon="el-icon-close" @click="replaceLawsNumModel = false">取消
-        <el-button type="primary" round class="common-button-primary" icon="el-icon-check" @click="replaceLawsNumModelBt">提交</el-button>
+        </el-button>
+        <el-button type="primary" round class="common-button-primary" icon="el-icon-check"
+                   @click="replaceLawsNumModelBt">提交
+        </el-button>
       </div>
     </el-dialog>
 
@@ -390,9 +405,19 @@ export default {
 /deep/ .el-dialog__body {
   padding: 0 20px 0;
 }
+
 /deep/ .el-dialog__footer {
   padding: 0 20px 20px;
 }
+
+.add-form-item {
+  /deep/ .el-form-item__content {
+    .el-textarea {
+      width: calc(~'100% - 90px');
+    }
+  }
+}
+
 /deep/ .input-width input.el-input__inner {
   width: 220px;
 }

src/pages/config/pages/dynamicInformationManage/dynamicInfomationDetails/index.vue

@@ -185,7 +185,7 @@ export default {
       pubOrgName: '',
       content: '',
       linkUri: '',
-      uploadPath: 'uploadPath',
+      uploadPath: 'file',
       resPk: '',
       fileList: [],
       picList: [],

src/pages/config/pages/dynamicInformationManage/dynamicInfomationDetails/index2.vue

@@ -174,7 +174,7 @@ export default {
       pubOrgName: '',
       content: '',
       linkUri: '',
-      uploadPath: 'uploadPath',
+      uploadPath: 'file',
       resPk: '',
       fileList: [],
       picList: [],

src/pages/details/otherStandardDetails/index.vue

@@ -3688,6 +3688,7 @@ export default {
               //报批稿撑开
               //top: 10px;
               right: 0;
+              top:-20px;
               padding: 0 10px;
               height: 30px;
               line-height: 30px;

src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue

@@ -1707,7 +1707,7 @@ export default {
       if (res.ok) {
         let imgPath = res.data.filePath
         let imgName = res.data.fileName
-        let imgSrc = 'uploadPath' + imgPath + imgName
+        let imgSrc = 'file' + imgPath + imgName
         // let imgSrc = imgPath + imgName
         // this.itemsContentList[this.saveUploadImgIndex].itemContent = 'uploadPath' + imgPath + imgName
         this.itemsContentList[this.saveAddIndex + 1].itemContent = '<img class=\'wordImg\' src=\'' + imgSrc + '\'>'

src/pages/personal/pages/my-collection/collectionDetail/CollectionDynamicDetail.vue

@@ -87,7 +87,7 @@ export default {
       pubOrgName: '',
       content: '',
       linkUri: '',
-      uploadPath: 'uploadPath',
+      uploadPath: 'file',
       resPk: '',
       fileList: [],
       picList: [],

src/pages/personal/pages/personal-info/components/PersonalData.vue

@@ -194,7 +194,7 @@ export default {
         loading: 'loading'
       }, res => {
         this.userInfo.userPic = res.data.id
-        this.userAvator = 'uploadPath' + res.data.filePath + res.data.fileName
+        this.userAvator = 'file' + res.data.filePath + res.data.fileName
       })
     },
     // 保存用户信息

src/pages/processCenter/pages/components/ProcessMixin.vue

@@ -22,7 +22,7 @@ export default {
           value: "laws1"
          },
           {
-              label: "企标制修订流程及企业标准库流程",
+              label: "企标制修订-技术标准",
               value: "buss1"
           },
         {

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

@@ -1,7 +1,7 @@
 <template><div class="bzrkStep1">
         <!--        标准入库流程-->
         <ProcessHeader toggle>
-            <template slot="proName">企标制修订流程及企业标准库流程</template>
+            <template slot="proName">企标制修订-技术标准</template>
             <template slot="proNode">发起企标制修订流程</template>
         </ProcessHeader>
         <div class="headerTabs">
@@ -2442,7 +2442,7 @@
                 _formData.append('createUser', this.$store.getters.userInfo.userId)
                 _formData.append('createUserName', this.$store.getters.userInfo.uName)
                 _formData.append('prcType', 'buss1')
-                _formData.append('prcName', '企标制修订流程及企业标准库流程')
+                _formData.append('prcName', '企标制修订-技术标准')
                 _formData.append('json', JSON.stringify({
                   taskInfo: '发起企标制修订流程',
                   form: this.form,

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

@@ -1,7 +1,7 @@
 <template><div class="bzrkStep1">
     <!--        标准入库流程-->
     <ProcessHeader toggle>
-        <template slot="proName">企标制修订流程及企业标准库流程</template>
+        <template slot="proName">企标制修订-技术标准</template>
         <template slot="proNode">专委会副主任/起草单位中心主任审定</template>
     </ProcessHeader>
     <div class="headerTabs">

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

@@ -1,7 +1,7 @@
 <template><div class="bzrkStep1">
     <!--        标准入库流程-->
     <ProcessHeader toggle>
-        <template slot="proName">企标制修订流程及企业标准库流程</template>
+        <template slot="proName">企标制修订-技术标准</template>
         <template slot="proNode">专委会主任/总院院长或主管副院长批准</template>
     </ProcessHeader>
     <div class="headerTabs">

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

@@ -1,7 +1,7 @@
 <template><div class="bzrkStep1">
     <!--        标准入库流程-->
     <ProcessHeader toggle>
-        <template slot="proName">企标制修订流程及企业标准库流程</template>
+        <template slot="proName">企标制修订-技术标准</template>
         <template slot="proNode">主起草人培训</template>
     </ProcessHeader>
     <div class="headerTabs">

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

@@ -1,7 +1,7 @@
 <template><div class="bzrkStep1">
     <!--        标准入库流程-->
     <ProcessHeader toggle>
-        <template slot="proName">企标制修订流程及企业标准库流程</template>
+        <template slot="proName">企标制修订-技术标准</template>
         <template slot="proNode">企标编写流程</template>
     </ProcessHeader>
     <div class="headerTabs">
@@ -2276,7 +2276,7 @@
                 _formData.append('createUser', this.$store.getters.userInfo.userId)
                 _formData.append('createUserName', this.$store.getters.userInfo.uName)
                 _formData.append('prcType', 'buss1')
-                _formData.append('prcName', '企标制修订流程及企业标准库流程')
+                _formData.append('prcName', '企标制修订-技术标准')
                 _formData.append('json', JSON.stringify({
                     taskInfo: this.taskInfo,
                     form: this.form,

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

@@ -1,7 +1,7 @@
 <template><div class="bzrkStep1">
     <!--        标准入库流程-->
     <ProcessHeader toggle>
-        <template slot="proName">企标制修订流程及企业标准库流程</template>
+        <template slot="proName">企标制修订-技术标准</template>
         <template slot="proNode">企标汇总修订</template>
     </ProcessHeader>
     <div class="headerTabs">
@@ -2275,7 +2275,7 @@
                 _formData.append('createUser', this.$store.getters.userInfo.userId)
                 _formData.append('createUserName', this.$store.getters.userInfo.uName)
                 _formData.append('prcType', 'buss1')
-                _formData.append('prcName', '企标制修订流程及企业标准库流程')
+                _formData.append('prcName', '企标制修订-技术标准')
                 _formData.append('json', JSON.stringify({
                     taskInfo: this.taskInfo,
                     form: this.form,

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

@@ -1,7 +1,7 @@
 <template><div class="bzrkStep1">
     <!--        标准入库流程-->
     <ProcessHeader toggle>
-        <template slot="proName">企标制修订流程及企业标准库流程</template>
+        <template slot="proName">企标制修订-技术标准</template>
         <template slot="proNode">标准化员审批</template>
     </ProcessHeader>
     <div class="headerTabs">

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

@@ -1,7 +1,7 @@
 <template><div class="bzrkStep1">
     <!--        标准入库流程-->
     <ProcessHeader toggle>
-        <template slot="proName">企标制修订流程及企业标准库流程</template>
+        <template slot="proName">企标制修订-技术标准</template>
         <template slot="proNode">会签征求意见</template>
     </ProcessHeader>
     <div class="headerTabs">
@@ -2483,7 +2483,7 @@
                 _formData.append('createUser', this.$store.getters.userInfo.userId)
                 _formData.append('createUserName', this.$store.getters.userInfo.uName)
                 _formData.append('prcType', 'buss1')
-                _formData.append('prcName', '企标制修订流程及企业标准库流程')
+                _formData.append('prcName', '企标制修订-技术标准')
                 _formData.append('json', JSON.stringify({
                     taskInfo: this.taskInfo,
                     form: this.form,

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

@@ -1,7 +1,7 @@
 <template><div class="bzrkStep1">
     <!--        标准入库流程-->
     <ProcessHeader toggle>
-        <template slot="proName">企标制修订流程及企业标准库流程</template>
+        <template slot="proName">企标制修订-技术标准</template>
         <template slot="proNode">主起草人修订并组织评审</template>
     </ProcessHeader>
     <div class="headerTabs">
@@ -2381,7 +2381,7 @@
                 _formData.append('createUser', this.$store.getters.userInfo.userId)
                 _formData.append('createUserName', this.$store.getters.userInfo.uName)
                 _formData.append('prcType', 'buss1')
-                _formData.append('prcName', '企标制修订流程及企业标准库流程')
+                _formData.append('prcName', '企标制修订-技术标准')
                 _formData.append('json', JSON.stringify({
                     taskInfo: this.taskInfo,
                     form: this.form,

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

@@ -1,7 +1,7 @@
 <template><div class="bzrkStep1">
     <!--        标准入库流程-->
     <ProcessHeader toggle>
-        <template slot="proName">企标制修订流程及企业标准库流程</template>
+        <template slot="proName">企标制修订-技术标准</template>
         <template slot="proNode">标准法规工程师复审</template>
     </ProcessHeader>
     <div class="headerTabs">
@@ -2543,7 +2543,7 @@
                 _formData.append('createUser', this.$store.getters.userInfo.userId)
                 _formData.append('createUserName', this.$store.getters.userInfo.uName)
                 _formData.append('prcType', 'buss1')
-                _formData.append('prcName', '企标制修订流程及企业标准库流程')
+                _formData.append('prcName', '企标制修订-技术标准')
                 _formData.append('json', JSON.stringify({
                     taskInfo: this.taskInfo,
                     form: this.form,

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

@@ -1,7 +1,7 @@
 <template><div class="bzrkStep1">
     <!--        标准入库流程-->
     <ProcessHeader toggle>
-        <template slot="proName">企标制修订流程及企业标准库流程</template>
+        <template slot="proName">企标制修订-技术标准</template>
         <template slot="proNode">技术委员会负责人/起草中心主任审核</template>
     </ProcessHeader>
     <div class="headerTabs">
@@ -2513,7 +2513,7 @@
                 _formData.append('createUser', this.$store.getters.userInfo.userId)
                 _formData.append('createUserName', this.$store.getters.userInfo.uName)
                 _formData.append('prcType', 'buss1')
-                _formData.append('prcName', '企标制修订流程及企业标准库流程')
+                _formData.append('prcName', '企标制修订-技术标准')
                 _formData.append('json', JSON.stringify({
                     taskInfo: this.taskInfo,
                     form: this.form,

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

@@ -1,7 +1,7 @@
 <template><div class="bzrkStep1">
     <!--        标准入库流程-->
     <ProcessHeader toggle>
-        <template slot="proName">企标制修订流程及企业标准库流程</template>
+        <template slot="proName">企标制修订-技术标准</template>
         <template slot="proNode">标准法规部部长审核</template>
     </ProcessHeader>
     <div class="headerTabs">
@@ -2513,7 +2513,7 @@
                 _formData.append('createUser', this.$store.getters.userInfo.userId)
                 _formData.append('createUserName', this.$store.getters.userInfo.uName)
                 _formData.append('prcType', 'buss1')
-                _formData.append('prcName', '企标制修订流程及企业标准库流程')
+                _formData.append('prcName', '企标制修订-技术标准')
                 _formData.append('json', JSON.stringify({
                     taskInfo: this.taskInfo,
                     form: this.form,

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

@@ -1,7 +1,7 @@
 <template><div class="bzrkStep1">
     <!--        标准入库流程-->
     <ProcessHeader toggle>
-        <template slot="proName">企标制修订流程及企业标准库流程</template>
+        <template slot="proName">企标制修订-技术标准</template>
         <template slot="proNode">重新企标汇总修订</template>
     </ProcessHeader>
     <div class="headerTabs">

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

@@ -1,7 +1,7 @@
 <template><div class="bzrkStep1">
     <!--        标准入库流程-->
     <ProcessHeader toggle>
-        <template slot="proName">企标制修订流程及企业标准库流程</template>
+        <template slot="proName">企标制修订-技术标准</template>
         <template slot="proNode">重新修订并组织评审</template>
     </ProcessHeader>
     <div class="headerTabs">

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

@@ -1,7 +1,7 @@
 <template><div class="bzrkStep1">
     <!--        标准入库流程-->
     <ProcessHeader toggle>
-        <template slot="proName">企标制修订流程及企业标准库流程</template>
+        <template slot="proName">企标制修订-技术标准</template>
         <template slot="proNode">企标制修订流程详情</template>
     </ProcessHeader>
     <div class="headerTabs">

src/pages/processCenter/pages/newProcess/index.vue

@@ -197,7 +197,7 @@
                   <img :src="getImg(Math.floor(Math.random() * 6))">
                 </div>
                 <div class="card-top-right">
-                  <div class="card-top-right-text">企标制修订流程及企业标准库流程</div>
+                  <div class="card-top-right-text">企标制修订-技术标准</div>
                   <div class="card-top-right-line"></div>
                 </div>
               </div>
@@ -398,7 +398,7 @@
       this.$store.commit('setHandleInfo')
       switch (prcType) {
         case 'buss1':
-            // 企标制修订流程及企业标准库流程
+          // 企标制修订-技术标准
           this.$router.push({
             name: 'bussLibrary1'
           })

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -2747,7 +2747,7 @@ export default {
                 this.OCRModel = false
                 this.OCRSubmitLoading = false
                 if (res.ok) {
-                  this.$message.success('OCR实别成功')
+                  this.$message.success('OCR识别成功')
                 } else {
                 }
               },

src/pages/regulatoryRepository/dynamicInformation/pages/DynamicInformationDetails.vue

@@ -81,7 +81,7 @@ export default {
         content: ''
       },
       linkUri: '',
-      uploadPath: 'uploadPath',
+      uploadPath: 'file',
       resPk: '',
       fileList: [],
       picList: [],

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

@@ -537,6 +537,44 @@
                     </el-form-item>
                 </template>
                 <template v-for="field in displayLocation.child">
+                  <!--起草单位QCDW-->
+                  <template v-if="field.attrField === 'QCDW'">
+                    <el-form-item
+                        prop="QCDW"
+                        label-width="150px"
+                        class="add-form-item"
+                    >
+                      <template slot="label">起草部门</template>
+                      <el-input
+                          :key="field.attrField"
+                          :config="field"
+                          clearable
+                          v-model="sarBussionessStandEO[field.attrField]"
+                          :disabled="formdisableflag" placeholder="选择起草部门"
+                          @click.native="choiceQCDW('QCDWId', '起草部门', sarBussionessStandEO.QCDWId)">
+                      </el-input>
+                    </el-form-item>
+                  </template>
+                <!--起草人QCRBUSS-->
+                  <template v-if="field.attrField === 'QCRBUSS'">
+                    <el-form-item
+                        prop="QCRBUSS"
+                        label-width="150px"
+                        class="add-form-item"
+                    >
+                      <template slot="label">起草人</template>
+                      <el-input v-model="sarBussionessStandEO[field.attrField]" placeholder="选择起草人" @click.native="choiceQCR('QCRBUSS', '选择起草人', sarBussionessStandEO[field.attrField])">
+                      </el-input>
+                      <!--                      <el-input-->
+                      <!--                          :key="field.attrField"-->
+                      <!--                          :config="field"-->
+                      <!--                          clearable-->
+                      <!--                          v-model="sarStandardsInfoEO['ZRGCS']"-->
+                      <!--                          :disabled="formdisableflag" placeholder="选择责任工程师"-->
+                      <!--                          @click.native="choiceRole('ZRGCSUserId', '责任工程师', sarStandardsInfoEO.ZRGCSUserId)">-->
+                      <!--                      </el-input>-->
+                    </el-form-item>
+                  </template>
                 <template v-if="field.attrField === 'SVPPS'">
                   <custom-SVPPS
                     :key="field.attrField"
@@ -684,7 +722,7 @@
                     :disabled="formdisableflag"
                   ></custom-select>
                 </template>
-                <template v-else-if="field.attrType === 'SEL_OPTS'">
+                <template v-else-if="field.attrType === 'SEL_OPTS' && field.attrField !== 'QCDW' && field.attrField !== 'QCRBUSS'">
                   <custom-select-array
                     :key="field.attrField"
                     :config="field"
@@ -1150,6 +1188,20 @@
       @isOk="isOk"
     ></GenerationNumber>
 
+    <Role-tree
+        :is-title="drawerTitle"
+        :is-visible.sync="modalShowRoleFlag"
+        @checkedRole="checkedRole2"
+        :nodeList="nodeList2"
+    ></Role-tree>
+
+    <Mechanism-tree
+        is-title="选择部门信息"
+        :is-visible.sync="modalshowflagZRBM"
+        :nodeList="nodeListZRBM"
+        @checkedRole="drawerCheckZRBM"
+    />
+
     <!-- 授权人员(上汽全公司选人解决方案) -->
 <!--    :max-selected="1"-->
 <!--    max-selected-tips="采购处理人只能为一个人"-->
@@ -1913,6 +1965,11 @@ export default {
         syrzOptions:[],//适用认证下拉框
         gkglbmOptions:[],//归口管理部门下拉框
       drawerTitle: '',
+      modalShowRoleFlag: false,
+      nodeList: [],
+      nodeList2: [],
+      nodeListZRBM: [],
+      modalshowflagZRBM: false,
       addOrUPdateFlag: 1, // 新增：1， 修改：2
       modalshowflag: false,
       standSubclassConfigOptions: [], // 企标细类下拉框-所有数据
@@ -2826,6 +2883,7 @@ export default {
                         })
                     })
                     this.dynamicFormField = displayLocation
+                  console.log('2805',this.dynamicFormField)
                     this.loading = false
                 })
                 this.sarBussionessStandEO = JSON.parse(JSON.stringify(item))
@@ -2876,6 +2934,57 @@ export default {
       // $('#deptBtn').click()
       $('#deptBtn2').click()
     },
+    choiceQCR (type, title, id) {
+      console.log('2077',title)
+      this.nodeList = []
+      this.nodeList.push(id)
+      this.userType = type
+      this.drawerTitle = title
+      this.modalShowRoleFlag = true
+    },
+    checkedRole2 (data) {
+      console.log('1712',this.drawerTitle)
+      let idList = ''
+      let nameList = ''
+      data.forEach( item => {
+        if (nameList.length > 0) {
+          nameList += ','
+          idList += ','
+        }
+        idList += item.id
+        nameList += item.name
+      })
+      this.sarBussionessStandEO['QCRBUSS'] = nameList
+
+    },
+    choiceQCDW(type, title, id) {
+
+
+      this.nodeListZRBM = []
+      this.nodeListZRBM.push(id)
+      this.drawerTitle = title
+      this.modalshowflagZRBM = true
+    },
+    drawerCheckZRBM(data) {
+
+      console.log("5389", data);
+      let idList = ''
+      let nameList = ''
+      data.forEach(item => {
+        // if (item.hasChild === '0') {
+        if (nameList.length > 0) {
+          nameList += ','
+          idList += ','
+        }
+        idList += item.id
+        nameList += item.name
+        // }
+      })
+
+      this.sarBussionessStandEO.QCDWId = idList;
+      this.sarBussionessStandEO['QCDW'] = nameList;
+
+    },
     // 新增-表单空
     resetForm () {
       this.modalshowflag = false
@@ -3685,7 +3794,7 @@ export default {
       this.OCRType = type
       if (type === '0') {
         text = 'OCR识别'
-        this.OCRTitle = '选择OCR实别文件'
+        this.OCRTitle = '选择OCR识别文件'
       } else if(type === '1') {
         text = '拆分'
         this.OCRTitle = '选择拆分文件'

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -146,7 +146,7 @@
                            :loading="delLoading"
                            size="mini"
                            @click="deleteStand(2)"
-                           v-btn-permission="'4d01342db0f56f01bfceaee7b46904f4'"><i class="iconfont">&#xe61b;</i>批量删除
+                           v-btn-permission="'b299fa5edb3f3f35badb2adb6bda9f2e'"><i class="iconfont">&#xe61b;</i>批量删除
                 </el-button>
         <el-button class="common-button-default"
                    size="mini" @click="configurationStandard"
@@ -4237,7 +4237,7 @@ export default {
       this.OCRType = type
       if (type === '0') {
         text = 'OCR识别'
-        this.OCRTitle = '选择OCR实别文件'
+        this.OCRTitle = '选择OCR识别文件'
       } else if(type === '1') {
         text = '拆分'
         this.OCRTitle = '选择拆分文件'

src/pages/regulatoryRepository/information/index2.vue

@@ -158,7 +158,7 @@ export default {
       pubOrgName: '',
       content: '',
       linkUri: '',
-      uploadPath: 'uploadPath',
+      uploadPath: 'file',
       resPk: '',
       fileList: [],
       picList: [],

src/router/index.js

@@ -931,7 +931,7 @@ const routes = [
         component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step1.vue'),
         meta: {
           requireAuth: true,
-          title: '企标制修订流程及企业标准库流程'
+          title: '企标制修订-技术标准'
         }
       },
         {
@@ -940,7 +940,7 @@ const routes = [
             component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step2.vue'),
             meta: {
                 requireAuth: true,
-                title: '企标制修订流程及企业标准库流程'
+                title: '企标制修订-技术标准'
             }
         },
         {
@@ -949,7 +949,7 @@ const routes = [
             component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step3.vue'),
             meta: {
                 requireAuth: true,
-                title: '企标制修订流程及企业标准库流程'
+                title: '企标制修订-技术标准'
             }
         },{
             path: '/bussLibraryC3',
@@ -957,7 +957,7 @@ const routes = [
             component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue'),
             meta: {
                 requireAuth: true,
-                title: '企标制修订流程及企业标准库流程'
+                title: '企标制修订-技术标准'
             }
         },{
             path: '/bussLibrary4',
@@ -965,7 +965,7 @@ const routes = [
             component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step4.vue'),
             meta: {
                 requireAuth: true,
-                title: '企标制修订流程及企业标准库流程'
+                title: '企标制修订-技术标准'
             }
         },{
             path: '/bussLibrary5',
@@ -973,7 +973,7 @@ const routes = [
             component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step5.vue'),
             meta: {
                 requireAuth: true,
-                title: '企标制修订流程及企业标准库流程'
+                title: '企标制修订-技术标准'
             }
         },{
             path: '/bussLibrary6',
@@ -981,7 +981,7 @@ const routes = [
             component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step6.vue'),
             meta: {
                 requireAuth: true,
-                title: '企标制修订流程及企业标准库流程'
+                title: '企标制修订-技术标准'
             }
         },{
             path: '/bussLibraryC6',
@@ -989,7 +989,7 @@ const routes = [
             component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue'),
             meta: {
                 requireAuth: true,
-                title: '企标制修订流程及企业标准库流程'
+                title: '企标制修订-技术标准'
             }
         },{
             path: '/bussLibrary7',
@@ -997,7 +997,7 @@ const routes = [
             component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step7.vue'),
             meta: {
                 requireAuth: true,
-                title: '企标制修订流程及企业标准库流程'
+                title: '企标制修订-技术标准'
             }
         },{
             path: '/bussLibrary8',
@@ -1005,7 +1005,7 @@ const routes = [
             component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step8.vue'),
             meta: {
                 requireAuth: true,
-                title: '企标制修订流程及企业标准库流程'
+                title: '企标制修订-技术标准'
             }
         },{
             path: '/bussLibrary9',
@@ -1013,7 +1013,7 @@ const routes = [
             component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step9.vue'),
             meta: {
                 requireAuth: true,
-                title: '企标制修订流程及企业标准库流程'
+                title: '企标制修订-技术标准'
             }
         },{
             path: '/bussLibrary10',
@@ -1021,7 +1021,7 @@ const routes = [
             component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step10.vue'),
             meta: {
                 requireAuth: true,
-                title: '企标制修订流程及企业标准库流程'
+                title: '企标制修订-技术标准'
             }
         },{
             path: '/bussLibrary11',
@@ -1029,7 +1029,7 @@ const routes = [
             component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step11.vue'),
             meta: {
                 requireAuth: true,
-                title: '企标制修订流程及企业标准库流程'
+                title: '企标制修订-技术标准'
             }
         },{
             path: '/bussLibrary12',
@@ -1037,7 +1037,7 @@ const routes = [
             component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step12.vue'),
             meta: {
                 requireAuth: true,
-                title: '企标制修订流程及企业标准库流程'
+                title: '企标制修订-技术标准'
             }
         },{
             path: '/bussLibraryDetail',
@@ -1045,7 +1045,7 @@ const routes = [
             component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/stepDetail.vue'),
             meta: {
                 requireAuth: true,
-                title: '企标制修订流程及企业标准库流程'
+                title: '企标制修订-技术标准'
             }
         },
       {