修改问题及还原

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="skuStockCode" label="sku编号">
+        <el-table-column align="center" prop="skuCode" label="sku编号">
         </el-table-column>
         <el-table-column align="center" prop="sn" label="成本">
           <template slot-scope="scope">
@@ -590,10 +590,18 @@ export default {
         type: [
           {
             required: true,
+            message: "请选择商品类型",
+            trigger: "change"
+          }
+        ],
+        goodsCategoryId: [
+          {
+            required: true,
             message: "请选择商品分类",
             trigger: "change"
           }
         ],
+
         organIdList: [
           {
             required: true,
@@ -895,10 +903,18 @@ export default {
       }
     },
     removeGoodsList(item) {
-      const index = this.form.goodsList.indexOf(item);
-      if (index !== -1) {
-        this.form.goodsList.splice(index, 1);
-      }
+      this.$confirm("是否删除该商品?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          const index = this.form.goodsList.indexOf(item);
+          if (index !== -1) {
+            this.form.goodsList.splice(index, 1);
+          }
+        })
+        .catch(() => {});
     },
     addGoodsList() {
       const ids = [];
@@ -928,7 +944,7 @@ export default {
             name: item.name,
             goodsId: item.goodsId,
             skuStockId: item.skuStockId,
-            skuStockCode: item.skuStockCode,
+            skuCode: item.skuCode,
             price: item.price,
             publishStatus: item.publishStatus,
             productSn: item.productSn,

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

@@ -101,7 +101,7 @@
         </el-table-column>
         <el-table-column align="center" prop="brandName" label="品牌">
         </el-table-column>
-        <el-table-column align="center" prop="skuStockCode" label="sku编号">
+        <el-table-column align="center" prop="skuCode" label="sku编号">
         </el-table-column>
         <el-table-column align="center" prop="price" label="销售价格">
         </el-table-column>

src/views/businessManager/shopManager/shopCategory.vue

@@ -5,14 +5,14 @@
       商品分类管理
     </h2>
     <div class="m-core">
-      <!-- <el-button
+      <el-button
         v-permission="'category/upset'"
         @click="openTypes('create')"
         type="primary"
         style="margin-bottom:20px"
       >
         添加
-      </el-button> -->
+      </el-button>
       <!-- 列表 -->
       <div class="tableWrap">
         <el-table
@@ -37,23 +37,23 @@
                 type="text"
                 >修改</el-button
               >
-              <!-- <el-button
+              <el-button
                 @click="onTypesDelOpeation(scope.row)"
                 v-permission="'category/del'"
                 type="text"
                 >删除</el-button
-              > -->
+              >
             </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,20 +206,19 @@ export default {
         page: this.pageInfo.page
       }).then(res => {
         let result = res.data;
-        console.log(result, "res,", res);
         if (res.code == 200) {
-          result.forEach(row => {
+          result.rows.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;
-          // this.pageInfo.total = result.total;
+          this.tableList = result.rows;
+          this.pageInfo.total = result.total;
         }
       });
     },
@@ -252,10 +251,9 @@ export default {
         let result = res.data;
         if (res.code == 200) {
           let tempArray = [];
-
-          (result.rows || []).forEach((item, index) => {
+          result.rows.forEach((item, index) => {
             let subject = [];
-            (item.subjects || []).forEach(s => {
+            item.subjects.forEach(s => {
               subject.push({
                 value: s.id,
                 label: s.name
@@ -268,7 +266,6 @@ export default {
             };
           });
           this.subjectList = tempArray;
-          console.log(this.subjectList, "12");
         }
       });
     }

src/views/resetTeaming/components/goodsPayInfo.vue

@@ -204,13 +204,16 @@ export default {
           this.$message.error("请至少选择一个采购商品");
           return;
         }
-        let total = 0;
-        this.form.musicGroupCalenderRefundPeriods.forEach(item => {
-          total += item.refundAmount * 1;
-        });
-        if (total != this.form.currentTotalAmount) {
-          this.$message.error("付款金额与回款金额不一致,请重新设置");
-          return;
+        // 修改账期时，金额可以不一致
+        if (this.$route.query.type != "payschoolList") {
+          let total = 0;
+          this.form.musicGroupCalenderRefundPeriods.forEach(item => {
+            total += item.refundAmount * 1;
+          });
+          if (total != this.form.currentTotalAmount) {
+            this.$message.error("付款金额与回款金额不一致,请重新设置");
+            return;
+          }
         }
 
         if (this.$route.query.calenderId) {

src/views/resetTeaming/goodsModal/payBackMoney.vue

@@ -27,6 +27,11 @@
             :label="item.realName"
             :value="item.id"
           >
+            <span style="float: left">{{ item.realName }}</span>
+            <span
+              style="float: right; color: #8492a6; font-size: 13px; padding-left: 12px"
+              >{{ item.phone }}</span
+            >
           </el-option>
         </el-select>
       </el-form-item>

src/views/resetTeaming/goodsModal/payGoodsInfo.vue

@@ -118,10 +118,18 @@ export default {
   },
   methods: {
     removeGoodsList(item) {
-      const index = this.form.calenderGoodsList.indexOf(item);
-      if (index !== -1) {
-        this.form.calenderGoodsList.splice(index, 1);
-      }
+      this.$confirm("是否删除该商品?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          const index = this.form.calenderGoodsList.indexOf(item);
+          if (index !== -1) {
+            this.form.calenderGoodsList.splice(index, 1);
+          }
+        })
+        .catch(() => {});
     },
     onChangeNum(index) {
       const form = this.form.calenderGoodsList[index];

src/views/resetTeaming/modals/review-detail.vue

@@ -79,6 +79,7 @@
         >{{ calender.startPaymentDate | dayjsFormat }} -
         {{ calender.deadlinePaymentDate | dayjsFormat }}</descriptions-item
       >
+
       <descriptions-item
         :span="3"
         label="备注："
@@ -387,20 +388,25 @@
       <el-table-column prop="totalPrice" label="总价格"> </el-table-column>
     </el-table>
 
-    <!-- <descriptions
-      :column="3"
-      v-if="course && course.length > 0 && course[0].name"
+    <el-alert
+      title="收货信息"
+      :closable="false"
+      class="alert"
+      type="info"
+      v-if="address.id"
     >
-      <descriptions-item :span="2" label="总金额：" v-if="course[0].name">{{
-        course[0].name
-      }}</descriptions-item>
-      <descriptions-item :span="2" label="优惠金额：" v-if="course[0].name">{{
-        course[0].name
-      }}</descriptions-item>
-      <descriptions-item :span="2" label="付款金额：" v-if="course[0].name">{{
-        course[0].name
+    </el-alert>
+    <descriptions :column="2" v-if="address.id">
+      <descriptions-item label="收货人：">{{ address.name }}</descriptions-item>
+      <descriptions-item label="手机号：">{{
+        address.phone
       }}</descriptions-item>
-    </descriptions> -->
+      <descriptions-item label="详细地址：">
+        {{ address.provinceName }} {{ address.cityName }}
+        {{ address.regionName }}
+        {{ address.address }}
+      </descriptions-item>
+    </descriptions>
 
     <el-alert
       title="缴费周期"
@@ -477,6 +483,7 @@ const initData = {
   course: [],
   member: [],
   goods: [],
+  address: {},
   repair: {},
   musicMerger: [],
   studentNum: 0,
@@ -532,6 +539,7 @@ export default {
             this[key] = res.data[key];
           }
         }
+        consoe.log(this);
       } catch (error) {}
     }
   }