Merge branch 'develop' into 'test'

Develop

See merge request !94

src/pages/details/otherStandardDetails/index.vue

@@ -559,11 +559,11 @@
 
           </el-table-column>
           <el-table-column
-              prop="xcxssrq"
+              prop="xccssrq"
               label="新车型实施日期(文本)"
               width="180">
             <template slot-scope="scope">
-              <span>{{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format('YYYY-MM-DD') : '' }}</span>
+              <span>{{ scope.row.xccssrq ? $moment(scope.row.xccssrq).format('YYYY-MM-DD') : '' }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -2339,7 +2339,6 @@ export default {
         this.selectedItemList = []
         if (res.ok) {
           this.standItemList = res.data.list;
-          console.log(res.data);
           this.total7 = res.data.count // 分页需要
         }
       }, e => {

src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue

@@ -354,7 +354,6 @@
                         this.form.cid = data.cid
                         this.form.endTime = data.endTime
                         this.form.cname = data.cname
-                        console.log(data);
                         this.oldData = JSON.parse(JSON.stringify(data.summaryList))
                         data.summaryList.forEach( item => {
                             if (item.state) {

src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue

@@ -366,6 +366,7 @@
                         })
                         this.json = data
                         this.data = arr
+
                         this.oldData = data.oldinfo
                     }).catch(e => {
                     })

src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue

@@ -66,6 +66,7 @@
       </el-button>
     </div>
     <div class="container">
+      <loading :loading="tableLoading">数据获取中</loading>
       <el-table
         :data="sarAccessListDatas"
         tooltip-effect="dark"
@@ -220,6 +221,7 @@ export default {
         { value: "FOREIGN_LAWS", label: "国内外政策" },
         { value: "BUSINESS", label: "企业标准 " }
       ],
+      tableLoading: true,
       sarAccessInfoSearchList: [],
       selectedAccInfoSearchList: [],
       sarAccessInfoListArry: [],
@@ -259,8 +261,23 @@ export default {
         _this: this
       }, res => {
         this.sarAccessListDatas = res.data.records
+        this.sarAccessListDatas.forEach(item => {
+          // 国家地区转换
+          if (item.countryArea !== null || item.countryArea !== "") {
+            let k = (item.countryArea || "").split(',')
+            for (let i in this.countryOptions) {
+              for (let m = 0; m< k.length; m++) {
+                if (this.countryOptions[i].value === k[m]) {
+                  k[m]  = this.countryOptions[i].label
+                }
+                item.countryArea = k.join(',')
+              }
+            }
+          }
+        })
         this.sarSarAccessEOSearch.page = 1
         this.sarAccessListTotal = res.data.total
+        this.tableLoading = false
       }, e => {
 
       });
@@ -349,6 +366,9 @@ export default {
       })
     }
   },
+  created() {
+    this.searchSarAccess();
+  },
   mounted() {
     // 分页查询数据
     this.searchSarAccess();

src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue

@@ -57,6 +57,7 @@
       </el-button>
     </div>
     <div class="container">
+      <loading :loading="tableLoading">数据获取中</loading>
       <el-table
         :data="sarAccessListDatas"
         tooltip-effect="dark"
@@ -174,6 +175,7 @@ export default {
       sarAccessListDatas: [],
       sarAccessListTotal: 0,
       loading: false,
+      tableLoading: true,
       selectedList: [],
       // 新增、编辑 准入信息字段
       sarAccessEO: {
@@ -277,6 +279,7 @@ export default {
         this.sarAccessListDatas = res.data.records;
         this.sarSarAccessEOSearch.page = 1
         this.sarAccessListTotal = res.data.total;
+        this.tableLoading = false
       }, e => {
       });
 

src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue

@@ -67,6 +67,7 @@
       </el-button>
     </div>
     <div class="container">
+      <loading :loading="tableLoading">数据获取中</loading>
       <el-table
         :data="sarAccessListDatas"
         tooltip-effect="dark"
@@ -177,6 +178,7 @@ export default {
       sarAccessListDatas: [],
       sarAccessListTotal: 0,
       loading: false,
+      tableLoading: true,
       selectedList: [],
       // 新增、编辑 准入信息字段
       sarAccessEO: {
@@ -292,6 +294,7 @@ export default {
             }
           }
         })
+        this.tableLoading = false
         this.sarSarAccessEOSearch.page = 1
         this.sarAccessListTotal = res.data.total
       }, e => {
@@ -405,6 +408,7 @@ export default {
             }
           }
         })
+        this.tableLoading = false
         this.sarSarAccessEOSearch.page = 1
         this.sarAccessListTotal = res.data.total
       }, e => {

src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue

@@ -214,11 +214,7 @@
         </div>
       </div>
       <div class="footer">
-        <pagination
+        <pagination :total="total" @pageChange="pageChange" @pageSizeChange="pageSizeChange"></pagination>
-          :page="pageNo"
-          :total="total"
-          @pageChange="pageChange"
-          @pageSizeChange="pageSizeChange"></pagination>
         <el-drawer
           title='查看'
           :visible.sync="historySee"

src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue

@@ -60,6 +60,24 @@
                         align="center"
                         label="修改意见内容(包括理由或依据)"
                 >
+                    <el-table-column
+                            prop="oldText"
+                            align="center"
+                            label="修改前"
+                    >
+                    </el-table-column>
+                    <el-table-column
+                            prop="newText"
+                            align="center"
+                            label="修改后"
+                    >
+                    </el-table-column>
+                    <el-table-column
+                            prop="reason"
+                            align="center"
+                            label="修改理由"
+                    >
+                    </el-table-column>
                 </el-table-column>
                 <el-table-column
                         prop="deptName"
@@ -104,12 +122,18 @@
         >
             <div class="demo-drawer-content add-demo">
                 <div class="search-area">
-                    <el-form :model="opinionContent" ref="formAdd" :rules="opinionContentRules" class="label-input-form">
+                    <el-form style="width: 100%;" :model="opinionContent" ref="formAdd" :rules="opinionContentRules" class="label-input-form">
-                        <el-form-item label="章节编号" label-width="80px" prop="partCode" class="add-form-item">
+                        <el-form-item label="章节编号" label-width="" prop="partCode" class="add-form-item">
                             <el-input  v-model="opinionContent.partCode" autocomplete="off" placeholder="请输入章节编号"></el-input>
                         </el-form-item>
-                        <el-form-item label="修改意见内容(包括理由或依据)" prop="content" label-width="" class="add-form-item">
+                        <el-form-item label="修改前" prop="oldText" label-width="" class="add-form-item">
-                            <el-input :autosize="{ minRows: 2, maxRows: 8}" type="textarea" v-model="opinionContent.content" autocomplete="off" placeholder="请输入修改意见内容"></el-input>
+                            <el-input  v-model="opinionContent.oldText" autocomplete="off" placeholder="请输入"></el-input>
+                        </el-form-item>
+                        <el-form-item label="修改后" prop="newText" label-width="" class="add-form-item">
+                            <el-input  v-model="opinionContent.newText" autocomplete="off" placeholder="请输入"></el-input>
+                        </el-form-item>
+                        <el-form-item label="修改理由" prop="reason" label-width="" class="add-form-item">
+                            <el-input  v-model="opinionContent.reason" autocomplete="off" placeholder="请输入修改理由"></el-input>
                         </el-form-item>
                     </el-form>
                 </div>
@@ -139,14 +163,22 @@
                 isSubmit: false,
                 opinionContent: { // 抽屉数据
                     partCode: '',
-                    content: '',
+                    oldText: '',
+                    newText: '',
+                    reason: ''
                 },
                 opinionContentRules: {
                     partCode: [
                         { required: true, message: '请输入章节编号', trigger: 'blur' },
                     ],
-                    content: [
+                    oldText: [
-                        { required: true, message: '请输入修改意见内容(包括理由或依据)', trigger: 'blur' }
+                        { required: true, message: '请输入修改前内容', trigger: 'blur' }
+                    ],
+                    newText: [
+                        { required: true, message: '请输入修改后内容', trigger: 'blur' }
+                    ],
+                    reason: [
+                        { required: true, message: '请输入修改理由', trigger: 'blur' }
                     ],
                 },
                 standinfoList: [], // 详情列表
@@ -231,12 +263,16 @@
                     this.id = row.id
                     this.opiniontitle = '编辑意见内容'
                     this.opinionContent.partCode = row.partCode
-                    this.opinionContent.content = row.content
+                    this.opinionContent.reason = row.reason
+                    this.opinionContent.oldText = row.oldText
+                    this.opinionContent.newText = row.newText
                 } else {
                     this.id = ''
                     this.opiniontitle = '新增意见'
                     this.opinionContent.partCode = ''
-                    this.opinionContent.content = ''
+                    this.opinionContent.reason = ''
+                    this.opinionContent.oldText = ''
+                    this.opinionContent.newText = ''
                 }
                 this.isDialog = true
             },
@@ -275,6 +311,9 @@
                         var form = {
                             cid: this.$route.query.item.cid,
                             content: this.opinionContent.content,
+                            oldText: this.opinionContent.oldText,
+                            newText: this.opinionContent.newText,
+                            reason: this.opinionContent.reason,
                             partCode: this.opinionContent.partCode,
                             userId: this.$store.getters.userInfo.userId || '',
                             userName: this.$store.getters.userInfo.userName || '',