1

src/views/order/transport/index.vue

@@ -29,6 +29,9 @@
                   </data-table>
                 </el-card>
               </el-col>
+              <el-col :span="24" class="page">
+                <page @query="search" :limit="limit" :total="total"></page>
+              </el-col>
             </el-row>
             <el-col :span="24" class="detail" v-else>
               <el-col :span="24" class="top">
@@ -54,6 +57,9 @@
                         style="width: 100%;"
                       ></el-date-picker>
                     </el-form-item>
+                    <el-form-item label="备注">
+                      <el-input type="textarea" v-model="form.remark" placeholder="备注"></el-input>
+                    </el-form-item>
                     <el-form-item label="供应商方式">
                       <el-radio-group v-model="form.supply_type" @change="changeSupply">
                         <el-radio label="0">自运</el-radio>
@@ -61,9 +67,6 @@
                         <el-radio label="2">第三方单位</el-radio>
                       </el-radio-group>
                     </el-form-item>
-                    <el-form-item label="备注">
-                      <el-input type="textarea" v-model="form.remark" placeholder="备注"></el-input>
-                    </el-form-item>
                   </el-col>
                   <el-col :span="12">
                     <!-- 自选-车号（选择），税率 -->
@@ -75,6 +78,9 @@
                           <el-option v-for="item in carnoList" :key="item.label" :label="item.car_no" :value="item.id"> </el-option>
                         </el-select>
                       </el-form-item>
+                      <el-form-item label="线路">
+                        <el-input v-model="form.route" placeholder="线路" readonly></el-input>
+                      </el-form-item>
                     </span>
                     <span v-else-if="form.supply_type == '1'">
                       <el-form-item label="供应商">
@@ -107,6 +113,9 @@
                       <el-form-item label="车牌号">
                         <el-input v-model="form.supplier.car_no" placeholder="车牌号"></el-input>
                       </el-form-item>
+                      <el-form-item label="线路">
+                        <el-input v-model="form.route" placeholder="线路" readonly></el-input>
+                      </el-form-item>
                     </span>
                     <el-form-item label="税率">
                       <el-select v-model="form.supplier.taxes" placeholder="请选择税率" @change="changeTaxes">
@@ -143,6 +152,8 @@
 </template>
 
 <script>
+// 分页
+import page from '@f/components/pagination.vue';
 import { mapState, createNamespacedHelpers } from 'vuex';
 // 订单表
 const { mapActions: order } = createNamespacedHelpers('order');
@@ -168,7 +179,9 @@ export default {
   },
   name: 'index',
   props: {},
-  components: {},
+  components: {
+    page,
+  },
   data: function() {
     return {
       // 显示
@@ -187,6 +200,7 @@ export default {
       ],
       list: [],
       total: 0,
+      limit: 4,
       opera: [],
       // 装车单数据
       form: {},
@@ -221,6 +235,8 @@ export default {
       modeList: [],
       // 税率列表
       taxesList: [],
+      // 当供应商类型为0,2时，路线在订单中直接获取
+      depositRoute: '',
     };
   },
   async created() {
@@ -237,7 +253,7 @@ export default {
     ...treaty({ treatyQuery: 'query' }),
     ...project({ projectQuery: 'query' }),
     ...mode({ modeQuery: 'query' }),
-    async search({ skip = 0, limit = 8, ...info } = {}) {
+    async search({ skip = 0, limit = this.limit, ...info } = {}) {
       //查订单
       let res = await this.query({ skip, limit, ...info });
       if (this.$checkRes(res)) {
@@ -260,7 +276,7 @@ export default {
       // 查询税率
       res = await this.tree('sl');
       if (this.$checkRes(res)) {
-        this.$set(this, `taxesList`, res[0].children);
+        this.$set(this, `taxesList`, res);
       }
     },
     // 选择货物
@@ -279,18 +295,28 @@ export default {
           supplier: {},
         };
         let goods = this.selected;
+        // 更换id
         for (const val of goods) {
           val.split_id = _.clone(val._id);
           delete val._id;
         }
+        // 处理路线
+        let route = goods[0];
+        let newRoute = this.list.find(i => i.split.find(f => f._id == route._id));
+        let routeData = this.routeList.find(i => i._id == newRoute.route);
+        let depositRoute = `${routeData.s_p}-${routeData.s_c}至${routeData.e_p}-${routeData.e_c}`;
+        this.$set(this, `depositRoute`, depositRoute);
         this.$set(this, `goodsList`, goods);
         this.$set(this, `form`, data);
+        this.dialog = true;
       }
-      this.dialog = true;
     },
     // 选择运输类型
+    // 选择自运&第三方时，路线赋值
     changeSupply(value) {
-      console.log(value);
+      if (value == 0 || value == 2) {
+        this.$set(this.form, `route`, this.depositRoute);
+      }
     },
     // 生成装车单
     async onSubmit() {
@@ -298,7 +324,10 @@ export default {
       data.goods = this.goodsList;
       let res = await this.transportCreate(data);
       if (this.$checkRes(res)) {
-        console.log(res);
+        this.$message({
+          message: '装车单生成成功',
+          type: 'success',
+        });
       }
     },
     // 过滤客户