diff --git a/src/utils/custom.js b/src/utils/custom.js
index eec45837..67830188 100644
--- a/src/utils/custom.js
+++ b/src/utils/custom.js
@@ -567,3 +567,45 @@ export function getIpAddress() {
   };
 return null;
 }
+
+export function dateToStr(date){
+  var year = date.getFullYear();//年
+  var month = date.getMonth();//月
+  var day = date.getDate();//日
+  var hours = date.getHours();//时
+  var min = date.getMinutes();//分
+  var second = date.getSeconds();//秒
+  return year + "-" +
+      ((month + 1) > 9 ? (month + 1) : "0" + (month + 1)) + "-" +
+      (day > 9 ? day : ("0" + day)) + " " +
+      (hours > 9 ? hours : ("0" + hours)) + ":" +
+      (min > 9 ? min : ("0" + min)) + ":" +
+      (second > 9 ? second : ("0" + second));
+}
+
+export function strToDate(datestr){
+  return new Date(datestr);
+}
+
+//字符串转字符串
+export function formatDate(dateStr) {
+  var newdateStr = dateStr.replace(/\d+(?=-[^-]+$)/, (a) => (parseInt(a, 10) - 1));  //字符串处理(月份)
+  var nums = newdateStr.match(/\d+/g);  //取数
+  var date = eval('new Date(' + nums + ')');  //转换
+  //重组
+  var datetime =
+      date.getFullYear() + "-" +  //年
+      ((date.getMonth() + 1) > 9 ? (date.getMonth() + 1) : "0" + (date.getMonth() + 1)) + "-" +  //月
+      (date.getDate() > 9 ? date.getDate() : ("0" + date.getDate()));  //日
+  return datetime;
+}
+
+
+export function addDateTimeByDay(dateStr,day) {
+  var today = strToDate(dateStr)
+  var targetday_milliseconds = today.getTime() + 1000 * 60 * 60 * 24 * day;
+  today.setTime(targetday_milliseconds);
+  return today;
+}
+
+
diff --git a/src/views/emis/emisQuotePrice/emisQuotePriceForm.vue b/src/views/emis/emisQuotePrice/emisQuotePriceForm.vue
index 28c09c81..f636c07e 100644
--- a/src/views/emis/emisQuotePrice/emisQuotePriceForm.vue
+++ b/src/views/emis/emisQuotePrice/emisQuotePriceForm.vue
@@ -60,7 +60,9 @@
                       type="datetime"
                       value-format="yyyy-MM-dd HH:mm:ss"
                       default-time = "00:00:00"
-                      placeholder="请选择开始日期">
+                      placeholder="请选择开始日期"
+                      @change="onStartDateChange"
+                      >
                     </el-date-picker>
                   </el-form-item>
               </el-col>
@@ -96,9 +98,17 @@
               </el-col>
               <el-col :span="24">
                 <el-form-item label="费用类型" prop="feeType">
-                  <el-select v-model="form.feeType" placeholder="费用类型" >
+                  <el-select v-model="form.feeType" placeholder="费用类型" v-if="chargeType != 1" >
                     <el-option
-                      v-for="dict in dict.type.emis_fee_type"
+                      v-for="dict of dict.type.emis_fee_type.filter(el=> el.value != 1001)"
+                      :key="dict.value"
+                      :label="dict.value+'-'+dict.label"
+                      :value="dict.value"
+                    />
+                  </el-select>
+                  <el-select v-model="form.feeType" placeholder="费用类型" disabled v-if="chargeType == 1" >
+                    <el-option
+                    v-for="dict of dict.type.emis_fee_type.filter(el=> el.value == 1001)"
                       :key="dict.value"
                       :label="dict.value+'-'+dict.label"
                       :value="dict.value"
@@ -218,6 +228,7 @@ import { listEmisQuoteSendArea, getEmisQuoteSendArea, delEmisQuoteSendArea, addE
 import { listEmisQuotePrice, getEmisQuotePrice, delEmisQuotePrice, addEmisQuotePrice, updateEmisQuotePrice } from "@/api/emis/emisQuotePrice";
 import { listEmisQuoteDispArea, getEmisQuoteDispArea, delEmisQuoteDispArea, addEmisQuoteDispArea, updateEmisQuoteDispArea } from "@/api/emis/emisQuoteDispArea";
 import {checkRole} from '@/utils/permission'
+import {addDateTimeByDay} from '@/utils/custom'
 
 import CountryPicker from '@/views/emis/EmisBaseTools/CountryPicker.vue';
 import EmisSiteSimplePicker from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
@@ -236,7 +247,11 @@ export default {
     },
     isCopy:{
       type:Boolean
-    }
+    },
+    chargeType:{
+      type:[Number,String]
+    },
+
   },
   components: {
     CountryPicker,EmisSiteSimplePicker,TransLinePicker,
@@ -351,6 +366,8 @@ export default {
 
     // console.log(this.ownerSiteCode);
     this.initData();
+
+
   },
   methods: {
     initData() {
@@ -362,7 +379,9 @@ export default {
 
             if(this.isCopy){
               this.form.quoteName=this.form.quoteName+"_Copy"
-              this.form.transLineCode=response.data.transLineCode;
+              console.log(this.form);
+              // this.form.transLineCode=response.data.transLineCode;
+              // console.log(this.form);
             }
 
             this.loading = false;
@@ -372,12 +391,20 @@ export default {
         }else{
             this.reset();
             this.form.billType='1';
-            this.form.feeType='1001';
+            if(this.chargeType == 1){
+              this.form.feeType='1001';
+            }else{
+              this.form.feeType='9999';
+            }
             this.initSendAreaList();
             this.initDispAreaList();
 
         }
     },
+    onStartDateChange(){
+      this.form.endDate=addDateTimeByDay(this.form.startDate,365);
+      console.log(this.form.endDate);
+    },
     onUseSiteChange(item){
       if(item!=null){
         // this.form.useSiteCode = item.sitCode;
diff --git a/src/views/emis/emisQuotePrice/index.vue b/src/views/emis/emisQuotePrice/index.vue
index 36db3d1f..4c8de9a9 100644
--- a/src/views/emis/emisQuotePrice/index.vue
+++ b/src/views/emis/emisQuotePrice/index.vue
@@ -235,7 +235,7 @@
     </XdTable>
 
     <el-dialog :title="titleForm" :visible.sync="openForm" width="90%" :destroy-on-close="true" v-dialogDrag append-to-body>
-      <emisQuotePriceForm :quoteId="currentId" :isCopy="isCopy"   @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisQuotePriceForm>
+      <emisQuotePriceForm :quoteId="currentId" :isCopy="isCopy" :chargeType="chargeType"   @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisQuotePriceForm>
     </el-dialog>
 
   </div>
@@ -351,11 +351,10 @@ export default {
   },
   created() {
     this.chargeType=this.$route.query.chargeType;
-    this.queryParams.chargeType=this.chargeType;
-
-    // if(this.chargeType ==1 ){
-    //   this.queryParams.feeType='1001';
-    // }
+    this.queryParams.params.chargeType=this.chargeType;
+    if(this.chargeType ==1 ){
+      this.queryParams.feeType='1001';
+    }
     this.getList();
   },
   methods: {