Merge branch 'develop' into 'test'

Develop

See merge request !89

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

@@ -108,7 +108,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>
@@ -301,6 +302,8 @@
               height="100%"
               :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
+              @row-click="rowClick"
+              @select="select"
               @selection-change="selectListChange"
               ref="selection"
             >
@@ -321,7 +324,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
@@ -340,7 +344,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>
@@ -368,6 +373,8 @@
               height="100%"
               :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
+              @row-click="rowClick"
+              @select="select"
               @selection-change="selectListChange"
               ref="selection"
             >
@@ -388,7 +395,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
@@ -407,7 +415,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>
@@ -417,7 +426,8 @@
                 align="center">
                 <template slot-scope="scope">
             <span
-              v-if="scope.row.applicationScope != null && scope.row.applicationScope !== ''">{{ scope.row.applicationScope
+              v-if="scope.row.applicationScope != null && scope.row.applicationScope !== ''">{{
+                scope.row.applicationScope
               }}</span>
                 </template>
               </el-table-column>
@@ -428,7 +438,8 @@
                 align="center">
                 <template slot-scope="scope">
                   <div>
-                    {{ scope.row.updateTime ? $moment(scope.row.updateTime).format("YYYY-MM-D hh:mm:ss") : scope.row.updateTime
+                    {{
+                      scope.row.updateTime ? $moment(scope.row.updateTime).format("YYYY-MM-D hh:mm:ss") : scope.row.updateTime
                     }}
                   </div>
                 </template>
@@ -448,6 +459,8 @@
               height="100%"
               :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
+              @row-click="rowClick"
+              @select="select"
               @selection-change="selectListChange"
               ref="selection"
             >
@@ -468,7 +481,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
@@ -487,7 +501,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>
@@ -497,7 +512,8 @@
                 align="center">
                 <template slot-scope="scope">
             <span
-              v-if="scope.row.applicationScope != null && scope.row.applicationScope !== ''">{{ scope.row.applicationScope
+              v-if="scope.row.applicationScope != null && scope.row.applicationScope !== ''">{{
+                scope.row.applicationScope
               }}</span>
                 </template>
               </el-table-column>
@@ -508,7 +524,8 @@
                 align="center">
                 <template slot-scope="scope">
                   <div>
-                    {{ scope.row.updateTime ? $moment(scope.row.updateTime).format("YYYY-MM-DD hh:mm:ss") : scope.row.updateTime
+                    {{
+                      scope.row.updateTime ? $moment(scope.row.updateTime).format("YYYY-MM-DD hh:mm:ss") : scope.row.updateTime
                     }}
                   </div>
                 </template>
@@ -616,7 +633,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>
@@ -1324,8 +1342,6 @@ export default {
             this.listForm.inforlist = formId.join(",");
           }, e => {
           });
-      } else if (this.selectedList.length > 1) {
-        this.$message.warning("只能选择一条数据进行带入");
       } else {
         this.$message.warning("请选择一条数据进行带入");
       }
@@ -1337,6 +1353,33 @@ export default {
         this.selectedList.push(data[0]);
       }
     },
+    // 表格某一行的单击事件
+    rowClick(row, column) {
+      const selectData = this.selectList
+      this.$refs.selection.clearSelection()
+      if (selectData.length === 1) {
+        selectData.forEach(item => {
+          // 判断 如果当前的一行被勾选, 再次点击的时候就会取消选中
+          if (item === row) {
+            this.$refs.selection.toggleRowSelection(row, false);
+          }
+          // 不然就让当前的一行勾选
+          else {
+            this.$refs.selection.toggleRowSelection(row, true);
+          }
+        })
+      } else {
+        this.$refs.selection.toggleRowSelection(row, true);
+      }
+    },
+    select(selection, row) {
+      // 清除 所有勾选项
+      this.$refs.selection.clearSelection()
+      // 当表格数据都没有被勾选的时候 就返回
+      // 主要用于将当前勾选的表格状态清除
+      if (selection.length === 0) return
+      this.$refs.selection.toggleRowSelection(row, true)
+    },
     //标准表格选择框改变
     selectStandChange(data) {
       this.selectList = [];

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

@@ -302,6 +302,8 @@
               height="100%"
               :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
+              @row-click="rowClick"
+              @select="select"
               @selection-change="selectListChange"
               ref="selection"
             >
@@ -371,6 +373,8 @@
               height="100%"
               :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
+              @row-click="rowClick"
+              @select="select"
               @selection-change="selectListChange"
               ref="selection"
             >
@@ -440,6 +444,8 @@
               height="100%"
               :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
+              @row-click="rowClick"
+              @select="select"
               @selection-change="selectListChange"
               ref="selection"
             >
@@ -1301,8 +1307,6 @@ export default {
             this.listForm.inforlist = formId.join(",");
           }, e => {
           });
-      } else if (this.selectedList.length > 1) {
-        this.$message.warning("只能选择一条数据进行带入");
       } else {
         this.$message.warning("请选择一条数据进行带入");
       }
@@ -1321,10 +1325,38 @@ export default {
         this.selectList.push(data[i].id);
       }
     },
+    select(selection, row) {
+      // 清除 所有勾选项
+      this.$refs.selection.clearSelection()
+      // 当表格数据都没有被勾选的时候 就返回
+      // 主要用于将当前勾选的表格状态清除
+      if(selection.length === 0) return
+      this.$refs.selection.toggleRowSelection(row, true)
+    },
     //添加标准select的改变
     selectThree(data) {
       this.standList = data;
     },
+    // 表格某一行的单击事件
+    rowClick(row, column) {
+      const selectData = this.selectList
+      this.$refs.selection.clearSelection()
+      if( selectData.length === 1 ) {
+        selectData.forEach(item => {
+          // 判断 如果当前的一行被勾选, 再次点击的时候就会取消选中
+          if (item === row) {
+            this.$refs.selection.toggleRowSelection(row, false);
+          }
+          // 不然就让当前的一行勾选
+          else {
+            this.$refs.selection.toggleRowSelection(row, true);
+          }
+        })
+      }
+      else {
+        this.$refs.selection.toggleRowSelection(row, true);
+      }
+    },
     choiceZRR(type, title, id) {
       this.nodeList = [];
       this.nodeList.push(id);

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

@@ -95,21 +95,21 @@
             label="条款名称">
           </el-table-column>
           <el-table-column
-            prop="xcxssrqgj"
+            prop="xcxssrq"
             width="200"
             align="center"
             label="新车型实施日期">
             <template slot-scope="scope">
-              <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
-            prop="zccssrqgj"
+            prop="zccssrq"
             width="200"
             align="center"
             label="在产车实施日期">
             <template slot-scope="scope">
-              <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column

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

@@ -95,12 +95,12 @@
             label="条款名称">
           </el-table-column>
           <el-table-column
-            prop="xcxssrqgj"
+            prop="xcxssrq"
             width="200"
             align="center"
             label="新车型实施日期">
             <template slot-scope="scope">
-              <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -109,7 +109,7 @@
             align="center"
             label="在产车实施日期">
             <template slot-scope="scope">
-              <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column

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

@@ -95,21 +95,21 @@
             label="条款名称">
           </el-table-column>
           <el-table-column
-            prop="xcxssrqgj"
+            prop="xcxssrq"
             width="200"
             align="center"
             label="新车型实施日期">
             <template slot-scope="scope">
-              <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
-            prop="zccssrqgj"
+            prop="zccssrq"
             width="200"
             align="center"
             label="在产车实施日期">
             <template slot-scope="scope">
-              <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column

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

@@ -352,9 +352,12 @@ export default {
                 standId: item.id,
                 itemsNum: item.itemsNum,
                 itemsName: item.itemsName,
+                xcxssrq: item.xcxssrq,
+                zccssrq: item.zccssrq,
                 workPeople: "请选择责任人"
               };
               children.push(aa);
+              console.log(children);
             }
           );
           this.dataList.forEach(key => {
@@ -373,7 +376,6 @@ export default {
           this.listForm = item.form;
           this.dataList = item.form.dataList;
         }
-
       });
     },
     //保存事件
@@ -400,6 +402,7 @@ export default {
       this.isSubmit = true;
       this.listForm.commentText = this.commentText;
       const json = JSON.stringify(this.listForm);
+      console.log(json);
       this.$http.post("lawss/activiti/completeTask", {
         taskIds: this.taskIds,
         userId: this.userId,

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

@@ -96,12 +96,12 @@
             label="条款名称">
           </el-table-column>
           <el-table-column
-            prop="xcxssrqgj"
+            prop="xcxssrq"
             width="200"
             align="center"
             label="新车型实施日期">
             <template slot-scope="scope">
-              <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -110,7 +110,7 @@
             align="center"
             label="在产车实施日期">
             <template slot-scope="scope">
-              <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -476,6 +476,7 @@ export default {
           this.listForm["id"] = item.id;
           // this.listForm.dataList = item.dataList;
           this.dataList = this.listForm.dataList;
+          console.log(this.dataList);
         } else {
           this.listForm = item.form;
           this.dataList = item.form.dataList;

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

@@ -95,21 +95,21 @@
             label="条款名称">
           </el-table-column>
           <el-table-column
-            prop="xcxssrqgj"
+            prop="xcxssrq"
             width="200"
             align="center"
             label="新车型实施日期">
             <template slot-scope="scope">
-              <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
-            prop="zccssrqgj"
+            prop="zccssrq"
             width="200"
             align="center"
             label="在产车实施日期">
             <template slot-scope="scope">
-              <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column

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

@@ -95,21 +95,21 @@
                   label="条款名称">
           </el-table-column>
           <el-table-column
-                  prop="xcxssrqgj"
+                  prop="xcxssrq"
                   width="200"
                   align="center"
                   label="新车型实施日期">
             <template slot-scope="scope">
-              <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
-                  prop="zccssrqgj"
+                  prop="zccssrq"
                   width="200"
                   align="center"
                   label="在产车实施日期">
             <template slot-scope="scope">
-              <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column

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

@@ -95,21 +95,21 @@
             label="条款名称">
           </el-table-column>
           <el-table-column
-            prop="xcxssrqgj"
+            prop="xcxssrq"
             width="200"
             align="center"
             label="新车型实施日期">
             <template slot-scope="scope">
-              <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
-            prop="zccssrqgj"
+            prop="zccssrq"
             width="200"
             align="center"
             label="在产车实施日期">
             <template slot-scope="scope">
-              <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -671,37 +671,19 @@
               </el-col>
 
               <template v-if="index === 0" >
-<!--                <el-form-item label="国家/地区" prop="" label-width="150px" class="add-form-item">-->
+                <el-form-item label="国家/地区" prop="" label-width="150px" class="add-form-item">
-<!--                  <el-select v-model="sarStandardsInfoEO.country" filterable clearable>-->
+                  <el-select v-model="sarStandardsInfoEO.country" multiple filterable clearable>
-<!--                    <el-option-->
-<!--                        v-for="item in countryOptions"-->
-<!--                        placeholder="请选择"-->
-<!--                        :key="item.value"-->
-<!--                        :value="item.value"-->
-<!--                        :label="item.label"-->
-<!--                    ></el-option>-->
-<!--                  </el-select>-->
-<!--                </el-form-item>-->
-                {{sarStandardsInfoEO.country}}
-                <el-form-item label="国家/地区" prop="countryArea" class="search-item">
-                  <el-select
-                      v-model="sarStandardsInfoEO.country"
-                      multiple
-                      placeholder="请选择"
-                      filterable
-                      :disabled="false"
-                      class="wx-resolve"
-                  >
                     <el-option
                         v-for="item in countryOptions"
-                        :value="item.value"
+                        placeholder="请选择"
                         :key="item.value"
+                        :value="item.value"
                         :label="item.label"
                     >
+                      {{ item.label }}
                     </el-option>
                   </el-select>
                 </el-form-item>
-
                 <el-form-item label="标准类别" prop="standSort" label-width="150px" class="add-form-item">
                   <el-select v-model="sarStandardsInfoEO.standSort" filterable>
                     <el-option
@@ -1692,6 +1674,7 @@ export default {
         id: '',
         standType: 'FOREIGN', // 标准分类
         country: '',
+        countryArr:'',
         standSort: '',
         applyArctic: '',
         standNumber: '',
@@ -2119,6 +2102,19 @@ export default {
   props: {
   },
   watch: {
+    'sarStandardsInfoEO.country': {
+      handler (val) {
+        if (val !== '' && val !== null && typeof (val) !== 'undefined') {
+          if (val instanceof Array) {
+            this.sarStandardsInfoEO.countryArr = val.join(",");
+          } else {
+            this.sarStandardsInfoEO.countryArr = val
+          }
+        } else if (val === '') {
+          this.sarStandardsInfoEO.countryArr = []
+        }
+      }
+    },
     filterText(val) {
       this.$refs.tree.filter(val);
     }
@@ -2435,10 +2431,9 @@ export default {
             console.log(formFieldList, 'AAAAAAAAAAAAAAAAAAAAA')
           this.sarStandardsInfoEO = JSON.parse(JSON.stringify(item))
           this.defaultCheckedKeys = [this.sarStandardsInfoEO.standSystem];
-          console.log(item.country);
+          if(item.country !== undefined && item.country !== null){
-          console.log("hello")
+            this.sarStandardsInfoEO.country = item.country.split(",");
-          this.sarStandardsInfoEO.country=item.country;
+          }
-          console.log(this.sarStandardsInfoEO.country);
           this.sarStandardsInfoEO.standSort = item.standSort
           if (this.sarStandardsInfoEO.putTime != null && this.sarStandardsInfoEO.putTime !== '') {
             this.sarStandardsInfoEO.putTime = this.sarStandardsInfoEO.putTime.replace(new RegExp(/-/gm), '/')
@@ -3113,8 +3108,7 @@ export default {
                   this.validateStandNumber(this.sarStandardsInfoEO).then((flag) => {
                       if (flag) {
                           // 时间格式修改
-                          this.sarStandardsInfoEO.country=JSON.stringify(this.sarStandardsInfoEO.country);
+                          this.sarStandardsInfoEO.country = this.sarStandardsInfoEO.countryArr;
-                          console.groupCollapsed(this.sarStandardsInfoEO.country);
                           let nowstandinfo = JSON.parse(JSON.stringify(this.sarStandardsInfoEO))
                           if (nowstandinfo.putTime != null && nowstandinfo.putTime !== '') {
                               nowstandinfo.putTime = this.$dateFormat(this.sarStandardsInfoEO.putTime, 'yyyy-MM-dd hh:mm:ss')

src/pages/searchCenter/pages/standardSearch.vue

@@ -2530,6 +2530,9 @@
 <style lang="less" scoped>
     @import '~@/assets/styles/mixins';
     @import '~@/assets/styles/style';
+    /deep/ p{
+        display: inline;
+    }
     /deep/.highlight-class {
         color: red !important;
     }