a

src/components/Finance/Cost.vue

@@ -15,7 +15,8 @@
                             分段类型:
                         </div>
                         <el-select v-model="costTypevalue" placeholder="请选择" @change="costTypeSelect">
-                            <el-option v-for="item in costType" :key="item.value" :label="item.label" :value="item.value">
+                            <el-option v-for="item in costType" :key="item.value" :label="item.label"
+                                :value="item.value">
                             </el-option>
                         </el-select>
                     </div>
@@ -82,15 +83,16 @@
                                 <el-col :span="5">
                                     <div> <el-form-item label="第一段开始时间:" prop="costTypeStartTime">
                                             <el-date-picker v-model="AGroupCostParameter.costTypeStartTime" type="date"
-                                                placeholder="第一段开始时间" format="yyyy 年 MM 月 dd 日" value-format="yyyy-MM-dd">
+                                                placeholder="第一段开始时间" format="yyyy 年 MM 月 dd 日"
+                                                value-format="yyyy-MM-dd">
                                             </el-date-picker>
                                         </el-form-item>
                                     </div>
                                 </el-col>
                                 <el-col :span="4">
                                     <div> <el-form-item label="结束时间:" prop="costTypeendTime"><el-date-picker
-                                                v-model="AGroupCostParameter.costTypeendTime" type="date" placeholder="结束时间"
-                                                format="yyyy 年 MM 月 dd 日" value-format="yyyy-MM-dd">
+                                                v-model="AGroupCostParameter.costTypeendTime" type="date"
+                                                placeholder="结束时间" format="yyyy 年 MM 月 dd 日" value-format="yyyy-MM-dd">
                                             </el-date-picker>
                                         </el-form-item>
                                     </div>
@@ -146,15 +148,16 @@
                                 <el-col :span="5">
                                     <div> <el-form-item label="第二段开始时间:" prop="costTypeStartTime">
                                             <el-date-picker v-model="BGroupCostParameter.costTypeStartTime" type="date"
-                                                placeholder="第二段开始时间" format="yyyy 年 MM 月 dd 日" value-format="yyyy-MM-dd">
+                                                placeholder="第二段开始时间" format="yyyy 年 MM 月 dd 日"
+                                                value-format="yyyy-MM-dd">
                                             </el-date-picker>
                                         </el-form-item>
                                     </div>
                                 </el-col>
                                 <el-col :span="4">
                                     <div> <el-form-item label="结束时间:" prop="costTypeendTime"><el-date-picker
-                                                v-model="BGroupCostParameter.costTypeendTime" type="date" placeholder="结束时间"
-                                                format="yyyy 年 MM 月 dd 日" value-format="yyyy-MM-dd">
+                                                v-model="BGroupCostParameter.costTypeendTime" type="date"
+                                                placeholder="结束时间" format="yyyy 年 MM 月 dd 日" value-format="yyyy-MM-dd">
                                             </el-date-picker>
                                         </el-form-item>
                                     </div>
@@ -235,8 +238,8 @@
                 </div>
             </div>
             <div style="color: #606266;font-size: 15px;font-weight: 600;">请选择要显示的项：</div>
-            <el-checkbox-group class="form-ss" v-model="CheckBoxListSelect.filter(item => item.cbType == 'Top')[0].cbValues"
-                @change="TopChange">
+            <el-checkbox-group class="form-ss"
+                v-model="CheckBoxListSelect.filter(item => item.cbType == 'Top')[0].cbValues" @change="TopChange">
                 <el-checkbox v-for="(  item, index  ) in    checkOptions  " :key="index" :title="item.tips"
                     :label="item.label" @change="(val) => { topcheckboxChange(val, item.label) }"></el-checkbox>
             </el-checkbox-group>
@@ -244,8 +247,8 @@
                 size="small" row-class-name="row" cell-class-name="column" :highlight-current-row="true" :fit="true"
                 :height="centerheight">
                 <template v-for="(  item, index  ) in      tableLabel     ">
-                    <el-table-column :key="index" :prop="item.prop" :width="item.width == 150 ? columnWidth : item.width"
-                        :label="item.label"
+                    <el-table-column :key="index" :prop="item.prop"
+                        :width="item.width == 150 ? columnWidth : item.width" :label="item.label"
                         v-if="CheckBoxListSelect.filter(item => item.cbType == 'Top')[0].cbValues.includes(item.label)">
                         <!-- eslint-disable-next-line -->
                         <template slot="header" slot-scope="scope">
@@ -261,24 +264,31 @@
                                 <el-input :ref="'el-input-' + index" v-model="scope.row[item.prop]" show-word-limit />
                             </div>
                             <div v-else-if="item.prop === 'day'">
-                                <el-input :ref="'el-input-' + index" v-model="scope.row[item.prop]" type="number" min="0"
-                                    @change="NumberSetTime(scope.row[item.prop], scope.$index)" />
+                                <el-input :ref="'el-input-' + index" v-model="scope.row[item.prop]" type="number"
+                                    min="0" @change="NumberSetTime(scope.row[item.prop], scope.$index)" />
                             </div>
                             <div v-else-if="item.prop === 'date'">
-                                <span :title="scope.row[item.prop]"><el-input placeholder="请输入日期"
+                                <span :title="scope.row[item.prop]">
+                                    <!-- <el-input placeholder="请输入日期"
                                         v-model="scope.row[item.prop]"
                                         @change="dateChange(scope.row[item.prop], scope.$index)">
-                                    </el-input></span>
+                                    </el-input> -->
+                                    <el-date-picker v-model="scope.row[item.prop]" type="date" value-format="yyyy-MM-dd"
+                                        placeholder="选择日期">
+                                    </el-date-picker>
+                                </span>
                             </div>
                             <div v-else-if="item.prop === 'sale'">
                                 <el-row class="figures-btn">
                                     <el-button @click="handleEdit(scope.$index, scope.row, 1)" size="mini"
                                         type="primary">司兼导</el-button>
-                                    <el-button @click="handleEdit(scope.$index, scope.row, 2)" size="mini" type="primary">导
+                                    <el-button @click="handleEdit(scope.$index, scope.row, 2)" size="mini"
+                                        type="primary">导
                                         游</el-button>
                                     <el-button @click="handleEdit(scope.$index, scope.row, 3)" size="mini"
                                         type="primary">车数据</el-button>
-                                    <el-button @click="handleEdit(scope.$index, scope.row, 4)" size="mini" type="primary">景
+                                    <el-button @click="handleEdit(scope.$index, scope.row, 4)" size="mini"
+                                        type="primary">景
                                         点</el-button>
                                 </el-row>
                             </div>
@@ -334,7 +344,8 @@
                                                     <div v-else>
                                                         <!-- <el-input v-model="AGroupCostParameter[itemsheetone.prop]"
                                                             show-word-limit /> -->
-                                                        <el-input-number v-model="AGroupCostParameter[itemsheetone.prop]"
+                                                        <el-input-number
+                                                            v-model="AGroupCostParameter[itemsheetone.prop]"
                                                             @change="handleChange" :min="0" size="small"
                                                             :controls="false"></el-input-number>
                                                     </div>
@@ -420,7 +431,7 @@
                                 <div class="biaoge"
                                     v-if="CheckBoxListSelect.filter(item => item.cbType == 'Right')[0].cbValues.includes(cabinitem.label)">
                                     <div style="    color: rgb(96, 98, 102);font-size: 15px;font-weight: 600;">{{
-                                        cabinitem.label }}
+        cabinitem.label }}
                                     </div>
                                     <el-table :data="cabinitem.sheetInfo" border style="width: 100%">
                                         <el-table-column
@@ -429,33 +440,34 @@
                                             <template slot-scope="scope">
                                                 <div v-if="itemcabinone.prop === 'toll'">
                                                     <el-input :ref="'el-input-' + index"
-                                                        v-model="scope.row[itemcabinone.prop]" show-word-limit disabled />
+                                                        v-model="scope.row[itemcabinone.prop]" show-word-limit
+                                                        disabled />
                                                 </div>
                                                 <span
                                                     v-else-if="itemcabinone.prop === 'costPerson' || itemcabinone.prop === 'singleQuote'"
                                                     :title="scope.row[itemcabinone.prop]">{{
-                                                        scope.row[itemcabinone.prop]
-                                                    }}</span>
+        scope.row[itemcabinone.prop]
+    }}</span>
                                                 <span v-else-if="itemcabinone.prop === 'totalCost'"
                                                     :title="scope.row[itemcabinone.prop]">{{
-                                                        (scope.row['toll'] * scope.row['costPerson']).toFixed(2)
-                                                    }}</span>
+        (scope.row['toll'] * scope.row['costPerson']).toFixed(2)
+    }}</span>
                                                 <span v-else-if="itemcabinone.prop === 'totalQuote'"
                                                     :title="scope.row[itemcabinone.prop]">{{
-                                                        (scope.row['toll'] * scope.row['singleQuote']).toFixed(2)
-                                                    }}</span>
+        (scope.row['toll'] * scope.row['singleQuote']).toFixed(2)
+    }}</span>
                                                 <span v-else-if="itemcabinone.prop === 'singleProfit'"
                                                     :title="scope.row[itemcabinone.prop]">{{
-                                                        ((scope.row['singleQuote'] - scope.row['costPerson'])).toFixed(2)
-                                                    }}</span>
+        ((scope.row['singleQuote'] - scope.row['costPerson'])).toFixed(2)
+    }}</span>
                                                 <span v-else-if="itemcabinone.prop === 'totalProfit'"
                                                     :title="scope.row[itemcabinone.prop]">{{
-                                                        ((scope.row['singleQuote'] - scope.row['costPerson']) *
-                                                            scope.row['toll']).toFixed(2)
-                                                    }}</span>
+        ((scope.row['singleQuote'] - scope.row['costPerson']) *
+            scope.row['toll']).toFixed(2)
+    }}</span>
                                                 <span v-else :title="scope.row[itemcabinone.prop]">{{
-                                                    scope.row[itemcabinone.prop]
-                                                }}</span>
+        scope.row[itemcabinone.prop]
+    }}</span>
 
                                             </template>
                                         </el-table-column>
@@ -469,7 +481,7 @@
                                 <div class="biaogeB"
                                     v-if="CheckBoxListSelect.filter(item => item.cbType == 'Right')[0].cbValues.includes(cabinitem.label)">
                                     <div style="    color: rgb(96, 98, 102);font-size: 15px;font-weight: 600;">{{
-                                        cabinitem.label }}
+        cabinitem.label }}
                                     </div>
                                     <el-table :data="cabinitem.sheetInfo" border style="width: 100%">
                                         <el-table-column
@@ -478,33 +490,34 @@
                                             <template slot-scope="scope">
                                                 <div v-if="itemcabinone.prop === 'toll'">
                                                     <el-input :ref="'el-input-' + index"
-                                                        v-model="scope.row[itemcabinone.prop]" show-word-limit disabled />
+                                                        v-model="scope.row[itemcabinone.prop]" show-word-limit
+                                                        disabled />
                                                 </div>
                                                 <span
                                                     v-else-if="itemcabinone.prop === 'costPerson' || itemcabinone.prop === 'singleQuote'"
                                                     :title="scope.row[itemcabinone.prop]">{{
-                                                        scope.row[itemcabinone.prop]
-                                                    }}</span>
+        scope.row[itemcabinone.prop]
+    }}</span>
                                                 <span v-else-if="itemcabinone.prop === 'totalCost'"
                                                     :title="scope.row[itemcabinone.prop]">{{
-                                                        (scope.row['toll'] * scope.row['costPerson']).toFixed(2)
-                                                    }}</span>
+        (scope.row['toll'] * scope.row['costPerson']).toFixed(2)
+    }}</span>
                                                 <span v-else-if="itemcabinone.prop === 'totalQuote'"
                                                     :title="scope.row[itemcabinone.prop]">{{
-                                                        (scope.row['toll'] * scope.row['singleQuote']).toFixed(2)
-                                                    }}</span>
+        (scope.row['toll'] * scope.row['singleQuote']).toFixed(2)
+    }}</span>
                                                 <span v-else-if="itemcabinone.prop === 'singleProfit'"
                                                     :title="scope.row[itemcabinone.prop]">{{
-                                                        (scope.row['singleQuote'] - scope.row['costPerson']).toFixed(2)
-                                                    }}</span>
+        (scope.row['singleQuote'] - scope.row['costPerson']).toFixed(2)
+    }}</span>
                                                 <span v-else-if="itemcabinone.prop === 'totalProfit'"
                                                     :title="scope.row[itemcabinone.prop]">{{
-                                                        ((scope.row['singleQuote'] - scope.row['costPerson']) *
-                                                            scope.row['toll']).toFixed(2)
+                                                    ((scope.row['singleQuote'] - scope.row['costPerson']) *
+                                                    scope.row['toll']).toFixed(2)
                                                     }}</span>
                                                 <span v-else :title="scope.row[itemcabinone.prop]">{{
                                                     scope.row[itemcabinone.prop]
-                                                }}</span>
+                                                    }}</span>
 
                                             </template>
                                         </el-table-column>
@@ -611,7 +624,7 @@ export default {
             ],
             tableLabel: [
                 { label: 'DAY', width: '90', prop: 'day', describe: '天数(DAY)' },
-                { label: 'DATE', width: '150', prop: 'date', describe: '时间(DATE)' },
+                { label: 'DATE', width: '180', prop: 'date', describe: '时间(DATE)' },
                 { label: 'ITIN', width: '200', prop: 'itin', describe: '行程描述(ITINERARY)' },
                 { label: 'VA', width: '85', prop: 'sale', describe: '车服务区域(Vehicle Area)' }, // ??????????????
                 { label: 'VT', width: '200', prop: 'carType', describe: '车型(VEHICLE TYPE)' },
@@ -2313,11 +2326,18 @@ export default {
             });
         },
         addStrip() {
+            var souerLength = this.tableData.length - 1;
+            var dataStr = "";
+            if (souerLength >= 0) {
+                dataStr = this.tableData[souerLength].date;
+                dataStr = this.addOneDay(dataStr, 1);
+            }
+
             this.tableData.push(
                 {
                     "diid": this.diid,
                     "day": "-",
-                    "date": "",
+                    "date": dataStr,
                     "itin": "",
                     "carType": "",
                     "carCost": 0,
@@ -3480,7 +3500,7 @@ export default {
             console.log(number, index, this.grouptitleinfo.visitStartDate);
             number = parseInt(number);
             if (!isNaN(number)) {
-                var time = this.addOneDay(this.grouptitleinfo.visitStartDate, number)
+                var time = this.addOneDay(this.grouptitleinfo.visitStartDate, number - 1)
                 this.tableData[index].date = time;
             } else {
                 this.tableData[index].date = '';
@@ -3488,6 +3508,9 @@ export default {
             }
         },
         addOneDay(dateString, number) {
+            if (!dateString) {
+                return "";
+            }
             let date = new Date(dateString);
             date.setDate(date.getDate() + number);
             let year = date.getFullYear();

src/components/OP/CarTouristGuideGrounContent.vue

@@ -36,7 +36,7 @@
                 <span style="color:#606266;">{{ delegationInfo.visitDate }}&nbsp;&nbsp;&nbsp;</span>
                 <span style="font-weight: bold;">天数/人数：</span>
                 <span style="color:#606266;">{{ delegationInfo.visitDays }}天/{{
-                    delegationInfo.visitPNumber }}人</span>
+            delegationInfo.visitPNumber }}人</span>
             </div>
             <hr style='background-color:#5555; height:1px; border:none;' />
             <div>
@@ -50,41 +50,45 @@
                         </el-table-column>
                         <el-table-column prop="SIdName" label="费用项目" width="120">
                             <template slot-scope="scope">
-                                <span style="display: none;">{{ scope.row.sId }}</span>{{ scope.row.sIdName }}
+                                <span style="display: none;">{{ scope.row.sId }}</span>{{ scope.row.sidName }}
                             </template>
                         </el-table-column>
-                        <el-table-column prop="SIdName" label="日期" width="160">
+                        <el-table-column prop="datePrice" label="日期" width="160">
                             <template slot-scope="scope">
-                                <el-date-picker
-                                style="width: 100%;"
-                                v-model="scope.row.price"
-                                type="date"
-                                :picker-options="startPickerOptions"
-                                placeholder="选择日期">
+                                <el-date-picker style="width: 100%;" v-model="scope.row.datePrice" type="date"
+                                    :picker-options="startPickerOptions" value-format="yyyy-MM-dd HH:mm:ss"
+                                    placeholder="选择日期">
                                 </el-date-picker>
                             </template>
                         </el-table-column>
                         <el-table-column label="金额/币种" width="400">
                             <template slot-scope="scope">
                                 <div class="el-input-number-style pice-ys">
-                                    <el-input-number size="small" placeholder="请输入金额" v-model="scope.row.price" :controls="false"
-                                        @change="PriceChange"></el-input-number>
+                                    <el-input-number size="small" placeholder="请输入金额" v-model="scope.row.price"
+                                        :controls="false" @change="PriceChange"></el-input-number>
 
                                     <!-- <el-input placeholder="请输入金额" v-model="scope.row.price" clearable style="width:180px;"
                                     @change="PriceChange" /> -->
                                     <el-select size="small" v-model="currency" placeholder="币种选择" clearable filterable
                                         style="width:120px" :disabled="true">
-                                        <el-option v-for="item in currencyList" :key="item.currencyId" :label="item.currencyCode"
-                                            :value="item.currencyId">
+                                        <el-option v-for="item in currencyList" :key="item.currencyId"
+                                            :label="item.currencyCode" :value="item.currencyId">
                                         </el-option>
                                     </el-select>
                                 </div>
                             </template>
                         </el-table-column>
+                        <el-table-column label="数量" width="100">
+                            <template slot-scope="scope">
+                                <el-input size="small" style="width: 100%;" placeholder="选择单位" v-model="scope.row.count"
+                                    @change="PriceChange">
+                                </el-input>
+                            </template>
+                        </el-table-column>
                         <el-table-column label="单位" width="100">
                             <template slot-scope="scope">
-                                    <el-input size="small" style="width: 100%;" placeholder="请输入金额" v-model="scope.row.price"
-                                        @change="PriceChange"></el-input>
+                                <el-input size="small" style="width: 100%;" placeholder="选择单位" v-model="scope.row.units"
+                                    @change="PriceChange"></el-input>
                             </template>
                         </el-table-column>
                         <el-table-column label="费用明细">
@@ -145,8 +149,8 @@
                                         style="width: 120px;"></el-input>
                                     <el-select v-model="currency" placeholder="币种选择" clearable filterable
                                         style="width:100px" :disabled="true">
-                                        <el-option v-for="item in currencyList" :key="item.currencyId" :label="item.currencyCode"
-                                            :value="item.currencyId">
+                                        <el-option v-for="item in currencyList" :key="item.currencyId"
+                                            :label="item.currencyCode" :value="item.currencyId">
                                         </el-option>
                                     </el-select>
                                 </el-form-item>
@@ -169,24 +173,14 @@
     </div>
 </template>
 <script>
-import { dE } from '@fullcalendar/core/internal-common'
 export default {
     data() {
         return {
-            //限制时间
-            startDate:'',//时间
-            minTime:1618891200000,//时间戳，对应时间为：'2021-04-20 12:00:00'
-            maxTime:1619323200000,//时间戳，对应时间为：'2021-04-25 12:00:00'
-            startPickerOptions:{
-                disabledDate: (time) => {
-                    //小于最小时间或者大于最大时间都不可选
-                    return time.getTime() < this.minTime-24*3600000|| time.getTime() > this.maxTime;
-                }
+            startPickerOptions: {
             },
-
-            pageId:'',
+            pageId: '',
             token: '',
-            cTable:'',
+            cTable: '',
             userId: 0,
             id: '',
             diId: '',
@@ -196,7 +190,6 @@ export default {
             delegationInfo: {},
             delegationInfoList: [],//团组下拉框
             currencyList: [],
-            tableInitialization: [],
             payment: [],
             IsAuditGM: 0,
             ContentList: [],
@@ -241,6 +234,7 @@ export default {
                 },
                 data: {
                     userId: that.userId,
+                    id: that.id,
                 }
             }).then(function (res) {
                 if (res.data.code == 200) {
@@ -249,23 +243,33 @@ export default {
                     for (let index = 0; index < that.delegationInfoList.length; index++) {
                         if (that.delegationInfoList[index].id == that.diId) {
                             that.delegationInfo = that.delegationInfoList[index];
-
                             break;
                         }
                     }
-                    that.tableInitialization = res.data.data.tableInitialization;
-                    that.tableInitialization.forEach(function (item) {
-                        that.ContentList.push({
-                            id: 0,
-                            sId: item.id,
-                            sIdName: item.name,
-                            price: '0.00',
-                            priceContent: '',
-                            //remark: '',
-                        })
-                    });
+
+                    that.ContentList = res.data.data.carTouristGuides;
                     that.payment = res.data.data.payment;
-                    that.OpCarTouristGuideGroundContenById()
+
+                    var CreditCardPayment = res.data.data.creditCardPayment;
+                    if (CreditCardPayment != null) {
+                        that.OPContenData.payDId = CreditCardPayment.payDId
+                        that.OPContenData.payee = CreditCardPayment.payee
+                        that.currency = CreditCardPayment.paymentCurrency
+                        that.OPContenData.payPercentage = CreditCardPayment.payPercentage
+                        that.countCost = CreditCardPayment.payMoney
+                        that.OPContenData.orbitalPrivateTransfer = CreditCardPayment.orbitalPrivateTransfer
+                        that.IsAuditGM = CreditCardPayment.isAuditGM;
+                    }
+
+                    var start = new Date(res.data.data.start).getTime();
+                    var end = new Date(res.data.data.end).getTime();
+
+                    that.startPickerOptions.disabledDate = (time) => {
+                        return time.getTime() < start || time.getTime() > end;
+                    }
+
+                    that.loading = false;
+                    //that.OpCarTouristGuideGroundContenById()
                 }
 
             })
@@ -286,7 +290,7 @@ export default {
                 }
             }).then(function (res) {
                 if (res.data.code == 200) {
-                    that.cTable=res.data.data.cTable
+                    that.cTable = res.data.data.cTable
                     that.PostGroupTeamRateByDiIdAndCTableId();
                 }
             })
@@ -309,56 +313,49 @@ export default {
             }).then(function (res) {
                 console.log(res)
                 if (res.data.code == 200) {
-                    that.currencyList=res.data.data.teamRates;
-                    that.currency=that.currencyList[0].currencyId;
+                    that.currencyList = res.data.data.teamRates;
+                    that.currency = that.currencyList[0].currencyId;
                 }
             })
         },
-        OpCarTouristGuideGroundContenById() {
-            var url = "/api/Groups/OpCarTouristGuideGroundContentById"
-            var that = this
-            this.$axios({
-                method: 'post',
-                url: url,
-                headers: {
-                    Authorization: 'Bearer ' + this.token
-                },
-                data: {
-                    id: that.id
-                }
-            }).then(function (res) {
-                if (res.data.code == 200) {
-                    var CreditCardPayment = res.data.data.creditCardPayment;
-                    if (CreditCardPayment != null) {
-                        that.OPContenData.payDId = CreditCardPayment.payDId
-                        that.OPContenData.payee = CreditCardPayment.payee
-                        that.currency = CreditCardPayment.paymentCurrency
-                        that.OPContenData.payPercentage = CreditCardPayment.payPercentage
-                        that.countCost = CreditCardPayment.payMoney
-                        that.OPContenData.orbitalPrivateTransfer = CreditCardPayment.orbitalPrivateTransfer
-                    }
-                    var CarTouristsContent = res.data.data.carTouristsContent;
-                    if (CarTouristsContent.length != 0) {
-                        CarTouristsContent.forEach(function (item) {
-                            that.ContentList.forEach(function (item1) {
-                                if (item.sId == item1.sId) {
-                                    item1.id = item.id
-                                    item1.price = item.price
-                                    item1.priceContent = item.priceContent
-                                    //item1.remark = item.remark
-                                }
+        // OpCarTouristGuideGroundContenById() {
+        //     var url = "/api/Groups/OpCarTouristGuideGroundContentById"
+        //     var that = this
+        //     this.$axios({
+        //         method: 'post',
+        //         url: url,
+        //         headers: {
+        //             Authorization: 'Bearer ' + this.token
+        //         },
+        //         data: {
+        //             id: that.id
+        //         }
+        //     }).then(function (res) {
+        //         if (res.data.code == 200) {
 
-                            })
-                        })
-                    }
-                    that.loading = false
-                }
-            })
-        },
+        //             var CarTouristsContent = res.data.data.carTouristsContent;
+        //             if (CarTouristsContent.length != 0) {
+        //                 CarTouristsContent.forEach(function (item) {
+        //                     that.ContentList.forEach(function (item1) {
+        //                         if (item.sId == item1.sId) {
+        //                             item1.id = item.id
+        //                             item1.price = item.price
+        //                             item1.priceContent = item.priceContent
+        //                             //item1.remark = item.remark
+        //                         }
+
+        //                     })
+        //                 })
+        //             }
+
+        //             that.loading = false
+        //         }
+        //     })
+        // },
         addBtn() {
             if (this.IsAuditGM == 1) {
                 this.$message.error('已通过审核，不可修改！');
-            } else {                
+            } else {
                 if (this.diId == null && this.diId == undefined && this.diId == "") {
                     this.$message.error("请选择团组名称");
                     return;
@@ -376,6 +373,9 @@ export default {
                                     sId: item.sId,
                                     price: item.price,
                                     priceContent: item.priceContent,
+                                    datePrice: item.datePrice,
+                                    count: item.count,
+                                    units: item.units,
                                     //remark: item.remark,
                                 })
                             })
@@ -394,7 +394,7 @@ export default {
                                         message: res.data.msg,
                                         type: 'success'
                                     });
-                                    that.$router.back();
+                                    that.EscAdd();
                                 } else {
                                     that.$message.error(res.data.msg);
                                 }
@@ -428,7 +428,7 @@ export default {
     },
 
     mounted() {
-        this.pageId=localStorage.getItem('indexs').split('-')[1];
+        this.pageId = localStorage.getItem('indexs').split('-')[1];
         console.log(this.pageId)
         this.token = JSON.parse(localStorage.getItem('userinif')).token;
         this.userId = JSON.parse(localStorage.getItem('userinif')).userInfo.userId
@@ -489,9 +489,11 @@ export default {
 .el-input-number-style .el-input input {
     text-align: left;
 }
-.pice-ys .el-input-number{
+
+.pice-ys .el-input-number {
     width: 250px;
 }
+
 @media screen and (max-width: 1700px) {
     .appraise-box>div {
         width: 48%;