Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcjg-web

@@ -95,7 +95,7 @@
           <component :is="editItem" ref="editItem" :class="{ 'editForm': $store.state.business.Edit }"
           <component :is="editItem" ref="editItem" :class="{ 'editForm': $store.state.business.Edit }"
             :bsmYwsjb="bsmYwsjb" :bsmSjsb="dataReport.bsmReport || dataReport.bsmSjsb" />
             :bsmYwsjb="bsmYwsjb" :bsmSjsb="dataReport.bsmReport || dataReport.bsmSjsb" />
         </div>
         </div>
-        <div class="d-center">
+        <div class="d-center" v-if="!$store.state.business.Edit">
           <btn nativeType="cz" @click="dialogVisible = false">取 消</btn>
           <btn nativeType="cz" @click="dialogVisible = false">取 消</btn>
           <btn nativeType="cx" @click="submitForm">确 定</btn>
           <btn nativeType="cx" @click="submitForm">确 定</btn>
         </div>
         </div>

 <template>
 <template>
   <div>
   <div>
-    <el-input type="textarea" :rows="6" disabled placeholder="配置参数" v-model="resultInfo">
+    <el-input type="textarea" :rows="6" :disabled="$store.state.business.Edit" placeholder="配置参数" v-model="resultInfo">
     </el-input>
     </el-input>
+    <div class="d-center" v-if="!$store.state.business.Edit">
+      <btn nativeType="cz" @click="dialogVisible = false">取 消</btn>
+      <btn nativeType="cx" @click="submitForm">确 定</btn>
+    </div>
   </div>
   </div>
 </template>
 </template>
 <script>
 <script>
@@ -31,7 +35,7 @@ export default {
 <style scoped lang="scss">
 <style scoped lang="scss">
 /* jsoneditor右上角默认有一个链接,加css去掉了 */
 /* jsoneditor右上角默认有一个链接,加css去掉了 */
 /deep/.el-textarea__inner {
 /deep/.el-textarea__inner {
-  min-height: 73vh !important;
+  min-height: 76vh !important;
   background-color: #08346F !important;
   background-color: #08346F !important;
   color: #ffffff;
   color: #ffffff;
   border: none !important;
   border: none !important;

@@ -33,9 +33,8 @@
     </div>
     </div>
     <!-- 列表区域 -->
     <!-- 列表区域 -->
     <div class="from-clues-content">
     <div class="from-clues-content">
-      <lb-table ref="table" :id="'mytable'" :page-size="pageData.size" :header-cell-style="headerStyle"
-        :current-page.sync="pageData.current" :total="tableData.total" @size-change="handleSizeChange"
-        @p-current-change="handleCurrentChange" :column="tableData.columns" :data="tableData.data">
+      <lb-table ref="table" :id="'mytable'" :header-cell-style="headerStyle" :pagination="false"
+        :column="tableData.columns" :data="tableData.data">
       </lb-table>
       </lb-table>
     </div>
     </div>
   </div>
   </div>
@@ -105,13 +104,7 @@ export default {
           }
           }
         ]
         ]
           .concat(data.columns()),
           .concat(data.columns()),
-        data: [],
-      },
-      // 分页
-      pageData: {
-        total: 0,
-        pageSize: 10,
-        current: 1
+        data: []
       }
       }
     }
     }
   },
   },
@@ -119,6 +112,7 @@ export default {
     this.handleResetForm()
     this.handleResetForm()
   },
   },
   methods: {
   methods: {
+    handleSearch () { },
     headerStyle ({ row, rowIndex }) {
     headerStyle ({ row, rowIndex }) {
       if (rowIndex == 3) {
       if (rowIndex == 3) {
         row[2].rowSpan = 2;
         row[2].rowSpan = 2;

@@ -34,9 +34,7 @@
     </div>
     </div>
     <!-- 列表区域 -->
     <!-- 列表区域 -->
     <div class="from-clues-content">
     <div class="from-clues-content">
-      <lb-table ref="table" :page-size="pageData.size" :id="'mytable'" :current-page.sync="pageData.current"
-        :total="tableData.total" @size-change="handleSizeChange" @p-current-change="handleCurrentChange"
-        :column="tableData.columns" :data="tableData.data">
+      <lb-table ref="table" :id="'mytable'" :pagination="false" :column="tableData.columns" :data="tableData.data">
       </lb-table>
       </lb-table>
     </div>
     </div>
   </div>
   </div>
@@ -107,12 +105,6 @@ export default {
         ]
         ]
           .concat(data.columns()),
           .concat(data.columns()),
         data: [],
         data: [],
-      },
-      // 分页
-      pageData: {
-        total: 0,
-        pageSize: 10,
-        current: 1
       }
       }
     };
     };
   },
   },
@@ -120,6 +112,7 @@ export default {
     this.handleResetForm()
     this.handleResetForm()
   },
   },
   methods: {
   methods: {
+    handleSearch () { },
     handlesetExport2Excel (val) {
     handlesetExport2Excel (val) {
       setExport2Excel(val)
       setExport2Excel(val)
     },
     },

@@ -33,9 +33,7 @@
     </div>
     </div>
     <!-- 列表区域 -->
     <!-- 列表区域 -->
     <div class="from-clues-content">
     <div class="from-clues-content">
-      <lb-table ref="table" :id="'mytable'" :page-size="pageData.size" :current-page.sync="pageData.current"
-        :total="tableData.total" @size-change="handleSizeChange" @p-current-change="handleCurrentChange"
-        :column="tableData.columns" :data="tableData.data">
+      <lb-table ref="table" :id="'mytable'" :pagination="false" :column="tableData.columns" :data="tableData.data">
       </lb-table>
       </lb-table>
     </div>
     </div>
   </div>
   </div>
@@ -106,19 +104,14 @@ export default {
         ]
         ]
           .concat(data.columns()),
           .concat(data.columns()),
         data: [],
         data: [],
-      },
-      // 分页
-      pageData: {
-        total: 0,
-        pageSize: 10,
-        current: 1
-      },
+      }
     }
     }
   },
   },
   created () {
   created () {
     this.handleResetForm()
     this.handleResetForm()
   },
   },
   methods: {
   methods: {
+    handleSearch () { },
     handlesetExport2Excel (val) {
     handlesetExport2Excel (val) {
       setExport2Excel(val)
       setExport2Excel(val)
     },
     },

@@ -79,7 +79,7 @@
     <!-- 引入详情组件 -->
     <!-- 引入详情组件 -->
     <!-- 编辑 -->
     <!-- 编辑 -->
     <dataDetails ref="editLog" :title="title" :visiableXml="true" />
     <dataDetails ref="editLog" :title="title" :visiableXml="true" />
-</div>
+  </div>
 </template>
 </template>
 <script>
 <script>
 // 上报报文查询
 // 上报报文查询
@@ -201,6 +201,11 @@ export default {
     handleDetail (row) {
     handleDetail (row) {
       this.title = row.rectypeName;
       this.title = row.rectypeName;
       this.$refs.editLog.isShow(row);
       this.$refs.editLog.isShow(row);
+      if (row.exchangeState == 2) {
+        this.$store.dispatch('business/setReportLogEdit')
+      } else { 
+        this.$store.dispatch('business/setEdit')
+      }
     },
     },
     // 重置
     // 重置
     resetForm () {
     resetForm () {