浏览代码

地址编辑完成

1
mo 2 年之前
父节点
当前提交
8092841e1f

+ 1 - 1
src/views/teamDetail/api.js

@@ -124,7 +124,7 @@ export const deleteMusicGroupAddr = data => request2({
   url: '/api-web/musicGroupShippingAddress/delete',
   data,
   params: data,
-  method: 'get',
+  method: 'post',
   requestType: 'form'
 })
 // courseScheduleConvert/queryCourse

+ 3 - 3
src/views/teamDetail/teamDetailedList.vue

@@ -2,13 +2,13 @@
   <div class="teamDetailedList">
     <el-tabs v-model="activeName">
       <el-tab-pane label="已发清单" name="waitTeamList" v-permission="'order/getMusicalList'">
-        <endTeamList />
+        <endTeamList v-if="activeName=='waitTeamList'" />
       </el-tab-pane>
       <el-tab-pane label="待发清单" name="endTeamList"  v-permission="'order/getMusicalList/wait'">
-        <waitTeamList />
+        <waitTeamList v-if="activeName=='endTeamList'"/>
       </el-tab-pane>
       <el-tab-pane label="收货地址" name="eidtTeamAddr" v-permission="'musicGroupShippingAddress/queryPage'">
-        <eidtTeamAddr />
+        <eidtTeamAddr v-if="activeName=='eidtTeamAddr'"/>
       </el-tab-pane>
 
     </el-tabs>

+ 12 - 3
src/views/teamDetail/teamListComponent/eidtTeamAddr.vue

@@ -9,9 +9,15 @@
           :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
           :data="tableList"
         >
-          <el-table-column label="地址编号" prop="sn" width="100px"  align="center">
+          <el-table-column label="地址编号" prop="id" width="100px"  align="center">
           </el-table-column>
-          <el-table-column label="详细地址" align="left" prop="name">
+          <el-table-column label="省" align="left" prop="regionProvince">
+          </el-table-column>
+          <el-table-column label="市" align="left" prop="regionCity">
+          </el-table-column>
+          <el-table-column label="区" align="left" prop="regionCounty">
+          </el-table-column>
+          <el-table-column label="详细地址" align="left" prop="detailAddress">
           </el-table-column>
           <el-table-column label="操作" prop="sn" width="100px"  align="center">
             <template slot-scope="scope">
@@ -120,7 +126,10 @@ export default {
       this.$store.dispatch("delVisitedViews", this.$route);
       this.$router.push({ path: "/teamList" });
     },
-    resetAddr(row){},
+    resetAddr(row){
+      this.activeRow = row;
+      this.addrVisiable = true;
+    },
    async deleteAddr(row){
     try{
       await this.$confirm("是否确认删除此收货地址?", "提示", {

+ 1 - 1
src/views/teamDetail/teamListComponent/endTeamList.vue

@@ -101,7 +101,7 @@ export default {
         //     this.hasVerifyMusicalList = res?.data?.rows[0]?.hasVerifyMusicalList
         //   }
         // })
-        getTeamDetailList({ musicGroupId: this.teamid }).then((res) => {
+        getTeamDetailList({ musicGroupId: this.teamid,deliveryStatus:'1' }).then((res) => {
           if (res.code == 200) {
             this.tableList = res.data ? res.data : [];
           }

+ 33 - 29
src/views/teamDetail/teamListComponent/modals/eidtAddr.vue

@@ -27,14 +27,14 @@
         <br />
         <div class="provinceWrap">
           <el-form-item
-            prop="regionProvince"
+            prop="regionProvinceId"
             :rules="[
               { required: true, message: '请选择省', trigger: 'change' },
             ]"
             style="margin-right: 0"
           >
             <el-select
-              v-model.trim="forms.regionProvince"
+              v-model.trim="forms.regionProvinceId"
               filterable
               placeholder="请选择省"
               clearable
@@ -50,16 +50,16 @@
             </el-select>
           </el-form-item>
           <el-form-item
-            prop="regionCity"
+            prop="regionCityId"
             :rules="[
               { required: true, message: '请选择市', trigger: 'change' },
             ]"
             style="margin-right: 0"
           >
             <el-select
-              v-model.trim="forms.regionCity"
+              v-model.trim="forms.regionCityId"
               filterable
-              :disabled="!forms.regionProvince"
+              :disabled="!forms.regionProvinceId"
               style="width: 148px !important; margin-right: 5px"
               placeholder="请选择市"
               @change="onChangeCity"
@@ -74,16 +74,16 @@
             </el-select>
           </el-form-item>
           <el-form-item
-            prop="regionCounty"
+            prop="regionCountyId"
             :rules="[
               { required: true, message: '请选择地区', trigger: 'change' },
             ]"
             style="margin-right: 0"
           >
             <el-select
-              v-model.trim="forms.regionCounty"
+              v-model.trim="forms.regionCountyId"
               filterable
-              :disabled="!forms.regionCity"
+              :disabled="!forms.regionCityId"
               style="width: 148px !important"
               placeholder="请选择地区"
               clearable
@@ -100,13 +100,13 @@
       </el-form-item>
       <el-form-item
         label="详细地址"
-        prop="address"
+        prop="detailAddress"
         :rules="[
           { required: true, message: '请输入详细地址', trigger: 'blur' },
         ]"
       >
         <el-input
-          v-model.trim="forms.address"
+          v-model.trim="forms.detailAddress"
           type="textarea"
           :rows="3"
           placeholder="请输入详细地址"
@@ -127,9 +127,10 @@ export default {
         mobile: "",
         detailAddress: "",
         musicGroupId: "",
-        regionProvince: "",
-        regionCity: "",
-        regionCounty: "",
+        regionProvinceId: "",
+        regionCityId: "",
+        regionCountyId: "",
+
       },
       provinceList: [],
       cityList: [],
@@ -141,32 +142,34 @@ export default {
       this.forms = {...this.form}
     }
     await this.getAreaList();
-    if (this.forms.regionCity) {
-      await getParentArea({ id: this.forms.regionCity }).then(async (res) => {
+    if (this.forms.regionCityId) {
+      await getParentArea({ id: this.forms.regionCityId }).then(async (res) => {
         if (res.code == 200 && res.data) {
-          await this.getAreaList(res.data.id, "regionCity", () => {
-            this.$set(this.forms, "regionProvince", res.data.id);
-            this.$set(this.forms, "regionCity", this.forms.regionCity);
+          await this.getAreaList(res.data.id, "regionCityId", () => {
+            this.$set(this.forms, "regionProvinceId", res.data.id+'');
+            this.$set(this.forms, "regionCityId", this.forms.regionCityId );
+            this.$set(this.forms, "regionCountyId", this.forms.regionCountyId);
           });
         }
       });
-      if (this.forms.regionCity) {
-        await this.getAreaList(this.forms.regionCity, "regionCounty");
+      if (this.forms.regionCityId) {
+        await this.getAreaList(this.forms.regionCityId, "regionCountyId");
+        this.$set(this.forms, "regionCountyId", this.forms.regionCountyId);
       }
     } else {
-      this.$set(this.forms, "regionProvince", null);
-      this.$set(this.forms, "city", null);
+      this.$set(this.forms, "regionProvinceId", null);
+      this.$set(this.forms, "regionCityId", null);
     }
   },
   methods: {
     onChangeProvince(val) {
-      this.forms.regionCity = null;
-      this.forms.regionCounty = null;
-      this.getAreaList(val, "");
+      this.forms.regionCityId = null;
+      this.forms.regionCountyId = null;
+      this.getAreaList(val+'', "");
     },
     onChangeCity(val) {
-      this.forms.regionCounty = null;
-      this.getAreaList(val, "regionCounty");
+      this.forms.regionCountyId = null;
+      this.getAreaList(val+'', "regionCountyId");
     },
     getAreaList(parentId, type, callback) {
       parentId = parentId ? parentId : 0;
@@ -176,11 +179,11 @@ export default {
           res.data.forEach((item) => {
             tempData.push({
               label: item.name,
-              value: item.id,
+              value: item.id+'',
             });
           });
           if (parentId) {
-            if (type == "regionCounty") {
+            if (type == "regionCountyId") {
               this.countyList = tempData;
             } else {
               this.cityList = tempData;
@@ -198,6 +201,7 @@ export default {
     async submit() {
       this.$refs.form.validate(async (flag) => {
         if (flag) {
+          this.forms.musicGroupId = this.$route.query.id
           if (this.forms.id) {
             // 修改  resetMusicGroupAddr
             try {

+ 2 - 2
src/views/teamDetail/teamListComponent/waitTeamList.vue

@@ -131,14 +131,14 @@ export default {
       }
     },
     getList(){
-      getTeamDetailList({ musicGroupId: this.teamid }).then((res) => {
+      getTeamDetailList({ musicGroupId: this.teamid,deliveryStatus:'0' }).then((res) => {
           if (res.code == 200) {
             this.tableList = res.data ? res.data : [];
           }
         });
     },
     async getMusicInfo() {
-      await getTeamBaseInfo({ musicGroupId: this.teamid }).then((res) => {
+      await getTeamBaseInfo({ musicGroupId: this.teamid  }).then((res) => {
         if (res.code == 200) {
           this.musicalInstrumentsProvideStatus =
             res.data?.musicGroup?.musicalInstrumentsProvideStatus;