Merge branch 'master' of http://118.178.128.178/Fedex/imac-vue

@@ -17,3 +17,21 @@ export function findAllFltDataApi(data) {
 
   })
 }
+//根据id查询item
+export function findFltById(data) {
+  return request({
+    url: '/FlightPreserveController/findFltById',
+    method: 'post',
+    data: data
+
+  })
+}
+//新增修改
+export function saveOrUpdate(data) {
+  return request({
+    url: '/FlightPreserveController/saveOrUpdate',
+    method: 'post',
+    data: data
+
+  })
+}
\ No newline at end of file

@@ -80,31 +80,37 @@
       <el-table-column label="航班类型" align="center" prop="typeName" width="100" />
       <el-table-column label="航班种类" align="center" prop="flightKindName" width="130" />
       <el-table-column label="航班状态" align="center" prop="statusName" />
-      <el-table-column label="总重量(KG)" align="center" prop="totalWeight" width="130" />
-      <el-table-column label="原始重量(KG)" align="center" prop="originalWeight" width="130" />
+      <el-table-column label="总重量" align="center" prop="totalWeight" width="130" />
+      <el-table-column label="原始重量（T）" align="center" prop="originalWeight" width="130" />
       <el-table-column label="总体积(cm³)" align="center" prop="totalVolume" width="130" />
-      <el-table-column label="是否限制一票一件" align="center" prop="ticketToPiece" width="150"  :formatter="ticketToPieceFormat" />
+      <el-table-column label="是否限制一票一件" align="center" prop="ticketToPiece" width="150"
+        :formatter="ticketToPieceFormat" />
       <el-table-column label="是否需要预审" align="center" prop="needRequired" width="150" :formatter="needRequiredFormat" />
       <el-table-column label="额外增重百分比" align="center" prop="extraWeightPercent" width="150" />
       <el-table-column label="高价百分比" align="center" prop="highPriceWeightPercent" width="150" />
       <el-table-column label="低价百分比" align="center" prop="lowPriceWeightPercent" width="150" />
-      <el-table-column label="是否开启高地价" align="center" prop="highLowPriceFlg" width="150":formatter="highLowPriceFlgFormat"/>
-      <el-table-column label="已配重量(KG)" align="center" prop="alloctedWeight" width="150" />
+      <el-table-column label="是否开启高地价" align="center" prop="highLowPriceFlg" width="150"
+        :formatter="highLowPriceFlgFormat" />
+      <el-table-column label="已配重量" align="center" prop="alloctedWeight" width="150" />
       <el-table-column label="已配体积(cm³)" align="center" prop="alloctedVolume" width="150" />
       <el-table-column label="航班优先级" align="center" prop="priorityName" width="150" />
       <el-table-column label="配舱优先级" align="center" prop="priorityRuleName" width="150" />
       <el-table-column label="创建人" align="center" prop="createUserName" width="120" />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="155">
+      <el-table-column label="创建时间" align="center" prop="createTime" width="155" />
+
+      <!-- <el-table-column label="创建时间" align="center" prop="createTime" width="155">
         <template slot-scope="scope">
           <span>{{ renderTime(scope.row.createTime) }}</span>
         </template>
-      </el-table-column>
-      <el-table-column label="最后修改人" align="center" prop="lastModifyUserName" width="120" />
-      <el-table-column label="最后修改时间" align="center" prop="lastModifyTime" width="155">
+      </el-table-column> -->
+      <el-table-column label="最后修改人" align="center" prop="lastModifyUserName" width="155" />
+      <!-- <el-table-column label="最后修改时间" align="center" prop="lastModifyTime" width="155">
         <template slot-scope="scope">
           <span>{{ renderTime(scope.row.lastModifyTime) }}</span>
         </template>
-      </el-table-column>
+      </el-table-column> -->
+      <el-table-column label="最后修改时间" align="center" prop="lastModifyTime" width="120" />
+
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="130" fixed="right">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">修改</el-button>
@@ -125,135 +131,106 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="125px">
         <el-row>
           <el-col :span="12">
-            <el-form-item label="航班号" prop="sourceFlightNo">
-              <el-input style="width:93%;" v-model="form.sourceFlightNo" placeholder="请输入航班号" />
+            <el-form-item label="航班号" prop="fltNo">
+              <el-input style="width:93%;" v-model="form.fltNo" placeholder="请输入航班号" />
             </el-form-item>
           </el-col>
           <!-- <el-col :span="1"> &#12288;</el-col> -->
           <el-col :span="12">
-            <el-form-item label="航班日期" prop="sourceFlightNo">
+            <el-form-item label="航班日期" prop="fltDate">
 
-              <el-date-picker clearable size="small" :picker-options="pickerOptionsStart" v-model="form.startDate"
-                type="date" value-format="yyyy-MM-dd" placeholder="选择开始时间">
+              <el-date-picker clearable size="small" v-model="form.fltDate"
+                type="date" value-format="yyyy-MM-dd" placeholder="选择航班日期">
               </el-date-picker>
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="航班路线" prop="sourceFlightNo">
-              <el-input style="width:93%" v-model="form.sourceFlightNo" placeholder="请输入航班路线" />
-            </el-form-item>
-          </el-col>
 
           <el-col :span="12">
-            <el-form-item label="航班起飞时间" prop="sourceFlightNo">
-              <el-time-picker v-model="form.startDate" placeholder="航班起飞时间">
-              </el-time-picker>
+            <el-form-item label="航班路线" prop="route">
+              <el-input style="width:93%" v-model="form.route" placeholder="请输入航班路线" />
             </el-form-item>
           </el-col>
-        </el-row>
-
         <el-row>
           <el-col :span="12">
-            <el-form-item label="航班种类" prop="startDate">
-              <el-select v-model="form.value" placeholder="请选择航班种类">
-                <el-option v-for="item in flightKindlist" :key="item.id" :label="item.label" :value="item.id">
+            <el-form-item label="航班种类" prop="kindId">
+              <el-select v-model="form.kindId" placeholder="请选择航班种类">
+                <el-option v-for="item in flightKindlist" :key="item.id" :label="item.chineseName" :value="item.id">
                 </el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="航班类型" prop="startDate">
-             <!-- <el-select v-model="form.value1" placeholder="请选择航班类型">
-                <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
+              <el-select v-model="form.typeId" placeholder="请选择航班类型">
+                <el-option v-for="item in flightTypelist" :key="item.id" :label="item.chineseName" :value="item.id">
                 </el-option>
-              </el-select> -->
+              </el-select>
             </el-form-item>
           </el-col>
-
-
           <el-col :span="12">
-            <el-form-item label="航班状态" prop="startDate">
-             <!-- <el-select v-model="form.value2" placeholder="请选择航班状态">
-                <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
+            <el-form-item label="航班状态" prop="statusId">
+              <el-select :disabled="true" v-model="form.statusId" placeholder="请选择航班状态">
+                <el-option v-for="item in flightStatuslist" :key="item.id" :label="item.chineseName" :value="item.id">
                 </el-option>
-              </el-select> -->
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="原始重量(KG)" prop="startDate">
-              <el-input placeholder="请输入原始重量(KG)" style="width:93%" min="0"
+            <el-form-item label="原始重量（T）" prop="originalWeight">
+              <el-input placeholder="请输入原始重量（T）" style="width:93%" min="0"
                 oninput="value=value.indexOf('.') > -1?value.slice(0, value.indexOf('.') + 3):value" type="number"
-                v-model="form.input"></el-input>
+                v-model="form.originalWeight"></el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="12">
-            <el-form-item label="额外增重百分比" prop="startDate">
-              <el-input placeholder="请输入额外增重百分比" style="width:93%" min="0"
+            <el-form-item label="额外增重百分比" prop="extraWeightPercent">
+              <el-input :disabled="true" placeholder="请输入额外增重百分比" style="width:93%" min="0"
                 oninput="value=value.indexOf('.') > -1?value.slice(0, value.indexOf('.') + 3):value" type="number"
-                v-model="form.input"></el-input>
+                v-model="form.extraWeightPercent"></el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="12">
-            <el-form-item label="是否限制一票一件" prop="startDate">
-              <el-switch v-model="form.value4" active-color="#13ce66">
+            <el-form-item label="是否开启高低价" prop="highLowPriceFlg">
+              <el-switch :disabled="true" v-model="form.highLowPriceFlg" active-color="#13ce66">
               </el-switch>
             </el-form-item>
           </el-col>
 
+          <!-- 是否需要预审，1：预审，0：取消预审 -->
           <el-col :span="12">
-            <el-form-item label="高价百分比" prop="startDate">
-              <el-input placeholder="请输入高价百分比" style="width:93%" min="0"
-                oninput="value=value.indexOf('.') > -1?value.slice(0, value.indexOf('.') + 3):value" type="number"
-                v-model="form.input"></el-input>
+            <el-form-item label="是否预审" prop="isNeedRequired">
+              <el-switch :disabled="true" v-model="form.isNeedRequired" active-color="#13ce66">
+              </el-switch>
             </el-form-item>
           </el-col>
 
           <el-col :span="12">
-            <el-form-item label="低价百分比" prop="startDate">
-              <el-input placeholder="请输入低价百分比" style="width:93%" min="0"
+            <el-form-item label="高价百分比" prop="highPriceWeightPercent">
+              <el-input :disabled="true" placeholder="请输入高价百分比" style="width:93%" min="0"
                 oninput="value=value.indexOf('.') > -1?value.slice(0, value.indexOf('.') + 3):value" type="number"
-                v-model="form.input"></el-input>
+                v-model="form.highPriceWeightPercent"></el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="12">
-            <el-form-item label="已配重量（KG）" prop="startDate">
-              <el-input placeholder="请输入已配重量（KG）" style="width:93%" min="0"
+            <el-form-item label="低价百分比" prop="lowPriceWeightPercent">
+              <el-input :disabled="true" placeholder="请输入低价百分比" style="width:93%" min="0"
                 oninput="value=value.indexOf('.') > -1?value.slice(0, value.indexOf('.') + 3):value" type="number"
-                v-model="form.input"></el-input>
+                v-model="form.lowPriceWeightPercent"></el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="12">
-            <el-form-item label="航班优先级" prop="startDate">
-             <!-- <el-select v-model="form.value5" placeholder="请选择航班优先级">
-                <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
-                </el-option>
-              </el-select> -->
-            </el-form-item>
-          </el-col>
-
-
-          <el-col :span="12">
-            <el-form-item label="总体积 （cm³）" prop="startDate">
-              <el-input placeholder="请输入总体积 （cm³）" style="width:93%" min="0"
+            <el-form-item label="已配重量" prop="alloctedWeight">
+              <el-input :disabled="true" placeholder="请输入已配重量" style="width:93%" min="0"
                 oninput="value=value.indexOf('.') > -1?value.slice(0, value.indexOf('.') + 3):value" type="number"
-                v-model="form.input"></el-input>
+                v-model="form.alloctedWeight"></el-input>
             </el-form-item>
           </el-col>
 
-          <el-col :span="12">
-            <el-form-item label="已配体积（cm³）" prop="startDate">
-              <el-input placeholder="请输入已配体积（cm³）" style="width:93%" min="0"
-                oninput="value=value.indexOf('.') > -1?value.slice(0, value.indexOf('.') + 3):value" type="number"
-                v-model="form.input"></el-input>
-
-            </el-form-item>
-          </el-col>
         </el-row>
 
 
@@ -268,7 +245,9 @@
 <script>
   import {
     findFltConditionDataApi,
-    findAllFltDataApi
+    findAllFltDataApi,
+    findFltById,
+    saveOrUpdate
 
   } from "@/api/findAllFltData";
   export default {
@@ -287,28 +266,7 @@
         single: true,
         // 非多个禁用
         multiple: true,
-        // data 中设定
-        pickerOptionsStart: {
-          disabledDate: time => {
-            let endDateVal = this.form.endDate;
-            if (endDateVal) {
-              return time.getTime() > new Date(endDateVal).getTime() || time.getTime() < new Date().getTime() - 24 *
-                60 * 60 * 1000;
-            } else {
-              return time.getTime() < new Date().getTime() - 24 * 60 * 60 * 1000;
-            }
-          }
-        },
-        pickerOptionsEnd: {
-          disabledDate: time => {
-            let beginDateVal = this.form.startDate;
-            if (beginDateVal) {
-              return time.getTime() < new Date(beginDateVal).getTime();
-            } else {
-              return time.getTime() < new Date().getTime() - 24 * 60 * 60 * 1000;
-            }
-          }
-        },
+
         // 遮罩层
         loading: false,
         // 遮罩层
@@ -348,18 +306,28 @@
         // 表单参数
         form: {
 
-        },
 
+        },
         // 表单校验
         rules: {
-          sourceFlightNo: [{
+          fltNo: [{
             required: true,
             message: "原航班号不能为空",
             trigger: "blur"
           }],
-          flightRank: [{
+          fltDate: [{
             required: true,
-            message: "配载航班不能为空",
+            message: "航班日期不能为空",
+            trigger: "blur"
+          }],
+          kindId: [{
+            required: true,
+            message: "航班种类不能为空",
+            trigger: "change"
+          }],
+          originalWeight: [{
+            required: true,
+            message: "原始重量（T）不能为空",
             trigger: "blur"
           }],
         }
@@ -412,6 +380,7 @@
             //航班类型
             this.flightTypelist = response.data.flightType;
             //航班状态
+
             this.flightStatuslist = response.data.flightStatus;
 
           } else {
@@ -455,28 +424,35 @@
       },
       /** 新增按钮操作 */
       handleAdd() {
-        this.form = {};
+         this.reset();
         this.open = true;
         this.title = "添加航班信息";
         this.form.id = -1;
-        this.dayOfWeek = [];
-
+        this.form.statusId=this.flightStatuslist[0].id;
       },
       /** 修改按钮操作 */
       handleUpdate(row) {
-
-        this.form = {};
-        this.dayOfWeek = [];
+         this.reset();
         this.open = true;
-        this.title = "修改原航班顺位规则";
-        this.form = row;
-        this.dayOfWeek = this.form.dayOfWeek ? this.form.dayOfWeek.split(";") : [];
-        //this.form.dayOfWeek = this.form.dayOfWeek ? this.form.dayOfWeek.split(";") : [];
+        this.title = "修改航班信息";
+        //根据ID查item
+
+        findFltById(row).then(response => {
+          if (response.code == 200) {
+           this.form = response.data;
+           //是否开启高地价
+           this.form.highLowPriceFlg  =this.form.highLowPriceFlg===1?true:false;
+           //是否预审
+             this.form.isNeedRequired  =this.form.isNeedRequired===1?true:false;
+          } else {
+            this.msgError(response.msg);
+          }
 
+        });
       },
       /** 删除 启用 停用按钮操作 */
       handleDeleteorPlayorpause(row, status, statusText) {
-        debugger
+
         //删除前需要停用
         if (status === 0 && row.status != '3') {
           this.$message({
@@ -512,9 +488,13 @@
       submitForm: function() {
         this.$refs["form"].validate(valid => {
           if (valid) {
-            this.form.dayOfWeek = this.dayOfWeek.sort();
+            let formdata=JSON.parse(JSON.stringify(this.form)); 
+           //是否开启高地价
+           formdata.highLowPriceFlg  =formdata.highLowPriceFlg?1:0;
+           //是否预审
+           formdata.isNeedRequired  =formdata.isNeedRequired?1:0;
             //处理数据
-            sourceFlightRulesSaveApi(this.form).then(response => {
+            saveOrUpdate(formdata).then(response => {
               if (response.code === 200) {
                 this.msgSuccess("保存成功");
                 this.open = false;
@@ -529,49 +509,13 @@
       },
       // 表单重置
       reset() {
-        this.form = {
-
-          dayOfWeek: []
-
-        };
+        this.form = {};
         this.resetForm("form");
       },
-      /** 查询目的航班*/
-      findSourceFlightAndFlightDate() {
-        //校验原航班号非空
-        if (this.queryParams.sourceFlightNo === null || this.queryParams.sourceFlightNo === undefined || this
-          .queryParams.sourceFlightNo.trim() === '') {
-          this.$message.warning("原航班号为空");
-          return
-        }
-        //校验原日期非空
-        if (this.queryParams.flightDate === null || this.queryParams.flightDate === undefined) {
-          this.$message.warning("日期为空");
-          return
-        }
-        this.openFlightDate = true;
-        this.loadingFlightDate = true;
-        this.sourceFlightAndFlightDate = [];
-        findSourceFlightAndFlightDateApi(this.queryParams).then(response => {
-          if (response.code === 200) {
-            this.sourceFlightAndFlightDate = response.data;
-            this.loadingFlightDate = false;
-          } else {
-            this.msgError(response.msg);
-          }
-
-        });
-
-
-      },
-      // 目的航班弹出框返回
-      cancelFlightDate() {
-        this.openFlightDate = false;
-      },
       // 取消按钮
       cancel() {
         this.open = false;
-        // this.reset();
+         this.reset();
       },
 
       /** 重置按钮操作 */