Merge branch 'develop' into 'test'

Develop

See merge request !84

src/pages/details/otherStandardDetails/index.vue

@@ -538,7 +538,7 @@
             </template>
           </el-table-column>
           <el-table-column
-            prop="interpretationContent"
+            prop="readContent"
             label="解读内容"
             show-overflow-tooltip
           >

src/pages/home1/components/release/index.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="release">
     <ul>
-      <li v-for="item in standardReleaseList" :key="item.id" class="time-title">
+      <li v-for="item in standardReleaseList" :key="item.id" class="time-title" v-if="updateTime>=item.issueTime">
         <a @click="handlePreview(item)" class="table-jump">{{ item.standName }}</a>
         <span class="time">{{item.issueTime }}</span>
       </li>
@@ -19,6 +19,7 @@ export default {
     return {
       putTime: '',
       standardReleaseList: [],  //标准发布数据
+      updateTime:""
     }
   },
   computed: {},
@@ -26,8 +27,22 @@ export default {
   mounted() {
     this.getDate()
     this.getAdvice()
+    this.addDate()
   },
   methods: {
+    //获取当前年月日
+    addDate(){
+      const nowDate = new Date();
+      const date = {
+        year: nowDate.getFullYear(),
+        month: nowDate.getMonth() + 1,
+        date: nowDate.getDate(),
+      }
+      const newmonth = date.month>10?date.month:'0'+date.month
+      const day = date.date>10?date.date:'0'+date.date
+      this.updateTime = date.year + '-' + newmonth + '-' + day
+      console.log("当前时间"+this.updateTime)
+    },
     // 点击查看
     handlePreview (item) {
       let routeUrl = this.$router.resolve({

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

@@ -407,8 +407,8 @@
                             arr = data.itemList
                         }
                         arr.forEach(item => {
-                            item.zxUserId = ''
+                            item.zxUserId = item.zxUserId || ''
-                            item.zxUserIdName = ''
+                            item.zxUserIdName = item.zxUserIdName || ''
                         })
                         this.itemList = arr
                         this.loading = false

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

@@ -26,7 +26,7 @@
               <el-form-item label="选择清单" prop="orgName" class="add-form-item form-item-disabled">
                 <el-radio-group v-model="listType" @change="selectionList">
                   <el-radio label="country">国家/地区清单</el-radio>
-                  <el-radio label="project">项目清单</el-radio>
+                  <el-radio label="project">车型类别清单</el-radio>
                   <el-radio label="other">其他清单</el-radio>
                 </el-radio-group>
                 <el-button size="mini" type="primary" style="margin-left: 40px;" @click="choiceShow">
@@ -377,7 +377,7 @@
                 align="center">
               </el-table-column>
               <el-table-column
-                prop="projectName"
+                prop="carType"
                 label="项目名称"
                 align="center">
               </el-table-column>
@@ -947,6 +947,20 @@ export default {
           _this: this
         }, res => {
           this.sarAccessListDatas = res.data.records;
+          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++) {
+                  if (this.energyKindOptions[i].value === k[m]) {
+                    k[m]  = this.energyKindOptions[i].label
+                  }
+                  item.carType = k.join(',')
+                }
+              }
+            }
+          })
           this.total = res.data.total;
         }, e => {
         });
@@ -1384,6 +1398,7 @@ export default {
     this.$http.get("sys/dictype/getDicTypeListCode", {}, {
       _this: this
     }, res => {
+      this.energyKindOptions = res.data.ENERGYTYPES //适用车型
       this.countryOptions = res.data.COUNTRY;
       this.standStateOptions = res.data.WBZTCLASS; // 文本状态
       this.setMap(this.standStateOptions);

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

@@ -26,7 +26,7 @@
               <el-form-item label="选择清单" prop="orgName" class="add-form-item form-item-disabled">
                 <el-radio-group v-model="listType" @change="selectionList">
                   <el-radio label="country">国家/地区清单</el-radio>
-                  <el-radio label="project">项目清单</el-radio>
+                  <el-radio label="project">车型类别清单</el-radio>
                   <el-radio label="other">其他清单</el-radio>
                 </el-radio-group>
                 <el-button size="mini" type="primary" style="margin-left: 40px;" @click="choiceShow">
@@ -380,8 +380,8 @@
                 align="center">
               </el-table-column>
               <el-table-column
-                prop="projectName"
+                prop="carType"
-                label="项目名称"
+                label="车型类别"
                 align="center">
               </el-table-column>
               <el-table-column
@@ -913,6 +913,20 @@ export default {
           _this: this
         }, res => {
           this.sarAccessListDatas = res.data.records;
+          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++) {
+                  if (this.energyKindOptions[i].value === k[m]) {
+                    k[m]  = this.energyKindOptions[i].label
+                  }
+                  item.carType = k.join(',')
+                }
+              }
+            }
+          })
           this.total = res.data.total;
         }, e => {
         });
@@ -994,8 +1008,6 @@ export default {
     },
     // 点击批量删除事件
     deleteList() {
-      console.log(this.selectList);
-      console.log(this.dataList);
       if (this.selectList.length < 1) {
         this.$message.warning("请选择一条数据进行删除");
       } else {
@@ -1011,10 +1023,8 @@ export default {
             index = this.dataList.findIndex(items => {
               return items.id === item;
             });
-            console.log(index);
             if (index > -1) {
               this.dataList.splice(index, 1);
-              console.log(this.dataList);
             }
             exits.push(item);
           });
@@ -1363,6 +1373,7 @@ export default {
     this.$http.get("sys/dictype/getDicTypeListCode", {}, {
       _this: this
     }, res => {
+      this.energyKindOptions = res.data.ENERGYTYPES //适用车型
       this.countryOptions = res.data.COUNTRY;
       this.standStateOptions = res.data.WBZTCLASS; // 文本状态
       this.setMap(this.standStateOptions);

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

@@ -122,6 +122,7 @@
                                             clearable
                                     ></el-input>
                                 </el-form-item>
+
                                 <el-form-item class="add-form-item form-item-disabled" style="margin-left: -210px">
                                     <el-button
                                             type="primary"
@@ -1456,9 +1457,13 @@
                         { type: 'number', message: '年标准年份必须为数字值'}
                     ],
                     standName: [
-                        { required: true, message: '请输入标准名称', trigger: 'blur' },
+                        { 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/xmpg2/step1-1.vue

@@ -30,7 +30,6 @@
                 <el-input
                   v-model="listForm.projectNumber"
                   placeholder="请输入项目编号"
-                  disabled
                   clearable
                 ></el-input>
               </el-form-item>
@@ -38,7 +37,6 @@
                 <el-input
                   v-model="listForm.projectName"
                   placeholder="请输入项目名称"
-                  disabled
                   clearable
                 ></el-input>
               </el-form-item>
@@ -68,8 +66,10 @@
             label="标准号"
           >
             <template slot-scope="scope">
-              <a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSort }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
+              <a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSort
-              <a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSort }} {{ scope.row.standNumber }}</a>
+                }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
+              <a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSort }}
+                {{ scope.row.standNumber }}</a>
             </template>
           </el-table-column>
           <el-table-column
@@ -265,14 +265,12 @@
                   <el-input
                     v-model="projectSearch.projectNumber"
                     placeholder="请输入项目编号"
-                    disabled
                   ></el-input>
                 </el-form-item>
                 <el-form-item label="项目名称" class="search-item search-item-last">
                   <el-input
                     v-model="projectSearch.projectName"
                     placeholder="请输入项目名称"
-                    disabled
                   ></el-input>
                 </el-form-item>
                 <el-form-item class="search-item btn-box">
@@ -368,13 +366,13 @@ export default {
       active: "1",  //当前选中的type
       isSubmit: false,
       saveLoading: false,
-      commentText: '',
+      commentText: "",
       //表单的数据
       listForm: {
         projectNumber: "",  //项目编号
         projectName: "",  //项目名称
         dataList: [], //项目下的标准数据
-        breakdownList: [], //标准下的分解单数据
+        breakdownList: [] //标准下的分解单数据
       },
       dataList: [], //下面标准的数据
       breakdownList: [], //标准下的条款数据
@@ -461,8 +459,8 @@ export default {
         _this: this
       }, res => {
         this.ProjectDatas = res.data.Maintenance.records;
+        this.total = res.data.Maintenance.total
       });
-
     },
     //点击清空按钮事件
     clearSearch() {
@@ -514,7 +512,7 @@ export default {
         {
           _this: this
         }, res => {
-          this.listForm.breakdownList = res.data
+          this.listForm.breakdownList = res.data;
         });
     },
     //标准的多选框改变
@@ -528,79 +526,83 @@ export default {
 
     },
     // 点击查看
-    handlePreview (item) {
+    handlePreview(item) {
       let routeUrl = this.$router.resolve({
-        name: 'OtherStandardDetails',
+        name: "OtherStandardDetails",
         params: {
           id: item.standId,
-          pageType: 'INLAND_STAND'
+          pageType: "INLAND_STAND"
         }
-      })
+      });
-      window.open(routeUrl.href, '_blank')
+      window.open(routeUrl.href, "_blank");
     },
     pageSizeChange(pageSize) {
 
     },
     //流程保存事件
-    handleSave(){
+    handleSave() {
-      this.saveLoading = true
+      this.saveLoading = true;
-      let _formData = new FormData()
+      let _formData = new FormData();
-      _formData.append('id', this.bpnId || '')
+      _formData.append("id", this.bpnId || "");
-      _formData.append('createUser', this.$store.getters.userInfo.userId)
+      _formData.append("createUser", this.$store.getters.userInfo.userId);
-      _formData.append('createUserName', this.$store.getters.userInfo.userName)
+      _formData.append("createUserName", this.$store.getters.userInfo.userName);
-      _formData.append('prcType', '6')
+      _formData.append("prcType", "6");
-      _formData.append('json', JSON.stringify({
+      _formData.append("json", JSON.stringify({
         form: this.form,
         roleForm: this.roleForm,
         commentText: this.commentText
-      }))
+      }));
       saveTaskFirst(_formData).then(res => {
-        this.saveLoading = false
+        this.saveLoading = false;
-        this.$message.success('保存成功')
+        this.$message.success("保存成功");
-        this.bpnId = res.result
+        this.bpnId = res.result;
       }).catch(e => {
-        this.saveLoading = false
+        this.saveLoading = false;
-      })
+      });
     },
     //流程提交事件
-    handleSubmit(){
+    handleSubmit() {
-      this.listForm.commentText = this.commentText;
+      if (this.listForm.dataList.length < 1) {
-      var json = Object.assign(this.listForm, this.roleForm)
+        this.$message.warning("请选择带标准的项目");
-      json.prcCreateUser = this.$store.getters.userInfo.userId;
+      } else {
-      json.prcCreateUserName = this.$store.getters.userInfo.uName;
+        this.listForm.commentText = this.commentText;
-      json.standId = this.listForm.standId;
+        var json = Object.assign(this.listForm, this.roleForm);
-      this.$refs['listForm'].validate((valid) => {
+        json.prcCreateUser = this.$store.getters.userInfo.userId;
-        if (valid) {
+        json.prcCreateUserName = this.$store.getters.userInfo.uName;
-          this.$refs['roleForm'].validate((valid) => {
+        json.standId = this.listForm.standId;
-            if (valid) {
+        this.$refs["listForm"].validate((valid) => {
-              this.isSubmit = true
+          if (valid) {
-              this.$http.get("lawss/activiti/startProcess", { type: "6" }, {
+            this.$refs["roleForm"].validate((valid) => {
-                _this: this
+              if (valid) {
-              }, res => {
+                this.isSubmit = true;
-                if (res.ok) {
+                this.$http.get("lawss/activiti/startProcess", { type: "6" }, {
-                  this.$http.post("lawss/activiti/completeTask", {
+                  _this: this
-                    taskIds: res.data,
+                }, res => {
-                    userId: this.$store.getters.userInfo.userId,
+                  if (res.ok) {
-                    json: JSON.stringify(json)
+                    this.$http.post("lawss/activiti/completeTask", {
-                  }, {
+                      taskIds: res.data,
-                    _this: this
+                      userId: this.$store.getters.userInfo.userId,
-                  }, res => {
+                      json: JSON.stringify(json)
-                    if (res.success) {
+                    }, {
-                      this.$message.success(res.message);
+                      _this: this
-                      this.$router.push("/processCenter");
+                    }, res => {
-                    }
+                      if (res.success) {
-                    this.isSubmit = false
+                        this.$message.success(res.message);
-                  });
+                        this.$router.push("/processCenter");
-                }
+                      }
-              });
+                      this.isSubmit = false;
-            } else {
+                    });
-              return this.$message.warning("请完善人员信息");
+                  }
-            }
+                });
-          });
+              } else {
-        } else {
+                return this.$message.warning("请完善人员信息");
-          return this.$message.warning("请完善基础信息");
+              }
-        }
+            });
-      });
+          } else {
+            return this.$message.warning("请完善基础信息");
+          }
+        });
+      }
     },
     choiceZRR(type, title, id) {
       this.nodeList = [];

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

@@ -450,10 +450,10 @@ export default {
       }, {
         _this: this
       }, res => {
-        if(res.data === null){
+        if (res.data === null) {
-          this.ProjectDatas = ''
+          this.ProjectDatas = "";
-          this.total = 0
+          this.total = 0;
-        }else{
+        } else {
           this.ProjectDatas = res.data.Maintenance.records;
           this.total = res.data.Maintenance.total;
         }
@@ -491,7 +491,6 @@ export default {
       this.$http.get("sarStandProjectLibrary/queryStandInfo", { id: this.projectId }, {
         _this: this
       }, res => {
-        console.log(res.data.records);
         this.listForm.dataList = res.data.records;
         this.dataList = res.data.records;
         this.listForm.dataList.forEach(item => {
@@ -525,7 +524,7 @@ export default {
         {
           _this: this
         }, res => {
-            this.listForm.breakdownList = res.data;
+          this.listForm.breakdownList = res.data;
         });
     },
     //标准的多选框改变
@@ -564,43 +563,47 @@ export default {
     },
     //流程提交事件
     handleSubmit() {
-      this.listForm.commentText = this.commentText;
+      if (this.listForm.dataList.length < 1) {
-      var json = Object.assign(this.listForm, this.roleForm);
+        this.$message.warning("请选择带标准的项目");
-      json.prcCreateUser = this.$store.getters.userInfo.userId;
+      } else {
-      json.prcCreateUserName = this.$store.getters.userInfo.uName;
+        this.listForm.commentText = this.commentText;
-      json.standId = this.listForm.standId;
+        var json = Object.assign(this.listForm, this.roleForm);
-      this.$refs["listForm"].validate((valid) => {
+        json.prcCreateUser = this.$store.getters.userInfo.userId;
-        if (valid) {
+        json.prcCreateUserName = this.$store.getters.userInfo.uName;
-          this.$refs["roleForm"].validate((valid) => {
+        json.standId = this.listForm.standId;
-            if (valid) {
+        this.$refs["listForm"].validate((valid) => {
-              this.isSubmit = true;
+          if (valid) {
-              this.$http.get("lawss/activiti/startProcess", { type: "6" }, {
+            this.$refs["roleForm"].validate((valid) => {
-                _this: this
+              if (valid) {
-              }, res => {
+                this.isSubmit = true;
-                if (res.ok) {
+                this.$http.get("lawss/activiti/startProcess", { type: "6" }, {
-                  this.$http.post("lawss/activiti/completeTask", {
+                  _this: this
-                    taskIds: res.data,
+                }, res => {
-                    userId: this.$store.getters.userInfo.userId,
+                  if (res.ok) {
-                    json: JSON.stringify(json)
+                    this.$http.post("lawss/activiti/completeTask", {
-                  }, {
+                      taskIds: res.data,
-                    _this: this
+                      userId: this.$store.getters.userInfo.userId,
-                  }, res => {
+                      json: JSON.stringify(json)
-                    if (res.success) {
+                    }, {
-                      this.$message.success(res.message);
+                      _this: this
-                      this.$router.push("/processCenter");
+                    }, res => {
-                    }
+                      if (res.success) {
-                    this.isSubmit = false;
+                        this.$message.success(res.message);
-                  });
+                        this.$router.push("/processCenter");
-                }
+                      }
-              });
+                      this.isSubmit = false;
-            } else {
+                    });
-              return this.$message.warning("请完善人员信息");
+                  }
-            }
+                });
-          });
+              } else {
-        } else {
+                return this.$message.warning("请完善人员信息");
-          return this.$message.warning("请完善基础信息");
+              }
-        }
+            });
-      });
+          } else {
+            return this.$message.warning("请完善基础信息");
+          }
+        });
+      }
     },
     // 点击查看
     handlePreview(item) {

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

@@ -44,7 +44,8 @@
         </process-title>
         <div class="tableTitle">
           <div class="tableButton">
-            <el-button plain class="common-button-primary" size="mini" @click="choiceZRRS('', 2, '')">批量分发责任人</el-button>
+            <el-button plain class="common-button-primary" size="mini" @click="choiceZRRS('', 2, '')">批量分发责任人
+            </el-button>
           </div>
         </div>
         <el-table
@@ -99,11 +100,11 @@
               <el-input v-model="scope.row.workPeople" placeholder="请选择分发责任人"
                         @click.native="choiceZRRS(scope.row, 1, scope.$index)" />
             </template>
-<!--            <template slot-scope="scope">-->
+            <!--            <template slot-scope="scope">-->
-<!--              <div :class="{'fileClass': !scope.row.workPeople}">-->
+            <!--              <div :class="{'fileClass': !scope.row.workPeople}">-->
-<!--                {{ scope.row.workPeople ? scope.row.workPeople : "" }}-->
+            <!--                {{ scope.row.workPeople ? scope.row.workPeople : "" }}-->
-<!--              </div>-->
+            <!--              </div>-->
-<!--            </template>-->
+            <!--            </template>-->
           </el-table-column>
         </el-table>
       </div>
@@ -259,7 +260,7 @@ export default {
       userId: this.$store.getters.userInfo.userId,
       taskIds: this.$route.query.taskIds,
       pId: this.$route.query.prcId,
-      selectedId:'',
+      selectedId: ""
     };
   },
   methods: {
@@ -322,6 +323,7 @@ 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);
@@ -413,9 +415,9 @@ export default {
       }, e => {
       });
     },
-     //批量分发按钮
+    //批量分发按钮
     choiceZRRS(row, type, index) {
-      this.selectedId=row.id
+      this.selectedId = row.id;
       this.type = type;
       if (type === 1) {
         this.drawerTitle = "选择责任人";
@@ -458,36 +460,37 @@ export default {
       //单选操作
       if (this.type === 1) {
         this.dataList.forEach(item => {
-          if(item.children){
+          if (item.children) {
             item.children.forEach(items => {
-             if(items.id === this.selectedId){
+              if (items.id === this.selectedId) {
-               items.workPeople = data[0].name
+                items.workPeople = data[0].name;
-               items.workPeopleId = data[0].id
+                items.workPeopleId = data[0].id;
-               // this.$set(items,'workPeople',data[0].name)
+                // this.$set(items,'workPeople',data[0].name)
-               //this.$set(items,'workPeopleId',data[0].id)
+                //this.$set(items,'workPeopleId',data[0].id)
-             }
+              }
-            })
+            });
           }
-        })
+        });
-        this.dataList = JSON.parse(JSON.stringify(this.dataList))
+        this.dataList = JSON.parse(JSON.stringify(this.dataList));
       } else if (this.type === 2) {
-        this.selectList.forEach(item =>{
+        this.selectList.forEach(item => {
-          this.dataList.map(items=>{
+          this.dataList.map(items => {
-            if(item.id==items.id){
+            if (item.id == items.id) {
-              items.workPeople = data[0].name
+              items.workPeople = "";
-              items.workPeopleId = data[0].id
+              items.workPeopleId = "";
+              this.$message.warning('您只能针对条款进行分发')
             }
-            if(items.children.length){
+            if (items.children.length) {
-              items.children.map(childrenItem=>{
+              items.children.map(childrenItem => {
-                if(childrenItem.id==item.id){
+                if (childrenItem.id == item.id) {
-                  childrenItem.workPeople = data[0].name
+                  childrenItem.workPeople = data[0].name;
-                  childrenItem.workPeopleId = data[0].id
+                  childrenItem.workPeopleId = data[0].id;
                 }
-              })
+              });
             }
-          })
+          });
-        })
+        });
-        this.dataList = JSON.parse(JSON.stringify(this.dataList))
+        this.dataList = JSON.parse(JSON.stringify(this.dataList));
       }
       this.modalshowflag = false;
     },

src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue

@@ -64,7 +64,7 @@ export default {
             continue;
           } else if (entity.id === "63e05705d0c8013162caa34f9fe52865") {
             list.push({
-              label: "车辆类型清单",
+              label: "车型类别清单",
               name: "listProject"
             });
             continue;

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

@@ -177,8 +177,8 @@
               prop="code"
               show-overflow-tooltip
               fixed="left"
-              width="180px"
               align="center"
+              width="180px"
               label="标准号">
             <template slot-scope="scope">
               <span @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber }}</span>
@@ -641,6 +641,7 @@ export default {
       zrbmOptions: [], // 责任部门
       categoryOptions: [], // 能源类型
       energyKindOptions: [], // 能源种类list
+      CycxOptions: [],
       sycpxOptions: [], // 适用产品线
       applyArcticOptions: [], // 基础车型 适用车型list
       /** ******************************/
@@ -900,7 +901,7 @@ export default {
       // 责任部门数据字典
       this.zrbmOptions = res.data.ZRBMCLASS
       // 能源类型数据字典
-      this.energyKindOptions = res.data.ENERGYTYPES
+      this.CycxOptions = res.data.CLLX
       // this.categoryOptions = res.data.NYLXCLASS // 能源类型
       // 适用车型数据字典
       this.applyArcticOptions = res.data.PRODUCTTYPE
@@ -1235,10 +1236,10 @@ export default {
     },
     // 清单条目 table select事件
     sarAccessInfoSelect (selectData) {
-      this.sarAccessInfoListArry = selectData
+      this.sarAccessInfoListArry = []
-     /* let sarAccessInfoListArryId =  []
+      for (let i = 0; i < selectData.length; i++) {
-      for(let i=0; i<this.selectData.length; i++){
+        this.sarAccessInfoListArry.push(selectData[i].id);
-      }*/
+      }
     },
     // 点击取消按钮 返回事件
     backCancal () {
@@ -1493,10 +1494,10 @@ export default {
         // 适用车型转换
         if (item.typeApplicable !== null) {
           let k = (item.typeApplicable || "").split(',')
-          for (let i in this.energyKindOptions) {
+          for (let i in this.CycxOptions) {
             for (let m = 0; m< k.length; m++) {
-              if (this.energyKindOptions[i].value === k[m]) {
+              if (this.CycxOptions[i].value === k[m]) {
-                k[m]  = this.energyKindOptions[i].label
+                k[m]  = this.CycxOptions[i].label
               }
               item.typeApplicable = k.join(',')
             }
@@ -2039,6 +2040,7 @@ export default {
       this.regionOptions = res.data.REGION // 基础信息 区域list
       this.applyArcticOptions = res.data.PRODUCTTYPE // 基础车型 适用车型list
       this.energyKindOptions = res.data.ENERGYTYPES // 能源种类list
+      this.CycxOptions = res.data.CLLX
       this.drawerCountryOptions = res.data.COUNTRY // 国家、地区list
       this.applyOptions = res.data.COUNTRY  //适用区域list
       this.standNatureOptions = res.data.SARPROPERTY // 新增 标准性质

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

@@ -621,6 +621,7 @@ export default {
       zrbmOptions: [], // 责任部门
       categoryOptions: [], // 能源类型
       energyKindOptions: [], // 能源种类list
+      CycxOptions: [],
       sycpxOptions: [], // 适用产品线
       applyArcticOptions: [], // 基础车型 适用车型list
       /** ******************************/
@@ -881,7 +882,7 @@ export default {
       // 责任部门数据字典
       this.zrbmOptions = res.data.ZRBMCLASS
       // 能源类型数据字典
-      this.energyKindOptions = res.data.ENERGYTYPES
+      this.CycxOptions = res.data.CLLX
       // this.categoryOptions = res.data.NYLXCLASS // 能源类型
       // 适用车型数据字典
       this.applyArcticOptions = res.data.PRODUCTTYPE
@@ -1207,7 +1208,10 @@ export default {
     },
     // 清单条目 table select事件
     sarAccessInfoSelect (selectData) {
-      this.sarAccessInfoListArry = selectData
+      this.sarAccessInfoListArry = []
+      for (let i = 0; i < selectData.length; i++) {
+        this.sarAccessInfoListArry.push(selectData[i].id);
+      }
     },
     // 点击取消按钮 返回事件
     backCancal () {
@@ -1461,10 +1465,10 @@ export default {
         // 适用车型转换
         if (item.typeApplicable !== null) {
           let k = (item.typeApplicable || "").split(',')
-          for (let i in this.energyKindOptions) {
+          for (let i in this.CycxOptions) {
             for (let m = 0; m< k.length; m++) {
-              if (this.energyKindOptions[i].value === k[m]) {
+              if (this.CycxOptions[i].value === k[m]) {
-                k[m]  = this.energyKindOptions[i].label
+                k[m]  = this.CycxOptions[i].label
               }
               item.typeApplicable = k.join(',')
             }
@@ -2018,6 +2022,7 @@ export default {
       this.regionOptions = res.data.REGION // 基础信息 区域list
       this.applyArcticOptions = res.data.PRODUCTTYPE || [] // 基础车型 适用车型list
       this.energyKindOptions = res.data.ENERGYTYPES || [] // 能源种类list
+      this.CycxOptions = res.data.CLLX // 能源种类list
       this.drawerCountryOptions = res.data.COUNTRY // 国家、地区list
       this.applyOptions = res.data.COUNTRY  //适用区域list
       this.standNatureOptions = res.data.SARPROPERTY // 新增 标准性质
@@ -2032,10 +2037,6 @@ export default {
       this.textStatusOptions = res.data.WBZTCLASS
       this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
       this.setMap(this.textStatusOptions)
-      this.setMap(this.zrbmOptions)
-      this.setMap(this.categoryOptions)
-      this.setMap(this.sycpxOptions)
-      this.setMap(this.energyKindOptions)
       this.getGzzOption()
     }, e => {
     })

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

@@ -18,7 +18,7 @@
                 size="small"
               >
                 <el-option
-                  v-for="item in energyKindOptions"
+                  v-for="item in CycxOptions"
                   :value="item.value"
                   :key="item.value"
                   :label="item.label"
@@ -130,11 +130,12 @@
             <el-select
               v-model="sarAccessInfo.typeApplicable"
               placeholder="请选择"
+              clearable
               filterable
               size="small"
             >
               <el-option
-                v-for="item in energyKindOptions"
+                v-for="item in CycxOptions"
                 :value="item.value"
                 :key="item.value"
                 :label="item.label"
@@ -145,6 +146,7 @@
             <el-select
               v-model="sarAccessInfo.syrz"
               placeholder="请选择"
+              clearable
               filterable
               size="small"
             >
@@ -284,7 +286,6 @@
         <el-button
           class="common-button-default delete-button"
           size="mini" @click="deleteSelectSarAccessInfo"
-          v-if="!disabledFlag"
           v-btn-permission="''"
         ><i class="iconfont">&#xe61b;</i>删除</el-button>
       </div>
@@ -670,6 +671,7 @@ export default {
       zrbmOptions: [], // 责任部门
       categoryOptions: [], // 能源类型
       energyKindOptions: [], // 能源种类list
+      CycxOptions: [],
       sycpxOptions: [], // 适用产品线
       applyArcticOptions: [], // 基础车型 适用车型list
       syrzOptions: [],
@@ -936,7 +938,7 @@ export default {
       // 责任部门数据字典
       this.zrbmOptions = res.data.ZRBMCLASS
       // 能源类型数据字典
-      this.energyKindOptions = res.data.ENERGYTYPES
+      this.CycxOptions = res.data.ENERGYTYPES
       // this.categoryOptions = res.data.NYLXCLASS // 能源类型
       // 适用车型数据字典
       this.applyArcticOptions = res.data.PRODUCTTYPE
@@ -1058,8 +1060,10 @@ export default {
       this.sarAccessInfoSearch.advanceSearchVOStr = ''
       // 国内标准法规可查字段
       if (val === 'INLAND_STAND'){
+        this.selectLawsStands()
         // 海外标准法规可查字段
       }else if (val === 'FOREIGN_STAND'){
+        this.selectLawsStands()
         // 国内外政策可查字段
       }
     },
@@ -1180,7 +1184,10 @@ export default {
     },
     // 清单条目 table select事件
     sarAccessInfoSelect (selectData) {
-      this.sarAccessInfoListArry = selectData
+      this.sarAccessInfoListArry = []
+      for (let i = 0; i < selectData.length; i++) {
+        this.sarAccessInfoListArry.push(selectData[i].id);
+      }
     },
     // 点击取消按钮 返回事件
     backCancal () {
@@ -1304,10 +1311,10 @@ export default {
         // 适用车型转换
         if (item.typeApplicable !== null) {
           let k = (item.typeApplicable || "").split(',')
-          for (let i in this.energyKindOptions) {
+          for (let i in this.CycxOptions) {
             for (let m = 0; m< k.length; m++) {
-              if (this.energyKindOptions[i].value === k[m]) {
+              if (this.CycxOptions[i].value === k[m]) {
-                k[m]  = this.energyKindOptions[i].label
+                k[m]  = this.CycxOptions[i].label
               }
               item.typeApplicable = k.join(',')
             }
@@ -1416,10 +1423,10 @@ export default {
     // 高级查询-查询按钮
     selectBtn() {
       if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
-        this.sarAccessInfoSearch.standType = 'INLAND'
+        this.sarAccessInfo.standType = 'INLAND'
         this.selectPage()
       } else {
-        this.sarAccessInfoSearch.standType = 'FOREIGN'
+        this.sarAccessInfo.standType = 'FOREIGN'
         this.selectPage()
       }
     },
@@ -1860,29 +1867,7 @@ export default {
           }
         })
         this.sarAccessInfoSearchList.forEach(item => {
-          if (item.attrInfoMap === null) {
+          this.addWord(item)
-            this.$set(item, 'zccssrqgj', '')
-            this.$set(item, 'xcxssrqgj', '')
-            this.$set(item, 'sycpx', '')
-            this.$set(item, 'typeApplicable', '')
-            this.$set(item, 'nylx', '')
-            this.$set(item, 'zrbm', '')
-            this.$set(item, 'cycvppsbm', '')
-            this.$set(item, 'cycvppscn', '')
-            this.$set(item, 'kccvppsbm', '')
-            this.$set(item, 'kccvppscn', '')
-          }else {
-            this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
-            this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
-            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)
-          }
         })
       }, e => {
 
@@ -1929,6 +1914,7 @@ export default {
       this.regionOptions = res.data.REGION // 基础信息 区域list
       this.applyArcticOptions = res.data.PRODUCTTYPE || [] // 基础车型 适用车型list
       this.energyKindOptions = res.data.ENERGYTYPES || [] // 能源种类list
+      this.CycxOptions = res.data.ENERGYTYPES // 能源种类list
       this.drawerCountryOptions = res.data.COUNTRY // 国家、地区list
       this.applyOptions = res.data.COUNTRY  //适用区域list
       this.standNatureOptions = res.data.SARPROPERTY // 新增 标准性质

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -341,24 +341,28 @@
           :wrapperClosable="false"
           :visible.sync="isAdvancedSearch">
         <div class="demo-drawer-content">
-          <el-form :model="sarStandardsSearch" :inline="true" class="label-input-form table-lattice" style="display: flex;flex-wrap: wrap">
+          <el-form :model="sarStandardsSearch" :inline="true" class="label-input-form table-lattice"
+                   style="display: flex;flex-wrap: wrap">
             <!--            标准号-->
-            <el-form-item :label="$t('m.standardNo')"  class="serch-form-item">
+            <el-form-item :label="$t('m.standardNo')" class="serch-form-item">
-              <el-input v-model="sarStandardsSearch.standNumber" :placeholder="$t('m.lookUpByStandardNumber')" clearable :maxlength="100"
+              <el-input v-model="sarStandardsSearch.standNumber" :placeholder="$t('m.lookUpByStandardNumber')" clearable
+                        :maxlength="100"
                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
             </el-form-item>
             <!--            标准名称-->
             <el-form-item :label="$t('m.standName')" class="serch-form-item">
-              <el-input v-model="sarStandardsSearch.standName" :placeholder="$t('m.searchByStandardName')" clearable :maxlength="500"
+              <el-input v-model="sarStandardsSearch.standName" :placeholder="$t('m.searchByStandardName')" clearable
+                        :maxlength="500"
                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
             </el-form-item>
             <!--            标准英文名称-->
             <el-form-item :label="$t('m.standardEnglishName')" class="serch-form-item">
-              <el-input v-model="sarStandardsSearch.standEnName" :placeholder="$t('m.searchAccordingToStandardEnglishName')" clearable :maxlength="500"
+              <el-input v-model="sarStandardsSearch.standEnName"
+                        :placeholder="$t('m.searchAccordingToStandardEnglishName')" clearable :maxlength="500"
                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
             </el-form-item>
             <!--            标准类别-->
-            <el-form-item :label="$t('m.standardCategory')"  class="serch-form-item">
+            <el-form-item :label="$t('m.standardCategory')" class="serch-form-item">
               <search-select
                   v-model="sarStandardsSearch.standSort"
                   :placeholder="$t('m.standardCategoryTips')"
@@ -366,59 +370,88 @@
                   :options="standSortOptions"
                   clearable/>
             </el-form-item>
-            <!--            文本状态-->
-            <el-form-item :label="$t('m.standStateShow')"  class="serch-form-item">
-              <el-select v-model="sarStandardsSearch.textStatus" :placeholder="$t('m.lookupByStandardStatus')" clearable
-                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
-                <el-option v-for="opt in standStateOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
-              </el-select>
-            </el-form-item>
             <!--            代替标准号-->
-            <el-form-item :label="$t('m.substituteStandardNumber')"  class="serch-form-item">
+            <el-form-item :label="$t('m.substituteStandardNumber')" class="serch-form-item">
-              <el-input v-model="sarStandardsSearch.dtbjh" :placeholder="$t('m.lookUpByAlternativeCriteria')" clearable :maxlength="100"
+              <el-input v-model="sarStandardsSearch.replaceStandNum" :placeholder="$t('m.lookUpByAlternativeCriteria')"
+                        clearable :maxlength="100"
                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
             </el-form-item>
+            <!--            被代替标准号-->
+            <el-form-item label="被代替标准号">
+              <el-input v-model="sarStandardsSearch.replacedStandNum" clearable placeholder="根据被代替标准号查找"
+                        @keyup.enter.native="btnSearch"></el-input>
+            </el-form-item>
             <!--            标准年份-->
-            <el-form-item :label="$t('m.standardYear')"  class="serch-form-item">
+            <el-form-item :label="$t('m.standardYear')" class="serch-form-item">
               <el-input
                   v-model="sarStandardsSearch.standYear"
                   placeholder="根据标准年份查找">
               </el-input>
             </el-form-item>
+
             <!--            标准发布日期-->
-            <el-form-item label="标准发布日期"  class="serch-form-item">
+            <el-form-item label="标准发布日期" class="serch-form-item">
               <el-date-picker
                   v-model="sarStandardsSearch.issueTime"
                   type="date"
+                  value-format="yyyy-MM-dd"
                   placeholder="根据标准发布日期查找">
               </el-date-picker>
             </el-form-item>
+            <!--            适用车型-->
+            <el-form-item :label="$t('m.applicableModels')" class="serch-form-item">
+              <el-select v-model="sarStandardsSearch.applyArctic"
+                         :placeholder="$t('m.searchAccordingToThApplicableModel')" clearable
+                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
+                <el-option v-for="opt in applyArcticOptions" :value="opt.value === undefined ? '' :opt.value"
+                           :key="opt.value" :label="opt.label">{{ opt.label }}
+                </el-option>
+              </el-select>
+            </el-form-item>
+
+            <!--            是否纳入标准清单-->
+            <el-form-item label="是否纳入标准清单" class="serch-form-item">
+              <el-select v-model="sarStandardsSearch.isRelateAccess" placeholder="根据是否纳入标准清单查找">
+                <el-option value="1" label="是"></el-option>
+                <el-option value="0" label="否"></el-option>
+              </el-select>
+            </el-form-item>
+
+
+            <!--            文本状态-->
+            <el-form-item :label="$t('m.standStateShow')" class="serch-form-item">
+              <el-select v-model="sarStandardsSearch.textStatus" :placeholder="$t('m.lookupByStandardStatus')" clearable
+                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
+                <el-option v-for="opt in standStateOptions" :value="opt.value === undefined ? '' :opt.value"
+                           :key="opt.value" :label="opt.label">{{ opt.label }}
+                </el-option>
+              </el-select>
+            </el-form-item>
             <!--            标准性质-->
             <el-form-item :label="$t('m.standNatureShow')" class="serch-form-item">
               <el-select v-model="sarStandardsSearch.standNature" placeholder="请选择标准性质" clearable
                          @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
-                <el-option v-for="opt in standNatureOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
+                <el-option v-for="opt in standNatureOptions" :value="opt.value === undefined ? '' :opt.value"
-              </el-select>
+                           :key="opt.value" :label="opt.label">{{ opt.label }}
-            </el-form-item>
+                </el-option>
-            <!--            是否纳入标准清单-->
-            <el-form-item  label="是否纳入标准清单" class="serch-form-item">
-              <el-select v-model="sarStandardsSearch.isRelateAccess"  placeholder="根据是否纳入标准清单查找">
-                <el-option value="yes" label="是"></el-option>
-                <el-option value="no" label="否"></el-option>
               </el-select>
             </el-form-item>
+
+            <!--            自定义属性-->
             <!--            实施日期-->
             <el-form-item label="实施日期">
               <el-date-picker
-                  v-model="sarStandardsSearch.ssrq"
+                  v-model="advanceSearchMapping.SSRQ"
                   type="date"
+                  value-format="yyyy-MM-dd"
                   placeholder="根据实施日期查找">
               </el-date-picker>
             </el-form-item>
             <!--            新车型实施日期-->
             <el-form-item title="新车型实施日期" label="新车型实施日期">
               <el-date-picker
-                  v-model="sarStandardsSearch.xcxssrq"
+                  value-format="yyyy-MM-dd"
+                  v-model="advanceSearchMapping.XCXSSRQ"
                   type="date"
                   placeholder="根据新车型实施日期查找">
               </el-date-picker>
@@ -426,139 +459,153 @@
             <!--            在产车实施日期-->
             <el-form-item title="在产车实施日期" label="在产车实施日期">
               <el-date-picker
-                  v-model="sarStandardsSearch.zccssrq"
+                  v-model="advanceSearchMapping.ZCCSSRQ"
                   type="date"
+                  value-format="yyyy-MM-dd"
                   placeholder="根据在产车实施日期查找">
               </el-date-picker>
             </el-form-item>
             <!--            归口管理部门-->
             <el-form-item label="归口管理部门">
-              <el-select v-model="sarStandardsSearch.gkglbm" placeholder="归口管理部门" clearable
+              <el-select v-model="advanceSearchMapping.GKDW" placeholder="归口管理部门" clearable
                          @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
-                <el-option v-for="opt in gkglbmOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
+                <el-option v-for="opt in gkglbmOptions" :value="opt.value === undefined ? '' :opt.value"
+                           :key="opt.value" :label="opt.label">{{ opt.label }}
+                </el-option>
               </el-select>
             </el-form-item>
             <!--            起草单位-->
             <el-form-item label="起草单位">
-              <el-select v-model="sarStandardsSearch.qcdw" placeholder="根据起草单位查找" clearable
+              <el-select v-model="advanceSearchMapping.QCDW" placeholder="根据起草单位查找" clearable
                          @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
-                <el-option v-for="opt in qcdwOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
+                <el-option v-for="opt in qcdwOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value"
+                           :label="opt.label">{{ opt.label }}
+                </el-option>
               </el-select>
             </el-form-item>
             <!--            我司参与深度-->
             <el-form-item label="我司参与深度">
-              <el-select v-model="sarStandardsSearch.wscysd" placeholder="请选择我司参与深度" clearable
+              <el-select v-model="advanceSearchMapping.CYSD" placeholder="请选择我司参与深度" clearable
                          @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
-                <el-option v-for="opt in cysdOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
+                <el-option v-for="opt in cysdOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value"
+                           :label="opt.label">{{ opt.label }}
+                </el-option>
               </el-select>
             </el-form-item>
 
             <!--            能源类型-->
             <el-form-item label="能源类型">
-              <el-select v-model="sarStandardsSearch.nylx" placeholder="请选择能源类型" clearable
+              <el-select v-model="advanceSearchMapping.NYLX" placeholder="请选择能源类型" clearable
                          @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
-                <el-option v-for="opt in nylxOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
+                <el-option v-for="opt in nylxOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value"
-              </el-select>
+                           :label="opt.label">{{ opt.label }}
-            </el-form-item>
+                </el-option>
-            <!--            适用车型-->
-            <el-form-item :label="$t('m.applicableModels')"  class="serch-form-item">
-              <el-select v-model="sarStandardsSearch.cllx" :placeholder="$t('m.searchAccordingToThApplicableModel')" clearable
-                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
-                <el-option v-for="opt in applyArcticOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
               </el-select>
             </el-form-item>
             <!--            适用产品线（新增字段）-->
-            <el-form-item :label="$t('m.applicableProductLine')"  class="serch-form-item">
+            <el-form-item :label="$t('m.applicableProductLine')" class="serch-form-item">
-              <el-select v-model="sarStandardsSearch.sycpx" :placeholder="$t('m.searchByApplicableProductLine')" clearable
+              <el-select v-model="advanceSearchMapping.SYCPX" :placeholder="$t('m.searchByApplicableProductLine')"
+                         clearable
                          @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
-                <el-option v-for="opt in sycpxOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
+                <el-option v-for="opt in sycpxOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value"
+                           :label="opt.label">{{ opt.label }}
+                </el-option>
               </el-select>
             </el-form-item>
             <!--            适用认证-->
             <el-form-item label="适用认证">
-              <el-select v-model="sarStandardsSearch.syrz" placeholder="根据适用认证查找" clearable
+              <el-select v-model="advanceSearchMapping.SYRZ" placeholder="根据适用认证查找" clearable
                          @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
-                <el-option v-for="opt in syrzOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
+                <el-option v-for="opt in syrzOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value"
+                           :label="opt.label">{{ opt.label }}
+                </el-option>
               </el-select>
             </el-form-item>
             <!--            责任部门-->
             <el-form-item label="责任部门">
-              <el-select v-model="sarStandardsSearch.zrbm" placeholder="根据责任部门查找" clearable
+              <el-select v-model="advanceSearchMapping.ZRBM" placeholder="根据责任部门查找" clearable
                          @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
-                <el-option v-for="opt in zrbmOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
+                <el-option v-for="opt in zrbmOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value"
+                           :label="opt.label">{{ opt.label }}
+                </el-option>
               </el-select>
             </el-form-item>
             <!--            责任工程师-->
             <el-form-item label="责任工程师">
-              <el-select v-model="sarStandardsSearch.zrgcs" placeholder="根据责任工程师查找" clearable
+              <el-select v-model="advanceSearchMapping.ZRGCS" placeholder="根据责任工程师查找" clearable
                          @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
-                <el-option v-for="opt in zrgcsOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
+                <el-option v-for="opt in zrgcsOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value"
+                           :label="opt.label">{{ opt.label }}
+                </el-option>
               </el-select>
             </el-form-item>
-            <!--            关联模块-VPPS编码-->
-            <el-form-item title="关联模块-VPPS编码" label="关联模块-VPPS编码" prop="standNumber">
-              <el-input v-model="sarStandardsSearch.svpps" clearable
-                        placeholder="根据关联模块-VPPS编码查找"
-                        @keyup.enter.native="btnSearch"></el-input>
-            </el-form-item>
-            <!--            代替标准号-->
-            <el-form-item label="代替标准号">
-              <el-input v-model="sarStandardsSearch.dtbjh" clearable placeholder="根据代替标准号查找"
-                        @keyup.enter.native="btnSearch"></el-input>
-            </el-form-item>
-            <!--            关联模块-中文名称-->
-            <el-form-item title="关联模块-中文名称" label="关联模块-中文名称" prop="standNumber">
-              <el-input v-model="sarStandardsSearch.standNumber" clearable
-                        placeholder="根据关联模块-中文名称"
-                        @keyup.enter.native="btnSearch"></el-input>
-            </el-form-item>
             <!--            采标编号-->
             <el-form-item label="采标编号" prop="nameShow">
-              <el-input v-model="sarStandardsSearch.cbbh" clearable placeholder="根据采标编号查找"
+              <el-input v-model="advanceSearchMapping.CBBH" clearable placeholder="根据采标编号查找"
                         @keyup.enter.native="btnSearch"></el-input>
             </el-form-item>
             <!--            采标程度-->
             <el-form-item label="采标程度" prop="standNumber">
-              <el-input v-model="sarStandardsSearch.cbcd" clearable
+              <el-input v-model="advanceSearchMapping.CBCD" clearable
                         placeholder="根据采标程度查找"
                         @keyup.enter.native="btnSearch"></el-input>
             </el-form-item>
             <!--            引用标准-->
             <el-form-item label="引用标准">
-              <el-input v-model="sarStandardsSearch.yybj" clearable placeholder="根据引用标准查找"
+              <el-input v-model="advanceSearchMapping.YYBJ" clearable placeholder="根据引用标准查找"
                         @keyup.enter.native="btnSearch"></el-input>
             </el-form-item>
             <!--            被引用标准-->
             <el-form-item label="被引用标准">
-              <el-input v-model="sarStandardsSearch.byybj" clearable
+              <el-input v-model="advanceSearchMapping.BYYBJ" clearable
                         placeholder="根据被引用标准查找"
                         @keyup.enter.native="btnSearch"></el-input>
             </el-form-item>
-            <!--            关联模块（新增字段）-->
-            <el-form-item :label="$t('m.associatedModule')"  class="serch-form-item">
-              <el-select v-model="sarStandardsSearch.cycvppsbm" :placeholder="$t('m.SearchByAssociatedModule')" clearable
-                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
-                <el-option v-for="opt in standNatureOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}
-                </el-option>
-              </el-select>
-            </el-form-item>
-
-<!--            标记-->
-            <!--            标签-->
-            <el-form-item label="标签">
-              <el-input v-model="sarStandardsSearch.gxhbq" clearable
-                        placeholder="根据被标签查找"
-                        @keyup.enter.native="btnSearch"></el-input>
-            </el-form-item>
 
 
             <!--            体系类别-->
             <el-form-item label="体系类别">
-              <el-select v-model="sarStandardsSearch.txlb" placeholder="根据体系类别查找" clearable
+              <el-select v-model="advanceSearchMapping.TXLB" placeholder="根据体系类别查找" clearable
                          @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
-                <el-option v-for="opt in txlbOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
+                <el-option v-for="opt in txlbOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value"
+                           :label="opt.label">{{ opt.label }}
+                </el-option>
               </el-select>
             </el-form-item>
+
+            <!--            关联模块--乘用车VPPS编码-->
+            <el-form-item title=" 关联模块--乘用车VPPS编码" label=" 关联模块--乘用车VPPS编码" prop="standNumber">
+              <el-input v-model="advanceSearchMapping.CYCVPPSBM" clearable
+                        placeholder=" 关联模块--乘用车VPPS编码"
+                        @keyup.enter.native="btnSearch"></el-input>
+            </el-form-item>
+            <!--           关联模块--乘用车vpps中文名称-->
+            <el-form-item title="关联模块--乘用车vpps中文名称" label="关联模块--乘用车vpps中文名称" prop="standNumber">
+              <el-input v-model="advanceSearchMapping.CYCVPPSCN" clearable
+                        placeholder="关联模块--乘用车vpps中文名称"
+                        @keyup.enter.native="btnSearch"></el-input>
+            </el-form-item>
+            <!--关联模块--卡车VPPS编码-->
+            <el-form-item title="关联模块--卡车VPPS编码" label="关联模块--卡车VPPS编码" prop="standNumber">
+              <el-input v-model="advanceSearchMapping.KCCVPPSBM" clearable
+                        placeholder="关联模块--卡车VPPS编码"
+                        @keyup.enter.native="btnSearch"></el-input>
+            </el-form-item>
+            <!--关联模块--卡车vpps中文名称-->
+            <el-form-item title="关联模块--卡车vpps中文名称" label="关联模块--卡车vpps中文名称" prop="standNumber">
+              <el-input v-model="advanceSearchMapping.KCCVPPSCN" clearable
+                        placeholder="关联模块--卡车vpps中文名称"
+                        @keyup.enter.native="btnSearch"></el-input>
+            </el-form-item>
+
+
+            <!--            标记-->
+            <!--            标签-->
+            <el-form-item label="标签">
+              <el-input v-model="advanceSearchMapping.GXHBQ" clearable
+                        placeholder="根据被标签查找"
+                        @keyup.enter.native="btnSearch"></el-input>
+            </el-form-item>
           </el-form>
         </div>
         <div class="demo-drawer-footer">
@@ -566,11 +613,13 @@
               class="common-button-primary"
               icon="el-icon-check"
               type="primary"
-              @click="getDomesticStandardTableBtn(sarStandardsSearch)">搜索</el-button>
+              @click="getDomesticStandardTableBtn(sarStandardsSearch)">搜索
+          </el-button>
           <el-button
               class="common-button-default"
               icon="el-icon-close"
-              @click="clearAllSearch('sarStandardsSearch')">取消</el-button>
+              @click="clearAllSearch('sarStandardsSearch')">取消
+          </el-button>
         </div>
       </el-drawer>
       <!-- 新增海外标准 -->
@@ -622,8 +671,8 @@
               </el-col>
 
               <template v-if="index === 0" >
-                <el-form-item label="国家/地区" prop="standSort" 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>
+                  <el-select v-model="sarStandardsInfoEO.country" filterable clearable>
                     <el-option
                         v-for="item in countryOptions"
                         placeholder="请选择"
@@ -1460,38 +1509,41 @@ export default {
         validFlag: '0',
         menuId: '',
         country: '',
-        standNumber: '',//标准编号
+        standNumber: '',//标准号
         standName: '',//标准名称
+        standEnName: '',//标准英文名称
+        standSort: '', // 标准类别
+        replaceStandNum: '',//代替标准号
+        replacedStandNum: '',// 被代替标准号
+        standYear: '',//标准年份
+        issueTime: '',//标准发布时间
+        applyArctic: '',//适用车型
         standState: '',
         standNature: '',//标准性质
-        issueTime: '',//标准发布时间
-        // applyArctic: '',
-        dtbjh: '',//代替标准号
-        // replaceStandNumCope: '',
-        // replaceStandNumList: [],
-        replacedStandNum: '',
         synopsis: '', // 内容摘要
-        // category: '', // 所属类别
+        textStatus:''//文本状态
-        standSort: '', // 标准类别
+      },
-        txlbOption:'', //标准体系
+      //高级搜索映射
-        gxhbq:'', //标签
+      advanceSearchMapping: {
-        wscysd:'', //我司参与深度
+        txlbOption: '', //标准体系
-        gkglbm:'', //归口管理部门
+        GXHBQ: '', //标签
-        ssrq:'',//实施日期
+        CYSD: '', //我司参与深度
-        scxssrq:''//新车型实施日期
+        GKDW: '', //归口管理部门
-        ,zccssrq:''//在产车实施日期
+        SSRQ: '',//实施日期
-        ,qcdw:''//起草单位
+        XCXSSRQ: ''//新车型实施日期
-        ,nylx:''//能源类型
+        , ZCCSSRQ: ''//在产车实施日期
-        ,cllx:''//适用车型
+        , QCDW: ''//起草单位
-        ,syrz:''//适用认证
+        , NYLX: ''//能源类型
-        ,zrgcs:''//责任工程师
+        , SYRZ: ''//适用认证
-        ,cbbh:''//采标编号
+        , ZRGCS: ''//责任工程师
-        ,cbcd:''//采标程度
+        , CBBH: ''//采标编号
-        ,yybj:''//引用标准
+        , CBCD: ''//采标程度
-        ,byybj:''//被引用标准
+        , YYBJ: ''//引用标准
-        ,txlb:''//体系类别
+        , BYYBJ: ''//被引用标准
+        , TXLB: ''//体系类别
+      },
 
-      }, // 分页查询过程中用到的对象
+      // 分页查询过程中用到的对象
       loading: false,
       isCollapse: true,
       sideClose: false, // 边栏收展状态
@@ -2532,17 +2584,19 @@ export default {
       this.getDomesticStandardTable()
     },
     // 搜索
-    getDomesticStandardTableBtn (sarStandardsSearch) {
+    getDomesticStandardTableBtn (item) {
+      item.page = 1
       this.standCommonlySearch.page = 1
-      this.standCommonlySearch.sarStandardsSearch = JSON.stringify(sarStandardsSearch) || ''
+      this.standCommonlySearch.sarStandardsSearch = JSON.stringify(item) || ''
-      this.getDomesticStandardTable(2)
+      this.getDomesticStandardTable(item)
     },
     // 清空搜索框
     clearAllSearch (flag) {
-      if (flag === 'standCommonlySearch') {
+
-        this.standCommonlySearch.standSort = ''
+      if (flag === 'sarStandardsSearch') {
-        this.standCommonlySearch.standNumber = ''
+        this.sarStandardsSearch.standSort = ''
-        this.standCommonlySearch.page = 1
+        this.sarStandardsSearch.standNumber = ''
+        this.sarStandardsSearch.page = 1
         this.getDomesticStandardTable()
       } else if (flag === 2) {
         // 标准条目搜索
@@ -3167,12 +3221,22 @@ export default {
      * 1、空：普通检索  2：高级检索
      * */
     getDomesticStandardTable (item) {
-      let data = this.standCommonlySearch
+
-      if (item === 2) {
+      // if (item === 2) {
-        data.standSort = ''
+      //   data.standSort = ''
-        data.standNumber = ''
+      //   data.standNumber = ''
-      } else {
+      // } else {
-        data.sarStandardsSearch = ''
+      //   data.sarStandardsSearch = ''
+      // }
+
+      if (item !== '' && item !== null && item !== undefined) {
+        item.pageSize = this.$store.getters.userInfo.configContent
+      }
+
+      this.sarStandardsSearch.pageSize = this.$store.getters.userInfo.configContent
+      const data = item || this.standCommonlySearch || this.advanceSearchMapping
+      if (item) {
+        this.sarStandardsSearch.advanceSearchStr = item.advanceSearchStr
       }
       const formData = {...data}
       if (!item) {
@@ -3197,6 +3261,29 @@ export default {
       }
       formData.standType = 'FOREIGN'
       formData.userId = this.$store.getters.userInfo.userId
+
+      // // 自定义属性字段高级搜索处理
+      //advanceSearchVOStr
+      const advanceSearchVOList = [];
+      for (let key in this.advanceSearchMapping) {
+        const value = this.advanceSearchMapping[key];
+        if (value !== null && value !== '') {
+          advanceSearchVOList.push({
+            connect: "and",
+            field: key || '',
+            type: 'like',
+            value: value
+          });
+        }
+
+      }
+      formData.advanceSearchVOStr = JSON.stringify(advanceSearchVOList);
+      console.log("======")
+      console.log(formData.advanceSearchVOStr);
+
+
+
+
       this.SarExportSearchEo = formData
       this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', formData, {
         _this: this, loading: 'loading'
@@ -3233,6 +3320,15 @@ export default {
         this.stahndinfoList = []
         this.total = 0
       })
+
+      //清空自定义字段
+      for (let key in this.advanceSearchMapping) {
+        this.advanceSearchMapping[key] = ''
+      }
+      //情况基本字段
+      for (let key in this.sarStandardsSearch) {
+        this.sarStandardsSearch[key] = ''
+      }
     },
     // 查询处于游离态的标准
     selectConfiguraStand () {

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

@@ -188,7 +188,7 @@
                   <el-form :modal="sarSarAccessEOSearch" :inline="true" class="label-input-form">
                     <el-form-item label="车型类别" class="search-item search-item-last">
                       <el-input
-                        v-model="sarSarAccessEOSearch.projectName"
+                        v-model="sarSarAccessEOSearch.carType"
                         placeholder="请输入车型类别"
                       ></el-input>
                     </el-form-item>
@@ -236,7 +236,7 @@
                 align="center">
               </el-table-column>
               <el-table-column
-                prop="projectName"
+                prop="carType"
                 label="车型类别"
                 align="center">
               </el-table-column>
@@ -497,7 +497,7 @@ export default {
       localProLib: {},
       // 查询相关参数
       sarSarAccessEOSearch: {
-        projectName: "",
+        carType: "",
         detailedListName: "",
       },
       takeingFlag: false,
@@ -525,7 +525,7 @@ export default {
       this.getStand()
     },
     clearSearchAccess(){
-      this.sarSarAccessEOSearch.projectName = ''
+      this.sarSarAccessEOSearch.carType = ''
       this.sarSarAccessEOSearch.detailedListName = ''
       this.transfer()
     },
@@ -593,6 +593,20 @@ export default {
         _this: this
       }, res => {
         this.sarAccessListDatas = res.data.records;
+        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++) {
+                if (this.energyKindOptions[i].value === k[m]) {
+                  k[m]  = this.energyKindOptions[i].label
+                }
+                item.carType = k.join(',')
+              }
+            }
+          }
+        })
         this.sarSarAccessEOSearch.page = 1
         this.totalNo = res.data.total
         this.detailedListModel = true
@@ -937,6 +951,7 @@ export default {
         _this: this,
         loading: 'loading'
       }, res => {
+        this.energyKindOptions = res.data.ENERGYTYPES //适用车型
         this.standSortOptions = res.data.STANDCLASSIFY // 标准类别
         this.setMap(this.zrbmMap, res.data.ZRBMCLASS)
         this.setMap(this.textStatusMap, res.data.WBZTCLASS)

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

@@ -270,6 +270,12 @@
                 width="150px"
                 align="center"
                 label="不合规">
+                <el-table-column
+                        width="150px"
+                        align="center"
+                        prop="productionNonCompliance"
+                        label="不合格项目">
+                </el-table-column>
                 <el-table-column
                   width="150px"
                   align="center"
@@ -321,7 +327,8 @@ export default {
       pageSize: this.$store.getters.userInfo.configContent,
       sarProStateEO: {
         productName: "",
-        standId: ""
+        standId: "",
+        type: ""
       },
       sarProStateTotal: 0,
       sarProStateTotalPage: 1,
@@ -376,6 +383,7 @@ export default {
       this.queryStandAndLaws();
     }, // 外层清空条件查询
     handleProjectCompliance(row) {
+      this.sarProStateEO.type = row.type
       this.standId = row.standId;
       this.querySarProStateZero();
     }, // 查看项目符合性

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

@@ -459,6 +459,7 @@ export default {
       }, res => {
         this.myLoading.loadData = false
         this.total = res.data.total
+        this.pageNo = 1
         this.nonList = res.data.records
         this.nonList.forEach(item => {
           // 责任部门转换