Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuanFront

src/views/main/ExpressModule/details.vue

@@ -5,7 +5,9 @@
         <a-row class="HeaderBox" type="flex" :gutter="16">
           <a-col>
             <div class="nav-box">
-              <div class="nav" @click="handleSubmit"><i class="iconfont icon-icon_baocun"></i>保存</div>
+              <div class="nav" @click="handleSubmit">
+                <i class="iconfont icon-icon_baocun"></i>{{ type == 'Details' ? '保存' : '新建' }}
+              </div>
               <!-- <div class="nav" @click="handleSubmit">保存并关闭</div> -->
               <div class="CutOff"></div>
               <!-- <div class="nav" @click="handleSubmit">保存并新建</div>
@@ -538,7 +540,11 @@
               </vxe-column>
               <vxe-column field="isHuanDan" title="是否还单" :edit-render="{}" fixed="right" width="100">
                 <template #edit="{ row }">
-                  <vxe-input v-model="row.isHuanDan" type="text" transfer></vxe-input>
+                  <!-- <vxe-input v-model="row.isHuanDan" type="text" transfer></vxe-input> -->
+                  <vxe-select v-model="row.isHuanDan" transfer>
+                    <vxe-option :value="0" label="是"></vxe-option>
+                    <vxe-option :value="1" label="否"></vxe-option>
+                  </vxe-select>
                 </template>
               </vxe-column>
               <vxe-column field="huanDanMan" title="还单人" :edit-render="{}" fixed="right" width="100">
@@ -1394,20 +1400,50 @@ export default {
               this.confirmLoading = false
             })
           } else {
+            if (this.type == 'Copy') {
+              if (values.detail && values.detail.length) {
+                let Arr = []
+                values.detail.forEach(item => {
+                  delete item.id
+                  delete item.createdUserId
+                  delete item.createdTime
+                  delete item.createdUserName
+                  delete item.pId
+                  delete item.tenantId
+                  delete item.WebKey
+                  Arr.push(item)
+                })
+                console.log(Arr)
+              }
+              if (values.business && values.business.length) {
+                let Arr = []
+                values.business.forEach(item => {
+                  delete item.id
+                  delete item.createdUserId
+                  delete item.createdTime
+                  delete item.createdUserName
+                  delete item.pId
+                  delete item.tenantId
+                  delete item.WebKey
+                  Arr.push(item)
+                })
+                console.log(Arr)
+              }
+            }
             console.log('新增')
             BookingOrderSFSave(values)
               .then(res => {
                 console.log(res)
                 if (res.success) {
                   this.$message.success(res.message)
-                  // this.type = 'Details'
+                  this.type = 'Details'
-                  // this.id = res.data.id
+                  this.id = res.data.result.id
-                  // this.WebId = ''
+                  this.WebId = ''
-                  // setTimeout(() => {
+                  setTimeout(() => {
-                  //   this.form.setFieldsValue({
+                    this.form.setFieldsValue({
-                  //     ...res.data
+                      ...res.data
-                  //   })
+                    })
-                  // }, 100)
+                  }, 100)
                 } else {
                   this.$message.error(res.message)
                 }

src/views/main/ExpressModule/index.vue

@@ -139,6 +139,12 @@
       </vxe-pager>
       <check ref="check" @ok="handleOk" />
       <edit-form ref="editForm" @ok="handleOk" />
+      <a-modal title="顺丰运单号" :visible="visible">
+        <template slot="footer"><span></span></template>
+        <a-table :columns="modalColumns" :data-source="KDtableData" bordered>
+          <span slot="waybillType" slot-scope="text">{{ text == 1 ? '母单' : text == 2 ? '子单' : '签回单' }}</span>
+        </a-table>
+      </a-modal>
     </a-card>
   </div>
 </template>
@@ -167,6 +173,8 @@ export default {
   },
   data() {
     return {
+      visible: false,
+      KDtableData: [],
       MapTimeA: [],
       MapTimeVisible: false,
       MapData: {},
@@ -203,6 +211,21 @@ export default {
         totalCount: 0
       },
       ColumnsQuery: [],
+      modalColumns: [
+        {
+          title: '运单号类型',
+          align: 'center',
+          width: '80',
+          dataIndex: 'waybillType',
+          scopedSlots: { customRender: 'waybillType' }
+        },
+        {
+          title: '运单号',
+          align: 'center',
+          width: '80',
+          dataIndex: 'waybillNo'
+        }
+      ],
       columns: [
         {
           title: '快递号',
@@ -321,8 +344,19 @@ export default {
     },
     FnKdSchedule(row) {
       console.log(row)
-      BookingOrderSFQueryKDSchedule({ Id: row.id }).then(res => {
+      this.visible = true
-        console.log(res)
+      BookingOrderSFQueryKDSchedule({ Id: row.id })
+        .then(res => {
+          if (res.code == 200) {
+            console.log(JSON.parse(JSON.parse(res.data)))
+            this.KDtableData = JSON.parse(JSON.parse(res.data)).msgData.waybillNoInfoList
+            this.visible = true
+          } else {
+            this.$message.warning(res.message)
+          }
+        })
+        .catch(err => {
+          this.$message.warning(err)
         })
     },
     FnAdd() {