update

src/components/DictTag/index.vue

@@ -35,7 +35,7 @@ export default {
       type: Array,
       default: null,
     },
-    value: [Number, String, Array],
+    value: [Number, String, Array,Boolean],
     size: String,
   },
   computed: {

src/views/material/changeApply/add/index.vue

@@ -298,123 +298,125 @@ export default {
           :name="item.key"
           lazy
         >
-          <el-super-table
-            v-model="materialInfo[item.key]"
-            :dict="dict"
-            :ref="tabName"
-            :columns="columns"
-            :size="$attrs.size"
-          >
-            <template slot="materialName" slot-scope="scope">
-              <component
-                v-bind="scope.attr"
-                v-model="scope.row[scope.item.key]"
-                :size="$attrs.size"
-                :source.sync="scope.row"
-              >
-              </component>
-            </template>
-            <!-- 判断是否禁用 -->
-            <template slot="drug" slot-scope="scope">
-              <component
-                v-bind="scope.attr"
-                v-model="scope.row[scope.item.key]"
-                :size="$attrs.size"
-                :source.sync="scope.row"
-                :disabled="!(scope.row.medicineMaterial ==='0') "
-              >
-              <el-option
-                  v-for="item in dict.type[scope.attr.dictName]"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
+          <div style="height: 420px;display:flex">
+            <el-super-table
+              v-model="materialInfo[item.key]"
+              :dict="dict"
+              :ref="tabName"
+              :columns="columns"
+              :size="$attrs.size"
+            >
+              <template slot="materialName" slot-scope="scope">
+                <component
+                  v-bind="scope.attr"
+                  v-model="scope.row[scope.item.key]"
+                  :size="$attrs.size"
+                  :source.sync="scope.row"
                 >
-                </el-option>
-              </component>
-            </template>
-
-            <template slot="registrationNo" slot-scope="scope">
-              <component
-                v-bind="scope.attr"
-                v-model="scope.row[scope.item.key]"
-                :size="$attrs.size"
-                :source.sync="scope.row"
-                :disabled="!(scope.row.medicineMaterial ==='0') "
-              >
-              </component>
-            </template>
-
-            <template slot="medicalDevices" slot-scope="scope">
-              <component
-                v-bind="scope.attr"
-                v-model="scope.row[scope.item.key]"
-                :size="$attrs.size"
-                :source.sync="scope.row"
-                :disabled="!(scope.row.medicineMaterial ==='0') "
-              >
-              <el-option
-                  v-for="item in dict.type[scope.attr.dictName]"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
+                </component>
+              </template>
+              <!-- 判断是否禁用 -->
+              <template slot="drug" slot-scope="scope">
+                <component
+                  v-bind="scope.attr"
+                  v-model="scope.row[scope.item.key]"
+                  :size="$attrs.size"
+                  :source.sync="scope.row"
+                  :disabled="!(scope.row.medicineMaterial ==='0') "
+                >
+                <el-option
+                    v-for="item in dict.type[scope.attr.dictName]"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  >
+                  </el-option>
+                </component>
+              </template>
+  
+              <template slot="registrationNo" slot-scope="scope">
+                <component
+                  v-bind="scope.attr"
+                  v-model="scope.row[scope.item.key]"
+                  :size="$attrs.size"
+                  :source.sync="scope.row"
+                  :disabled="!(scope.row.medicineMaterial ==='0') "
                 >
-                </el-option>
-              </component>
-            </template>
-            <template slot="maintenanceType" slot-scope="scope">
-              <component
-                v-bind="scope.attr"
-                v-model="scope.row[scope.item.key]"
-                :size="$attrs.size"
-                :source.sync="scope.row"
-                :disabled="!(scope.row.medicineMaterial ==='0') "
-              >
-              <el-option
-                  v-for="item in dict.type[scope.attr.dictName]"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
+                </component>
+              </template>
+  
+              <template slot="medicalDevices" slot-scope="scope">
+                <component
+                  v-bind="scope.attr"
+                  v-model="scope.row[scope.item.key]"
+                  :size="$attrs.size"
+                  :source.sync="scope.row"
+                  :disabled="!(scope.row.medicineMaterial ==='0') "
                 >
-                </el-option>
-              </component>
-            </template>
-            <template slot="dosageFromName" slot-scope="scope">
-              <component
-                v-bind="scope.attr"
-                v-model="scope.row[scope.item.key]"
-                :size="$attrs.size"
-                :source.sync="scope.row"
-                :disabled="!(scope.row.medicineMaterial ==='0') "
-              >
-              </component>
-            </template>
-            
-
-            <el-table-column fixed="right" label="操作" width="120" align="center">
-              <template slot="header" slot-scope="scope">
-                <el-button
-                  type="text"
+                <el-option
+                    v-for="item in dict.type[scope.attr.dictName]"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  >
+                  </el-option>
+                </component>
+              </template>
+              <template slot="maintenanceType" slot-scope="scope">
+                <component
+                  v-bind="scope.attr"
+                  v-model="scope.row[scope.item.key]"
                   :size="$attrs.size"
-                  @click="useRowAdd(tabName)"
+                  :source.sync="scope.row"
+                  :disabled="!(scope.row.medicineMaterial ==='0') "
                 >
-                  增行
-                </el-button>
+                <el-option
+                    v-for="item in dict.type[scope.attr.dictName]"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  >
+                  </el-option>
+                </component>
               </template>
-              <template slot-scope="scope">
-                <el-button
-                  type="text"
+              <template slot="dosageFromName" slot-scope="scope">
+                <component
+                  v-bind="scope.attr"
+                  v-model="scope.row[scope.item.key]"
                   :size="$attrs.size"
-                  @click.native.prevent="useRowRemove(tabName, scope)"
+                  :source.sync="scope.row"
+                  :disabled="!(scope.row.medicineMaterial ==='0') "
                 >
-                删除
-                </el-button>
-                <AmendantRecord
-                  v-if=" tabName ==='materialBasic' && addType === 'edit' && scope.row.id"
-                  v-model="scope.row"
-                ></AmendantRecord>
+                </component>
               </template>
-            </el-table-column>
-          </el-super-table>
+              
+  
+              <el-table-column fixed="right" label="操作" width="120" align="center">
+                <template slot="header" slot-scope="scope">
+                  <el-button
+                    type="text"
+                    :size="$attrs.size"
+                    @click="useRowAdd(tabName)"
+                  >
+                    增行
+                  </el-button>
+                </template>
+                <template slot-scope="scope">
+                  <el-button
+                    type="text"
+                    :size="$attrs.size"
+                    @click.native.prevent="useRowRemove(tabName, scope)"
+                  >
+                  删除
+                  </el-button>
+                  <AmendantRecord
+                    v-if=" tabName ==='materialBasic' && addType === 'edit' && scope.row.id"
+                    v-model="scope.row"
+                  ></AmendantRecord>
+                </template>
+              </el-table-column>
+            </el-super-table>
+          </div>
         </el-tab-pane>
       </el-tabs>
 

src/views/material/changeApply/amendantRecord/index.vue

@@ -85,7 +85,7 @@ export default {
       :size="size"
     >
 
-      <div style="padding: 10px;">
+      <div style="padding: 10px;height: 600px;display: flex;">
 
         <el-super-table
           v-model="tableData"

src/views/material/changeApply/index.vue

@@ -45,25 +45,26 @@
         </el-col>
       </el-row>
 
-
-      <el-super-table
-        v-model="tableList"
-        :dict="dict"
-        :columns="TableColumns"
-        :size="size"
-        pagination
-        :page="page"
-        @pagination="useQuery(params, page)"
-        @row-dblclick="useSee"
-      >
-        <el-table-column fixed="right" label="操作" width="150" align="center">
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click="useSee(scope.row)">查看</el-button>
-            <el-button @click="handleEdit(scope.row)" v-if="scope.row.status == 0 || scope.row.status == 3" type="text" size="small">编辑</el-button>
-            <el-button type="text" size="small" @click="deleteRow(scope.row)" v-if="scope.row.status == 0 || scope.row.status == 3">删除</el-button>
-          </template>
-        </el-table-column>
-      </el-super-table>
+      <div style="height: 600px; display:flex;">
+        <el-super-table
+          v-model="tableList"
+          :dict="dict"
+          :columns="TableColumns"
+          :size="size"
+          pagination
+          :page="page"
+          @pagination="useQuery(params, page)"
+          @row-dblclick="useSee"
+        >
+          <el-table-column fixed="right" label="操作" width="150" align="center">
+            <template slot-scope="scope">
+              <el-button type="text" size="small" @click="useSee(scope.row)">查看</el-button>
+              <el-button @click="handleEdit(scope.row)" v-if="scope.row.status == 0 || scope.row.status == 3" type="text" size="small">编辑</el-button>
+              <el-button type="text" size="small" @click="deleteRow(scope.row)" v-if="scope.row.status == 0 || scope.row.status == 3">删除</el-button>
+            </template>
+          </el-table-column>
+        </el-super-table>
+      </div>
     </div>
 </el-card>
 

src/views/material/changeApply/see/index.vue

@@ -246,6 +246,7 @@ export default {
             :name="item.key"
             lazy
           >
+          <div style="height: 420px;display:flex">
             <el-super-table
               v-model="materialInfo[item.key]"
               :dict="dict"
@@ -274,6 +275,8 @@ export default {
                 </template>
               </el-table-column>
             </el-super-table>
+          </div>
+           
           </el-tab-pane>
         </el-tabs>