1.订单维护参照弹窗不展示

2.订单维护主子表高度调整
3.订单维护不限制修订时订单使用返利、订单抵扣余款大小

src/components/popover-select/index.vue

@@ -109,7 +109,7 @@ export default {
     TableColumnTemp() {
       const { type } = this.$props;
       const documents = require(`./components/${type}`).default;
-      return documents.filter((document) => document.key);
+      return documents.filter((document) => document.item.key);
     },
   },
   watch: {
@@ -303,23 +303,23 @@ export default {
           >
           </el-table-column>
           <el-table-column
-            v-for="(column, index) in TableColumnTemp"
+            v-for="({item,attr}, index) in TableColumnTemp"
             :key="index"
-            :prop="column.key"
-            :label="column.title"
-            :width="column.width"
+            :prop="item.key"
+            :label="item.title"
+            :width="item.width"
             show-overflow-tooltip
           >
             <template slot-scope="scope">
               <dr-computed-input
-                v-if="column.type === 'ComputedInput'"
-                v-model="scope.row[column.key]"
+                v-if="attr.type === 'ComputedInput'"
+                v-model="scope.row[item.key]"
                 :source="scope.row"
-                :computed="column.computed"
-                :placeholder="column.placeholder"
+                :computed="attr.computed"
+                :placeholder="attr.placeholder"
                 style="width: 100%"
               ></dr-computed-input>
-              <span v-else> {{ scope.row[column.key] }}</span>
+              <span v-else> {{ scope.row[item.key] }}</span>
             </template>
           </el-table-column>
         </el-table>

src/views/purchase/purchase-order/column.js

@@ -501,13 +501,13 @@ export const TabColumns = [
         },
         
       },
-      { 
-        item:{key: "material", title: "物料ID",width:120, },
-        attr:{
-          isHidden:true,
-        },
+      // { 
+      //   item:{key: "material", title: "物料ID",width:120, },
+      //   attr:{
+      //     isHidden:true,
+      //   },
         
-      },
+      // },
       { 
         item:{key: "materialName", title: "物料名称",width:150,  },
         attr:{

src/views/purchase/purchase-order/edit/index.vue

@@ -544,7 +544,6 @@ export default {
               <el-input-number v-if="column.inputType === 'InputNumber'" 
                 v-model="params[column.key]"
                 :precision="column.precision"
-                :max="handleIsRevise() ? params[column.key] : Infinity"
                 :controls-position="column.controlsPosition" 
                 :placeholder="column.placeholder"
                 :clearable="column.clearable" 

src/views/purchase/purchase-order/index.vue

@@ -604,62 +604,64 @@ export default {
       </el-col>
     </el-row>
 
-    <el-super-table
-      class="purchaseTable"
-      v-model="tableData"
-      ref="purchaseTable"
-      :dict="dict"
-      :columns="tableColumns"
-      :selectable="setSelectable"
-      index
-      checkbox
-      pagination
-      :page="page"
-      convenitentOperation
-      @pagination="fetchList(params, page)"
-      @row-dblclick="handleOpenSeeDrawer" 
-      @row-click="handleDetailsData" 
-      @selection-change="handleSelectionChange"
-      @select="handleSelect"
-    >
+    <div style="display: flex;height:420px;">
+      <el-super-table
+        class="purchaseTable"
+        v-model="tableData"
+        ref="purchaseTable"
+        :dict="dict"
+        :columns="tableColumns"
+        :selectable="setSelectable"
+        index
+        checkbox
+        pagination
+        :page="page"
+        convenitentOperation
+        @pagination="fetchList(params, page)"
+        @row-dblclick="handleOpenSeeDrawer" 
+        @row-click="handleDetailsData" 
+        @selection-change="handleSelectionChange"
+        @select="handleSelect"
+      >
+        
+        <el-table-column fixed="right" label="操作" width="120">
+            <template slot-scope="scope">
+              <el-button 
+                v-if="judgeIsOption('revise',scope.row)"
+                type="text" 
+                size="small" 
+                @click.stop="handleOpenEditDrawer(scope.row)"
+                v-hasPermi="['material:order:edit']">
+              修订
+              </el-button>
+              <el-button 
+                v-if="judgeIsOption('edit',scope.row)"
+                type="text" 
+                size="small" 
+                @click.stop="handleOpenEditDrawer(scope.row)"
+                v-hasPermi="['material:order:edit']">
+              编辑
+              </el-button>
+              <!-- 0=自由态，1=审批中，2=已审核，3=已驳回 4=提交中-->
+              <el-button 
+                v-if="judgeIsOption('del',scope.row)" 
+                type="text" 
+                size="small" 
+                @click.stop="handleDeleteList(scope.row)"
+                v-hasPermi="['material:order:remove']"
+              >删除</el-button>
+              <el-button 
+                v-if="judgeIsOption('submit',scope.row)" 
+                type="text" 
+                size="mini"
+                v-hasPermi="['material:order:toOa']" 
+                @click.stop="handleSubmit(scope.row)"
+              >提交</el-button>
+            </template>
+        </el-table-column>
       
-      <el-table-column fixed="right" label="操作" width="120">
-          <template slot-scope="scope">
-            <el-button 
-              v-if="judgeIsOption('revise',scope.row)"
-              type="text" 
-              size="small" 
-              @click.stop="handleOpenEditDrawer(scope.row)"
-              v-hasPermi="['material:order:edit']">
-            修订
-            </el-button>
-            <el-button 
-              v-if="judgeIsOption('edit',scope.row)"
-              type="text" 
-              size="small" 
-              @click.stop="handleOpenEditDrawer(scope.row)"
-              v-hasPermi="['material:order:edit']">
-            编辑
-            </el-button>
-            <!-- 0=自由态，1=审批中，2=已审核，3=已驳回 4=提交中-->
-            <el-button 
-              v-if="judgeIsOption('del',scope.row)" 
-              type="text" 
-              size="small" 
-              @click.stop="handleDeleteList(scope.row)"
-              v-hasPermi="['material:order:remove']"
-            >删除</el-button>
-            <el-button 
-              v-if="judgeIsOption('submit',scope.row)" 
-              type="text" 
-              size="mini"
-              v-hasPermi="['material:order:toOa']" 
-              @click.stop="handleSubmit(scope.row)"
-            >提交</el-button>
-          </template>
-      </el-table-column>
-    
-    </el-super-table>
+      </el-super-table>
+    </div>
 
     <div style="position: relative; padding-top: 10px;" v-loading="tabLoading">
       <el-row style="position: absolute; top: 30px; right: 20px;z-index: 10;">
@@ -679,21 +681,22 @@ export default {
           :label="column.title" 
           :name="column.key"
         >
-          <el-super-table
-            style="height: 300px;"
-            v-model="tabTableDatas[column.key]"
-            :ref="column.key"
-            :dict="dict"
-            :columns="column.tableColumns"
-            :selectable="setTabSelectable"
-            :checkbox="setTabSelectable()"
-            convenitentOperation
-            @select="handleTabSelect"
-            @selection-change="handleTabSelectionChange"
-
-          >
-          </el-super-table>
-         
+          <div style="height:580px;display:flex">
+            <el-super-table
+              v-model="tabTableDatas[column.key]"
+              :ref="column.key"
+              :dict="dict"
+              :columns="column.tableColumns"
+              :selectable="setTabSelectable"
+              :checkbox="setTabSelectable()"
+              convenitentOperation
+              @select="handleTabSelect"
+              @selection-change="handleTabSelectionChange"
+
+            >
+            </el-super-table>
+          </div>
+          
         </el-tab-pane>
         
       </el-tabs>
@@ -703,9 +706,4 @@ export default {
 </template>
 
 <style lang="scss">
-.purchaseTable{
-  .el-table__body-wrapper{
-    height: 480px;
-  }
-}
 </style>