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

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -623,6 +623,7 @@
         </div>
       </el-drawer>
       <!-- 新增海外标准 -->
+<!--      编辑海外标准-->
       <el-drawer
         :title="modalshowtitle"
         :visible.sync="modalshowflag"
@@ -680,7 +681,6 @@
                         :value="item.value"
                         :label="item.label"
                     >
-                      {{ item.label }}
                     </el-option>
                   </el-select>
                 </el-form-item>
@@ -943,6 +943,7 @@
             </template>
           </el-form>
         </div>
+<!--        提交/取消-->
         <div class="demo-drawer-footer">
           <el-button v-show="modalshowtitle === '新增海外标准'" type="primary" size="mini" class="common-button-primary" icon="el-icon-check" @click="saveBt">保存</el-button>
           <el-button size="mini" class="common-button-primary" icon="el-icon-check" type="primary" @click="saveOrUpdateStands" :loading="isSubmit">提交</el-button>
@@ -2431,7 +2432,7 @@ export default {
             console.log(formFieldList, 'AAAAAAAAAAAAAAAAAAAAA')
           this.sarStandardsInfoEO = JSON.parse(JSON.stringify(item))
           this.defaultCheckedKeys = [this.sarStandardsInfoEO.standSystem];
-          if(item.country !== undefined && item.country !== null){
+          if(item.country !== undefined && item.country !== null && item.country !== ''){
             this.sarStandardsInfoEO.country = item.country.split(",");
           }
           this.sarStandardsInfoEO.standSort = item.standSort
@@ -3139,6 +3140,8 @@ export default {
                               sarStandAttrObj[item.attrField] = nowstandinfo[item.attrField]
                           })
                           nowstandinfo['sarStandAttrEOStr'] = JSON.stringify(sarStandAttrObj).replace(/"/g, "'")
+                        console.log("nowstandinfo");
+                        console.log(nowstandinfo);
                           this.$http.postData(this.addOrUPdateFlag === 1 ? 'sarStandardsInfo/sar-standards-info/addarStandardsInfo' : 'sarStandardsInfo/sar-standards-info/updateSarStandardsInfo', nowstandinfo, {
                               _this: this
                           }, res => {