002390 1 年之前
父節點
當前提交
d5f192a033

+ 5 - 3
src/views/material/basicFile/details.vue

@@ -251,6 +251,7 @@
 
                 <!-- 其他展示为列表 -->
                 <el-table v-else 
+                  border
                   :data="mainMsg.value" 
                   @cell-dblclick="handleMaindbClick"
                   @selection-change="handleMainChange"
@@ -366,7 +367,7 @@
                     <!-- 其他展示为列表 -->
 
                     <!-- 辅计量 -->
-                    <el-table v-else-if="activeViceTab == 'material_unit'" :data="unitDetails.value"
+                    <el-table border v-else-if="activeViceTab == 'material_unit'" :data="unitDetails.value"
                               class="material-table">
                       <el-table-column type="index" v-if="unitDetails.form.length" label="序号" width="55"
                                        align="center"/>
@@ -383,7 +384,7 @@
                     </el-table>
 
                     <!-- 辅助属性 -->
-                    <el-table v-else-if="activeViceTab == 'material_property'" :data="propertyDetail.value"
+                    <el-table border v-else-if="activeViceTab == 'material_property'" :data="propertyDetail.value"
                               class="material-table">
                       <el-table-column type="index" v-if="propertyDetail.form.length" label="序号" width="55"
                                        align="center"/>
@@ -471,6 +472,7 @@
       </el-row>
       <!-- 表格数据 -->
       <el-table 
+        border
         :data="materialType.value" 
         stripe 
         style="width: 100%" 
@@ -674,7 +676,7 @@
         <!-- queryMedcineItemDrug -->
         <!-- 列表 -->
         <div v-else>
-          <el-table :data="MoreDataDialog.list" v-loading="MoreDataDialog.loading" style="width: 100%"
+          <el-table  border :data="MoreDataDialog.list" v-loading="MoreDataDialog.loading" style="width: 100%"
                     @row-click="handleCurentRow" highlight-current-row>
             <el-table-column type="index" label="序号" width="55" align="center"/>
             <el-table-column v-for="m in MoreDataDialog.form" v-if="m.show" :prop="m.prop" :label="m.name"/>

+ 4 - 4
src/views/material/basicFile/index.vue

@@ -32,8 +32,8 @@
             </el-form-item>
 
             <el-form-item>
-              <el-button size="small" type="primary" @click="handleQuery">搜索</el-button>
-              <el-button size="small" @click="handleResetQuery">重置</el-button>
+              <el-button size="small" type="primary" @click="handleQuery">搜 索</el-button>
+              <el-button size="small" @click="handleResetQuery">重 置</el-button>
             </el-form-item>
           </el-form>
         </el-col>
@@ -101,10 +101,10 @@
 
     <!-- 主体列表 -->
     <el-card class="material-list" v-loading="loading">
-      <el-table :data="taskList" ref="materialTable" @cell-dblclick="handledbClick" :row-key="getRowKey"
+      <el-table border :data="taskList" ref="materialTable" @cell-dblclick="handledbClick" :row-key="getRowKey"
                 @selection-change="handleSelectionChange" @select="handleSelect" @select-all="handleSelectAll">
         <!--  -->
-        <el-table-column type="selection" width="30" :reserve-selection="true"/>
+        <el-table-column type="selection" width="45" :reserve-selection="true"/>
         <el-table-column type="index" label="序号" width="55" align="center"/>
         <el-table-column width="150" v-for="h in  tableHeader" v-if="h.show" :label="h.name" align="center"
                          show-overflow-tooltip>

+ 11 - 6
src/views/purchase/contract/index.vue

@@ -36,6 +36,9 @@ export default {
     this.useQuery(this.params, this.page);
   },
   methods: {
+    setSelectable(){
+      return true
+    },
     //
     async fetchList(prop, page) {
       try {
@@ -166,23 +169,25 @@ export default {
       :size="size"
       :dict="dict"
       :columns="TableColumns"
-      stroage
-      hideOperationColumns
+      :selectable="setSelectable"
+      checkbox
       @row-dblclick="useSee"
       @selection-change="useSelect"
+      :page="page"
+      @pagination="useQuery(params, page)"
     >
       <!-- <el-table-column fixed width="55" align="center" label="#" prop="$index">
       </el-table-column> -->
-      <el-table-column fixed width="55" align="center" type="selection">
-      </el-table-column>
+      <!-- <el-table-column fixed width="55" align="center" type="selection">
+      </el-table-column> -->
     </el-super-table>
-    <pagination
+    <!-- <pagination
       :total="page.total"
       :page.sync="page.pageNum"
       :limit.sync="page.pageSize"
       @pagination="useQuery(params, page)"
       style="height: 32px; margin: 20px 0 0 0; padding: 0 !important"
-    />
+    /> -->
   </el-card>
 </template>
 <style scoped lang="scss">

+ 1 - 2
src/views/purchase/purchase-order/add/index.vue

@@ -597,7 +597,6 @@ export default {
 
               <el-input-number
                 v-if="column.inputType === 'InputNumber'"
-                :min="column.min || 0"
                 v-model="params[column.key]"
                 :precision="column.precision"
                 :controls-position="column.controlsPosition"
@@ -696,6 +695,7 @@ export default {
               :data="params[column.key]" 
               style="width: 100%"
               :height="params[column.key].length ? 300 : 100"
+              border
             >
               <el-table-column
                 v-for="(cColumn, cIndex) in column.tableColumns"
@@ -744,7 +744,6 @@ export default {
                       v-if="cColumn.inputType === 'InputNumber'"
                       v-model="scope.row[cColumn.key]"
                       :precision="cColumn.precision"
-                      :min="column.min || 0"
                       :controls-position="cColumn.controlsPosition"
                       :placeholder="cColumn.placeholder"
                       @change="handleInputChange(scope.row, cColumn.key)"

+ 1 - 1
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"
-                :min="column.min || 0"
                 :max="handleIsRevise() ? params[column.key] : Infinity"
                 :controls-position="column.controlsPosition" 
                 :placeholder="column.placeholder"
@@ -625,6 +624,7 @@ export default {
             :name="column.key"
             >
             <el-table 
+              border
               :data="params[column.key].filter(item => item.delFlag === '0')" 
               style="width: 100%"
               :height="params[column.key].filter(item => item.delFlag === '0').length ? 300 : 100"

+ 36 - 23
src/views/purchase/purchase-order/index.vue

@@ -33,12 +33,9 @@ export default {
     return {
       loading: false,
       tabLoading:false,
-      isSimpleSearch: true,
-      pageSizes: [10, 20, 50, 100],
-      page: initPage(),
+      page: { pageNum: 1, pageSize: 10, total: 0 },
       searchColumns: SearchColumns,
       params: initParams(SearchColumns),
-
       tableColumns: TableColumns,
       tableData: [],
       tabColumns: initTabColumns(),
@@ -99,14 +96,25 @@ export default {
         }
       }
     },
-    handleSearchChange() {
-      this.isSimpleSearch = !this.isSimpleSearch;
+    setSelectable(){
+      return true
+    },
+    setTabSelectable(){
+
+      if(this.tabName === 'puOrderItemList'){
+        return true
+      }
+
+      return false
+
     },
 
     // 刷新操作
     handleRefreshList() {
 
-      this.page = initPage();
+      this.page.pageNum = 1;
+
+      this.page.pageSize = 10;
 
       this.checkedList = [];
               
@@ -131,7 +139,9 @@ export default {
     // 重置操作
     handleResetList() {
 
-      this.page = initPage();
+      this.page.pageNum = 1;
+      
+      this.page.pageSize = 10;
 
       this.params = initParams(SearchColumns);
 
@@ -541,7 +551,7 @@ export default {
     ></el-super-search>
   
     <!-- 操作 -->
-    <el-row :gutter="24" type="flex" justify="end">
+    <el-row :gutter="24" type="flex" justify="end" style="margin-bottom: 16px;">
       <el-col :span="24" style="text-align: right;">
         <el-button size="mini" type="primary" @click="handleOpenAddDrawer"
           v-hasPermi="['material:order:add']">新增</el-button>
@@ -572,22 +582,24 @@ export default {
 
     <el-super-table
       v-model="tableData"
-      size="mini"
       max-height="480"
       :dict="dict"
       :columns="tableColumns"
-      hideOperationColumns
-      stroage
+      :selectable="setSelectable"
+      checkbox
+      :page="page"
+      :iconOperation="false"
+      @pagination="fetchList(params, page)"
       @row-dblclick="handleOpenSeeDrawer" 
       @row-click="handleDetailsData" 
       @select="handleSelect"
     >
 
-      <el-table-column type="selection" width="45" fixed></el-table-column>
-      <el-table-column type="index" width="50" label="序号"></el-table-column>
+      <!-- <el-table-column type="selection" width="45" fixed></el-table-column>
+      <el-table-column type="index" width="50" label="序号"></el-table-column> -->
+      
       <el-table-column fixed="right" label="操作" width="120">
           <template slot-scope="scope">
-          <!-- <template #operation="{scope}"> -->
             <el-button 
               v-if="judgeIsOption('revise',scope.row)"
               type="text" 
@@ -624,7 +636,7 @@ export default {
     
     </el-super-table>
 
-    <pagination
+    <!-- <pagination
       v-show="page.total>0"
       :total="page.total"
       :page.sync="page.pageNum"
@@ -632,7 +644,7 @@ export default {
       :page-sizes="[10,20,50,100,500,1000]"
       @pagination="fetchList(params, page)"
     />
-   
+    -->
     <div style="position: relative; padding-top: 10px;" v-loading="tabLoading">
       <el-row style="position: absolute; top: 30px; right: 20px;z-index: 10;">
         <el-button 
@@ -651,20 +663,21 @@ export default {
         >
           <el-super-table
             v-model="tabTableDatas[column.key]"
-            size="mini"
             max-height="200"
             :dict="dict"
-            hideOperationColumns
-            stroage
             :columns="column.tableColumns"
+            :selectable="setTabSelectable"
+            :checkbox="setTabSelectable()"
+            :page="{pageNum: 1, pageSize: 10, total: 0}"
+            :iconOperation="false"
             @select="handleTabSelect"
           >
-            <el-table-column
+            <!-- <el-table-column
               v-if=" tabName === 'puOrderItemList'" 
               type="selection" 
               width="45"
-            ></el-table-column>
-            <el-table-column type="index" width="50" label="序号"></el-table-column>
+            ></el-table-column> -->
+            <!-- <el-table-column type="index" width="50" label="序号"></el-table-column> -->
           </el-super-table>
          
         </el-tab-pane>

+ 1 - 1
src/views/purchase/purchase-order/see/index.vue

@@ -296,7 +296,7 @@ export default {
             :label="column.title" 
             :name="column.key"
           >
-            <el-table :data="params[column.key]" style="width: 100%">
+            <el-table :data="params[column.key]" style="width: 100%"  border>
               <el-table-column 
                 v-for="(cColumn, cIndex) in column.tableColumns" 
                 :key="cIndex"