修改

src/store/modules/permission.js

@@ -361,6 +361,20 @@ function setDetailRoute(accessedRoutes) {
           }
         },
         {
+          name: "商品采购设置",
+          path: "goodsPaySet2",
+          component: () =>
+            import("@/views/resetTeaming/components/goodsPayInfo"),
+          hidden: true,
+          meta: {
+            noCache: "1",
+            title: "商品采购设置",
+            belongTopMenu: "/financialManager",
+            activeMenu: "/payschoolList",
+            id: "xx3"
+          }
+        },
+        {
           name: "乐团详情",
           path: "resetTeaming",
           component: () => import("@/views/resetTeaming/index"),

src/views/branchPayManager/payschoolList.vue

@@ -282,20 +282,15 @@ export default {
     },
     onChangeTime(row) {
       let query = this.$route.query;
-      this.$router.push(
-        {
-          path: "/business/goodsPaySet",
-          query: {
-            calenderId: row.calenderId,
-            musicGroupId: row.musicGroupId,
-            type: "payschoolList",
-            ...query
-          }
-        },
-        route => {
-          route.meta.title = "商品采购设置";
+      this.$router.push({
+        path: "/business/goodsPaySet",
+        query: {
+          calenderId: row.calenderId,
+          musicGroupId: row.musicGroupId,
+          type: "payschoolList",
+          ...query
         }
-      );
+      });
     },
     async downLoad(row) {
       try {

src/views/businessManager/shopManager/model/combinationProducts.vue

@@ -21,7 +21,7 @@
         </el-table-column>
         <el-table-column align="center" prop="price" label="销售价格">
         </el-table-column>
-        <el-table-column align="center" prop="skuStockId" label="sku编号">
+        <el-table-column align="center" prop="skuStockCode" label="sku编号">
         </el-table-column>
         <el-table-column align="center" prop="sn" label="成本">
           <template slot-scope="scope">
@@ -928,6 +928,7 @@ export default {
             name: item.name,
             goodsId: item.goodsId,
             skuStockId: item.skuStockId,
+            skuStockCode: item.skuStockCode,
             price: item.price,
             publishStatus: item.publishStatus,
             productSn: item.productSn,

src/views/businessManager/shopManager/model/subShopGoods.vue

@@ -101,14 +101,14 @@
         </el-table-column>
         <el-table-column align="center" prop="brandName" label="品牌">
         </el-table-column>
-        <el-table-column align="center" prop="skuStockId" label="sku编号">
+        <el-table-column align="center" prop="skuStockCode" label="sku编号">
         </el-table-column>
         <el-table-column align="center" prop="price" label="销售价格">
         </el-table-column>
         <el-table-column align="center" prop="stock" label="剩余库存">
         </el-table-column>
-        <el-table-column align="center" prop="sn" label="采购价">
-        </el-table-column>
+        <!-- <el-table-column align="center" prop="price" label="采购价">
+        </el-table-column> -->
         <el-table-column align="center" prop="publishStatus" label="状态">
           <template slot-scope="scope">
             <el-tag :type="scope.row.publishStatus == 1 ? '' : 'danger'">

src/views/businessManager/shopManager/shopCategory.vue

@@ -46,14 +46,14 @@
             </template>
           </el-table-column>
         </el-table>
-        <pagination
+        <!-- <pagination
           sync
           :total.sync="pageInfo.total"
           :page.sync="pageInfo.page"
           :limit.sync="pageInfo.limit"
           :page-sizes="pageInfo.page_size"
           @pagination="getList"
-        />
+        /> -->
       </div>
     </div>
     <el-dialog
@@ -206,19 +206,20 @@ export default {
         page: this.pageInfo.page
       }).then(res => {
         let result = res.data;
+        console.log(result, "res,", res);
         if (res.code == 200) {
-          result.rows.forEach(row => {
+          result.forEach(row => {
             let subjectname = [],
               subjectIds = [];
-            row.subjects.forEach(item => {
+            (row.subjects || []).forEach(item => {
               subjectname.push(item.name);
               subjectIds.push(item.id);
             });
             row.subjectName = subjectname;
             row.subjectIds = subjectIds;
           });
-          this.tableList = result.rows;
-          this.pageInfo.total = result.total;
+          this.tableList = result;
+          // this.pageInfo.total = result.total;
         }
       });
     },

src/views/resetTeaming/components/resetPayList.vue

@@ -64,7 +64,7 @@
         class="newBand"
         @click="newGoodsPay"
         v-if="teamStatus"
-        v-permission="'musicGroupPaymentCalender/createCalender/4359'"
+        v-permission="'musicGroupPaymentCalender/createCalender/4459'"
       >
         新建商品采购
       </div>

src/views/resetTeaming/goodsModal/payBackMoney.vue

@@ -90,7 +90,10 @@
 
           <i
             class="el-icon-delete delete"
-            v-if="!(form.musicGroupCalenderRefundPeriods.length <= 1)"
+            v-if="
+              !(form.musicGroupCalenderRefundPeriods.length <= 1) ||
+                !payschoolListStatus
+            "
             @click="deteleRow(item, index)"
           ></i>
         </div>

src/views/resetTeaming/index.vue

@@ -175,7 +175,7 @@
 
         <el-tab-pane
           lazy
-          label="收货地址"
+          label="乐器清单"
           name="10"
           :disabled="!teamid"
           v-if="permission('/teamMusicList')"

src/views/teamDetail/teamDetailedList.vue

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

vue.config.js

@@ -18,7 +18,7 @@ const name = defaultSettings.title || "管乐迷后台管理系统"; // page tit
 // let target = "https://online.dayaedu.com"; //线上
 // let target = 'http://192.168.3.20:8000' //邹璇
 // let target = "http://192.168.0.127:8000"; //勇哥
-// let target = "http://192.168.3.14:8005"; // 原谅
+// let target = "http://192.168.3.14:8000"; // 原谅
 let target = "https://dev.dayaedu.com"; //测试环境
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {