Merge branch 'purchase' into wxlNew

src/api/businessManager.js

@@ -88,4 +88,11 @@ export function updateCostMargin (data) {
     data: qs.stringify(data)
   })
 }
-
+// 进货清单
+export function getGoodsProcurements (data) {
+  return request({
+    url: api + '/goodsProcurement/queryGoodsProcurements',
+    method: 'get',
+    params: data
+  })
+}

src/router/index.js

@@ -330,6 +330,8 @@ export const asyncRoutes = {
   // 查看乐团基本信息
   teamLookBase: () => import('@/views/teamDetail/teamInfo'),
   // 更换列表
-  resetList: () => import('@/views/businessManager/resetList')
+  resetList: () => import('@/views/businessManager/resetList'),
+  // 进货清单
+  purchaseLlist: () => import('@/views/businessManager/shopManager/purchase-llist')
 }
 export default router

src/views/businessManager/orderManager/salesList.vue

@@ -155,11 +155,15 @@
                            label="教务老师"></el-table-column>
           <el-table-column align='center'
                            fixed="right"
+                           width="150px"
                            label="操作">
             <template slot-scope="scope">
               <el-button @click="onBackMoney(scope.row)"
                          v-permission="'sellOrder/update'"
                          type="text">修改成本</el-button>
+              <el-button @click="openRefund(scope.row)"
+                         v-permission="'sellOrder/update'"
+                         type="text">退费</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -169,6 +173,36 @@
                     :page-sizes="pageInfo.page_size"
                     @pagination="getList" />
       </div>
+      <el-dialog
+        title="退费"
+        width="400px"
+        :visible.sync="refundVisible"
+        @close="refundVisible = false"
+      >
+        <el-form
+          :model="refundForm"
+          :rules="refundRules"
+          ref="refundform"
+        >
+          <el-form-item
+            label="退费金额"
+            prop="money"
+            label-width="100px"
+          >
+            <el-input
+              v-model="refundForm.money"
+              type="number"
+              placeholder="请输入退费金额"
+            />
+          </el-form-item>
+        </el-form>
+        <span slot="footer"
+              class="dialog-footer">
+          <el-button @click="refundVisible = false">取消</el-button>
+          <el-button type="primary"
+                     @click="submitRefund">确认</el-button>
+        </span>
+      </el-dialog>
       <el-dialog title="修改成本"
                  :visible.sync="backStatus"
                  @close="onFormClose('ruleForm')"
@@ -256,6 +290,7 @@ export default {
     return {
       paymentChannelStatus: paymentChannelStatus,
       orderDate: null,
+      refundVisible: false,
       detail: {},
       searchForm: {
         search: '',
@@ -284,6 +319,12 @@ export default {
       rules: {
         sellCost: [{ required: true, message: '请输入金额', trigger: 'input' }],
       },
+      refundForm: {
+        money: null,
+      },
+      refundRules: {
+        money: [{ required: true, message: '请输入退费金额', trigger: 'blur' }],
+      },
       cooperations: [],
       restaurants: [],
     }
@@ -387,6 +428,13 @@ export default {
     onFormClose (formName) { // 关闭弹窗重置验证
       this.$refs[formName].clearValidate()
     },
+    openRefund(row) {
+      this.refundVisible = true
+      this.detail = row
+    },
+    submitRefund() {
+      console.log({...this.refundForm})
+    },
     onBackMoney (row) { // 退费
       this.backStatus = true
       this.detail = row

src/views/businessManager/shopManager/purchase-form.vue

@@ -0,0 +1,105 @@
+<template>
+  <div>
+    <el-form
+      :model="form"
+      :rules="rules"
+      ref="form"
+    >
+      <el-form-item
+        label="备查货号"
+        prop="no"
+        label-width="100px"
+      >
+        <el-input
+          v-model="form.no"
+          type="number"
+          placeholder="请输入备查货号"
+        />
+      </el-form-item>
+      <el-form-item
+        label="进货数量"
+        prop="no"
+        label-width="100px"
+      >
+        <el-input
+          v-model="form.no"
+          type="number"
+          placeholder="请输入进货数量"
+        />
+      </el-form-item>
+      <el-form-item
+        label="税务数量"
+        prop="no"
+        label-width="100px"
+      >
+        <el-input
+          v-model="form.no"
+          type="number"
+          placeholder="请输入税务数量"
+        />
+      </el-form-item>
+      <el-form-item
+        label="商品采购价1"
+        prop="money1"
+        label-width="100px"
+      >
+        <el-input
+          v-model="form.no"
+          type="number"
+          placeholder="请输入商品采购价1"
+        />
+      </el-form-item>
+      <el-form-item
+        label="商品采购价2"
+        prop="money2"
+        label-width="100px"
+      >
+        <el-input
+          v-model="form.no"
+          type="number"
+          placeholder="请输入商品采购价2"
+        />
+      </el-form-item>
+    </el-form>
+    <span
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button
+        @click="$listeners.close"
+      >取消</el-button>
+      <el-button
+        type="primary"
+        @click="submit"
+      >确认</el-button>
+    </span>
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      form: {},
+      rules: {
+        no: [{ required: true, message: '请输入备查货号', trigger: 'blur' }],
+        money1: [{ required: true, message: '请输入商品采购价1', trigger: 'blur' }],
+        money2: [{ required: false, message: '请输入商品采购价2', trigger: 'blur' }],
+      },
+    }
+  },
+  mounted() {
+    console.log(this)
+  },
+  methods: {
+    submit() {
+      console.log(this.form)
+    }
+  },
+}
+</script>
+<style lang="less" scoped>
+  .dialog-footer{
+    text-align: right;
+    display: block;
+  }
+</style>

src/views/businessManager/shopManager/purchase-llist.vue

@@ -0,0 +1,198 @@
+<template>
+  <div class="m-container">
+    <h2>
+      <div class="squrt"></div>进货清单
+    </h2>
+    <div class="m-core">
+      <el-form
+         inline
+         class="searchForm"
+         v-model="searchForm"
+      >
+        <el-form-item>
+          <el-input clearable v-model="searchForm.search" placeholder="备查货号"/>
+        </el-form-item>
+        <el-form-item>
+          <el-date-picker
+            style="width:410px;"
+            v-model.trim="orderDate"
+            type="daterange"
+            value-format="yyyy-MM-dd"
+            @change="searchOrderDate"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            :picker-options="{ firstDayOfWeek: 1 }"
+        >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item>
+          <el-button
+            @click="search"
+            type="danger"
+          >搜索</el-button>
+          <el-button
+            @click="onReSet"
+            type="primary"
+          >重置</el-button>
+        </el-form-item>
+      </el-form>
+      <div class="tableWrap">
+        <el-table
+          :data="tableList"
+          style="width: 100%"
+          :header-cell-style="{background:'#EDEEF0',color:'#444'}"
+        >
+          <el-table-column
+            align='center'
+            width="180"
+            prop="batchNo"
+            label="备查货号"
+          />
+          <el-table-column
+            align='center'
+            width="150"
+            prop="totalQuantity"
+            label="进货数量"
+          />
+          <el-table-column
+            align='center'
+            width="150"
+            prop="taxQuantity"
+            label="税务数量"
+          />
+          <el-table-column
+            align='center'
+            width="150"
+            prop="discountPrice"
+            label="商品采购价1"
+          />
+          <el-table-column
+            align='center'
+            width="150"
+            prop="agreeCostPrice"
+            label="商品采购价2"
+          />
+          <el-table-column
+            align='center'
+            prop="createTime"
+            label="入库日期"
+          />
+          <!-- <el-table-column
+            align='center'
+            width="150"
+            fixed="right"
+            label="操作"
+          >
+            <template slot-scope="scope">
+              <el-button
+                v-permission="'sellOrder/update'"
+                type="text"
+              >修改</el-button>
+              <el-button
+                @click="edit(scope.row)"
+                v-permission="'sellOrder/update'"
+                type="text"
+              >删除</el-button>
+            </template>
+          </el-table-column> -->
+        </el-table>
+      </div>
+    </div>
+    <el-dialog
+      title="修改"
+      width="500px"
+      :visible.sync="editVisible"
+      @close="editVisible = false"
+    >
+      <purchaseForm
+        @close="closeEdit"
+      />
+    </el-dialog>
+  </div>
+</template>
+<script>
+import dayjs from 'dayjs'
+import purchaseForm from './purchase-form'
+import { getGoodsProcurements } from '@/api/businessManager'
+const initSearchForm = {
+  startTime: null,
+  endTime: null,
+  search: '',
+}
+
+export default {
+  components: {
+    purchaseForm
+  },
+  data() {
+    return {
+      tableList: [],
+      detail: null,
+      editVisible: false,
+      searchForm: {
+        ...initSearchForm,
+      },
+      pageInfo: {
+        // 分页规则
+        limit: 10, // 限制显示条数
+        page: 1, // 当前页
+        total: 0, // 总条数
+        page_size: [10, 20, 40, 50] // 选择限制显示条数
+      },
+      orderDate: []
+    }
+  },
+  mounted() {
+    this.orderDate = [
+      dayjs().format('YYYY-MM-DD'),
+      dayjs().format('YYYY-MM-DD'),
+    ]
+    this.getList()
+  },
+  methods: {
+    searchOrderDate(val) {
+      console.log(val)
+    },
+    getList() {
+      const form = {
+        ...this.searchForm,
+        enterStorageStartTime: this.orderDate[0],
+        enterStorageEndTime: this.orderDate[1],
+      }
+      getGoodsProcurements({
+        rows: this.pageInfo.limit,
+        page: this.pageInfo.page,
+        ...form
+      })
+        .then(res => {
+          if (res.code == 200 && res.data) {
+            this.tableList = res.data.rows
+            this.pageInfo.total = res.data.total
+          }
+        })
+    },
+    onReSet () {
+      this.orderDate = []
+      this.searchForm = {
+        ...initSearchForm,
+      }
+      this.getList()
+    },
+    edit(row) {
+      this.editVisible = true
+      this.detail = row
+    },
+    closeEdit() {
+      this.editVisible = false
+      this.detail = null
+    },
+    search() {
+      this.getList()
+    },
+  },
+}
+</script>
+<style lang="less" scoped>
+
+</style>

src/views/businessManager/shopManager/shopList.vue

@@ -696,13 +696,12 @@
   }
 </script>
 <style lang="scss">
-  .shopImage {
-    width: 60px;
-    height: 60px;
-  }
-
-  .shopDesc {
-    max-height: 70px;
-    overflow: hidden;
-  }
+.shopImage {
+  width: 60px;
+  height: 60px;
+}
+.shopDesc {
+  max-height: 70px;
+  overflow: hidden;
+}
 </style>