等待接口

1

src/views/teamDetail/teamDetailedList.vue

@@ -2,10 +2,10 @@
   <div class="teamDetailedList">
     <el-tabs v-model="activeName">
       <el-tab-pane label="已发清单" name="waitTeamList" v-permission="'order/getMusicalList'">
-        <waitTeamList />
+        <endTeamList />
       </el-tab-pane>
       <el-tab-pane label="待发清单" name="endTeamList"  v-permission="'order/getMusicalList/wait'">
-        <endTeamList />
+        <waitTeamList />
       </el-tab-pane>
       <el-tab-pane label="收货地址" name="eidtTeamAddr" v-permission="'musicGroupShippingAddress/queryPage'">
         <eidtTeamAddr />
@@ -30,7 +30,14 @@ export default {
     eidtTeamAddr
   },
   mounted() {
+    this.$bus.$on("changeAddrTab", obj => {
+      this.activeName = obj;
+    });
+  },
+  beforeDestroy(){
+    this.$bus.$off("changeAddrTab", obj => {
 
+    });
   },
   activated() {
 

src/views/teamDetail/teamListComponent/modals/deliverGoods.vue

@@ -1,12 +1,128 @@
 <template>
   <div>
-
+    <el-form :model="forms" ref="form">
+      <el-form-item
+        label="物流公司"
+        prop="expressCompany"
+        :rules="[
+          { required: true, message: '请输入物流公司名称', trigger: 'blur' },
+        ]"
+      >
+        <el-input
+          v-model.trim="forms.expressCompany"
+          placeholder="请输入物流公司名称"
+        ></el-input>
+      </el-form-item>
+      <el-form-item
+        label="物流单号"
+        prop="expressBillNo"
+        :rules="[
+          { required: true, message: '请输入物流单号', trigger: 'blur' },
+        ]"
+      >
+        <el-input
+          v-model.trim="forms.expressBillNo"
+          placeholder="请输入物流单号"
+        ></el-input>
+      </el-form-item>
+      <el-form-item
+      label="收货地址"
+        prop="addressId"
+        :rules="[
+          { required: true, message: '请选收货地址', trigger: 'change' },
+        ]"
+        style="margin-right: 0"
+      >
+        <el-select
+          v-model.trim="forms.addressId"
+          filterable
+          placeholder="请选收货地址"
+          style="width:100%"
+          clearable
+        >
+          <el-option
+            v-for="item in addrList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+    </el-form>
   </div>
 </template>
 <script>
+import { areaQueryChild, getParentArea } from "@/api/specialSetting";
+import { addMusicGroupAddr, getMusicGroupAddr } from "../../api";
 export default {
-  data(){
-    return {}
-  }
-}
+  props: ["form"],
+  data() {
+    return {
+      forms: {
+        expressCompany: "",
+        expressBillNo: "",
+        goodsIds: "",
+        addressId: "",
+      },
+      addrList: [],
+    };
+  },
+  async mounted() {
+    this.getAddrList()
+    if (this.form) {
+      // this.forms = { ...this.form };
+    }
+  },
+  methods: {
+    async getAddrList() {
+      this.teamid = this.$route.query.id;
+      try {
+        getMusicGroupAddr({
+          musicGroupId: this.teamid,
+          page: 1,
+          rows: 9999,
+        }).then(async (res) => {
+          try{
+          if (res.code == 200) {
+            this.addrList = res.data.rows ? res.data.rows : [];
+            if (this.addrList.length < 1) {
+              await this.$confirm("当前乐团暂无收货地址,是否前去配置?", "提示", {
+                type: "warning",
+              });
+              this.$emit('close')
+              this.$bus.$emit("changeAddrTab",'eidtTeamAddr')
+            }
+          }
+        }catch(e){
+          console.log(e)
+        }
+        });
+      } catch (e) {
+        console.log(e);
+      }
+    },
+    async submit() {
+      this.$refs.form.validate(async (flag) => {
+        if (flag) {
+          // 新增
+          try {
+            const res = await addMusicGroupAddr({ ...this.forms });
+            this.$message.success("添加成功");
+            this.$emit("getList");
+          } catch (e) {
+            console.log(e);
+          }
+        }
+      });
+    },
+  },
+};
 </script>
+
+<style lang="scss" scoped>
+.provinceWrap {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+}
+</style>

src/views/teamDetail/teamListComponent/waitTeamList.vue

@@ -5,6 +5,7 @@
         <el-table
           :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
           :data="tableList"
+          @selection-change="handleSelectionChange"
         >
           <el-table-column type="selection" width="55"> </el-table-column>
           <el-table-column label="商品编号" prop="sn" align="center">
@@ -40,13 +41,14 @@
         @click="musicalListDetailExport"
         >分发清单导出</el-button
       >
+      <!--  v-if="
+          musicalStatus &&
+          $helpers.permission('musicGroup/takeEffectOfinstrumentInsurance')
+        " -->
       <el-button
         type="primary"
         @click="onDelivery"
-        v-if="
-          musicalStatus &&
-          $helpers.permission('musicGroup/takeEffectOfinstrumentInsurance')
-        "
+
         >确认发货</el-button
       >
       <el-button
@@ -59,6 +61,16 @@
       <!-- <div class="okBtn" v-permission="'order/verifyMusicalList'"
            @click="okDetailList">确认</div> -->
     </div>
+    <el-dialog :visible.sync="addrVisiable" title="确认清单" width="500px">
+      <deliverGoods v-if="addrVisiable" :form="activeChiose" ref='deliverGoods' @close='()=>{addrVisiable = false}' @getList='getList'/>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="addrVisiable = false">取 消</el-button>
+        <el-button type="primary" @click="onsubmitDelivery"
+          >确 定</el-button
+        >
+      </div>
+    </el-dialog>
+
   </div>
 </template>
 <script>
@@ -68,6 +80,7 @@ import {
   verifyMusicalList,
   takeEffectOfinstrumentInsurance,
 } from "@/api/orderManager";
+import deliverGoods from './modals/deliverGoods.vue'
 import axios from "axios";
 import qs from "qs";
 import { getToken, getTenantId } from "@/utils/auth";
@@ -82,9 +95,11 @@ export default {
       team_status: "",
       musicalInstrumentsProvideStatus: 0, // 是否确认发货  1已发货
       hasVerifyMusicalList: true,
-      activeChiose:[]
+      activeChiose:[],
+      addrVisiable:false
     };
   },
+  components:{deliverGoods},
   mounted() {
     this.init();
   },
@@ -110,13 +125,16 @@ export default {
         //     this.hasVerifyMusicalList = res?.data?.rows[0]?.hasVerifyMusicalList
         //   }
         // })
-        getTeamDetailList({ musicGroupId: this.teamid }).then((res) => {
+          this.getList()
+        this.getMusicInfo();
+      }
+    },
+    getList(){
+      getTeamDetailList({ musicGroupId: this.teamid }).then((res) => {
           if (res.code == 200) {
             this.tableList = res.data ? res.data : [];
           }
         });
-        this.getMusicInfo();
-      }
     },
     async getMusicInfo() {
       await getTeamBaseInfo({ musicGroupId: this.teamid }).then((res) => {
@@ -136,6 +154,9 @@ export default {
       this.$router.push({ path: "/teamList" });
     },
     onDelivery() {
+      console.log('自动发货')
+      this.addrVisiable = true;
+      return
       this.$confirm("是否确认发货", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -150,6 +171,9 @@ export default {
         }
       });
     },
+    onsubmitDelivery(){
+      console.log('确认发货发货')
+    },
     okDetailList() {
       this.$confirm(`是否确认发放清单?`, "提示", {
         confirmButtonText: "确定",