Merge branch 'develop' into FOTON

src/components/roleTree/index.vue

@@ -143,26 +143,33 @@
                 }
             }),
             checkChange2 (row, type, c) {
-                if (type) {
+                if (this.checkBox) {
-                    this.nodeList.push(row.id)
                 } else {
-                    for (let a = 0; a < this.nodeList.length; a ++) {
+                    if (type) {
-                        if (row.id === this.nodeList[a]) {
+                        this.nodeList.push(row.id)
-                            this.nodeList.splice(a, 1)
+                    } else {
+                        for (let a = 0; a < this.nodeList.length; a ++) {
+                            if (row.id === this.nodeList[a]) {
+                                this.nodeList.splice(a, 1)
+                            }
                         }
                     }
                 }
             },
             checkChange (row, type, c) {
-                if (type) {
+                if (this.checkBox) {
-                    this.nodeList.push(row.id)
                 } else {
-                    for (let a = 0; a < this.nodeList.length; a ++) {
+                    if (type) {
-                        if (row.id === this.nodeList[a]) {
+                        this.nodeList.push(row.id)
-                            this.nodeList.splice(a, 1)
+                    } else {
+                        for (let a = 0; a < this.nodeList.length; a ++) {
+                            if (row.id === this.nodeList[a]) {
+                                this.nodeList.splice(a, 1)
+                            }
                         }
                     }
                 }
+
             },
             handleTreeDrawerCancel () {
                 this.filterText = ''
@@ -200,17 +207,27 @@
                 this.open1 = true
             },
             drawerCheck (data) {
-                if (this.checkBox) {
+                if (this.checkBox) { // 单选
                     // 单选判断
-                    var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes());
+                    let getlist = this.$refs.tree.getCheckedNodes()
-                    if(getlist.length == 1) {
+                    if (getlist.length > 1) {
-                        this.roleRow = getlist[0]
+                        this.$refs.tree.setCheckedKeys([])
-                    } else {
+                        this.$refs.tree.setCheckedKeys([data.id])
-                        this.$refs.tree.setCheckedKeys([data.id]);
+                        this.roleList = [data]
-                        this.roleRow = this.$refs.tree.getCheckedNodes()[0]
+                    } else if (getlist.length === 0) {
+                        this.roleList = [{}]
+                    } else if (getlist.length === 1) {
+                        this.roleList = [data]
                     }
-                    this.roleList = [this.roleRow]
+                    // var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes());
-                } else {
+                    // if(getlist.length == 1) {
+                    //     this.roleRow = getlist[0]
+                    // } else {
+                    //     this.$refs.tree.setCheckedKeys([data.id])
+                    //     this.roleRow = this.$refs.tree.getCheckedNodes()[0]
+                    // }
+                    // this.roleList = [this.roleRow]
+                } else { // 多选
                     this.roleList = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes())
                 }
             },

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue

@@ -217,8 +217,8 @@
               width="150"
               label="新车型实施日期">
             <template slot-scope="scope">
-              <span v-if="scope.row.xcxssrqgj">{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '' }}</span>
+              <span v-if="scope.row.xcxssrqgj">{{ scope.row.xcxssrqgj }}</span>
-              <span v-else-if="scope.row.putTime">{{ scope.row.putTime ? $moment(scope.row.putTime).format('YYYY-MM-DD') : '' }}</span>
+              <span v-else-if="scope.row.putTime">{{ scope.row.putTime }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -229,7 +229,7 @@
               width="150"
               label="在产车实施日期">
             <template slot-scope="scope">
-              <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format('YYYY-MM-DD') : '' }}</span>
+              <span>{{ scope.row.zccssrqgj }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -338,9 +338,6 @@
             align="center"
             width="210px"
             label="标准实施日期">
-          <template slot-scope="scope">
-            <span>{{ scope.row.ssrq ? $moment(scope.row.ssrq).format('YYYY-MM-DD') : '' }}</span>
-          </template>
         </el-table-column>
         <el-table-column
             show-overflow-tooltip
@@ -349,11 +346,6 @@
             width="210px"
             align="center"
             label="在产车实施日期">
-          <template slot-scope="scope">
-            <span v-if="scope.row.zccssrqgj === null || scope.row.zccssrqgj === ''">
-            </span>
-<!--            <span v-else>{{ scope.row.zccssrqgj.slice(0, 10) }}</span>-->
-          </template>
         </el-table-column>
         <el-table-column
             prop="xcxssrqgj"
@@ -361,11 +353,6 @@
             align="center"
             width="210px"
             label="新车型实施日期">
-          <template slot-scope="scope">
-            <span v-if="scope.row.xcxssrqgj === null || scope.row.xcxssrqgj === ''">
-            </span>
-<!--            <span v-else>{{ scope.row.xcxssrqgj.slice(0, 10) }}</span>-->
-          </template>
         </el-table-column>
         <el-table-column
             show-overflow-tooltip

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

@@ -194,8 +194,8 @@
             align="center"
             label="新车型实施日期">
               <template slot-scope="scope">
-                <span v-if="scope.row.xcxssrqgj">{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '' }}</span>
+                <span v-if="scope.row.xcxssrqgj">{{ scope.row.xcxssrqgj }}</span>
-                <span v-else-if="scope.row.putTime">{{ scope.row.putTime ? $moment(scope.row.putTime).format('YYYY-MM-DD') : '' }}</span>
+                <span v-else-if="scope.row.putTime">{{ scope.row.putTime }}</span>
               </template>
           </el-table-column>
           <el-table-column
@@ -205,7 +205,7 @@
             sortable
             label="在产车实施日期">
               <template slot-scope="scope">
-                  <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format('YYYY-MM-DD') : '' }}</span>
+                  <span>{{ scope.row.zccssrqgj }}</span>
               </template>
           </el-table-column>
           <el-table-column
@@ -311,9 +311,6 @@
           align="center"
           width="210px"
           label="标准实施日期">
-          <template slot-scope="scope">
-            <span>{{ scope.row.ssrq ? $moment(scope.row.ssrq).format('YYYY-MM-DD') : '' }}</span>
-          </template>
         </el-table-column>
         <el-table-column
           show-overflow-tooltip
@@ -322,11 +319,6 @@
           width="210px"
           align="center"
           label="在产车实施日期">
-          <template slot-scope="scope">
-            <span v-if="scope.row.zccssrqgj === null || scope.row.zccssrqgj === ''">
-            </span>
-<!--            <span v-else>{{ scope.row.zccssrqgj.slice(0,10) }}</span>-->
-          </template>
         </el-table-column>
         <el-table-column
           prop="xcxssrqgj"
@@ -334,11 +326,6 @@
           align="center"
           width="210px"
           label="新车型实施日期">
-          <template slot-scope="scope">
-            <span v-if="scope.row.xcxssrqgj === null || scope.row.xcxssrqgj === ''">
-            </span>
-<!--            <span v-else>{{ scope.row.xcxssrqgj.slice(0,10) }}</span>-->
-          </template>
         </el-table-column>
         <el-table-column
           show-overflow-tooltip

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

@@ -251,8 +251,8 @@
               align="center"
               label="新车型实施日期">
             <template slot-scope="scope">
-              <span v-if="scope.row.xcxssrqgj">{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '' }}</span>
+              <span v-if="scope.row.xcxssrqgj">{{ scope.row.xcxssrqgj }}</span>
-              <span v-else-if="scope.row.putTime">{{ scope.row.putTime ? $moment(scope.row.putTime).format('YYYY-MM-DD') : '' }}</span>
+              <span v-else-if="scope.row.putTime">{{ scope.row.putTime }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -262,7 +262,7 @@
               align="center"
               label="在产车实施日期">
             <template slot-scope="scope">
-              <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format('YYYY-MM-DD') : '' }}</span>
+              <span>{{ scope.row.zccssrqgj }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -369,9 +369,6 @@
             align="center"
             width="210px"
             label="标准实施日期">
-          <template slot-scope="scope">
-            <span>{{ scope.row.ssrq ? $moment(scope.row.ssrq).format('YYYY-MM-DD') : '' }}</span>
-          </template>
         </el-table-column>
         <el-table-column
             show-overflow-tooltip
@@ -380,11 +377,6 @@
             width="210px"
             align="center"
             label="在产车实施日期">
-          <template slot-scope="scope">
-            <span v-if="scope.row.zccssrqgj === null || scope.row.zccssrqgj === ''">
-            </span>
-<!--            <span v-else>{{ scope.row.zccssrqgj.slice(0, 10) }}</span>-->
-          </template>
         </el-table-column>
         <el-table-column
             prop="xcxssrqgj"
@@ -392,11 +384,6 @@
             align="center"
             width="210px"
             label="新车型实施日期">
-          <template slot-scope="scope">
-            <span v-if="scope.row.xcxssrqgj === null || scope.row.xcxssrqgj === ''">
-            </span>
-<!--            <span v-else>{{ scope.row.xcxssrqgj.slice(0, 10) }}</span>-->
-          </template>
         </el-table-column>
         <el-table-column
             show-overflow-tooltip

src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue

@@ -101,10 +101,11 @@
         <el-table-column
                 fixed="right"
                 label=""
-                width="50"
+                width="100"
                 align="center">
           <template slot-scope="scope">
-            <i class="el-icon-view btn-i" @click="handleProjectCompliance(scope.row)"></i>
+            <el-button class="common-button-primary" type="primary"  size="mini" @click="handleProjectCompliance(scope.row)">查看</el-button>
+<!--            <i class="el-icon-view btn-i" @click="handleProjectCompliance(scope.row)"></i>-->
           </template>
         </el-table-column>
       </el-table>
@@ -113,7 +114,7 @@
     </div>
     <!--    查看符合标准性弹窗-->
     <el-drawer
-            title="标准涉及项目符合性"
+            title="标准技术储备符合性"
             :visible.sync="showSarProStateModal"
             :wrapperClosable="false"
             size="1100px"