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

src/api/landTransportation/index.js

@@ -197,7 +197,7 @@ export function getCorp() {
 //查询业务员
 export function getSalesman(data) {
     return request({
-        url: '/api/blade-client/corpsattn/all-list',
+        url: '/api/blade-user/userList',
         method: 'get',
         params:data
     })

src/components/finance/financialAccount.vue

@@ -137,7 +137,18 @@
             @input="amountChange(row)"
             style="width: 100%"
           />
-          <span v-else>{{ row.quantity }}</span>
+          <span v-else>{{ Number(row.quantity).toFixed(2) }}</span>
+        </template>
+        <template slot-scope="{row,index}" slot="amount">
+          <el-input-number
+            v-if="row.$cellEdit"
+            v-model="row.amount"
+            size="small"
+            :controls="false"
+            :precision="2"
+            style="width: 100%"
+          />
+          <span v-else>{{ Number(row.amount).toFixed(2) }}</span>
         </template>
       </avue-crud>
       <div class="dialogButton">
@@ -326,6 +337,7 @@
       }
     },
     created() {
+      this.option.height = window.innerHeight - 240;
       this.historyOption.searchShow = false
       customerList({
         size: 10000,

src/views/businessManagement/deliveryNotice/configuration/customerContact.json

@@ -16,7 +16,7 @@
   "dialogWidth": "60%",
   "tree": true,
   "border": true,
-  "index": false,
+  "index": true,
   "selection": true,
   "menuWidth": 130,
   "dialogClickModal": false,
@@ -42,21 +42,6 @@
   ],
   "column":[
     {
-      "label": "排序",
-      "prop": "sort",
-      "type": "number",
-      "index": 1,
-      "width":100,
-      "cell": true,
-      "overHidden": true,
-      "rules": [
-        {
-          "required": true,
-          "message": "请输入排序",
-          "trigger": "blur"
-        }
-      ]
-    },{
       "label": "类别",
       "prop": "priceCategory",
       "index": 2,

src/views/businessManagement/purchaseOrder/configuration/customerContact.json

@@ -16,7 +16,7 @@
   "dialogWidth": "60%",
   "tree": true,
   "border": true,
-  "index": false,
+  "index": true,
   "selection": true,
   "menuWidth": 130,
   "dialogClickModal": false,
@@ -35,21 +35,6 @@
   ],
   "column":[
     {
-      "label": "排序",
-      "prop": "sort",
-      "type": "number",
-      "index": 1,
-      "width":100,
-      "cell": true,
-      "overHidden": true,
-      "rules": [
-        {
-          "required": true,
-          "message": "请输入排序",
-          "trigger": "blur"
-        }
-      ]
-    },{
       "label": "商品类别",
       "prop": "priceCategory",
       "index": 1,

src/views/businessManagement/purchaseOrder/detailsPageEdit.vue

@@ -1504,29 +1504,11 @@ export default {
           price: e.price,
           unit: e.unit,
           quantity: e.orderQuantity,
+          srcFeesId: e.id,
           costType: this.feesOption.find(e => e.cname == '货款')? this.feesOption.find(e => e.cname == '货款').id: null,
         }
         arr.push(form)
       })
-      //采购明细提单号 list
-      // this.billData = {
-      //   belongCompany: this.form.belongCompany,
-      //   srcOrderno:this.form.orderNo,
-      //   itemType:"采购",
-      //   corpsName:this.form.corpsName,
-      //   corpId:this.form.corpId,
-      //   srcParentId: this.form.id,
-      //   currency: 'CNY',
-      //   exchangeRate: '1',
-      //   taxRate: '0',
-      //   accDate: this.form.businesDate,
-      //   srcType: 1, // 1.采购or销售主表货款申请 2. 采购or销售-费用明细申请  3.收发货-费用明细
-      //   tradeType: 'GN',
-      //   optionType: 'GN',
-      //   amount: this.form.orderAmount,
-      //   costType: this.feesOption.find(e => e.cname == '货款')? this.feesOption.find(e => e.cname == '货款').id: null,
-      // }
-      // arr.push(this.billData)
       let getFeeList = this.$refs.feeInfo.submitData().filter(item => item.feesType == 2)
       getFeeList.forEach(item => {
         let form = {
@@ -1547,6 +1529,8 @@ export default {
           amount: item.amount,
           costType: item.itemId,
           srcFeesId: item.id,
+          quantity: item.quantity, // 数量
+          price: item.price,
         }
         arr.push(form)
       })

src/views/businessManagement/receipt/configuration/customerContact.json

@@ -16,7 +16,7 @@
   "dialogWidth": "60%",
   "tree": true,
   "border": true,
-  "index": false,
+  "index": true,
   "selection": true,
   "menuWidth": 130,
   "dialogClickModal": false,
@@ -34,21 +34,6 @@
   ],
   "column":[
     {
-      "label": "排序",
-      "prop": "sort",
-      "type": "number",
-      "index": 1,
-      "width":100,
-      "cell": true,
-      "overHidden": true,
-      "rules": [
-        {
-          "required": true,
-          "message": "请输入排序",
-          "trigger": "blur"
-        }
-      ]
-    },{
       "label": "类别",
       "prop": "priceCategory",
       "type": "number",

src/views/businessManagement/salesOrder/configuration/customerContact.json

@@ -16,7 +16,7 @@
   "dialogWidth": "60%",
   "tree": true,
   "border": true,
-  "index": false,
+  "index": true,
   "selection": true,
   "menuWidth": 130,
   "dialogClickModal": false,
@@ -38,23 +38,7 @@
       "decimals": 0
     }
   ],
-  "column":[
-    {
-      "label": "排序",
-      "prop": "sort",
-      "type": "number",
-      "index": 1,
-      "width":100,
-      "cell": true,
-      "overHidden": true,
-      "rules": [
-        {
-          "required": true,
-          "message": "请输入排序",
-          "trigger": "blur"
-        }
-      ]
-    },{
+  "column":[{
       "label": "产品分类",
       "prop": "priceCategory",
       "index": 1,

src/views/businessManagement/salesOrder/detailsPageEdit.vue

@@ -2136,31 +2136,11 @@ export default {
           price: e.price,
           unit: e.unit,
           goodName: e.cname,
+          srcFeesId: e.id,
           costType: this.feesOption.find(e => e.cname == '货款')? this.feesOption.find(e => e.cname == '货款').id: null,
         }
         arr.push(form)
       })
-      // this.billData = {
-      //   belongCompany: this.form.belongCompany,
-      //   srcOrderno:this.form.orgOrderNo,
-      //   itemType:"销售",
-      //   corpsName:this.form.corpName,
-      //   corpId:this.form.corpId,
-      //   srcParentId: this.form.id,
-      //   currency: 'CNY',
-      //   exchangeRate: '1',
-      //   taxRate: '0',
-      //   accDate: this.form.businesDate,
-      //   srcType: 1,
-      //   tradeType: 'GN',
-      //   optionType: 'GN',
-      //   chargeMember: this.form.chargeMember,
-      //   amount: this.form.balanceAmount,
-      //   quantity: 0, // 数量
-      //   price: 0,
-      //   costType: this.feesOption.find(e => e.cname == '货款')? this.feesOption.find(e => e.cname == '货款').id: null,
-      // }
-      // arr.push(this.billData)
       let getFeeList = this.$refs.feeInfo.submitData().filter(item => item.feesType == 1)
       getFeeList.forEach(item => {
         let form = {
@@ -2181,6 +2161,8 @@ export default {
           amount: item.amount,
           costType: item.itemId,
           srcFeesId: item.id,
+          quantity: item.quantity, // 数量
+          price: item.price,
         }
         arr.push(form)
       })
@@ -2360,7 +2342,6 @@ export default {
     },
     //确认导入触发
     async importGoods() {
-      this.saveLoading = true;
       if (this.goodsListSave.length > 0) {
         this.goodsListSaveHandle()
       } else {
@@ -2370,6 +2351,7 @@ export default {
       }
     },
     goodsListSaveHandle() {
+      this.saveLoading = true;
       for (let item in this.goodsListSave) {
         getMarketPrice({code: this.goodsListSave[item].code, isFreight: this.form.isFreight, isLabel: this.form.isLabel}).then(res => {
           if (res.data.data.length > 0) {
@@ -2438,6 +2420,7 @@ export default {
       this.dialogVisible = false
     },
     tableDataHandle() {
+      this.saveLoading = true;
       for (let item=0;item<this.tableData.length;item++) {
         getMarketPrice({code: this.tableData[item].code, isFreight: this.form.isFreight, isLabel: this.form.isLabel}).then(res => {
           if (res.data.data.length > 0) {
@@ -3006,7 +2989,15 @@ export default {
       // let caseOverPayment = this.form.caseOverPayment? this.form.caseOverPayment: 0
       // 本次试用返利
       let thisUsedProfit = this.form.thisUsedProfit? this.form.thisUsedProfit: 0
-      this.$set(this.form, 'debitAmount', ((Number(orderAmount) - Number(thisUsedProfit)).toFixed(2)))
+      let feeAmountD = 0; //费用明细应收
+      let feeAmountC = 0; //费用明细应付
+      this.$refs.feeInfo.submitData().filter(item => item.feesType == 1).forEach(item => {
+        feeAmountD += Number(item.amount)
+      })
+      this.$refs.feeInfo.submitData().filter(item => item.feesType == 2).forEach(item => {
+        feeAmountC += Number(item.amount)
+      })
+      this.$set(this.form, 'debitAmount', ((Number(orderAmount) - Number(thisUsedProfit) + Number(feeAmountD) - Number(feeAmountC)).toFixed(2)))
       this.$set(this.form, "balanceAmount", (Number(this.form.debitAmount) - Number(settlmentAmount)).toFixed(2));
     },
     quantityChange(row) {

src/views/financialManagement/paymentRequest/paymentRequestDetails.vue

@@ -236,7 +236,7 @@
 <script>
   import itemOption from "./configuration/detailsPage.json";
   import { contrastObj,contrastList } from "@/util/contrastData";
-  import { getDetails, paymentCheck,getlistBankBy,saveOrEdit } from "@/api/financialManagement/paymentRequest";
+  import { getDetails, paymentCheck,getlistBankBy,saveOrEdit, deleteDetail } from "@/api/financialManagement/paymentRequest";
   import checkSchedule from "../../../components/check/checkSchedule";
   import check from "@/components/check/check";
   import { cancelCheck } from "@/api/check/check";
@@ -526,7 +526,27 @@
         this.$refs.crud.rowCell(row, index)
       },
       rowDel(row,index){
-        this.dataList.splice(index, 1);
+        this.$confirm("确定删除数据?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          if (row.id) {
+            deleteDetail({ids: row.id}).then(res => {
+              this.$message({
+                type: 'success',
+                message: '删除成功！'
+              })
+              this.dataList.splice(row.$index, 1);
+            })
+          } else {
+            this.$message({
+              type: "success",
+              message: "删除成功!"
+            });
+            this.dataList.splice(row.$index, 1);
+          }
+        });
       },
       //打开审核
       openCheckDialog(){

src/views/landTransportation/dispatchingCars/detailPage.vue

@@ -11,75 +11,7 @@
         </el-button>
       </div>
     </div>
-    <containerTitle
-        title="起止地信息"
-        style="margin-top: 50px"></containerTitle>
-    <basic-container>
-      <el-table
-          ref="singleTable"
-          :data="tableData"
-          size="mini"
-          :header-cell-style="{color:'#000',background:'#fafafa'}"
-          style="width: 100%">
-        <el-table-column
-            property="date"
-            align="center"
-            width="40">
-          <template slot-scope="scope">
-            <span v-if="scope.$index == 0">
-              <el-button type="primary" size="mini" circle>起</el-button>
-            </span>
-            <span v-else-if="scope.$index === tableData.length-1">
-              <el-button type="success" size="mini" circle>止</el-button>
-            </span>
-            <span v-else>
-              <el-button v-if="goodsForm.status === 1" type="warning" size="mini" circle>途</el-button>
-              <el-tooltip v-else class="item" effect="dark" content="删除" placement="right">
-                  <el-button type="danger" icon="el-icon-delete" size="mini" circle
-                             @click="deleteAddress(scope)"></el-button>
-              </el-tooltip>
-            </span>
-          </template>
-        </el-table-column>
-        <el-table-column
-            type="index"
-            label="序号"
-            align="center"
-            width="60">
-        </el-table-column>
-        <el-table-column
-            property="corpName"
-            label="发货工厂"
-            align="center"
-            show-overflow-tooltip
-            width="280">
-        </el-table-column>
-        <el-table-column
-            property="province"
-            label="省市区"
-            align="center"
-            width="280">
-          <template slot-scope="scope">
-            <el-cascader
-                size="small"
-                style="width: 100%;"
-                v-model="scope.row.region"
-                disabled
-                :props="treeOption"></el-cascader>
-          </template>
-        </el-table-column>
-        <el-table-column
-            property="address"
-            align="center"
-            show-overflow-tooltip
-            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="委托信息" style="margin-top: 50px"></containerTitle>
     <basic-container>
       <avue-form :option="goodsOptionForm" v-model="goodsForm">
         <template slot-scope="scope" slot="corpId">
@@ -149,6 +81,90 @@
         </template>
       </avue-form>
     </basic-container>
+    <containerTitle
+        title="起止地信息"></containerTitle>
+    <basic-container>
+      <el-table
+          ref="singleTable"
+          :data="tableData"
+          size="mini"
+          :header-cell-style="{color:'#000',background:'#fafafa'}"
+          style="width: 100%">
+        <el-table-column
+            property="date"
+            align="center"
+            width="40">
+          <template slot-scope="scope">
+            <span v-if="scope.$index == 0">
+              <el-button type="primary" size="mini" circle>起</el-button>
+            </span>
+            <span v-else-if="scope.$index === tableData.length-1">
+              <el-button type="success" size="mini" circle>止</el-button>
+            </span>
+            <span v-else>
+              <el-button v-if="goodsForm.status === 2" type="warning" size="mini" circle>途</el-button>
+              <el-tooltip v-else class="item" effect="dark" content="删除" placement="right">
+                  <el-button type="danger" icon="el-icon-delete" size="mini" circle
+                             @click="deleteAddress(scope)"></el-button>
+              </el-tooltip>
+            </span>
+          </template>
+        </el-table-column>
+        <el-table-column
+            type="index"
+            label="序号"
+            align="center"
+            width="60">
+        </el-table-column>
+        <el-table-column
+            property="corpName"
+            label="发货工厂"
+            align="center"
+            show-overflow-tooltip
+            width="200">
+        </el-table-column>
+        <!--        <el-table-column-->
+        <!--            property="province"-->
+        <!--            label="省市区"-->
+        <!--            align="center"-->
+        <!--            width="280">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            <el-cascader-->
+        <!--                size="small"-->
+        <!--                style="width: 100%;"-->
+        <!--                v-model="scope.row.region"-->
+        <!--                disabled-->
+        <!--                :props="treeOption"></el-cascader>-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <el-table-column
+            property="contacts"
+            align="center"
+            width="150"
+            show-overflow-tooltip
+            label="联系人">
+        </el-table-column>
+        <el-table-column
+            property="tel"
+            align="center"
+            width="180"
+            show-overflow-tooltip
+            label="电话">
+        </el-table-column>
+        <el-table-column
+            property="address"
+            align="center"
+            show-overflow-tooltip
+            label="详细地址">
+        </el-table-column>
+        <el-table-column
+            property="remarks"
+            align="center"
+            show-overflow-tooltip
+            label="备注">
+        </el-table-column>
+      </el-table>
+    </basic-container>
     <containerTitle title="车辆信息"></containerTitle>
     <basic-container>
       <avue-crud
@@ -621,7 +637,7 @@ export default {
             width: 200,
             prop: 'fleetId'
           }, {
-            label: '到厂时间',
+            label: '货运日期',
             type: "datetime",
             cell: true,
             format: 'yyyy-MM-dd HH:mm:ss',
@@ -641,19 +657,21 @@ export default {
             prop: 'quantity',
             type: 'number',
             precision:0
-          }, {
-            label: '包装',
-            width: 100,
-            overHidden: true,
-            cell: true,
-            prop: 'packing',
-            type: 'select',
-            dicUrl: "/api/blade-system/dict-biz/dictionary?code=packaging",
-            props: {
-              label: "dictValue",
-              value: "dictValue"
-            },
-          }, {
+          }
+          // , {
+          //   label: '包装',
+          //   width: 100,
+          //   overHidden: true,
+          //   cell: true,
+          //   prop: 'packing',
+          //   type: 'select',
+          //   dicUrl: "/api/blade-system/dict-biz/dictionary?code=packaging",
+          //   props: {
+          //     label: "dictValue",
+          //     value: "dictValue"
+          //   },
+          // }
+          , {
             label: '尺码',
             width: 100,
             overHidden: true,
@@ -790,82 +808,135 @@ export default {
         disabled: true,
         span: 8,
         column: [{
-          label: '客户名称',
+          label: '公司名称',
           formslot: true,
-          prop: 'corpId'
+          prop: 'corpId',
+          rules: [{
+            required: true,
+            message: " ",
+            trigger: "change"
+          }],
         }, {
-          label: '提单号',
-          prop: 'billNo'
+          label: '业务员',
+          prop: 'salesman',
+          rules: [{
+            required: true,
+            message: " ",
+            trigger: "blur"
+          }]
         }, {
-          label: '到厂时间',
+          label: '业务员部门',
+          prop: 'salesmanDept',
+          type: "tree",
+          filter: false,
+          dicData: [],
+          props: {
+            label: "title"
+          }
+        }, {
+          label: '委托日期',
+          prop: 'bsDate',
           type: "datetime",
           format: 'yyyy-MM-dd HH:mm:ss',
           valueFormat: 'yyyy-MM-dd HH:mm:ss',
-          prop: 'arrivalTime'
         }, {
-          label: '订单号',
-          prop: 'orderNo',
-          disabled: true
+          label: '联系电话',
+          prop: 'tel'
         }, {
-          label: '场站',
-          prop: 'station'
+          label: '票据号',
+          prop: 'receiptNo'
         }, {
-          label: '业务员',
-          prop: 'salesman',
-          type: 'select',
-          dicUrl: "/api/blade-client/corpsattn/all-list",
-          props: {
-            label: "cname",
-            value: "id"
-          },
-        }]
-      },
-      goodsOptionFormTwo: {
-        menuBtn: false,
-        disabled: true,
-        span: 8,
-        column: [{
-          label: '所属公司',
-          formslot: true,
-          prop: 'belongCompany',
+          label: '提单号',
+          prop: 'billNo',
           rules: [{
-            required: false,
+            required: true,
             message: " ",
             trigger: "blur"
           }],
         }, {
-          label: '船名航次',
-          prop: 'factory'
-        }, {
-          label: '货物名称',
-          prop: 'goods'
-        }, {
-          label: '订舱代理',
-          prop: 'agentId'
-        }, {
-          label: '起运港',
-          prop: 'polId'
-        }, {
-          label: '目的港',
-          prop: 'podId'
-        }, {
-          label: '开船日期',
-          prop: 'etd',
-          type: 'date'
-        }, {
-          label: '截关日期',
-          prop: 'etc',
-          type: 'date'
+          label: '入货场站',
+          prop: 'station',
+          rules: [{
+            required: true,
+            message: " ",
+            trigger: "blur"
+          }],
         }, {
-          label: '截单日期',
-          prop: 'siCutoffDate',
-          type: 'date'
+          label: '货运日期',
+          type: "datetime",
+          format: 'yyyy-MM-dd HH:mm:ss',
+          valueFormat: 'yyyy-MM-dd HH:mm:ss',
+          prop: 'arrivalTime',
+          rules: [{
+            required: true,
+            message: " ",
+            trigger: "blur"
+          }],
         }, {
           label: '备注',
           span: 24,
           prop: 'remarks'
-        }
-        ]
+        }]
+      },
+      goodsOptionFormTwo: {
+        menuBtn: false,
+        disabled: true,
+        span: 8,
+        column: [
+          // {
+          //   label: '所属公司',
+          //   formslot: true,
+          //   prop: 'belongCompany',
+          //   rules: [{
+          //     required: false,
+          //     message: " ",
+          //     trigger: "blur"
+          //   }],
+          // },
+          {
+            label: '船名航次',
+            prop: 'factory',
+            rules: [{
+              required: false,
+              message: " ",
+              trigger: "blur"
+            }],
+          }
+          // , {
+          //   label: '货物名称',
+          //   prop: 'goods',
+          //   rules: [{
+          //     required: false,
+          //     message: " ",
+          //     trigger: "blur"
+          //   }],
+          // }
+          , {
+            label: '开船日期',
+            prop: 'etd',
+            type: 'date'
+          }, {
+            label: '截港日期',
+            prop: 'etc',
+            type: 'date'
+          }, {
+            label: '起运港',
+            prop: 'polId'
+          }, {
+            label: '目的港',
+            prop: 'podId'
+          }, {
+            label: '预配箱量',
+            prop: 'expectCtnQty',
+            type: 'date'
+          }, {
+            label: '截单日期',
+            prop: 'siCutoffDate',
+            type: 'date'
+          }, {
+            label: '订舱代理',
+            prop: 'agentId'
+          }]
       },
       entrustOptionTwo: {
         align: 'center',
@@ -1106,9 +1177,9 @@ export default {
         delete this.goodsForm.orderAddressList
         delete this.goodsForm.orderItemList
         delete this.goodsForm.orderFeeList
-        this.tableData.forEach(item => {
-          if (item.region) item.region = item.region.split(',')
-        })
+        // this.tableData.forEach(item => {
+        //   if (item.region) item.region = item.region.split(',')
+        // })
       })
     }
     this.$refs.other.show = false
@@ -1214,9 +1285,9 @@ export default {
         delete this.goodsForm.orderAddressList
         delete this.goodsForm.orderItemList
         delete this.goodsForm.orderFeeList
-        this.tableData.forEach(item => {
-          if (item.region) item.region = item.region.split(',')
-        })
+        // this.tableData.forEach(item => {
+        //   if (item.region) item.region = item.region.split(',')
+        // })
       })
     },
     //切换收付费
@@ -1333,9 +1404,9 @@ export default {
     //保存
     editCustomer() {
       let data = JSON.parse(JSON.stringify(this.tableData))
-      data.forEach(item => {
-        if (item.region.length !== 0) item.region = item.region.join(',')
-      })
+      // data.forEach(item => {
+      //   if (item.region.length !== 0) item.region = item.region.join(',')
+      // })
       saveDelegationList({
         ...this.goodsForm,
         kind: '2',
@@ -1416,6 +1487,12 @@ export default {
   }
 }
 </script>
-<style scoped>
+<style scoped lang="scss">
+::v-deep .el-form-item {
+  margin-bottom: 8px;
+}
 
+::v-deep .el-form-item__content{
+  line-height: 32px;
+}
 </style>

src/views/landTransportation/dispatchingCars/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <basic-container v-if="show">
+    <basic-container v-show="show">
       <div class="home-container">
         <div style="display: flex;justify-content: center;">
           <div class="content">
@@ -49,7 +49,7 @@
         </div>
       </div>
     </basic-container>
-    <basic-container v-if="show">
+    <basic-container v-show="show">
       <avue-crud
           :table-loading="loading"
           :data="dataList"
@@ -95,7 +95,7 @@
         </template>
       </avue-crud>
     </basic-container>
-    <detail-page v-else @backToList="backToList" :id="id"></detail-page>
+    <detail-page v-if="!show" @backToList="backToList" :id="id"></detail-page>
   </div>
 </template>
 
@@ -135,99 +135,117 @@ export default {
         height: "auto",
         searchSpan: 8,
         searchIcon: true,
-        column: [
+        column:[
           {
-            label: '状态',
-            prop: 'itemStatusDetail',
-            index: 1,
+            label: '货运日期',
+            prop: 'arrivalTime',
             overHidden: true,
-            width: 140
+            type: "date",
+            searchRange: true,
+            defaultTime:['00:00:00', '23:59:59'],
+            format: "yyyy-MM-dd HH:mm:ss",
+            valueFormat: "yyyy-MM-dd HH:mm:ss",
+            index: 1,
+            width: 150,
+            search: true,
           }, {
-            label: '订单号',
-            prop: 'orderNo',
+            label: '业务员',
             index: 2,
-            overHidden: true,
-            width: 160,
+            width: 150,
+            prop: 'salesman',
             search: true,
-          }, {
-            label: '客户名称',
-            prop: 'corpName',
             overHidden: true,
-            index: 3,
-            width: 140,
-            search: true,
+            type: "select",
+            dicUrl: "/api/blade-user/userList",
+            props: {
+              label: "realName",
+              value: "id"
+            }
           }, {
-            label: '所属公司',
-            prop: 'belongCompany',
-            overHidden: true,
-            index: 4,
+            label: '货运地点',
+            prop: 'addressDetail',
+            index: 3,
             width: 140,
             search: true,
           }, {
             label: '提单号',
             prop: 'billNo',
-            index: 5,
+            index: 4,
             overHidden: true,
             width: 140,
             search: true,
           }, {
-            label: '货物名称',
-            prop: 'goods',
+            label: '入货场站',
+            prop: 'station',
             overHidden: true,
-            index: 6,
-            width: 140,
-            search: true,
-          }, {
-            label: '路线',
-            prop: 'addressDetail',
-            index: 7,
+            index: 5,
             width: 140,
             search: true,
-          }, {
+          },{
             label: '计划箱量',
             prop: 'ctnDetail',
             overHidden: true,
-            index: 8,
-            width: 140,
-            search: true,
-          }, {
+            index: 6,
+            width: 140
+          },{
             label: '已派箱量',
             prop: 'dispatchCtnDetail',
             overHidden: true,
-            index: 9,
-            width: 140,
-            search: true,
-          }, {
+            index: 7,
+            width: 140
+          },{
             label: '受理箱量',
             prop: 'sendCtnDetail',
             overHidden: true,
-            index: 10,
+            index: 8,
+            width: 140
+          },{
+            label: '运费',
+            index: 9,
             width: 140,
+            prop: 'freight'
+          },{
+            label: '订单号',
+            prop: 'orderNo',
+            index: 10,
+            overHidden: true,
+            width: 160,
             search: true,
           }, {
-            label: '场站',
-            prop: 'station',
-            overHidden: true,
+            label: '状态',
+            prop: 'itemStatusDetail',
             index: 11,
-            width: 140,
-            search: true,
+            overHidden: true,
+            width: 140
           }, {
-            label: '到厂时间',
-            prop: 'arrivalTime',
+            label: '公司名称',
+            prop: 'corpName',
             overHidden: true,
-            type: "date",
-            searchRange: true,
-            defaultTime: ['00:00:00', '23:59:59'],
-            format: "yyyy-MM-dd HH:mm:ss",
-            valueFormat: "yyyy-MM-dd HH:mm:ss",
             index: 12,
             width: 140,
             search: true,
-          }, {
+          }
+          // , {
+          //   label: '所属公司',
+          //   prop: 'belongCompany',
+          //   overHidden: true,
+          //   index: 4,
+          //   width: 140,
+          //   search: true,
+          // }
+          // , {
+          //   label: '货物名称',
+          //   prop: 'goods',
+          //   overHidden: true,
+          //   index: 13,
+          //   width: 140,
+          //   search: true,
+          // }
+          ,{
             label: '船名航次',
             prop: 'factory',
             overHidden: true,
-            index: 13,
+            index: 14,
             width: 140,
             search: true,
           }, {
@@ -236,10 +254,10 @@ export default {
             prop: 'createTime',
             type: "date",
             searchRange: true,
-            defaultTime: ['00:00:00', '23:59:59'],
+            defaultTime:['00:00:00', '23:59:59'],
             format: "yyyy-MM-dd HH:mm:ss",
             valueFormat: "yyyy-MM-dd HH:mm:ss",
-            index: 14,
+            index: 15,
             width: 140,
             search: true,
           }]
@@ -370,7 +388,7 @@ export default {
       this.onLoad(this.page)
     },
     ToBreak (val) {
-      if (val)return val.replace('\n', '<br/>')
+      if (val)return val.replace(/\n/g, '<br/>')
     }
   }
 }

src/views/landTransportation/driver/index.vue

@@ -238,24 +238,85 @@ export default {
             decimals: 2
           }],
         column: [{
-          label: '状态',
+          label: '货运日期',
+          prop: 'arrivalTime',
+          overHidden: true,
+          type: "date",
+          searchRange: true,
+          defaultTime: ['00:00:00', '23:59:59'],
+          format: "yyyy-MM-dd HH:mm:ss",
+          valueFormat: "yyyy-MM-dd HH:mm:ss",
+          index: 1,
+          width: 140,
+          search: true,
+        },{
+          label: '实际到厂时间',
+          prop: 'realArrivalTime',
+          overHidden: true,
+          type: "date",
+          searchRange: true,
+          defaultTime: ['00:00:00', '23:59:59'],
+          format: "yyyy-MM-dd HH:mm:ss",
+          valueFormat: "yyyy-MM-dd HH:mm:ss",
+          index: 2,
+          width: 140,
+          search: true,
+        },{
+          label: '完工日期',
+          prop: 'finishedTime',
+          overHidden: true,
+          type: "date",
+          searchRange: true,
+          defaultTime: ['00:00:00', '23:59:59'],
+          format: "yyyy-MM-dd HH:mm:ss",
+          valueFormat: "yyyy-MM-dd HH:mm:ss",
+          index:3,
+          width: 140,
+          search: true,
+        },{
+          label: '货运地点',
+          index: 4,
+          width: 160,
+          search: true,
+          prop: 'addressDetail'
+        },{
+          label: '提单号',
           width: 100,
-          type: 'select',
-          index:1,
+          index:5,
+          search: true,
           overHidden: true,
-          dicUrl: "/api/blade-system/dict-biz/dictionary?code=land_order_status",
+          prop: 'billNo'
+        }, {
+          label: '入货场站',
+          prop: 'station',
+          overHidden: true,
+          index: 6,
+          width: 140,
+          search: true,
+        }, {
+          label: '箱型',
+          width: 100,
+          search: true,
+          index: 7,
+          overHidden: true,
+          prop: 'ctnType',
+          type: 'select',
+          dicUrl: "/api/blade-system/dict-biz/dictionary?code=boxType",
           props: {
             label: "dictValue",
-            value: "dictKey"
+            value: "dictValue"
           },
-          dataType: "string",
-          prop: 'status'
         }, {
+          label: '箱量',
+          width: 50,
+          index: 8,
+          prop: 'ctnQuantity'
+        },{
           label: '车号',
           width: 150,
           prop: 'vehicleId',
           overHidden: true,
-          index:4,
+          index:9,
           type: 'select',
           search: true,
           dicUrl: "/api/blade-client/land-vehicle/vehicle-list?fleetId={{key}}",
@@ -263,24 +324,17 @@ export default {
             label: "plateNo",
             value: "id"
           }
-        },{
-          label: '提单号',
-          width: 100,
-          index:2,
-          search: true,
-          overHidden: true,
-          prop: 'billNo'
         }, {
           label: '车队',
           width: 200,
           search: true,
-          index:3,
+          index:10,
           overHidden: true,
           prop: 'fleetId'
         }, {
           label: '司机',
           width: 115,
-          index:5,
+          index:11,
           search: true,
           overHidden: true,
           prop: 'driverId',
@@ -293,62 +347,25 @@ export default {
         }, {
           label: '电话',
           width: 160,
-          index:6,
+          index:12,
           overHidden: true,
           search: true,
           prop: 'tel'
         },{
-          label: '路线',
-          index: 7,
-          width: 160,
-          search: true,
-          prop: 'addressDetail'
-        },{
-          label: '到厂时间',
-          prop: 'arrivalTime',
-          overHidden: true,
-          type: "date",
-          searchRange: true,
-          defaultTime: ['00:00:00', '23:59:59'],
-          format: "yyyy-MM-dd HH:mm:ss",
-          valueFormat: "yyyy-MM-dd HH:mm:ss",
-          index: 8,
-          width: 140,
-          search: true,
-        },{
-          label: '实际到厂时间',
-          prop: 'realArrivalTime',
-          overHidden: true,
-          type: "date",
-          searchRange: true,
-          defaultTime: ['00:00:00', '23:59:59'],
-          format: "yyyy-MM-dd HH:mm:ss",
-          valueFormat: "yyyy-MM-dd HH:mm:ss",
-          index: 9,
-          width: 140,
-          search: true,
-        },{
           label: '货物名称',
           overHidden: true,
           width: 160,
           search: true,
-          index: 10,
+          index: 13,
           prop: 'goods'
         }, {
           label: '箱号',
           cell: true,
           width: 245,
-          index: 11,
+          index: 14,
           overHidden: true,
           search: true,
           prop: 'ctnNo'
-        }, {
-          label: '场站',
-          prop: 'station',
-          overHidden: true,
-          index: 12,
-          width: 140,
-          search: true,
         },{
           label: '制单日期',
           overHidden: true,
@@ -358,35 +375,17 @@ export default {
           defaultTime: ['00:00:00', '23:59:59'],
           format: "yyyy-MM-dd HH:mm:ss",
           valueFormat: "yyyy-MM-dd HH:mm:ss",
-          index: 13,
+          index: 15,
           width: 140,
           search: true,
         },{
           label: '船名航次',
           prop: 'factory',
           overHidden: true,
-          index: 14,
+          index: 16,
           width: 140,
           search: true,
         }, {
-          label: '尺寸箱型',
-          width: 100,
-          search: true,
-          index: 15,
-          overHidden: true,
-          prop: 'ctnType',
-          type: 'select',
-          dicUrl: "/api/blade-system/dict-biz/dictionary?code=boxType",
-          props: {
-            label: "dictValue",
-            value: "dictValue"
-          },
-        }, {
-          label: '箱量',
-          width: 50,
-          index: 16,
-          prop: 'ctnQuantity'
-        }, {
           label: '重量(吨)',
           width: 160,
           prop: 'landWeight',
@@ -424,6 +423,7 @@ export default {
           width: 100,
           precision: 2,
           cell: true,
+          index: 22,
           controls: false,
           type: 'number',
           prop: 'oneFeeC'
@@ -432,6 +432,7 @@ export default {
           width: 100,
           precision: 2,
           cell: true,
+          index: 23,
           controls: false,
           type: 'number',
           prop: 'twoFeeC'
@@ -440,12 +441,14 @@ export default {
           width: 100,
           precision: 2,
           cell: true,
+          index: 24,
           controls: false,
           type: 'number',
           prop: 'threeFeeC'
         }, {
           label: '待时费',
           width: 100,
+          index: 25,
           precision: 2,
           cell: true,
           controls: false,
@@ -455,6 +458,7 @@ export default {
           label: '其他',
           width: 100,
           precision: 2,
+          index: 26,
           cell: true,
           type: 'number',
           controls: false,
@@ -462,8 +466,22 @@ export default {
         }, {
           label: '费用备注',
           width: 245,
+          index: 27,
           cell: true,
           prop: 'feeRemarksC'
+        },{
+          label: '状态',
+          width: 100,
+          type: 'select',
+          index:28,
+          overHidden: true,
+          dicUrl: "/api/blade-system/dict-biz/dictionary?code=land_order_status",
+          props: {
+            label: "dictValue",
+            value: "dictKey"
+          },
+          dataType: "string",
+          prop: 'status'
         }
         ],
       },
@@ -659,7 +677,7 @@ export default {
       })
     },
     ToBreak (val) {
-      if (val)return val.replace('\n', '<br/>')
+      if (val)return val.replace(/\n/g, '<br/>')
     }
   }
 }

src/views/landTransportation/motorcadeDriver/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="adds">
     <basic-container>
       <div class="home-container">
         <div style="display: flex;justify-content: center;">
@@ -351,25 +351,63 @@ export default {
             type: 'sum',
             decimals: 2
           }],
-        column: [{
-          label: '状态',
+        column: [ {
+          label: '货运日期',
+          prop: 'arrivalTime',
           overHidden: true,
+          type: "date",
+          searchRange: true,
+          defaultTime: ['00:00:00', '23:59:59'],
+          format: "yyyy-MM-dd HH:mm:ss",
+          valueFormat: "yyyy-MM-dd HH:mm:ss",
+          index: 1,
+          width: 145,
+          search: true,
+        }, {
+          label: '货运地点',
+          index: 2,
+          width: 160,
+          search: true,
+          prop: 'addressDetail'
+        }, {
+          label: '提单号',
           width: 100,
+          index: 3,
+          search: true,
+          overHidden: true,
+          prop: 'billNo'
+        }, {
+          label: '入货场站',
+          prop: 'station',
+          overHidden: true,
+          index: 4,
+          width: 140,
+          search: true,
+        }, {
+          label: '箱型',
+          width: 100,
+          index: 5,
+          search: true,
+          overHidden: true,
+          prop: 'ctnType',
           type: 'select',
-          index: 1,
-          dicUrl: "/api/blade-system/dict-biz/dictionary?code=land_order_status",
+          dicUrl: "/api/blade-system/dict-biz/dictionary?code=boxType",
           props: {
             label: "dictValue",
-            value: "dictKey"
-          },
-          dataType: "string",
-          prop: 'status'
+            value: "dictValue"
+          }
+        }, {
+          label: '箱量',
+          width: 50,
+          index: 6,
+          overHidden: true,
+          prop: 'ctnQuantity'
         }, {
           label: '车号',
           width: 150,
           cell: true,
           search: true,
-          index: 4,
+          index: 7,
           allowCreate: true,
           prop: 'vehicleId',
           overHidden: true,
@@ -381,19 +419,12 @@ export default {
             label: "plateNo",
             value: "id"
           },
-        }, {
-          label: '提单号',
-          width: 100,
-          index: 2,
-          search: true,
-          overHidden: true,
-          prop: 'billNo'
         },
           {
             label: '车队',
             width: 200,
             search: true,
-            index: 3,
+            index: 8,
             // hide:true,
             showColumn: false,
             filterable: true,
@@ -417,7 +448,7 @@ export default {
             overHidden: true,
             cell: true,
             filterable: true,
-            index: 5,
+            index: 9,
             prop: 'driverId',
             type: 'select',
             dicUrl: "/api/blade-client/land-driver/driver-list?vehicleId={{key}}",
@@ -431,81 +462,58 @@ export default {
             width: 160,
             search: true,
             cell: true,
-            index: 6,
+            index: 10,
             prop: 'tel'
           }, {
             label: '件数',
             width: 100,
             search: true,
-            index: 6,
+            index: 11,
             overHidden: true,
             controls: false,
             cell: true,
             prop: 'quantity',
             type: 'number',
             precision:0
-          }, {
-            label: '包装',
-            width: 100,
-            search: true,
-            index: 6,
-            overHidden: true,
-            cell: true,
-            prop: 'packing',
-            type: 'select',
-            dicUrl: "/api/blade-system/dict-biz/dictionary?code=packaging",
-            props: {
-              label: "dictValue",
-              value: "dictValue"
-            },
-          }, {
+          },
+          // {
+          //   label: '包装',
+          //   width: 100,
+          //   search: true,
+          //   index: 6,
+          //   overHidden: true,
+          //   cell: true,
+          //   prop: 'packing',
+          //   type: 'select',
+          //   dicUrl: "/api/blade-system/dict-biz/dictionary?code=packaging",
+          //   props: {
+          //     label: "dictValue",
+          //     value: "dictValue"
+          //   },
+          // },
+          {
             label: '尺码',
             width: 100,
             search: true,
-            index:6,
+            index:12,
             overHidden: true,
             cell: true,
             prop: 'size',
-          }, {
-            label: '路线',
-            index: 7,
-            width: 160,
-            search: true,
-            prop: 'addressDetail'
-          }, {
-            label: '到厂时间',
-            prop: 'arrivalTime',
-            overHidden: true,
-            type: "date",
-            searchRange: true,
-            defaultTime: ['00:00:00', '23:59:59'],
-            format: "yyyy-MM-dd HH:mm:ss",
-            valueFormat: "yyyy-MM-dd HH:mm:ss",
-            index: 8,
-            width: 145,
-            search: true,
-          }, {
+          },{
             label: '货物名称',
             overHidden: true,
             width: 160,
             search: true,
-            index: 9,
+            index: 13,
             prop: 'goods'
           }, {
             label: '箱号',
             overHidden: true,
             width: 245,
-            index: 10,
+            index: 14,
             search: true,
             prop: 'ctnNo'
           }, {
-            label: '场站',
-            prop: 'station',
-            overHidden: true,
-            index: 11,
-            width: 140,
-            search: true,
-          }, {
             label: '制单日期',
             overHidden: true,
             prop: 'createTime',
@@ -514,42 +522,23 @@ export default {
             defaultTime: ['00:00:00', '23:59:59'],
             format: "yyyy-MM-dd HH:mm:ss",
             valueFormat: "yyyy-MM-dd HH:mm:ss",
-            index: 12,
+            index: 15,
             width: 145,
             search: true,
           }, {
             label: '船名航次',
             prop: 'factory',
             overHidden: true,
-            index: 13,
+            index: 16,
             width: 140,
             search: true,
           }, {
-            label: '尺寸箱型',
-            width: 100,
-            index: 14,
-            search: true,
-            overHidden: true,
-            prop: 'ctnType',
-            type: 'select',
-            dicUrl: "/api/blade-system/dict-biz/dictionary?code=boxType",
-            props: {
-              label: "dictValue",
-              value: "dictValue"
-            }
-          }, {
-            label: '箱量',
-            width: 50,
-            index: 15,
-            overHidden: true,
-            prop: 'ctnQuantity'
-          }, {
             label: '重量(吨)',
             width: 160,
             prop: 'landWeight',
             controls: false,
             overHidden: true,
-            index: 16,
+            index: 17,
             precision: 2,
             type: 'number'
           },
@@ -561,20 +550,20 @@ export default {
           {
             label: '应付陆运费',
             overHidden: true,
-            index: 17,
+            index: 18,
             width: 100,
             cell: true,
             prop: 'landAmountC'
           }, {
             label: '委托备注',
             overHidden: true,
-            index: 18,
+            index: 19,
             width: 245,
             prop: 'remarks'
           }, {
             label: '车队备注',
             cell: true,
-            index: 19,
+            index: 20,
             width: 245,
             overHidden: true,
             prop: 'fleetRemarks'
@@ -582,13 +571,14 @@ export default {
             label: '司机备注',
             overHidden: true,
             width: 245,
-            index: 20,
+            index: 21,
             prop: 'driverRemarks'
           }, {
             label: '场站费',
             width: 100,
             precision: 2,
             cell: true,
+            index: 22,
             controls: false,
             type: 'number',
             prop: 'oneFeeC'
@@ -597,6 +587,7 @@ export default {
             width: 100,
             precision: 2,
             cell: true,
+            index: 23,
             controls: false,
             type: 'number',
             prop: 'twoFeeC'
@@ -604,6 +595,7 @@ export default {
             label: '扣款',
             width: 100,
             precision: 2,
+            index: 24,
             cell: true,
             controls: false,
             type: 'number',
@@ -612,6 +604,7 @@ export default {
             label: '待时费',
             width: 100,
             precision: 2,
+            index: 25,
             cell: true,
             controls: false,
             type: 'number',
@@ -620,6 +613,7 @@ export default {
             label: '其他',
             width: 100,
             precision: 2,
+            index: 26,
             cell: true,
             type: 'number',
             controls: false,
@@ -627,8 +621,22 @@ export default {
           }, {
             label: '费用备注',
             width: 245,
+            index: 27,
             cell: true,
             prop: 'feeRemarksC'
+          }, {
+            label: '状态',
+            overHidden: true,
+            width: 100,
+            type: 'select',
+            index: 28,
+            dicUrl: "/api/blade-system/dict-biz/dictionary?code=land_order_status",
+            props: {
+              label: "dictValue",
+              value: "dictKey"
+            },
+            dataType: "string",
+            prop: 'status'
           }
         ]
       },
@@ -835,7 +843,7 @@ export default {
       })
     },
     ToBreak(val) {
-      if (val) return val.replace('\n', '<br/>')
+      if (val)return val.replace(/\n/g, '<br/>')
     }
   }
 }

src/views/landTransportation/placeAnOrder/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <basic-container v-if="show">
+    <basic-container v-show="show">
       <div class="home-container">
         <div style="display: flex;justify-content: center;">
           <div class="content">
@@ -105,8 +105,9 @@
         </div>
       </div>
     </basic-container>
-    <basic-container v-if="show">
+    <basic-container v-show="show">
       <avue-crud
+          v-if="key>0"
           :table-loading="loading"
           :page.sync="page"
           :data="dataList"
@@ -131,7 +132,7 @@
         <template slot="addressDetail" slot-scope="{ row,index}">
           <el-tooltip class="item" effect="dark" placement="top">
             <div v-html="ToBreak(row.addressDetail)" slot="content"></div>
-            <div style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">{{row.addressDetail}}</div>
+/*            <div style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">{{row.addressDetail}}</div>*/
           </el-tooltip>
         </template>
         <template slot-scope="{row,index}" slot="menu">
@@ -155,7 +156,7 @@
         </template>
       </avue-crud>
     </basic-container>
-    <detail-page v-else @backToList="backToList" :id="id"></detail-page>
+    <detail-page v-if="!show" @backToList="backToList" :id="id"></detail-page>
   </div>
 </template>
 
@@ -182,6 +183,7 @@ export default {
         total: 0,
         pageSizes: [10, 50, 100, 200, 300]
       },
+      key:0,
       totalData:{},
       option: {},
       optionList: {
@@ -198,97 +200,115 @@ export default {
         searchIndex: 2,
         column:[
           {
-            label: '状态',
-            prop: 'itemStatusDetail',
-            index: 1,
-            overHidden: true,
-            width: 140
-          },{
-            label: '订单号',
-            prop: 'orderNo',
-            index: 2,
+            label: '货运日期',
+            prop: 'arrivalTime',
             overHidden: true,
-            width: 160,
+            type: "date",
+            searchRange: true,
+            defaultTime:['00:00:00', '23:59:59'],
+            format: "yyyy-MM-dd HH:mm:ss",
+            valueFormat: "yyyy-MM-dd HH:mm:ss",
+            index: 1,
+            width: 150,
             search: true,
           }, {
-            label: '客户名称',
-            prop: 'corpName',
-            overHidden: true,
-            index: 3,
-            width: 140,
+            label: '业务员',
+            index: 2,
+            width: 150,
+            prop: 'salesman',
             search: true,
-          }, {
-            label: '所属公司',
-            prop: 'belongCompany',
             overHidden: true,
-            index: 4,
+            type: "select",
+            dicUrl: "/api/blade-user/userList",
+            props: {
+              label: "realName",
+              value: "id"
+            }
+          }, {
+            label: '货运地点',
+            prop: 'addressDetail',
+            index: 3,
             width: 140,
             search: true,
           }, {
             label: '提单号',
             prop: 'billNo',
-            index: 5,
+            index: 4,
             overHidden: true,
             width: 140,
             search: true,
           }, {
-            label: '货物名称',
-            prop: 'goods',
+            label: '入货场站',
+            prop: 'station',
             overHidden: true,
-            index: 6,
-            width: 140,
-            search: true,
-          }, {
-            label: '路线',
-            prop: 'addressDetail',
-            index: 7,
+            index: 5,
             width: 140,
             search: true,
           },{
             label: '计划箱量',
             prop: 'ctnDetail',
             overHidden: true,
-            index: 8,
-            width: 140,
-            search: true,
+            index: 6,
+            width: 140
           },{
             label: '已派箱量',
             prop: 'dispatchCtnDetail',
             overHidden: true,
-            index: 9,
-            width: 140,
-            search: true,
+            index: 7,
+            width: 140
           },{
             label: '受理箱量',
             prop: 'sendCtnDetail',
             overHidden: true,
-            index: 10,
+            index: 8,
+            width: 140
+          },{
+            label: '运费',
+            index: 9,
             width: 140,
+            prop: 'freight'
+          },{
+            label: '订单号',
+            prop: 'orderNo',
+            index: 10,
+            overHidden: true,
+            width: 160,
             search: true,
           }, {
-            label: '场站',
-            prop: 'station',
-            overHidden: true,
+            label: '状态',
+            prop: 'itemStatusDetail',
             index: 11,
-            width: 140,
-            search: true,
+            overHidden: true,
+            width: 140
           }, {
-            label: '到厂时间',
-            prop: 'arrivalTime',
+            label: '公司名称',
+            prop: 'corpName',
             overHidden: true,
-            type: "date",
-            searchRange: true,
-            defaultTime:['00:00:00', '23:59:59'],
-            format: "yyyy-MM-dd HH:mm:ss",
-            valueFormat: "yyyy-MM-dd HH:mm:ss",
             index: 12,
-            width: 150,
+            width: 140,
             search: true,
-          }, {
+          }
+          // , {
+          //   label: '所属公司',
+          //   prop: 'belongCompany',
+          //   overHidden: true,
+          //   index: 4,
+          //   width: 140,
+          //   search: true,
+          // }
+          // , {
+          //   label: '货物名称',
+          //   prop: 'goods',
+          //   overHidden: true,
+          //   index: 13,
+          //   width: 140,
+          //   search: true,
+          // }
+            ,{
             label: '船名航次',
             prop: 'factory',
             overHidden: true,
-            index: 13,
+            index: 14,
             width: 140,
             search: true,
           }, {
@@ -300,7 +320,7 @@ export default {
             defaultTime:['00:00:00', '23:59:59'],
             format: "yyyy-MM-dd HH:mm:ss",
             valueFormat: "yyyy-MM-dd HH:mm:ss",
-            index: 14,
+            index: 15,
             width: 140,
             search: true,
           }]
@@ -314,6 +334,7 @@ export default {
   },
   async created() {
     this.option = await this.getColumnData(this.getColumnName(85), this.optionList);
+    this.key++
     let i = 0;
     this.option.column.forEach(item => {
       if (item.search) i++
@@ -430,7 +451,7 @@ export default {
       this.show = true
     },
     ToBreak (val) {
-      if (val)return val.replace('\n', '<br/>')
+      if (val)return val.replace(/\n/g, '<br/>')
     }
   }
 }

src/views/reimbursement/index.vue

@@ -140,6 +140,14 @@ export default {
       this.show = false;
       this.$store.commit("BX_IN_DETAIL");
     }
+    if (this.$route.query.params) {
+      this.show = true;
+      this.detailData = {
+        id: this.$route.query.params,
+      };
+      this.show = false;
+      this.$store.commit("BX_IN_DETAIL");
+    }
   },
   methods: {
     searchCriteriaSwitch(type) {
@@ -231,7 +239,7 @@ export default {
       this.selection = list;
     },
     goBack() {
-      if (this.$route.query.check) {
+      if (this.$route.query.check || this.$route.query.params) {
         this.$router.$avueRouter.closeTag(this.$route.fullPath);
         this.$router.push({
           path: "/reimbursement/index"

src/views/workManagement/purchaseApply/index.vue

@@ -131,6 +131,14 @@ export default {
       this.show = false;
       this.$store.commit("OFFICEPUR_IN_DETAIL");
     }
+    if (this.$route.query.params) {
+      this.show = true;
+      this.detailData = {
+        id: this.$route.query.params,
+      };
+      this.show = false;
+      this.$store.commit("OFFICEPUR_IN_DETAIL");
+    }
   },
   filters: {
     userFormat(row, userList) {
@@ -234,7 +242,7 @@ export default {
       this.selection = list;
     },
     goBack() {
-      if (this.$route.query.check) {
+      if (this.$route.query.check || this.$route.query.params) {
         this.$router.$avueRouter.closeTag(this.$route.fullPath);
         this.$router.push({
           path: "/workManagement/purchaseApply/index"

src/views/workManagement/requisition/index.vue

@@ -131,6 +131,14 @@ export default {
       this.show = false;
       this.$store.commit("OFFICELY_IN_DETAIL");
     }
+    if (this.$route.query.params) {
+      this.show = true;
+      this.detailData = {
+        id: this.$route.query.params,
+      };
+      this.show = false;
+      this.$store.commit("OFFICELY_IN_DETAIL");
+    }
   },
   methods: {
     searchCriteriaSwitch(type) {
@@ -224,7 +232,7 @@ export default {
       this.selection = list;
     },
     goBack() {
-      if (this.$route.query) {
+      if (this.$route.query.check || this.$route.query.params) {
         this.$router.$avueRouter.closeTag(this.$route.fullPath);
         this.$router.push({
           path: "/workManagement/requisition/index"

vue.config.js

@@ -27,10 +27,11 @@ module.exports = {
       '/api': {
         //本地服务接口地址
         // target: 'http://192.168.1.12:1080',
-        // target: 'http://192.168.1.117:1080',
+        target: 'http://192.168.1.114:1080',
+        // target: 'http://124.222.119.174:1080',
         // 打包地址.
         // target: 'http://121.37.83.47:10004',//服务器ip
-        target: 'http://trade.tubaosoft.com:10004',//服务器域名
+        // target: 'http://trade.tubaosoft.com:10004',//服务器域名
         ws: true,
         pathRewrite: {
           '^/api': '/'