52772 标准化活动日历位置调整

src/components/navMenu/index.vue

@@ -286,11 +286,11 @@
                 path: '/standContrast',
                 menuId: '1d83a6278f781419f628e9f5560f5c86'
               },
-              {
+              // {
-                title: '标准化活动日历',
+              //   title: '标准化活动日历',
-                path: '/standCalendar',
+              //   path: '/standCalendar',
-                menuId: '5e834b3fca90619e593ad0ee83263885'
+              //   menuId: '5e834b3fca90619e593ad0ee83263885'
-              },
+              // },
               // {
               //   title: '标准比对库',
               //   path: '/standardComparisonLibrary',

src/pages/processCenter/pages/phone/bzrk/step2.vue

@@ -812,6 +812,8 @@ export default {
             // jdwjFileMap: {},
             this.kwjFileMap = this.assemble(processForm.kwj, processForm.kwjName);
             // kwjFileMap: {},
+            this.xdbFileMap = this.assemble(processForm.xdb, processForm.xdbName);
+            // xdbFileMap: {},
             this.glwjFileMap = this.assemble(processForm.glwj, processForm.glwjName);
             // glwjFileMap: {},
             this.caFileMap = this.assemble(processForm.ca, processForm.caName);
@@ -830,14 +832,19 @@ export default {
     getFormFieldList(item) {
       this.$nextTick(() => {
         this.form = JSON.parse(JSON.stringify(item))
-/*        console.log(this.form)
+        let wssmrName = this.form.wssmrname || this.form.wssmr
+        this.form.wssmr = wssmrName
+        this.form.sycpx = this.form.sycpx && this.form.sycpx !== [] ? this.form.sycpx : ''
+        this.form.nylx = this.form.nylx && this.form.nylx !== [] ? this.form.nylx : ''
+        this.form.cllx = this.form.cllx && this.form.cllx !== [] ? this.form.cllx: ''
+        this.form.syrz = this.form.syrz && this.form.syrz !== [] ? this.form.syrz : ''
         this.defaultCheckedKeys = [this.form.standSystem]
         this.defaultCheckedKeys1 = [this.form.cycvppsbm]
         this.defaultCheckedKeys2 = [this.form.kccvppsbm]
-        this.defaultCheckedKeys3 = [this.form.dybxh]*/
+        this.defaultCheckedKeys3 = [this.form.dybxh]
         this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN'
-        this.form.standYear = this.form.standYear ? parseInt(this.form.standYear) : ''
+        this.form.standYear = this.form.standYear ? this.form.standYear : ''
-        if (this.form.country !== undefined && this.form.country !== null && this.form.country !== '') {
+        if (this.form.country) {
           this.form.country = this.form.country.split(",");
         }
         this.form.prcNum = this.prcNum
@@ -881,16 +888,6 @@ export default {
       this.handleSubmit()
     },
     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.isSubmit = true;
       this.form.commentText = this.commentText;
       this.form.approvalOpinion = this.formTongGuo.approvalOpinion;

src/pages/regulatoryRepository/workingGroup/index.vue

@@ -14,7 +14,10 @@
 <!--                <workingGroup2 v-if="activeName === 'workingGroup2'"></workingGroup2>-->
 <!--            </el-tab-pane>-->
         </el-tabs>
-      <el-button size="mini" type="primary" @click="statisticsBtn" v-btn-permission="'2331baafd7d298b87ab3c0b5430d608d'" class="statistics">工作组统计</el-button>
+      <div class="statistics">
+        <el-button size="mini" type="primary" @click="calendarBtn" v-btn-permission="'5e834b3fca90619e593ad0ee83263885'" >标准化活动日历</el-button>
+        <el-button size="mini" type="primary" @click="statisticsBtn" v-btn-permission="'2331baafd7d298b87ab3c0b5430d608d'">工作组统计</el-button>
+      </div>
     </div>
 </template>
 <script>
@@ -36,7 +39,10 @@
             this.$router.push({
               name: 'dataStatisComments'
             })
-          }
+          },
+          calendarBtn(){
+           this.$router.push('/standCalendar')
+          },
         },
         mounted() {},
         beforeDestroy() {}