Merge branch 'develop' into FOTON

public/static/pdf/web/viewer.js

@@ -6664,9 +6664,13 @@ var PDFPageView = function () {
         // //判断分辨率
         // if (screen.width+"*"+screen.height === '800*600' ){
         // }
-
+        var screenHeight = window.screen.height;
-
+        var screenWidth = window.screen.width;
-
+        if((screenHeight>screenWidth) && (screenWidth>480 && screenWidth <= 1440)){
+          defaultSettings.watermark_fontsize = '20px';
+          defaultSettings.watermark_width = 60;
+          defaultSettings.watermark_height = 40;
+        }
         var oTemp = document.createDocumentFragment();
 
         //获取页面最大宽度

src/pages/details/otherLawsDetails/index.vue

@@ -337,7 +337,6 @@
             type="primary"
             class="common-button-primary"
             @click="openRelatedTermsDrawer"
-            v-btn-permission="'8PXLAB2CMQG5QNAGKKNB'"
         >关联条款</el-button>
         <!--<el-button class="common-button-default delete-button" icon="delete" @click="batchDeleteItems(2)" v-btn-permission="'VVETPP4CFK'">删除</el-button>-->
       </div>

src/pages/details/otherStandardDetails/index.vue

@@ -789,7 +789,7 @@
           type="primary"
           class="common-button-primary"
           @click="openRelatedTermsDrawer"
-          v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'"
+          v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'bd291146ac1e42c48968c5142ae55375' : '960a97045a6e47b0b8e33ebc347e5fd9'"
         >关联条款
         </el-button>
         <el-button

src/pages/details/otherStandardExternalDetails/index.vue

@@ -823,7 +823,7 @@
           type="primary"
           class="common-button-primary"
           @click="openRelatedTermsDrawer"
-          v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'"
+          v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'bd291146ac1e42c48968c5142ae55375' : '960a97045a6e47b0b8e33ebc347e5fd9'"
         >关联条款
         </el-button>
         <el-button

src/pages/details/process/ruku/index.vue

@@ -357,7 +357,7 @@
             type="primary"
             class="common-button-primary"
             @click="openRelatedTermsDrawer"
-            v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '28CUM4KPUXDMCCMTFUQA' : 'R62HAB3QEMD27BZ7XHCM'"
+            v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'bd291146ac1e42c48968c5142ae55375' : '960a97045a6e47b0b8e33ebc347e5fd9'"
         >关联条款</el-button>
       </div>
       <div class="content">

src/pages/localTool/standAutoSplit/index.vue

@@ -191,12 +191,14 @@
             height="100%"
             border
             :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
-            @selection-change="selectStandChange"
+            @selection-change="standSelectChangeByStandTab"
         >
-          <el-table-column
+          <el-table-column label="" width="55">
-              type="selection"
+            <template slot-scope="scope">
-              width="55"
+              <el-radio :label="scope.$index+1" v-model="radio" @change.native="standSelectChangeByStandTab(scope.row)">
-              align="center">
+                &nbsp;
+              </el-radio>
+            </template>
           </el-table-column>
           <el-table-column
               prop="sarType"
@@ -683,6 +685,7 @@ export default {
       speedModal: false,
       percent: 0,
       ifUp: true,
+      radio: null,
       standCommonlySearch: {},
       dataLoading: false,
       loading: false,
@@ -1136,6 +1139,19 @@ export default {
         this.selectedSplitStandList.push(data[i])
       }
     },
+    standSelectChangeByStandTab (data) {
+      this.selectedSplitStandList = []
+      let checkId = data.standId+"_"+data.attId
+      for (let i = 0; i < this.addSpiltStandList.length; i++) {
+        let dataId = this.addSpiltStandList[i].standId+"_"+this.addSpiltStandList[i].attId
+        if (checkId === dataId) {
+          this.addSpiltStandList[i].checkBox = true
+          this.selectedSplitStandList.push(this.addSpiltStandList[i])
+        }
+      }
+    },
+
+
     searchStandList () {
       this.splitInfoPage = 1
       this.getSarFileSplitInfoEOPage()

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

@@ -43,7 +43,7 @@
             <el-button v-btn-permission="'19173939f52bb35d82e85fdcfc5bc37a'"   size="mini" @click="uploadImportModal"><i class="iconfont">&#xe825;</i>模板下载</el-button>
             <el-button v-btn-permission="'6c51b9f4bb333aaf4895c98f8c2ea896'"   size="mini" @click="batchCopy">批量复制</el-button>
             <el-button v-btn-permission="'b5eb643881b814cadd477a1e414e568e'"   size="mini" @click="combineItems">合并条款</el-button>
-            <el-button v-btn-permission="'958e004c1ac4fe39564aa7547b8c0b6b'"   size="mini" @click="openSubmitAndExamine" v-if="this.$route.query.result === '1'">提交</el-button>
+<!--            <el-button v-btn-permission="'958e004c1ac4fe39564aa7547b8c0b6b'"   size="mini" @click="openSubmitAndExamine" v-if="this.$route.query.result === '1'">提交</el-button>-->
             <el-button v-if="auditFlag==='1'"  size="mini" v-btn-permission="'958e004c1ac4fe39564aa7547b8c0b6b'" @click="splitCheckBtn">审核</el-button>
             <!--<el-button size="mini" @click="$message.warning('需求暂不明确')" v-if="this.$route.query.result === '1'">提交</el-button>-->
           </div>

src/pages/phone/domesticDetails.vue

@@ -533,7 +533,7 @@
       type="primary"
       class="common-button-primary"
       @click="openRelatedTermsDrawer"
-      v-btn-permission="$route.query.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'"
+      v-btn-permission="$route.query.pageType === 'INLAND_STAND' ? 'bd291146ac1e42c48968c5142ae55375' : '960a97045a6e47b0b8e33ebc347e5fd9'"
     >关联条款
     </el-button>
     <el-button

src/pages/phone/phoneHome.vue

@@ -128,7 +128,7 @@ export default {
       top: 15px;
       left: 15px;
       width: 23vw;
-      height: 0.8rem;
+      height: 7.6vh;
       background: url("../../assets/images/phone/phoneTitle.png") no-repeat;
       background-size: 100% 100%;
     }

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

@@ -49,8 +49,10 @@
                   ></el-input>
                 </el-form-item>
                 <el-form-item label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
+                  <el-tooltip :disabled="!form.standSystem" effect="dark" :content=form.standSystem placement="top-start">
                     <el-input :disabled="disabledXX"  v-model="form.standSystem" clearable placeholder="选择标准体系" @click.native="choiceZRR1('standSystem', '标准体系', form.standSystem)"></el-input>
-                  <tree-select-new
+                  </el-tooltip>
+                  <tree-select-new v-if="!disabledXX"
                     :key="key"
                     :multiple=false
                     :lazy=false
@@ -166,6 +168,7 @@
                     </el-input>
                   </el-tooltip>
                   <tree-select-stand
+                    v-if="!disabledXX"
                     :key="key"
                     :multiple=true
                     :lazy=false
@@ -220,12 +223,12 @@
                 <cus-tom-data-picker-group
                   :config="{attrName:'实施日期(标准文本)',attrField:'ssrq'}"
                   v-model="form.ssrq"
-                  :disabled="false"
+                  :disabled="disabledXX"
                 ></cus-tom-data-picker-group>
                 <cus-tom-data-picker-group
                   :config="{attrName:'在产车实施日期(标准文本)',attrField:'zccssrq'}"
                   v-model="form.zccssrq"
-                  :disabled="false"
+                  :disabled="disabledXX"
                 ></cus-tom-data-picker-group>
                 <!--
                                 <el-form-item label="实施日期(标准文本)" prop="ssrq" class="add-form-item form-item-disabled">
@@ -251,7 +254,7 @@
                 <cus-tom-data-picker-group
                   :config="{attrName:'新车型实施日期(标准文本)',attrField:'xcxssrq'}"
                   v-model="form.xcxssrq"
-                  :disabled="false"
+                  :disabled="disabledXX"
                 ></cus-tom-data-picker-group>
                 <!--                                <el-form-item label="新车型实施日期(标准文本)" prop="xcxssrq" class="add-form-item form-item-disabled">
                                     <el-date-picker :disabled="disabledXX"
@@ -328,7 +331,7 @@
                     </div>
                   </div>
                 </el-form-item>
-                <el-form-item label="发布稿" prop="fbgbjbdName" class="add-form-item form-item-disabled">
+                <el-form-item label="发布稿(原文)" prop="fbgbjbdName" class="add-form-item form-item-disabled">
                   <el-input :disabled="disabledXX"
                     disabled
                     style="display: none;"
@@ -353,6 +356,31 @@
                     </div>
                   </div>
                 </el-form-item>
+                <el-form-item label="发布稿(译文)" prop="fbgywbdName" class="add-form-item form-item-disabled">
+                  <el-input :disabled="disabledXX"
+                            disabled
+                            style="display: none;"
+                            v-model="form.fbgywbdName"
+                            clearable
+                  ></el-input>
+                  <div style="display: flex;justify-content: space-between">
+                    <div style="width: 80%;line-height: 40px">
+                      <div v-for="(item,index) in FBGYWBDFileList" :key="index" @click="filePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">
+                        {{ item.name }}
+                      </div>
+                    </div>
+                    <div style="width: 20%;">
+                      <el-button :disabled="disabledXX"
+                                 type="primary"
+                                 class="common-button-primary"
+                                 size="mini"
+                                 style="margin-left: 10px; margin-top: 11px; float: right;"
+                                 @click="fileUpload('fbgywbd')">
+                        <i class="el-icon-upload el-icon--right"></i>
+                      </el-button>
+                    </div>
+                  </div>
+                </el-form-item>
                 <el-form-item v-show="form.standInData === '0'" label="送审稿" prop="ssg" class="add-form-item form-item-disabled">
                   <el-input :disabled="disabledXX"
                     disabled
@@ -507,31 +535,6 @@
                     </div>
                   </div>
                 </el-form-item>
-                <el-form-item label="发布稿（译文）" prop="fbgywbdName" class="add-form-item form-item-disabled">
-                  <el-input :disabled="disabledXX"
-                            disabled
-                            style="display: none;"
-                            v-model="form.fbgywbdName"
-                            clearable
-                  ></el-input>
-                  <div style="display: flex;justify-content: space-between">
-                    <div style="width: 80%;line-height: 40px">
-                      <div v-for="(item,index) in FBGYWBDFileList" :key="index" @click="filePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">
-                        {{ item.name }}
-                      </div>
-                    </div>
-                    <div style="width: 20%;">
-                      <el-button :disabled="disabledXX"
-                                 type="primary"
-                                 class="common-button-primary"
-                                 size="mini"
-                                 style="margin-left: 10px; margin-top: 11px; float: right;"
-                                 @click="fileUpload('fbgywbd')">
-                        <i class="el-icon-upload el-icon--right"></i>
-                      </el-button>
-                    </div>
-                  </div>
-                </el-form-item>
                 <el-form-item v-show="form.standInData === '0'" label="报批稿" prop="bpg" class="add-form-item form-item-disabled">
                   <el-input :disabled="disabledXX"
                     disabled
@@ -593,7 +596,7 @@
               <el-col :span="12">
                 <!--责任部门-->
 <!--                                              <template>
-                                                <custom-select-array
+                                                <custom-select-array :disabled="disabledXX"
                                                     :key="zrbmOptions.options"
                                                     :config="zrbmOptions"
                                                     v-model="form['zrbm']"
@@ -612,7 +615,7 @@
                                                 </el-form-item>-->
                 <!--适用车型-->
                 <template>
-                  <custom-select-array
+                  <custom-select-array :disabled="disabledXX"
                     style="margin-left: -12px"
                     :config="applyArcticOptions"
                     v-model="form['cllx']"
@@ -620,7 +623,7 @@
                 </template>
                 <!--能源类型-->
                 <template>
-                  <custom-select-array
+                  <custom-select-array :disabled="disabledXX"
                     style="margin-left: -12px"
                     :config="categoryOptions"
                     v-model="form['nylx']"
@@ -628,7 +631,7 @@
                 </template>
                 <el-form-item label="关联模块--乘用车VPPS编码" prop="cycvppsbm" class="add-form-item form-item-disabled">
                   <el-input :disabled="disabledXX"  v-model="form.cycvppsbm" placeholder="选择乘用车VPPS编码" clearable @click.native="choiceZRR2('cycvppsbm', '乘用车VPPS', form.cycvppsbm)"></el-input>
-                  <tree-select-new
+                  <tree-select-new v-if="!disabledXX"
                     width="800"
                     :key="key1"
                     :lazy=true
@@ -645,7 +648,7 @@
                 </el-form-item>
                 <el-form-item label="关联模块--卡车VPPS编码" prop="kccvppsbm" class="add-form-item form-item-disabled">
                   <el-input :disabled="disabledXX"  v-model="form.kccvppsbm" placeholder="选择卡车VPPS编码" clearable @click.native="choiceZRR3('kccvppsbm', '卡车VPPS', form.kccvppsbm)"></el-input>
-                  <tree-select-new
+                  <tree-select-new v-if="!disabledXX"
                     width="800"
                     :key="key2"
                     :lazy=true
@@ -662,7 +665,7 @@
                 </el-form-item>
                 <el-form-item label="模块结构单元变型号(卡车)" prop="dybxh" class="add-form-item form-item-disabled">
                   <el-input :disabled="disabledXX"  v-model="form.dybxh" placeholder="选择模块结构单元变型号" clearable @click.native="choiceZRR4('dybxh', '模块结构单元', form.dybxh)"></el-input>
-                  <tree-select-module
+                  <tree-select-module v-if="!disabledXX"
                     width="800"
                     :key="key3"
                     :lazy=true
@@ -679,7 +682,7 @@
                 </el-form-item>
                 <el-form-item label="模块结构单元变型号(乘用车)" prop="dybxhcar" class="add-form-item form-item-disabled">
                   <el-input :disabled="disabledXX"  v-model="form.dybxhcar" placeholder="选择模块结构单元变型号" clearable @click.native="choiceZRR5('dybxhcar', '模块结构单元', form.dybxhcar)"></el-input>
-                  <tree-select-module
+                  <tree-select-module v-if="!disabledXX"
                     width="800"
                     :key="key4"
                     :lazy=true
@@ -704,6 +707,7 @@
                     <el-option v-for="item in qcdwOption" :value="item.value" :key="item.value" :label="item.label" multiple filterable></el-option>
                   </el-select>
                   <el-button class="common-button-primary add-button"
+                             :disabled="disabledXX"
                              type="primary"
                              icon="add"
                              size="small"
@@ -713,7 +717,7 @@
               <el-col :span="12">
                 <!--适用产品线-->
                 <template>
-                  <custom-select-array
+                  <custom-select-array :disabled="disabledXX"
                     style="margin-left: -12px"
                     :config="sycpxOptions"
                     v-model="form['sycpx']"
@@ -732,7 +736,7 @@
                                                 </el-form-item>-->
                 <!--适用认证-->
                 <template>
-                  <custom-select-array
+                  <custom-select-array :disabled="disabledXX"
                     style="margin-left: -12px; display: none"
                     :config="applyAuthOptions"
                     v-model="form['syrz']"
@@ -762,7 +766,7 @@
                                                 </el-form-item>
                 责任工程师
                                               <template>
-                                                <custom-select-array
+                                                <custom-select-array :disabled="disabledXX"
                                                     :key="zrgcsOptions.options"
                                                     :config="zrgcsOptions"
                                                     v-model="form['zrgcs']"
@@ -1495,24 +1499,25 @@
         </el-button>
       </div>
     </el-drawer>
+    <loading :loading="ccc">加载数据</loading>
   </div>
 </template>
 
 <script>
-import ProcessHeader from '../../components/ProcessHeader'
+  import ProcessHeader from '../../components/ProcessHeader'
-import ProcessFooter from '../../components/ProcessFooter'
+  import ProcessFooter from '../../components/ProcessFooter'
-import ProcessTitle from '../../components/ProcessTitle'
+  import ProcessTitle from '../../components/ProcessTitle'
-import CustomSelectArray from '@/components/CustomFormComponents/SelectArray'
+  import CustomSelectArray from '@/components/CustomFormComponents/SelectArray'
-import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId, taskDel} from "api/process";
+  import {getBusStandFileByAttId, queryTaskFirst, saveTaskFirst, taskDel} from "api/process";
-import TreeSelect from '@/components/treeSelect/treeSelect.vue';
+  import TreeSelect from '@/components/treeSelect/treeSelect.vue';
-import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
+  import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
-import TreeSelectModule from "@/components/treeSelect/treeSelectModule.vue";
+  import TreeSelectModule from "@/components/treeSelect/treeSelectModule.vue";
-import CustomDatePickGroup from '@/components/CustomFormComponents/DatePickerGroup'
+  import CustomDatePickGroup from '@/components/CustomFormComponents/DatePickerGroup'
-import CusTomDataPickerGroup
+  import CusTomDataPickerGroup
     from "@/pages/regulatoryRepository/localProductsOrProjectLibrary/components/DatePickerGroup";
-import TreeSelectStand from "@/components/treeSelect/treeSelectStand";
+  import TreeSelectStand from "@/components/treeSelect/treeSelectStand";
 
-export default {
+  export default {
   name: "bzrkStep1",
   components: {
     TreeSelectStand,
@@ -1563,6 +1568,7 @@ export default {
     }
     return {
       disabledXX:!!this.$route.query.disabledXX,
+      ccc:false,
       productTitle: '', // 模态框标题
       productModelAdd: {
         // 模态框信息
@@ -2297,6 +2303,7 @@ export default {
       return data.name.indexOf(value) !== -1;
     },
     getTaskId() {
+      this.ccc = true
       queryTaskFirst({
         bpnId: this.$route.query.bpnId
       }).then(res => {
@@ -2325,7 +2332,6 @@ export default {
      * @description: 动态表单读取
      */
     getFormFieldList(item) {
-      console.log(item);
       this.$nextTick(() => {
         this.form = JSON.parse(JSON.stringify(item))
         this.defaultCheckedKeys = [this.form.standSystem]
@@ -2344,10 +2350,6 @@ export default {
         this.form.prcName = this.prcName
         this.form['id'] = item.id
 
-
-        // zbjbdFileList: {},
-        console.log(this.form);
-
         // 遍历对象初始化文件信息
         for (const p in this.form) {
           if (typeof (this.form[p]) != "function") {
@@ -2355,6 +2357,7 @@ export default {
           }
         }
 
+
       })
     },
     // 将文本状态的id与name对应
@@ -2462,6 +2465,7 @@ export default {
               _this: this
             }, res => {
               if (res && res.data) {
+                this.ccc = true
                 const bringData = res.data
                 bringData.txlb = ''
                 bringData.signFlag = this.form.signFlag && this.form.signFlag != '' ? this.form.signFlag : '0'
@@ -2512,6 +2516,7 @@ export default {
                 this.verifySarStandard = true
                 this.busVsFunc()
                 this.modelFunc()
+                this.menu2("",this.form.standSystem)
                 this.$forceUpdate()
               }
               // 遍历对象初始化文件信息
@@ -3323,14 +3328,40 @@ export default {
           ;
       }
     },
-    popoverHide(checkedIds, checkedData, isShow, isLoadChild, topId) {
+    async menu2(id,name){
-      if (checkedData) {
+      let res = await this.selectMenu2(id,name)
-        if (checkedData.length > 0 && checkedData.length != 0) {
+      if(res && res.data){
-          this.form.standSystem = checkedData.map(item => item.menuName).join(",")
+        this.form.standSystem = res.data
-        } else {
-          this.form.standSystem = checkedData.menuName
-        }
         this.modalShowFlag1 = false
+        this.ccc = false
+      }
+    },
+    selectMenu2(id,name) {
+      const param = {}
+      if(id && id !== ""){
+        param.id = id
+      }
+
+      if(name && name !== ""){
+        param.menuName = name
+      }
+      return new Promise((resolve, reject) => {
+        this.$http.get('lawss/sarMenuStandardLimit/getTopMenu', param, {
+          _this: this
+        }, res => {
+          resolve(res)
+        })
+      })
+    },
+    popoverHide(checkedIds, checkedData, isShow, isLoadChild, topId) {
+      this.ccc = true
+      if (checkedData) {
+        this.menu2(checkedIds,"")
+        // if (checkedData.length > 0 && checkedData.length !== 0) {
+        //   this.form.standSystem = checkedData.map(item => item.menuName).join(",")
+        // } else {
+        //   this.form.standSystem = checkedData.menuName
+        // }
       }
 
     },
@@ -3767,47 +3798,17 @@ export default {
         this.txlbOptions = res.data.TXLBCLASS // 体系类别
         this.setMap(this.standStateOptions0)
         this.setMap(this.standStateOptions1)
-
+        this.ccc = false
       }
     },
   },
   mounted() {
     this.getTree()
-    this.$http.get('sys/dictype/getDicTypeListCode', '', {
-      _this: this
-    }, res => {
-      this.countryOptions = res.data.COUNTRY//国家地区
-      this.standSortOptions = res.data.STANDCLASSIFY // 标准类别
-      this.standNatureOptions = res.data.SARPROPERTY // 标准性质
-      const standOptions = []
-      res.data.WBZTCLASS.forEach(item=>{
-        if( item.label === '草案' || item.label === '征求意见' || item.label === '送审' || item.label === '报批' || item.label === '发布'){
-          standOptions.push(item)
-        }
-      })
-      this.standStateOptions0 = standOptions // 文本状态
-      this.standStateOptions1 = res.data.WBZTCLASS
-      this.standSystemOptions = res.data.BZTXCLASS // 标准体系
-      this.applyArcticOptions.options = res.data.ENERGYTYPES // 适用车型
-      this.categoryOptions.options = res.data.NYLXCLASS // 能源类型
-      this.applyAuthOptions.options = res.data.SYRZCLASS // 适用认证
-      this.cysdOptions = res.data.WSCYSD // 我司参与深度
-      this.cyzbpmOptions = res.data.CYZBPM // 我司参与制标排名
-      this.wssmrOptions = res.data.WSSMR // 我司署名人
-      this.sycpxOptions.options = res.data.SYCPXCLASS // 适用产品线
-      this.zrbmOptions.options = res.data.ZRBMCLASS // 责任部门
-      this.zrgcsOptions.options = res.data.ZRGCSCLASS // 责任工程师
-      this.qcdwOption = res.data.QCDW // 体系类别
-      this.gkglbmOptions = res.data.GKGLBM // 归口管理部门
-      this.cbcdOptions = res.data.DEGREESTANDARD // 采标程度
-      this.txlbOptions = res.data.TXLBCLASS // 体系类别
-      this.setMap(this.standStateOptions0)
-      this.setMap(this.standStateOptions1)
     this.bpnId = this.$route.query.bpnId
     if (this.bpnId !== undefined) {
       this.getTaskId()
     }
-    })
+    this.getDataAsync()
     this.busVsFunc()
     this.modelFunc()
 

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

@@ -171,7 +171,9 @@
               </el-col>
               <el-col :span="12">
                 <el-form-item label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
+                  <el-tooltip :disabled="!form.standSystem" effect="dark" :content=form.standSystem placement="top-start">
                     <el-input v-model="form.standSystem" disabled></el-input>
+                  </el-tooltip>
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '1'" label="标签" prop="gxhbq" class="add-form-item form-item-disabled">
                   <el-input
@@ -306,7 +308,7 @@
                     - -
                   </div>
                 </el-form-item>
-                <el-form-item label="发布稿" prop="fbgbjbdName" class="add-form-item form-item-disabled">
+                <el-form-item label="发布稿(原文)" prop="fbgbjbdName" class="add-form-item form-item-disabled">
                   <div v-if="fbgbjbdFileMap.length>0" v-for="(value,index)  in this.fbgbjbdFileMap" :key="index" style="cursor: pointer;color: #00b7ee">
                     <span style="" @click="downloadFileNew(value.id)" :title="value.name">{{ value.name  }}</span>
                   </div>
@@ -314,6 +316,14 @@
                     - -
                   </div>
                 </el-form-item>
+                <el-form-item label="发布稿(译文)" prop="fbgywbdName" class="add-form-item form-item-disabled">
+                  <div v-if="fbgywbdFileMap.length>0" v-for="(value,index)  in this.fbgywbdFileMap" :key="index" style="cursor: pointer;color: #00b7ee">
+                    <span style="" @click="downloadFileNew(value.id)" :title="value.name">{{ value.name  }}</span>
+                  </div>
+                  <div v-else>
+                    - -
+                  </div>
+                </el-form-item>
                 <el-form-item v-if="form.standInData === '1'" label="增补件" prop="zbjbdName" class="add-form-item form-item-disabled">
                   <div v-if="zbjbdFileMap.length>0" v-for="(value,index)  in this.zbjbdFileMap" :key="index" style="cursor: pointer;color: #00b7ee">
                     <span style="" @click="downloadFileNew(value.id)" :title="value.name">{{ value.name  }}</span>
@@ -366,14 +376,7 @@
                     - -
                   </div>
                 </el-form-item>
-                <el-form-item label="发布稿（译文）" prop="fbgywbdName" class="add-form-item form-item-disabled">
+
-                  <div v-if="fbgywbdFileMap.length>0" v-for="(value,index)  in this.fbgywbdFileMap" :key="index" style="cursor: pointer;color: #00b7ee">
-                    <span style="" @click="downloadFileNew(value.id)" :title="value.name">{{ value.name  }}</span>
-                  </div>
-                  <div v-else>
-                    - -
-                  </div>
-                </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="报批稿" prop="bpgName" class="add-form-item form-item-disabled">
                   <div v-if="bpgFileMap.length>0" v-for="(value,index)  in this.bpgFileMap" :key="index" style="cursor: pointer;color: #00b7ee">
                     <span style="" @click="downloadFileNew(value.id)" :title="value.name">{{ value.name  }}</span>

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

@@ -107,7 +107,9 @@
                   </el-radio-group>
                 </el-form-item>
                 <el-form-item label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
+                  <el-tooltip :disabled="!form.standSystem" effect="dark" :content=form.standSystem placement="top-start">
                     <el-input v-model="form.standSystem" disabled></el-input>
+                  </el-tooltip>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -275,7 +277,7 @@
                     - -
                   </div>
                 </el-form-item>
-                <el-form-item label="发布稿" prop="fbgbjbdName" class="add-form-item form-item-disabled">
+                <el-form-item label="发布稿(原文)" prop="fbgbjbdName" class="add-form-item form-item-disabled">
                   <div v-if="form.fbgbjbdName" v-for="(value,index)  in this.fbgbjbdFileMap" :key="index"  style="cursor: pointer;color: #00b7ee">
                     <span style="" @click="downloadFileNew(value.id)" :title="value.name">{{ value.name  }}</span>
                   </div>
@@ -283,6 +285,14 @@
                     - -
                   </div>
                 </el-form-item>
+                <el-form-item label="发布稿(译文)" prop="fbgywbdName" class="add-form-item form-item-disabled">
+                  <div v-if="form.fbgywbdName" v-for="(value,index)  in this.fbgywbdFileMap" :key="index"  style="cursor: pointer;color: #00b7ee">
+                    <span style="" @click="downloadFileNew(value.id)" :title="value.name">{{ value.name  }}</span>
+                  </div>
+                  <div v-else>
+                    - -
+                  </div>
+                </el-form-item>
                 <el-form-item v-if="form.standInData === '1'" label="增补件" prop="zbjbdName" class="add-form-item form-item-disabled">
                   <div  v-if="form.zbjbdName"  v-for="(value,index)  in this.zbjbdFileMap" :key="index" style="cursor: pointer;color: #00b7ee">
                     <span style="" @click="downloadFileNew(value.id)" :title="value.name">{{ value.name  }}</span>
@@ -327,14 +337,7 @@
                     - -
                   </div>
                 </el-form-item>
-                <el-form-item label="发布稿（译文）" prop="fbgywbdName" class="add-form-item form-item-disabled">
+
-                  <div v-if="form.fbgywbdName" v-for="(value,index)  in this.fbgywbdFileMap" :key="index"  style="cursor: pointer;color: #00b7ee">
-                    <span style="" @click="downloadFileNew(value.id)" :title="value.name">{{ value.name  }}</span>
-                  </div>
-                  <div v-else>
-                    - -
-                  </div>
-                </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="报批稿" prop="bpgName" class="add-form-item form-item-disabled">
                   <div v-if="form.bpgName" v-for="(value,index)  in this.bpgFileMap" :key="index" style="cursor: pointer;color: #00b7ee">
                     <span style="" @click="downloadFileNew(value.id)" :title="value.name">{{ value.name  }}</span>

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

@@ -61,7 +61,9 @@
                   ></el-input>
                 </el-form-item>
                 <el-form-item label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
+                  <el-tooltip :disabled="!form.standSystem" effect="dark" :content=form.standSystem placement="top-start">
                     <el-input v-model="form.standSystem" clearable placeholder="选择标准体系" @click.native="choiceZRR1('standSystem', '标准体系', form.standSystem)"></el-input>
+                  </el-tooltip>
                   <tree-select-new
                     :key="key"
                     :multiple=false
@@ -433,7 +435,7 @@
                     </div>
                   </div>
                 </el-form-item>
-                <el-form-item label="发布稿" prop="fbgbjbdName" class="add-form-item form-item-disabled">
+                <el-form-item label="发布稿(原文)" prop="fbgbjbdName" class="add-form-item form-item-disabled">
                   <el-input
                     disabled
                     style="display: none;"
@@ -458,6 +460,14 @@
                     </div>
                   </div>
                 </el-form-item>
+                <el-form-item label="发布稿(译文)" prop="fbgywbdName" class="add-form-item form-item-disabled">
+                  <div v-if="form.fbgywbdName" v-for="(value,index)  in this.fbgywbdFileMap" :key="index"  style="cursor: pointer;color: #00b7ee">
+                    <span style="" @click="downloadFileNew(value.id)" :title="value.name">{{ value.name  }}</span>
+                  </div>
+                  <div v-else>
+                    - -
+                  </div>
+                </el-form-item>
                 <el-form-item v-show="form.standInData === '0'" label="送审稿" prop="ssg" class="add-form-item form-item-disabled">
                   <el-input
                     disabled
@@ -726,14 +736,7 @@
                     </div>
                   </div>
                 </el-form-item>
-                <el-form-item label="发布稿（译文）" prop="fbgywbdName" class="add-form-item form-item-disabled">
+
-                  <div v-if="form.fbgywbdName" v-for="(value,index)  in this.fbgywbdFileMap" :key="index"  style="cursor: pointer;color: #00b7ee">
-                    <span style="" @click="downloadFileNew(value.id)" :title="value.name">{{ value.name  }}</span>
-                  </div>
-                  <div v-else>
-                    - -
-                  </div>
-                </el-form-item>
                 <el-form-item v-show="form.standInData === '0'" label="报批稿" prop="bpg" class="add-form-item form-item-disabled">
                   <el-input
                     disabled
@@ -1560,6 +1563,7 @@
       @checkedRole="checkedRole2"
       :nodeList="nodeList2"
     ></Role-tree>
+    <loading :loading="ccc">加载数据</loading>
   </div>
 </template>
 
@@ -1599,6 +1603,7 @@ export default {
     return {
       submitType: '',
       bpnId: '',
+      ccc: false,
       modalShowRoleFlag: false,
       fileList: [],
       caFileList: [],
@@ -2530,15 +2535,40 @@ export default {
     //   }
     //   this.modalShowFlag4 = false
     // },
-
+    async menu2(id,name){
-    popoverHide(checkedIds, checkedData, isShow, isLoadChild, topId) {
+      let res = await this.selectMenu2(id,name)
-      if (checkedData) {
+      if(res && res.data){
-        if (checkedData.length > 0 && checkedData.length != 0) {
+        this.form.standSystem = res.data
-          this.form.standSystem = checkedData.map(item => item.menuName).join(",")
-        } else {
-          this.form.standSystem = checkedData.menuName
-        }
         this.modalShowFlag1 = false
+        this.ccc = false
+      }
+    },
+    selectMenu2(id,name) {
+      const param = {}
+      if(id && id !== ""){
+        param.id = id
+      }
+
+      if(name && name !== ""){
+        param.menuName = name
+      }
+      return new Promise((resolve, reject) => {
+        this.$http.get('lawss/sarMenuStandardLimit/getTopMenu', param, {
+          _this: this
+        }, res => {
+          resolve(res)
+        })
+      })
+    },
+    popoverHide(checkedIds, checkedData, isShow, isLoadChild, topId) {
+      this.ccc = true
+      if (checkedData) {
+        this.menu2(checkedIds,"")
+        // if (checkedData.length > 0 && checkedData.length !== 0) {
+        //   this.form.standSystem = checkedData.map(item => item.menuName).join(",")
+        // } else {
+        //   this.form.standSystem = checkedData.menuName
+        // }
       }
 
     },
@@ -2982,16 +3012,20 @@ export default {
         this.$set(this.textStatusMap, item.value, item.label)
       })
     },
-  },
+    getDicTypeListCode(res,json) {
-  created() {
+      return new Promise((resolve, reject) => {
-    this.getData()
-  },
-  mounted() {
-    this.bpnId = this.$route.query.bpnId
-    this.processTable()
         this.$http.get('sys/dictype/getDicTypeListCode', '', {
           _this: this
         }, res => {
+          const history = res;
+          resolve(history)
+        })
+      })
+    },
+    async getDataAsync(){
+      this.ccc = true
+      let res = await this.getDicTypeListCode()
+      if(res && res.data){
         this.countryOptions = res.data.COUNTRY//国家地区
         this.standSortOptions = res.data.STANDCLASSIFY // 标准类别
         this.standNatureOptions = res.data.SARPROPERTY // 标准性质
@@ -3013,7 +3047,17 @@ export default {
         this.treeStatus = true
         this.key++
         this.setMap(this.standStateOptions);
-    })
+        this.ccc = false
+      }
+    },
+  },
+  created() {
+  },
+  mounted() {
+    this.bpnId = this.$route.query.bpnId
+    this.getData()
+    this.getDataAsync()
+    this.processTable()
     this.busVsFunc()
     this.modelFunc()
   },

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

@@ -171,7 +171,9 @@
               </el-col>
               <el-col :span="12">
                 <el-form-item label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
+                  <el-tooltip :disabled="!form.standSystem" effect="dark" :content=form.standSystem placement="top-start">
                     <el-input v-model="form.standSystem" disabled></el-input>
+                  </el-tooltip>
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '1'" label="标签" prop="gxhbq" class="add-form-item form-item-disabled">
                   <el-input
@@ -306,7 +308,7 @@
                     - -
                   </div>
                 </el-form-item>
-                <el-form-item label="发布稿" prop="fbgbjbdName" class="add-form-item form-item-disabled">
+                <el-form-item label="发布稿(原文)" prop="fbgbjbdName" class="add-form-item form-item-disabled">
                   <div v-if="fbgbjbdFileMap.length>0" v-for="(value,index)  in this.fbgbjbdFileMap" :key="index" style="cursor: pointer;color: #00b7ee">
                     <span style="" @click="downloadFileNew(value.id)" :title="value.name">{{ value.name  }}</span>
                   </div>
@@ -314,6 +316,14 @@
                     - -
                   </div>
                 </el-form-item>
+                <el-form-item label="发布稿(译文)" prop="fbgywbdName" class="add-form-item form-item-disabled">
+                  <div v-if="form.fbgywbdName" v-for="(value,index)  in this.fbgywbdFileMap" :key="index"  style="cursor: pointer;color: #00b7ee">
+                    <span style="" @click="downloadFileNew(value.id)" :title="value.name">{{ value.name  }}</span>
+                  </div>
+                  <div v-else>
+                    - -
+                  </div>
+                </el-form-item>
                 <el-form-item v-if="form.standInData === '1'" label="增补件" prop="zbjbdName" class="add-form-item form-item-disabled">
                   <div v-if="zbjbdFileMap.length>0" v-for="(value,index)  in this.zbjbdFileMap" :key="index" style="cursor: pointer;color: #00b7ee">
                     <span style="" @click="downloadFileNew(value.id)" :title="value.name">{{ value.name  }}</span>
@@ -366,14 +376,7 @@
                     - -
                   </div>
                 </el-form-item>
-                <el-form-item label="发布稿（译文）" prop="fbgywbdName" class="add-form-item form-item-disabled">
+
-                  <div v-if="form.fbgywbdName" v-for="(value,index)  in this.fbgywbdFileMap" :key="index"  style="cursor: pointer;color: #00b7ee">
-                    <span style="" @click="downloadFileNew(value.id)" :title="value.name">{{ value.name  }}</span>
-                  </div>
-                  <div v-else>
-                    - -
-                  </div>
-                </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="报批稿" prop="bpgName" class="add-form-item form-item-disabled">
                   <div v-if="bpgFileMap.length>0" v-for="(value,index)  in this.bpgFileMap" :key="index" style="cursor: pointer;color: #00b7ee">
                     <span style="" @click="downloadFileNew(value.id)" :title="value.name">{{ value.name  }}</span>

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

@@ -374,6 +374,7 @@
         </div>
       </el-upload>
     </el-dialog>
+    <loading :loading="ccc">加载数据</loading>
   </div>
 </template>
 
@@ -400,6 +401,7 @@ export default {
       },
       activeNames: '1',
       bpnId: '',
+      ccc:false,
       fileUrl: 'api/att/attFile/uploadNew',
       fileMadel: false,
       OCRoptions: [],
@@ -520,6 +522,7 @@ export default {
   },
   methods: {
     getTaskId() {
+      this.ccc = true
       queryTaskFirst({
         bpnId: this.$route.query.bpnId
       }).then(res => {
@@ -527,6 +530,7 @@ export default {
         this.form = JSON.parse(JSON.stringify(mes.form))
         this.roleForm = mes.roleForm
         this.commentText = mes.commentText
+        this.getFileTypeHGAsync(this.form.standId)
       })
     },
     filesUpload (file) { // 下载
@@ -762,6 +766,23 @@ export default {
         this.$message.warning("请选择一条数据进行带入");
       }
     },
+    async getFileTypeHGAsync(standId){
+      let res = await this.getFileTypeHG(standId)
+      if(res && res.data){
+        this.textTypeList = res.data
+        this.ccc = false
+      }
+    },
+    getFileTypeHG(standId) {
+      return new Promise((resolve, reject) => {
+        this.$http.get('SarStandItems/sar-stand-items/getFileTypeHG', {standId: standId}, {
+          _this: this
+        }, res => {
+          const history = res;
+          resolve(history)
+        })
+      })
+    },
     /*** **********************************************/
     /** 流程节点负责人的选择 *****************************/
     checkedRole2(data) {

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

@@ -53,13 +53,13 @@
                                     ></el-input>
                                 </el-form-item>
                                 <el-form-item label="发布日期" prop="issueTime" class="add-form-item form-item-disabled">
-                                    <el-datePicker v-model="form.issueTime"
+                                    <el-datePicker :disabled="disabledXX" v-model="form.issueTime"
                                                    placeholder="请选择发布日期"
                                                    :editable="false"
                                     ></el-datePicker>
                                 </el-form-item>
                                 <el-form-item v-show="verifySarStandard" label="企标备案日期" prop="BARQ" class="add-form-item form-item-disabled">
-                                    <el-datePicker v-model="form.BARQ"
+                                    <el-datePicker :disabled="disabledXX" v-model="form.BARQ"
                                                    :editable="false"
                                                    placeholder="请选择企标备案日期"
                                                    value-format="yyyy-MM-dd"
@@ -83,7 +83,7 @@
                                               clearable></el-input>
                                 </el-form-item>
 <!--                                <el-form-item v-show="verifySarStandard" label="复审日期" prop="FSRQBUSS" class="add-form-item form-item-disabled">-->
-<!--                                    <el-datePicker v-model="form.FSRQBUSS"-->
+<!--                                    <el-datePicker :disabled="disabledXX" v-model="form.FSRQBUSS"-->
 <!--                                                   :editable="false"-->
 <!--                                                   disabled-->
 <!--                                                   placeholder="请选择废止日期"-->
@@ -152,25 +152,25 @@
                                     ></el-input>
                                 </el-form-item>
                                 <el-form-item v-show="verifySarStandard"label="截止日期" prop="expirationDate" class="add-form-item form-item-disabled">
-                                    <el-datePicker v-model="form.expirationDate"
+                                    <el-datePicker :disabled="disabledXX" v-model="form.expirationDate"
                                                    placeholder="请选择截止日期"
                                                    :editable="false"
                                     ></el-datePicker>
                                 </el-form-item>
                                 <el-form-item v-show="verifySarStandard" label="企标实施日期" prop="putTime" class="add-form-item form-item-disabled">
-                                    <el-datePicker v-model="form.putTime"
+                                    <el-datePicker :disabled="disabledXX" v-model="form.putTime"
                                                    :editable="false"
                                                    placeholder="请选择企标实施日期"
                                                    value-format="yyyy-MM-dd"
                                     ></el-datePicker>
                                 </el-form-item>
 <!--                                <el-form-item v-show="verifySarStandard" label="发布日期" prop="issueTime" class="add-form-item form-item-disabled">-->
-<!--                                    <el-datePicker v-model="form.issueTime"-->
+<!--                                    <el-datePicker :disabled="disabledXX" v-model="form.issueTime"-->
 <!--                                                   :editable="false"-->
 <!--                                                   placeholder="请选择发布日期"></el-datePicker>-->
 <!--                                </el-form-item>-->
 <!--                                <el-form-item v-show="verifySarStandard" label="废止日期" prop="FZRQBUSS" class="add-form-item form-item-disabled">-->
-<!--                                    <el-datePicker v-model="form.FZRQBUSS"-->
+<!--                                    <el-datePicker :disabled="disabledXX" v-model="form.FZRQBUSS"-->
 <!--                                                   :editable="false"-->
 <!--                                                   placeholder="请选择废止日期"-->
 <!--                                                   value-format="yyyy-MM-dd"-->
@@ -1023,7 +1023,7 @@
                 @checkedRole="drawerCheckZRBM"
         />
         <!-- 组件树-->
-        <tree-select-new
+        <tree-select-new v-if="!disabledXX"
                 :key="key"
                 :multiple=false
                 :lazy=false
@@ -1033,7 +1033,7 @@
                 :data="standSystemOptions"
                 :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"
                 :nodeKey="nodeKey" @popoverHide="popoverHide" @popoverHideCancel="popoverHideCancel"></tree-select-new>
-    <tree-select-new
+    <tree-select-new v-if="!disabledXX"
             width = "500"
             :lazy=true
             :multiple="multipleFlag2"
@@ -1046,7 +1046,7 @@
             :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1"
             :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"
             @popoverHideCancel="popoverHideBusVsCancel"></tree-select-new>
-    <tree-select-new
+    <tree-select-new v-if="!disabledXX"
             width="500"
             :lazy=true
             :multiple=true
@@ -1071,7 +1071,7 @@
             :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"
             :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel"
             @popoverHideCancel="popoverHideModelCancel()"></tree-select-module>
-    <loading :loading="ccc"></loading>
+    <loading :loading="ccc">加载数据</loading>
     </div>
 </template>
 

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

@@ -66,7 +66,7 @@
 <!--                                              clearable></el-input>-->
 <!--                                </el-form-item>-->
 <!--                                <el-form-item v-show="verifySarStandard" label="复审日期" prop="FSRQBUSS" class="add-form-item form-item-disabled">-->
-<!--                                    <el-datePicker v-model="form.FSRQBUSS"-->
+<!--                                    <el-datePicker :disabled="disabledXX"  v-model="form.FSRQBUSS"-->
 <!--                                                   :editable="false"-->
 <!--                                                   disabled-->
 <!--                                                   placeholder="请选择废止日期"-->
@@ -109,19 +109,19 @@
                                     ></el-input>
                                 </el-form-item>
                                 <el-form-item v-show="verifySarStandard" label="企标实施日期" prop="putTime" class="add-form-item form-item-disabled">
-                                    <el-datePicker v-model="form.putTime"
+                                    <el-datePicker :disabled="disabledXX"  v-model="form.putTime"
                                                    :editable="false"
                                                    placeholder="请选择企标实施日期"
                                                    value-format="yyyy-MM-dd"
                                     ></el-datePicker>
                                 </el-form-item>
 <!--                                <el-form-item v-show="verifySarStandard" label="发布日期" prop="issueTime" class="add-form-item form-item-disabled">-->
-<!--                                    <el-datePicker v-model="form.issueTime"-->
+<!--                                    <el-datePicker :disabled="disabledXX"  v-model="form.issueTime"-->
 <!--                                                   :editable="false"-->
 <!--                                                   placeholder="请选择发布日期"></el-datePicker>-->
 <!--                                </el-form-item>-->
 <!--                                <el-form-item v-show="verifySarStandard" label="废止日期" prop="FZRQBUSS" class="add-form-item form-item-disabled">-->
-<!--                                    <el-datePicker v-model="form.FZRQBUSS"-->
+<!--                                    <el-datePicker :disabled="disabledXX"  v-model="form.FZRQBUSS"-->
 <!--                                                   :editable="false"-->
 <!--                                                   placeholder="请选择废止日期"-->
 <!--                                                   value-format="yyyy-MM-dd"-->
@@ -1049,7 +1049,7 @@
                 @checkedRole="drawerCheckZRBM"
         />
         <!-- 组件树-->
-        <tree-select-new
+        <tree-select-new v-if="!disabledXX"
                 :multiple=false
                 :lazy=false
                 :modalShowFlag="modalShowFlag1"
@@ -1058,7 +1058,7 @@
                 :data="standSystemOptions"
                 :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"
                 :nodeKey="nodeKey" @popoverHide="popoverHide" @popoverHideCancel="popoverHideCancel"></tree-select-new>
-    <tree-select-new
+    <tree-select-new v-if="!disabledXX"
             width = "500"
             :lazy=true
             :multiple="multipleFlag2"
@@ -1071,7 +1071,7 @@
             :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1"
             :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"
             @popoverHideCancel="popoverHideBusVsCancel"></tree-select-new>
-    <tree-select-new
+    <tree-select-new v-if="!disabledXX"
             width="500"
             :lazy=true
             :multiple=true
@@ -1084,7 +1084,7 @@
             :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys2"
             :nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs"
             @popoverHideCancel="popoverHideCarVsCancel()"></tree-select-new>
-    <tree-select-module
+    <tree-select-module v-if="!disabledXX"
             width="500"
             :lazy=true
             :multiple=true
@@ -1096,7 +1096,7 @@
             :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"
             :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel"
             @popoverHideCancel="popoverHideModelCancel()"></tree-select-module>
-    <tree-select-module
+    <tree-select-module v-if="!disabledXX"
             width="500"
             :lazy=true
             :multiple=true
@@ -1109,7 +1109,7 @@
             :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys4"
             :nodeKey="nodeKeyModel" @popoverHide="popoverCarHideModel"
             @popoverHideCancel="popoverCarHideModelCancel()"></tree-select-module>
-    <loading :loading="ccc"></loading>
+    <loading :loading="ccc">加载数据</loading>
     </div>
 </template>
 

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

@@ -27,7 +27,7 @@
                 <el-button :disabled="disabledXX" size="mini" type="primary" style="margin-left: 10px;" @click="choiceShow">选择项目</el-button>
               </el-form-item>
               <el-form-item label="项目编号" prop="projectNumber" class="add-form-item form-item-disabled">
-                <el-input
+                <el-input :disabled="disabledXX"
                   v-model="listForm.projectNumber"
                   placeholder="请输入项目编号"
                   disabled
@@ -35,7 +35,7 @@
                 ></el-input>
               </el-form-item>
               <el-form-item label="项目名称" prop="projectName" class="add-form-item form-item-disabled">
-                <el-input
+                <el-input :disabled="disabledXX"
                   v-model="listForm.projectName"
                   placeholder="请输入项目名称"
                   disabled
@@ -153,7 +153,7 @@
         <el-collapse accordion>
           <el-collapse-item title="回执说明">
             <div style="margin: 10px 0;">
-              <el-input
+              <el-input :disabled="disabledXX"
                 type="textarea"
                 :rows="3"
                 resize="none"
@@ -178,8 +178,8 @@
                 <el-form-item prop="startUserName" style="margin-bottom: 0">
                   <h4>流程发起人</h4>
                   <div style="margin-top: 10px;width: 300px;">
-                    <el-input v-model="roleForm.startUser" style="display: none;"></el-input>
+                    <el-input :disabled="disabledXX"  v-model="roleForm.startUser" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.startUserName" placeholder="流程发起人" disabled></el-input>
+                    <el-input :disabled="disabledXX"  v-model="roleForm.startUserName" placeholder="流程发起人" disabled></el-input>
                   </div>
                 </el-form-item>
               </el-card>
@@ -189,8 +189,8 @@
                 <el-form-item prop="serviceManagerName" style="margin-bottom: 0">
                   <h4>审批责任人</h4>
                   <div style="margin-top: 10px;width: 300px;">
-                    <el-input v-model="roleForm.serviceManager" style="display: none;"></el-input>
+                    <el-input :disabled="disabledXX"  v-model="roleForm.serviceManager" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.serviceManagerName" placeholder="标准法规业务经理"
+                    <el-input :disabled="disabledXX"  v-model="roleForm.serviceManagerName" placeholder="标准法规业务经理"
                               @click.native="choiceZRR('serviceManager', '选择业务经理', roleForm.serviceManager)">
                     </el-input>
                   </div>
@@ -203,8 +203,8 @@
                 <el-form-item prop="engineeringManagerName" style="margin-bottom: 0">
                   <h4>工程经理</h4>
                   <div style="margin-top: 10px;width: 300px;">
-                    <el-input v-model="roleForm.engineeringManager" style="display: none;"></el-input>
+                    <el-input :disabled="disabledXX"  v-model="roleForm.engineeringManager" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.engineeringManagerName" placeholder="选择工程经理"
+                    <el-input :disabled="disabledXX"  v-model="roleForm.engineeringManagerName" placeholder="选择工程经理"
                               @click.native="choiceZRR('engineeringManager', '选择工程经理', roleForm.engineeringManager)"></el-input>
                   </div>
                 </el-form-item>
@@ -215,8 +215,8 @@
                 <el-form-item prop="statuteMinisterName" style="margin-bottom: 0">
                   <h4>标准法规部部长</h4>
                   <div style="margin-top: 10px;width: 300px;">
-                    <el-input v-model="roleForm.statuteMinister" style="display: none;"></el-input>
+                    <el-input :disabled="disabledXX"  v-model="roleForm.statuteMinister" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.statuteMinisterName" placeholder="选择标准法规部部长"
+                    <el-input :disabled="disabledXX"  v-model="roleForm.statuteMinisterName" placeholder="选择标准法规部部长"
                               @click.native="choiceZRR('statuteMinister', '选择标准法规部部长', roleForm.statuteMinister)"></el-input>
                   </div>
                 </el-form-item>
@@ -255,13 +255,13 @@
             <div class="left">
               <el-form :modal="projectSearch" :inline="true" class="label-input-form" style="margin-left:10px">
                 <el-form-item label="项目编号" class="search-item search-item-last">
-                  <el-input
+                  <el-input :disabled="disabledXX"
                     v-model="projectSearch.projectNumber"
                     placeholder="请输入项目编号"
                   ></el-input>
                 </el-form-item>
                 <el-form-item label="项目名称" class="search-item search-item-last">
-                  <el-input
+                  <el-input :disabled="disabledXX"
                     v-model="projectSearch.projectName"
                     placeholder="请输入项目名称"
                   ></el-input>

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

@@ -501,7 +501,7 @@ export default {
         case '10':
           //项目评估流程- 项目
           this.$router.push({
-            name: 'xmpgStep1'
+            name: 'xmpg2Step1'
           })
           break
         case '11':

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

@@ -1438,7 +1438,7 @@
           <div class="search-area">
               <div class="left">
                   <el-form :modal="replaceLawsNumForm" :inline="true" class="label-input-form">
-                      <el-form-item label="编号/名称" class="search-item">
+                      <el-form-item label="编号" class="search-item">
                           <el-input
                                   v-model="replaceLawsNumForm.standCode"
                                   placeholder="根据企标编号查找"

src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue

@@ -1357,6 +1357,7 @@
                             drafterName: command[0].drafterName, // 起草人
                             drafter: command[0].drafter,
                             }
+                        if(command[0].lxd && command[0].lxd !== 'null'){
                             this.addForm.LXD = command[0].lxd
                             let fileName1 = ""
                             if(this.addForm.esName && this.addForm.esName !== ''){
@@ -1366,6 +1367,21 @@
                             }
                             this.addForm.lxdName = fileName1
                             this.LXDList=this.assemble(command[0].lxd,fileName1)
+                        }else {
+                            this.$http.get('/lawss/activiti/saveEditFile', {
+                                model: 'model_lx'
+                            },{
+                                _this: this
+                            }, res => {
+                                if(res){
+                                    this.addForm.lxd = res.id
+                                    this.addForm.lxdName = '立项单'
+                                    this.LXDList=this.assemble(res.id,'立项单');
+                                }
+
+                            })
+                        }
+
                         if (typeof (this.addForm.area) === 'string') {
                             this.addForm.area = command[0].area.split(',')
                         }
@@ -1399,14 +1415,30 @@
                         this.addDrawer = true
                         this.addForm = command[0]
                         this.addForm.LXD = command[0].lxd
-                        let fileName = ""
+                        if(command[0].lxd && command[0].lxd !== 'null'){
+                            this.addForm.LXD = command[0].lxd
+                            let fileName1 = ""
                             if(this.addForm.esName && this.addForm.esName !== ''){
-                            fileName = this.addForm.esName+'-立项单'
+                                fileName1 = this.addForm.esName+'-立项单'
                             }else {
-                            fileName = '立项单'
+                                fileName1 = '立项单'
+                            }
+                            this.addForm.lxdName = fileName1
+                            this.LXDList=this.assemble(command[0].lxd,fileName1)
+                        }else {
+                            this.$http.get('/lawss/activiti/saveEditFile', {
+                                model: 'model_lx'
+                            },{
+                                _this: this
+                            }, res => {
+                                if(res){
+                                    this.addForm.lxd = res.id
+                                    this.addForm.lxdName = '立项单'
+                                    this.LXDList=this.assemble(res.id,'立项单');
+                                }
+
+                            })
                         }
-                        this.addForm.lxdName = fileName
-                        this.LXDList=this.assemble(command[0].lxd,fileName);
                         if (typeof (this.addForm.area) === 'string') {
                             this.addForm.area = command[0].area.split(',')
                         }