瀏覽代碼

仓库调整详情

zhouhao 2 年之前
父節點
當前提交
d886385ae0

+ 107 - 4
src/components/WarehousingHeader/WarehousingHeader.vue

@@ -1,13 +1,116 @@
 <template>
-$END$
+  <div class="warehousing">
+    <el-form v-if="pageTyep==='add'" :rules="rules" label-position="left" label-width="120px" :model="screenForm" size="mini">
+      <el-row gutter="20">
+        <el-col :xs="24" :ms="8" :lg="8">
+          <el-form-item label="商家编号" prop="name">
+            <el-input v-model="screenForm.code" placeholder="商家编号" size="mini" />
+          </el-form-item>
+        </el-col>
+        <el-col :xs="24" :ms="8" :lg="8">
+          <el-form-item label="商家名称" prop="code">
+            <el-input v-model="screenForm.code" placeholder="商家名称" size="mini" />
+          </el-form-item>
+        </el-col>
+        <el-col :xs="24" :ms="8" :lg="8">
+          <el-form-item label="调整日期" prop="code">
+            <el-input v-model="screenForm.code" placeholder="调整日期" size="mini" />
+          </el-form-item>
+        </el-col>
+        <el-col :xs="24" :ms="8" :lg="8">
+          <el-form-item label="制单人" prop="code">
+            <el-input v-model="screenForm.code" placeholder="制单人" size="mini" />
+          </el-form-item>
+        </el-col>
+        <el-col :xs="24" :ms="8" :lg="8">
+          <el-form-item label="制单时间" prop="code">
+            <el-input v-model="screenForm.code" placeholder="制单时间" size="mini" />
+          </el-form-item>
+        </el-col>
+        <el-col :xs="24" :ms="24" :lg="24">
+          <el-form-item label="备注" prop="code">
+            <el-input v-model="screenForm.code" placeholder="备注" size="mini" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div v-else>
+      <h5>单据信息</h5>
+      <div  class="diy-table-1">
+        <el-row>
+          <el-col :span="6" class="item">
+            <div class="label">调整单号</div>
+            <div class="value">2222</div>
+          </el-col>
+          <el-col :span="6" class="item">
+            <div class="label">商家编号</div>
+            <div class="value">2222</div>
+          </el-col>
+          <el-col :span="6" class="item">
+            <div class="label">商家名称</div>
+            <div class="value">2222</div>
+          </el-col>
+          <el-col :span="6" class="item">
+            <div class="label">调整日期</div>
+            <div class="value">2222</div>
+          </el-col>
+          <el-col :span="6" class="item">
+            <div class="label">制单人</div>
+            <div class="value">2222</div>
+          </el-col>
+          <el-col :span="18" class="item">
+            <div class="label">制单时间</div>
+            <div class="value">2222</div>
+          </el-col>
+          <el-col :span="24" class="item">
+            <div class="label">备注</div>
+            <div class="value">2222</div>
+          </el-col>
+
+        </el-row>
+      </div>
+
+    </div>
+  </div>
 </template>
 
 <script>
 export default {
-name: "WarehousingHeader"
+  name: 'WarehousingHeader',
+  props: {
+    pageTyep: {
+      type: String,
+      default: 'add'
+    }
+  },
+  data() {
+    return {
+      screenForm: {},
+      rules: {
+        name: [
+          { required: true, message: '请输入销售订单号', trigger: 'blur' },
+          { required: true, message: '请输入商家编号', trigger: 'blur' },
+          { required: true, message: '请输入商家名称', trigger: 'blur' },
+          { required: true, message: '请输入配送日期', trigger: 'blur' },
+          { required: true, message: '请输入发货仓库编号', trigger: 'blur' },
+          { required: true, message: '请输入发货仓库名称', trigger: 'blur' },
+          { required: true, message: '请输入用户名称', trigger: 'blur' },
+          { required: true, message: '请输入用户电话', trigger: 'blur' },
+          { required: true, message: '请输入商家编号', trigger: 'blur' },
+          { required: true, message: '请输入送货地址', trigger: 'blur' },
+          { required: true, message: '请输入备注', trigger: 'blur' }
+
+        ]
+      }
+    }
+  }
 }
 </script>
 
-<style scoped>
-
+<style scoped lang="scss">
+.warehousing {
+  margin: 20px;
+  padding: 20px;
+  box-shadow: 0 0 8px 0 rgb(0 0 0 / 20%);
+}
 </style>

+ 3 - 1
src/views/basic_data/stock/adjust_warehouse.vue

@@ -9,6 +9,7 @@
       :columnParsing="columnParsing"
     >
     </template-page>
+    <warehousing-header/>
   </div>
 </template>
 
@@ -17,8 +18,9 @@ import TemplatePage from '@/components/template/template-page-1.vue'
 import import_mixin from '@/components/template/import_mixin.js'
 
 import { getFrontListCustomerAcc, exportCustomerStockOrderBean } from '@/api/stock'
+import WarehousingHeader from '@/components/WarehousingHeader/WarehousingHeader'
 export default {
-  components: { TemplatePage },
+  components: { TemplatePage,WarehousingHeader },
   mixins: [import_mixin],
   data() {
     return {

+ 78 - 87
src/views/sales/sales_management/customer_sales_list.vue

@@ -1,121 +1,112 @@
 <template>
   <div>
-    <!--    <zj-page-template-->
-    <!--      :getTableData="getTableData"-->
-    <!--      :optionsEvens="evens"-->
-    <!--      :tableAttributes="tableAttributes"-->
-    <!--      :tableEvents="tableEvents"-->
-    <!--      :columnParsing="columnParsing"-->
-    <!--      :plan="plan"-->
-    <!--      @columnWidthChange="columnWidthChange"-->
-    <!--      @columnListChange="columnListChange"-->
-    <!--    />-->
-    <sales-header />
-    <sales-table/>
+    <template-page
+      style="width: 100%;
+      height: 100%;"
+      ref="pageRef"
+      :getList="getList"
+      :exportList="exportList"
+      :columnParsing="columnParsing"
+    >
+    </template-page>
   </div>
 </template>
 
 <script>
-import tableDataJson from './components/tableData'
-import SalesHeader from '@/components/SalesHeader/SalesHeader'
-import SalesTable from '@/components/SalesTable/SalesTable'
+import TemplatePage from '@/components/template/template-page-1.vue'
+import import_mixin from '@/components/template/import_mixin.js'
 
+import { getcustomerFrontList, partsNewInExport } from '@/api/stock'
 export default {
-  components: {
-    SalesHeader,
-    SalesTable
-  },
+  components: { TemplatePage },
+  mixins: [import_mixin],
   data() {
     return {
-      // 按钮集合
-      evens: [
-        [
-          {
-            name: '刷新',
-            click: this.refresh
-          }
-        ],
+      // 事件组合
+      optionsEvensGroup: [
         [
-          {
-            name: '新增',
-            click: this.add
-          },
-          {
-            name: '删除',
-            click: this.del
-          }
+          [
+            {
+              name: '批量删除',
+              click: this.dels,
+              isRole: this.$checkBtnRole('del', this.$route.meta.roles)
+            }
+          ]
         ]
       ],
-      // 我的方案
-      plan: [
-        {
-          name: '默认方案',
-          paramCallback: () => {
-            return []
-          }
-        },
-        {
-          name: '今天',
-          paramCallback: () => {
-            return []
-          }
-        },
-        {
-          name: '本周',
-          paramCallback: () => {
-            return []
-          }
-        }
-      ],
+      // 表格属性
       tableAttributes: {
         // 启用勾选列
         selectColumn: true
       },
+      // 表格事件
       tableEvents: {
         'selection-change': this.selectionChange
-      }
+      },
+      recordSelected: []
     }
   },
   methods: {
-    // 获取列表数据函数
-    getTableData(data) {
-      // console.log("参数:" + JSON.stringify(data));
-      return tableDataJson
+    // 列表请求函数
+    getList(...p) {
+      this.recordSelected = []
+      return getcustomerFrontList(...p)
     },
+    // 列表导出函数
+    exportList: partsNewInExport,
     // 表格列解析渲染数据更改
     columnParsing(item, defaultData) {
-      // console.log(item, defaultData);
       return defaultData
     },
-    // 监听列表显示状态与排序变化
-    columnListChange(columnList) {
-      // console.log(columnList);
-    },
-    // 监听列宽度变化
-    columnWidthChange({ newWidth, oldWidth, column }) {
-      // console.log(newWidth, oldWidth, column);
-    },
     // 监听勾选变化
-    selectionChange(arr) {
-      // console.log(arr);
-    },
-    /**
-     * 更多其他操作
-     */
-    refresh() {
-      alert('点击了刷新')
-    },
-    add() {
-      alert('点击了新增')
-    },
-    del() {
-      alert('点击了删除')
+    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 scoped>
-
+<style lang="scss" scoped>
+::v-deep .el-table__body-wrapper {
+  height: 100% !important;
+}
 </style>

+ 79 - 87
src/views/sales/sales_management/return_sales_list.vue

@@ -1,120 +1,112 @@
 <template>
   <div>
-    <!--    <zj-page-template-->
-    <!--      :getTableData="getTableData"-->
-    <!--      :optionsEvens="evens"-->
-    <!--      :tableAttributes="tableAttributes"-->
-    <!--      :tableEvents="tableEvents"-->
-    <!--      :columnParsing="columnParsing"-->
-    <!--      :plan="plan"-->
-    <!--      @columnWidthChange="columnWidthChange"-->
-    <!--      @columnListChange="columnListChange"-->
-    <!--    />-->
-    <return-sales-header />
-    <sales-table/>
+    <template-page
+      style="width: 100%;
+      height: 100%;"
+      ref="pageRef"
+      :getList="getList"
+      :exportList="exportList"
+      :columnParsing="columnParsing"
+    >
+    </template-page>
   </div>
 </template>
 
 <script>
-import tableDataJson from './components/tableData'
-import ReturnSalesHeader from '@/components/ReturnSalesHeader/ReturnSalesHeader'
-import salesTable from '@/components/SalesTable/SalesTable'
+import TemplatePage from '@/components/template/template-page-1.vue'
+import import_mixin from '@/components/template/import_mixin.js'
+
+import { getcustomerFrontList, partsNewInExport } from '@/api/stock'
 export default {
-  components: {
-    ReturnSalesHeader,
-    salesTable
-  },
+  components: { TemplatePage },
+  mixins: [import_mixin],
   data() {
     return {
-      // 按钮集
-      evens: [
+      // 事件组
+      optionsEvensGroup: [
         [
-          {
-            name: '刷新',
-            click: this.refresh
-          }
-        ],
-        [
-          {
-            name: '新增',
-            click: this.add
-          },
-          {
-            name: '删除',
-            click: this.del
-          }
+          [
+            {
+              name: '批量删除',
+              click: this.dels,
+              isRole: this.$checkBtnRole('del', this.$route.meta.roles)
+            }
+          ]
         ]
       ],
-      // 我的方案
-      plan: [
-        {
-          name: '默认方案',
-          paramCallback: () => {
-            return []
-          }
-        },
-        {
-          name: '今天',
-          paramCallback: () => {
-            return []
-          }
-        },
-        {
-          name: '本周',
-          paramCallback: () => {
-            return []
-          }
-        }
-      ],
+      // 表格属性
       tableAttributes: {
         // 启用勾选列
         selectColumn: true
       },
+      // 表格事件
       tableEvents: {
         'selection-change': this.selectionChange
-      }
+      },
+      recordSelected: []
     }
   },
   methods: {
-    // 获取列表数据函数
-    getTableData(data) {
-      // console.log("参数:" + JSON.stringify(data));
-      return tableDataJson
+    // 列表请求函数
+    getList(...p) {
+      this.recordSelected = []
+      return getcustomerFrontList(...p)
     },
+    // 列表导出函数
+    exportList: partsNewInExport,
     // 表格列解析渲染数据更改
     columnParsing(item, defaultData) {
-      // console.log(item, defaultData);
       return defaultData
     },
-    // 监听列表显示状态与排序变化
-    columnListChange(columnList) {
-      // console.log(columnList);
-    },
-    // 监听列宽度变化
-    columnWidthChange({ newWidth, oldWidth, column }) {
-      // console.log(newWidth, oldWidth, column);
-    },
     // 监听勾选变化
-    selectionChange(arr) {
-      // console.log(arr);
-    },
-    /**
-     * 更多其他操作
-     */
-    refresh() {
-      alert('点击了刷新')
-    },
-    add() {
-      alert('点击了新增')
-    },
-    del() {
-      alert('点击了删除')
+    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 scoped>
-
+<style lang="scss" scoped>
+::v-deep .el-table__body-wrapper {
+  height: 100% !important;
+}
 </style>