Merge branch 'dev' of http://git.echepei.com/caojunjie/Smart_platform_ui into dev

src/views/basicData/customerInformation/index.vue

@@ -78,6 +78,9 @@
           <template slot="adminProfiles" slot-scope="{ row }">
             <span>{{ row.adminProfilesName | adminProfileFilter }}</span>
           </template>
+          <template slot="belongtocompany" slot-scope="{ row }">
+            <span>{{ row.belongCompany }}</span>
+          </template>
         </avue-crud>
         <report-dialog
           :switchDialog="switchDialog"

src/views/basicData/customerManagement/supplierMaterial/index.vue

@@ -78,6 +78,9 @@
           <template slot="adminProfiles" slot-scope="{ row }">
             <span>{{ row.adminProfilesName | adminProfileFilter }}</span>
           </template>
+          <template slot="belongtocompany" slot-scope="{ row }">
+            <span>{{ row.belongCompany }}</span>
+          </template>
         </avue-crud>
         <report-dialog
           :switchDialog="switchDialog"

src/views/basicData/landTransportation/driverInformation/index.vue

@@ -0,0 +1,115 @@
+<template>
+<div>
+  <basic-container>
+    <avue-crud :data="dataList" :option="option"></avue-crud>
+  </basic-container>
+</div>
+</template>
+
+<script>
+export default {
+  name: "index",
+  data(){
+    return{
+      dataList:[],
+      option:{
+        align:'center',
+        index: true,
+        column:[{
+          label: '司机姓名',
+          prop: 'fileName',
+          index: 1,
+          width: 140,
+          cell: true,
+          overHidden: true,
+          search:true,
+        },{
+          label: '身份证号',
+          prop: 'fileName',
+          index: 1,
+          width: 140,
+          cell: true,
+          overHidden: true,
+          search:true,
+        },{
+          label: '准假车型',
+          prop: 'fileName',
+          index: 1,
+          width: 140,
+          cell: true,
+          overHidden: true,
+          search:true,
+        },{
+          label: '电话',
+          prop: 'fileName',
+          index: 1,
+          width: 140,
+          cell: true,
+          overHidden: true,
+          search:true,
+        },{
+          label: '所属车队',
+          prop: 'fileName',
+          index: 1,
+          width: 140,
+          cell: true,
+          overHidden: true,
+          search:true,
+        },{
+          label: '性别',
+          prop: 'fileName',
+          index: 1,
+          width: 140,
+          cell: true,
+          overHidden: true,
+          search:true,
+        },{
+          label: '驾驶证有效期',
+          prop: 'fileName',
+          index: 1,
+          width: 140,
+          cell: true,
+          overHidden: true,
+          search:true,
+        },{
+          label: '资格证证件号',
+          prop: 'fileName',
+          index: 1,
+          width: 140,
+          cell: true,
+          overHidden: true,
+          search:true,
+        },{
+          label: '资格证有效期',
+          prop: 'fileName',
+          index: 1,
+          width: 140,
+          cell: true,
+          overHidden: true,
+          search:true,
+        },{
+          label: '押运证证件号',
+          prop: 'fileName',
+          index: 1,
+          width: 140,
+          cell: true,
+          overHidden: true,
+          search:true,
+        },{
+          label: '押运证有效期',
+          prop: 'fileName',
+          index: 1,
+          width: 140,
+          cell: true,
+          overHidden: true,
+          search:true,
+        }]
+      }
+    }
+  },
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/basicData/landTransportation/vehicleInformation/index.vue

@@ -0,0 +1,203 @@
+<template>
+  <div>
+    <basic-container>
+      <avue-crud :data="dataList" :option="option"></avue-crud>
+    </basic-container>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "index",
+  data(){
+    return{
+      dataList:[],
+      option:{
+        align:'center',
+        index: true,
+        column:[{
+          label: '车牌号',
+          prop: 'fileName',
+          index: 1,
+          width: 140,
+          cell: true,
+          overHidden: true,
+          search:true,
+        },{
+          label: '车队名称',
+          prop: 'fileName',
+          index: 1,
+          width: 140,
+          cell: true,
+          overHidden: true,
+          search:true,
+        },{
+          label: '司机名称',
+          prop: 'fileName',
+          index: 1,
+          width: 140,
+          cell: true,
+          overHidden: true,
+          search:true,
+        },{
+          label: '挂车号',
+          prop: 'fileName',
+          index: 1,
+          width: 140,
+          cell: true,
+          overHidden: true,
+          search:true,
+        },{
+          label: '燃油类型',
+          prop: 'fileName',
+          index: 1,
+          width: 140,
+          cell: true,
+          overHidden: true,
+          search:true,
+        },{
+          label: '车辆类型',
+          prop: 'fileName',
+          index: 1,
+          width: 140,
+          cell: true,
+          overHidden: true,
+          search:true,
+        },{
+          label: '车辆品牌',
+          prop: 'fileName',
+          index: 1,
+          width: 140,
+          cell: true,
+          overHidden: true,
+          search:true,
+        },{
+          label: '制造单位',
+          prop: 'fileName',
+          index: 1,
+          width: 140,
+          cell: true,
+          overHidden: true,
+          search:true,
+        },{
+          label: '发证机关',
+          prop: 'fileName',
+          index: 1,
+          width: 140,
+          cell: true,
+          overHidden: true,
+          search:true,
+        },{
+          label: '牵引车辆型号',
+          prop: 'fileName',
+          index: 1,
+          width: 140,
+          cell: true,
+          overHidden: true,
+          search:true,
+        },{
+          label: '牵引车车架号',
+          prop: 'fileName',
+          index: 1,
+          width: 140,
+          cell: true,
+          overHidden: true,
+          search:true,
+        },{
+          label: '挂车型号',
+          prop: 'fileName',
+          index: 1,
+          width: 140,
+          cell: true,
+          overHidden: true,
+          search:true,
+        },{
+          label: '挂车车架号',
+          prop: 'fileName',
+          index: 1,
+          width: 140,
+          cell: true,
+          overHidden: true,
+          search:true,
+        },{
+          label: '发动机型号',
+          prop: 'fileName',
+          index: 1,
+          width: 140,
+          cell: true,
+          overHidden: true,
+          search:true,
+        },{
+          label: '核载人数',
+          prop: 'fileName',
+          index: 1,
+          width: 140,
+          cell: true,
+          overHidden: true,
+          search:true,
+        },{
+          label: '购车日期',
+          prop: 'fileName',
+          index: 1,
+          width: 140,
+          cell: true,
+          overHidden: true,
+          search:true,
+        },{
+          label: '注册日期',
+          prop: 'fileName',
+          index: 1,
+          width: 140,
+          cell: true,
+          overHidden: true,
+          search:true,
+        },{
+          label: '报废日期',
+          prop: 'fileName',
+          index: 1,
+          width: 140,
+          cell: true,
+          overHidden: true,
+          search:true,
+        },{
+          label: '外阔尺寸mm',
+          prop: 'fileName',
+          index: 1,
+          width: 140,
+          cell: true,
+          overHidden: true,
+          search:true,
+        },{
+          label: '总重量kg',
+          prop: 'fileName',
+          index: 1,
+          width: 140,
+          cell: true,
+          overHidden: true,
+          search:true,
+        },{
+          label: '核定重量kg',
+          prop: 'fileName',
+          index: 1,
+          width: 140,
+          cell: true,
+          overHidden: true,
+          search:true,
+        },{
+          label: '装备质量kg',
+          prop: 'fileName',
+          index: 1,
+          width: 140,
+          cell: true,
+          overHidden: true,
+          search:true,
+        }]
+      }
+    }
+  },
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/businessManagement/purchaseOrder/detailsPageEdit.vue

@@ -167,14 +167,23 @@
               ></el-input>
               <span v-else>{{ row.orderQuantity | IntegerFormat }}</span>
             </template>
-            <template slot="price" slot-scope="{ row }">
-              <el-input
+            <template slot="purchaseAmount" slot-scope="{ row }">
+              <el-select
                 v-if="row.$cellEdit"
-                v-model.trim="row.price"
-                oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'                size="small"
-                @input="changeContractAmt(row)"
-              ></el-input>
-              <span v-else>{{ row.price }}</span>
+                v-model="row.purchaseAmount"
+                @focus="changeContractAmt(row)"
+                allow-create
+                filterable
+                v-input-limit="2"
+                default-first-option
+              >
+                <el-option
+                  v-for="(item, index) in purchasePriceOption"
+                  :key="index"
+                  :label="item.purchasePrice"
+                  :value="item.purchasePrice"></el-option>
+              </el-select>
+              <span v-else>{{ row.purchaseAmount | decimalFormat }}</span>
             </template>
             <template slot="amount" slot-scope="{ row }">
               <span>{{ row.amount | decimalFormat }}</span>
@@ -185,24 +194,6 @@
             <template slot="storageQuantity" slot-scope="{ row }">
               <span>{{ row.storageQuantity | IntegerFormat }}</span>
             </template>
-<!--            <template slot="storageQuantity" slot-scope="{ row }">-->
-<!--              <el-input-->
-<!--                v-if="row.$cellEdit"-->
-<!--                v-model.trim="row.storageQuantity"-->
-<!--                size="small"-->
-<!--                oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'-->
-<!--              ></el-input>-->
-<!--              <span v-else>{{ row.storageQuantity }}</span>-->
-<!--            </template>-->
-<!--            <template slot="actualQuantity" slot-scope="{ row }">-->
-<!--              <el-input-->
-<!--                v-if="row.$cellEdit"-->
-<!--                v-model.trim="row.actualQuantity"-->
-<!--                size="small"-->
-<!--                oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'-->
-<!--              ></el-input>-->
-<!--              <span v-else>{{ row.actualQuantity }}</span>-->
-<!--            </template>-->
             <template slot="code" slot-scope="{row,index}">
               <el-button type="text" size="mini" style="padding:4px 10px;float:left" @click="commodityChoice(row)" :disabled="detailData.seeDisabled || !row.$cellEdit">选择</el-button>
               <span>{{ row.code }}</span>
@@ -515,6 +506,7 @@ import reportDialog from "@/components/report-dialog/main";
 import check from "@/components/check/check";
 import checkSchedule from "@/components/check/checkSchedule";
 import { customerList as feeList } from "@/api/basicData/basicFeesDesc";
+import { getMarketPrice, getPurchasePrice } from "@/api/basicData/fees";
 
 export default {
   name: "detailsPage",
@@ -608,7 +600,6 @@ export default {
         treeLoad: function (node, resolve) {
           const parentId = (node.level === 0) ? 0 : node.data.id;
           getDeptLazyTreeS(parentId).then(res => {
-            console.log(res.data.data)
             resolve(res.data.data.map(item => {
               return {
                 ...item,
@@ -822,6 +813,7 @@ export default {
       feesOption: [],
       applyPaymentList: [],
       messageVisble: false,
+      purchasePriceOption: [],
     }
   },
   mounted() {
@@ -844,7 +836,6 @@ export default {
   async created() {
     this.rowHeight = (window.innerHeight - 130) + 'px'
     this.customerContact = customerContact
-    console.log(this.customerContact)
     // this.customerContact = await this.getColumnData(this.getColumnName(18), customerContact);
     this.advantageProject = await this.getColumnData(this.getColumnName(19), advantageProject);
     this.getWorkDicts("payment_term").then(res => {
@@ -1061,11 +1052,9 @@ export default {
     },
     //点击行可编辑
     handleRowClick(row, event, column) {
-      console.log(row.$index)
     },
     //商品编辑
     rowCell(row, index) {
-      console.log(row)
       if (row.$cellEdit) {
         if (Number(row.orderQuantity) < Number(row.actualQuantity)) {
           return this.$message.error('订货数量不能小于发货数量')
@@ -1075,7 +1064,6 @@ export default {
     },
     //费用编辑
     rowCellTwo(row, index) {
-      console.log(row)
       this.$refs.crudProject.rowCell(row, index)
     },
     //商品选中触发
@@ -1098,14 +1086,12 @@ export default {
     choice(row) {
       this.dialogCost = !this.dialogCost
       this.choiceData = true
-      console.log(row)
       this.choiceIndex = row.$index
     },
     //点击商品明细选择触发
     commodityChoice(row) {
       this.dialogVisible = !this.dialogVisible
       this.commodityData = true
-      console.log(row)
       this.choiceIndexT = row.$index
     },
     //导入商品触发
@@ -1120,6 +1106,13 @@ export default {
         this.contactsData[this.choiceIndexT].orderQuantity = 0
         this.contactsData[this.choiceIndexT].price = 0
         this.contactsData[this.choiceIndexT].amount = 0
+        getPurchasePrice({code: this.contactsData[this.choiceIndexT].code}).then(res => {
+          if (res.data.data.length > 0) {
+            this.$set(this.contactsData[this.choiceIndexT], 'purchaseAmount', res.data.data[0].purchasePrice)
+          } else {
+            this.$set(this.contactsData[this.choiceIndexT], 'purchaseAmount', '0')
+          }
+        })
         selectGoodsNum({
           goodsId: this.tableData[0].id,
           itemType: this.tableData[0].typeno
@@ -1145,7 +1138,6 @@ export default {
       // this.advantageProjectForm = this.advantageProjectForm.concat(this.tableDataCost)
       if (this.tableDataCost.length > 0) {
         for (let item in this.tableDataCost) {
-          console.log(this.tableDataCost[item])
           this.tableDataCost[item].itemId = this.tableDataCost[item].id
           this.tableDataCost[item].feeName = this.tableDataCost[item].cname
           this.tableDataCost[item].sort = this.maxFeeNum + 1
@@ -1162,6 +1154,13 @@ export default {
     importGoods() {
       if (this.goodsListSave.length > 0) {
         for (let item in this.goodsListSave) {
+          getPurchasePrice({code: this.goodsListSave[item].code}).then(res => {
+            if (res.data.data.length > 0) {
+              this.$set(this.goodsListSave[item], 'purchaseAmount', res.data.data[0].purchasePrice)
+            } else {
+              this.$set(this.goodsListSave[item], 'purchaseAmount', '0')
+            }
+          })
           selectGoodsNum({
             goodsId: this.goodsListSave[item].id,
             itemType: this.goodsListSave[item].typeno
@@ -1185,6 +1184,13 @@ export default {
         }
       } else {
         for (let item in this.tableData) {
+          getPurchasePrice({code: this.tableData[item].code}).then(res => {
+            if (res.data.data.length > 0) {
+              this.$set(this.tableData[item], 'purchaseAmount', res.data.data[0].purchasePrice)
+            } else {
+              this.$set(this.tableData[item], 'purchaseAmount', '0')
+            }
+          })
           selectGoodsNum({
             goodsId: this.tableData[item].id,
             itemType: this.tableData[item].typeno
@@ -1222,12 +1228,10 @@ export default {
     },
     //选中触发
     selectionChange(list) {
-      console.log(list);
       this.tableData = list
     },
     //费用选中触发
     selectionChangeCost(list) {
-      console.log(list);
       this.tableDataCost = list
     },
     //导入页左商品类型查询
@@ -1256,8 +1260,6 @@ export default {
     },
     //新增商品信息保存触发
     rowSave(row, done, loading) {
-      console.log(row)
-      console.log(this.contactsData)
       // this.contactsData.push(row)
       done()
     },
@@ -1331,7 +1333,6 @@ export default {
         feesTypeId: this.treeDeptIdCost
       })
       customerList(queryParams).then(res => {
-        console.log(res)
         const data = res.data.data;
         this.pageCost.total = data.total;
         this.dataCost = data.records;
@@ -1366,9 +1367,12 @@ export default {
 
     // 计算费用
     changeContractAmt(row) {
+      getPurchasePrice({code: row.code}).then(res => {
+        this.purchasePriceOption = res.data.data
+      })
       let orderQuantity = 0;
       let purchaseAmount = 0;
-      if (row.price) {
+      if (row.purchaseAmount) {
         purchaseAmount = row.purchaseAmount;
       }
       if (row.orderQuantity) {

src/views/businessManagement/receipt/detailsPageEdit.vue

@@ -154,6 +154,12 @@
             <template slot="purchaseQuantity" slot-scope="{ row }">
               <span>{{ row.purchaseQuantity | IntegerFormat }}</span>
             </template>
+            <template slot="purchaseAmount" slot-scope="{ row }">
+              <span>{{ row.purchaseAmount | decimalFormat }}</span>
+            </template>
+            <template slot="deliveryAmount" slot-scope="{ row }">
+              <span>{{ row.deliveryAmount | decimalFormat }}</span>
+            </template>
             <template slot="menuLeft" slot-scope="{size}">
               <el-button type="primary"
                          icon="el-icon-plus"
@@ -305,6 +311,8 @@ import {
   micrometerFormat,
   IntegerFormat
 } from "@/util/validate";
+import {detail as GYSDetail} from "@/api/basicData/customerInformation";
+import { getMarketPrice, getPurchasePrice } from "@/api/basicData/fees";
 
 export default {
   name: "detailsPage",
@@ -624,6 +632,7 @@ export default {
       // 收货禁用
       receiveDisabled: false,
       messageVisble:false,
+      GYSInfo: [], //供应商发货方信息
     }
   },
   mounted() {
@@ -704,15 +713,17 @@ export default {
       this.$set(this.form, 'deliveryAmount', 0)
       this.$set(this.form, 'totalQuantity', 0)
       this.$set(this.form, 'purchaseAmount', 0)
+      this.returnBack({id: this.form.corpId})
       this.contactsData.forEach(item => {
         this.$set(item, 'specificationAndModel', item.itemType)
         this.$set(item, 'orgOrderNo', this.form.orgOrderNo)
         this.$set(item, "inventoryNumber", item.storageQuantity)
         this.$set(item, "srcId", item.id)
-        this.$set(item, "deliveryAmount", item.amount)
-        this.$set(item, "purchaseAmount", item.price)
+        // this.$set(item, "deliveryAmount", item.amount)
+        this.$set(item, "purchaseAmount", item.purchaseAmount)
         this.$set(item, "purchaseQuantity", Number(item.orderQuantity))
         this.$set(item, "actualQuantity", (Number(item.orderQuantity) - Number(item.actualQuantity)))
+        this.actualQuantityChange(item)
         // 入库数量和入库金额的比例
         this.$set(item, 'scale', Number(item.deliveryAmount / item.actualQuantity))
         this.form.deliveryAmount = Number(this.form.deliveryAmount) + Number(item.deliveryAmount)
@@ -825,11 +836,11 @@ export default {
     actualQuantityChange(row) {
       if (Number(row.actualQuantity) > Number(row.purchaseQuantity)) {
         this.$message.error('入库数量不能超过采购数量')
-        row.actualQuantity = 0
+        row.actualQuantity = '0.00'
+        row.deliveryAmount = '0.00'
+      } else {
+        row.deliveryAmount = Number(row.actualQuantity) * Number(row.purchaseAmount)
       }
-      // if (row.scale) {
-      //   row.deliveryAmount = Number(row.actualQuantity) * Number(row.scale)
-      // }
     },
     // 类别变换时触发
     warehouseTreeChange(id) {
@@ -896,6 +907,13 @@ export default {
         this.contactsData[this.choiceIndexT].typeno = this.tableData[0].typeno
         this.contactsData[this.choiceIndexT].specificationAndModel = this.tableData[0].typeno
         this.contactsData[this.choiceIndexT].itemId = this.tableData[0].id
+        getPurchasePrice({code: this.contactsData[this.choiceIndexT].code}).then(res => {
+          if (res.data.data.length > 0) {
+            this.$set(this.contactsData[this.choiceIndexT], 'purchaseAmount', res.data.data[0].purchasePrice)
+          } else {
+            this.$set(this.contactsData[this.choiceIndexT], 'purchaseAmount', '0')
+          }
+        })
         selectGoodsNum({
           goodsId: this.tableData[0].id,
           itemType: this.tableData[0].typeno
@@ -940,6 +958,13 @@ export default {
       // this.contactsData = this.contactsData.concat(this.tableData)
       if (this.tableData.length > 0) {
         for (let item in this.tableData) {
+          getPurchasePrice({code: this.tableData[item].code}).then(res => {
+            if (res.data.data.length > 0) {
+              this.$set(this.tableData[item], 'purchaseAmount', res.data.data[0].purchasePrice)
+            } else {
+              this.$set(this.tableData[item], 'purchaseAmount', '0')
+            }
+          })
           selectGoodsNum({
             goodsId: this.tableData[item].id,
             itemType: this.tableData[item].typeno
@@ -1356,6 +1381,19 @@ export default {
       })
     },
     returnBack(data) {
+      GYSDetail(data.id).then(res => {
+        if (res.data.data.corpsAddrList.length > 0) {
+          this.GYSInfo = res.data.data.corpsAddrList
+          this.$set(this.form, 'arrivalAddress', this.GYSInfo[0].addr);
+          this.$set(this.form, 'arrivalContact', this.GYSInfo[0].attn);
+          this.$set(this.form, 'arrivalTel', this.GYSInfo[0].tel);
+        } else {
+          this.GYSInfo = []
+          this.$set(this.form, 'arrivalAddress', null);
+          this.$set(this.form, 'arrivalContact', null);
+          this.$set(this.form, 'arrivalTel', null);
+        }
+      })
       if (data.belongtocompany) {
         // this.form.salesCompany = data.belongtocompany
       }

src/views/businessManagement/salesOrder/detailsPageEdit.vue

@@ -2172,10 +2172,14 @@ export default {
         this.$set(this.form, 'chargeMember', arr[0])
       }
       khDetail(data.id).then(res => {
-        if (res.data.data.corpsAttnList) {
-          this.khInfoList = res.data.data.corpsAttnList
+        if (res.data.data.corpsAttnList.length > 0) {
+          this.khInfoList = res.data.data.corpsAttnList;
           this.$set(this.form, 'corpAttn', res.data.data.corpsAttnList[0].cname);
           this.$set(this.form, 'corpTel', res.data.data.corpsAttnList[0].tel);
+        } else {
+          this.khInfoList = [];
+          this.$set(this.form, 'corpAttn', null);
+          this.$set(this.form, 'corpTel', null);
         }
       })
       if (data.belongtocompany) {

src/views/landTransportation/dispatchingCars/detailPage.vue

@@ -0,0 +1,245 @@
+<template>
+  <div>
+    <div class="customer-head">
+      <div class="customer-back">
+        <el-button
+            type="danger"
+            style="border: none;background: none;color: red"
+            icon="el-icon-arrow-left"
+            @click="backToList"
+        >返回列表
+        </el-button>
+      </div>
+      <el-button
+          class="el-button--small-yh add-customer-btn"
+          type="primary"
+          :disabled="disabled"
+          size="small"
+          @click="editCustomer"
+      >保存
+      </el-button>
+    </div>
+    <containerTitle title="起止地信息" style="margin-top: 50px"></containerTitle>
+    <basic-container>
+      <el-table
+          ref="singleTable"
+          :data="tableData"
+          size="mini"
+          :header-cell-style="{color:'#000'}"
+          highlight-current-row
+          style="width: 100%">
+        <el-table-column
+            property="date"
+            align="center"
+            width="40">
+          <template slot-scope="scope">
+            <el-tooltip class="item" effect="dark" content="增加途径地址" placement="top">
+              <el-button type="primary" icon="el-icon-plus" size="mini" circle
+                         v-if="(scope.$index+1) === tableData.length" @click="addAddress"></el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+        <el-table-column
+            property="date"
+            label="省份"
+            align="center"
+            width="120">
+          <template slot-scope="scope">
+            <el-select v-model="scope.row.date" filterable size="small" placeholder="请选择">
+              <el-option label="北京" value="1"></el-option>
+              <el-option label="山东" value="2"></el-option>
+              <el-option label="天津" value="3"></el-option>
+            </el-select>
+          </template>
+        </el-table-column>
+        <el-table-column
+            property="name"
+            label="城市"
+            align="center"
+            width="120">
+          <template slot-scope="scope">
+            <el-select v-model="scope.row.name" filterable size="small" placeholder="请选择">
+              <el-option label="测试城市0" value="1"></el-option>
+              <el-option label="测试城市1" value="2"></el-option>
+              <el-option label="测试城市2" value="3"></el-option>
+            </el-select>
+          </template>
+        </el-table-column>
+        <el-table-column
+            property="address"
+            align="center"
+            width="160"
+            label="区/县">
+          <template slot-scope="scope">
+            <el-select v-model="scope.row.name" filterable size="small" placeholder="请选择">
+              <el-option label="测试城市0" value="1"></el-option>
+              <el-option label="测试城市1" value="2"></el-option>
+              <el-option label="测试城市2" value="3"></el-option>
+            </el-select>
+          </template>
+        </el-table-column>
+        <el-table-column
+            property="address"
+            align="center"
+            label="详细地址">
+          <template slot-scope="scope">
+            <el-input v-model="scope.row.address" size="small" placeholder="请输入内容"></el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </basic-container>
+    <containerTitle title="箱信息"></containerTitle>
+    <basic-container>
+      <avue-crud :data="entrustList" :option="entrustOptionTwo"></avue-crud>
+    </basic-container>
+    <containerTitle title="车队箱信息"></containerTitle>
+    <basic-container>
+      <avue-crud :data="goodsList" :option="goodsOptionCrud"></avue-crud>
+    </basic-container>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      form: {},
+      tableData: [{
+        date: '2016-05-02',
+        name: '王小虎',
+        address: '上海市普陀区金沙江路 1518 弄'
+      }, {
+        date: '2016-05-02',
+        name: '王小虎',
+        address: '上海市普陀区金沙江路 1518 弄'
+      }],
+      entrustList: [],
+      goodsList:[],
+      goodsOptionCrud: {
+        index:true,
+        cellBtn:true,
+        addBtn:false,
+        addRowBtn:true,
+        column: [
+          {
+            label: '车队',
+            cell: true,
+            prop: 'name'
+          },{
+            label: '尺寸箱型',
+            cell: true,
+            prop: 'sex'
+          },{
+            label: '箱量',
+            cell: true,
+            prop: 'sex'
+          }, {
+            label: '重量',
+            cell: true,
+            prop: 'sex'
+          }, {
+            label: '车号',
+            cell: true,
+            prop: 'sex'
+          }, {
+            label: '司机',
+            cell: true,
+            prop: 'sex'
+          }, {
+            label: '电话',
+            cell: true,
+            prop: 'sex'
+          }, {
+            label: '箱号',
+            cell: true,
+            prop: 'sex'
+          }, {
+            label: '陆运费',
+            cell: true,
+            prop: 'sex'
+          }, {
+            label: '陆运费',
+            cell: true,
+            prop: 'sex'
+          }, {
+            label: '是否派车',
+            cell: true,
+            prop: 'sex'
+          }, {
+            label: '备注',
+            cell: true,
+            prop: 'sex'
+          }
+        ]
+      },
+      entrustOptionTwo: {
+        align: 'center',
+        menuAlign: 'center',
+        index:true,
+        cellBtn:true,
+        addBtn:false,
+        addRowBtn:true,
+        column: [
+          {
+            label: '车队',
+            cell: true,
+            prop: 'name'
+          }, {
+            label: '尺寸箱形',
+            cell: true,
+            prop: 'sex'
+          }, {
+            label: '箱量',
+            cell: true,
+            prop: 'sex'
+          }, {
+            label: '重量',
+            cell: true,
+            prop: 'sex'
+          }, {
+            label: '车号',
+            cell: true,
+            prop: 'sex'
+          }, {
+            label: '司机',
+            cell: true,
+            prop: 'sex'
+          }, {
+            label: '电话',
+            cell: true,
+            prop: 'sex'
+          }, {
+            label: '陆运费(D)',
+            cell: true,
+            prop: 'sex'
+          }, {
+            label: '陆运费(C)',
+            cell: true,
+            prop: 'sex'
+          }, {
+            label: '指派车队',
+            cell: true,
+            prop: 'sex'
+          }, {
+            label: '备注',
+            cell: true,
+            prop: 'sex'
+          }
+        ]
+      }
+    };
+  },
+  methods: {
+    //地址新增
+    addAddress(){
+      this.tableData.push({})
+    },
+    backToList(){
+      this.$emit('backToList')
+    }
+  }
+}
+</script>
+<style scoped>
+
+</style>

src/views/landTransportation/dispatchingCars/index.vue

@@ -0,0 +1,56 @@
+<template>
+  <div>
+    <basic-container v-if="show">
+      <avue-crud :data="dataList" ref="crud" :option="option">
+        <template slot="menuLeft" slot-scope="{size}">
+          <el-button type="primary" :size="size" @click="rowSave">新增</el-button>
+        </template>
+      </avue-crud>
+    </basic-container>
+    <detail-page v-else @backToList="backToList"></detail-page>
+  </div>
+</template>
+
+<script>
+import detailPage from './detailPage'
+export default {
+  name: "index",
+  components: {
+    detailPage
+  },
+  data(){
+    return{
+      show:true,
+      dataList:[
+        {fileName:'222222222'}
+      ],
+      option:{
+        align:'center',
+        index: true,
+        addBtn: false,
+        column:[{
+            label: '订单号',
+            prop: 'fileName',
+            index: 1,
+            width: 140,
+            cell: true,
+            overHidden: true,
+            search:true,
+          }]
+      }
+    }
+  },
+  methods:{
+    rowSave(){
+      this.show = false
+    },
+    backToList(){
+      this.show = true
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/landTransportation/placeAnOrder/detailPage.vue

@@ -16,7 +16,7 @@
           :disabled="disabled"
           size="small"
           @click="editCustomer"
-      >{{ form.id ? "确认修改" : "确认新增" }}
+      >保存
       </el-button>
     </div>
     <containerTitle title="起止地信息" style="margin-top: 50px"></containerTitle>
@@ -24,45 +24,78 @@
       <el-table
           ref="singleTable"
           :data="tableData"
+          size="mini"
+          :header-cell-style="{color:'#000'}"
           highlight-current-row
           style="width: 100%">
         <el-table-column
             property="date"
             align="center"
-            width="120">
+            width="40">
+          <template slot-scope="scope">
+            <el-tooltip class="item" effect="dark" content="增加途径地址" placement="top">
+              <el-button type="primary" icon="el-icon-plus" size="mini" circle
+                         v-if="(scope.$index+1) === tableData.length" @click="addAddress"></el-button>
+            </el-tooltip>
+          </template>
         </el-table-column>
         <el-table-column
             property="date"
             label="省份"
             align="center"
             width="120">
+          <template slot-scope="scope">
+            <el-select v-model="scope.row.date" filterable size="small" placeholder="请选择">
+              <el-option label="北京" value="1"></el-option>
+              <el-option label="山东" value="2"></el-option>
+              <el-option label="天津" value="3"></el-option>
+            </el-select>
+          </template>
         </el-table-column>
         <el-table-column
             property="name"
             label="城市"
             align="center"
             width="120">
+          <template slot-scope="scope">
+            <el-select v-model="scope.row.name" filterable size="small" placeholder="请选择">
+              <el-option label="测试城市0" value="1"></el-option>
+              <el-option label="测试城市1" value="2"></el-option>
+              <el-option label="测试城市2" value="3"></el-option>
+            </el-select>
+          </template>
         </el-table-column>
         <el-table-column
             property="address"
             align="center"
+            width="160"
             label="区/县">
+          <template slot-scope="scope">
+            <el-select v-model="scope.row.name" filterable size="small" placeholder="请选择">
+              <el-option label="测试城市0" value="1"></el-option>
+              <el-option label="测试城市1" value="2"></el-option>
+              <el-option label="测试城市2" value="3"></el-option>
+            </el-select>
+          </template>
         </el-table-column>
         <el-table-column
             property="address"
             align="center"
             label="详细地址">
+          <template slot-scope="scope">
+            <el-input v-model="scope.row.address" size="small" placeholder="请输入内容"></el-input>
+          </template>
         </el-table-column>
       </el-table>
     </basic-container>
-    <containerTitle title="委托"></containerTitle>
+    <containerTitle title="箱信息"></containerTitle>
     <basic-container>
       <avue-crud :data="entrustList" :option="entrustOptionTwo"></avue-crud>
     </basic-container>
     <containerTitle title="货物信息"></containerTitle>
     <basic-container>
-      货物信息
-<!--      <avue-form :option="option" v-model="form"></avue-form>-->
+      <avue-form :option="goodsOptionForm" v-model="goodsForm"></avue-form>
+      <avue-crud :data="goodsList" :option="goodsOptionCrud"></avue-crud>
     </basic-container>
   </div>
 </template>
@@ -71,41 +104,107 @@
 export default {
   data() {
     return {
-      form:{},
+      form: {},
+      goodsForm: {},
       tableData: [{
         date: '2016-05-02',
         name: '王小虎',
         address: '上海市普陀区金沙江路 1518 弄'
+      }, {
+        date: '2016-05-02',
+        name: '王小虎',
+        address: '上海市普陀区金沙江路 1518 弄'
       }],
-      entrustList:[],
-      entrustOptionTwo:{
-        align:'center',
-        menuAlign:'center',
-        column:[
+      entrustList: [],
+      goodsOptionForm: {
+        menuBtn:false,
+        column: [
           {
-            label:'尺寸',
-            prop:'name'
-          },{
-            label:'箱型',
-            prop:'sex'
-          },{
-            label:'箱量',
-            prop:'sex'
-          },{
-            label:'总重量(dun)',
-            prop:'sex'
-          },{
-            label:'陆运费',
-            prop:'sex'
-          },{
-            label:'备注',
-            prop:'sex'
+            label: '提单号',
+            prop: 'name'
+          }, {
+            label: '场站',
+            prop: 'sex'
+          }, {
+            label: '到厂时间',
+            prop: 'sex'
+          }, {
+            label: '工厂名称',
+            prop: 'sex'
+          }, {
+            label: '货物名称',
+            prop: 'sex'
+          }, {
+            label: '备注',
+            prop: 'sex'
+          }
+        ]
+      },
+      goodsList:[],
+      goodsOptionCrud: {
+        index:true,
+        cellBtn:true,
+        addBtn:false,
+        addRowBtn:true,
+        column: [{
+            label: '尺寸箱型',
+            cell: true,
+            prop: 'sex'
+          }, {
+            label: '箱量',
+            cell: true,
+            prop: 'sex'
+          }, {
+            label: '是否派箱',
+            cell: true,
+            prop: 'sex'
+          }, {
+            label: '车队是否受理',
+            cell: true,
+            prop: 'sex'
+          }
+        ]
+      },
+      entrustOptionTwo: {
+        align: 'center',
+        menuAlign: 'center',
+        index:true,
+        cellBtn:true,
+        addBtn:false,
+        addRowBtn:true,
+        column: [ {
+            label: '尺寸箱型',
+            cell: true,
+            prop: 'sex'
+          }, {
+            label: '箱量',
+            cell: true,
+            prop: 'sex'
+          }, {
+            label: '总重量(吨)',
+            cell: true,
+            prop: 'sex'
+          }, {
+            label: '陆运费',
+            cell: true,
+            prop: 'sex'
+          }, {
+            label: '备注',
+            cell: true,
+            prop: 'sex'
           }
         ]
       }
     };
   },
   methods: {
+    //地址新增
+    addAddress(){
+      this.tableData.push({})
+    },
+    backToList() {
+      this.$emit('backToList')
+    }
   }
 }
 </script>

src/views/landTransportation/placeAnOrder/index.vue

@@ -7,7 +7,7 @@
         </template>
       </avue-crud>
     </basic-container>
-    <detail-page v-else></detail-page>
+    <detail-page v-else @backToList="backToList"></detail-page>
   </div>
 </template>
 
@@ -44,6 +44,9 @@ export default {
     rowSave(){
       this.show = false
     },
+    backToList(){
+      this.show = true
+    }
   }
 }
 </script>