lxf 1 year ago
parent
commit
391646bcfc

+ 7 - 2
src/components/makeProduct/modification/index.vue

@@ -6,7 +6,6 @@
       :source="sourceList.data"
       :pagination="sourceList.pagination"
       :config="config"
-      :loading="loading"
       :searchConfig="searchConfig"
       highlight-current-row
       @get-list="getList"
@@ -24,7 +23,13 @@
       </div>
     </div>
 
-    <el-table :data="selectData" :cell-style="{ padding: '0' }" :row-style="{ height: '35px' }" header-row-class-name="tableHeader" style="margin-bottom: 10px">
+    <el-table
+      :data="selectData"
+      :cell-style="{ padding: '0' }"
+      :row-style="{ height: '35px' }"
+      header-row-class-name="tableHeader"
+      style="margin-bottom: 10px"
+      v-loading="loading">
       <el-table-column label="品号" prop="code" width="220" />
       <el-table-column label="品名" prop="name" min-width="220" />
       <el-table-column label="操作" align="center" width="120">

+ 7 - 1
src/components/makeProduct/modification/subsidiary.vue

@@ -24,7 +24,13 @@
       </div>
     </div>
 
-    <el-table :data="selectData" :cell-style="{ padding: '0' }" :row-style="{ height: '35px' }" header-row-class-name="tableHeader" style="margin-bottom: 10px">
+    <el-table
+      :data="selectData"
+      :cell-style="{ padding: '0' }"
+      :row-style="{ height: '35px' }"
+      header-row-class-name="tableHeader"
+      style="margin-bottom: 10px"
+      v-loading="loading">
       <el-table-column label="品号" prop="code" width="220" />
       <el-table-column label="品名" prop="name" min-width="220" />
       <el-table-column label="操作" align="center" width="120">

+ 1 - 2
src/views/production/operation/batching/index.vue

@@ -9,7 +9,6 @@
             :source="sourceList.data"
             :pagination="sourceList.pagination"
             :config="config"
-            :loading="loading"
             :searchConfig="searchConfig"
             highlight-current-row
             :action-list="[
@@ -26,7 +25,7 @@
             @clickReset="clickReset">
           </byTable>
 
-          <table class="table-class" border="0" cellpadding="0" cellspacing="0">
+          <table class="table-class" border="0" cellpadding="0" cellspacing="0" v-loading="loading">
             <tr>
               <th style="width: 200px">BOM品号</th>
               <th style="min-width: 320px">BOM品名</th>

+ 7 - 7
src/views/production/operation/batching/quick.vue

@@ -1,6 +1,6 @@
 <template>
-  <div>
-    <el-card class="box-card" v-loading="loading">
+  <div v-loading="loading">
+    <div style="height: calc(100vh - 174px); overflow-y: auto; overflow-x: hidden">
       <byForm :formConfig="formConfig" :formOption="formOption" v-model="formData.data" :rules="rules" ref="submit">
         <template #basicInformation>
           <div style="width: 100%">
@@ -39,11 +39,11 @@
           </div>
         </template>
       </byForm>
-      <div style="width: 100%; text-align: center; margin: 10px">
-        <el-button @click="clickCancel()" size="large">取 消</el-button>
-        <el-button type="primary" @click="submitForm()" size="large" v-preReClick>确 定</el-button>
-      </div>
-    </el-card>
+    </div>
+    <div style="width: 100%; text-align: center; margin: 10px">
+      <el-button @click="clickCancel()" size="large">取 消</el-button>
+      <el-button type="primary" @click="submitForm()" size="large" v-preReClick>确 定</el-button>
+    </div>
   </div>
 </template>