Merge branch 'develop' of http://gitlab.91isoft.com:90/LAWS/laws-system-front-FOTON into develop

src/pages/details/otherStandardDetails/index.vue

@@ -3,7 +3,9 @@
   <div class="other-standard-details v-class" :class="{'hidden': !isMoreAwayBtn}">
     <!--title 标题-->
     <div class="details-header">
-      <span>{{ sarStandardsInfoEO.standSortShow || '' }} {{ sarStandardsInfoEO.standNumber }}-{{ sarStandardsInfoEO.standYear }} 《{{ sarStandardsInfoEO.standName }}》 标准详情</span>
+      <span>{{ sarStandardsInfoEO.standSortShow || '' }} {{
+          sarStandardsInfoEO.standNumber
+        }}-{{ sarStandardsInfoEO.standYear }} 《{{ sarStandardsInfoEO.standName }}》 标准详情</span>
     </div>
     <!--主体内容-->
     <div class="details-content">
@@ -25,8 +27,10 @@
               <!--          <div class="modular-header-title"><i class="icon-modular-title" /><span>基础信息</span>-->
               <!--          </div>-->
               <div class="modular-header-btn">
-                <el-button v-if="sarStandardsInfoEO.collectId" @click="collectClick(sarStandardsInfoEO.collectId)" title="取消收藏" class="collection-btn" icon="icon-collection" :loading="isSubmit"></el-button>
+                <el-button v-if="sarStandardsInfoEO.collectId" @click="collectClick(sarStandardsInfoEO.collectId)"
-                <el-button v-else @click="collectClick()" title="收藏" class="collection-btn" icon="el-icon-star-off" :loading="isSubmit"></el-button>
+                           title="取消收藏" class="collection-btn" icon="icon-collection" :loading="isSubmit"></el-button>
+                <el-button v-else @click="collectClick()" title="收藏" class="collection-btn" icon="el-icon-star-off"
+                           :loading="isSubmit"></el-button>
                 <el-button class="relation-btn" icon="icon-relation" @click="relateEvent()">更新记录</el-button>
                 <!--            <el-button class="relation-btn" @click="knowledgeSharing">标准问答</el-button>-->
                 <!--            <el-button class="relation-btn" @click="showItemsModel()">标准分解单</el-button>-->
@@ -66,7 +70,9 @@
                     sarStandardsInfoEO.issueTime || '-'
                   }}</span></p>
                 <p>
-                  <label style=" margin-right: 76px;">是否纳入认证清单</label><span>{{ sarStandardsInfoEO.isRelateAccess ? (sarStandardsInfoEO.isRelateAccess === '1' ? '是' : '否') : '-' }}</span>
+                  <label style=" margin-right: 76px;">是否纳入认证清单</label><span>{{
+                    sarStandardsInfoEO.isRelateAccess ? (sarStandardsInfoEO.isRelateAccess === '1' ? '是' : '否') : '-'
+                  }}</span>
                 </p>
                 <p v-if="saveStandType === 'INLAND_STAND'"><label style=" margin-right: 150px;">标准体系</label><span>{{
                     sarStandardsInfoEO.standSystem || '-'
@@ -98,7 +104,8 @@
                   <template v-if="child.attrField === 'XGLC' && child.value">
                     <p class="modular-content-p-val">
                       <span v-for="(item, index) in child.value.split(',')" :key="index">
-                        <a @click="processCenterClick(item)" style="cursor: pointer;color: #0c91e5;margin-right: 5px;" class="span-line">{{ item }}</a>
+                        <a @click="processCenterClick(item)" style="cursor: pointer;color: #0c91e5;margin-right: 5px;"
+                           class="span-line">{{ item }}</a>
                       </span>
                     </p>
                   </template>
@@ -116,7 +123,8 @@
                   <!--其他-->
                   <template v-else>
                     <span v-for="(item, index) in child.value.split(',')" :key="index">
-                    <a @click="showReplaceStandInfo(item)" style="cursor: pointer;color: #0c91e5;margin-right: 5px;" class="span-line">{{ item }}</a>
+                    <a @click="showReplaceStandInfo(item)" style="cursor: pointer;color: #0c91e5;margin-right: 5px;"
+                       class="span-line">{{ item }}</a>
                   </span>
                   </template>
                 </div>
@@ -225,7 +233,8 @@
               <template v-if="child.attrField === 'XGLC' && child.value">
                 <p class="modular-content-p-val">
                   <span v-for="(item, index) in child.value.split(',')" :key="index">
-                  <a @click="processCenterClick(item)" style="cursor: pointer;color: #0c91e5;margin-right: 5px;" class="span-line">{{ item }}</a>
+                  <a @click="processCenterClick(item)" style="cursor: pointer;color: #0c91e5;margin-right: 5px;"
+                     class="span-line">{{ item }}</a>
                 </span>
                 </p>
               </template>
@@ -234,7 +243,8 @@
               >
                 <p class="modular-content-p-val" v-if="child.value">
                   <span v-for="(item, index) in child.value.split(',')" :key="index">
-                    <a @click="showReplaceStandInfo(item)" style="cursor: pointer;color: #0c91e5;margin-right: 5px;" class="span-line">{{ item }}</a>
+                    <a @click="showReplaceStandInfo(item)" style="cursor: pointer;color: #0c91e5;margin-right: 5px;"
+                       class="span-line">{{ item }}</a>
                   </span>
                 </p>
                 <span class="modular-content-p-val" v-else>-</span>
@@ -319,7 +329,8 @@
               <template v-if="child.attrField === 'XGLC' && child.value">
                 <p class="modular-content-p-val">
                   <span v-for="(item, index) in child.value.split(',')" :key="index">
-                  <a @click="processCenterClick(item)" style="cursor: pointer;color: #0c91e5;margin-right: 5px;" class="span-line">{{ item }}</a>
+                  <a @click="processCenterClick(item)" style="cursor: pointer;color: #0c91e5;margin-right: 5px;"
+                     class="span-line">{{ item }}</a>
                 </span>
                 </p>
               </template>
@@ -328,7 +339,8 @@
               >
                 <p class="modular-content-p-val" v-if="child.value">
                   <span v-for="(item, index) in child.value.split(',')" :key="index">
-                    <a @click="showReplaceStandInfo(item)" style="cursor: pointer;color: #0c91e5;margin-right: 5px;" class="span-line">{{ item }}</a>
+                    <a @click="showReplaceStandInfo(item)" style="cursor: pointer;color: #0c91e5;margin-right: 5px;"
+                       class="span-line">{{ item }}</a>
                   </span>
                 </p>
                 <span class="modular-content-p-val" v-else>-</span>
@@ -439,7 +451,8 @@
 
 
             <el-form-item class="search-item">
-              <el-input v-model="standItemSearch.itemsName" size="small" placeholder="根据条款名称查找" clearable maxlength="100"></el-input>
+              <el-input v-model="standItemSearch.itemsName" size="small" placeholder="根据条款名称查找" clearable
+                        maxlength="100"></el-input>
             </el-form-item>
             <!--            新车实施日期-->
             <el-form-item class="search-item">
@@ -484,7 +497,8 @@
       </div>
       <div class="action-bar">
         <el-button class="common-button-default export-button" icon="export" size="mini"
-                   @click="exportStandardItem" v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '52HT9PLW49G6ZWS9RZSC' : '9CLEQQBS75SYV8JQQYFB'">
+                   @click="exportStandardItem"
+                   v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '52HT9PLW49G6ZWS9RZSC' : '9CLEQQBS75SYV8JQQYFB'">
           导出
         </el-button>
         <el-button
@@ -538,7 +552,7 @@
             </template>
           </el-table-column>
           <el-table-column
-            prop="readContent"
+              prop="interpretationContent"
               label="解读内容"
               show-overflow-tooltip
           >
@@ -606,7 +620,21 @@
         </el-table>
         <loading :loading="tableLoading">数据加载中...</loading>
       </div>
-      <pagination :page="standItemSearch.page" :total="standitemTotal" @pageChange="pageChange" @pageSizeChange="pageSizeChange"></pagination>
+
+
+      <el-pagination
+          @size-change="pageSizeChange"
+          @current-change="pageChange"
+          :current-page="1"
+          :page-sizes="[10, 20, 30, 50]"
+          :page-size="100"
+          layout="sizes, prev, pager, next, jumper"
+          :total="standitemTotal">
+      </el-pagination>
+
+<!--        <pagination :total="standitemTotal" @pageChange="pageChange"-->
+<!--                  @pageSizeChange="pageSizeChange"></pagination>-->
+
     </el-drawer>
     <!--新增标准条款-->
     <el-drawer
@@ -732,7 +760,8 @@
         </el-form>
       </div>
       <div class="demo-drawer-footer">
-        <el-button class="common-button-primary" icon="el-icon-check" type="primary" v-if="!itemFormdisableflag" @click="saveOrUpdateStandItem" :loading="isSubmit">
+        <el-button class="common-button-primary" icon="el-icon-check" type="primary" v-if="!itemFormdisableflag"
+                   @click="saveOrUpdateStandItem" :loading="isSubmit">
           保存
         </el-button>
         <el-button class="common-button-default" icon="el-icon-close" @click="resetForm">取消</el-button>
@@ -775,45 +804,93 @@
           <span class="see-drawer-val" :title="standShowItemEO.itemsName">{{ standShowItemEO.itemsName }}</span>
         </div>
         <div class="see-drawer-div">
-          <label class="see-drawer-name" title="内容简介">内容简介</label>
+          <label class="see-drawer-name" title="内容简介">条款内容</label>
-          <span class="see-drawer-val" :title="standShowItemEO.termsConditions ? standShowItemEO.termsConditions.replace(/<.*?>/ig, ' ') : ''">{{
+          <span class="see-drawer-val"
+                :title="standShowItemEO.termsConditions ? standShowItemEO.termsConditions.replace(/<.*?>/ig, ' ') : ''">{{
               standShowItemEO.termsConditions ? standShowItemEO.termsConditions.replace(/<.*?>/ig, ' ') : ''
             }}</span>
         </div>
+        <div class="see-drawer-div">
+          <label class="see-drawer-name" title="解读内容">解读内容</label>
+          <span class="see-drawer-val"
+                :title="standShowItemEO.interpretationContent ? standShowItemEO.interpretationContent.replace(/<.*?>/ig, ' ') : ''">
+            {{
+              standShowItemEO.interpretationContent ? standShowItemEO.interpretationContent.replace(/<.*?>/ig, ' ') : ''
+            }}</span>
+        </div>
+
+        <div class="see-drawer-div">
+          <label class="see-drawer-name" title="新车型实施日期">新车型实施日期</label>
+          <span class="see-drawer-val"
+                :title="standShowItemEO.xcxssrq">{{
+              standShowItemEO.xcxssrq ? $moment(standShowItemEO.xcxssrq).format('YYYY-MM-DD') : ''
+            }}</span>
+        </div>
+        <div class="see-drawer-div">
+          <label class="see-drawer-name" title="在产车实施日期">在产车实施日期</label>
+          <span class="see-drawer-val"
+                :title="standShowItemEO.zccssrq">{{
+              standShowItemEO.zccssrq ? $moment(standShowItemEO.zccssrq).format('YYYY-MM-DD') : ''
+            }}</span>
+        </div>
+        <div class="see-drawer-div">
+          <label class="see-drawer-name" title="适用车型">适用车型</label>
+          <span class="see-drawer-val" :title="standShowItemEO.applyArctic">{{ standShowItemEO.applyArctic }}</span>
+        </div>
         <div class="see-drawer-div">
           <label class="see-drawer-name" title="责任部门">责任部门</label>
           <span class="see-drawer-val" :title="standShowItemEO.responsibleUnit">{{
               standShowItemEO.responsibleUnit
             }}</span>
         </div>
-        <div class="see-drawer-div">
-          <label class="see-drawer-name" title="FO">FO</label>
-          <span class="see-drawer-val" :title="standShowItemEO.foShow">{{ standShowItemEO.foShow }}</span>
-        </div>
         <div class="see-drawer-div">
           <label class="see-drawer-name" title="责任工程师">责任工程师</label>
-          <span class="see-drawer-val" :title="standShowItemEO.dutyEngineerShow">{{
+          <span class="see-drawer-val" :title="standShowItemEO.dutyEngineer">
-              standShowItemEO.dutyEngineerShow
+            {{standShowItemEO.dutyEngineer }}</span>
-            }}</span>
         </div>
         <div class="see-drawer-div">
-          <label class="see-drawer-name" title="svpps">svpps</label>
+          <label class="see-drawer-name" title="基于上一版本差异">基于上一版本差异</label>
-          <span class="see-drawer-val" :title="standShowItemEO.svppsShow">{{ standShowItemEO.svppsShow }}</span>
+          <span class="see-drawer-val" :title="standShowItemEO.comparedWithPrevious">
+            {{standShowItemEO.comparedWithPrevious }}</span>
         </div>
+
         <div class="see-drawer-div">
-          <label class="see-drawer-name" title="适用车辆类型">适用车辆类型</label>
+          <label class="see-drawer-name" title="符合性状态">符合性状态</label>
-          <span class="see-drawer-val" :title="standShowItemEO.applyArctic">{{ standShowItemEO.applyArctic }}</span>
+          <span class="see-drawer-val" :title="standShowItemEO.complianceRequire">
+            {{standShowItemEO.complianceRequire }}</span>
         </div>
+
         <div class="see-drawer-div">
-          <label class="see-drawer-name" title="要求类型">要求类型</label>
+          <label class="see-drawer-name" title="合规性分析">合规性分析</label>
-          <span class="see-drawer-val" :title="standShowItemEO.claimTypeShow">{{ standShowItemEO.claimTypeShow }}</span>
+          <span class="see-drawer-val" :title="standShowItemEO.complianceState">
-        </div>
+            {{standShowItemEO.complianceState }}</span>
-        <div class="see-drawer-div">
-          <label class="see-drawer-name" title="企标覆盖关系">企标覆盖关系</label>
-          <span class="see-drawer-val" :title="standShowItemEO.busStandCoverShow ? standShowItemEO.busStandCoverShow : busStandCoverName(standShowItemEO.busStandCover)">{{
-              standShowItemEO.busStandCoverShow ? standShowItemEO.busStandCoverShow : busStandCoverName(standShowItemEO.busStandCover)
-            }}</span>
         </div>
+<!--        <div class="see-drawer-div">-->
+<!--          <label class="see-drawer-name" title="FO">FO</label>-->
+<!--          <span class="see-drawer-val" :title="standShowItemEO.foShow">{{ standShowItemEO.foShow }}</span>-->
+<!--        </div>-->
+<!--        <div class="see-drawer-div">-->
+<!--          <label class="see-drawer-name" title="责任工程师">责任工程师</label>-->
+<!--          <span class="see-drawer-val" :title="standShowItemEO.dutyEngineerShow">{{-->
+<!--              standShowItemEO.dutyEngineerShow-->
+<!--            }}</span>-->
+<!--        </div>-->
+<!--        <div class="see-drawer-div">-->
+<!--          <label class="see-drawer-name" title="svpps">svpps</label>-->
+<!--          <span class="see-drawer-val" :title="standShowItemEO.svppsShow">{{ standShowItemEO.svppsShow }}</span>-->
+<!--        </div>-->
+
+<!--        <div class="see-drawer-div">-->
+<!--          <label class="see-drawer-name" title="要求类型">要求类型</label>-->
+<!--          <span class="see-drawer-val" :title="standShowItemEO.claimTypeShow">{{ standShowItemEO.claimTypeShow }}</span>-->
+<!--        </div>-->
+<!--        <div class="see-drawer-div">-->
+<!--          <label class="see-drawer-name" title="企标覆盖关系">企标覆盖关系</label>-->
+<!--          <span class="see-drawer-val"-->
+<!--                :title="standShowItemEO.busStandCoverShow ? standShowItemEO.busStandCoverShow : busStandCoverName(standShowItemEO.busStandCover)">{{-->
+<!--              standShowItemEO.busStandCoverShow ? standShowItemEO.busStandCoverShow : busStandCoverName(standShowItemEO.busStandCover)-->
+<!--            }}</span>-->
+<!--        </div>-->
       </div>
     </el-drawer>
     <!-- 更新LOG -->
@@ -900,10 +977,14 @@
                   <i class="iconfont">&#xe61e;</i>
                   <el-dropdown-menu slot="dropdown">
                     <el-dropdown-item :command="[scope.row, '查看']">查看</el-dropdown-item>
-                    <el-dropdown-item :v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'XPMLS6UV5HXG7C9ZR6B8' : '5ZC797XABNFV36KWJCA5'" :command="[scope.row, '编辑']">
+                    <el-dropdown-item
+                        :v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'XPMLS6UV5HXG7C9ZR6B8' : '5ZC797XABNFV36KWJCA5'"
+                        :command="[scope.row, '编辑']">
                       编辑
                     </el-dropdown-item>
-                    <el-dropdown-item :v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '4V4592SVLAZY9HMC8WHU' : '485WL3QHGRJ27H2XD34Z'" :command="[scope.row, '删除']">
+                    <el-dropdown-item
+                        :v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '4V4592SVLAZY9HMC8WHU' : '485WL3QHGRJ27H2XD34Z'"
+                        :command="[scope.row, '删除']">
                       删除
                     </el-dropdown-item>
                   </el-dropdown-menu>
@@ -928,7 +1009,8 @@
           <el-input v-model="addForm.title" placeholder="请输入标题"></el-input>
         </el-formItem>
         <el-formItem label="内容" prop="content" class="add-form-item">
-          <el-input v-model="addForm.content" :autosize="{ minRows: 3, maxRows: 4}" resize="none" type="textarea" placeholder="请输入内容"></el-input>
+          <el-input v-model="addForm.content" :autosize="{ minRows: 3, maxRows: 4}" resize="none" type="textarea"
+                    placeholder="请输入内容"></el-input>
         </el-formItem>
         <el-formItem label="附件" prop="files" class="add-form-item">
           <el-upload
@@ -949,7 +1031,8 @@
         </el-formItem>
       </el-form>
       <div slot="footer" class="demo-drawer-footer">
-        <el-button type="primary" size="mini" class="common-button-primary" :loading="AddKnowSubLoading" icon="el-icon-check" @click="AddKnowSub">
+        <el-button type="primary" size="mini" class="common-button-primary" :loading="AddKnowSubLoading"
+                   icon="el-icon-check" @click="AddKnowSub">
           确定
         </el-button>
         <el-button class="common-button-default" icon="el-icon-close" @click="AddKnowClose">取消</el-button>
@@ -1017,7 +1100,8 @@
           </template>
         </div>
         <div slot="footer" class="demo-drawer-footer">
-          <el-button type="primary" size="mini" class="common-button-primary" icon="el-icon-check" @click="comparisonSub">
+          <el-button type="primary" size="mini" class="common-button-primary" icon="el-icon-check"
+                     @click="comparisonSub">
             确定
           </el-button>
           <el-button class="common-button-default" icon="el-icon-close" @click="comparisonClose">取消</el-button>
@@ -1043,7 +1127,8 @@
             <el-input v-model.trim="listVO.name" placeholder="请输入清单名称" clearable/>
           </el-form-item>
           <el-form-item label="是否公开" prop="public" class="add-form-item">
-            <el-radio-group v-model="listVO.public" style="margin-bottom: 0px; display: flex; align-items: center; height: 50px;">
+            <el-radio-group v-model="listVO.public"
+                            style="margin-bottom: 0px; display: flex; align-items: center; height: 50px;">
               <el-radio :label="true">是</el-radio>
               <el-radio :label="false">否</el-radio>
             </el-radio-group>
@@ -1051,7 +1136,8 @@
         </el-form>
       </div>
       <div id="listFormButton" class="demo-drawer-footer">
-        <el-button class="common-button-primary" icon="el-icon-check" type="primary" @click="submitDrawerForm('listVO')">
+        <el-button class="common-button-primary" icon="el-icon-check" type="primary"
+                   @click="submitDrawerForm('listVO')">
           确定
         </el-button>
         <el-button class="common-button-default" icon="el-icon-close" @click="AddcomparisonDrawer = false">取消
@@ -1067,7 +1153,8 @@
         <p v-html="importForm.content"></p>
       </div>
       <div slot="footer" class="demo-drawer-footer">
-        <el-button type="primary" size="mini" class="common-button-default" icon="el-icon-check" @click="importFailed = false">
+        <el-button type="primary" size="mini" class="common-button-default" icon="el-icon-check"
+                   @click="importFailed = false">
           确认
         </el-button>
       </div>
@@ -1093,10 +1180,12 @@
         ></related-terms-select>
       </div>
       <div class="demo-drawer-footer">
-        <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" :loading="btnLoading" @click="handleRelatedTermsDrawerSubmit">
+        <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" :loading="btnLoading"
+                   @click="handleRelatedTermsDrawerSubmit">
           {{ $t('m.submit') }}
         </el-button>
-        <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="handleRelatedTermsDrawerCancel">
+        <el-button class="common-button-default" size="mini" icon="el-icon-close"
+                   @click="handleRelatedTermsDrawerCancel">
           {{ $t('m.cancel') }}
         </el-button>
       </div>
@@ -1127,6 +1216,7 @@ export default {
   },
   data() {
     return {
+      interpretationContent: '',
       relatedTermsDrawerVisible: false,
       btnLoading: false,
       comparisonTitle: '',
@@ -1229,7 +1319,7 @@ export default {
         synopsis: '',
         responsibleUnit: '',
         category: '',
-        remark: ''
+        remark: '',
       }, // 标准新增过程中用到的对象
       standItemEO: {
         id: '',
@@ -1981,12 +2071,18 @@ export default {
     },
     // 分页点击后方法
     pageChange(page) {
+      console.log("page");
+      console.log(page);
+
       this.standItemSearch.page = page
       this.selectSarStandItems()
     },
     // 分页每页显示数改变后方法
     pageSizeChange(pageSize) {
-      this.standItemSearch.pageSize = this.$store.getters.userInfo.configContent
+      console.log("pageSize");
+      console.log(pageSize);
+      // this.standItemSearch.pageSize = this.$store.getters.userInfo.configContent
+      this.standItemSearch.pageSize =pageSize;
       this.selectSarStandItems()
       // 此处需要调用接口，修改个人配置
     },
@@ -2221,8 +2317,11 @@ export default {
       this.$http.get('SarStandItems/sar-stand-items/querySarItemAndInterpretation', this.standItemSearch, {}, res => {
         this.selectedItemList = []
         if (res.ok) {
-          this.standItemList = res.data;
+          this.standItemList = res.data.list;
-          console.log("hello" + this.standItemList + res.data);
+          console.log("standItemList");
+          console.log(this.standItemList);
+          console.log("res.data");
+          console.log(res.data);
           this.standitemTotal = res.data.count // 分页需要
         }
       }, e => {
@@ -2386,14 +2485,17 @@ export default {
     },
     // 分解单-查看
     handlePreview(item) {
+      console.log(item);
+      this.standShowItemEO = item
+      console.log(this.standShowItemEO);
       this.showItemInfoModal = true
       let fileList = []
       item.defaultFileList = []
-      this.standShowItemEO = JSON.parse(JSON.stringify(item))
+
+
       if (this.standShowItemEO.tackTime != null && this.standShowItemEO.tackTime !== '') {
         this.standShowItemEO.tackTime = this.standShowItemEO.tackTime.split(' ')[0]
       }
-      this.standShowItemEO.applyArctic = this.standShowItemEO.applyArcticShow // 将编辑的显示字段赋值
       this.standShowItemEO.responsibleUnit = this.standShowItemEO.responsibleUnitShow
       // 请求文件信息
       if (item.relevanceFile != null && item.relevanceFile !== '') {

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

@@ -1064,6 +1064,7 @@ export default {
     //保存事件
     handleSave() {
       this.saveLoading = true;
+      this.listForm.fileName = this.fileInfoList
       let _formData = new FormData();
       _formData.append("id", this.bpnId || "");
       _formData.append("createUser", this.$store.getters.userInfo.userId);
@@ -1089,6 +1090,7 @@ export default {
         this.$message.warning("标准不能为空");
       } else {
         this.listForm.commentText = this.commentText
+        this.listForm.fileName = this.fileInfoList
         var json = Object.assign(this.listForm, this.roleForm);
         this.$refs["qdfbForm"].validate((valid) => {
           if (valid) {
@@ -1126,14 +1128,11 @@ export default {
     },
     // 删除上传的文件
     delFileInfo(file, fileList) {
-      let middle = [];
+      this.fileInfoList.forEach((item, index) => {
-      let files = [];
+        if (item.name === file.name || item.id === file.id ) {
-      fileList.forEach(item => {
+          this.fileInfoList.splice(index,1)
-        middle.push(item.name);
+        }
-        files.push(item.response.data.id);
+      })
-      });
-      this.fileListName = middle;
-      this.fileIds = files;
     },
     fileUpload() {
       this.fileMadel = true;
@@ -1141,24 +1140,7 @@ export default {
     // 上传文件成功回调
     uploadBackSuccess(res, file, fileList) {
       if (res.ok) {
-        let middle = [];
+        this.fileInfoList.push(res.data)
-        fileList.forEach(item => {
-          middle.push(item.name);
-        });
-        this.fileListName = middle;
-        this.fileIds.push(file.response.data.id);
-        // this.listForm.fileName =  this.fileListName.join(',');
-        // this.listForm.fileId = this.fileIds.join(',');
-        // if (this.listForm.fileName === null || this.listForm.fileName === undefined) {
-        //   this.listForm.fileName = this.fileListName.join(",");
-        // } else {
-        //   this.listForm.fileName = this.listForm.fileName + "," + this.fileListName.join(",");
-        // }
-        // if (this.listForm.fileId === null || this.listForm.fileId === undefined) {
-        //   this.listForm.fileId = this.fileIds.join(",");
-        // } else {
-        //   this.listForm.fileId = this.listForm.fileId + "," + this.fileIds.join(",");
-        // }
         this.$message.success("上传成功");
       } else {
         this.$message.error(res.message);
@@ -1290,26 +1272,39 @@ export default {
     //选择清单确定事件
     OkDrawer() {
       if (this.selectedList.length === 1) {
-        let deposit = new Map();
+        this.listForm.standId = this.selectedList[0].id;
-        this.sarAccessListDatas.forEach(item => {
+        this.listForm.listName = this.selectedList[0].detailedListName;
-          deposit.set(item.id, item);
+        this.listForm.descriptionList = this.selectedList[0].remark;
-        });
+        // 将查询出的文件名字和id组合成数组
-        let bringData = [];
+        if(this.selectedList[0].fileName !== null) {
-        for (let i = 0; i < this.selectedList.length; i++) {
+          let textName = this.selectedList[0].fileName.split(',').map(item => {
-          bringData.push(deposit.get(this.selectedList[i]));
+            return {
+              name: item
+            }
+          })
+          let textId = this.selectedList[0].fileIds.split(',').map(item => {
+            return {
+              id: item
+            }
+          })
+          textName.forEach(item => {
+            this.$set(item, 'id', '')
+          })
+          for (let i = 0; i< textName.length; i++) {
+            textName[i].id = textId[i].id
+          }
+          this.fileInfoList = textName
+        } else {
+          this.fileInfoList = []
         }
-        this.listForm.standId = bringData[0].id;
-        this.listForm.listName = bringData[0].detailedListName;
-        this.listForm.descriptionList = bringData[0].remark;
-        this.listForm.fileId = bringData[0].fileIds;
-        this.listForm.fileName = bringData[0].fileName;
         this.ListModel = false;
+
         this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById",
-          { id: bringData[0].id, page: this.page, Size: this.pageSize }, {
+          { id: this.selectedList[0].id, page: this.page, Size: this.pageSize }, {
             _this: this
           }, res => {
-            if (res.data.records == null) {
+            if (res.data === null) {
-              res.data.records = [];
+              this.dataList = [];
             }
             this.dataList = res.data.records;
             this.dataList.forEach(item => {
@@ -1321,7 +1316,7 @@ export default {
                 this.$set(item, "ZCCSSRQ", item.zccssrqgj);
               }
             })
-            this.listForm.dataList = res.data;
+            this.listForm.dataList = res.data.records;
             let formId = [];
             this.dataList.map(item => {
               formId.push(item.id);
@@ -1339,7 +1334,7 @@ export default {
     selectListChange(data) {
       this.selectedList = [];
       for (let i = 0; i < data.length; i++) {
-        this.selectedList.push(data[i].id);
+        this.selectedList.push(data[0]);
       }
     },
     //标准表格选择框改变

src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue

@@ -37,26 +37,21 @@
                 ></el-input>
               </el-form-item>
               <el-form-item label="附件" prop="fileName" class="add-form-item form-item-disabled">
-                <div class="file-box" v-if="fileList.length > 0">
+                <el-upload
-                  <p v-for="item in fileList"
+                  :action="uploadFileListPath"
-                     :key="item.id"> {{ item.name }}
+                  show-file-list
-                    <i
+                  :file-list="fileInfoList"
-                      title="下载"
+                  name="file"
-                      @click="downloadFile(item.id)"
+                  accept=".PDF, .pdf, .doc, .DOC, .docx, .DOCX, .xls, .xlsx, .ppt, .pptx, .PPT, .PPTX, .JPG, .JPEG, .PNG, .jpg, .jpeg, .png"
-                      class="icon-download"
+                  :on-remove="delFileInfo"
-                      v-btn-permission="''"
+                  :on-success="uploadBackSuccess"
-                    />
+                  :before-upload="beforeUpload"
-                    <i
+                  :on-preview="handleOnPreview"
-                      title="下载带水印"
+                >
-                      @click="downloadFileByWater(item.id, item.name)"
+                  <el-button class="common-button-default" size="mini">
-                      class="icon-download2"
+                    点击上传
-                      v-btn-permission="''"
+                  </el-button>
-                    />
+                </el-upload>
-                  </p>
-                </div>
-                <div v-else>
-                  暂无数据
-                </div>
               </el-form-item>
             </el-col>
           </el-row>
@@ -479,7 +474,7 @@ export default {
         this.dataList = mes.form.dataList;
         this.commentText = mes.commentText;
         this.prcNum = mes.prcNum
-        this.fileIds = mes.form.fileId;
+        this.fileInfoList = mes.form.fileName;
         this.getFileInfo();
         this.processTable();
       });
@@ -652,13 +647,16 @@ export default {
     },
     // 删除上传的文件
     delFileInfo (file, fileList) {
-      this.fileInfoList = fileList
+      this.fileInfoList.forEach((item, index) => {
+        if (item.name === file.name || item.id === file.id ) {
+          this.fileInfoList.splice(index,1)
+        }
+      })
     },
     // 上传文件成功回调
     uploadBackSuccess (res, file, fileList) {
       if (res.ok) {
-        this.fileInfoList = fileList
+        this.fileInfoList.push(res.data)
-        this.fileInfoList[this.fileInfoList.length - 1].id = res.data.id
         this.$message.success('上传成功')
       } else {
         this.$message.error(res.message)
@@ -666,8 +664,38 @@ export default {
       }
     },
     //上传之前的钩子
-    beforeUpload () {
+    //上传之前的钩子
-
+    beforeUpload (file) {
+      var filename = file.name;
+      // this.listForm.fileName = this.listForm.fileName + ',' + file.name
+      var index1 = filename.lastIndexOf(".");
+      var index2 = filename.length;
+      var fileSuffix = filename.substring(index1, index2);
+      //把后缀转大写
+      if (fileSuffix !== undefined && fileSuffix !== null) {
+        fileSuffix = fileSuffix.toUpperCase();
+      }
+      // 判断上传文件格式
+      if (fileSuffix === ".PDF" || fileSuffix === ".DOC" || fileSuffix === ".DOCX" || fileSuffix === ".PPT"
+        || fileSuffix === ".PPTX" || fileSuffix === ".XLS" || fileSuffix === ".XLSX"
+        || fileSuffix === ".PNG" || fileSuffix === ".JPG" || fileSuffix === ".JPEG") {
+        return true;
+      } else {
+        this.$message.error("文件" + file.name + "格式不正确，请上传pdf、doc、docx、ppt、pptx、xls、xlsx、png、jpg、jpeg等文件");
+        return false;
+      }
+      // 判断文件上传大小
+      if (file.size / 1024 / 1024 > 300) {
+        this.$message.warning("文件" + file.name + "大小不能超过300M");
+        return false;
+      }
+      return true;
+    },
+    handleOnPreview(file) {
+      let attId = file.id
+      if (attId != null && attId !== "") {
+        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+      }
     },
     //保存事件
     handleSave() {

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

@@ -50,8 +50,6 @@
               </el-form-item>
               <el-form-item label="附件" prop="fileName" class="add-form-item form-item-disabled">
                 <div>
-                  <p>
-                    {{ listForm.fileName }}
                   <el-upload
                     :action="uploadFileListPath"
                     show-file-list
@@ -66,7 +64,6 @@
                       点击上传
                     </el-button>
                   </el-upload>
-                  </p>
                 </div>
               </el-form-item>
               <el-form-item label="会签" prop="sign" class="add-form-item form-item-disabled">
@@ -108,7 +105,8 @@
             label="标准号">
             <template slot-scope="scope">
               <a v-if="scope.row.standYear" class="table-jump"
-                 @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber
+                 @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
+                  scope.row.standNumber
                 }}-{{ scope.row.standYear }}</a>
               <a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }}
                 {{ scope.row.standNumber }}</a>
@@ -211,20 +209,20 @@
                 </el-form-item>
               </el-card>
             </el-timeline-item>
-<!--            <el-timeline-item timestamp="选择会签责任人,填写意见" placement="top"-->
+            <!--            <el-timeline-item timestamp="选择会签责任人,填写意见" placement="top"-->
-<!--                              :color="roleForm.dockUser ? '#66b1ff' : ''" v-if="signFlag === '2'">-->
+            <!--                              :color="roleForm.dockUser ? '#66b1ff' : ''" v-if="signFlag === '2'">-->
-<!--              <el-card>-->
+            <!--              <el-card>-->
-<!--                <el-form-item prop="dockUserName2" style="margin-bottom: 0">-->
+            <!--                <el-form-item prop="dockUserName2" style="margin-bottom: 0">-->
-<!--                  <h4>会签人</h4>-->
+            <!--                  <h4>会签人</h4>-->
-<!--                  <div style="margin-top: 10px;width: 300px;">-->
+            <!--                  <div style="margin-top: 10px;width: 300px;">-->
-<!--                    <el-input v-model="roleForm.dockUser" style="display: none;"></el-input>-->
+            <!--                    <el-input v-model="roleForm.dockUser" style="display: none;"></el-input>-->
-<!--                    <el-input v-model="roleForm.dockUserName" placeholder="选择会签责任人"-->
+            <!--                    <el-input v-model="roleForm.dockUserName" placeholder="选择会签责任人"-->
-<!--                              @click.native="choiceZRR('dockUser', '选择责任人', roleForm.dockUser)">-->
+            <!--                              @click.native="choiceZRR('dockUser', '选择责任人', roleForm.dockUser)">-->
-<!--                    </el-input>-->
+            <!--                    </el-input>-->
-<!--                  </div>-->
+            <!--                  </div>-->
-<!--                </el-form-item>-->
+            <!--                </el-form-item>-->
-<!--              </el-card>-->
+            <!--              </el-card>-->
-<!--            </el-timeline-item>-->
+            <!--            </el-timeline-item>-->
             <el-timeline-item timestamp="根据会签意见修订" placement="top"
                               :color="roleForm.ministerUser ? '#66b1ff' : ''" v-if="signFlag === '1'">
               <el-card>
@@ -324,7 +322,8 @@
               >
                 <template slot-scope="scope">
                   <a class="table-jump" @click.stop="showTable(scope.row)">{{
-                      scope.row.detailedListName }}</a>
+                      scope.row.detailedListName
+                    }}</a>
                 </template>
               </el-table-column>
               <el-table-column
@@ -343,7 +342,8 @@
                 align="center">
                 <template slot-scope="scope">
             <span
-              v-if="scope.row.detailedListVision != null && scope.row.detailedListVision !== ''">{{ scope.row.detailedListVision
+              v-if="scope.row.detailedListVision != null && scope.row.detailedListVision !== ''">{{
+                scope.row.detailedListVision
               }}</span>
                 </template>
               </el-table-column>
@@ -391,7 +391,8 @@
               >
                 <template slot-scope="scope">
                   <a class="table-jump" @click.stop="showTable(scope.row)">{{
-                      scope.row.detailedListName }}</a>
+                      scope.row.detailedListName
+                    }}</a>
                 </template>
               </el-table-column>
               <el-table-column
@@ -410,7 +411,8 @@
                 align="center">
                 <template slot-scope="scope">
             <span
-              v-if="scope.row.detailedListVision != null && scope.row.detailedListVision !== ''">{{ scope.row.detailedListVision
+              v-if="scope.row.detailedListVision != null && scope.row.detailedListVision !== ''">{{
+                scope.row.detailedListVision
               }}</span>
                 </template>
               </el-table-column>
@@ -458,7 +460,8 @@
               >
                 <template slot-scope="scope">
                   <a class="table-jump" @click.stop="showTable(scope.row)">{{
-                      scope.row.detailedListName }}</a>
+                      scope.row.detailedListName
+                    }}</a>
                 </template>
               </el-table-column>
               <el-table-column
@@ -477,7 +480,8 @@
                 align="center">
                 <template slot-scope="scope">
             <span
-              v-if="scope.row.detailedListVision != null && scope.row.detailedListVision !== ''">{{ scope.row.detailedListVision
+              v-if="scope.row.detailedListVision != null && scope.row.detailedListVision !== ''">{{
+                scope.row.detailedListVision
               }}</span>
                 </template>
               </el-table-column>
@@ -593,7 +597,8 @@
                       scope.row.standNumber
                     }}-{{ scope.row.standYear }}</a>
                   <a v-else @click="handlePreview(scope.row)" class="table-jump">{{
-                      scope.row.standSortShow }}
+                      scope.row.standSortShow
+                    }}
                     {{ scope.row.standNumber }}</a>
                 </template>
               </el-table-column>
@@ -705,7 +710,7 @@
 import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
-import { saveTaskFirst } from "api/process";
+import {saveTaskFirst} from "api/process";
 import seeDatalis from "@/pages/localTool/standContrast/pages/seeDatalis";
 
 export default {
@@ -755,21 +760,21 @@ export default {
       },
       formRules: {
         listType: [
-          { required: true, message: "请选择清单类型", trigger: "change" }
+          {required: true, message: "请选择清单类型", trigger: "change"}
         ],
         listName: [
-          { required: true, message: "请填写清单名称", trigger: "change" }
+          {required: true, message: "请填写清单名称", trigger: "change"}
         ]
       },
       roleFormRules: {
         dockUserName: [
-          { required: true, message: "请选择会签责任人", trigger: "change" }
+          {required: true, message: "请选择会签责任人", trigger: "change"}
         ],
         ministerUserName: [
-          { required: true, message: "请选择修订责任人", trigger: "change" }
+          {required: true, message: "请选择修订责任人", trigger: "change"}
         ],
         directorUserName: [
-          { required: true, message: "请选择审批责任人", trigger: "change" }
+          {required: true, message: "请选择审批责任人", trigger: "change"}
         ]
       },
       dataList: [],//清单里的标准数据
@@ -913,12 +918,12 @@ export default {
           _this: this
         }, res => {
           this.sarAccessListDatas = res.data.records;
-          this.sarAccessListDatas.forEach(item =>{
+          this.sarAccessListDatas.forEach(item => {
             // 适用车型转换
             if (item.carType !== null) {
               let k = (item.carType || "").split(',')
               for (let i in this.energyKindOptions) {
-                for (let m = 0; m< k.length; m++) {
+                for (let m = 0; m < k.length; m++) {
                   if (this.energyKindOptions[i].value === k[m]) {
                     k[m] = this.energyKindOptions[i].label
                   }
@@ -984,10 +989,10 @@ export default {
       }, res => {
         this.standardData = res.data.list;
         this.standardData.forEach(item => {
-          if(item.attrInfoMap === null){
+          if (item.attrInfoMap === null) {
             this.$set(item, "ZCCSSRQ", '');
             this.$set(item, "XCXSSRQ", '');
-          }else{
+          } else {
             this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ);
             this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ);
           }
@@ -1036,6 +1041,7 @@ export default {
     //保存事件
     handleSave() {
       this.saveLoading = true;
+      this.listForm.fileName = this.fileInfoList
       let _formData = new FormData();
       _formData.append("id", this.bpnId || "");
       _formData.append("createUser", this.$store.getters.userInfo.userId);
@@ -1061,13 +1067,14 @@ export default {
         this.$message.warning("标准不能为空");
       } else {
         this.listForm.commentText = this.commentText
+        this.listForm.fileName = this.fileInfoList
         var json = Object.assign(this.listForm, this.roleForm);
         this.$refs["qdfbForm"].validate((valid) => {
           if (valid) {
             this.$refs["Form"].validate((valid) => {
               if (valid) {
                 this.isSubmit = true
-                this.$http.get("lawss/activiti/startProcess", { type: "4" }, {
+                this.$http.get("lawss/activiti/startProcess", {type: "4"}, {
                   _this: this
                 }, res => {
                   if (res.ok) {
@@ -1098,14 +1105,11 @@ export default {
     },
     // 删除上传的文件
     delFileInfo(file, fileList) {
-      let middle = [];
+      this.fileInfoList.forEach((item, index) => {
-      let files = [];
+        if (item.name === file.name || item.id === file.id ) {
-      fileList.forEach(item => {
+          this.fileInfoList.splice(index,1)
-        middle.push(item.name);
+        }
-        files.push(item.response.data.id);
+      })
-      });
-      this.fileListName = middle;
-      this.fileIds = files;
     },
     fileUpload() {
       this.fileMadel = true;
@@ -1113,24 +1117,7 @@ export default {
     // 上传文件成功回调
     uploadBackSuccess(res, file, fileList) {
       if (res.ok) {
-        let middle = [];
+        this.fileInfoList.push(res.data)
-        fileList.forEach(item => {
-          middle.push(item.name);
-        });
-        this.fileListName = middle;
-        this.fileIds.push(file.response.data.id);
-        // this.listForm.fileName =  this.fileListName.join(',');
-        // this.listForm.fileId = this.fileIds.join(',');
-        if (this.listForm.fileName === null || this.listForm.fileName === undefined || this.listForm.fileName === '') {
-          this.listForm.fileName = this.fileListName.join(",");
-        } else {
-          this.listForm.fileName = this.listForm.fileName + "," + this.fileListName.join(",");
-        }
-        if (this.listForm.fileId === null || this.listForm.fileId === undefined || this.listForm.fileName === '') {
-          this.listForm.fileId = this.fileIds.join(",");
-        } else {
-          this.listForm.fileId = this.listForm.fileId + "," + this.fileIds.join(",");
-        }
         this.$message.success("上传成功");
       } else {
         this.$message.error(res.message);
@@ -1262,30 +1249,39 @@ export default {
     //选择清单确定事件
     OkDrawer() {
       if (this.selectedList.length === 1) {
-        let deposit = new Map();
+        this.listForm.standId = this.selectedList[0].id;
-        this.sarAccessListDatas.forEach(item => {
+        this.listForm.listName = this.selectedList[0].detailedListName;
-          deposit.set(item.id, item);
+        this.listForm.descriptionList = this.selectedList[0].remark;
-        });
+        // 将查询出的文件名字和id组合成数组
-        let bringData = [];
+        if(this.selectedList[0].fileName !== null) {
-        for (let i = 0; i < this.selectedList.length; i++) {
+          let textName = this.selectedList[0].fileName.split(',').map(item => {
-          bringData.push(deposit.get(this.selectedList[i]));
+            return {
+              name: item
             }
-        this.listForm.standId = bringData[0].id;
+          })
-        this.listForm.listName = bringData[0].detailedListName;
+          let textId = this.selectedList[0].fileIds.split(',').map(item => {
-        this.listForm.descriptionList = bringData[0].remark;
+            return {
-        this.listForm.fileId = bringData[0].fileIds;
+              id: item
-        if(bringData[0].fileName === null ){
+            }
-          this.listForm.fileName = ''
+          })
+          textName.forEach(item => {
+            this.$set(item, 'id', '')
+          })
+          for (let i = 0; i< textName.length; i++) {
+            textName[i].id = textId[i].id
+          }
+          this.fileInfoList = textName
         } else {
-          this.listForm.fileName = bringData[0].fileName;
+          this.fileInfoList = []
         }
         this.ListModel = false;
+
         this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById",
-          { id: bringData[0].id, page: this.page, Size: this.pageSize }, {
+          { id: this.selectedList[0].id, page: this.page, Size: this.pageSize }, {
             _this: this
           }, res => {
-            if (res.data.records == null) {
+            if (res.data === null) {
-              res.data.records = [];
+              this.dataList = [];
             }
             this.dataList = res.data.records;
             this.dataList.forEach(item => {
@@ -1315,7 +1311,7 @@ export default {
     selectListChange(data) {
       this.selectedList = [];
       for (let i = 0; i < data.length; i++) {
-        this.selectedList.push(data[i].id);
+        this.selectedList.push(data[0]);
       }
     },
     //标准表格选择框改变
@@ -1349,7 +1345,6 @@ export default {
       });
     },
     pageChange(page) {
-      console.log(page);
       this.page = page;
       this.selectionList();
     },

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

@@ -315,7 +315,6 @@ export default {
           taskIds: this.taskIds,
           pId: this.pId
         }).then(res => {
-          console.log(res.mesg);
           if (res) {
             const processForm = JSON.parse(res.mesg);
             this.getFormFieldList(processForm);
@@ -330,16 +329,17 @@ export default {
     getFormFieldList(item) {
       this.$nextTick(() => {
         this.listForm = JSON.parse(JSON.stringify(item));
-        console.log(this.listForm.fileName);
         this.listForm.prcNum = this.prcNum;
         this.listForm.prcName = this.prcName;
         this.listForm["id"] = item.id;
         this.dataList = item.dataList;
         this.listForm.jlUserId = item.jlUserId;
         this.listForm.zrUserId = item.zrUserId;
-        this.fileIds = item.fileId;
+        item.fileName.forEach(itemId => {
+          this.fileIds = itemId.id
           this.getFileInfo();
         });
+      });
     },
     // 请求上传的文件信息
     getFileInfo() {

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

@@ -52,26 +52,21 @@
                 ></el-input>
               </el-form-item>
               <el-form-item label="附件" prop="fileName" class="add-form-item form-item-disabled">
-                <div class="file-box" v-if="fileList.length > 0">
+                <el-upload
-                  <p v-for="item in fileList"
+                  :action="uploadFileListPath"
-                     :key="item.id"> {{ item.name }}
+                  show-file-list
-                    <i
+                  :file-list="fileInfoList"
-                      title="下载"
+                  name="file"
-                      @click="downloadFile(item.id)"
+                  accept=".PDF, .pdf, .doc, .DOC, .docx, .DOCX, .xls, .xlsx, .ppt, .pptx, .PPT, .PPTX, .JPG, .JPEG, .PNG, .jpg, .jpeg, .png"
-                      class="icon-download"
+                  :on-remove="delFileInfo"
-                      v-btn-permission="''"
+                  :on-success="uploadBackSuccess"
-                    />
+                  :before-upload="beforeUpload"
-                    <i
+                  :on-preview="handleOnPreview"
-                      title="下载带水印"
+                >
-                      @click="downloadFileByWater(item.id, item.name)"
+                  <el-button class="common-button-default" size="mini">
-                      class="icon-download2"
+                    点击上传
-                      v-btn-permission="''"
+                  </el-button>
-                    />
+                </el-upload>
-                  </p>
-                </div>
-                <div v-else>
-                  暂无数据
-                </div>
               </el-form-item>
             </el-col>
           </el-row>
@@ -611,7 +606,7 @@ export default {
       }
     },
     // 请求上传的文件信息
-    getFileInfo() {
+   /* getFileInfo() {
       this.$http.get("att/attFile/getMultiFileInfos", {
         fileIds: this.fileIds
       }, {
@@ -630,7 +625,7 @@ export default {
         });
       }, e => {
       });
-    },
+    },*/
     /**
      * @Description: 点击下载
      */
@@ -655,13 +650,16 @@ export default {
     },
     // 删除上传的文件
     delFileInfo (file, fileList) {
-      this.fileInfoList = fileList
+      this.fileInfoList.forEach((item, index) => {
+        if (item.name === file.name || item.id === file.id ) {
+          this.fileInfoList.splice(index,1)
+        }
+      })
     },
     // 上传文件成功回调
     uploadBackSuccess (res, file, fileList) {
       if (res.ok) {
-        this.fileInfoList = fileList
+        this.fileInfoList.push(res.data)
-        this.fileInfoList[this.fileInfoList.length - 1].id = res.data.id
         this.$message.success('上传成功')
       } else {
         this.$message.error(res.message)
@@ -669,8 +667,37 @@ export default {
       }
     },
     //上传之前的钩子
-    beforeUpload () {
+    beforeUpload (file) {
-
+      var filename = file.name;
+      // this.listForm.fileName = this.listForm.fileName + ',' + file.name
+      var index1 = filename.lastIndexOf(".");
+      var index2 = filename.length;
+      var fileSuffix = filename.substring(index1, index2);
+      //把后缀转大写
+      if (fileSuffix !== undefined && fileSuffix !== null) {
+        fileSuffix = fileSuffix.toUpperCase();
+      }
+      // 判断上传文件格式
+      if (fileSuffix === ".PDF" || fileSuffix === ".DOC" || fileSuffix === ".DOCX" || fileSuffix === ".PPT"
+        || fileSuffix === ".PPTX" || fileSuffix === ".XLS" || fileSuffix === ".XLSX"
+        || fileSuffix === ".PNG" || fileSuffix === ".JPG" || fileSuffix === ".JPEG") {
+        return true;
+      } else {
+        this.$message.error("文件" + file.name + "格式不正确，请上传pdf、doc、docx、ppt、pptx、xls、xlsx、png、jpg、jpeg等文件");
+        return false;
+      }
+      // 判断文件上传大小
+      if (file.size / 1024 / 1024 > 300) {
+        this.$message.warning("文件" + file.name + "大小不能超过300M");
+        return false;
+      }
+      return true;
+    },
+    handleOnPreview(file) {
+      let attId = file.id
+      if (attId != null && attId !== "") {
+        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+      }
     },
     getData() {
       return new Promise((resolve, reject) => {
@@ -701,14 +728,12 @@ export default {
           this.listForm.applyUpdUserId = item.applyUpdUserId
           this.listForm.jlUserId = item.jlUserId
           this.listForm.zrUserId = item.zrUserId
-          this.fileIds = item.fileId;
+          this.fileInfoList = item.fileName
-          this.getFileInfo();
          } else {
           this.listForm = item.form
           this.dataList = item.form.dataList
           this.listForm.dataList = item.form.dataList
-          this.fileIds = item.form.fileId;
+          this.fileInfoList = item.form.fileName
-          this.getFileInfo();
         }
       })
     },

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

@@ -37,27 +37,6 @@
                   clearable
                 ></el-input>
               </el-form-item>
-<!--              <el-form-item label="附件" prop="modelName" class="add-form-item form-item-disabled">-->
-<!--                <div class="file-box" v-if="listForm.model">-->
-<!--                  <p> {{ listForm.modelName }}-->
-<!--                    <i-->
-<!--                      title="下载"-->
-<!--                      @click="downloadFile(listForm.model)"-->
-<!--                      class="icon-download"-->
-<!--                      v-btn-permission="''"-->
-<!--                    />-->
-<!--                    <i-->
-<!--                      title="下载带水印"-->
-<!--                      @click="downloadFileByWater(listForm.model,listForm.modelName)"-->
-<!--                      class="icon-download2"-->
-<!--                      v-btn-permission="''"-->
-<!--                    />-->
-<!--                  </p>-->
-<!--                </div>-->
-<!--                <div v-else>-->
-<!--                  暂无数据-->
-<!--                </div>-->
-<!--              </el-form-item>-->
               <el-form-item label="附件" prop="fileName" class="add-form-item form-item-disabled">
                 <div class="file-box" v-if="fileList.length > 0">
                   <p v-for="item in fileList"
@@ -379,9 +358,10 @@ export default {
         this.listForm.applyUpdUserId = item.applyUpdUserId;
         this.listForm.jlUserId = item.jlUserId;
         this.listForm.zrUserId = item.zrUserId;
-        this.fileIds = item.fileId;
+        item.fileName.forEach(itemId => {
-        console.log(this.fileIds);
+          this.fileIds = itemId.id
           this.getFileInfo();
+        })
       });
     },
     // 请求上传的文件信息
@@ -427,7 +407,7 @@ export default {
         }
       }
     },
-    //驳回事件
+    // 驳回事件
     beforeBack() {
       if(!this.commentText){
         this.$message.warning('请填写审批意见')

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

@@ -1150,6 +1150,10 @@ export default {
           { required: true, message: '请输入标准名称', trigger: 'blur' },
           { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }
         ],
+        standEnName: [
+          { required: true, message: '请输入标准英文名称', trigger: 'blur' },
+          { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }
+        ],
         standNature: [
           { required: true, message: '请选择标准性质', trigger: 'change' }
         ],

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

@@ -385,7 +385,6 @@ export default {
       this.fileData = fileList
       this.fileTextList.forEach((item, index) => {
         if (item.name === file.name || item.id === file.id ) {
-          console.log()
           this.fileTextList.splice(index,1)
         }
       })

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

@@ -349,7 +349,7 @@ export default {
               let aa = {
                 key: item.standId,
                 id: item.id,
-                standId: item.itemsNum,
+                standId: item.id,
                 itemsNum: item.itemsNum,
                 itemsName: item.itemsName,
                 workPeople: "请选择责任人"

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

@@ -112,13 +112,13 @@
             </template>
           </el-table-column>
           <el-table-column
-                  prop="endTime"
+                  prop="overTime"
                   label="完成日期"
                   align="center"
                   width="150"
           >
             <template slot-scope="scope">
-              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
+              <span>{{ scope.row.overTime ? $moment(scope.row.overTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
             </template>
           </el-table-column>
           <el-table-column :label="$t('m.operation')" align="center" width="50">

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

@@ -112,13 +112,13 @@
             </template>
           </el-table-column>
           <el-table-column
-                  prop="endTime"
+                  prop="overTime"
                   label="完成日期"
                   align="center"
                   width="150"
           >
             <template slot-scope="scope">
-              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
+              <span>{{ scope.row.overTime ? $moment(scope.row.overTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
             </template>
           </el-table-column>
           <el-table-column :label="$t('m.operation')" align="center" width="50">

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

@@ -112,13 +112,13 @@
             </template>
           </el-table-column>
           <el-table-column
-                  prop="endTime"
+                  prop="overTime"
                   label="完成日期"
                   align="center"
                   width="150"
           >
             <template slot-scope="scope">
-              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
+              <span>{{ scope.row.overTime ? $moment(scope.row.overTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
             </template>
           </el-table-column>
           <el-table-column :label="$t('m.operation')" align="center" width="50">

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

@@ -112,13 +112,13 @@
             </template>
           </el-table-column>
           <el-table-column
-            prop="endTime"
+            prop="overTime"
             label="完成日期"
             align="center"
             width="150"
           >
             <template slot-scope="scope">
-              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
+              <span>{{ scope.row.overTime ? $moment(scope.row.overTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
             </template>
           </el-table-column>
           <el-table-column :label="$t('m.operation')" align="center" width="50">

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

@@ -112,13 +112,13 @@
             </template>
           </el-table-column>
           <el-table-column
-                  prop="endTime"
+                  prop="overTime"
                   label="完成日期"
                   align="center"
                   width="380"
           >
             <template slot-scope="scope">
-              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
+              <span>{{ scope.row.overTime ? $moment(scope.row.overTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
             </template>
           </el-table-column>
           <el-table-column :label="$t('m.operation')" align="center" width="50">

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -1941,7 +1941,7 @@ export default {
           {type: 'string', max: 100, message: '代替标准编号不能超过100个字符', trigger: 'change'}
         ],
         isRelateAccess: [
-          { required: true, message: '重要度不能为空', trigger: 'change' }
+          { required: false, message: '重要度不能为空', trigger: 'change' }
         ],
         issueTime:[
           {required: true, message: '发布日期不能为空', trigger: 'change'}

src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue

@@ -129,7 +129,7 @@
                     class="common-button-primary"
                     size="mini"
                     v-btn-permission="'f0ea68cb2c01cd0063ea639ee9bd4cec'"
-                    @click="querySarProStateZero">查询
+                    @click="querySarProStateZero(1)">查询
                   </el-button>
                 </el-form-item>
                 <el-form-item class="search-item btn-box">

src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue

@@ -176,17 +176,17 @@
               label="责任部门">
             </el-table-column>
             <el-table-column
-              prop="dutyEngineerName"
+              prop="dutyEngineer"
               width="150"
               label="责任工程师">
             </el-table-column>
             <el-table-column
-              prop="authEngineerName"
+              prop="authEngineer"
               width="150"
               label="认证工程师">
             </el-table-column>
             <el-table-column
-              prop="qaEngineerName"
+              prop="qaEngineer"
               width="150"
               label="质量工程师">
             </el-table-column>