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

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

@@ -159,8 +159,20 @@
             :visible.sync="modalshowflag2"
             :wrapperClosable="false"
             size="800px">
+      <el-form
+              ref="attributeEO"
+              class="label-input-form"
+              :inline="true"
+      >
+        <el-form-item class="form-item-disabled" style="margin: 10px;">
+          <el-input
+                  v-model="filterText2"
+                  placeholder="请输入姓名"
+          ></el-input>
+        </el-form-item>
+      </el-form>
       <el-tree
-              v-if="modalshowflag2"
+              v-if="modalshowflag2 && open2"
               style="height: 100%; overflow: auto;"
               node-key="id"
               class="filter-tree"
@@ -169,23 +181,52 @@
               :default-checked-keys="nodeList2"
               highlight-current
               check-strictly
-              default-expand-all
               :expand-on-click-node="false"
               show-checkbox
+              ref="tree2"
+              :load="loadNode"
+              lazy>
+      </el-tree>
+      <el-tree
+              v-if="modalshowflag2 && !open2"
+              style="height: 100%; overflow: auto;"
+              node-key="id"
+              class="filter-tree"
+              :data="treeData2"
+              :props="defaultProps"
+              :default-checked-keys="nodeList2"
+              highlight-current
+              check-strictly
+              :expand-on-click-node="false"
+              default-expand-all
+              show-checkbox
               ref="tree2">
       </el-tree>
       <div id="roleFormButton2" class="demo-drawer-footer">
         <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveUserInfo2">确定</el-button>
         <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancleUserInfo2">取消</el-button>
       </div>
+      <loading style="z-index: 2099;" :loading="treeLoading">导入中...</loading>
     </el-drawer>
     <el-drawer
             :title="drawerTitle"
             :visible.sync="modalshowflag"
             :wrapperClosable="false"
             size="800px">
+      <el-form
+              ref="attributeEO"
+              class="label-input-form"
+              :inline="true"
+      >
+        <el-form-item class="form-item-disabled" style="margin: 10px;">
+          <el-input
+                  v-model="filterText1"
+                  placeholder="请输入姓名"
+          ></el-input>
+        </el-form-item>
+      </el-form>
       <el-tree
-              v-if="modalshowflag"
+              v-if="modalshowflag && open1"
               node-key="id"
               style="height: 100%; overflow: auto;"
               class="filter-tree"
@@ -195,15 +236,33 @@
               highlight-current
               check-strictly
               @check="drawerCheck"
-              default-expand-all
               :expand-on-click-node="false"
               show-checkbox
+              ref="tree"
+              :load="loadNode"
+              lazy>
+      </el-tree>
+      <el-tree
+              v-if="modalshowflag && !open1"
+              node-key="id"
+              style="height: 100%; overflow: auto;"
+              class="filter-tree"
+              :data="treeData1"
+              :props="defaultProps"
+              :default-checked-keys="nodeList"
+              highlight-current
+              check-strictly
+              @check="drawerCheck"
+              :expand-on-click-node="false"
+              default-expand-all
+              show-checkbox
               ref="tree">
       </el-tree>
       <div id="roleFormButton" class="demo-drawer-footer">
         <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveUserInfo">确定</el-button>
         <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancleUserInfo">取消</el-button>
       </div>
+      <loading style="z-index: 2099;" :loading="treeLoading">导入中...</loading>
     </el-drawer>
     <el-dialog width='400px' :visible.sync="fileMadel" title="上传文件">
       <el-upload
@@ -236,6 +295,13 @@ export default {
   name: "bzdyStep1",
   data() {
     return {
+      treeLoading: false,
+      treeData2: [],
+      treeData1: [],
+      open1: true,
+      open2: true,
+      filterText1: '',
+      filterText2: '',
       commentText: '',
       roleRow: {},
       nodeList: [],
@@ -310,12 +376,56 @@ export default {
     ProcessFooter,
     ProcessTitle
   },
+  watch: {
+    filterText1 (val) {
+      if (val.length) {
+        this.open1 = false
+        this.treeLoading = true
+        this.$http.get('SarInstitution/institution/institutionAndUser', {
+          userName: val
+        }, {}, res => {
+          this.treeData1 = res.data
+          this.treeLoading = false
+        })
+      } else {
+        this.open1 = true
+      }
+    },
+    filterText2 (val) {
+      if (val.length) {
+        this.open2 = false
+        this.treeLoading = true
+        this.$http.get('SarInstitution/institution/institutionAndUser', {
+          userName: val
+        }, {}, res => {
+          this.treeData2 = res.data
+          this.treeLoading = false
+        })
+      } else {
+        this.open2 = true
+      }
+    },
+  },
   methods: {
+    loadNode(node, resolve) {
+      if (node.level === 0) {
+        return resolve(this.treeData);
+      }
+      this.getChildren(node, resolve)
+    },
+    getChildren (node, resolve) {
+     this.$http.get('SarInstitution/institution/getNext', {
+       institutionId: node.key
+     }, {}, res => {
+       resolve(res)
+     })
+    },
     choiceZRRS () {
       this.nodeList2 = []
       if ( this.roleForm.dockUserList.length > 0) {
         this.nodeList2 = this.roleForm.dockUserList.split(',')
       }
+      this.filterText2 = ''
       this.modalshowflag2 = true
     },
     saveUserInfo2 () {
@@ -410,11 +520,14 @@ export default {
       this.nodeList.push(id)
       this.type = type
       this.drawerTitle = title
+      this.filterText1 = ''
       this.modalshowflag = true
     },
     getTree () {
-      this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> {
+      this.treeLoading = true
-        this.treeData = res.data
+      this.$http.get('SarInstitution/institution/getFirstInstitution', {}, {}, res=> {
+        this.treeData = res
+        this.treeLoading = false
       })
     },
     handleTabs(name) {

src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue

@@ -87,7 +87,7 @@
           label="国家/地区"
           align="center">
           <template slot-scope="scope">
-            <span v-if="scope.row.countryArea.indexOf(',') >= 0">
+            <span v-if="scope.row.countryArea !== null && scope.row.countryArea.indexOf(',')  > 0">
               <span>{{ scope.row.countryArea }}</span>
             </span>
             <span v-else>{{ countryAreaMap[scope.row.countryArea] }}</span>
@@ -138,7 +138,7 @@
           label="更新时间"
           align="center">
           <template slot-scope="scope">
-            <div>{{ scope.row.updateTime ? $moment(scope.row.updateTime).format('YYYY-MM-DD hh:mm:ss')  : 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/accessStandardsAndRegulations/pages/addEdit.vue

@@ -70,6 +70,7 @@
                   :on-remove="delFileInfo"
                   :on-success="uploadBackSuccess"
                   :before-upload="beforeUpload"
+                  :on-preview="handleOnPreview"
               >
                 <el-button class="common-button-default" size="mini">
                   点击上传
@@ -225,17 +226,26 @@
               prop="issueTime"
               sortable
               label="发布日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.issueTime ? $moment(scope.row.issueTime).format('YYYY-MM-DD') : '' }}</span>
+            </template>
           </el-table-column>
           <el-table-column
-              prop="xcxssrq"
+              prop="xcxssrqgj"
               sortable
               label="新车型实施日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '' }}</span>
+            </template>
           </el-table-column>
           <el-table-column
               show-overflow-tooltip
-              prop="zccssrq"
+              prop="zccssrqgj"
               sortable
               label="在产车实施日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format('YYYY-MM-DD') : '' }}</span>
+            </template>
           </el-table-column>
           <el-table-column
               show-overflow-tooltip
@@ -376,6 +386,9 @@
           width="210px"
           align="center"
           label="在产车实施日期">
+          <template slot-scope="scope">
+            <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format('YYYY-MM-DD') : '' }}</span>
+          </template>
         </el-table-column>
         <el-table-column
           prop="xcxssrqgj"
@@ -383,6 +396,9 @@
           align="center"
           width="210px"
           label="新车型实施日期">
+          <template slot-scope="scope">
+            <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '' }}</span>
+          </template>
         </el-table-column>
         <el-table-column
           show-overflow-tooltip
@@ -554,6 +570,7 @@ export default {
       nylxMap: {},
       zrbmMap: {},
       sycpxMap: {},
+      zrbmOptions: [],
       selectSearch : [],
       // 新增、编辑 基础信息字段
       sarAccessEO: {
@@ -879,6 +896,14 @@ export default {
         fileList.pop()
       }
     },
+
+    // 点击上传的文件进行下载
+    handleOnPreview(file) {
+      let attId = file.id
+      if (attId != null && attId !== "") {
+        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+      }
+    },
     // 相关附件 上传之前钩子
     beforeUpload (file) {
       var filename = file.name
@@ -1257,6 +1282,19 @@ export default {
         _this: this
       }, res =>{
         this.sarAccessInfoSearchList = res.data.list
+        this.sarAccessInfoSearchList.forEach(item => {
+          this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
+          this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
+          this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
+          this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
+          this.$set(item, 'nylx', item.attrInfoMap.NYLX)
+          this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
+          this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
+          this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
+          this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
+          this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
+        })
+        console.log(this.sarAccessInfoSearchList)
       }, e => {
       })
     },
@@ -1714,6 +1752,7 @@ export default {
         _this: this
       }, res => {
         this.sarAccessInfoList = res.data
+        console.log(res.data)
       }, e => {
       })
     },

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue

@@ -55,6 +55,7 @@
                 :on-remove="delFileInfo"
                 :on-success="uploadBackSuccess"
                 :before-upload="beforeUpload"
+                :on-preview="handleOnPreview"
               >
                 <el-button class="common-button-default" size="mini">
                   点击上传
@@ -1716,7 +1717,14 @@ export default {
         this.$set(this.zrbmMap, item.value, item.label)
         this.$set(this.sycpxMap, item.value, item.label)
       })
-    }
+    },
+    // 点击上传的文件进行下载
+    handleOnPreview(file) {
+      let attId = file.id
+      if (attId != null && attId !== "") {
+        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+      }
+    },
   },
   watch: {
     // 监听 清单类型

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue

@@ -55,6 +55,7 @@
                 :on-remove="delFileInfo"
                 :on-success="uploadBackSuccess"
                 :before-upload="beforeUpload"
+                :on-preview="handleOnPreview"
               >
                 <el-button class="common-button-default" size="mini">
                   点击上传
@@ -1716,7 +1717,14 @@ export default {
         this.$set(this.zrbmMap, item.value, item.label)
         this.$set(this.sycpxMap, item.value, item.label)
       })
-    }
+    },
+    // 点击上传的文件进行下载
+    handleOnPreview(file) {
+      let attId = file.id
+      if (attId != null && attId !== "") {
+        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+      }
+    },
   },
   watch: {
     // 监听 清单类型