Merge branch 'ol_12_30' into online

debug.log

@@ -0,0 +1,14 @@
+[1207/094223.177:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
+[1208/093635.101:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
+[1209/094216.333:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
+[1211/093733.478:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
+[1214/094206.298:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
+[1216/112417.508:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
+[1218/093715.178:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
+[1223/094343.219:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
+[1224/093236.399:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
+[1225/094724.194:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
+[1230/094024.562:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
+[1231/093553.846:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
+[0104/094020.609:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
+[0105/101053.212:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)

src/store/modules/selects.js

@@ -126,7 +126,7 @@ export default {
       }
     },
     async setTechnician({commit,state},force){
-      if ((!state.educations.length || force === true) && !loadings.commit_technician) {
+      if ((!state.technician.length || force === true) && !loadings.commit_technician) {
         loadings.commit_technician = true
         try {
           const res = await findTechnician()

src/views/businessManager/orderManager/financeManager.vue

@@ -480,7 +480,7 @@
             </el-select>
           </el-form-item>
           <div v-if="form.applyType == 'SELL'">
-            <div v-for="(goodsList, index) in form.goodsList" :key="index">
+            <div v-for="(goodsList, index) in form.goodsList" :key="index"  class="shopListWrap">
               <el-form-item
                 :label="'商品名称' + (index + 1)"
                 :label-width="formLabelWidth"
@@ -491,6 +491,7 @@
                 ]"
               >
                 <el-select
+                 v-if="isAdd"
                   v-model.trim="goodsList.id"
                   filterable
                   :disabled="!isAdd"
@@ -504,6 +505,9 @@
                     :value="item.id"
                   ></el-option>
                 </el-select>
+                  <p class="showShop" v-else>
+              <Tooltip :content="goodsList.id | filterShopId" />
+            </p>
               </el-form-item>
               <el-form-item
                 class="setWidth"
@@ -527,14 +531,16 @@
                 :disabled="!isAdd"
                 v-if="form.goodsList.length > 1"
                 circle
+                 style="height:40px;"
                 @click.prevent="removeGoodsList(goodsList)"
               ></el-button>
               <el-button
                 icon="el-icon-plus"
+                  v-if="form.goodsList.length > 1"
                 :disabled="!isAdd"
                 @click.prevent="addGoodsList"
                 circle
-                style="margin-left: 5px"
+                style="margin-left: 5px; height:40px;"
               ></el-button>
             </div>
           </div>
@@ -612,6 +618,7 @@ import { getToken } from "@/utils/auth";
 import load from "@/utils/loading";
 import { orderServerList } from "@/utils/searchArray";
 import { Export } from "@/utils/downLoadFile";
+import Tooltip from "@/components/Tooltip/index";
 let validAmount = (rule, value, callback) => {
   if (!value) {
     callback(new Error("请输入商品数量"));
@@ -623,8 +630,9 @@ let validAmount = (rule, value, callback) => {
     callback();
   }
 };
+let that;
 export default {
-  components: { pagination },
+  components: { pagination,Tooltip },
   name: "incomeTwo",
   data() {
     return {
@@ -717,6 +725,9 @@ export default {
       },
     };
   },
+  created(){
+    that = this
+  },
   mounted() {
     // getEmployeeOrgan().then((res) => {
     //   if (res.code == 200) {
@@ -1182,6 +1193,17 @@ export default {
       }
     },
   },
+    filters: {
+    filterShopId(val) {
+      let str = "";
+      that.shopList.forEach((shop) => {
+        if (shop.id == val) {
+          str = shop.name;
+        }
+      });
+      return str;
+    },
+  },
 };
 </script>
 <style lang="scss" scoped>
@@ -1202,4 +1224,20 @@ export default {
   padding: 0 20px;
   margin-bottom: 20px;
 }
+.showShop {
+  height: 40px;
+  line-height: 40px;
+  width: 150px;
+  background-color: #f5f7fa;
+  border-color: #e4e7ed;
+  color: #c0c4cc;
+  cursor: not-allowed;
+  color: #333;
+  opacity: 1;
+  border-radius: 4px;
+  border: 1px solid #dcdfe6;
+  padding: 0 15px;
+  margin-right: 10px;
+}
+.shopListWrap { display: flex; flex-direction: row; justify-content: flex-start;}
 </style>

src/views/studentManager/components/studentVip.vue

@@ -10,9 +10,12 @@
       save-key="studentDetail-studentVip"
     >
       <el-form-item>
-        <el-input placeholder="课程名称"
-                  @keyup.enter.native="onSearch"
-                  v-model.trim="searchForm.vipGroupName"></el-input>
+        <el-input
+          placeholder="课程名称"
+          clearable
+          @keyup.enter.native="onSearch"
+          v-model.trim="searchForm.classGroupName"
+        ></el-input>
       </el-form-item>
       <el-form-item>
         <el-button native-type="submit" type="danger">搜索</el-button>