0906PM

src/pages/system/cmsManager/majorProjects/edit.vue

@@ -126,7 +126,7 @@
               </template>
             </el-table-column>
           </el-table>
-            <el-button type="primary" size="mini" @click="addCourse">新增</el-button>
+            <el-button type="primary" size="mini" @click="coursesShow">新增</el-button>
         </li>
         <li class="flex-h">
           <span>是否前台展示：</span>
@@ -203,6 +203,7 @@ export default {
       imgs: null,
       detailimgs: null,
       selCourseVisible: false,
+      selCourseList: [],
     }
   },
   components: {},
@@ -224,6 +225,7 @@ export default {
       },
       set (val) {
         this.UpdateInfo({...this.detail, CaseId: val})
+        this.getCourse()
       }
     },
     imgsArr: {
@@ -324,6 +326,9 @@ export default {
     getDetail () {
       this.GetCaseInfo({id: this.id})
     },
+    getCourse () {
+      this.GetCourseList({caseid: this.CaseId, page: 1, pagesize: 100})
+    },
     toggleSelection (rows) {
       if (rows) {
         rows.forEach(row => {
@@ -344,15 +349,18 @@ export default {
       this.GetCourseList({caseid: this.CaseId, page: 1, pagesize: 100, callback: this.coursesShow})
     },
     coursesShow () {
+      this.selCourseList = this.detail.Courses || []
       this.selCourseVisible = true
       setTimeout(() => {
-        this.toggleSelection(this.coursesList.filter(x => (this.detail.Courses || []).filter(y => y.CourseId === x.CourseId).length > 0))
+        this.toggleSelection(this.coursesList.filter(x => (this.selCourseList || []).filter(y => y.CourseId === x.CourseId).length > 0))
       }, 30)
     },
     handleSelectionChange (val) {
-      this.UpdateInfo({...this.detail, Courses: val})
+      this.selCourseList = val
+      // this.UpdateInfo({...this.detail, Courses: val})
     },
     addCourseOk () {
+      this.UpdateInfo({...this.detail, Courses: this.selCourseList})
       this.selCourseVisible = false
     },
     deleteItem (row) {
@@ -360,6 +368,7 @@ export default {
     }
   },
   mounted () {
+    this.getCourse()
     const { id } = this.$route.query
     this.id = id
     if (id && id !== '') {

src/pages/system/goodsManager/goodsTypeManager/add.vue

@@ -9,13 +9,27 @@
               <el-input
                 placeholder="请输入商品种类"
                 v-model="postData.TypeName"
+                maxlength="10"
                 clearable>
               </el-input>
             </div>
           </div>
         </li>
         <li class="flex-h">
-          <!-- <span>选择案场：</span> -->
+          <span>种类英文：</span>
+          <div class="flex-item">
+            <div style="width:50%">
+              <el-input
+                placeholder="请输入种类英文"
+                v-model="postData.EnglishName"
+                maxlength="10"
+                clearable>
+              </el-input>
+            </div>
+          </div>
+        </li>
+        <li class="flex-h">
+          <span>选择案场：</span>
           <div class="flex-item">
             <div style="width:50%">
               <el-select v-model="CaseId" placeholder="请选择">
@@ -52,6 +66,7 @@ export default {
         CreatUser: '', // 创建者（传空值）
         CreatTime: '', // 创建时间（传空值）
         Status: '', // 状态（传空值）
+        EnglishName: '',
       },
       caseAreaList: [
         {

src/pages/system/goodsManager/goodsTypeManager/edit.vue

@@ -9,13 +9,27 @@
               <el-input
                 placeholder="请输入商品种类"
                 v-model="postData.TypeName"
+                maxlength="10"
                 clearable>
               </el-input>
             </div>
           </div>
         </li>
         <li class="flex-h">
-          <!-- <span>选择案场：</span> -->
+          <span>种类英文：</span>
+          <div class="flex-item">
+            <div style="width:50%">
+              <el-input
+                placeholder="请输入种类英文"
+                v-model="postData.EnglishName"
+                maxlength="10"
+                clearable>
+              </el-input>
+            </div>
+          </div>
+        </li>
+        <li class="flex-h">
+          <span>选择案场：</span>
           <div class="flex-item">
             <div style="width:50%">
               <el-select v-model="CaseId" placeholder="请选择">
@@ -49,7 +63,8 @@ export default {
         TypeName: '',
         Status: '',
         OrgId: '',
-        CaseId: ''
+        CaseId: '',
+        EnglishName: '',
       },
     }
   },

src/pages/system/newOrder/caseRecord/index.vue

@@ -0,0 +1,177 @@
+<template>
+  <div class="subPage">
+    <div class="system-table-search">
+      <div class="flex-h">
+        <div class="flex-item flex-h">
+          <el-button size="mini" type="success" @click='addRecord'>新增</el-button>
+        </div>
+        <ul>
+          <li>
+            <!-- <span>选择案场：</span> -->
+            <el-select v-model="CaseId" placeholder="请选择">
+              <el-option
+                v-for="item in cases"
+                :key="item.CaseId"
+                :label="item.CaseName"
+                :value="item.CaseId">
+              </el-option>
+            </el-select>
+          </li>
+        </ul>
+        <el-button
+          size="mini"
+          type="primary" @click="search">搜索</el-button>
+      </div>
+      <div class="moreFilter"></div>
+    </div>
+    <div class="system-table-box">
+      <el-table :data="records.list" stripe style="width: 100%">
+        <el-table-column prop="CaseId" label="案场">
+          <template slot-scope="scope">
+            {{getCaseName(scope.row.CaseId)}}
+          </template>
+        </el-table-column>
+        <el-table-column prop="Month" label="月份">
+        </el-table-column>
+        <el-table-column prop="Num" label="规定次数">
+        </el-table-column>
+        <el-table-column prop="ActrualNum" label="实际次数">
+        </el-table-column>
+        <el-table-column prop="OverNum" label="超出次数">
+        </el-table-column>
+        <el-table-column prop="LeftNum" label="剩余次数">
+        </el-table-column>
+        <el-table-column fixed='right' label="操作" width="300">
+          <template slot-scope="scope">
+            <el-button size="mini" type="warning" @click="handleReport(scope.$index, scope.row)">导出Excel</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        @current-change="handleCurrentChange"
+        :current-page.sync="postData.page"
+        :page-size="postData.pagesize"
+        layout="prev, pager, next, jumper"
+        :total="records.pagenum">
+      </el-pagination>
+    </div>
+    <el-dialog
+      title="新增月记录"
+      :visible.sync="addVisible"
+      width="500px"
+      center>
+      <div>
+        <form class="mainForm">
+          <ul>
+            <li class="flex-h">
+              <span>对应案场：</span>
+              <div class="flex-item">
+                <div style="width:50%">
+                  <el-select v-model="detail.CaseId" placeholder="请选择">
+                    <el-option
+                      v-for="item in cases"
+                      :key="item.CaseId"
+                      :label="item.CaseName"
+                      :value="item.CaseId">
+                    </el-option>
+                  </el-select>
+                </div>
+              </div>
+            </li>
+            <li class="flex-h">
+              <span>月份：</span>
+              <div class="flex-item">
+                <div style="width:50%">
+                  <el-date-picker
+                    v-model="detail.Month"
+                    type="month"
+                    placeholder="选择月">
+                  </el-date-picker>
+                </div>
+              </div>
+            </li>
+            <li class="flex-h">
+              <span>规定次数：</span>
+              <div class="flex-item">
+                <div style="width:50%">
+                  <el-input v-model="detail.Num" placeholder="请输入规定次数"></el-input>
+                </div>
+              </div>
+            </li>
+          </ul>
+        </form>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="addVisible = false">取 消</el-button>
+        <el-button type="primary" @click="submit">保 存</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { createNamespacedHelpers, mapState } from 'vuex'
+
+const { mapState: mapRecordState, mapActions: mapRecordActions } = createNamespacedHelpers('caserecord')
+
+export default {
+  name: '',
+  data () {
+    return {
+      addVisible: false,
+      detail: {
+        CaseId: '',
+      },
+      postData: {
+        caseid: '',
+        page: 1,
+        pagesize: 10,
+      }
+    }
+  },
+  computed: {
+    ...mapState({
+      cases: x => x.app.cases.list,
+      defaultCaseId: x => x.app.cases.default
+    }),
+    ...mapRecordState({
+      records: x => x.recordList,
+    }),
+    CaseId: {
+      get () {
+        return this.caseid || this.defaultCaseId
+      },
+      set (val) {
+        this.caseid = val
+      }
+    }
+  },
+  methods: {
+    ...mapRecordActions([
+      'GetRecordList',
+    ]),
+    getCaseName (caseid) {
+      return ((this.cases.filter(x => x.CaseId === caseid) || [])[0] || {}).CaseName
+    },
+    addRecord () {
+      this.addVisible = true
+    },
+    search () {
+      this.getList()
+    },
+    submit () {
+    },
+    getList () {
+      this.GetRecordList(this.postData)
+    },
+    handleCurrentChange (val) { // 跳转到分页
+      this.postData.page = val
+      this.getList()
+    },
+  }
+}
+</script>
+
+<!-- Add "scoped" attribute to limit CSS to this component only -->
+<style lang="scss" scoped>
+</style>

src/pages/system/page.js

@@ -89,6 +89,8 @@ import vipList from './cardAndCouponManager/vipManager/index' // vip列表
 import editVip from './cardAndCouponManager/vipManager/edit' // 编辑vip
 import activateVip from './cardAndCouponManager/vipManager/activateVip' // 激活vip
 
+import caseRecord from './newOrder/caseRecord/index' // 月记录
+
 export default {
   router: [
     {
@@ -429,6 +431,11 @@ export default {
           name: 'newOrderList',
           component: newOrderList,
           children: []
+        }, { // 月记录
+          path: 'caseRecord',
+          name: 'caseRecord',
+          component: caseRecord,
+          children: []
         }]
       }, { // 数据统计
         path: 'dataStatistics',

src/store/case/record.js

@@ -0,0 +1,29 @@
+import ajax from '../../util/ajax'
+import api from '../../util/api'
+
+export default {
+  namespaced: true,
+  state: {
+    recordList: [],
+  },
+  mutations: {
+    updateList (state, payload) {
+      state.recordList = payload || []
+    },
+  },
+  actions: {
+    GetRecordList ({ commit }, payload) {
+      ajax(api.case.getRecordList.url, {
+        method: api.case.getRecordList.method,
+        queryData: {
+          ...payload,
+        }
+      }).then(res => {
+        commit('updateList', res)
+        if (payload.callback) {
+          payload.callback()
+        }
+      })
+    },
+  }
+}

src/store/index.js

@@ -24,6 +24,7 @@ export const modules = {
   verification: () => require('./verification/verification').default,
   goodsorder: () => require('./goods/order').default,
   cmscase: () => require('./cms/case').default,
+  caserecord: () => require('./case/record').default,
 }
 
 Object.keys(modules).forEach((modKey) => {

src/util/api.js

@@ -196,6 +196,14 @@ const $api = {
       method: 'get',
       url: `${baseUrl}${common}/usertype`
     },
+    getRecordList: {
+      method: 'get',
+      url: `${baseUrl}${common}/case/record`
+    },
+    addRecord: {
+      method: 'post',
+      url: `${baseUrl}${common}/case/record`
+    },
   },
   goodsManager: {
     getGoodsSpecList: { // 商品规格列表