提交箱管

src/components/boxCost/index.vue

@@ -136,17 +136,35 @@ export default {
         precision: 2,
         disabled: true,
         controls: false,
-        overHidden: true,
-        width: 140
-      }, {
-        label: '备注',
-        prop: 'remarks',
-        type: 'textarea',
-        overHidden: true,
-        minRows: 3,
-        span: 24,
-        width: 200
-      }]
+          overHidden: true,
+          width: 140
+        }, {
+          label: '日期起',
+          prop: 'rentStartDate',
+          width: 100,
+          overHidden: true,
+          type: "date",
+          disabled: true,
+          format: "yyyy-MM-dd",
+          valueFormat: "yyyy-MM-dd HH:mm:ss"
+        }, {
+          label: '日期止',
+          prop: 'rentEndDate',
+          width: 100,
+          disabled: true,
+          overHidden: true,
+          type: "date",
+          format: "yyyy-MM-dd",
+          valueFormat: "yyyy-MM-dd HH:mm:ss"
+        }, {
+          label: '备注',
+          prop: 'remarks',
+          type: 'textarea',
+          overHidden: true,
+          minRows: 3,
+          span: 24,
+          width: 200
+        }]
     },
       boxTube:{
         align: 'center',

src/views/boxManagement/leaseIn/detailsPage.vue

@@ -95,7 +95,7 @@
       </avue-crud>
     </trade-card>
 <!--    费用信息组件-->
-    <box-cost v-model="dataListTwo" activeName="second" :codeValue="245.2" ref="boxCost"
+    <box-cost v-model="dataListTwo" type="ZR" activeName="second" :codeValue="245.2" ref="boxCost"
               @resetTrigger="resetTrigger"></box-cost>
     <trade-card title="附件明细">
       <c-upload
@@ -185,7 +185,9 @@ export default {
     onLoad: Object,
     detailData: Object
   },
-  components:{checkSchedule},
+  components:{
+    checkSchedule
+  },
   data() {
     return {
       excelOption: {
@@ -393,11 +395,7 @@ export default {
         dialogTop: 25,
         dialogWidth: "80%",
         showSummary: true,
-        sumColumnList: [{
-          name: 'amount',
-          type: 'sum',
-          decimals: 2
-        },{
+        sumColumnList: [,{
           name: 'emptyWeight',
           type: 'sum',
           decimals: 2
@@ -813,8 +811,8 @@ export default {
             }
             this.disabledVisible = true
             statusUpdate({
-              ...this.formState,
               ...this.form,
+              ...this.formState,
               tradingBoxItemsList: this.selectionList,
               rentType: this.title === "起租" ? 1 : 2
             }).then(res => {
@@ -1140,10 +1138,10 @@ export default {
     beforeOpen(done,type){
       if (this.formTwo.count > 0){
         this.findObject(this.option.column, "price").disabled = true
-        this.findObject(this.option.column, "amount").disabled = true
+        // this.findObject(this.option.column, "amount").disabled = true
       }else {
         this.findObject(this.option.column, "price").disabled = false
-        this.findObject(this.option.column, "amount").disabled = false
+        // this.findObject(this.option.column, "amount").disabled = false
       }
       done();
     },

src/views/boxManagement/leaseOut/detailsPage.vue

@@ -85,7 +85,7 @@
       </avue-crud>
     </trade-card>
 <!--    费用信息组件-->
-    <box-cost v-model="dataListTwo" activeName="first" :codeValue="247.2" ref="boxCost"
+    <box-cost v-model="dataListTwo" type="ZC" activeName="first" :codeValue="247.2" ref="boxCost"
               @resetTrigger="resetTrigger"></box-cost>
     <trade-card title="附件明细">
       <c-upload
@@ -384,10 +384,6 @@ export default {
         dialogWidth: "80%",
         showSummary: true,
         sumColumnList: [{
-          name: 'amount',
-          type: 'sum',
-          decimals: 2
-        },{
           name: 'emptyWeight',
           type: 'sum',
           decimals: 2
@@ -811,8 +807,8 @@ export default {
               }
             }
             statusUpdate({
-              ...this.formState,
               ...this.form,
+              ...this.formState,
               tradingBoxItemsList:this.selectionList,
               rentType:this.title === "起租"?1:2
             }).then(res => {
@@ -1138,10 +1134,10 @@ export default {
     beforeOpen(done,type){
       if (this.formTwo.count > 0){
         this.findObject(this.option.column, "price").disabled = true
-        this.findObject(this.option.column, "amount").disabled = true
+        // this.findObject(this.option.column, "amount").disabled = true
       }else {
         this.findObject(this.option.column, "price").disabled = false
-        this.findObject(this.option.column, "amount").disabled = false
+        // this.findObject(this.option.column, "amount").disabled = false
       }
       done();
     },

src/views/maintenance/integral/index.vue

@@ -172,7 +172,7 @@ export default {
     expandChange(row, index) {
       if (row.loading) {
         detail({pid: row.id}).then(res => {
-          row.insideList = res.data.data? res.data.data.records: []
+          row.insideList = res.data.data? res.data.data: []
           row.loading = false
         })
       }

src/views/maintenance/overpayment/index.vue

@@ -123,7 +123,7 @@ export default {
     expandChange(row, index) {
       if (row.loading) {
         overpaymentDetail({pid: row.id}).then(res => {
-          row.insideList = res.data.data? res.data.data.records: []
+          row.insideList = res.data.data? res.data.data: []
           row.loading = false
         })
       }

src/views/maintenance/rebate/index.vue

@@ -247,7 +247,7 @@ export default {
     expandChange(row, index) {
       if (row.loading) {
         getRebateDetail({ corpId: row.id }).then(res => {
-          row.insideList = res.data.data ? res.data.data.records : []
+          row.insideList = res.data.data ? res.data.data : []
           row.loading = false
         })
       }