瀏覽代碼

feature:bug修复

chenqilong 2 年之前
父節點
當前提交
ca7b7a22c6

+ 1 - 1
src/views/supply/apply/engin_list.vue

@@ -9,6 +9,7 @@
     :tableAttributes="tableAttributes"
     :tableEvents="tableEvents"
     :operationColumnWidth="200"
+    :replaceOrNotMap="false"
   >
     <ExamineDialog :is-show.sync="isShowExamineDialog" :examine-form.sync="examineForm" />
 
@@ -260,7 +261,6 @@ export default {
     },
     operation() {
       return (h, { row, index, column }) => {
-        console.log(row, column)
         return (
           <div class="operation-btns">
             {this.$checkBtnRole('apply', this.$route.meta.roles) &&

+ 9 - 24
src/views/supply/engin/components/commerce_detail.vue

@@ -5,7 +5,9 @@
 
       <div id="printData">
         <div class="main-title">
-          <div class="title">工程订单 <span style="margin-left: 20px">经销商名称:{{detailData.customerName}}</span></div>
+          <div class="title">
+            工程订单 <span style="margin-left: 20px">经销商名称:{{ detailData.customerName }}</span>
+          </div>
         </div>
 
         <div class="diy-table-1">
@@ -271,7 +273,7 @@
             <el-table-column align="left" label="业务员" prop="serviceName" min-width="100" show-overflow-tooltip />
           </el-table>
         </div>
-        <div class="table" style="margin-top: 20px" v-if="detailData.examineStatus =='OK'">
+        <div class="table" style="margin-top: 20px" v-if="detailData.examineStatus == 'OK'">
           <el-table
             :data="detailData.refundNoteList"
             element-loading-text="Loading"
@@ -284,28 +286,11 @@
             :summary-method="$getSummaries"
           >
             <el-table-column align="center" label="序号" type="index" width="50"></el-table-column>
-            <el-table-column
-              align="left"
-              label="创建人"
-              prop="createBy"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="left"
-              label="创建时间"
-              prop="createTime"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="left"
-              label="退订说明"
-              prop="refundNote"
-              show-overflow-tooltip
-            ></el-table-column>
-
+            <el-table-column align="left" label="创建人" prop="createBy" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="创建时间" prop="createTime" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="退订说明" prop="refundNote" show-overflow-tooltip></el-table-column>
           </el-table>
         </div>
-
       </div>
 
       <div class="page-footer">
@@ -336,7 +321,7 @@
       </div>
     </div>
 
-    <el-dialog title="直调发货" :visible.sync="isShowDeliverDialog" width="80%">
+    <el-dialog title="直调发货" append-to-body :visible.sync="isShowDeliverDialog" width="80%">
       <el-form
         ref="deliverForm"
         :model="deliverForm"
@@ -436,7 +421,7 @@
       </span>
     </el-dialog>
 
-    <el-dialog title="直接调拨单(提前开票)" :visible.sync="isShowDirectDialog" width="80%">
+    <el-dialog title="直接调拨单(提前开票)" append-to-body :visible.sync="isShowDirectDialog" width="80%">
       <el-form
         ref="directForm"
         :model="directForm"

+ 2 - 0
src/views/supply/engin/engin_list.vue

@@ -10,6 +10,7 @@
     :tableEvents="tableEvents"
     :operationColumnWidth="200"
     :fieldBeansHook="fieldBeansHook"
+    :replaceOrNotMap="false"
   >
     <EditDateDialog :is-show.sync="isShowEditDateDialog" :date-form.sync="dateForm" />
     <Popu v-if="!showPage">
@@ -220,6 +221,7 @@ export default {
     },
     operation() {
       return (h, { row, index, column }) => {
+        // console.log(row)
         return (
           <div class="operation-btns">
             {this.$checkBtnRole('apply', this.$route.meta.roles) && row.examineStatus === 'SAVE' ? (