Bläddra i källkod

feat: 页面改版

aXin-0810 2 år sedan
förälder
incheckning
620dc165a2

+ 5 - 12
src/views/sales_control/adjust_warehouse.vue

@@ -1,8 +1,7 @@
 <template>
-  <div style="width: 100%; height: 100%">
+  <div style="width: 100%; height: 100%; overflow-y: auto">
     <template-page
       v-if="!pageType"
-      style="width: 100%; height: 100%"
       ref="pageRef"
       :getList="getList"
       :exportList="exportList"
@@ -11,11 +10,9 @@
       :optionsEvensGroup="optionsEvensGroup"
     >
     </template-page>
-    <popu v-if="pageType">
-      <warehouse-form v-if="pageType == 1" />
-      <warehouse-examine v-else-if="pageType == 2" :detailsId="detailsId" />
-      <warehouse-details v-else :detailsId="detailsId" />
-    </popu>
+    <warehouse-form v-else-if="pageType == 1" />
+    <warehouse-examine v-else-if="pageType == 2" :detailsId="detailsId" />
+    <warehouse-details v-else :detailsId="detailsId" />
   </div>
 </template>
 
@@ -167,8 +164,4 @@ export default {
 }
 </script>
 
-<style lang="scss" scoped>
-::v-deep .el-table__body-wrapper {
-  height: 100% !important;
-}
-</style>
+<style lang="scss" scoped></style>

+ 1 - 5
src/views/sales_control/customer_warehouse.vue

@@ -96,8 +96,4 @@ export default {
 }
 </script>
 
-<style lang="scss" scoped>
-::v-deep .el-table__body-wrapper {
-  height: 100% !important;
-}
-</style>
+<style lang="scss" scoped></style>

+ 24 - 29
src/views/sales_control/sales_management/components/return_sales_details.vue

@@ -1,30 +1,30 @@
 <template>
   <div>
-    <el-page-header @back="$parent.pageType=0" content="详情" style=" padding: 20px 20px 0 20px;"></el-page-header>
+    <el-page-header @back="$parent.pageType = 0" content="详情" style="padding: 20px 20px 0 20px"></el-page-header>
     <return-sales-header ref="header" :details="details" />
     <sales-table :dataList="dataList" :column="column" @handleSelection="handleSelection">
-
-
       <template #events>
-        <el-button v-if="details.status==1 " type="primary" size="mini" @click="handleInform(2)">通知退货</el-button>
-        <el-button v-if="details.status==2 " disabled size="mini">撤销退货</el-button>
-       
+        <el-button v-if="details.status == 1" type="primary" size="mini" @click="handleInform(2)">通知退货</el-button>
+        <el-button v-if="details.status == 2" disabled size="mini">撤销退货</el-button>
       </template>
 
-<!--      <template v-slot:operation="{item:{row,$index}}">-->
-<!--        <el-popconfirm-->
-<!--          style="margin-left: 10px"-->
-<!--          title="删除?"-->
-<!--          @onConfirm="handleDel(row,$index)"-->
-<!--        >-->
-<!--          <el-button slot="reference" type="text" size="mini">删除</el-button>-->
-<!--        </el-popconfirm>-->
-<!--      </template>-->
+      <!--      <template v-slot:operation="{item:{row,$index}}">-->
+      <!--        <el-popconfirm-->
+      <!--          style="margin-left: 10px"-->
+      <!--          title="删除?"-->
+      <!--          @onConfirm="handleDel(row,$index)"-->
+      <!--        >-->
+      <!--          <el-button slot="reference" type="text" size="mini">删除</el-button>-->
+      <!--        </el-popconfirm>-->
+      <!--      </template>-->
     </sales-table>
-    <sales-dialog :dialogVisible="dialogVisible" :customerNumber="customerNumber" :func="getDialogList"
-                  @confirm="confirm"
+    <sales-dialog
+      :dialogVisible="dialogVisible"
+      :customerNumber="customerNumber"
+      :func="getDialogList"
+      @confirm="confirm"
     />
-  </div> 
+  </div>
 </template>
 
 <script>
@@ -70,7 +70,7 @@ export default {
         {
           prop: 'qty',
           label: '已退数量',
-          width: '180',
+          width: '180'
         },
         // {
         //   prop: 'volume',
@@ -84,13 +84,13 @@ export default {
         // },
         {
           prop: 'notes',
-          label: '备注',
-
-
+          label: '备注'
         }
-      ]    }
+      ]
+    }
   },
   created() {
+    console.log(this.$parent)
     if (this.detailsId) {
       detailRefund({ id: this.detailsId }).then(res => {
         this.dataList = res.data.orders
@@ -111,7 +111,6 @@ export default {
       this.$refs.header.screenForm.customerNumber = this.dataList[0].customerNumber
       this.customerNumber = this.dataList[0].customerNumber
       this.dialogVisible = false
-
     },
     handleDel(item, index) {
       this.dataList.splice(index, 1)
@@ -133,7 +132,6 @@ export default {
       sendRefund({ id: this.details.id, status }).then(res => {
         this.$successMsg('退货通知')
         this.$parent.pageType = 0
-
       })
     },
     handelSubmit() {
@@ -151,11 +149,8 @@ export default {
         this.$forceUpdate()
       })
     }
-
   }
 }
 </script>
 
-<style scoped>
-
-</style>
+<style scoped></style>

+ 108 - 118
src/views/sales_control/sales_management/components/sel-export-column-list.vue

@@ -1,118 +1,108 @@
-<template>
-  <el-dialog
-    title="勾选导出列"
-    :before-close="cancel"
-    :visible.sync="dialogVisible"
-    width="400px"
-  >
-    <el-table
-      :data="exportColumnList"
-      v-bind="{
-        height: '100%',
-        style: 'width: 100%',
-        border: true,
-        headerCellClassName: 'headerRowColor',
-        size: 'mini'
-      }"
-    >
-      <el-table-column
-        v-bind="{
-          label: '显示',
-          prop: '',
-          width: '80px'
-        }"
-      >
-        <template slot="header" slot-scope="scope">
-          <div>
-            <el-checkbox v-model="isExport"></el-checkbox>
-            <span style="margin-left:5px">导出</span>
-          </div>
-        </template>
-        <template slot-scope="scope">
-          <el-checkbox v-model="scope.row.isExport"></el-checkbox>
-        </template>
-      </el-table-column>
-      <el-table-column
-        v-bind="{
-          label: '列名',
-          prop: ''
-        }"
-      >
-        <template slot-scope="scope">
-          <div>
-            {{ scope.row.label }}
-          </div>
-        </template>
-      </el-table-column>
-    </el-table>
-    <span slot="footer" class="dialog-footer">
-      <el-button size="mini" @click="cancel">取 消</el-button>
-      <el-button size="mini" type="primary" @click="determine">确 定</el-button>
-    </span>
-  </el-dialog>
-</template>
-
-<script>
-export default {
-  props: {
-    columnList: {
-      type: Array,
-      default: () => []
-    }
-  },
-  data() {
-    return {
-      dialogVisible: false,
-      isExport: true,
-      exportColumnList: []
-    };
-  },
-  watch: {
-    columnList: {
-      handler() {
-        if (this.columnList && this.columnList.length) {
-          this.exportColumnList = this.columnList.map(item => {
-            return { ...item.exportField, isExport: true };
-          });
-          this.dialogVisible = true;
-        } else {
-          this.exportColumnList = [];
-          this.dialogVisible = false;
-        }
-      },
-      deep: true
-    },
-    exportColumnList: {
-      handler() {
-        this.isExport = this.exportColumnList.every(
-          item => item.isExport === true
-        );
-      },
-      deep: true
-    },
-    isExport() {
-      if (
-        this.exportColumnList.every(item => item.isExport === true) !==
-        this.isExport
-      ) {
-        this.exportColumnList.map(item => {
-          item.isExport = this.isExport;
-        });
-      }
-    }
-  },
-  methods: {
-    cancel() {
-      this.$emit("cancel");
-    },
-    determine() {
-      this.$emit(
-        "determine",
-        this.exportColumnList.filter(item => item.isExport)
-      );
-    }
-  }
-};
-</script>
-
-<style lang="scss" scoped></style>
+<template>
+  <el-dialog title="勾选导出列" :before-close="cancel" :visible.sync="dialogVisible" width="400px">
+    <el-table
+      :data="exportColumnList"
+      v-bind="{
+        height: '100%',
+        style: 'width: 100%',
+        border: true,
+        headerCellClassName: 'headerRowColor',
+        size: 'mini'
+      }"
+    >
+      <el-table-column
+        v-bind="{
+          label: '显示',
+          prop: '',
+          width: '80px'
+        }"
+      >
+        <template slot="header" slot-scope="scope">
+          <div>
+            <el-checkbox v-model="isExport"></el-checkbox>
+            <span style="margin-left: 5px">导出</span>
+          </div>
+        </template>
+        <template slot-scope="scope">
+          <el-checkbox v-model="scope.row.isExport"></el-checkbox>
+        </template>
+      </el-table-column>
+      <el-table-column
+        v-bind="{
+          label: '列名',
+          prop: ''
+        }"
+      >
+        <template slot-scope="scope">
+          <div>
+            {{ scope.row.label }}
+          </div>
+        </template>
+      </el-table-column>
+    </el-table>
+    <span slot="footer" class="dialog-footer">
+      <el-button size="mini" @click="cancel">取 消</el-button>
+      <el-button size="mini" type="primary" @click="determine">确 定</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  props: {
+    columnList: {
+      type: Array,
+      default: () => []
+    }
+  },
+  data() {
+    return {
+      dialogVisible: false,
+      isExport: true,
+      exportColumnList: []
+    }
+  },
+  watch: {
+    columnList: {
+      handler() {
+        if (this.columnList && this.columnList.length) {
+          this.exportColumnList = this.columnList.map(item => {
+            return { ...item.exportField, isExport: true }
+          })
+          this.dialogVisible = true
+        } else {
+          this.exportColumnList = []
+          this.dialogVisible = false
+        }
+      },
+      deep: true
+    },
+    exportColumnList: {
+      handler() {
+        this.isExport = this.exportColumnList.every(item => item.isExport === true)
+      },
+      deep: true
+    },
+    isExport() {
+      if (this.exportColumnList.every(item => item.isExport === true) !== this.isExport) {
+        this.exportColumnList.map(item => {
+          item.isExport = this.isExport
+        })
+      }
+    }
+  },
+  methods: {
+    cancel() {
+      this.$emit('cancel')
+    },
+    determine() {
+      this.$emit(
+        'determine',
+        this.exportColumnList.filter(item => item.isExport)
+      )
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped></style>

+ 4 - 11
src/views/sales_control/sales_management/customer_sales_list.vue

@@ -1,8 +1,7 @@
 <template>
-  <div style="width: 100%; height: 100%">
+  <div style="width: 100%; height: 100%; overflow-y: auto">
     <template-page
       v-if="!pageType"
-      style="width: 100%; height: 100%"
       ref="pageRef"
       :getList="getList"
       :exportList="exportList"
@@ -11,10 +10,8 @@
       :optionsEvensGroup="optionsEvensGroup"
     >
     </template-page>
-    <popu v-if="pageType">
-      <customer_sales_form :detailsId="detailsId" v-if="pageType === 1 || pageType === 2" />
-      <customer_sales_details :detailsId="detailsId" v-else />
-    </popu>
+    <customer_sales_form :detailsId="detailsId" v-else-if="pageType === 1 || pageType === 2" />
+    <customer_sales_details :detailsId="detailsId" v-else />
   </div>
 </template>
 
@@ -194,8 +191,4 @@ export default {
 }
 </script>
 
-<style lang="scss" scoped>
-::v-deep .el-table__body-wrapper {
-  height: 100% !important;
-}
-</style>
+<style lang="scss" scoped></style>

+ 5 - 12
src/views/sales_control/sales_management/return_sales_list.vue

@@ -1,5 +1,5 @@
 <template>
-  <div style="width: 100%; height: 100%">
+  <div style="width: 100%; height: 100%; overflow-y: auto">
     <template-page
       v-if="!pageType"
       ref="pageRef"
@@ -10,15 +10,12 @@
       :optionsEvensGroup="optionsEvensGroup"
     >
     </template-page>
-    <popu v-if="pageType">
-      <return_sales_form v-if="pageType === 1 || pageType === 2" :details-id="detailsId" />
-      <return_sales_details v-else :details-id="detailsId" />
-    </popu>
+    <return_sales_form v-else-if="pageType === 1 || pageType === 2" :details-id="detailsId" />
+    <return_sales_details v-else :details-id="detailsId" />
   </div>
 </template>
 
 <script>
-import popu from '@/components/template/popu.vue'
 import TemplatePage from '@/components/template/template-page-1.vue'
 import import_mixin from '@/components/template/import_mixin.js'
 import { delDeleteRefund, exportRefund, getFrontOrderListRefund } from '@/api/sales'
@@ -26,7 +23,7 @@ import return_sales_form from '@/views/sales_control/sales_management/components
 import return_sales_details from '@/views/sales_control/sales_management/components/return_sales_details'
 
 export default {
-  components: { TemplatePage, return_sales_form, return_sales_details, popu },
+  components: { TemplatePage, return_sales_form, return_sales_details },
   mixins: [import_mixin],
   data() {
     return {
@@ -164,8 +161,4 @@ export default {
 }
 </script>
 
-<style lang="scss" scoped>
-::v-deep .el-table__body-wrapper {
-  height: 100% !important;
-}
-</style>
+<style lang="scss" scoped></style>

+ 1 - 5
src/views/sales_control/stock_three_level.vue

@@ -96,8 +96,4 @@ export default {
 }
 </script>
 
-<style lang="scss" scoped>
-::v-deep .el-table__body-wrapper {
-  height: 100% !important;
-}
-</style>
+<style lang="scss" scoped></style>

+ 2 - 2
src/views/setting/menu.vue

@@ -91,7 +91,7 @@
           <el-input placeholder="请输入URL" v-model="addParentForm.url"></el-input>
         </el-form-item>
         <el-form-item label="全URL" prop="fullUrl">
-          <el-input placeholder="请输入全URL" v-model="addParentForm.fullUrl" :disabled="!isAdmin"></el-input>
+          <el-input placeholder="请输入全URL" v-model="addParentForm.fullUrl"></el-input>
         </el-form-item>
         <el-form-item label="图标" prop="icon">
           <div class="iconInput">
@@ -155,7 +155,7 @@
           <el-input placeholder="请输入URL" v-model="addChildForm.url"></el-input>
         </el-form-item>
         <el-form-item label="全URL" prop="fullUrl">
-          <el-input placeholder="请输入全URL" v-model="addChildForm.fullUrl" :disabled="!isAdmin"></el-input>
+          <el-input placeholder="请输入全URL" v-model="addChildForm.fullUrl"></el-input>
         </el-form-item>
         <el-form-item label="图标" prop="icon">
           <div class="iconInput">

+ 26 - 25
src/views/stock_control/adjust_warehouse.vue

@@ -1,9 +1,7 @@
 <template>
-  <div>
+  <div style="width: 100%; height: 100%; overflow-y: auto">
     <template-page
       v-if="!pageType"
-      style="width: 100%;
-      height: 100%;"
       ref="pageRef"
       :getList="getList"
       :exportList="exportList"
@@ -12,23 +10,23 @@
       :optionsEvensGroup="optionsEvensGroup"
     >
     </template-page>
-    <warehouse-form v-else-if="pageType==1" />
-    <warehouse-examine v-else-if="pageType==2" :detailsId="detailsId" />
+    <warehouse-form v-else-if="pageType == 1" />
+    <warehouse-examine v-else-if="pageType == 2" :detailsId="detailsId" />
     <warehouse-details v-else :detailsId="detailsId" />
   </div>
 </template>
 
 <script>
+import popu from '@/components/template/popu.vue'
 import TemplatePage from '@/components/template/template-page-1.vue'
 import import_mixin from '@/components/template/import_mixin.js'
-
 import { getFrontListCustomerAcc, exportCustomerStockOrderBean, deleteCustomerStockOrder } from '@/api/stock'
 import WarehouseForm from '@/views/stock_control/components/WarehouseForm'
 import WarehouseExamine from '@/views/stock_control/components/WarehouseExamine'
 import WarehouseDetails from '@/views/stock_control/components/WarehouseDetails'
 
 export default {
-  components: { TemplatePage, WarehouseForm, WarehouseExamine, WarehouseDetails },
+  components: { TemplatePage, WarehouseForm, WarehouseExamine, WarehouseDetails, popu },
   mixins: [import_mixin],
   data() {
     return {
@@ -38,10 +36,10 @@ export default {
           [
             {
               name: '库存调整2',
-              click:this.addWarehouse
+              click: this.addWarehouse
             }
           ]
-        ],
+        ]
       ],
       // 表格属性
       tableAttributes: {
@@ -54,7 +52,7 @@ export default {
       },
       recordSelected: [],
       detailsId: '',
-      pageType: 0,
+      pageType: 0
     }
   },
   methods: {
@@ -75,7 +73,7 @@ export default {
     },
     addWarehouse() {
       this.pageType = 1
-      console.log(this.pageType,'333')
+      console.log(this.pageType, '333')
     },
     operation() {
       return (h, { row, index, column }) => {
@@ -83,39 +81,42 @@ export default {
           <div class="operation-btns">
             <el-button
               size="mini"
-              type="text" onClick={() => {
-              this.detailsId = row.id
-              this.pageType = 3
-
-            }}
+              type="text"
+              onClick={() => {
+                this.detailsId = row.id
+                this.pageType = 3
+              }}
             >
               查看
             </el-button>
             {row.examineStatus != 'OK' || row.examineStatus != 'CLOSE' ? (
               <el-button
                 size="mini"
-                type="text" onClick={() => {
-                this.detailsId = row.id
-                this.pageType = 2
-              }}
+                type="text"
+                onClick={() => {
+                  this.detailsId = row.id
+                  this.pageType = 2
+                }}
               >
                 审批
               </el-button>
             ) : null}
             <el-popconfirm
-              onOnConfirm = {()=>{
+              onOnConfirm={() => {
                 deleteCustomerStockOrder({ id: row.id }).then(res => {
                   this.$successMsg('删除成功')
-                  this.$refs.pageRef.refreshList();
-                })              }}
+                  this.$refs.pageRef.refreshList()
+                })
+              }}
               title="删除吗?"
             >
-              <el-button slot="reference" size="mini" type="text">删除</el-button>
+              <el-button slot="reference" size="mini" type="text">
+                删除
+              </el-button>
             </el-popconfirm>
           </div>
         )
       }
-
     }
     // 批量删除
     // dels() {

+ 3 - 16
src/views/stock_control/customer_warehouse.vue

@@ -1,15 +1,6 @@
 <template>
-  <div>
-    <template-page
-      style="width: 100%;
-      height: 100%;"
-      ref="pageRef"
-      :getList="getList"
-      :exportList="exportList"
-      :columnParsing="columnParsing"
-    >
-    </template-page>
-  </div>
+  <template-page ref="pageRef" :getList="getList" :exportList="exportList" :columnParsing="columnParsing">
+  </template-page>
 </template>
 
 <script>
@@ -105,8 +96,4 @@ export default {
 }
 </script>
 
-<style lang="scss" scoped>
-::v-deep .el-table__body-wrapper {
-  height: 100% !important;
-}
-</style>
+<style lang="scss" scoped></style>

+ 1 - 5
src/views/stock_control/preposition_stock_list.vue

@@ -96,8 +96,4 @@ export default {
 }
 </script>
 
-<style lang="scss" scoped>
-::v-deep .el-table__body-wrapper {
-  height: 100% !important;
-}
-</style>
+<style lang="scss" scoped></style>

+ 27 - 26
src/views/stock_control/sales_management/customer_sales_list.vue

@@ -1,9 +1,7 @@
 <template>
-  <div>
+  <div style="width: 100%; height: 100%; overflow-y: auto">
     <template-page
       v-if="!pageType"
-      style="width: 100%;
-      height: 100%;"
       ref="pageRef"
       :getList="getList"
       :exportList="exportList"
@@ -12,12 +10,13 @@
       :optionsEvensGroup="optionsEvensGroup"
     >
     </template-page>
-    <customer_sales_form :detailsId="detailsId" v-else-if="pageType===1 || pageType ===2" />
+    <customer_sales_form :detailsId="detailsId" v-else-if="pageType === 1 || pageType === 2" />
     <customer_sales_details :detailsId="detailsId" v-else />
   </div>
 </template>
 
 <script>
+import popu from '@/components/template/popu.vue'
 import TemplatePage from '@/components/template/template-page-1.vue'
 import import_mixin from '@/components/template/import_mixin.js'
 import { delFrontOrder, exportCustomerFrontOrder, getFrontOrderList } from '@/api/sales'
@@ -25,7 +24,7 @@ import customer_sales_form from '@/views/sales_control/sales_management/componen
 import customer_sales_details from '@/views/sales_control/sales_management/components/customer_sales_details'
 
 export default {
-  components: { TemplatePage, customer_sales_form, customer_sales_details },
+  components: { TemplatePage, customer_sales_form, customer_sales_details, popu },
   mixins: [import_mixin],
   data() {
     return {
@@ -97,20 +96,21 @@ export default {
           <div class="operation-btns">
             <el-button
               size="mini"
-              type="text" onClick={() => {
-              this.detailsId = row.id
-              this.pageType = 3
-
-            }}
+              type="text"
+              onClick={() => {
+                this.detailsId = row.id
+                this.pageType = 3
+              }}
             >
               查看
             </el-button>
             <el-button
               size="mini"
-              type="text" onClick={() => {
-              this.detailsId = row.id
-              this.pageType = 2
-            }}
+              type="text"
+              onClick={() => {
+                this.detailsId = row.id
+                this.pageType = 2
+              }}
             >
               编辑
             </el-button>
@@ -123,23 +123,24 @@ export default {
               }}
               title="删除吗?"
             >
-              <el-button slot="reference" size="mini" type="text">删除</el-button>
+              <el-button slot="reference" size="mini" type="text">
+                删除
+              </el-button>
             </el-popconfirm>
           </div>
         )
       }
-
     }
-// <el-popconfirm
-//   onOnConfirm = {()=>{
-//     deleteCustomerStockOrder({ id: row.id }).then(res => {
-//       this.$successMsg('删除成功')
-//       this.$refs.pageRef.getTableData()
-//     })              }}
-//   title="删除吗?"
-// >
-//   <el-button slot="reference" type="text">删除</el-button>
-// </el-popconfirm>
+    // <el-popconfirm
+    //   onOnConfirm = {()=>{
+    //     deleteCustomerStockOrder({ id: row.id }).then(res => {
+    //       this.$successMsg('删除成功')
+    //       this.$refs.pageRef.getTableData()
+    //     })              }}
+    //   title="删除吗?"
+    // >
+    //   <el-button slot="reference" type="text">删除</el-button>
+    // </el-popconfirm>
 
     // 批量删除
     // dels() {

+ 27 - 26
src/views/stock_control/sales_management/return_sales_list.vue

@@ -1,9 +1,7 @@
 <template>
-  <div>
+  <div style="width: 100%; height: 100%; overflow-y: auto">
     <template-page
       v-if="!pageType"
-      style="width: 100%;
-      height: 100%;"
       ref="pageRef"
       :getList="getList"
       :exportList="exportList"
@@ -12,33 +10,34 @@
       :optionsEvensGroup="optionsEvensGroup"
     >
     </template-page>
-    <return_sales_form v-else-if="pageType===1 || pageType ===2" :details-id="detailsId"/>
-    <return_sales_details v-else :details-id="detailsId"/>
+    <return_sales_form v-else-if="pageType === 1 || pageType === 2" :details-id="detailsId" />
+    <return_sales_details v-else :details-id="detailsId" />
   </div>
 </template>
 
 <script>
+import popu from '@/components/template/popu.vue'
 import TemplatePage from '@/components/template/template-page-1.vue'
 import import_mixin from '@/components/template/import_mixin.js'
 import { delDeleteRefund, exportRefund, getFrontOrderListRefund } from '@/api/sales'
 import return_sales_form from '@/views/sales_control/sales_management/components/return_sales_form'
 import return_sales_details from '@/views/sales_control/sales_management/components/return_sales_details'
 export default {
-  components: { TemplatePage,return_sales_form,return_sales_details },
+  components: { TemplatePage, return_sales_form, return_sales_details, popu },
   mixins: [import_mixin],
   data() {
     return {
-      detailsId:'',
-      pageType:0,
+      detailsId: '',
+      pageType: 0,
       // 事件组合
       optionsEvensGroup: [
         [
           [
             {
               name: '新增',
-              click: ()=>{
+              click: () => {
                 this.pageType = 1
-                this.detailsId =''
+                this.detailsId = ''
               }
             }
           ]
@@ -47,7 +46,7 @@ export default {
           [
             {
               name: '编辑',
-              click: ()=>{
+              click: () => {
                 this.pageType = 1
               }
             }
@@ -96,38 +95,40 @@ export default {
           <div class="operation-btns">
             <el-button
               size="mini"
-              type="text" onClick={() => {
-              this.detailsId = row.id
-              this.pageType = 3
-
-            }}
+              type="text"
+              onClick={() => {
+                this.detailsId = row.id
+                this.pageType = 3
+              }}
             >
               查看
             </el-button>
             <el-button
               size="mini"
-              type="text" onClick={() => {
-              this.detailsId = row.id
-              this.pageType = 2
-            }}
+              type="text"
+              onClick={() => {
+                this.detailsId = row.id
+                this.pageType = 2
+              }}
             >
               编辑
             </el-button>
             <el-popconfirm
-              onOnConfirm = {()=>{
+              onOnConfirm={() => {
                 delDeleteRefund({ id: row.id }).then(res => {
                   this.$successMsg('删除成功')
-                  this.$refs.pageRef.refreshList();
-
-                })              }}
+                  this.$refs.pageRef.refreshList()
+                })
+              }}
               title="删除吗?"
             >
-              <el-button slot="reference" size="mini" type="text">删除</el-button>
+              <el-button slot="reference" size="mini" type="text">
+                删除
+              </el-button>
             </el-popconfirm>
           </div>
         )
       }
-
     }
 
     // 批量删除

+ 3 - 16
src/views/stock_control/stock_three_level.vue

@@ -1,15 +1,6 @@
 <template>
-  <div>
-    <template-page
-      style="width: 100%;
-      height: 100%;"
-      ref="pageRef"
-      :getList="getList"
-      :exportList="exportList"
-      :columnParsing="columnParsing"
-    >
-    </template-page>
-  </div>
+  <template-page ref="pageRef" :getList="getList" :exportList="exportList" :columnParsing="columnParsing">
+  </template-page>
 </template>
 
 <script>
@@ -105,8 +96,4 @@ export default {
 }
 </script>
 
-<style lang="scss" scoped>
-::v-deep .el-table__body-wrapper {
-  height: 100% !important;
-}
-</style>
+<style lang="scss" scoped></style>

+ 116 - 125
src/views/supply/pickup/barcode.vue

@@ -1,136 +1,127 @@
 <template>
-    <div>
-      <template-page
-        style="width: 100%;
-        height: 100%;"
-        ref="pageRef"
-        :getList="getList"
-        :exportList="exportList"
-        :columnParsing="columnParsing"
-        :optionsEvensGroup="optionsEvensGroup"
-      >
-      </template-page>
-    </div>
-  </template>
-  
-  <script>
-  import TemplatePage from '@/components/template/template-page-1.vue'
-  import import_mixin from '@/components/template/import_mixin.js'
-  
-  import { getSalseList, salseExport,salseImport, salseCodeDownload } from '@/api/stock'
-  export default {
-    components: { TemplatePage },
-    mixins: [import_mixin],
-    data() {
-      return {
-        // 事件组合
-        optionsEvensGroup: [
+  <template-page
+    style="width: 100%; height: 100%"
+    ref="pageRef"
+    :getList="getList"
+    :exportList="exportList"
+    :columnParsing="columnParsing"
+    :optionsEvensGroup="optionsEvensGroup"
+  >
+  </template-page>
+</template>
+
+<script>
+import TemplatePage from '@/components/template/template-page-1.vue'
+import import_mixin from '@/components/template/import_mixin.js'
+
+import { getSalseList, salseExport, salseImport, salseCodeDownload } from '@/api/stock'
+export default {
+  components: { TemplatePage },
+  mixins: [import_mixin],
+  data() {
+    return {
+      // 事件组合
+      optionsEvensGroup: [
         [
-            [
+          [
             {
-                name: "下载模板",
-                click: () => {
-                  salseCodeDownload({}, `${this.$route.meta.title}`)
-                    .then(res => {
-                      console.log('chengg');
-                      this.$message({
-                        message: "下载成功",
-                        type: "success"
-                      });
+              name: '下载模板',
+              click: () => {
+                salseCodeDownload({}, `${this.$route.meta.title}`)
+                  .then(res => {
+                    console.log('chengg')
+                    this.$message({
+                      message: '下载成功',
+                      type: 'success'
                     })
-                    .catch(err => {
-                      this.$message.error("下载失败");
-                    });
-                },
-                // isRole: this.$checkBtnRole("import",this.$route.meta.roles)
-              }
-            ]
-          ],
-          [
-            [
-              {
-                name: '',
-                render:this.importButton(salseImport),
-                // isRole: this.$checkBtnRole("import",this.$route.meta.roles)
+                  })
+                  .catch(err => {
+                    this.$message.error('下载失败')
+                  })
               }
-            ]
+              // isRole: this.$checkBtnRole("import",this.$route.meta.roles)
+            }
           ]
-         
         ],
-        // 表格属性
-        tableAttributes: {
-          // 启用勾选列
-          selectColumn: true
-        },
-        // 表格事件
-        tableEvents: {
-          'selection-change': this.selectionChange
-        },
-        recordSelected: []
-      }
-    },
-    methods: {
-      // 列表请求函数
-      getList(...p) {
-        this.recordSelected = []
-        return getSalseList(...p)
+        [
+          [
+            {
+              name: '',
+              render: this.importButton(salseImport)
+              // isRole: this.$checkBtnRole("import",this.$route.meta.roles)
+            }
+          ]
+        ]
+      ],
+      // 表格属性
+      tableAttributes: {
+        // 启用勾选列
+        selectColumn: true
       },
-      // 列表导出函数
-      exportList: salseExport,
-      // 表格列解析渲染数据更改
-      columnParsing(item, defaultData) {
-        return defaultData
+      // 表格事件
+      tableEvents: {
+        'selection-change': this.selectionChange
       },
-      // 监听勾选变化
-      selectionChange(data) {
-        this.recordSelected = data
-      }
-      // 批量删除
-      // dels() {
-      //   if (this.recordSelected.length) {
-      //     this.$confirm('此操作将删除数据, 是否继续?', '提示', {
-      //       confirmButtonText: '确定',
-      //       cancelButtonText: '取消',
-      //       type: 'warning'
-      //     })
-      //       .then(() => {
-      //         partsOldOutDel({
-      //           ids: this.recordSelected.map(item => item.id).join(',')
-      //         })
-      //           .then(res => {
-      //             this.$refs.pageRef.refreshList()
-      //             this.$message({
-      //               type: 'success',
-      //               message: '删除成功!'
-      //             })
-      //           })
-      //           .catch(() => {
-      //             this.$message({
-      //               type: 'error',
-      //               message: '删除失败'
-      //             })
-      //           })
-      //       })
-      //       .catch(() => {
-      //         this.$message({
-      //           type: 'info',
-      //           message: '已取消删除'
-      //         })
-      //       })
-      //   } else {
-      //     this.$message({
-      //       type: 'info',
-      //       message: '请先勾选需要删除的数据!'
-      //     })
-      //   }
-      // }
+      recordSelected: []
     }
+  },
+  methods: {
+    // 列表请求函数
+    getList(...p) {
+      this.recordSelected = []
+      return getSalseList(...p)
+    },
+    // 列表导出函数
+    exportList: salseExport,
+    // 表格列解析渲染数据更改
+    columnParsing(item, defaultData) {
+      return defaultData
+    },
+    // 监听勾选变化
+    selectionChange(data) {
+      this.recordSelected = data
+    }
+    // 批量删除
+    // dels() {
+    //   if (this.recordSelected.length) {
+    //     this.$confirm('此操作将删除数据, 是否继续?', '提示', {
+    //       confirmButtonText: '确定',
+    //       cancelButtonText: '取消',
+    //       type: 'warning'
+    //     })
+    //       .then(() => {
+    //         partsOldOutDel({
+    //           ids: this.recordSelected.map(item => item.id).join(',')
+    //         })
+    //           .then(res => {
+    //             this.$refs.pageRef.refreshList()
+    //             this.$message({
+    //               type: 'success',
+    //               message: '删除成功!'
+    //             })
+    //           })
+    //           .catch(() => {
+    //             this.$message({
+    //               type: 'error',
+    //               message: '删除失败'
+    //             })
+    //           })
+    //       })
+    //       .catch(() => {
+    //         this.$message({
+    //           type: 'info',
+    //           message: '已取消删除'
+    //         })
+    //       })
+    //   } else {
+    //     this.$message({
+    //       type: 'info',
+    //       message: '请先勾选需要删除的数据!'
+    //     })
+    //   }
+    // }
   }
-  </script>
-  
-  <style lang="scss" scoped>
-  ::v-deep .el-table__body-wrapper {
-    height: 100% !important;
-  }
-  </style>
-  
+}
+</script>
+
+<style lang="scss" scoped></style>