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

@@ -187,9 +187,6 @@
           'id': 1,
           'name': '有效'
         },{
-          'id': 2,
-          'name': '执行中'
-        },{
           'id': 3,
           'name': '停用'
         }],

@@ -132,48 +132,148 @@
 
     <!-- 添加或修改对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="60%">
-      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="125px">
         <el-row>
-          <el-col :span="10">
-            <el-form-item label="原航班" prop="sourceFlightNo">
-              <el-input v-model="form.sourceFlightNo" placeholder="请输入原航班号" />
+          <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-row>
-        <el-row>
+           <!-- <el-col :span="1"> &#12288;</el-col> -->
           <el-col :span="12">
-            <el-form-item label="有效开始时间" prop="startDate">
+            <el-form-item label="航班日期" prop="sourceFlightNo">
+
              <el-date-picker clearable size="small" :picker-options="pickerOptionsStart" v-model="form.startDate"
                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="endDate">
-              <el-date-picker clearable size="small" :picker-options="pickerOptionsEnd" v-model="form.endDate"
-                type="date" value-format="yyyy-MM-dd" placeholder="选择结束时间">
-              </el-date-picker>
+            <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>
+          </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 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="航班类型" 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-option>
+               </el-select>
+            </el-form-item>
+          </el-col>
+
 
-          <el-col :span="24" style="margin-bottom: 5%;">
-            <span style="color: red;margin-left: 10%;">提示:配载航班之同请用分号分隔【符号不区分中英文】,例:CA1053:C7433</span><br />
-            <span style="color: red;margin-left: 10%;">提示:如果需要设置配载航班延迟或提前可以直接在目的航斑后加减【+-】天数。如:CA1053+1:CZ433-1</span>
+          <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-option>
+               </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" 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-col :span="24">
-            <el-form-item label="配载航班" prop="flightRank">
-              <el-input type="textarea" v-model="form.flightRank" :rows="4"></el-input>
+
+          <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>
           </el-col>
-          <el-col :span="24">
-            <el-form-item label="周期段">
-              <el-checkbox-group v-model="dayOfWeek">
-                <el-checkbox v-for="item in dayOfWeekList" :key="item" :label="item" :name="item"></el-checkbox>
-              </el-checkbox-group>
+
+           <el-col :span="12">
+             <el-form-item label="是否限制一票一件" prop="startDate" >
+             <el-switch
+               v-model="form.value4"
+               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" 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-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>
+            </el-col>
+
+            <el-col :span="12">
+              <el-form-item label="已配重量（KG）" prop="startDate" >
+               <el-input placeholder="请输入已配重量（KG）" 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-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" 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-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>
+
+
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -193,6 +293,22 @@
     name: "SourceFlightRules",
     data() {
       return {
+          options: [{
+                  value: '选项1',
+                  label: '黄金糕'
+                }, {
+                  value: '选项2',
+                  label: '双皮奶'
+                }, {
+                  value: '选项3',
+                  label: '蚵仔煎'
+                }, {
+                  value: '选项4',
+                  label: '龙须面'
+                }, {
+                  value: '选项5',
+                  label: '北京烤鸭'
+                }],
         // 选中数组
         ids: [],
         // 非单个禁用
@@ -322,7 +438,7 @@
       handleAdd() {
         this.form = {};
         this.open = true;
-        this.title = "添加原航班顺位规则";
+        this.title = "添加航班信息";
         this.form.id = -1;
         this.dayOfWeek = [];