Merge branch 'test' of http://git.dayaedu.com/molingzhide/dy-admin-manager into test

dist/static/css/chunk-13af5276.f78fc9ab.css

@@ -1 +0,0 @@
-.lookTitle[data-v-662bacf4]{height:40px;line-height:40px;font-weight:700;background-color:#edeef0;padding:0 20px;margin-bottom:20px}.setWidth[data-v-662bacf4]{display:inline-block}.showShop[data-v-662bacf4]{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[data-v-662bacf4]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}

dist/static/css/chunk-2e95ee29.0d3d440b.css

@@ -0,0 +1 @@
+.lookTitle[data-v-3f5eb15e]{height:40px;line-height:40px;font-weight:700;background-color:#edeef0;padding:0 20px;margin-bottom:20px}.setWidth[data-v-3f5eb15e]{display:inline-block}.showShop[data-v-3f5eb15e]{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[data-v-3f5eb15e]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}

dist/static/css/chunk-74aa7010.e7625d6c.css → dist/static/css/chunk-fb68d2e0.c25330a0.css

@@ -1 +1 @@
-.process[data-v-f049a426]{padding:10px;max-height:600px;overflow-y:auto}.dialog-footer[data-v-0dcea96b]{margin-top:20px;display:block;text-align:right}[data-v-44ef2152] .el-button+.el-button{margin-left:0}.select[data-v-44ef2152]{font-size:14px}.btnList[data-v-44ef2152]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.btnList div[data-v-44ef2152]{margin-right:15px}
+.process[data-v-f049a426]{padding:10px;max-height:600px;overflow-y:auto}.dialog-footer[data-v-0dcea96b]{margin-top:20px;display:block;text-align:right}[data-v-619f17a0] .el-button+.el-button{margin-left:0}.select[data-v-619f17a0]{font-size:14px}.btnList[data-v-619f17a0]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.btnList div[data-v-619f17a0]{margin-right:15px}

dist/static/css/chunk-1ca30b97.3194f810.css → dist/static/css/chunk-fcd89c9c.16a43373.css

@@ -1 +1 @@
-.alert[data-v-142acd92]{margin:10px 0}[data-v-142acd92] .el-icon-check,[data-v-142acd92] .el-icon-close{font-size:18px;font-weight:700}[data-v-142acd92] .el-icon-close{color:red}[data-v-142acd92] .el-icon-check{color:#14928a}.title[data-v-7576dd06]{margin-bottom:20px}.amap-demo[data-v-7576dd06]{height:500px}[data-v-1ad322b9] .description-title{margin:0!important}
+.alert[data-v-142acd92]{margin:10px 0}[data-v-142acd92] .el-icon-check,[data-v-142acd92] .el-icon-close{font-size:18px;font-weight:700}[data-v-142acd92] .el-icon-close{color:red}[data-v-142acd92] .el-icon-check{color:#14928a}.title[data-v-7576dd06]{margin-bottom:20px}.amap-demo[data-v-7576dd06]{height:500px}[data-v-69ae4217] .description-title{margin:0!important}

package.json

@@ -17,8 +17,8 @@
     "@babel/plugin-proposal-optional-chaining": "^7.11.0",
     "JSONPath": "^0.11.2",
     "axios": "0.18.1",
-    "browserslist": "^4.13.0",
-    "caniuse-lite": "^1.0.30001109",
+    "browserslist": "^4.16.4",
+    "caniuse-lite": "^1.0.30001214",
     "clean-deep": "^3.3.0",
     "copy-to-clipboard": "^3.3.1",
     "dayjs": "^1.8.35",

src/views/businessManager/orderManager/orderAudit-taoqi/index.vue

@@ -190,7 +190,7 @@
 // import { getToken } from "@/utils/auth";
 import pagination from "@/components/Pagination/index";
 // import load from "@/utils/loading";
-// import { getEmployeeOrgan, getAddress, getCooperation } from "@/api/buildTeam";
+import { getEmployeeOrgan } from "@/api/buildTeam";
 import { orderServerList, orderAuditTypeList } from "@/utils/searchArray";
 import orderAuditDetail from "@/views/businessManager/orderManager/orderAudit/orderAuditDetail";
 import { getRouteOrderList } from "@/api/orderManager";

src/views/businessManager/orderManager/orderAudit-taoqi/orderAuditDetail.vue

@@ -29,7 +29,7 @@
           style="width: 100% !important"
         >
           <el-option
-            v-for="(item, index) in organList"
+            v-for="(item, index) in selects.branchs"
             :key="index"
             :label="item.name"
             :value="item.id"
@@ -303,7 +303,7 @@ import {
 import { orderServerList } from "@/utils/searchArray";
 import { getCooperation } from "@/api/buildTeam";
 export default {
-  props: ["orderId", "shopList", "organList", "isLook"],
+  props: ["orderId", "shopList", "isLook"],
   data() {
     return {
       formLabelWidth: "100px",
@@ -373,6 +373,8 @@ export default {
         }
       });
     }
+    // 获取分部
+     this.$store.dispatch("setBranchs");
   },
   methods: {
     changeOrgin(val) {

src/views/businessManager/orderManager/orderAudit/orderAuditDetail.vue

@@ -29,7 +29,7 @@
           style="width: 100% !important"
         >
           <el-option
-            v-for="(item, index) in organList"
+            v-for="(item, index) in selects.branchs"
             :key="index"
             :label="item.name"
             :value="item.id"
@@ -326,7 +326,7 @@ import Tooltip from "@/components/Tooltip/index";
 let that;
 export default {
   components: { Tooltip },
-  props: ["orderId", "shopList", "organList", "isLook"],
+  props: ["orderId", "shopList", "isLook"],
   data() {
     return {
       formLabelWidth: "100px",
@@ -399,6 +399,8 @@ export default {
         }
       });
     }
+    // 获取分部
+     this.$store.dispatch("setBranchs");
   },
   methods: {
     changeOrgin(val) {

src/views/businessManager/shopManager/shopList.vue

@@ -1224,20 +1224,16 @@ export default {
         params: {
           templateType: "GOODS",
         },
-        fileName: "商品导入模板.xls",
-      });
+        fileName: '商品导入模板.xls'
+      })
     },
-    exportShopList() {
-      Export(
-        this,
-        {
-          url: "/api-web/export/goods",
-          params: qs.stringify(cleanDeep(this.searchForm)),
-          fileName: "商品导出.xls",
-          method: "post",
-        },
-        "确定导出商品"
-      );
+    exportShopList(){
+      Export(this, {
+        url: "/api-web/export/goods",
+        params: qs.stringify(cleanDeep(this.searchForm)),
+        fileName: '商品导出.xls',
+        method:'post'
+      }, '确定导出商品')
     },
     onFormClose(formName) {
       // 关闭弹窗重置验证

src/views/main/baseinfo/business.vue

@@ -33,8 +33,7 @@
           </el-tooltip>
         </span>
 
-        <span v-if="(item.percent&&item.percent!==0)"> <count-to :endVal="item.percent" :decimals="2" />% </span>
-        <span v-else> 暂无数据 </span>
+        <span> <count-to :endVal="item.percent" :decimals="2" />% </span>
       </statistic-item>
     </statistic>
     <!--   :data-zoom="dataZoom" -->
@@ -72,9 +71,9 @@ export default {
       };
     },
     items() {
-      //  this.data["HOMEWORK_CREATE_RATE"] ||
+      //
       return {
-        HOMEWORK_CREATE_RATE: {},
+        HOMEWORK_CREATE_RATE:  this.data["HOMEWORK_CREATE_RATE"] ||{},
         HOMEWORK_SUBMIT_RATE: this.data["HOMEWORK_SUBMIT_RATE"] || {},
         HOMEWORK_COMMENT_RATE: this.data["HOMEWORK_COMMENT_RATE"] || {},
       };

src/views/musicInspection/index.vue

@@ -4,7 +4,11 @@
     <h2>
       <div class="squrt"></div>
       乐团巡查
-      <filter-search :keys="['searchType']" :moreKeys="['organId', 'start', 'end']" @reload="reloadSearch"/>
+      <filter-search
+        :keys="['searchType']"
+        :moreKeys="['organId', 'start', 'end']"
+        @reload="reloadSearch"
+      />
     </h2>
     <div class="m-core">
       <save-form

src/views/teamDetail/teamList.vue

@@ -413,9 +413,6 @@ export default {
     if (query.organId) {
       this.topForm.orgin = query.organId;
     }
-    if (query.search) {
-      this.topForm.teamName = query.search;
-    }
     this.init();
   },
   activated() {