Merge branch 'develop' into FOTON

# Conflicts:
#	src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

src/components/treeSelect/treeSelectNew.vue

@@ -10,6 +10,7 @@
             >
         <el-tree class="common-tree" :style="style" ref="tree" :data="data" :props="defaultProps"
                  :load="loadNode"
+                 v-if="modalShowFlag"
                  :lazy="lazy"
                  :show-checkbox="multiple"
                  :node-key="nodeKey"

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

@@ -440,6 +440,7 @@
                         <el-form-item label="上一版本差异点" prop="changePoint" class="add-form-item" v-if="sarType === 'INLAND' && form.itemsNum1">
                             <el-input
                                     type="textarea"
+                                    :autosize="{ minRows: 4, maxRows: 14}"
                                     v-model="plForm.changePoint"
                                     placeholder="请输入上一版本差异点"
                                     maxlength="500"

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

@@ -448,6 +448,7 @@
             <el-form-item label="上一版本差异点" prop="changePoint" class="add-form-item" v-if="sarType === 'INLAND' && form.itemsNum1">
               <el-input
                       type="textarea"
+                      :autosize="{ minRows: 4, maxRows: 14}"
                       v-model="plForm.changePoint"
                       placeholder="请输入上一版本差异点"
                       maxlength="500"

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

@@ -319,6 +319,7 @@
                     <el-form-item label="上一版本差异点" prop="changePoint" class="add-form-item" v-if="sarType === 'INLAND' && form.itemsNum1">
                         <el-input
                                 type="textarea"
+                                :autosize="{ minRows: 4, maxRows: 14}"
                                 v-model="plForm.changePoint"
                                 placeholder="请输入上一版本差异点"
                                 maxlength="500"
@@ -406,6 +407,7 @@
                     <el-form-item label="上一版本差异点" prop="changePoint" class="add-form-item" v-if="sarType === 'INLAND' && form.itemsNum1">
                         <el-input
                                 type="textarea"
+                                :autosize="{ minRows: 4, maxRows: 14}"
                                 v-model="editForm.changePoint"
                                 placeholder="请输入上一版本差异点"
                                 maxlength="500"

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

@@ -48,7 +48,7 @@
                     clearable
                   ></el-input>
                 </el-form-item>
-                <el-form-item v-if="verifySarStandard" label="标准年份" prop="standYear" class="add-form-item form-item-disabled">
+                <el-form-item v-if="verifySarStandard" label="标准年份" prop="" class="add-form-item form-item-disabled">
                   <el-input
                     v-model="form.standYear"
                     placeholder="请输入标准标准年份"
@@ -56,10 +56,18 @@
                   ></el-input>
                 </el-form-item>
                 <el-form-item label="标准中文名称" prop="standName" class="add-form-item form-item-disabled">
+                  <el-tooltip v-if="form.standName" effect="dark" :content=form.standName placement="top-start">
+                    <el-input
+                            v-model="form.standName"
+                            placeholder="请输入标准中文名称"
+                            clearable
+                    ></el-input>
+                  </el-tooltip>
                   <el-input
-                    v-model="form.standName"
+                          v-else
-                    placeholder="请输入标准中文名称"
+                          v-model="form.standName"
-                    clearable
+                          placeholder="请输入标准中文名称"
+                          clearable
                   ></el-input>
                 </el-form-item>
                 <el-form-item label="标准英文名称" prop="standEnName" class="add-form-item form-item-disabled">
@@ -833,7 +841,15 @@
             <el-row :gutter="24">
               <el-col :span="12">
                 <el-form-item label="代替标准号" prop="dtbjh" class="add-form-item form-item-disabled">
+                  <el-tooltip v-if="form.dtbjh" effect="dark" :content=form.dtbjh placement="top-start">
+                    <el-input
+                            v-model="form.dtbjh"
+                            placeholder="请输入代替标准号"
+                            clearable
+                    ></el-input>
+                  </el-tooltip>
                   <el-input
+                          v-else
                     v-model="form.dtbjh"
                     placeholder="请输入代替标准号"
                     clearable
@@ -893,7 +909,15 @@
                     v-model="form.bfdtbzh"
                     placeholder="请输入部分代替标准号"
                   ></el-input>
+                  <el-tooltip v-if="form.bfbdtbzh" effect="dark" :content=form.bfbdtbzh placement="top-start">
+                    <el-input
+                            v-model="form.bfbdtbzh"
+                            placeholder="请输入部分代替标准号"
+                            clearable
+                    ></el-input>
+                  </el-tooltip>
                   <el-input
+                          v-else
                     v-model="form.bfbdtbzh"
                     placeholder="请输入部分代替标准号"
                     clearable
@@ -908,7 +932,15 @@
                   </el-button>
                 </el-form-item>
                 <el-form-item v-show="form.standInData === '0'" label="采标编号" prop="cbbh" class="add-form-item form-item-disabled">
+                  <el-tooltip v-if="form.cbbh" effect="dark" :content=form.cbbh placement="top-start">
+                    <el-input
+                            v-model="form.cbbh"
+                            placeholder="请输入采标编号"
+                            clearable
+                    ></el-input>
+                  </el-tooltip>
                   <el-input
+                          v-else
                     v-model="form.cbbh"
                     placeholder="请输入采标编号"
                     clearable
@@ -923,7 +955,15 @@
                   </el-button>
                 </el-form-item>
                 <el-form-item label="引用标准" prop="yybj" class="add-form-item form-item-disabled">
+                  <el-tooltip v-if="form.yybj" effect="dark" :content=form.yybj placement="top-start">
+                    <el-input
+                            v-model="form.yybj"
+                            placeholder="请输入引用标准"
+                            clearable
+                    ></el-input>
+                  </el-tooltip>
                   <el-input
+                          v-else
                     v-model="form.yybj"
                     placeholder="请输入引用标准"
                     clearable

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

@@ -64,7 +64,15 @@
                   ></el-input>
                 </el-form-item>
                 <el-form-item label="标准中文名称" prop="standName" class="add-form-item form-item-disabled">
+                  <el-tooltip v-if="form.standName" effect="dark" :content=form.standName placement="top-start">
+                    <el-input
+                            v-model="form.standName"
+                            placeholder="请输入标准中文名称"
+                            clearable
+                    ></el-input>
+                  </el-tooltip>
                   <el-input
+                          v-else
                     disabled
                     v-model="form.standName"
                     placeholder="请输入标准中文名称"
@@ -547,11 +555,18 @@
             <el-row :gutter="24">
               <el-col :span="12">
                 <el-form-item label="代替标准号" prop="dtbjh" class="add-form-item form-item-disabled">
+                  <el-tooltip v-if="form.dtbjh" effect="dark" :content=form.dtbjh placement="top-start">
+                    <el-input
+                            v-model="form.dtbjh"
+                            placeholder="请输入代替标准号"
+                            clearable
+                    ></el-input>
+                  </el-tooltip>
                   <el-input
-                    disabled
+                          v-else
-                    v-model="form.dtbjh"
+                          v-model="form.dtbjh"
-                    placeholder="请输入代替标准号"
+                          placeholder="请输入代替标准号"
-                    clearable
+                          clearable
                   ></el-input>
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="采标程度" prop="cbcd" class="add-form-item form-item-disabled">
@@ -570,27 +585,48 @@
               </el-col>
               <el-col :span="12">
                 <el-form-item label="部分代替标准号" prop="bfbdtbzh" class="add-form-item form-item-disabled">
+                  <el-tooltip v-if="form.bfbdtbzh" effect="dark" :content=form.bfbdtbzh placement="top-start">
+                    <el-input
+                            v-model="form.bfbdtbzh"
+                            placeholder="请输入部分代替标准号"
+                            clearable
+                    ></el-input>
+                  </el-tooltip>
                   <el-input
-                    disabled
+                          v-else
-                    v-model="form.bfbdtbzh"
+                          v-model="form.bfbdtbzh"
-                    placeholder="请输入部分代替标准号"
+                          placeholder="请输入部分代替标准号"
-                    clearable
+                          clearable
                   ></el-input>
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="采标编号" prop="cbbh" class="add-form-item form-item-disabled">
+                  <el-tooltip v-if="form.cbbh" effect="dark" :content=form.cbbh placement="top-start">
+                    <el-input
+                            v-model="form.cbbh"
+                            placeholder="请输入采标编号"
+                            clearable
+                    ></el-input>
+                  </el-tooltip>
                   <el-input
-                    disabled
+                          v-else
-                    v-model="form.cbbh"
+                          v-model="form.cbbh"
-                    placeholder="请输入采标编号"
+                          placeholder="请输入采标编号"
-                    clearable
+                          clearable
                   ></el-input>
                 </el-form-item>
                 <el-form-item label="引用标准" prop="yybj" class="add-form-item form-item-disabled">
+                  <el-tooltip v-if="form.yybj" effect="dark" :content=form.yybj placement="top-start">
+                    <el-input
+                            v-model="form.yybj"
+                            placeholder="请输入引用标准"
+                            clearable
+                    ></el-input>
+                  </el-tooltip>
                   <el-input
-                    disabled
+                          v-else
-                    v-model="form.yybj"
+                          v-model="form.yybj"
-                    placeholder="请输入引用标准"
+                          placeholder="请输入引用标准"
-                    clearable
+                          clearable
                   ></el-input>
                 </el-form-item>
               </el-col>

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

@@ -64,11 +64,19 @@
                   ></el-input>
                 </el-form-item>
                 <el-form-item label="标准中文名称" prop="standName" class="add-form-item form-item-disabled">
+                  <el-tooltip v-if="form.standName" effect="dark" :content=form.standName placement="top-start">
+                    <el-input
+                            v-model="form.standName"
+                            placeholder="请输入标准中文名称"
+                            clearable
+                    ></el-input>
+                  </el-tooltip>
                   <el-input
-                      disabled
+                          v-else
-                      v-model="form.standName"
+                          disabled
-                      placeholder="请输入标准中文名称"
+                          v-model="form.standName"
-                      clearable
+                          placeholder="请输入标准中文名称"
+                          clearable
                   ></el-input>
                 </el-form-item>
                 <el-form-item label="标准英文名称" prop="standEnName" class="add-form-item form-item-disabled">
@@ -499,11 +507,18 @@
             <el-row :gutter="24">
               <el-col :span="12">
                 <el-form-item label="代替标准号" prop="dtbjh" class="add-form-item form-item-disabled">
+                  <el-tooltip v-if="form.dtbjh" effect="dark" :content=form.dtbjh placement="top-start">
+                    <el-input
+                            v-model="form.dtbjh"
+                            placeholder="请输入代替标准号"
+                            clearable
+                    ></el-input>
+                  </el-tooltip>
                   <el-input
-                      disabled
+                          v-else
-                      v-model="form.dtbjh"
+                          v-model="form.dtbjh"
-                      placeholder="请输入代替标准号"
+                          placeholder="请输入代替标准号"
-                      clearable
+                          clearable
                   ></el-input>
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="采标程度" prop="cbcd" class="add-form-item form-item-disabled">
@@ -530,27 +545,48 @@
               </el-col>
               <el-col :span="12">
                 <el-form-item label="部分代替标准号" prop="bfbdtbzh" class="add-form-item form-item-disabled">
+                  <el-tooltip v-if="form.bfbdtbzh" effect="dark" :content=form.bfbdtbzh placement="top-start">
+                    <el-input
+                            v-model="form.bfbdtbzh"
+                            placeholder="请输入部分代替标准号"
+                            clearable
+                    ></el-input>
+                  </el-tooltip>
                   <el-input
-                      disabled
+                          v-else
-                      v-model="form.bfbdtbzh"
+                          v-model="form.bfbdtbzh"
-                      placeholder="请输入部分代替标准号"
+                          placeholder="请输入部分代替标准号"
-                      clearable
+                          clearable
                   ></el-input>
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="采标编号" prop="cbbh" class="add-form-item form-item-disabled">
+                  <el-tooltip v-if="form.cbbh" effect="dark" :content=form.cbbh placement="top-start">
+                    <el-input
+                            v-model="form.cbbh"
+                            placeholder="请输入采标编号"
+                            clearable
+                    ></el-input>
+                  </el-tooltip>
                   <el-input
-                      disabled
+                          v-else
-                      v-model="form.cbbh"
+                          v-model="form.cbbh"
-                      placeholder="请输入采标编号"
+                          placeholder="请输入采标编号"
-                      clearable
+                          clearable
                   ></el-input>
                 </el-form-item>
                 <el-form-item label="引用标准" prop="yybj" class="add-form-item form-item-disabled">
+                  <el-tooltip v-if="form.yybj" effect="dark" :content=form.yybj placement="top-start">
+                    <el-input
+                            v-model="form.yybj"
+                            placeholder="请输入引用标准"
+                            clearable
+                    ></el-input>
+                  </el-tooltip>
                   <el-input
-                      disabled
+                          v-else
-                      v-model="form.yybj"
+                          v-model="form.yybj"
-                      placeholder="请输入引用标准"
+                          placeholder="请输入引用标准"
-                      clearable
+                          clearable
                   ></el-input>
                 </el-form-item>
 <!--                <el-form-item label="被引用标准" prop="byybj" class="add-form-item form-item-disabled">-->

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

@@ -42,8 +42,6 @@
                     ></el-option>
                   </el-select>
                 </el-form-item>
-
-
                 <el-form-item label="标准类别" prop="standSort" class="add-form-item form-item-disabled">
                   <el-select v-model="form.standSort" filterable placeholder="请选择标准类别">
                     <el-option
@@ -63,10 +61,19 @@
                   ></el-input>
                 </el-form-item>
                 <el-form-item label="标准中文名称" prop="standName" class="add-form-item form-item-disabled">
+                  <el-tooltip v-if="form.standName" effect="dark" :content=form.standName placement="top-start">
+                    <el-input
+                            v-model="form.standName"
+                            placeholder="请输入标准中文名称"
+                            clearable
+                    ></el-input>
+                  </el-tooltip>
                   <el-input
-                    v-model="form.standName"
+                          v-else
-                    placeholder="请输入标准中文名称"
+                          disabled
-                    clearable
+                          v-model="form.standName"
+                          placeholder="请输入标准中文名称"
+                          clearable
                   ></el-input>
                 </el-form-item>
                 <el-form-item label="标准英文名称" prop="standEnName" class="add-form-item form-item-disabled">
@@ -1070,10 +1077,18 @@
             <el-row :gutter="24">
               <el-col :span="12">
                 <el-form-item label="代替标准号" prop="dtbjh" class="add-form-item form-item-disabled">
+                  <el-tooltip v-if="form.dtbjh" effect="dark" :content=form.dtbjh placement="top-start">
+                    <el-input
+                            v-model="form.dtbjh"
+                            placeholder="请输入代替标准号"
+                            clearable
+                    ></el-input>
+                  </el-tooltip>
                   <el-input
-                    v-model="form.dtbjh"
+                          v-else
-                    placeholder="请输入代替标准号"
+                          v-model="form.dtbjh"
-                    clearable
+                          placeholder="请输入代替标准号"
+                          clearable
                   ></el-input>
                   <el-button
                     type="primary"
@@ -1125,9 +1140,22 @@
               <el-col :span="12">
                 <el-form-item label="部分代替标准号" prop="bfbdtbzh" class="add-form-item form-item-disabled">
                   <el-input
-                    v-model="form.bfbdtbzh"
+                          style="display:none;"
-                    placeholder="请输入部分代替标准号"
+                          v-model="form.bfdtbzh"
-                    clearable
+                          placeholder="请输入部分代替标准号"
+                  ></el-input>
+                  <el-tooltip v-if="form.bfbdtbzh" effect="dark" :content=form.bfbdtbzh placement="top-start">
+                    <el-input
+                            v-model="form.bfbdtbzh"
+                            placeholder="请输入部分代替标准号"
+                            clearable
+                    ></el-input>
+                  </el-tooltip>
+                  <el-input
+                          v-else
+                          v-model="form.bfbdtbzh"
+                          placeholder="请输入部分代替标准号"
+                          clearable
                   ></el-input>
                   <el-button
                     type="primary"
@@ -1139,10 +1167,18 @@
                   </el-button>
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="采标编号" prop="cbbh" class="add-form-item form-item-disabled">
+                  <el-tooltip v-if="form.cbbh" effect="dark" :content=form.cbbh placement="top-start">
+                    <el-input
+                            v-model="form.cbbh"
+                            placeholder="请输入采标编号"
+                            clearable
+                    ></el-input>
+                  </el-tooltip>
                   <el-input
-                    v-model="form.cbbh"
+                          v-else
-                    placeholder="请输入采标编号"
+                          v-model="form.cbbh"
-                    clearable
+                          placeholder="请输入采标编号"
+                          clearable
                   ></el-input>
                   <el-button
                     type="primary"
@@ -1154,10 +1190,18 @@
                   </el-button>
                 </el-form-item>
                 <el-form-item label="引用标准" prop="yybj" class="add-form-item form-item-disabled">
+                  <el-tooltip v-if="form.yybj" effect="dark" :content=form.yybj placement="top-start">
+                    <el-input
+                            v-model="form.yybj"
+                            placeholder="请输入引用标准"
+                            clearable
+                    ></el-input>
+                  </el-tooltip>
                   <el-input
-                    v-model="form.yybj"
+                          v-else
-                    placeholder="请输入引用标准"
+                          v-model="form.yybj"
-                    clearable
+                          placeholder="请输入引用标准"
+                          clearable
                   ></el-input>
                   <el-button
                     type="primary"

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

@@ -49,11 +49,19 @@
                   ></el-input>
                 </el-form-item>
                 <el-form-item label="标准中文名称" prop="standName" class="add-form-item form-item-disabled">
+                  <el-tooltip v-if="form.standName" effect="dark" :content=form.standName placement="top-start">
+                    <el-input
+                            v-model="form.standName"
+                            placeholder="请输入标准中文名称"
+                            clearable
+                    ></el-input>
+                  </el-tooltip>
                   <el-input
-                    disabled
+                          v-else
-                    v-model="form.standName"
+                          disabled
-                    placeholder="请输入标准中文名称"
+                          v-model="form.standName"
-                    clearable
+                          placeholder="请输入标准中文名称"
+                          clearable
                   ></el-input>
                 </el-form-item>
                 <el-form-item label="标准英文名称" prop="standEnName" class="add-form-item form-item-disabled">
@@ -457,11 +465,18 @@
             <el-row :gutter="24">
               <el-col :span="12">
                 <el-form-item label="代替标准号" prop="dtbjh" class="add-form-item form-item-disabled">
+                  <el-tooltip v-if="form.dtbjh" effect="dark" :content=form.dtbjh placement="top-start">
+                    <el-input
+                            v-model="form.dtbjh"
+                            placeholder="请输入代替标准号"
+                            clearable
+                    ></el-input>
+                  </el-tooltip>
                   <el-input
-                    disabled
+                          v-else
-                    v-model="form.dtbjh"
+                          v-model="form.dtbjh"
-                    placeholder="请输入代替标准号"
+                          placeholder="请输入代替标准号"
-                    clearable
+                          clearable
                   ></el-input>
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="采标程度" prop="cbcd" class="add-form-item form-item-disabled">
@@ -489,31 +504,50 @@
               </el-col>
               <el-col :span="12">
                 <el-form-item label="部分代替标准号" prop="bfbdtbzh" class="add-form-item form-item-disabled">
+                  <el-tooltip v-if="form.bfbdtbzh" effect="dark" :content=form.bfbdtbzh placement="top-start">
+                    <el-input
+                            v-model="form.bfbdtbzh"
+                            placeholder="请输入部分代替标准号"
+                            clearable
+                    ></el-input>
+                  </el-tooltip>
                   <el-input
-                    disabled
+                          v-else
-                    v-model="form.bfbdtbzh"
+                          v-model="form.bfbdtbzh"
-                    placeholder="请输入部分代替标准号"
+                          placeholder="请输入部分代替标准号"
-                    clearable
+                          clearable
                   ></el-input>
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="采标编号" prop="cbbh" class="add-form-item form-item-disabled">
+                  <el-tooltip v-if="form.cbbh" effect="dark" :content=form.cbbh placement="top-start">
+                    <el-input
+                            v-model="form.cbbh"
+                            placeholder="请输入采标编号"
+                            clearable
+                    ></el-input>
+                  </el-tooltip>
                   <el-input
-                    disabled
+                          v-else
-                    v-model="form.cbbh"
+                          v-model="form.cbbh"
-                    placeholder="请输入采标编号"
+                          placeholder="请输入采标编号"
-                    clearable
+                          clearable
                   ></el-input>
                 </el-form-item>
                 <el-form-item label="引用标准" prop="yybj" class="add-form-item form-item-disabled">
+                  <el-tooltip v-if="form.yybj" effect="dark" :content=form.yybj placement="top-start">
+                    <el-input
+                            v-model="form.yybj"
+                            placeholder="请输入引用标准"
+                            clearable
+                    ></el-input>
+                  </el-tooltip>
                   <el-input
-                    disabled
+                          v-else
-                    v-model="form.yybj"
+                          v-model="form.yybj"
-                    placeholder="请输入引用标准"
+                          placeholder="请输入引用标准"
-                    clearable
+                          clearable
                   ></el-input>
                 </el-form-item>
-
-
                 <!--                                <el-form-item label="被引用标准" prop="byybj" class="add-form-item form-item-disabled">-->
                 <!--                                    <el-input-->
                 <!--                                            disabled-->

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

@@ -127,7 +127,7 @@
         <el-col :span="12">
           <el-form-item label="发布稿" prop="FBGBUSSName" class="add-form-item form-item-disabled">
             <div v-if="FBGBUSSFileList.length > 0" v-for="(item,index) in FBGBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
-              <span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
+              <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis22 }}</span>
               <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
                         <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
                   </span>
@@ -139,7 +139,7 @@
           </el-form-item>
           <el-form-item label="历史版本" prop="LSBBBUSSName" class="add-form-item form-item-disabled">
             <div v-if="LSBBBUSSFileList.length > 0" v-for="(item,index) in LSBBBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
-              <span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
+              <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis22 }}</span>
               <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
                         <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
                   </span>
@@ -153,7 +153,7 @@
         <el-col :span="12">
           <el-form-item label="修改单" prop="XGDName" class="add-form-item form-item-disabled">
             <div v-if="XGDFileList.length > 0" v-for="(item,index) in XGDFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
-              <span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
+              <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis22 }}</span>
               <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
                         <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
                   </span>
@@ -165,7 +165,7 @@
           </el-form-item>
           <el-form-item label="其他文件" prop="QTWJBUSSName" class="add-form-item form-item-disabled">
             <div v-if="QTWJBUSSFileList.length > 0" v-for="(item,index) in QTWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
-              <span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
+              <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis22 }}</span>
               <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
                         <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
                   </span>
@@ -267,7 +267,7 @@
           </el-form-item>
           <el-form-item label="关联文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled">
             <div v-if="GLWJBUSSFileList.length > 0" v-for="(item,index) in GLWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
-              <span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
+              <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis22 }}</span>
               <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
                         <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
                   </span>
@@ -333,7 +333,7 @@
               default-expand-all>
         <el-table-column
                 label="序号"
-                min-width="5%"
+                min-width="6%"
                 align="center">
           <template slot-scope="scope">
             {{scope.$index + 1}}
@@ -401,7 +401,7 @@
         <el-table-column
                 prop="zrUserIdName"
                 label="责任人"
-                min-width="15%"
+                min-width="14%"
                 align="center">
           <!--                                <template slot-scope="scope">-->
           <!--                                    <el-form-item-->
@@ -516,6 +516,13 @@
           return value.slice(0,35) + '...'
         }
         return value
+      },
+      ellipsis22 (value) {
+        if (!value) return ''
+        if (value.length > 22) {
+          return value.slice(0,22) + '...'
+        }
+        return value
       }
     },
     data () {

src/pages/processCenter/pages/creatProcess/qbrk-product/common/formListIn.vue

@@ -126,7 +126,7 @@
         <el-col :span="12">
           <el-form-item label="发布稿" prop="FBGBUSSName" class="add-form-item form-item-disabled">
             <div v-if="FBGBUSSFileList.length > 0" v-for="(item,index) in FBGBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
-              <span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
+              <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis22 }}</span>
               <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
                         <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
                   </span>
@@ -138,7 +138,7 @@
           </el-form-item>
           <el-form-item label="历史版本" prop="LSBBBUSSName" class="add-form-item form-item-disabled">
             <div v-if="LSBBBUSSFileList.length > 0" v-for="(item,index) in LSBBBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
-              <span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
+              <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis22 }}</span>
               <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
                         <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
                   </span>
@@ -152,7 +152,7 @@
         <el-col :span="12">
           <el-form-item label="修改单" prop="XGDName" class="add-form-item form-item-disabled">
             <div v-if="XGDFileList.length > 0" v-for="(item,index) in XGDFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
-              <span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
+              <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis22 }}</span>
               <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
                         <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
                   </span>
@@ -164,7 +164,7 @@
           </el-form-item>
           <el-form-item label="其他文件" prop="QTWJBUSSName" class="add-form-item form-item-disabled">
             <div v-if="QTWJBUSSFileList.length > 0" v-for="(item,index) in QTWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
-              <span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
+              <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis22 }}</span>
               <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
                         <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
                   </span>
@@ -266,7 +266,7 @@
           </el-form-item>
           <el-form-item label="关联文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled">
             <div v-if="GLWJBUSSFileList.length > 0" v-for="(item,index) in GLWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
-              <span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
+              <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis22 }}</span>
               <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
                         <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
                   </span>
@@ -332,7 +332,7 @@
               default-expand-all>
         <el-table-column
                 label="序号"
-                min-width="5%"
+                min-width="6%"
                 align="center">
           <template slot-scope="scope">
             {{scope.$index + 1}}
@@ -400,7 +400,7 @@
         <el-table-column
                 prop="zrUserIdName"
                 label="责任人"
-                min-width="15%"
+                min-width="14%"
                 align="center">
           <!--                                <template slot-scope="scope">-->
           <!--                                    <el-form-item-->
@@ -515,6 +515,13 @@
           return value.slice(0,35) + '...'
         }
         return value
+      },
+      ellipsis22 (value) {
+        if (!value) return ''
+        if (value.length > 22) {
+          return value.slice(0,22) + '...'
+        }
+        return value
       }
     },
     data () {

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

@@ -299,6 +299,77 @@
             @submit="handleSubmit"
     >
     </ProcessFooter>
+    <el-drawer
+            ref="standard"
+            size="1400px"
+            :title="showDrawerTitle"
+            :visible.sync="showDrawer"
+            :before-close="showDrawerClose">
+        <div style="height: 98%;display: flex;">
+            <div class="left">
+                <el-tabs v-model="editableTabsValue" type="card" style="height: 100%" @tab-click="previewIframe">
+                    <el-tab-pane
+                            style="height: 100%"
+                            v-if="FBGBUSSFileList.length > 0"
+                            v-for="(item, index) in FBGBUSSFileList"
+                            :key="item.name"
+                            :label="item.name"
+                            :name="item.id"
+                    >
+                        <loading :loading="iframeLoading">正在加载文档</loading>
+                        <iframe width="100%" height="100%" wframeborder="0" ref="iframe" v-bind:src="iframeUrl"></iframe>
+                    </el-tab-pane>
+                </el-tabs>
+            </div>
+            <div class="rightDiv">
+                <div class="search-area">
+                    <el-form :model="showForm" :rules="showFormRules" class="label-input-form" style="width: 100%;" ref="showForm">
+                        <el-form-item label="条款号" prop="modelNum" class="add-form-item">
+                            <el-input
+                                    v-model="showForm.modelNum"
+                                    clearable
+                            ></el-input>
+                        </el-form-item>
+                        <el-form-item label="修改前" prop="modelUpdBefore" class="add-form-item">
+                            <el-input
+                                    v-model="showForm.modelUpdBefore"
+                                    clearable
+                            ></el-input>
+                        </el-form-item>
+                        <el-form-item label="修改后" prop="modelUpdAfter" class="add-form-item">
+                            <el-input
+                                    v-model="showForm.modelUpdAfter"
+                                    clearable
+                            ></el-input>
+                        </el-form-item>
+                        <el-form-item label="修改理由" prop="modelContent" class="add-form-item">
+                            <el-input
+                                    v-model="showForm.modelContent"
+                                    clearable
+                            ></el-input>
+                        </el-form-item>
+                        <el-form-item label="提出部门" prop="zrDeptIdName" class="add-form-item form-item-disabled">
+                            <el-input
+                                    v-model="showForm.zrDeptIdName" disabled
+                                    clearable
+                            ></el-input>
+                        </el-form-item>
+                        <el-form-item label="责任人" prop="zrUserIdName" class="add-form-item form-item-disabled">
+                            <el-input
+                                    v-model="showForm.zrUserIdName" disabled
+                                    clearable
+                            ></el-input>
+                        </el-form-item>
+                    </el-form>
+                </div>
+                <div class="demo-drawer-footer">
+                    <el-button :loading="isSubmit" size="mini" class="common-button-primary" icon="el-icon-check" type="primary" @click="createRowSubmit">
+                        提交
+                    </el-button>
+                </div>
+            </div>
+        </div>
+    </el-drawer>
     <el-dialog width='400px' :visible.sync="fileMadel" title="上传文件">
         <el-upload
                 multiple
@@ -643,6 +714,7 @@
     import ProcessHeader from '../../components/ProcessHeader'
     import ProcessFooter from '../../components/ProcessFooter'
     import ProcessTitle from '../../components/ProcessTitle'
+    import { onlyOfficeUrl,kkFileViewUrl } from '@/sysConfig'
     import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail} from "api/process";
     import {getEvaluationIndex} from "api/businessApi";
     import TreeSelect from '@/components/treeSelect/treeSelect.vue';
@@ -737,6 +809,23 @@
                         }
                     }]
                 },
+                iframeLoading:false,
+                iframeUrl:"",
+                showForm:{
+                    modelNum: '',
+                    modelName: "",
+                    modelUpdBefore: "",
+                    modelUpdAfter: "",
+                    modelContent: "",
+                    zrUserId:this.$store.getters.userInfo.userId,
+                    zrUserIdName:this.$store.getters.userInfo.userName,
+                    zrDeptId:this.$store.getters.userInfo.institutionId,
+                    zrDeptIdName:this.$store.getters.userInfo.institutionName,
+                    children:[],
+                },
+                editableTabsValue:"",
+                showDrawerTitle:"",
+                showDrawer:false,
                 taskInfo: '会签征求意见',
                 loading: false,
                 disabledState: true,
@@ -991,6 +1080,20 @@
                     prcCreateUser: this.$store.getters.userInfo.userId,
                     prcCreateUserName: this.$store.getters.userInfo.userName,
                 },
+                showFormRules:{
+                    modelNum: [
+                        { required: true, message: '请填写条款号', trigger: 'blur' },
+                    ],
+                    modelUpdBefore: [
+                        { required: true, message: '请填写修改前', trigger: 'blur' },
+                    ],
+                    modelUpdAfter: [
+                        { required: true, message: '请填写修改后', trigger: 'blur' },
+                    ],
+                    modelContent: [
+                        { required: true, message: '请填写修改理由', trigger: 'blur' },
+                    ],
+                },
                 modelRules:{
                     zrUserIdName: [
                         { required: true, message: '请选择会签责任人', trigger: 'blur' },
@@ -1168,6 +1271,40 @@
             },
         },
         methods: {
+            previewShow(attId) {
+                this.iframeLoading = true
+                return new Promise((resolve, reject) => {
+                    getBusStandFileByAttId({
+                        attId
+                    }).then(res => {
+                        if(res){
+                            const history = res;
+                            const editFileInfo = res.data
+                            if(editFileInfo.fileSuffix.toLowerCase() === 'pdg'){
+                                this.iframeUrl = 'book://ssreader/e0?url='+editFileInfo.downLoadUrl
+                            }else if(editFileInfo.fileSuffix.toLowerCase() === 'pdf'){
+                                this.iframeUrl = './static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id)
+                            }else {
+                                const nowTime = new Date().getTime()
+                                // window.open(onlyOfficeUrl+'/onlyOffice?oldFileName=' + editFileInfo.oldFileName + '&fileType=' + editFileInfo.fileSuffix + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName)
+                                this.iframeUrl = kkFileViewUrl+'/onlinePreview?url='+encodeURIComponent(Base64.encode(editFileInfo.downLoadUrl));
+                            }
+                            this.iframeLoading = false
+                            this.$forceUpdate()
+                            resolve(history)
+                        }
+                    }).catch(e => {
+                    })
+                })
+            },
+            previewIframe(targetName, action){
+                let attId = targetName.name
+                this.iframeUrl = ""
+                this.previewShow(attId)
+            },
+            showDrawerClose () {
+                this.showDrawer = false
+            },
             filterData2(){
                 let spanOneArr = []
                 let concatOne = 0
@@ -1319,6 +1456,25 @@
                     this.zrIdList.push(item.id)
                 })
             },
+            createRowSubmit(){
+                this.$refs['showForm'].validate((valid) => {
+                    if (valid) {
+                        const list = {
+                            modelNum: this.showForm.modelNum,
+                            modelUpdBefore: this.showForm.modelUpdBefore,
+                            modelUpdAfter: this.showForm.modelUpdAfter,
+                            modelContent: this.showForm.modelContent,
+                            zrUserId:this.$store.getters.userInfo.userId,
+                            zrUserIdName:this.$store.getters.userInfo.userName,
+                            zrDeptId:this.$store.getters.userInfo.institutionId,
+                            zrDeptIdName:this.$store.getters.userInfo.institutionName,
+                            children:[],
+                        };
+                        this.form.modelData.push(list);
+                        this.$message.success("新增成功！")
+                    }
+                })
+            },
             createRow() {
                 // 创建行
                 // if (this.diaTable.length >= 6) { // 判断当前表格是否可继续创建
@@ -1328,26 +1484,32 @@
                 //         duration: 2000
                 //     });
                 //     return false;
-                // }
+                // // }
-                const list = {
+                if(this.FBGBUSSFileList.length > 0){
-                    id: this.form.modelData.length + 1,
+                    this.editableTabsValue = this.FBGBUSSFileList[0].id
-                    modelNum: '',
+                    this.previewShow(this.FBGBUSSFileList[0].id)
-                    orderNum: this.form.modelData.length + 1, // orderNum为新创建行的索引
+                }
-                    pid: '0',
+                this.showDrawer = true
-                    modelIndex: this.form.modelData.length,
+                this.showDrawerTitle = "新增征求意见"
-                    disabled1: false,
+                // const list = {
-                    disabled2: false,
+                //     id: this.form.modelData.length + 1,
-                    modelName: "",
+                //     modelNum: '',
-                    modelUpdBefore: "",
+                //     orderNum: this.form.modelData.length + 1, // orderNum为新创建行的索引
-                    modelUpdAfter: "",
+                //     pid: '0',
-                    modelContent: "",
+                //     modelIndex: this.form.modelData.length,
-                    zrUserId:this.$store.getters.userInfo.userId,
+                //     disabled1: false,
-                    zrUserIdName:this.$store.getters.userInfo.userName,
+                //     disabled2: false,
-                    zrDeptId:this.$store.getters.userInfo.institutionId,
+                //     modelName: "",
-                    zrDeptIdName:this.$store.getters.userInfo.institutionName,
+                //     modelUpdBefore: "",
-                    children:[],
+                //     modelUpdAfter: "",
-                };
+                //     modelContent: "",
-                this.form.modelData.push(list);
+                //     zrUserId:this.$store.getters.userInfo.userId,
+                //     zrUserIdName:this.$store.getters.userInfo.userName,
+                //     zrDeptId:this.$store.getters.userInfo.institutionId,
+                //     zrDeptIdName:this.$store.getters.userInfo.institutionName,
+                //     children:[],
+                // };
+                // this.form.modelData.push(list);
             },
             // createRow() {
             //     // 创建行
@@ -2688,6 +2850,40 @@
 
 <style lang="less" scoped>
     @import '~@/assets/styles/style';
+    /deep/ .left {
+        width: 60%;
+        height: calc(~'100% - 52px');
+    }
+    /deep/ .el-tabs__content{
+        height: 100% !important;
+    }
+    /deep/ .rightDiv {
+        background: #fff;
+        width: 40%;
+        height: 98%;
+        .height {
+            margin-bottom: 0;
+            padding: 10px 20px;
+            font-size: 18px;
+            font-weight: bold;
+            color: #333333;
+            border-bottom: 1px solid #e5e5e5;
+        }
+        .search-area {
+            height: calc(~'100% - 52px');
+            overflow: auto;
+        }
+        .demo-drawer-footer {
+            width: 100%;
+            padding: 0 20px;
+            height: 50px;
+            line-height: 50px;
+            border-top: 1px solid #e8e8e8;
+            text-align: right;
+            background: #fff;
+            z-index: 999;
+        }
+    }
     /deep/ .column1{
         font-size: 18px !important;
     }

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

@@ -57,7 +57,7 @@
                                 default-expand-all>
                             <el-table-column
                                     label="序号"
-                                    min-width="5%"
+                                    min-width="6%"
                                     align="center">
                                 <template slot-scope="scope">
                                     {{scope.$index + 1}}
@@ -125,7 +125,7 @@
                             <el-table-column
                                     prop="zrUserIdName"
                                     label="责任人"
-                                    min-width="15%"
+                                    min-width="14%"
                                     align="center">
                                 <!--                                <template slot-scope="scope">-->
                                 <!--                                    <el-form-item-->

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

@@ -100,7 +100,7 @@
       <el-col :span="12">
         <el-form-item label="发布稿" prop="FBGBUSSName" class="add-form-item form-item-disabled">
           <div v-if="FBGBUSSFileList.length > 0" v-for="(item,index) in FBGBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
-            <span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
+            <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis22 }}</span>
               <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
                         <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
                   </span>
@@ -112,7 +112,7 @@
         </el-form-item>
         <el-form-item label="历史版本" prop="LSBBBUSSName" class="add-form-item form-item-disabled">
           <div v-if="LSBBBUSSFileList.length > 0" v-for="(item,index) in LSBBBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
-            <span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
+            <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis22 }}</span>
               <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
                         <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
                   </span>
@@ -126,7 +126,7 @@
       <el-col :span="12">
         <el-form-item label="编制说明" prop="BZSMBUSSName" class="add-form-item form-item-disabled">
           <div v-if="BZSMBUSSFileList.length > 0" v-for="(item,index) in BZSMBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
-            <span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
+            <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis22 }}</span>
               <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
                         <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
                   </span>
@@ -138,7 +138,7 @@
         </el-form-item>
         <el-form-item label="其他文件" prop="QTWJBUSSName" class="add-form-item form-item-disabled">
           <div v-if="QTWJBUSSFileList.length > 0" v-for="(item,index) in QTWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
-            <span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
+            <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis22 }}</span>
               <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
                         <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
                   </span>
@@ -278,7 +278,7 @@
         </el-form-item>
         <el-form-item label="关联文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled">
           <div v-if="GLWJBUSSFileList.length > 0" v-for="(item,index) in GLWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
-            <span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
+            <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis22 }}</span>
             <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
                         <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
                   </span>
@@ -307,7 +307,7 @@
               default-expand-all>
           <el-table-column
                   label="序号"
-                  min-width="5%"
+                  min-width="6%"
                   align="center">
               <template slot-scope="scope">
                   {{scope.$index + 1}}
@@ -375,7 +375,7 @@
           <el-table-column
                   prop="zrUserIdName"
                   label="责任人"
-                  min-width="15%"
+                  min-width="14%"
                   align="center">
               <!--                                <template slot-scope="scope">-->
               <!--                                    <el-form-item-->
@@ -423,7 +423,7 @@
             <el-col :span="12">
               <el-form-item label="汇总评审意见文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled">
                   <div v-if="summaryFileList.length > 0" v-for="(item,index) in summaryFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
-                      <span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
+                      <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis22 }}</span>
                       <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
                         <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
                   </span>
@@ -498,7 +498,14 @@ export default {
         return value.slice(0,35) + '...'
       }
       return value
-    }
+    },
+      ellipsis22 (value) {
+          if (!value) return ''
+          if (value.length > 22) {
+              return value.slice(0,22) + '...'
+          }
+          return value
+      }
   },
   data () {
     return {

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

@@ -111,7 +111,7 @@
         <el-col :span="12">
           <el-form-item label="发布稿" prop="FBGBUSSName" class="add-form-item form-item-disabled">
             <div v-if="FBGBUSSFileList.length > 0" v-for="(item,index) in FBGBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
-              <span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
+              <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis22 }}</span>
               <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
                         <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
                   </span>
@@ -123,7 +123,7 @@
           </el-form-item>
           <el-form-item label="历史版本" prop="LSBBBUSSName" class="add-form-item form-item-disabled">
             <div v-if="LSBBBUSSFileList.length > 0" v-for="(item,index) in LSBBBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
-              <span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
+              <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis22 }}</span>
               <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
                         <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
                   </span>
@@ -137,7 +137,7 @@
         <el-col :span="12">
           <el-form-item label="编制说明" prop="BZSMBUSSName" class="add-form-item form-item-disabled">
             <div v-if="BZSMBUSSFileList.length > 0" v-for="(item,index) in BZSMBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
-              <span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
+              <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis22 }}</span>
               <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
                         <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
                   </span>
@@ -149,7 +149,7 @@
           </el-form-item>
           <el-form-item label="其他文件" prop="QTWJBUSSName" class="add-form-item form-item-disabled">
             <div v-if="QTWJBUSSFileList.length > 0" v-for="(item,index) in QTWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
-              <span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
+              <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis22 }}</span>
               <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
                         <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
                   </span>
@@ -288,7 +288,7 @@
           </el-form-item>
           <el-form-item label="关联文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled">
             <div v-if="GLWJBUSSFileList.length > 0" v-for="(item,index) in GLWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
-              <span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
+              <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis22 }}</span>
               <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
                         <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
                   </span>
@@ -317,7 +317,7 @@
               default-expand-all>
         <el-table-column
                 label="序号"
-                min-width="5%"
+                min-width="6%"
                 align="center">
           <template slot-scope="scope">
             {{scope.$index + 1}}
@@ -385,7 +385,7 @@
         <el-table-column
                 prop="zrUserIdName"
                 label="责任人"
-                min-width="15%"
+                min-width="14%"
                 align="center">
           <!--                                <template slot-scope="scope">-->
           <!--                                    <el-form-item-->
@@ -433,7 +433,7 @@
         <el-col :span="12">
           <el-form-item label="汇总评审意见文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled">
             <div v-if="summaryFileList.length > 0" v-for="(item,index) in summaryFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
-              <span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
+              <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis22 }}</span>
               <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
                         <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
                   </span>
@@ -508,6 +508,13 @@
           return value.slice(0,35) + '...'
         }
         return value
+      },
+      ellipsis22 (value) {
+        if (!value) return ''
+        if (value.length > 22) {
+          return value.slice(0,22) + '...'
+        }
+        return value
       }
     },
     data () {

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

@@ -479,7 +479,7 @@
             :title="showDrawerTitle"
             :visible.sync="showDrawer"
             :before-close="showDrawerClose">
-            <div style="height: 100%;display: flex;">
+            <div style="height: 98%;display: flex;">
                 <div class="left">
                     <el-tabs v-model="editableTabsValue" type="card" style="height: 100%" @tab-click="previewIframe">
                         <el-tab-pane
@@ -490,6 +490,7 @@
                                 :label="item.name"
                                 :name="item.id"
                         >
+                            <loading :loading="iframeLoading">正在加载文档</loading>
                             <iframe width="100%" height="100%" wframeborder="0" ref="iframe" v-bind:src="iframeUrl"></iframe>
                         </el-tab-pane>
                     </el-tabs>
@@ -977,6 +978,7 @@
                         }
                     }]
                 },
+                iframeLoading:false,
                 iframeUrl:"",
                 showForm:{
                     modelNum: '',
@@ -1431,6 +1433,7 @@
         },
         methods: {
             previewShow(attId) {
+                this.iframeLoading = true
                 return new Promise((resolve, reject) => {
                     getBusStandFileByAttId({
                         attId
@@ -1447,6 +1450,7 @@
                                 // window.open(onlyOfficeUrl+'/onlyOffice?oldFileName=' + editFileInfo.oldFileName + '&fileType=' + editFileInfo.fileSuffix + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName)
                                 this.iframeUrl = kkFileViewUrl+'/onlinePreview?url='+encodeURIComponent(Base64.encode(editFileInfo.downLoadUrl));
                             }
+                            this.iframeLoading = false
                             this.$forceUpdate()
                             resolve(history)
                         }

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

@@ -185,7 +185,7 @@
                                 default-expand-all>
                             <el-table-column
                                     label="序号"
-                                    min-width="5%"
+                                    min-width="6%"
                                     align="center">
                                 <template slot-scope="scope">
                                     {{scope.$index + 1}}
@@ -253,7 +253,7 @@
                             <el-table-column
                                     prop="zrUserIdName"
                                     label="责任人"
-                                    min-width="15%"
+                                    min-width="14%"
                                     align="center">
                                 <!--                                <template slot-scope="scope">-->
                                 <!--                                    <el-form-item-->

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -1332,18 +1332,27 @@
         :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel"
         @popoverHideCancel="popoverHideModelCancel()"></tree-select-module>
       <tree-select-module
+        width="500"
+        :lazy=true
+        :multiple=true
+        :check-strictly=true
+        :modalShowFlag="modalShowFlag5"
+        :drawerTitle="drawerTitle"
+        :url="url"
+        :type="modelType"
+        :urlChild="urlChild"
+        :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys4"
+        :nodeKey="nodeKeyModel" @popoverHide="popoverCarHideModel"
+        @popoverHideCancel="popoverCarHideModelCancel()"></tree-select-module>
+      <tree-select-new
+              :multiple=false
+              :lazy=false
+              :modalShowFlag="modalShowFlag6"
+              drawerTitle="标准体系"
               width="500"
-              :lazy=true
+              :data="standSystemOptions"
-              :multiple=true
+              :defaultProps="defaultProps"
-              :check-strictly=true
+              :nodeKey="nodeKey" @popoverHide="TpopoverHide" @popoverHideCancel="TpopoverHideCancel"></tree-select-new>
-              :modalShowFlag="modalShowFlag5"
-              :drawerTitle="drawerTitle"
-              :url="url"
-              :type="modelType"
-              :urlChild="urlChild"
-              :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys4"
-              :nodeKey="nodeKeyModel" @popoverHide="popoverCarHideModel"
-              @popoverHideCancel="popoverCarHideModelCancel()"></tree-select-module>
       <!--      导入失败-->
       <el-dialog :visible.sync="importFailed" :close-on-click-modal="false" width="400px">
         <p slot="title" style="color:#f60">
@@ -1615,13 +1624,20 @@
                   </el-form-item>
                   <!--            体系类别-->
                   <el-form-item label="标准体系" class="add-form-item form-item-disabled">
-                    <el-select v-model="advanceSearchMapping.TXLB" placeholder="根据标准体系查找" clearable
+                    <el-input v-model="advanceSearchMapping.TXLB" style="display: none;"></el-input>
-                               @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
+                    <el-input v-model="advanceSearchMapping.TXLBName" placeholder="根据标准体系查找"
-                      <el-option v-for="(opt, index) in txlbOptions" :value="opt.value === undefined ? '' :opt.value"
+                              clearable
-                                 :key="index"
+                              :maxlength="500"
-                                 :label="opt.label">{{ opt.label }}
+                              @click.native="BZTXhandle"
-                      </el-option>
+                              @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
-                    </el-select>
+
+<!--                    <el-select v-model="advanceSearchMapping.TXLB" placeholder="根据标准体系查找" clearable-->
+<!--                               @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">-->
+<!--                      <el-option v-for="(opt, index) in txlbOptions" :value="opt.value === undefined ? '' :opt.value"-->
+<!--                                 :key="index"-->
+<!--                                 :label="opt.label">{{ opt.label }}-->
+<!--                      </el-option>-->
+<!--                    </el-select>-->
                   </el-form-item>
                   <!-- 备案日期 -->
                   <el-form-item label="备案日期" class="add-form-item form-item-disabled">
@@ -2166,6 +2182,7 @@ export default {
   },
   data() {
     return {
+      modalShowFlag6: false,
       QCDWValue: [],
       QCDWmodal: false,
       QCDWList: [],
@@ -2399,8 +2416,6 @@ export default {
         textStatus: '',//文本状态
         synopsis: '', // 内容摘要
         CLLX: '' // 适用车型
-
-
       }, // 分页查询过程中用到的对象
 
       //高级搜索映射
@@ -2421,7 +2436,8 @@ export default {
         , CBCD: ''//采标程度
         , YYBJ: ''//引用标准
         , BYYBJ: ''//被引用标准
-        , TXLB: '',//体系类别
+        , TXLB: ''//体系类别
+        , TXLBName: '',
         DYBXH: '',// 模块结构单元变形号
         DYMC: '',//模块结构单元名称
         BARQ: '' //备案日期
@@ -2911,6 +2927,17 @@ export default {
     }
   },
   methods: {
+    BZTXhandle () {
+      this.modalShowFlag6 = true
+    },
+    TpopoverHide (checkedIds, checkedData) {
+      this.advanceSearchMapping.TXLB = checkedData.menuName
+      this.advanceSearchMapping.TXLBName = checkedData.menuName
+      this.modalShowFlag6 = false
+    },
+    TpopoverHideCancel () {
+      this.modalShowFlag6 = false
+    },
     QCDWOK() {
       let arr1 = []
       if (this.sarStandardsInfoEO['QCDW']) {
@@ -4511,6 +4538,7 @@ export default {
       // // 自定义属性字段高级搜索处理
       //advanceSearchVOStr
       const advanceSearchVOList = [];
+
       for (let key in this.advanceSearchMapping) {
         const value = this.advanceSearchMapping[key];
         if (value !== null && value !== '' && (key === 'NYLX' || key === 'SYRZ' || key === 'SYCPX' || (item.CLLX && item.CLLX.length > 0))) {
@@ -4534,6 +4562,7 @@ export default {
             type: 'equals',
             value: value
           });
+        } else if (value !== null && value !== '' && (key === 'TXLBName')) {
         } else if (value !== null && value !== '') {
           advanceSearchVOList.push({
             connect: "and",
@@ -4542,7 +4571,6 @@ export default {
             value: value
           });
         }
-
       }
       formData.advanceSearchVOStr = JSON.stringify(advanceSearchVOList);
       this.SarExportSearchEo = formData

src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue

@@ -143,7 +143,7 @@
                         </el-table-column>
                         <el-table-column
                                 prop="draftTime"
-                                width="200"
+                                width="170"
                                 align="center"
                                 label="计划标准初稿完成时间">
                             <template slot-scope="scope">
@@ -151,7 +151,7 @@
                             </template>
                         </el-table-column>
                         <el-table-column
-                                width="200"
+                                width="170"
                                 prop="releaseTime"
                                 align="center"
                                 label="计划标准发布时间">
@@ -160,6 +160,7 @@
                             </template>
                         </el-table-column>
                         <el-table-column
+                                width="180"
                                 align="center"
                                 prop="unitName"
                                 label="起草责任单位">