10/13 更换列表

11

dist/static/css/chunk-5a254c34.a93afb2d.css → dist/static/css/chunk-79158174.b9f74fb9.css

@@ -1 +1 @@
-.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}[data-v-10113950] .demo-table-expand .el-form-item{margin-right:0;margin-bottom:0;width:50%}[data-v-10113950] .demo-table-expand label{color:#99a9bf}
+.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}[data-v-402b8db2] .demo-table-expand .el-form-item{margin-right:0;margin-bottom:0;width:50%}[data-v-402b8db2] .demo-table-expand label{color:#99a9bf}

src/views/businessManager/resetList/index.vue

@@ -271,9 +271,12 @@ export default {
       let params = this.searchForm
       params.rows = this.rules.limit
       params.page = this.rules.page
-      if (this.searchForm.resetDate && this.searchForm.resetDate.length > 1) {
-        params.startTime = this.searchForm.resetDate[0]
-        params.endTime = this.searchForm.resetDate[1]
+      if (this.resetDate && this.resetDate.length > 1) {
+        params.startTime = this.resetDate[0]
+        params.endTime = this.resetDate[1]
+      } else {
+        params.startTime = null
+        params.endTime = null
       }
 
 
@@ -311,6 +314,8 @@ export default {
       }
 
     }
+  }, watch: {
+
   }
 };
 </script>

src/views/businessManager/resetList/resetSound.vue

@@ -1,58 +1,48 @@
 <template>
   <div>
-    <el-dialog title="修改" width="500px" :visible.sync="soundVisible">
-      <el-form
-        :model="soundForm"
-        label-position="right"
-        label-width="120px"
-        :inline="true"
-        ref="soundForm"
-      >
+    <el-dialog title="修改"
+               width="500px"
+               :visible.sync="soundVisible">
+      <el-form :model="soundForm"
+               label-position="right"
+               label-width="120px"
+               :inline="true"
+               ref="soundForm">
         <el-form-item label="原乐器">
-          <el-input
-            style="width: 330px"
-            disabled
-            v-model="soundForm.originalMusicalGoods"
-          ></el-input>
+          <el-input style="width: 330px"
+                    disabled
+                    v-model="soundForm.originalMusicalGoods"></el-input>
         </el-form-item>
         <el-form-item label="原教辅">
-          <el-input
-            style="width: 330px"
-            disabled
-            v-model="soundForm.originalAccessories"
-          ></el-input>
+          <el-input style="width: 330px"
+                    disabled
+                    v-model="soundForm.originalAccessories"></el-input>
         </el-form-item>
         <el-form-item label="更换乐器">
-          <el-input
-            style="width: 330px"
-            disabled
-            v-model="soundForm.changeMusicalGoods"
-          ></el-input>
+          <el-input style="width: 330px"
+                    disabled
+                    v-model="soundForm.changeMusicalGoods"></el-input>
         </el-form-item>
         <el-form-item label="更换教辅">
-          <el-input
-            style="width: 330px"
-            disabled
-            v-model="soundForm.changeAccessories"
-          ></el-input>
+          <el-input style="width: 330px"
+                    disabled
+                    v-model="soundForm.changeAccessories"></el-input>
         </el-form-item>
         <el-form-item label="支付差价">
-          <el-input
-            style="width: 330px"
-            disabled
-            v-model="soundForm.money"
-          ></el-input>
+          <el-input style="width: 330px"
+                    disabled
+                    v-model="soundForm.money"></el-input>
         </el-form-item>
         <el-form-item label="成本差(元)">
-          <el-input
-            style="width: 330px"
-            v-model="soundForm.costMargin"
-          ></el-input>
+          <el-input style="width: 330px"
+                    v-model="soundForm.costMargin"></el-input>
         </el-form-item>
       </el-form>
-      <div slot="footer" class="dialog-footer">
+      <div slot="footer"
+           class="dialog-footer">
         <el-button @click="soundVisible = false">取 消</el-button>
-        <el-button type="primary" @click="resetCostMargin">确 定</el-button>
+        <el-button type="primary"
+                   @click="resetCostMargin">确 定</el-button>
       </div>
     </el-dialog>
   </div>
@@ -64,7 +54,7 @@ import numeral from "numeral";
 import { updateCostMargin } from "@/api/businessManager";
 export default {
   props: ["show", "item"],
-  data() {
+  data () {
     return {
       soundForm: {
         originalMusicalGoods: null,
@@ -78,17 +68,22 @@ export default {
       soundVisible: false,
     };
   },
-  mounted() {},
+  mounted () { },
   methods: {
-    accessoriesFormatter(accessories) {
-      let arr = accessories.map((res) => {
-        return res.name;
-      });
-      return arr.join(",");
+    accessoriesFormatter (accessories) {
+      if (accessories?.length > 0) {
+        let arr = accessories.map((res) => {
+          return res.name;
+        });
+        return arr.join(",");
+      } else {
+        return ''
+      }
+
     },
-    resetCostMargin() {
-      updateCostMargin({id:this.soundForm.id,costMargin:this.soundForm.costMargin}).then(res=>{
-        if(res.code == 200){
+    resetCostMargin () {
+      updateCostMargin({ id: this.soundForm.id, costMargin: this.soundForm.costMargin }).then(res => {
+        if (res.code == 200) {
           this.$message.success('修改成功')
           this.$emit('getList')
         }
@@ -96,10 +91,10 @@ export default {
     },
   },
   watch: {
-    show(val) {
+    show (val) {
       this.soundVisible = val;
     },
-    soundVisible(val) {
+    soundVisible (val) {
       if (!val) {
         this.$emit("closeReset");
       }
@@ -107,7 +102,7 @@ export default {
     item: {
       immediate: true,
       deep: true,
-      handler(row, oldValue) {
+      handler (row, oldValue) {
         if (row) {
           this.soundForm = {
             originalMusicalGoods: row.originalMusicalGoods
@@ -122,8 +117,8 @@ export default {
               this.accessoriesFormatter(row.changeAccessoriesGoods) || null,
             money: numeral(
               row.changeMusicalPrice +
-                row.changeAccessoriesPrice -
-                (row.originalMusicalPrice + row.originalAccessoriesPrice)
+              row.changeAccessoriesPrice -
+              (row.originalMusicalPrice + row.originalAccessoriesPrice)
             ).format("0,0.00"),
             costMargin: numeral(row.costMargin).format("0,0.00"),
             id: row.id,