Merge branch '0609getMusicFee' into test

src/components/select-all/index.vue

@@ -55,15 +55,31 @@ export default {
   //   },
   // },
   watch: {
-    '$attrs.value': function(newVal, oldVal) {
-      // 优化页面使用多组件时，tooltip不显示的问题
-      const { selected } = this.$refs.select;
-      let labelStr = selected
-        .map((item) => (item.label ? item.label : item.value))
-        .join(",");
-      this.labelStr = labelStr
-      this.isShow = (this.$refs?.select?.disabled || false) && this.labelStr?.length > 0
-    }
+    "$attrs.value": {
+      immediate: true,
+      handler(newVal, oldVal) {
+        // 优化页面使用多组件时，tooltip不显示的问题
+        this.$nextTick(() => {
+          const selected = this.$refs.select?.selected;
+
+          let labelStr = "";
+          if (newVal && newVal.length > 0 && selected) {
+            labelStr = selected
+              .map((item) => (item.label ? item.label : item.value))
+              .join(",");
+            this.labelStr = labelStr;
+            this.isShow =
+              (this.$refs?.select?.disabled || false) &&
+              this.labelStr?.length > 0;
+          } else {
+            this.labelStr = "";
+            this.isShow =
+              (this.$refs?.select?.disabled || false) &&
+              this.labelStr?.length > 0;
+          }
+        });
+      },
+    },
   },
   methods: {
     selectAll() {
@@ -72,11 +88,11 @@ export default {
         .filter((item) => !item.disabled && item.value)
         .map((item) => item.value);
       this.$emit("input", values);
-      this.$emit('change', values)
+      this.$emit("change", values);
     },
     onChange(val) {
-      this.$emit('change', val)
-    }
+      this.$emit("change", val);
+    },
   },
 };
 </script>

src/views/businessManager/orderManager/financeManager-taoqi.vue

@@ -41,7 +41,7 @@
       </div>
       <el-upload
         v-permission="'import/routeOrder/taoqi'"
-        style="display: inline-block;"
+        style="display: inline-block"
         action="/api-web/import/routeOrder"
         :show-file-list="false"
         :before-upload="beforeUpload"
@@ -322,9 +322,9 @@
             }}</template>
           </el-table-column>
           <el-table-column align="center" label="备注" width="220px">
-           <template slot-scope="scope">
-                       <overflow-text width="200px" :text="scope.row.memo"/>
-                     </template>
+            <template slot-scope="scope">
+              <overflow-text width="200px" :text="scope.row.memo" />
+            </template>
           </el-table-column>
           <el-table-column
             align="center"
@@ -333,7 +333,12 @@
             label="操作"
           >
             <template slot-scope="scope">
-              <div v-if="scope.row.groupType == 'OUTORDER' && $helpers.permission('routeOrder/getOrderInfo/taoqi')">
+              <div
+                v-if="
+                  scope.row.groupType == 'OUTORDER' &&
+                  $helpers.permission('routeOrder/getOrderInfo/taoqi')
+                "
+              >
                 <el-button type="text" @click="lookOrderInfo(scope.row)"
                   >查看</el-button
                 >
@@ -409,15 +414,32 @@
             label="缴费单号"
             prop="calenderId"
             :label-width="formLabelWidth"
-             :rules="[{pattern:/^[0-9]*$/,message:'请输入正确的缴费单号',trigger: 'blur'}]"
+            :rules="[
+              {
+                pattern: /^[0-9]*$/,
+                message: '请输入正确的缴费单号',
+                trigger: 'blur',
+              },
+            ]"
           >
             <!-- <el-input
               v-model.trim="form.calenderId"
               :disabled="!isAdd"
               placeholder="请输入缴费单号"
             ></el-input> -->
-            <el-select v-model="form.calenderId" :disabled="!isAdd" placeholder="请选择缴费单号" style="width: 100% !important" filterable>
-              <el-option v-for="(item, index) in getCalenderList" :key="index" :label="item.id" :value="item.id"></el-option>
+            <el-select
+              v-model="form.calenderId"
+              :disabled="!isAdd"
+              placeholder="请选择缴费单号"
+              style="width: 100% !important"
+              filterable
+            >
+              <el-option
+                v-for="(item, index) in getCalenderList"
+                :key="index"
+                :label="item.id"
+                :value="item.id"
+              ></el-option>
             </el-select>
           </el-form-item>
           <el-form-item
@@ -524,7 +546,13 @@
                     :key="index"
                     :label="item.name"
                     :value="item.id"
-                  ></el-option>
+                  >
+                    <span style="float: left">{{ item.name }}</span>
+                    <span
+                      style="float: right; color: #8492a6; font-size: 13px"
+                      >{{ item.id }}</span
+                    >
+                  </el-option>
                 </el-select>
                 <p class="showShop" v-else>
                   <Tooltip :content="goodsList.id | filterShopId" />
@@ -626,7 +654,7 @@ import {
   routeOrderAdd,
   getOrderInfo,
   orderDelete,
-  getCalenders
+  getCalenders,
 } from "@/api/orderManager";
 import { goodsQuery } from "@/api/businessManager";
 import { getEmployeeOrgan, getAddress, getCooperation } from "@/api/buildTeam";
@@ -753,13 +781,13 @@ export default {
       headers: {
         Authorization: getToken(),
       },
-      getCalenderList: []
+      getCalenderList: [],
     };
   },
   created() {
     that = this;
-        if (!(this.searchForm.orderDate?.length > 0)) {
-          this.getNow()
+    if (!(this.searchForm.orderDate?.length > 0)) {
+      this.getNow();
     }
   },
   mounted() {
@@ -772,8 +800,8 @@ export default {
     this.getList();
   },
   methods: {
-    getNow(){
-       var now = new Date();
+    getNow() {
+      var now = new Date();
       var startDate = new Date(
         Date.UTC(now.getFullYear(), now.getMonth(), now.getDate())
       )
@@ -822,7 +850,6 @@ export default {
               this.getList();
             } else {
               this.$message.error(res.msg);
-
             }
           });
         } else {
@@ -1046,7 +1073,7 @@ export default {
         lessActualAmount: null,
         orderDate: [],
       };
-      this.getNow()
+      this.getNow();
       this.getList();
     },
     removeGoodsList(item) {
@@ -1073,9 +1100,9 @@ export default {
           {
             id: null,
             number: null,
-          }
-        ]
-        goodsQuery({ rows: 99999 }).then((res) => {
+          },
+        ];
+        goodsQuery({ rows: 99999, noOrganSearch: 1 }).then((res) => {
           if (res.code === 200) {
             this.shopList = res.data.rows;
           }
@@ -1083,10 +1110,10 @@ export default {
       }
     },
     async checkSchool(val) {
-      this.form.calenderId = null
+      this.form.calenderId = null;
       try {
-        let res = await getCalenders({id : val})
-        this.getCalenderList = res.data
+        let res = await getCalenders({ id: val });
+        this.getCalenderList = res.data;
       } catch {
         //
       }
@@ -1199,7 +1226,6 @@ export default {
     },
     handleError(err, file, fileList) {
       load.endLoading();
-
     },
     fomatStr(str) {
       let arr = str.split(";");
@@ -1244,7 +1270,7 @@ export default {
           ],
           applyType: null,
           userId: "",
-          calenderId: null
+          calenderId: null,
         };
       }
     },

src/views/businessManager/orderManager/financeManager.vue

@@ -44,7 +44,7 @@
       </div>
       <el-upload
         v-permission="'import/routeOrder'"
-        style="display: inline-block;"
+        style="display: inline-block"
         action="/api-web/import/routeOrder"
         :show-file-list="false"
         :before-upload="beforeUpload"
@@ -325,9 +325,9 @@
             }}</template>
           </el-table-column>
           <el-table-column align="center" label="备注" width="220px">
-           <template slot-scope="scope">
-                       <overflow-text width="200px" :text="scope.row.memo"/>
-                     </template>
+            <template slot-scope="scope">
+              <overflow-text width="200px" :text="scope.row.memo" />
+            </template>
           </el-table-column>
           <el-table-column
             align="center"
@@ -336,7 +336,12 @@
             label="操作"
           >
             <template slot-scope="scope">
-              <div v-if="scope.row.groupType == 'OUTORDER' && $helpers.permission('routeOrder/getOrderInfo')">
+              <div
+                v-if="
+                  scope.row.groupType == 'OUTORDER' &&
+                  $helpers.permission('routeOrder/getOrderInfo')
+                "
+              >
                 <el-button type="text" @click="lookOrderInfo(scope.row)"
                   >查看</el-button
                 >
@@ -411,15 +416,32 @@
             label="缴费单号"
             prop="calenderId"
             :label-width="formLabelWidth"
-             :rules="[{pattern:/^[0-9]*$/,message:'请输入正确的缴费单号',trigger: 'blur'}]"
+            :rules="[
+              {
+                pattern: /^[0-9]*$/,
+                message: '请输入正确的缴费单号',
+                trigger: 'blur',
+              },
+            ]"
           >
             <!-- <el-input
               v-model.trim="form.calenderId"
               :disabled="!isAdd"
               placeholder="请输入缴费单号"
             ></el-input> -->
-            <el-select v-model="form.calenderId" :disabled="!isAdd" placeholder="请选择缴费单号" style="width: 100% !important" filterable>
-              <el-option v-for="(item, index) in getCalenderList" :key="index" :label="item.id" :value="item.id"></el-option>
+            <el-select
+              v-model="form.calenderId"
+              :disabled="!isAdd"
+              placeholder="请选择缴费单号"
+              style="width: 100% !important"
+              filterable
+            >
+              <el-option
+                v-for="(item, index) in getCalenderList"
+                :key="index"
+                :label="item.id"
+                :value="item.id"
+              ></el-option>
             </el-select>
           </el-form-item>
           <el-form-item
@@ -526,7 +548,13 @@
                     :key="index"
                     :label="item.name"
                     :value="item.id"
-                  ></el-option>
+                  >
+                    <span style="float: left">{{ item.name }}</span>
+                    <span
+                      style="float: right; color: #8492a6; font-size: 13px"
+                      >{{ item.id }}</span
+                    >
+                  </el-option>
                 </el-select>
                 <p class="showShop" v-else>
                   <Tooltip :content="goodsList.id | filterShopId" />
@@ -628,7 +656,7 @@ import {
   routeOrderAdd,
   getOrderInfo,
   orderDelete,
-  getCalenders
+  getCalenders,
 } from "@/api/orderManager";
 import { goodsQuery } from "@/api/businessManager";
 import { getEmployeeOrgan, getAddress, getCooperation } from "@/api/buildTeam";
@@ -755,13 +783,13 @@ export default {
       headers: {
         Authorization: getToken(),
       },
-      getCalenderList: []
+      getCalenderList: [],
     };
   },
   created() {
     that = this;
-        if (!(this.searchForm.orderDate?.length > 0)) {
-          this.getNow()
+    if (!(this.searchForm.orderDate?.length > 0)) {
+      this.getNow();
     }
   },
   mounted() {
@@ -774,8 +802,8 @@ export default {
     this.getList();
   },
   methods: {
-    getNow(){
-       var now = new Date();
+    getNow() {
+      var now = new Date();
       var startDate = new Date(
         Date.UTC(now.getFullYear(), now.getMonth(), now.getDate())
       )
@@ -824,7 +852,6 @@ export default {
               this.getList();
             } else {
               this.$message.error(res.msg);
-
             }
           });
         } else {
@@ -894,7 +921,7 @@ export default {
           load.startLoading();
           axios(options).then((res) => {
             load.endLoading();
-            if(res.data.code == 200) {
+            if (res.data.code == 200) {
               this.$message.info(res.data.data);
             } else {
               this.$message.error(res.data.msg);
@@ -1054,7 +1081,7 @@ export default {
         lessActualAmount: null,
         orderDate: [],
       };
-      this.getNow()
+      this.getNow();
       this.getList();
     },
     removeGoodsList(item) {
@@ -1071,7 +1098,7 @@ export default {
     },
     changeOrgin(val) {
       this.$set(this.form, "schoolId", null);
-      this.form.calenderId = null
+      this.form.calenderId = null;
       if (val) {
         getCooperation({ rows: 9999, organId: val }).then((res) => {
           if (res.code === 200) {
@@ -1082,9 +1109,9 @@ export default {
           {
             id: null,
             number: null,
-          }
-        ]
-        goodsQuery({ rows: 99999 }).then((res) => {
+          },
+        ];
+        goodsQuery({ rows: 99999, noOrganSearch: 1 }).then((res) => {
           if (res.code === 200) {
             this.shopList = res.data.rows;
           }
@@ -1092,10 +1119,10 @@ export default {
       }
     },
     async checkSchool(val) {
-      this.form.calenderId = null
+      this.form.calenderId = null;
       try {
-        let res = await getCalenders({id : val})
-        this.getCalenderList = res.data
+        let res = await getCalenders({ id: val });
+        this.getCalenderList = res.data;
       } catch {
         //
       }
@@ -1144,10 +1171,10 @@ export default {
           });
         }
       });
-      if(this.form.calenderId) {
+      if (this.form.calenderId) {
         try {
-          let res = await getCalenders({id : this.form.calenderId})
-          this.getCalenderList = res.data
+          let res = await getCalenders({ id: this.form.calenderId });
+          this.getCalenderList = res.data;
         } catch {
           //
         }
@@ -1215,7 +1242,6 @@ export default {
     },
     handleError(err, file, fileList) {
       load.endLoading();
-
     },
     fomatStr(str) {
       let arr = str.split(";");
@@ -1260,7 +1286,7 @@ export default {
           ],
           applyType: null,
           userId: "",
-          calenderId: null
+          calenderId: null,
         };
       }
     },

src/views/teamBuild/components/soundSetComponents/soundSetCore.vue

@@ -410,6 +410,8 @@ export default {
     lookMusic() {},
     checkShopAndMark() {
       let loadash = this.$helpers.lodash;
+      let errorShop = []
+      let flag = false
       this.activeSoundList.forEach((item) => {
         // 格式化教辅
         let markIdList = item.markList.map((mark) => {
@@ -420,34 +422,27 @@ export default {
         })
         for (let i = 0; i < item.markChioseList.length; i++) {
           if (!markIdList.includes(item.markChioseList[i])) {
+            errorShop.push(item.markChioseList[i])
+            flag = true
             item.markChioseList.splice(i--, 1);
           }
         }
 
           for (let i = 0; i < item.chioseMusic.length; i++) {
           if (!goodsIdList.includes(item.chioseMusic[i].musical)) {
+              errorShop.push(item.chioseMusic[i].musical)
+            flag = true
             item.chioseMusic[i].musical = null
             item.chioseMusic[i].groupPrice = null
           }
         }
-        // item.markChioseList.forEach((markChiose, index) => {
-        //   console.log(markChiose);
-        //   if (!markIdList.includes(markChiose)) {
-        //     item.markChioseList.splice(index--, 1);
-        //   }
-        // });
-        // if (item.markList.length > 0) {
-        //   item.markList.find((mark) => {
-        //     if (!item.markChioseList.includes(mark.id)) {
-        //       // 不包含就要删除就删除这一项
-        //       let loadash = this.$helper.loadash;
-        //       loadash.pull(item.markChioseList, mark.id);
-        //     }
-        //   });
-        // }else{
-        //   item.markChioseList = []
-        // }
       });
+      if(flag){
+        // 提示
+
+        this.$message.error(`{${errorShop.join(',')}}商品已失效，请联系仓库主管`)
+      }
+      this.$set(this,'activeSoundList',this.activeSoundList)
     },
     checkSubmit (){
        let flag = true;