5/31

src/api/modular/main/tmsaip/TmsForwarderOrder.js

@@ -16,7 +16,7 @@ export function TmsForwarderOrderUpdate(parameter) {
   return axios({
     url: `/tmsaip/TmsForwarderOrder/update/${parameter.id}`,
     method: 'post',
-    data: parameter
+    data: parameter.values
   })
 }
 /**

src/views/main/tmsaip/TmsForwarderOrder/details.vue

@@ -83,6 +83,7 @@
                   <!-- <a-input v-decorator="['etd']" allowClear /> -->
                   <a-date-picker
                     format="YYYY-MM-DD HH:mm:ss"
+                    valueFormat="YYYY-MM-DD HH:mm:ss"
                     show-time
                     :style="{ width: '100%' }"
                     v-decorator="['etd']"
@@ -112,6 +113,7 @@
                   <a-date-picker
                     :disabled="type == 'Details'"
                     format="YYYY-MM-DD HH:mm:ss"
+                    valueFormat="YYYY-MM-DD HH:mm:ss"
                     show-time
                     :style="{ width: '100%' }"
                     v-decorator="['dispatchTime']"
@@ -162,7 +164,7 @@
                   </a-select>
                 </a-form-item>
               </a-col>
-              <a-col :span="5">
+              <!-- <a-col :span="5">
                 <a-form-item
                   label="箱型箱量:"
                   :labelCol="{ xs: { span: 25 }, sm: { span: 6 } }"
@@ -171,7 +173,7 @@
                 >
                   <a-input v-decorator="['containers']" allowClear />
                 </a-form-item>
-              </a-col>
+              </a-col> -->
             </a-row>
             <a-row>
               <a-col :span="5">
@@ -373,13 +375,28 @@
               :edit-config="{ trigger: 'click', mode: 'row' }"
             >
               <vxe-column type="checkbox" width="45"></vxe-column>
+              <vxe-column field="dispatchStatus" title="状态" :edit-render="{}">
+                <template #default="{ row }">
+                  <span>{{ FnRdispatchStatus(row.dispatchStatus) }}</span>
+                </template>
+                <template #edit="{ row }">
+                  <vxe-select v-model="row.dispatchStatus" transfer>
+                    <vxe-option
+                      v-for="item in dispatchStatusList"
+                      :key="item.code"
+                      :value="item.code"
+                      :label="item.name"
+                    ></vxe-option>
+                  </vxe-select>
+                </template>
+              </vxe-column>
               <!-- <vxe-column type="seq" width="60"></vxe-column> -->
-              <vxe-column field="cntName" title="箱型" :edit-render="{}">
+              <vxe-column field="cntCode" title="箱型" :edit-render="{}">
                 <template #default="{ row }">
-                  <span>{{ FnRctncode(row.cntName) }}</span>
+                  <span>{{ FnRctncode(row.cntCode) }}</span>
                 </template>
                 <template #edit="{ row }">
-                  <vxe-select v-model="row.cntName" transfer>
+                  <vxe-select v-model="row.cntCode" transfer>
                     <vxe-option
                       v-for="item in ctnList"
                       :key="item.code"
@@ -401,7 +418,8 @@
               </vxe-column>
               <vxe-column field="dispatchTime" title="派车日期" :edit-render="{}">
                 <template #edit="{ row }">
-                  <vxe-input v-model="row.dispatchTime" type="text"></vxe-input>
+                  <!-- <a-date-picker format="YYYY-MM-DD HH:mm:ss" show-time v-model="row.dispatchTime" allowClear /> -->
+                  <vxe-input v-model="row.dispatchTime" type="datetime" transfer></vxe-input>
                 </template>
               </vxe-column>
               <vxe-column field="carLicense" title="车牌号" :edit-render="{}">
@@ -444,6 +462,7 @@
 import { mapGetters, mapActions } from 'vuex'
 import { commondbYardlist } from '@/api/modular/main/CommondbYardlist'
 import { commondbCarrierlist } from '@/api/modular/main/CommondbPortlist'
+import { GetCtn } from '@/api/modular/main/BookingLedger'
 import {
   TmsForwarderOrderCreate,
   TmsForwarderOrderUpdate,
@@ -502,6 +521,12 @@ export default {
       WebData: {},
       dispatcherIdData: [],
       ctnList: [],
+      dispatchStatusList: [
+        { code: '0', name: '未派车' },
+        { code: '1', name: '运输中' },
+        { code: '2', name: '已提箱' },
+        { code: '3', name: '已还箱' }
+      ],
       yardidData: [],
       inYardIDData: [],
       yardcontractaData: [],
@@ -651,6 +676,14 @@ export default {
 
       validateFields((errors, values) => {
         if (!errors) {
+          // dispatchTime
+          values.tmsForwarderOrderBodyEntityList = this.ContactsData
+          values.tmsForwarderOrderBodyEntityList.forEach((item, index) => {
+            item.serialNo = item.WebKey
+            // if (item.dispatchTime) {
+            //   item.dispatchTime = new Date(Date.parse(item.dispatchTime)).toISOString()
+            // }
+          })
           values.tmsForwarderOrderLoadingPlaceEntityList = this.tmsForwarderOrderLoadingPlaceEntityList
           console.log(values)
           if (this.id && this.type != 'Copy') {
@@ -721,6 +754,7 @@ export default {
 
     init() {
       console.log(this.id)
+      this.ContactsData = []
       this.form.resetFields()
       if (this.id) {
         TmsForwarderOrderInfo({ id: this.id }).then(res => {
@@ -770,6 +804,9 @@ export default {
           ]
         }
       }
+      GetCtn({ KeyWord: '' }).then(res => {
+        this.ctnList = res.data
+      })
       commondbCarrierlist().then(res => {
         this.carrierCodeData = res.data
       })
@@ -795,6 +832,17 @@ export default {
       }
       return RData
     },
+    FnRdispatchStatus(value) {
+      let RData = ''
+      if (value) {
+        this.dispatchStatusList.forEach(item => {
+          if (item.code == value) {
+            RData = item.name
+          }
+        })
+      }
+      return RData
+    },
     removeCheckboxRow() {
       console.log(this.$refs.xTable.selection)
       this.$refs.xTable.selection.forEach(item => {

src/views/main/tmsaip/TmsForwarderOrder/index.vue

@@ -107,7 +107,7 @@
                       :filter-option="filterOption"
                       :not-found-content="null"
                     >
-                      <a-select-option v-for="item in listAllData" :key="item.code" :value="item.code">
+                      <a-select-option v-for="item in listAllData" :key="item.id" :value="item.id">
                         {{ item.name }}
                       </a-select-option>
                     </a-select>
@@ -125,7 +125,7 @@
                       :filter-option="filterOption"
                       :not-found-content="null"
                     >
-                      <a-select-option v-for="item in listAllData" :key="item.code" :value="item.code">
+                      <a-select-option v-for="item in listAllData" :key="item.id" :value="item.id">
                         {{ item.name }}
                       </a-select-option>
                     </a-select>
@@ -143,6 +143,7 @@
                         style="min-width:30px; flex: 1;"
                         v-model="queryParam.dispatchTimeBegin"
                         format="YYYY-MM-DD"
+                        valueFormat="YYYY-MM-DD"
                         suffixIcon=" "
                         placeholder="开始时间"
                       />
@@ -151,6 +152,7 @@
                         style="min-width:30px;flex: 1;"
                         v-model="queryParam.dispatchTimeEnd"
                         format="YYYY-MM-DD"
+                        valueFormat="YYYY-MM-DD"
                         placeholder="结束时间"
                         suffixIcon=" "
                       />
@@ -165,6 +167,7 @@
                         style="min-width:30px; flex: 1;"
                         v-model="queryParam.etdBegin"
                         format="YYYY-MM-DD"
+                        valueFormat="YYYY-MM-DD"
                         suffixIcon=" "
                         placeholder="开始时间"
                       />
@@ -173,6 +176,7 @@
                         style="min-width:30px;flex: 1;"
                         v-model="queryParam.etdEnd"
                         format="YYYY-MM-DD"
+                        valueFormat="YYYY-MM-DD"
                         placeholder="结束时间"
                         suffixIcon=" "
                       />
@@ -234,6 +238,10 @@
             <span v-else-if="item.dataIndex == 'billNo'" @click="FnGoDetails(row)" class="GoDetails">{{
               row[item.dataIndex]
             }}</span>
+            <span v-else-if="item.dataIndex == 'carGroupId'">{{ FnCarGroupId(row[item.dataIndex]) }}</span>
+            <span v-else-if="item.dataIndex == 'fromYardId'">{{ FnFromYardId(row[item.dataIndex]) }}</span>
+            <span v-else-if="item.dataIndex == 'returnYardId'">{{ FnFromYardId(row[item.dataIndex]) }}</span>
+            <span v-else-if="item.dataIndex == 'carrierId'">{{ FnCarrierId(row[item.dataIndex]) }}</span>
             <span v-else>{{ row[item.dataIndex] }}</span>
           </template>
         </vxe-column>
@@ -494,6 +502,33 @@ export default {
       })
       return Rdata
     },
+    FnCarGroupId(data) {
+      let Rdata = '-'
+      this.carGroupIdData.forEach(item => {
+        if (item.id == data) {
+          Rdata = item.name
+        }
+      })
+      return Rdata
+    },
+    FnFromYardId(data) {
+      let Rdata = '-'
+      this.YardCodeData.forEach(item => {
+        if (item.code == data) {
+          Rdata = item.name
+        }
+      })
+      return Rdata
+    },
+    FnCarrierId(data) {
+      let Rdata = '-'
+      this.carrierCodeData.forEach(item => {
+        if (item.code == data) {
+          Rdata = item.cnName
+        }
+      })
+      return Rdata
+    },
     handlePageChange1({ currentPage, pageSize }) {
       this.queryParam.PageNo = currentPage
       this.queryParam.PageSize = pageSize