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

src/pages/details/otherStandardDetails/index.vue

@@ -425,7 +425,7 @@
     <div v-show="!isMoreAwayBtn" class="more" @click="moreClick">更多<img src="@/assets/images/shangqi/img/more.png">
     </div>
     <!--    <div v-show="isMoreAwayBtn" class="put-away" @click="putAwayClick">收起<img src="@/assets/images/shangqi/img/more.png"></div>-->
-    <!--查看标准条款列表-->
+    <!--查看分解单-->
     <el-drawer
         title="查看分解单"
         :wrapperClosable="false"
@@ -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
@@ -819,9 +819,9 @@
         <div class="see-drawer-div">
           <label class="see-drawer-name" title="解读内容">解读内容</label>
           <span class="see-drawer-val"
-                :title="standShowItemEO.interpretationContent ? standShowItemEO.interpretationContent.replace(/<.*?>/ig, ' ') : ''">
+                :title="standShowItemEO.readContent ? standShowItemEO.readContent.replace(/<.*?>/ig, ' ') : ''">
             {{
-              standShowItemEO.interpretationContent ? standShowItemEO.interpretationContent.replace(/<.*?>/ig, ' ') : ''
+              standShowItemEO.readContent ? standShowItemEO.readContent.replace(/<.*?>/ig, ' ') : ''
             }}</span>
         </div>
 
@@ -1251,6 +1251,7 @@ export default {
       knowIdList: '',
       total7: 0,
       page7: 1,
+      pageSize7: this.$store.getters.userInfo.configContent,
       addForm: {
         title: '',
         content: '',
@@ -2331,12 +2332,14 @@ export default {
     selectSarStandItems(id, flag) {
       this.standItemSearch.standId = this.sarStandardsInfoEO.id
       this.standItemSearch.fileType = this.fileType
-      this.$http.get('SarStandItems/sar-stand-items/querySarItemAndInterpretation', this.standItemSearch, {}, res => {
+      this.$http.get('SarStandItems/sar-stand-items/querySarItemAndInterpretation', {
+        ...this.standItemSearch,
+        pageSize: this.pageSize7, page: this.page7,
+      }, {}, res => {
         this.selectedItemList = []
         if (res.ok) {
-          this.standItemList = res.data;
+          this.standItemList = res.data.list;
-          console.log(res.data);
+          this.total7 = res.data.count // 分页需要
-          this.total7 = res.data.length // 分页需要
         }
       }, e => {
       })

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

@@ -1224,6 +1224,7 @@ export default {
     },
     //添加标准确定事件
     okStand() {
+      this.getStandData();
       if (this.standList.length < 1) {
         this.$message.warning("请选择需要添加进清单的数据");
       } else {

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"
@@ -83,7 +84,7 @@
             align="center">
         </el-table-column>
         <el-table-column
-          prop="countryArea"
+            prop="countryAreaShow"
             label="国家/地区"
             align="center">
         </el-table-column>
@@ -113,7 +114,8 @@
             align="center">
           <template slot-scope="scope">
             <span
-              v-if="scope.row.detailedListVision != null && scope.row.detailedListVision !== ''">{{ scope.row.detailedListVision
+                v-if="scope.row.detailedListVision != null && scope.row.detailedListVision !== ''">{{
+                scope.row.detailedListVision
               }}</span>
           </template>
         </el-table-column>
@@ -122,7 +124,10 @@
             label="更新时间"
             align="center">
           <template slot-scope="scope">
-            <div>{{ scope.row.updateTime ? $moment(scope.row.updateTime).format('YYYY-MM-DD')  : scope.row.updateTime }}</div>
+            <div>{{
+                scope.row.updateTime ? $moment(scope.row.updateTime).format('YYYY-MM-DD') : scope.row.updateTime
+              }}
+            </div>
           </template>
         </el-table-column>
         <el-table-column
@@ -136,11 +141,14 @@
               <el-dropdown trigger="click" @command="handleCommand">
                 <i class="iconfont">&#xe61e;</i>
                 <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="'b736f2469d49b3214cc8087419a24b60'">查看
+                  <el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="'b736f2469d49b3214cc8087419a24b60'">
+                    查看
                   </el-dropdown-item>
-                  <el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'4733577057bf2470fc5c1f88d81eaf1d'">编辑
+                  <el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'4733577057bf2470fc5c1f88d81eaf1d'">
+                    编辑
                   </el-dropdown-item>
-                  <el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="'ff411226afb759fd2f4a2798ceac322a'">删除
+                  <el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="'ff411226afb759fd2f4a2798ceac322a'">
+                    删除
                   </el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
@@ -220,6 +228,7 @@ export default {
         {value: "FOREIGN_LAWS", label: "国内外政策"},
         {value: "BUSINESS", label: "企业标准 "}
       ],
+      tableLoading: true,
       sarAccessInfoSearchList: [],
       selectedAccInfoSearchList: [],
       sarAccessInfoListArry: [],
@@ -258,7 +267,25 @@ export default {
       }, {
         _this: this
       }, res => {
-        this.sarAccessListDatas = res.data.records
+        let arr = res.data.records;
+        console.log('271', arr)
+        arr.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.countryAreaShow = k.join(',')
+              }
+            }
+          }
+        })
+        console.log('286',arr)
+        this.sarAccessListDatas = arr
+        this.tableLoading = false
         this.sarSarAccessEOSearch.page = 1
         this.sarAccessListTotal = res.data.total
       }, e => {
@@ -349,6 +376,9 @@ export default {
       })
     }
   },
+  created() {
+    this.searchSarAccess();
+  },
   mounted() {
     // 分页查询数据
     this.searchSarAccess();
@@ -380,6 +410,7 @@ export default {
     flex: auto;
     width: 100%;
     height: calc(100% - 110px) !important;
+
     .pagination {
       position: static;
 

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/accessStandardsAndRegulations/pages/addEdit.vue

@@ -6,7 +6,8 @@
       <el-divider content-position="left">基础信息</el-divider>
       <div class="search-area">
         <div class="left">
-          <el-form inline :model="sarAccessEO" ref="sarAccessForm" class="label-input-form" :rules="sarAccessEORules" label-width="80px">
+          <el-form inline :model="sarAccessEO" ref="sarAccessForm" class="label-input-form" :rules="sarAccessEORules"
+                   label-width="80px">
             <el-form-item label="清单名称" prop="detailedListName" class="search-item">
               <el-input v-model="sarAccessEO.detailedListName" :disabled="disabledFlag" placeholder="请输入"></el-input>
             </el-form-item>
@@ -100,14 +101,17 @@
               <el-button
                   class="common-button-default"
                   size="small"
-                  @click="clearSearchLaws">清空</el-button>
+                  @click="clearSearchLaws">清空
+              </el-button>
             </el-form-item>
             <el-form-item>
-              <el-button type="primary" v-if="showSelectBox" class="common-button-primary" size="mini" @click="selectMoreBtn">
+              <el-button type="primary" v-if="showSelectBox" class="common-button-primary" size="mini"
+                         @click="selectMoreBtn">
                 <i class="iconfont">&#xe7a5;</i>
                 高级查询
               </el-button>
-              <el-button type="primary" v-if="!showSelectBox" class="common-button-primary" size="mini" @click="selectMoreBtn">
+              <el-button type="primary" v-if="!showSelectBox" class="common-button-primary" size="mini"
+                         @click="selectMoreBtn">
                 <i class="iconfont">&#xe7a5;</i>
                 高级查询
               </el-button>
@@ -141,18 +145,21 @@
       <div class="action-bar">
         <el-button
             class="common-button-default"
-            size="mini" @click="addSarAccess">添加</el-button>
+            size="mini" @click="addSarAccess">添加
+        </el-button>
         <el-button
             class="common-button-default"
             v-if="showTableFlag"
             size="mini" @click="isShowTable"
-        >{{$t('m.showAddDataList')}}</el-button>
+        >{{ $t('m.showAddDataList') }}
+        </el-button>
         <el-button
             class="common-button-default"
             v-if="!showTableFlag"
             size="mini"
             @click="isShowTable"
-        >{{$t('m.hideAddDataList')}}</el-button>
+        >{{ $t('m.hideAddDataList') }}
+        </el-button>
       </div>
       <div class="standards-drawer-table standards-drawer-table-one" v-if="!showTableFlag">
         <el-table
@@ -245,13 +252,15 @@
             class="common-button-default export-button"
             size="mini" @click="exportAccessInfo('apart')"
             v-btn-permission="''"
-        ><i class="iconfont">&#xe6e9;</i>导出</el-button>
+        ><i class="iconfont">&#xe6e9;</i>导出
+        </el-button>
         <el-button
             class="common-button-default delete-button"
             size="mini" @click="deleteSelectSarAccessInfo"
             v-if="!disabledFlag"
             v-btn-permission="''"
-        ><i class="iconfont">&#xe61b;</i>删除</el-button>
+        ><i class="iconfont">&#xe61b;</i>删除
+        </el-button>
       </div>
       <!--   清单条目的列表页   -->
       <el-table
@@ -395,26 +404,33 @@
                 type="primary"
                 size="small" @click="moveUp(scope.$index, scope.row)"
                 v-if="!disabledFlag"
-            >上移</el-button>
+            >上移
+            </el-button>
             <el-button
                 class="common-button-default"
                 type="danger"
                 size="small" @click="moveDown(scope.$index, scope.row)"
                 v-if="!disabledFlag"
-            >下移</el-button>
+            >下移
+            </el-button>
             <el-button
                 size="small"
                 @click="editTghisRow(scope.row)"
                 class="common-button-default"
                 type="warning"
-            >编辑</el-button>
+            >编辑
+            </el-button>
           </template>
         </el-table-column>
       </el-table>
     </div>
     <div class="footer">
-      <el-button class="common-button-primary" icon="el-icon-check" size="mini" type="primary" @click="saveSarAccess" v-if="!disabledFlag" :loading="loadData">{{$t('m.submit')}}</el-button>
+      <el-button class="common-button-primary" icon="el-icon-check" size="mini" type="primary" @click="saveSarAccess"
-      <el-button class="common-button-default" icon="el-icon-close" size="mini" @click="backCancal" v-if="!disabledFlag">{{$t('m.cancel')}}</el-button>
+                 v-if="!disabledFlag" :loading="loadData">{{ $t('m.submit') }}
+      </el-button>
+      <el-button class="common-button-default" icon="el-icon-close" size="mini" @click="backCancal"
+                 v-if="!disabledFlag">{{ $t('m.cancel') }}
+      </el-button>
     </div>
     <el-dialog :visible.sync="exportTestItemNameFlag" title="导出文件" width="300px">
       <el-form :inline="true" class="label-input-form search-area">
@@ -424,7 +440,8 @@
       </el-form>
       <span slot="footer" class="demo-drawer-footer">
         <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancal">取消</el-button>
-        <el-button type="primary" size="mini" class="common-button-primary" icon="el-icon-check" @click="exportTestItem">提交</el-button>
+        <el-button type="primary" size="mini" class="common-button-primary" icon="el-icon-check"
+                   @click="exportTestItem">提交</el-button>
       </span>
     </el-dialog>
     <!--导入模态框-->
@@ -517,14 +534,16 @@
             size="mini"
             icon="el-icon-check"
             @click="saveInfo"
-          >提交</el-button
+        >提交
+        </el-button
         >
         <el-button
             size="mini"
             icon="el-icon-close"
             class="common-button-default"
             @click="cancelInfo"
-          >取消</el-button
+        >取消
+        </el-button
         >
       </div>
     </el-drawer>
@@ -553,6 +572,7 @@ import stand from "../../../config/pages/attributeCustom/components/stand";
 import {mapGetters} from 'vuex'
 import {dicTypeData, StandardsInfoPage} from '@/api/unqualProcess'
 import {interfaceUrl} from "@/sysConfig";
+
 export default {
   name: 'ListOfStandardsAndRegulationsDetails',
   components: {
@@ -1229,7 +1249,8 @@ export default {
           })
           this.sarAccessInfoListArry = []
           this.$refs.entryTable.clearSelection()
-        }).catch(() => {})
+        }).catch(() => {
+        })
       } else {
         this.$message.error('请选择需要删除的清单条目!')
       }
@@ -1296,23 +1317,42 @@ export default {
             // 新增
             sarAccessEO.state = '1'
             sarAccessEO.version = 0
+            if (this.sarAccessInfoList.length !== 0) {
               this.$http.post('sarLawsDetailedList/sar-laws-detailed-list/insertList', sarAccessEO, {
                 _this: this,
                 loading: 'loadData'
               }, res => {
-              if (this.sarAccessInfoList.length !== 0) {
                 if (res.ok) {
+                  if (res.data === "数据库为空，添加成功") {
                     this.$message.success('新增成功')
                     this.isNext = true
                     this.$router.push({
                       name: 'AccessStandardsAndRegulations'
                     })
+                  } else if (res.data === "车型类别清单添加成功") {
+                    this.$message.success('新增成功')
+                    this.isNext = true
+                    this.$router.push({
+                      name: 'AccessStandardsAndRegulations'
+                    })
+                  } else if (res.data === "车型类别清单添加失败") {
+                    this.$message.error('已存在此车型类别清单，新增失败')
+                  } else if (res.data === "国家/地区清单添加成功") {
+                    this.$message.success('新增成功')
+                    this.isNext = true
+                    this.$router.push({
+                      name: 'AccessStandardsAndRegulations'
+                    })
+                  } else if (res.data === "国家/地区清单添加失败") {
+                    this.$message.error('已存在此国家/地区清单，新增失败')
                   }
+                }
+              }, e => {
+                console.log(e)
+              })
             } else {
               this.$message.error('请选中需要添加到 清单条目 的(标准号/政策编号)')
             }
-            }, e => {
-            })
           } else {
             // 编辑
             this.$http.putData('sarLawsDetailedList/sar-laws-detailed-list/updateList', sarAccessEO, {
@@ -1320,11 +1360,12 @@ export default {
               loading: 'loadData'
             }, res => {
               if (res.ok) {
-                //this.$message.success('编辑成功')
+                this.$message.success('修改成功')
-                this.isNext = true
                 this.$router.push({
                   name: 'AccessStandardsAndRegulations'
                 })
+              } else {
+                this.$message.error('已存在此国家/地区清单，修改失败')
               }
             }, e => {
             })
@@ -1334,6 +1375,120 @@ export default {
         }
       })
     },
+    // saveSarAccess () {
+    //   this.$refs['sarAccessForm'].validate((valid) => {
+    //     if (valid) {
+    //       let rowlist = []
+    //       let rowlist1 = []
+    //       let rowlist2 = []
+    //       let rowlist3 = []
+    //       for (let i = 0; i < this.sarAccessInfoList.length; i++) {
+    //         rowlist.push(this.sarAccessInfoList[i].id)
+    //         if (this.sarAccessInfoList[i].ssrq === null)  {
+    //           rowlist1.push(this.sarAccessInfoList[i].ssrq = '-')
+    //         }else {
+    //           rowlist1.push(this.sarAccessInfoList[i].ssrq.toString())
+    //         }
+    //        if (this.sarAccessInfoList[i].xcxssrqgj === null) {
+    //          rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '-')
+    //        }else {
+    //          rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj.toString())
+    //        }
+    //        if (this.sarAccessInfoList[i].zccssrqgj === null) {
+    //          rowlist2.push(this.sarAccessInfoList[i].zccssrqgj = '-')
+    //        }else {
+    //          rowlist2.push(this.sarAccessInfoList[i].zccssrqgj.toString())
+    //        }
+    //       }
+    //       rowlist = rowlist.join(',')
+    //       rowlist1 = rowlist1.join(',')
+    //       rowlist2 = rowlist2.join(',')
+    //       rowlist3 = rowlist3.join(',')
+    //       let sarAccessEO = JSON.parse(JSON.stringify(this.sarAccessEO))
+    //       sarAccessEO.inforlist = rowlist
+    //       sarAccessEO.inforlist1 = rowlist1
+    //       sarAccessEO.inforlist2 = rowlist2
+    //       sarAccessEO.inforlist3 = rowlist3
+    //       sarAccessEO.countryArea = sarAccessEO.countryArea.join(',')
+    //       // sarAccessEO.applicationScope = sarAccessEO.applicationScope.join(',')
+    //       // 判断是否有附件
+    //       if (this.fileInfoList.length > 0) {
+    //         let relateFile = []
+    //         this.fileInfoList.map(item => {
+    //           relateFile.push(item.id)
+    //         })
+    //         sarAccessEO.fileIds = relateFile.join(',')
+    //       }
+    //       if (!sarAccessEO.id) {
+    //         // 新增
+    //         sarAccessEO.state = '1'
+    //         sarAccessEO.version = 0
+    //         this.$http.post('sarLawsDetailedList/sar-laws-detailed-list/insertList', sarAccessEO, {
+    //           _this: this,
+    //           loading: 'loadData'
+    //         }, res => {
+    //           if (this.sarAccessInfoList.length !== 0) {
+    //             if (res.ok) {
+    //               if (res.data === "数据库为空，添加成功"){
+    //                 this.$message.success('新增成功')
+    //                 this.isNext = true
+    //                 this.$router.push({
+    //                   name: 'AccessStandardsAndRegulations'
+    //                 })
+    //               }
+    //               else if (res.data === "其他清单添加成功"){
+    //                 this.$message.success('新增成功')
+    //                 this.isNext = true
+    //                 this.$router.push({
+    //                   name: 'AccessStandardsAndRegulations'
+    //                 })
+    //               }
+    //               else if (res.data === "车型类别清单添加成功"){
+    //                 this.$message.success('新增成功')
+    //                 this.isNext = true
+    //                 this.$router.push({
+    //                   name: 'AccessStandardsAndRegulations'
+    //                 })
+    //               }else if(res.data === "车型类别清单添加失败"){
+    //                 this.$message.error('已存在此车型类别清单，新增失败')
+    //               }
+    //               else if (res.data === "国家/地区清单添加成功"){
+    //                 this.$message.success('新增成功')
+    //                 this.isNext = true
+    //                 this.$router.push({
+    //                   name: 'AccessStandardsAndRegulations'
+    //                 })
+    //               }else if(res.data === "国家/地区清单添加失败"){
+    //                 this.$message.error('已存在此国家/地区清单，新增失败')
+    //               }
+    //
+    //             }
+    //           } else {
+    //             this.$message.error('请选中需要添加到 清单条目 的(标准号/政策编号)')
+    //           }
+    //         }, e => {
+    //         })
+    //       } else {
+    //         // 编辑
+    //         this.$http.putData('sarLawsDetailedList/sar-laws-detailed-list/updateList', sarAccessEO, {
+    //           _this: this,
+    //           loading: 'loadData'
+    //         }, res => {
+    //           if (res.ok) {
+    //             //this.$message.success('编辑成功')
+    //             this.isNext = true
+    //             this.$router.push({
+    //               name: 'AccessStandardsAndRegulations'
+    //             })
+    //           }
+    //         }, e => {
+    //         })
+    //       }
+    //     }else {
+    //       this.$message.error('请检查表单是否填写正确')
+    //     }
+    //   })
+    // },
     pageInfo() {
       StandardsInfoPage(this.sarAccessInfoSearch).then(res => {
         this.sarAccessInfoSearchList = res.data.list
@@ -1727,7 +1882,8 @@ export default {
               this.isSubmit = false
               this.$message.warning('标准编号已存在')
             }
-          }, e => {})
+          }, e => {
+          })
         } else {
           this.isSubmit = false
           this.$message({
@@ -2097,6 +2253,7 @@ export default {
   height: calc(~'100% - 50px');
   background: #ffffff;
   overflow-y: auto;
+
   .basic-information {
     & > .search-area {
       & > .left {
@@ -2104,9 +2261,11 @@ export default {
       }
     }
   }
+
   .basic-information, .data-search, .list-entry {
     padding-top: 0.1px;
     background: #ffffff;
+
     .el-divider {
       .el-divider__text {
         color: #409EFF;
@@ -2114,9 +2273,11 @@ export default {
       }
     }
   }
+
   .showSelectBox {
     padding: 10px;
   }
+
   .data-search {
     .standards-drawer-table-one {
       position: relative;
@@ -2124,11 +2285,13 @@ export default {
       height: 356px;
     }
   }
+
   .list-entry {
     .el-tabs {
       padding: 0 10px;
     }
   }
+
   .footer {
     position: absolute;
     bottom: 0;
@@ -2140,32 +2303,39 @@ export default {
     text-align: right;
   }
 }
+
 .labelBox {
   /deep/ .el-form-item__label {
     padding-right: 5px;
     padding-left: 15px;
   }
 }
+
 .labelBox1 {
   /deep/ .el-form-item__label {
     padding-right: 5px;
   }
 }
+
 .un-select {
   user-select: none;
 }
+
 ::v-deep .el-drawer__header {
   & > span:first-child {
     outline: none !important;
   }
 }
+
 ::v-deep .el-drawer {
   outline: none !important;
 }
+
 /deep/ .wx-resolve {
   .el-select__tags {
     padding: 4px;
   }
+
   .el-tag {
     margin: 2px;
   }

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue

@@ -1264,27 +1264,38 @@ export default {
             })
             sarAccessEO.fileIds = relateFile.join(',')
           }
+
+
           if (!sarAccessEO.id) {
             // 新增
             sarAccessEO.state = '1'
             sarAccessEO.version = 0
+            if (this.sarAccessInfoList.length !== 0) {
               this.$http.post('sarLawsDetailedList/sar-laws-detailed-list/insertList', sarAccessEO, {
                 _this: this,
                 loading: 'loadData'
               }, res => {
-              if (this.sarAccessInfoList.length !== 0) {
                 if (res.ok) {
+                  if (res.data === "数据库为空，添加成功") {
+                    this.$message.success('新增成功')
+                    this.isNext = true
+                    this.$router.push({
+                      name: 'AccessStandardsAndRegulations'
+                    })
+                  } else if (res.data === "其他清单添加成功") {
                     this.$message.success('新增成功')
                     this.isNext = true
                     this.$router.push({
                       name: 'AccessStandardsAndRegulations'
                     })
                   }
+                }
+              }, e => {
+                console.log(e)
+              })
             } else {
               this.$message.error('请选中需要添加到 清单条目 的(标准号/政策编号)')
             }
-            }, e => {
-            })
           } else {
             // 编辑
             this.$http.putData('sarLawsDetailedList/sar-laws-detailed-list/updateList', sarAccessEO, {
@@ -1293,6 +1304,7 @@ export default {
             }, res => {
               if (res.ok) {
                 this.isNext = true
+                this.$message.success('修改成功')
                 this.$router.push({
                   name: 'AccessStandardsAndRegulations'
                 })
@@ -1305,6 +1317,92 @@ export default {
         }
       })
     },
+    // 提交按钮 事件
+    // saveSarAccess () {
+    //   this.$refs['sarAccessForm'].validate((valid) => {
+    //     if (valid) {
+    //       let rowlist = []
+    //       let rowlist1 = []
+    //       let rowlist2 = []
+    //       let rowlist3 = []
+    //       for (let i = 0; i < this.sarAccessInfoList.length; i++) {
+    //         rowlist.push(this.sarAccessInfoList[i].id)
+    //         if (this.sarAccessInfoList[i].ssrq === null)  {
+    //           rowlist1.push(this.sarAccessInfoList[i].ssrq = '-')
+    //         }else {
+    //           rowlist1.push(this.sarAccessInfoList[i].ssrq.toString())
+    //         }
+    //         if (this.sarAccessInfoList[i].xcxssrqgj === null) {
+    //           rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '-')
+    //         }else {
+    //           rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj.toString())
+    //         }
+    //         if (this.sarAccessInfoList[i].zccssrqgj === null) {
+    //           rowlist2.push(this.sarAccessInfoList[i].zccssrqgj = '-')
+    //         }else {
+    //           rowlist2.push(this.sarAccessInfoList[i].zccssrqgj.toString())
+    //         }
+    //       }
+    //       rowlist = rowlist.join(',')
+    //       rowlist1 = rowlist1.join(',')
+    //       rowlist2 = rowlist2.join(',')
+    //       rowlist3 = rowlist3.join(',')
+    //       let sarAccessEO = JSON.parse(JSON.stringify(this.sarAccessEO))
+    //       sarAccessEO.inforlist = rowlist
+    //       sarAccessEO.inforlist1 = rowlist1
+    //       sarAccessEO.inforlist2 = rowlist2
+    //       sarAccessEO.inforlist3 = rowlist3
+    //       // sarAccessEO.countryArea = sarAccessEO.countryArea.join(',')
+    //       // sarAccessEO.applicationScope = sarAccessEO.applicationScope.join(',')
+    //       // 判断是否有附件
+    //       if (this.fileInfoList.length > 0) {
+    //         let relateFile = []
+    //         this.fileInfoList.map(item => {
+    //           relateFile.push(item.id)
+    //         })
+    //         sarAccessEO.fileIds = relateFile.join(',')
+    //       }
+    //       if (!sarAccessEO.id) {
+    //         // 新增
+    //         sarAccessEO.state = '1'
+    //         sarAccessEO.version = 0
+    //         this.$http.post('sarLawsDetailedList/sar-laws-detailed-list/insertList', sarAccessEO, {
+    //           _this: this,
+    //           loading: 'loadData'
+    //         }, res => {
+    //           if (this.sarAccessInfoList.length !== 0) {
+    //             if (res.ok) {
+    //               this.$message.success('新增成功')
+    //               this.isNext = true
+    //               this.$router.push({
+    //                 name: 'AccessStandardsAndRegulations'
+    //               })
+    //             }
+    //           }else {
+    //             this.$message.error('请选中需要添加到 清单条目 的(标准号/政策编号)')
+    //           }
+    //         }, e => {
+    //         })
+    //       } else {
+    //         // 编辑
+    //         this.$http.putData('sarLawsDetailedList/sar-laws-detailed-list/updateList', sarAccessEO, {
+    //           _this: this,
+    //           loading: 'loadData'
+    //         }, res => {
+    //           if (res.ok) {
+    //             this.isNext = true
+    //             this.$router.push({
+    //               name: 'AccessStandardsAndRegulations'
+    //             })
+    //           }
+    //         }, e => {
+    //         })
+    //       }
+    //     }else {
+    //       this.$message.error('请检查表单是否填写正确')
+    //     }
+    //   })
+    // },
     pageInfo() {
       StandardsInfoPage(this.sarAccessInfoSearch).then(res =>{
         this.sarAccessInfoSearchList = res.data.list

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue

@@ -6,7 +6,8 @@
       <el-divider content-position="left">基础信息</el-divider>
       <div class="search-area">
         <div class="left">
-          <el-form inline :model="sarAccessEO" ref="sarAccessForm" class="label-input-form" :rules="sarAccessEORules" label-width="80px">
+          <el-form inline :model="sarAccessEO" ref="sarAccessForm" class="label-input-form" :rules="sarAccessEORules"
+                   label-width="80px">
             <el-form-item label="清单名称" prop="detailedListName" class="search-item">
               <el-input v-model="sarAccessEO.detailedListName" :disabled="disabledFlag" placeholder="请输入"></el-input>
             </el-form-item>
@@ -97,7 +98,8 @@
               <el-button
                   class="common-button-default"
                   size="small"
-                @click="clearSearchLaws">清空</el-button>
+                  @click="clearSearchLaws">清空
+              </el-button>
             </el-form-item>
             <el-form-item>
               <el-button type="primary" class="common-button-primary" size="mini" @click="selectMoreBtn">
@@ -166,18 +168,21 @@
       <div class="action-bar">
         <el-button
             class="common-button-default"
-          size="mini" @click="addSarAccess">添加</el-button>
+            size="mini" @click="addSarAccess">添加
+        </el-button>
         <el-button
             class="common-button-default"
             v-if="showTableFlag"
             size="mini" @click="isShowTable"
-        >{{$t('m.showAddDataList')}}</el-button>
+        >{{ $t('m.showAddDataList') }}
+        </el-button>
         <el-button
             class="common-button-default"
             v-if="!showTableFlag"
             size="mini"
             @click="isShowTable"
-        >{{$t('m.hideAddDataList')}}</el-button>
+        >{{ $t('m.hideAddDataList') }}
+        </el-button>
       </div>
       <div class="standards-drawer-table standards-drawer-table-one" v-if="!showTableFlag">
         <el-table
@@ -282,12 +287,14 @@
             class="common-button-default export-button"
             size="mini" @click="exportAccessInfo('apart')"
             v-btn-permission="''"
-        ><i class="iconfont">&#xe6e9;</i>导出</el-button>
+        ><i class="iconfont">&#xe6e9;</i>导出
+        </el-button>
         <el-button
             class="common-button-default delete-button"
             size="mini" @click="deleteSelectSarAccessInfo"
             v-btn-permission="''"
-        ><i class="iconfont">&#xe61b;</i>删除</el-button>
+        ><i class="iconfont">&#xe61b;</i>删除
+        </el-button>
       </div>
       <el-table
           :data="sarAccessInfoList"
@@ -430,26 +437,33 @@
                 type="primary"
                 size="small" @click="moveUp(scope.$index, scope.row)"
                 v-if="!disabledFlag"
-            >上移</el-button>
+            >上移
+            </el-button>
             <el-button
                 class="common-button-default"
                 type="danger"
                 size="small" @click="moveDown(scope.$index, scope.row)"
                 v-if="!disabledFlag"
-            >下移</el-button>
+            >下移
+            </el-button>
             <el-button
                 size="small"
                 @click="editTghisRow(scope.row)"
                 class="common-button-default"
                 type="warning"
-            >编辑</el-button>
+            >编辑
+            </el-button>
           </template>
         </el-table-column>
       </el-table>
     </div>
     <div class="footer">
-      <el-button class="common-button-primary" icon="el-icon-check" size="mini" type="primary" @click="saveSarAccess" v-if="!disabledFlag" :loading="loadData">{{$t('m.submit')}}</el-button>
+      <el-button class="common-button-primary" icon="el-icon-check" size="mini" type="primary" @click="saveSarAccess"
-      <el-button class="common-button-default" icon="el-icon-close" size="mini" @click="backCancal" v-if="!disabledFlag">{{$t('m.cancel')}}</el-button>
+                 v-if="!disabledFlag" :loading="loadData">{{ $t('m.submit') }}
+      </el-button>
+      <el-button class="common-button-default" icon="el-icon-close" size="mini" @click="backCancal"
+                 v-if="!disabledFlag">{{ $t('m.cancel') }}
+      </el-button>
     </div>
     <el-dialog :visible.sync="exportTestItemNameFlag" title="导出文件" width="300px">
       <el-form :inline="true" class="label-input-form search-area">
@@ -459,7 +473,8 @@
       </el-form>
       <span slot="footer" class="demo-drawer-footer">
         <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancal">取消</el-button>
-        <el-button type="primary" size="mini" class="common-button-primary" icon="el-icon-check" @click="exportTestItem">提交</el-button>
+        <el-button type="primary" size="mini" class="common-button-primary" icon="el-icon-check"
+                   @click="exportTestItem">提交</el-button>
       </span>
     </el-dialog>
     <!--导入模态框-->
@@ -551,14 +566,16 @@
             size="mini"
             icon="el-icon-check"
             @click="saveInfo"
-        >提交</el-button
+        >提交
+        </el-button
         >
         <el-button
             size="mini"
             icon="el-icon-close"
             class="common-button-default"
             @click="cancelInfo"
-        >取消</el-button
+        >取消
+        </el-button
         >
       </div>
     </el-drawer>
@@ -587,6 +604,7 @@ import stand from "../../../config/pages/attributeCustom/components/stand";
 import {mapGetters} from 'vuex'
 import {interfaceUrl} from "@/sysConfig";
 import {dicTypeData, StandardsInfoPage} from "@/api/unqualProcess"
+
 export default {
   name: 'OtherAddEit',
   components: {
@@ -1179,7 +1197,8 @@ export default {
           })
           this.sarAccessInfoListArry = []
           this.$refs.entryTable.clearSelection()
-        }).catch(() => {})
+        }).catch(() => {
+        })
       } else {
         this.$message.error('请选择需要删除的清单条目!')
       }
@@ -1246,23 +1265,42 @@ export default {
             // 新增
             sarAccessEO.state = '1'
             sarAccessEO.version = 0
+            if (this.sarAccessInfoList.length !== 0) {
               this.$http.post('sarLawsDetailedList/sar-laws-detailed-list/insertList', sarAccessEO, {
                 _this: this,
                 loading: 'loadData'
               }, res => {
-              if (this.sarAccessInfoList.length !== 0) {
                 if (res.ok) {
+                  if (res.data === "数据库为空，添加成功") {
                     this.$message.success('新增成功')
                     this.isNext = true
                     this.$router.push({
                       name: 'AccessStandardsAndRegulations'
                     })
+                  } else if (res.data === "车型类别清单添加成功") {
+                    this.$message.success('新增成功')
+                    this.isNext = true
+                    this.$router.push({
+                      name: 'AccessStandardsAndRegulations'
+                    })
+                  } else if (res.data === "车型类别清单添加失败") {
+                    this.$message.error('已存在此车型类别清单，新增失败')
+                  } else if (res.data === "国家/地区清单添加成功") {
+                    this.$message.success('新增成功')
+                    this.isNext = true
+                    this.$router.push({
+                      name: 'AccessStandardsAndRegulations'
+                    })
+                  } else if (res.data === "国家/地区清单添加失败") {
+                    this.$message.error('已存在此国家/地区清单，新增失败')
                   }
+                }
+              }, e => {
+                console.log(e)
+              })
             } else {
               this.$message.error('请选中需要添加到 清单条目 的(标准号/政策编号)')
             }
-            }, e => {
-            })
           } else {
             // 编辑
             this.$http.putData('sarLawsDetailedList/sar-laws-detailed-list/updateList', sarAccessEO, {
@@ -1271,9 +1309,12 @@ export default {
             }, res => {
               if (res.ok) {
                 this.isNext = true
+                this.$message.success('修改成功')
                 this.$router.push({
                   name: 'AccessStandardsAndRegulations'
                 })
+              } else {
+                this.$message.error('已存在此车型类别清单，修改失败')
               }
             }, e => {
             })
@@ -1283,6 +1324,95 @@ export default {
         }
       })
     },
+    // saveSarAccess () {
+    //   this.$refs['sarAccessForm'].validate((valid) => {
+    //     if (valid) {
+    //       let rowlist = []
+    //       let rowlist1 = []
+    //       let rowlist2 = []
+    //       let rowlist3 = []
+    //       for (let i = 0; i < this.sarAccessInfoList.length; i++) {
+    //         rowlist.push(this.sarAccessInfoList[i].id)
+    //         if (this.sarAccessInfoList[i].ssrq === null)  {
+    //           rowlist1.push(this.sarAccessInfoList[i].ssrq = '-')
+    //         }else {
+    //           rowlist1.push(this.sarAccessInfoList[i].ssrq.toString())
+    //         }
+    //         if (this.sarAccessInfoList[i].xcxssrqgj === null) {
+    //           rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '-')
+    //         }else {
+    //           rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj.toString())
+    //         }
+    //         if (this.sarAccessInfoList[i].zccssrqgj === null) {
+    //           rowlist2.push(this.sarAccessInfoList[i].zccssrqgj = '-')
+    //         }else {
+    //           rowlist2.push(this.sarAccessInfoList[i].zccssrqgj.toString())
+    //         }
+    //       }
+    //       rowlist = rowlist.join(',')
+    //       rowlist1 = rowlist1.join(',')
+    //       rowlist2 = rowlist2.join(',')
+    //       rowlist3 = rowlist3.join(',')
+    //       let sarAccessEO = JSON.parse(JSON.stringify(this.sarAccessEO))
+    //       sarAccessEO.inforlist = rowlist
+    //       sarAccessEO.inforlist1 = rowlist1
+    //       sarAccessEO.inforlist2 = rowlist2
+    //       sarAccessEO.inforlist3 = rowlist3
+    //       // sarAccessEO.countryArea = sarAccessEO.countryArea.join(',')
+    //       // sarAccessEO.applicationScope = sarAccessEO.applicationScope.join(',')
+    //       // 判断是否有附件
+    //       if (this.fileInfoList.length > 0) {
+    //         let relateFile = []
+    //         this.fileInfoList.map(item => {
+    //           relateFile.push(item.id)
+    //         })
+    //         sarAccessEO.fileIds = relateFile.join(',')
+    //       }
+    //       if (!sarAccessEO.id) {
+    //         // 新增
+    //         sarAccessEO.state = '1'
+    //         sarAccessEO.version = 0
+    //         this.$http.post('sarLawsDetailedList/sar-laws-detailed-list/insertList', sarAccessEO, {
+    //           _this: this,
+    //           loading: 'loadData'
+    //         }, res => {
+    //           if (this.sarAccessInfoList.length !== 0) {
+    //             if (res.ok) {
+    //               if (res.data === "车型类别清单添加成功") {
+    //                 this.$message.success('新增成功')
+    //                 this.isNext = true
+    //                 this.$router.push({
+    //                   name: 'AccessStandardsAndRegulations'
+    //                 })
+    //               }else{
+    //                 this.$message.error('已存在此车型类别清单，新增失败')
+    //               }
+    //             }
+    //           }else {
+    //             this.$message.error('请选中需要添加到 清单条目 的(标准号/政策编号)')
+    //           }
+    //         }, e => {
+    //         })
+    //       } else {
+    //         // 编辑
+    //         this.$http.putData('sarLawsDetailedList/sar-laws-detailed-list/updateList', sarAccessEO, {
+    //           _this: this,
+    //           loading: 'loadData'
+    //         }, res => {
+    //           if (res.ok) {
+    //             this.isNext = true
+    //             this.$router.push({
+    //               name: 'AccessStandardsAndRegulations'
+    //             })
+    //           }
+    //         }, e => {
+    //         })
+    //       }
+    //     }else {
+    //       this.$message.error('请检查表单是否填写正确')
+    //     }
+    //   })
+    // },
     // 字段转化
     changeText(val) {
       val.forEach(item => {
@@ -1658,7 +1788,8 @@ export default {
               this.isSubmit = false
               this.$message.warning('标准编号已存在')
             }
-          }, e => {})
+          }, e => {
+          })
         } else {
           this.isSubmit = false
           this.$message({
@@ -1943,7 +2074,7 @@ export default {
         //this.sarAccessEO.countryArea = accessRow.countryArea.split(',')
         // this.sarAccessEO.applicationScope = accessRow.applicationScope.split(',')
         this.sarAccessEO.detailedListName = accessRow.detailedListName
-        this.sarAccessEO.projectName = accessRow.projectName
+        this.sarAccessEO.carType = accessRow.carType
         this.sarAccessEO.id = accessRow.id
         this.sarAccessEO.remark = accessRow.remark || ''
         this.sarAccessEO.relateFile = accessRow.relateFile
@@ -1973,6 +2104,7 @@ export default {
   height: calc(~'100% - 50px');
   background: #ffffff;
   overflow-y: auto;
+
   .basic-information {
     & > .search-area {
       & > .left {
@@ -1980,9 +2112,11 @@ export default {
       }
     }
   }
+
   .basic-information, .data-search, .list-entry {
     padding-top: 0.1px;
     background: #ffffff;
+
     .el-divider {
       .el-divider__text {
         color: #409EFF;
@@ -1990,6 +2124,7 @@ export default {
       }
     }
   }
+
   .data-search {
     .standards-drawer-table-one {
       position: relative;
@@ -1997,11 +2132,13 @@ export default {
       height: 356px;
     }
   }
+
   .list-entry {
     .el-tabs {
       padding: 0 10px;
     }
   }
+
   .footer {
     position: absolute;
     bottom: 0;
@@ -2013,32 +2150,39 @@ export default {
     text-align: right;
   }
 }
+
 .labelBox {
   /deep/ .el-form-item__label {
     padding-right: 5px;
     padding-left: 23px;
   }
 }
+
 .labelBox1 {
   /deep/ .el-form-item__label {
     padding-right: 5px;
   }
 }
+
 .un-select {
   user-select: none;
 }
+
 ::v-deep .el-drawer__header {
   & > span:first-child {
     outline: none !important;
   }
 }
+
 ::v-deep .el-drawer {
   outline: none !important;
 }
+
 /deep/ .wx-resolve {
   .el-select__tags {
     padding: 4px;
   }
+
   .el-tag {
     margin: 2px;
   }

src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue

@@ -713,6 +713,8 @@ export default {
            this.dataList.push(item)
          }
        })
+       this.detailedListModel = false
+       this.standModel = false
      }else{
        this.$message.warning('请至少选择一条数据进行添加')
      }

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 || '',

src/sysConfig/index.js

@@ -4,10 +4,10 @@
  * @date: 2018-09-04 17:47:46
  */
 // 服务器地址
-// const devIp = '10.96.10.171'
+const devIp = '10.96.10.171'
-// const devInterfacePORT = '9999'
-const devIp = '10.96.170.156'
 const devInterfacePORT = '9999'
+// const devIp = '10.5.103.101'
+// const devInterfacePORT = '9999'
 // 云端端口号
 const DEV_CLOUD_RES_INTERFACE_PORT = '7777'
 const simpleFilePath = 'att/attFile/upload'