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

src/pages/details/otherStandardDetails/index.vue

@@ -288,7 +288,7 @@
                         v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'"
                     />
 
-                    <el-button v-if="file.fileSuffix='pdf'" type="primary" round>OCR</el-button>
+<!--                    <el-button v-if="file.fileSuffix='pdf'" type="primary" round>OCR</el-button>-->
                     <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>
                   </template>
                   <template v-else>
@@ -387,7 +387,7 @@
                     />
 <!--                    OCR按钮,根据文件名取后缀判断是否出现-->
 
-                      <el-button v-if="judgeSuffix(file.fileName)" type="primary" size="mini" style="margin: 5px" @click="ocrFunction(file)" plain>OCR</el-button>
+<!--                      <el-button v-if="judgeSuffix(file.fileName)" type="primary" size="mini" style="margin: 5px" @click="ocrFunction(file)" plain>OCR</el-button>-->
 
 
                     <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>
@@ -2245,6 +2245,8 @@ export default {
           }, {
             _this: this
           }, res => {
+
+            console.log("res.data",res.data);
             if (res.data) {
               let fileObj = {}
               fileObj.fileId = res.data.attId

src/pages/localTool/standardWarning.vue

@@ -113,7 +113,8 @@
                     <el-button
                       size="mini"
                       type="danger"
-                          @click="cancelWarning(scope.$index, scope.row)">取消预警</el-button>
+                      @click="cancelWarning(scope.$index, scope.row)">取消预警
+                    </el-button>
                   </template>
                 </el-table-column>
               </el-table>
@@ -183,7 +184,8 @@
                     <el-button
                       size="mini"
                       type="danger"
-                          @click="cancelWarning(scope.$index, scope.row)">取消预警</el-button>
+                      @click="cancelWarning(scope.$index, scope.row)">取消预警
+                    </el-button>
                   </template>
                 </el-table-column>
               </el-table>
@@ -255,7 +257,8 @@
                     <el-button
                       size="mini"
                       type="danger"
-                          @click="cancelWarning(scope.$index, scope.row)">取消预警</el-button>
+                      @click="cancelWarning(scope.$index, scope.row)">取消预警
+                    </el-button>
                   </template>
                 </el-table-column>
               </el-table>
@@ -327,7 +330,8 @@
                     <el-button
                       size="mini"
                       type="danger"
-                          @click="cancelWarning(scope.$index, scope.row)">取消预警</el-button>
+                      @click="cancelWarning(scope.$index, scope.row)">取消预警
+                    </el-button>
                   </template>
                 </el-table-column>
               </el-table>
@@ -544,7 +548,9 @@ export default {
               break
           }
         }
-        for (const loading in this.loading) { this.loading[loading] = false }
+        for (const loading in this.loading) {
+          this.loading[loading] = false
+        }
       }, e => {
       });
     },
@@ -580,7 +586,9 @@ export default {
               break
           }
         }
-         for(const loading in this.loading) {this.loading[loading] = false}
+        for (const loading in this.loading) {
+          this.loading[loading] = false
+        }
       }, e => {
       });
     },
@@ -800,7 +808,9 @@ export default {
     // this.queryNewTypeByPage();
     // this.queryProductionVehicleByPage();
     // 四个预警同时查询,loading全部打开
-    for (const loading in this.loading) { this.loading[loading] = true }
+    for (const loading in this.loading) {
+      this.loading[loading] = true
+    }
     this.getEarlyDate();
 
   }
@@ -963,6 +973,7 @@ export default {
           /deep/ .el-input__inner {
             width: 155px;
           }
+
           .choose-time-area {
             /deep/ .el-input__inner {
               width: 220px;

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

@@ -311,10 +311,15 @@ export default {
         if (item.responUserList !== undefined) {
           let listJSON = JSON.parse(JSON.stringify(item.responUserList))
           this.dataList = [listJSON][0].standardInfoList
+        } else {
+          if (item.dockUserList !== undefined) {
+            let listJSON = JSON.parse(JSON.stringify(item.dockUserList))
+            this.dataList = listJSON[0].standardInfoList
           }else {
             let listJSONInfo = item.info
             this.dataList = [listJSONInfo]
           }
+        }
         this.dataList.forEach(item => {
           if (item.fileText.length !== 0) {
             this.fileTextList = item.fileText

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

@@ -226,7 +226,7 @@
                   <div style="margin-top: 10px;width: 300px;">
                     <el-input v-model="roleForm.statuteMinister" style="display: none;"></el-input>
                     <el-input v-model="roleForm.statuteMinisterName" placeholder="选择标准法规部部长"
-                              @click.native="choiceZRR('statuteMinister', '选择技术管理中心主任', roleForm.statuteMinister)"></el-input>
+                              @click.native="choiceZRR('statuteMinister', '选择标准法规部部长', roleForm.statuteMinister)"></el-input>
                   </div>
                 </el-form-item>
               </el-card>
@@ -533,6 +533,13 @@ export default {
     },
     //项目的多选框改变
     selectListChange(data) {
+      // 单选
+      if (data.length > 1) {
+        this.$refs.selection.clearSelection()
+        this.$refs.selection.toggleRowSelection(data.pop())
+      }
+      this.multipleSelection = data
+
       this.selectedList = data;
     },
     pageChange(page) {

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

@@ -592,10 +592,24 @@ export default {
     },
     //清单勾选框数据
     selectListChange(data) {
+      // 单选
+      if (data.length > 1) {
+        this.$refs.selection.clearSelection()
+        this.$refs.selection.toggleRowSelection(data.pop())
+      }
+      this.multipleSelection = data
+
       this.selectedList = data;
     },
     //项目勾选框数据
     selectProjectChange(data) {
+      // 单选
+      if (data.length > 1) {
+        this.$refs.selection.clearSelection()
+        this.$refs.selection.toggleRowSelection(data.pop())
+      }
+      this.multipleSelection = data
+
       this.selectProject = data;
     },
     //提交事件

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

@@ -372,6 +372,7 @@ export default {
   },
   data() {
     return {
+      multipleSelection:[],
       active: "1", //默认显示
       commentText: "",
       modalshowflag: false,
@@ -434,6 +435,15 @@ export default {
     };
   },
   methods: {
+    // 表格勾选
+    handleSelectionChange(val) {
+      // 单选
+      if (val.length > 1) {
+        this.$refs.table.clearSelection()
+        this.$refs.table.toggleRowSelection(val.pop())
+      }
+      this.multipleSelection = val
+    },
     handleTabs(type) {
       this.active = type;
     },
@@ -581,10 +591,24 @@ export default {
     },
     //清单勾选框数据
     selectListChange(data) {
+      // 单选
+      if (data.length > 1) {
+        this.$refs.selection.clearSelection()
+        this.$refs.selection.toggleRowSelection(data.pop())
+      }
+      this.multipleSelection = data
+
       this.selectedList = data;
     },
     //项目勾选框数据
     selectProjectChange(data) {
+      // 单选
+      if (data.length > 1) {
+        this.$refs.selection.clearSelection()
+        this.$refs.selection.toggleRowSelection(data.pop())
+      }
+      this.multipleSelection = data
+
       this.selectProject = data;
     },
     //提交事件

src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue

@@ -398,7 +398,7 @@ export default {
         // 相关人员姓名
       },
       // 新增编辑弹窗里的数据
-      localProEODefault: {
+     /* localProEODefault: {
         // 项目相关人员
         userEOList: [],
         //  产品代码
@@ -460,7 +460,7 @@ export default {
         // 相关人员信息
         relatePersonShow: ""
         // 相关人员姓名
-      },
+      },*/
       //查询3类
       projectLibrarySearch: {
         // 项目名称

src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue

@@ -14,10 +14,16 @@
             <el-col :span="5" :push="1">项目编号: <span class="valueColor">{{ localProEO.projectNumber }}</span></el-col>
             <el-col :span="5" :push="2">
               <el-tooltip class="item" effect="dark" :content="localProEO.projectName" placement="top">
-                <div slot="content" class="toolip-content" v-if="localProEO.projectName !== undefined && localProEO.projectName.length>15">{{ localProEO.projectName }}</div>
+                <div slot="content" class="toolip-content" v-if="localProEO.projectName !== undefined && localProEO.projectName.length>15">
+                  {{ localProEO.projectName }}
+                </div>
                 <div v-else></div>
-                <div class="check-item-value" v-if="localProEO.projectName !== undefined && localProEO.projectName.length>15">项目名称: <span class="valueColor">{{localProEO.projectName && localProEO.projectName.substring(0,15)+"..." }}</span></div>
-                <div class="check-item-value" v-else>项目名称: <span class="valueColor">{{localProEO.projectName}}</span></div>
+                <div class="check-item-value" v-if="localProEO.projectName !== undefined && localProEO.projectName.length>15">
+                  项目名称: <span class="valueColor">{{
+                    localProEO.projectName && localProEO.projectName.substring(0, 15) + "..."
+                  }}</span></div>
+                <div class="check-item-value" v-else>项目名称: <span class="valueColor">{{ localProEO.projectName }}</span>
+                </div>
               </el-tooltip>
             </el-col>
             <el-col :span="4" :push="3">项目分类:<span class="valueColor">{{ localProEO.projectClassification }}</span>
@@ -39,19 +45,23 @@
         </div>
       </el-card>
       <div class="action-bar">
-<!--        <el-button plain class="common-button-primary" v-btn-permission="''" size="mini" @click="transfer">调取</el-button>-->
-<!--        <el-button plain class="common-button-primary" v-btn-permission="''" size="mini" @click="deleteList">批量删除-->
-<!--        </el-button>-->
-        <el-button class="common-button-default export-button"
+        <el-row>
+          <el-col :span="12">
+            <span style="font-size: 16px;font-weight: bold">清单版本: {{  }}</span>
+          </el-col>
+          <el-col :span="12" style="text-align: end">
+            <el-button
+              type="primary"
+              class="common-button-default export-button"
               size="mini" @click="exportStandard"
               v-btn-permission="''"
               title="不勾选时默认导出所有筛选项；勾选时仅导出勾选项"
               icon="export"
             >导出
             </el-button>
+          </el-col>
+        </el-row>
         </div>
-      <!--      <el-tabs type="border-card">-->
-      <!--        <el-tab-pane :label="localProEO.productName" class="details-panel-tabs-item">-->
       <div class="table-wrapper">
         <el-table
           :data="dataList"
@@ -172,8 +182,6 @@
           @pageSizeChange="pageSizeChangeLaws"></pagination>
       </div>
       <loading :loading="loading">数据获取中</loading>
-      <!--        </el-tab-pane>-->
-      <!--      </el-tabs>-->
     </div>
     <!-- 调取弹窗 -->
     <el-drawer
@@ -265,7 +273,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>
@@ -274,7 +283,10 @@
                 label="更新时间"
                 align="center">
                 <template slot-scope="scope">
-                  <div>{{ scope.row.updateTime ? $moment(scope.row.updateTime).format('YYYY-MM-DD')  : scope.row.updateTime }}</div>
+                  <div>{{
+                      scope.row.updateTime ? $moment(scope.row.updateTime).format('YYYY-MM-DD') : scope.row.updateTime
+                    }}
+                  </div>
                 </template>
               </el-table-column>
               <el-table-column

src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue

@@ -190,7 +190,7 @@
       destroy-on-close
       :wrapperClosable="false"
       class="seeHisToryDraw"
-      size="1000px"
+      size="600px"
     >
       <div class="demo-drawer-content">
         <div class="el-drawer-form" style="height: auto">