合并分支 'ExportOrder' 到 'master'

运单费率



查看合并请求 !32

@@ -24,6 +24,12 @@
                         </el-date-picker>
                         </el-date-picker>
                     </div>
                     </div>
                 </el-form-item>
                 </el-form-item>
+                <el-form-item label="">
+                    <el-select v-model="formInline.remark2" placeholder="付款状态">
+                        <el-option label="是" value="1"></el-option>
+                        <el-option label="否" value="0"></el-option>
+                    </el-select>
+                </el-form-item>
                 <el-form-item>
                 <el-form-item>
                     <el-button type="primary" @click="getLists">查询</el-button>
                     <el-button type="primary" @click="getLists">查询</el-button>
                 </el-form-item>
                 </el-form-item>
@@ -45,7 +51,6 @@
                         <el-button size="small" type="primary">导入运单</el-button>
                         <el-button size="small" type="primary">导入运单</el-button>
                     </el-upload>
                     </el-upload>
                     </el-form-item>
                     </el-form-item>
-
                     <el-button type="success" @click="exportToExcel">导出 Excel</el-button>
                     <el-button type="success" @click="exportToExcel">导出 Excel</el-button>
                 </el-form-item>
                 </el-form-item>
             </el-form>
             </el-form>
@@ -128,6 +133,11 @@
                         show-overflow-tooltip>
                         show-overflow-tooltip>
                 </el-table-column>
                 </el-table-column>
                 <el-table-column
                 <el-table-column
+                        prop="feweight"
+                        label="计费重量"
+                        show-overflow-tooltip>
+                </el-table-column>
+                <el-table-column
                         prop="vol"
                         prop="vol"
                         label="体积"
                         label="体积"
                         show-overflow-tooltip>
                         show-overflow-tooltip>
@@ -138,6 +148,20 @@
                         show-overflow-tooltip>
                         show-overflow-tooltip>
                 </el-table-column>
                 </el-table-column>
                 <el-table-column
                 <el-table-column
+                        prop="remark1"
+                        label="应付"
+                        show-overflow-tooltip>
+                </el-table-column>
+                <el-table-column
+                        prop="remark2"
+                        label="付款状态"
+                        show-overflow-tooltip>
+                    <template slot-scope="scope">
+                        <span v-if="scope.row.remark2==='1'" style="color: #5BB75B;font-weight: bolder">已付</span>
+                        <span v-else style="font-weight: bolder;color: red">未付</span>
+                    </template>
+                </el-table-column>
+                <el-table-column
                         fixed="right"
                         fixed="right"
                         label="操作"
                         label="操作"
                         width="100">
                         width="100">
@@ -226,12 +250,28 @@
                     <el-form-item label="毛重">
                     <el-form-item label="毛重">
                         <el-input v-model="submitForm.weight" placeholder="毛重"></el-input>
                         <el-input v-model="submitForm.weight" placeholder="毛重"></el-input>
                     </el-form-item>
                     </el-form-item>
+                    <el-form-item label="计费重量">
+                        <el-input v-model="submitForm.feweight" placeholder="计费重量"></el-input>
+                    </el-form-item>
                     <el-form-item label="体积">
                     <el-form-item label="体积">
                         <el-input v-model="submitForm.vol" placeholder="体积"></el-input>
                         <el-input v-model="submitForm.vol" placeholder="体积"></el-input>
                     </el-form-item>
                     </el-form-item>
                     <el-form-item label="应收">
                     <el-form-item label="应收">
                         <el-input v-model="submitForm.charge" placeholder="应收"></el-input>
                         <el-input v-model="submitForm.charge" placeholder="应收"></el-input>
                     </el-form-item>
                     </el-form-item>
+                    <el-form-item label="应付">
+                        <el-input v-model="submitForm.remark1" placeholder="应付"></el-input>
+                    </el-form-item>
+                    <el-form-item label="付款状态">
+                        <el-select v-model="submitForm.remark2" style="width: 157px">
+                            <el-option
+                                    v-for="item in paystatus"
+                                    :key="item.value"
+                                    :label="item.label"
+                                    :value="item.value">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
                     <el-form-item label="危险品">
                     <el-form-item label="危险品">
                         <el-select v-model="submitForm.isdangerous" style="width: 157px">
                         <el-select v-model="submitForm.isdangerous" style="width: 157px">
                             <el-option
                             <el-option
@@ -389,6 +429,7 @@
                     awba: '',
                     awba: '',
                     licenseno: '',
                     licenseno: '',
                     starttime: '',
                     starttime: '',
+                    remark2:'',
                     endtime: '',
                     endtime: '',
                     pageNum: 1,
                     pageNum: 1,
                     pageSize: 20
                     pageSize: 20
@@ -445,10 +486,11 @@
                     relevance: "",
                     relevance: "",
                     remark: "",
                     remark: "",
                     remark1: "",
                     remark1: "",
-                    remark2: "",
+                    remark2: "0",
                     taketime: "",
                     taketime: "",
                     vol: 0,
                     vol: 0,
-                    weight: 0
+                    weight: 0,
+                    feweight:0
                 },
                 },
                 dialogVisible: false,
                 dialogVisible: false,
                 PDdialogVisible: false,
                 PDdialogVisible: false,
@@ -463,6 +505,15 @@
                         label: '是'
                         label: '是'
                     }
                     }
                 ],
                 ],
+                paystatus: [
+                    {
+                        value: "0",
+                        label: '否'
+                    }, {
+                        value: "1",
+                        label: '是'
+                    }
+                ],
                 textMap: {
                 textMap: {
                     update: '编辑',
                     update: '编辑',
                     create: '新增'
                     create: '新增'

+<template>
+    <div>费率配置</div>
+</template>
+<script>
+    export default {
+        data() {
+            return {
+
+            }
+        },
+        mounted() {
+        },
+        methods:{
+
+        }
+    }
+</script>