订单字段回显调整

src/option/distribution/distributionReservation.js

@@ -416,9 +416,15 @@ export default {
       width: '100',
       search: true
     },
+    // {
+    //   label: '服务类型',
+    //   prop: 'typeService',
+    //   width: '100',
+    //   search: true
+    // },
     {
       label: '服务类型',
-      prop: 'typeService',
+      prop: 'typeServerName',
       width: '100',
       search: true
     },

src/views/distribution/turndelivery/deliveryDiscuss.vue

@@ -152,7 +152,7 @@
         <el-col :span="6">
           <el-form-item label="配送类型:" prop="goodsAreaId">
             <el-radio-group v-model="stockUpForm.deliveryType">
-              <el-radio :label="'10'" :value="'10'">商配&emsp; </el-radio>
+              <el-radio :label="'1'" :value="'1'">商配&emsp; </el-radio>
             </el-radio-group>
           </el-form-item>
         </el-col>
@@ -485,7 +485,7 @@
       <el-table-column prop="menu" label="操作" :width="220" align="center">
         <template #="{ row }">
           <!--              <el-button type="primary" text icon="el-icon-view" @click="handleView(row)">查看</el-button>-->
-<!--                        <el-button type="primary" text icon="el-icon-edit" @click="handleEdit(row)">编辑</el-button>-->
+          <!--                        <el-button type="primary" text icon="el-icon-edit" @click="handleEdit(row)">编辑</el-button>-->
           <!--              <el-button type="primary" text icon="el-icon-delete" @click="rowDel(row)">删除</el-button>-->
         </template>
       </el-table-column>
@@ -874,6 +874,8 @@
         if (this.$route.query.id) {
           this.deliveryListId = this.$route.query.id;
         }
+        this.loading = false;
+
       },
       sizeChange(pageSize) {
         this.page.pageSize = pageSize;
@@ -1049,6 +1051,10 @@
      * 订单提交
      */
     onSubmitBusiness() {
+      if (this.orderData.length===0){
+        this.$message.warning('请选择订单');
+        return;
+      }
       if (this.deliveryListId){
         let data = {};
         let tripartite = {};
@@ -1406,7 +1412,7 @@
       }
         this.aaa = true;
         this.bbb = false;
-        this.stockUpForm.deliveryType="10";
+        this.stockUpForm.deliveryType="1";
         this.stockUpForm.deliveryWay="10";
         this.loadAndUnload = ["1","2"];
         this.stockUpForm.otherFee = 0;
@@ -1427,7 +1433,7 @@
       }
         this.aaa = false;
         this.bbb = true;
-        this.stockUpForm.deliveryType="10";
+        this.stockUpForm.deliveryType="1";
         this.stockUpForm.deliveryWay="10";
         this.loadAndUnload = ["1","2"];
         this.stockUpForm.otherFee = 0;
@@ -1489,6 +1495,8 @@
       },
       searchChange(){
         let params = {};
+        this.query.typeService=1;
+        this.query.genre = "1";
         console.log("query------------->",this.query);
         const page = this.page;
         selectStockArticleInfoList(page.currentPage,page.pageSize,Object.assign(params,this.query)).then(res=>{
@@ -1549,13 +1557,14 @@
         this.query={};
       },
       async onLoad(page, params = {}) {
+        this.stockUpForm.deliveryType="1";
         console.log("》》》》》》》》》》》》》》》",this.deliveryListId);
         if (this.deliveryListId){
             getDeliveryList(this.deliveryListId).then( async res=>{
               let data = res.data.data;
               Object.assign(this.stockUpForm,data.reservationInfo)
               Object.assign(this.stockUpForm,data.stockupInfo)
-              this.stockUpForm.deliveryType = '10';
+              this.stockUpForm.deliveryType = '1';
               this.stockUpForm.deliveryWay = data.reservationInfo.deliveryWay;
               this.serveType = data.reservationInfo.serveType.split(",");
               if (data.stockupInfo){
@@ -1621,8 +1630,9 @@
                 let deliveryTripartiteVO = data.deliveryTripartiteVO;
                 this.aaa = false;
                 this.bbb = true;
-                // this.form.tripartiteSource = deliveryTripartiteVO.distributionCompanyId;
-                this.waixieForm.tripartiteSource = "1";
+                this.waixieForm.tripartiteSource = data.distributionCompanyId;
+                console.log("distributionCompanyId---------------->",deliveryTripartiteVO.distributionCompanyId);
+                console.log("deliveryTripartiteVO---------------->",deliveryTripartiteVO);
                 this.waixieForm.driverName = deliveryTripartiteVO.driverName ;
                 this.waixieForm.vehicleNum = deliveryTripartiteVO.vehicleNum ;
                 this.waixieForm.driverPhone = deliveryTripartiteVO.driverPhone ;
@@ -1633,7 +1643,7 @@
             })
           this.isDisable=true;
         }else {
-          this.stockUpForm.deliveryType="10";
+          this.stockUpForm.deliveryType="1";
           this.stockUpForm.deliveryWay="10";
           this.loadAndUnload = ["1","2"];
           this.stockUpForm.otherFee = 0;