fixbug:充值/疗程

3 years ago · e9ade5b5b5
parent 5e9d4205f2
commit e9ade5b5b5
13 changed files with 22163 additions and 405 deletions
--- a/config/index.js
+++ b/config/index.js
@ -46,7 +46,7 @@ module.exports = {
      }
    },
    // Various Dev Server settingsss
-    host: "192.168.31.194", // can be overwritten by process.env.HOST
+    host: "192.168.31.193", // can be overwritten by process.env.HOST
    port: 3000, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
    autoOpenBrowser: false,
    errorOverlay: true,
--- a/dist.zip
+++ b/dist.zip
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -39,7 +39,7 @@
    "vue-print-nb": "^1.6.0",
    "vue-router": "^3.0.1",
    "vuex": "^3.5.1",
-    "webpack-dev-server": "^2.9.7"
+    "webpack-dev-server": "^2.9.6"
  },
  "devDependencies": {
    "autoprefixer": "^7.1.2",
--- a/partten/partten.js
+++ b/partten/partten.js
@ -1,5 +1,7 @@
+// 手机号正则
 export const phoneNum = /^((1)|(\\+861)|(861))[0-9]{10}$/;

+// 邮箱正则
 export const email = /^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/;

 // export const http = "https://www.decaisoft.com:443/";
--- a/src/components/staffList/admin/index.vue
+++ b/src/components/staffList/admin/index.vue
@ -21,13 +21,19 @@
    </el-table>
    <div style="width: 150px;margin:10px auto;" class="flex justify-between align-center">
      <el-button size="mini" type="info" :disabled="staffLists.length == 0" @click="delsalesman">撤销</el-button>
-      <el-button size="mini" type="primary" plain @click="handleadd">增加</el-button>
+      <el-button size="mini" type="primary" plain @click="handleadd" :disabled='isTrue'>增加</el-button>
    </div>
  </div>
 </template>
 <script>
 import { selectListType } from "@/api/eashier.js";
 export default {
+  props:{
+    isTrue:{
+      type:Boolean,
+      default:false
+    }
+  },
  data() {
    return {
      staffList: [], //选择员工数组
@ -39,8 +45,9 @@ export default {
    };
  },
  methods: {
+    // 限制最多添加八个
    handleadd(){
-      if(this.staffLists.length>=4) return this.$message({message: '最多只能添加四条',type: 'warning'});
+      if(this.staffLists.length>=8) return this.$message({message: '最多只能添加八条',type: 'warning'});
      this.staffLists.push({brandNumber:'',staffName:'',ratio:0})
    },
    rowClassName({ row, rowIndex }) {
--- a/src/components/staffList/manager/index.vue
+++ b/src/components/staffList/manager/index.vue
@ -26,7 +26,7 @@
    </el-table>
    <div style="width: 150px;margin:10px auto;" class="flex justify-between align-center">
      <el-button size="mini" type="info" :disabled="staffLists.length == 0" @click="delsalesman">撤销</el-button>
-      <el-button size="mini" type="primary" plain
+      <el-button size="mini" type="primary" plain :disabled='isTrue'
        @click="handleadd">增加
      </el-button>
    </div>
@ -35,6 +35,12 @@
 <script>
 import { QuerCompetent } from "@/api/eashier.js";
 export default {
+  props:{
+    isTrue:{
+      type:Boolean,
+      default:false
+    }
+  },  
  data() {
    return {
      staffList: [], //选择员工数组
@ -45,8 +51,9 @@ export default {
    };
  },
  methods: {
+    // 限制最多添加八个
    handleadd(){
-      if(this.staffLists.length>=4)return this.$message({message: '最多只能添加四条',type: 'warning'});
+      if(this.staffLists.length>=8)return this.$message({message: '最多只能添加八条',type: 'warning'});
      this.staffLists.push({ brandNumber: '', staffName: '', ratio: 0 })
    },
    rowClassName({ row, rowIndex }) {
--- a/src/components/staffList/staff/index.vue
+++ b/src/components/staffList/staff/index.vue
@ -25,7 +25,7 @@
    </el-table>
    <div style="width: 150px;margin:10px auto;" class="flex justify-between align-center">
      <el-button size="mini" type="info" :disabled="staffLists.length == 0" @click="delsalesman">撤销</el-button>
-      <el-button size="mini" type="primary" plain
+      <el-button size="mini" type="primary" plain :disabled='isTrue'
        @click="handleadd">增加
      </el-button>
    </div>
@ -35,6 +35,12 @@
 <script>
 import { selectList } from "@/api/eashier.js";
 export default {
+  props:{
+    isTrue:{
+      type:Boolean,
+      default:false
+    }
+  },
  data() {
    return {
      staffList: [], //选择员工数组
@ -46,8 +52,9 @@ export default {
    };
  },
  methods: {
+    // 限制最多添加八个
    handleadd(){
-      if(this.staffLists.length>=4)return this.$message({message: '最多只能添加四条', type: 'warning'});
+      if(this.staffLists.length>=8)return this.$message({message: '最多只能添加八条', type: 'warning'});
      this.staffLists.push({ brandNumber: '', staffName: '', ratio: 0 })
    },
    rowClassName({ row, rowIndex }) {
--- a/src/pages/eashier/coursetorec/components/detail.vue
+++ b/src/pages/eashier/coursetorec/components/detail.vue
@ -45,7 +45,7 @@
        </div>
        <span class="text-bold padding-xs">员工</span>
        <div class="into-table-width flex justify-center align-start flex-wrap padding-top">
-          <staffsles ref="staffsles" @staffslesData="staffslesData"></staffsles>
+          <staffsles ref="staffsles" @staffslesData="staffslesData" :is-true='true'></staffsles>
        </div>
      </el-form>
    </div>
--- a/src/pages/eashier/coursetorec/components/raiseList.vue
+++ b/src/pages/eashier/coursetorec/components/raiseList.vue
@ -46,7 +46,6 @@
    <detail ref="detail" @detailData="detailData"></detail>
    <span slot="footer" class="dialog-footer">
      <el-button size="mini" type="primary" @click="dialogFormVisible = false">关闭</el-button>
-      </el-button>
    </span>
  </el-dialog>
 </template>
--- a/src/pages/eashier/raiseReatment/components/detail.vue
+++ b/src/pages/eashier/raiseReatment/components/detail.vue
@ -59,9 +59,9 @@
        </div>
        <span class="padding-left-sm ">员工/门店管理层/高管业绩</span>
        <div class=" flex justify-center align-start flex-wrap padding-top">
-          <staffsles ref="staffsles" @staffslesData="staffslesData"></staffsles>
-          <admin ref="admin" @adminData="adminData"></admin>
-          <manager ref="manager" @managerData="managerData"></manager>
+          <staffsles ref="staffsles" @staffslesData="staffslesData" :is-true="true"></staffsles>
+          <admin ref="admin" @adminData="adminData" :is-true="true"></admin>
+          <manager ref="manager" @managerData="managerData" :is-true="true"></manager>
        </div>
      </el-form>
    </div>
--- a/src/pages/eashier/service/service.vue
+++ b/src/pages/eashier/service/service.vue
@ -52,8 +52,7 @@
    <div class="flex justify-start align-start ">
      <div class="into-table-width">
        <el-table style="margin-top:3px;" :data="list" max-height="650" ref="list" @row-click="rowClick"
-          :row-class-name="rowClassName" :row-key='getRowKeys' @expand-change="expandSelect" :expand-row-keys="expand"
-          row-key="index" stripe
+          :row-class-name="rowClassName" :row-key='getRowKeys' @expand-change="expandSelect" :expand-row-keys="expand" stripe
          :header-cell-style="{ background: 'linear-gradient(#6cb3ff, #1873d4)', color: '#eeeeee', }">
          <el-table-column type="expand">
            <template slot-scope="scope">
--- a/src/pages/eashier/within/components/detail.vue
+++ b/src/pages/eashier/within/components/detail.vue
@ -47,7 +47,7 @@
      </el-form-item>
    </el-form>
    <div class="text-center margin-left-lg padding-left">
-      <staffsles ref="staffsles" @staffslesData="staffslesData"></staffsles>
+      <staffsles ref="staffsles" @staffslesData="staffslesData" :is-true="true"></staffsles>
    </div>
    <member ref="member" @memberData="memberData"></member>
    <rec ref="rec" @recTypeData="recData"></rec>