清单导出检查完毕

1

src/views/teamBuild/components/teamBaseInfo.vue

@@ -514,7 +514,7 @@
         </el-form-item>
         <el-form-item
           label="是否赠送辅件"
-          prop="memberCourseShowFlag"
+          prop="isGiveAccessories"
           label-width="200px"
           :rules="[{ required: true, message: '是否赠送辅件不能为空' }]"
         >
@@ -533,8 +533,8 @@
           <el-switch
             v-model="topFrom.isGiveAccessories"
             :disabled="basdisabled"
-            :active-value="1"
-            :inactive-value="0"
+            :active-value="'true'"
+            :inactive-value="'false'"
           >
           </el-switch>
         </el-form-item>

src/views/teamDetail/teamListComponent/endTeamList.vue

@@ -25,13 +25,13 @@
       </div>
     </div>
     <div class="btnWrap" style="margin-top: 20px">
-      <el-button
+      <!-- <el-button
         type="primary"
         v-if="tableList.length > 0"
         v-permission="'order/musicalListExport'"
         @click="musicalListExport"
         >订货清单导出</el-button
-      >
+      > -->
       <el-button
         type="primary"
         v-if="tableList.length > 0"
@@ -39,18 +39,18 @@
         @click="musicalListDetailExport"
         >分发清单导出</el-button
       >
-      <el-button
+      <!-- <el-button
         type="primary"
         @click="onDelivery"
         v-if="musicalStatus && $helpers.permission('musicGroup/takeEffectOfinstrumentInsurance')"
-        >确认发货</el-button>
-      <el-button
+        >确认发货</el-button> -->
+      <!-- <el-button
         type="warning okBtn"
         v-if="team_status == 'PREPARE'&&!hasVerifyMusicalList"
         v-permission="'order/verifyMusicalList'"
         @click="okDetailList"
         >乐器清单确认</el-button
-      >
+      > -->
       <!-- <div class="okBtn" v-permission="'order/verifyMusicalList'"
            @click="okDetailList">确认</div> -->
     </div>
@@ -121,21 +121,21 @@ export default {
       this.$store.dispatch("delVisitedViews", this.$route);
       this.$router.push({ path: "/teamList" });
     },
-    onDelivery() {
-      this.$confirm('是否确认发货', "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      }).then(async () => {
-        try {
-          await takeEffectOfinstrumentInsurance({ musicGroupId: this.teamid })
-          this.$message.success('确定发货成功')
-          this.getMusicInfo()
-        } catch {
-          //
-        }
-      })
-    },
+    // onDelivery() {
+    //   this.$confirm('是否确认发货', "提示", {
+    //     confirmButtonText: "确定",
+    //     cancelButtonText: "取消",
+    //     type: "warning",
+    //   }).then(async () => {
+    //     try {
+    //       await takeEffectOfinstrumentInsurance({ musicGroupId: this.teamid })
+    //       this.$message.success('确定发货成功')
+    //       this.getMusicInfo()
+    //     } catch {
+    //       //
+    //     }
+    //   })
+    // },
     okDetailList() {
       this.$confirm(`是否确认发放清单?`, "提示", {
         confirmButtonText: "确定",
@@ -161,6 +161,7 @@ export default {
       let url = "/api-web/order/musicalListExport";
       let data = {
         musicGroupId: this.$route.query.id,
+        deliveryStatus:'1'
       };
       const options = {
         method: "POST",
@@ -236,6 +237,7 @@ export default {
       let url = "/api-web/order/musicalListDetailExport";
       let data = {
         musicGroupId: this.$route.query.id,
+        deliveryStatus:'1'
       };
       const options = {
         method: "POST",

src/views/teamDetail/teamListComponent/waitTeamList.vue

@@ -52,13 +52,13 @@
 
         >确认发货</el-button
       >
-      <el-button
+      <!-- <el-button
         type="warning okBtn"
         v-if="team_status == 'PREPARE' && !hasVerifyMusicalList"
         v-permission="'order/verifyMusicalList'"
         @click="okDetailList"
         >乐器清单确认</el-button
-      >
+      > -->
       <!-- <div class="okBtn" v-permission="'order/verifyMusicalList'"
            @click="okDetailList">确认</div> -->
     </div>
@@ -131,6 +131,7 @@ export default {
       }
     },
     getList(){
+      this.addrVisiable=false;
       getTeamDetailList({ musicGroupId: this.teamid,deliveryStatus:'0' }).then((res) => {
           if (res.code == 200) {
             this.tableList = res.data ? res.data : [];
@@ -155,22 +156,22 @@ export default {
       this.$router.push({ path: "/teamList" });
     },
     onDelivery() {
-      console.log('自动发货')
+      // console.log('自动发货')
       this.addrVisiable = true;
-      return
-      this.$confirm("是否确认发货", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      }).then(async () => {
-        try {
-          await takeEffectOfinstrumentInsurance({ musicGroupId: this.teamid });
-          this.$message.success("确定发货成功");
-          this.getMusicInfo();
-        } catch {
-          //
-        }
-      });
+      // return
+      // this.$confirm("是否确认发货", "提示", {
+      //   confirmButtonText: "确定",
+      //   cancelButtonText: "取消",
+      //   type: "warning",
+      // }).then(async () => {
+      //   try {
+      //     await takeEffectOfinstrumentInsurance({ musicGroupId: this.teamid });
+      //     this.$message.success("确定发货成功");
+      //     this.getMusicInfo();
+      //   } catch {
+      //     //
+      //   }
+      // });
     },
     onsubmitDelivery(){
       this.$refs.deliverGoods.submit()
@@ -200,6 +201,7 @@ export default {
       let url = "/api-web/order/musicalListExport";
       let data = {
         musicGroupId: this.$route.query.id,
+        deliveryStatus:'0'
       };
       const options = {
         method: "POST",
@@ -275,6 +277,7 @@ export default {
       let url = "/api-web/order/musicalListDetailExport";
       let data = {
         musicGroupId: this.$route.query.id,
+        deliveryStatus:'0'
       };
       const options = {
         method: "POST",