From 5674737c404a3e7cc9b34ab7921bad3d1452ade1 Mon Sep 17 00:00:00 2001
From: "Mr.Z" <709235321@qq.com>
Date: Wed, 18 Aug 2021 13:06:10 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=A7=A3=E8=AF=BB=E5=86=85=E5=AE=B9?=
 =?UTF-8?q?=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/details/otherStandardDetails/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index 1ae32f44e..99e9ee793 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -552,7 +552,7 @@
             </template>
           </el-table-column>
           <el-table-column
-              prop="interpretationContent"
+              prop="readContent"
               label="解读内容"
               show-overflow-tooltip
           >

From 366dfbb509195a95538eb193f351ce7f8376aea2 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Wed, 18 Aug 2021 13:13:59 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B=20?=
 =?UTF-8?q?=E5=9B=BD=E5=AE=B6/=E5=9C=B0=E5=8C=BA=E5=A4=9A=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzrk/step1.vue         | 42 +++++++++++++++++--
 .../pages/creatProcess/bzrk/step2.vue         | 16 ++++++-
 .../pages/creatProcess/bzrk/step3.vue         |  8 +++-
 .../pages/creatProcess/bzrk/step4.vue         | 20 ++++++++-
 .../foreignStandardsAndRegulations/index.vue  |  7 +++-
 5 files changed, 85 insertions(+), 8 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index bb62223f3..ebb987a99 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -80,15 +80,29 @@
                             <el-col :span="12">
 
 
-                              <el-form-item v-if="form.standInData=='1'" label="国家/地区" prop="country" class="add-form-item form-item-disabled">
-                                <el-select :popper-append-to-body="false" v-model="form.country" placeholder="国家/地区">
+<!--                              <el-form-item v-if="form.standInData=='1'" label="国家/地区" prop="country" class="add-form-item form-item-disabled">-->
+<!--                                <el-select :popper-append-to-body="false" v-model="form.country"  placeholder="国家/地区">-->
+<!--                                  <el-option-->
+<!--                                      v-for="item in countryOptions"-->
+<!--                                      placeholder="请选择"-->
+<!--                                      :key="item.value"-->
+<!--                                      :value="item.value"-->
+<!--                                      :label="item.label"-->
+<!--                                  ></el-option>-->
+<!--                                </el-select>-->
+<!--                              </el-form-item>-->
+
+
+                              <el-form-item v-if="form.standInData=='1'"label="国家/地区" prop="" label-width="150px" class="add-form-item">
+                                <el-select v-model="form.country" multiple filterable clearable>
                                   <el-option
                                       v-for="item in countryOptions"
                                       placeholder="请选择"
                                       :key="item.value"
                                       :value="item.value"
                                       :label="item.label"
-                                  ></el-option>
+                                  >
+                                  </el-option>
                                 </el-select>
                               </el-form-item>
 
@@ -892,6 +906,7 @@
                 </el-collapse-item>
             </el-collapse>
         </div>
+<!--        保存||提交-->
         <ProcessFooter
                 v-show="verifySarStandard"
                 show-save
@@ -1354,6 +1369,7 @@
                 fileUrl: 'api/att/attFile/upload',
                 fileMadel: false,
                 fileType: '',
+                countryArr:'',
                 form: {
                     // 基础信息
                     textStatus: '', // 文本状态
@@ -1509,6 +1525,20 @@
             }
         },
         watch:{
+          'form.country': {
+            handler (val) {
+              console.log("val")
+              if (val !== '' && val !== null && typeof (val) !== 'undefined') {
+                if (val instanceof Array) {
+                  this.countryArr = val.join(",");
+                } else {
+                  this.countryArr = val
+                }
+              } else if (val === '') {
+                this.countryArr = []
+              }
+            }
+          },
           filterText(val) {
             this.$refs.tree.filter(val);
           },
@@ -2252,6 +2282,11 @@
             },
             //保存
             handleSave() {
+              this.form.country=this.countryArr;
+              // if(item.country !== undefined && item.country !== null){
+              //   this.sarStandardsInfoEO.country = item.country.split(",");
+              // }
+
                 this.saveLoading = true
                 let _formData = new FormData()
                 // _formData.append('id', this.bpnId)
@@ -2280,6 +2315,7 @@
                 })
             },
             handleSubmit() {
+              this.form.country=this.countryArr;
                 this.$refs['form'].validate((valid) => {
                     if (valid) {
                         this.$refs['userForm'].validate((valid) => {
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
index 4ef370645..2e5e7caad 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
@@ -33,7 +33,7 @@
 
 
                               <el-form-item v-if="form.standInData=='1'" label="国家/地区" prop="country" class="add-form-item form-item-disabled">
-                                <el-select :popper-append-to-body="false" v-model="form.country" placeholder="国家/地区" disabled>
+                                <el-select :popper-append-to-body="false" v-model="form.country" placeholder="国家/地区" multiple disabled>
                                   <el-option
                                       v-for="item in countryOptions"
                                       placeholder="请选择"
@@ -680,6 +680,7 @@
             <loading :loading="loading">流程列表加载中</loading>
           </div>
         </div>
+<!--      提交-->
         <ProcessFooter
                 :show-save="false"
                 show-submit
@@ -1006,6 +1007,9 @@
                     this.defaultCheckedKeys3 = [this.form.dybxh]
                     this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN'
                     this.form.standYear = this.form.standYear ? parseInt(this.form.standYear) : ''
+                  if( this.form.country !== undefined &&   this.form.country !== null &&   this.form.country !== ''){
+                    this.form.country=this.form.country.split(",");
+                  }
                     this.form.prcNum = this.prcNum
                     this.form.prcName = this.prcName
                     this.form['id'] = item.id
@@ -1030,6 +1034,16 @@
             },
             handleSave() {},
             handleSubmit() {
+              const val= this.form.country;
+              if (val !== '' && val !== null && typeof (val) !== 'undefined') {
+                if (val instanceof Array) {
+                  this.form.country = val.join(",");
+                } else {
+                  this.form.country = val
+                }
+              } else if (val === '') {
+                this.form.country = []
+              }
               this.$refs['formTongGuo'].validate((valid) => {
                     if (valid) {
                       this.isSubmit = true
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
index eaf8c0817..983b1fe33 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
@@ -33,7 +33,7 @@
 
 
                 <el-form-item v-if="form.standInData=='1'" label="国家/地区" prop="country" class="add-form-item form-item-disabled">
-                  <el-select :popper-append-to-body="false" v-model="form.country" placeholder="国家/地区" disabled>
+                  <el-select :popper-append-to-body="false" v-model="form.country" placeholder="国家/地区" multiple disabled>
                     <el-option
                         v-for="item in countryOptions"
                         placeholder="请选择"
@@ -956,6 +956,8 @@ export default {
     getFormFieldList (item) {
       this.$nextTick(() => {
         this.form = JSON.parse(JSON.stringify(item))
+        console.log("this.form");
+        console.log(this.form);
         this.defaultCheckedKeys = [this.form.standSystem]
         this.defaultCheckedKeys1 = [this.form.cycvppsbm]
         this.defaultCheckedKeys2 = [this.form.kccvppsbm]
@@ -964,6 +966,10 @@ export default {
         this.form.standYear = this.form.standYear ? parseInt(this.form.standYear) : ''
         this.form.prcNum = this.prcNum
         this.form.prcName = this.prcName
+        if( this.form.country !== undefined &&   this.form.country !== null &&   this.form.country !== ''){
+          this.form.country=this.form.country.split(",");
+        }
+
         this.form['id'] = item.id
         this.$forceUpdate()
       })
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
index b8ec12e52..4ab71a53d 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
@@ -32,7 +32,7 @@
                   </el-radio-group>
                 </el-form-item>
                 <el-form-item v-if="form.standInData=='1'" label="国家/地区" prop="country" class="add-form-item form-item-disabled">
-                  <el-select :popper-append-to-body="false" v-model="form.country" placeholder="国家/地区">
+                  <el-select :popper-append-to-body="false" v-model="form.country" placeholder="国家/地区" multiple>
                     <el-option
                         v-for="item in countryOptions"
                         placeholder="请选择"
@@ -912,6 +912,7 @@
         <loading :loading="loading">流程列表加载中</loading>
       </div>
     </div>
+<!--    提交-->
     <ProcessFooter
         show-save
         show-submit
@@ -1060,6 +1061,7 @@ export default {
   },
   data () {
     return {
+      countryArr:'',
       activeName:'1',
       // 当前流程类型(1待办/2已办)
       processType: 1,
@@ -1693,6 +1695,7 @@ export default {
       this.active = name
     },
     handleSave() {
+      this.form.country=this.countryArr;
       this.saveLoading = true
       let _formData = new FormData()
       // _formData.append('id', this.bpnId)
@@ -1714,6 +1717,7 @@ export default {
       })
     },
     handleSubmit() {
+      this.form.country=this.countryArr;
       this.$refs['form'].validate((valid) => {
           if (valid) {
             this.isSubmit = true
@@ -1795,6 +1799,20 @@ export default {
     this.modelFunc()
   },
   watch:{
+
+    'form.country': {
+      handler (val) {
+        if (val !== '' && val !== null && typeof (val) !== 'undefined') {
+          if (val instanceof Array) {
+            this.countryArr = val.join(",");
+          } else {
+            this.countryArr = val
+          }
+        } else if (val === '') {
+          this.countryArr = []
+        }
+      }
+    },
     form(val){
       if(this.form){
 
diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
index e2297f63a..d6a4891a2 100644
--- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+++ b/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 => {