Merge branch 'develop' into 'test'

Develop

See merge request !79

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

@@ -78,6 +78,21 @@
                                 </el-form-item>
                             </el-col>
                             <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-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 label="标准类别" prop="standSort" class="add-form-item form-item-disabled">
                                     <el-select :popper-append-to-body="false" v-model="form.standSort" placeholder="请选择标准类别">
                                         <el-option
@@ -1463,6 +1478,7 @@
                 },
                 zrUserIds: [], // 选择多个会签责任人
                 userType:'', // 选择用户ID判断
+                countryOptions:[],//国家地区
                 standSortOptions: [], // 标准类别
                 standNatureOptions: [], // 标准性质
                 standStateOptions: [], // 文本状态
@@ -2331,6 +2347,7 @@
             this.$http.get('sys/dictype/getDicTypeListCode', '', {
                 _this: this
             }, res => {
+                 this.countryOptions=res.data.COUNTRY//国家地区
                 this.standSortOptions = res.data.STANDCLASSIFY // 标准类别
                 this.standNatureOptions = res.data.SARPROPERTY // 标准性质
                 this.standStateOptions = res.data.WBZTCLASS // 文本状态

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

@@ -31,6 +31,19 @@
                     <el-radio label="1">海外标准入库</el-radio>
                   </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-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 label="标准类别" prop="standSort" class="add-form-item form-item-disabled">
                   <el-select v-model="form.standSort" placeholder="请选择标准类别">
                     <el-option
@@ -1230,6 +1243,7 @@ export default {
         prcName:'',
         standType: '',
       }, // 标准信息
+      countryOptions:[],//国家地区
       standSortOptions: [], // 标准类别
       standNatureOptions: [], // 标准性质
       standStateOptions: [], // 文本状态
@@ -1753,6 +1767,7 @@ export default {
     this.$http.get('sys/dictype/getDicTypeListCode', '', {
       _this: this
     }, res => {
+      this.countryOptions=res.data.COUNTRY//国家地区
       this.standSortOptions = res.data.STANDCLASSIFY // 标准类别
       this.standNatureOptions = res.data.SARPROPERTY // 标准性质
       this.standStateOptions = res.data.WBZTCLASS // 文本状态

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -3093,6 +3093,7 @@ export default {
       },
     // 表格排序
     sortChange (sortObj) {
+      console.log(sortObj.column+"======"+sortObj.column.property+"======"+sortObj.column.order);
       if (sortObj.column.order !== 'normal') {
         this.nowOrder = ''
         this.orderBy = ''
@@ -3125,7 +3126,7 @@ export default {
               this.nowOrder=1
             }
             break
-          case 'standStateShow' :
+          case 'textStatus' :
             this.orderBy = 5;
             this.nowOrder = sortObj.column.order
             if (this.nowOrder === 'ascending'){
@@ -3134,6 +3135,16 @@ export default {
               this.nowOrder=1
             }
             break
+          case 'SSRQ' :
+            this.orderBy = 6;
+            this.nowOrder = sortObj.column.order
+            if (this.nowOrder === 'ascending'){
+              this.nowOrder=2
+            }else if (this.nowOrder === 'descending') {
+              this.nowOrder=1
+            }
+            break
+
         }
       }
       this.getDomesticStandardTable()