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

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

@@ -682,6 +682,9 @@ export default {
         detailedListName: [
           {required: true, message: '清单名称不能为空', trigger: 'blur'},
           {type: 'string', max: 100, message: '清单名称不能超过100个字符', trigger: 'blur'}
+        ],
+        carType: [
+          {required: true,message: '车型类别不能为空', trigger: 'blur'}
         ]
       },
       disabledFlag: false,

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -3126,6 +3126,7 @@ export default {
                           // 处理动态表单的时间和下拉框格式
                           const formFieldList = this.formFieldList
                           const sarStandAttrObj = {}
+
                           formFieldList.forEach((item) => {
                               const value = nowstandinfo[item.attrField]
                               // 时间格式处理
@@ -3140,6 +3141,8 @@ export default {
                               }
                               sarStandAttrObj[item.attrField] = nowstandinfo[item.attrField]
                           })
+
+
                           nowstandinfo['sarStandAttrEOStr'] = JSON.stringify(sarStandAttrObj).replace(/"/g, "'")
                         console.log("nowstandinfo");
                         console.log(nowstandinfo);
@@ -3153,10 +3156,35 @@ export default {
                                   if (this.addOrUPdateFlag === 1) {
                                       sessionStorage.removeItem('STAND_INLAND')
                                   }
+
+                                console.log("hello")
+                                console.log(formFieldList);
+                                let standardToLawsInfo={'countryArea':'','standId':'','ssrq':'','zccssrqgj':'','xcxssrqgj':''}
+                                standardToLawsInfo.countryArea=nowstandinfo.country;
+                                standardToLawsInfo.standId=nowstandinfo.id;
+                                standardToLawsInfo.ssrq=nowstandinfo.SSRQ;
+                                standardToLawsInfo.zccssrqgj=nowstandinfo.ZCCSSRQ;
+                                standardToLawsInfo.xcxssrqgj=nowstandinfo.XCXSSRQ;
+
+                                console.log("country")
+                                console.log(standardToLawsInfo);
+                                this.$http.post('sarLawsDetailedList/sar-laws-detailed-list/standardToLaws',
+                                    standardToLawsInfo,
+                                    {_this:this}
+                                )
+
+
+
                               }
                           }, e => {
                               this.isSubmit = false
                           })
+
+
+
+
+
+
                       } else {
                           this.isSubmit = false
                       }

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

@@ -699,6 +699,51 @@ export default {
     cancelStand() {
       this.standModel = false;
     },
+    //如果张宇欢改好了就把这个放开，然后把底下那个注释了
+    // okStand() {
+    //   let _this = this;
+    //   if (this.standList.length < 1) {
+    //     _this.$message.warning("请选择标准");
+    //   } else {
+    //     for (let i = 0; i < this.dataList.length; i++) {
+    //       let newStand = false;
+    //       for (let j = 0; j < this.standList.length; j++) {
+    //         if (this.standList[j].id == this.dataList[i].standId) {
+    //           newStand = true;
+    //           this.standList.splice(j, 1)
+    //           j--
+    //         }
+    //       }
+    //       if (newStand) {
+    //         _this.$message.warning("请勿重复添加数据");
+    //       } else {
+    //         // _this.dataList.push(item);
+    //       }
+    //     }
+    //     this.standardData = []
+    //     _this.standModel = false;
+    //     for (var i = 0; i < this.standList.length; i++) {
+    //       this.standList1.push({
+    //         standId: this.standList[i].id,
+    //         projectId: this.localProEO.id
+    //       })
+    //     }
+    //     if (this.standList1 != '') {
+    //       this.$http.postData("sarStandProjectLibrary/batchInsert", this.standList1, {
+    //         _this: this
+    //       }, res => {
+    //         if (res.ok) {
+    //           // this.$message.success(res.message)
+    //           this.getDataList()
+    //         }
+    //       }, e => {
+    //       });
+    //     }
+    //     this.standList = []
+    //     this.standList1 = []
+    //     _this.standModel = false;
+    //   }
+    // },
     //添加标准确定事件
     okStand(){
      if(this.standList.length > 0){