11

.env.development

@@ -6,7 +6,7 @@ ENV = 'development'
 
 # 电动车租赁系统/开发环境
 # VUE_APP_BASE_API = '/dev-api'
-VUE_APP_BASE_API = 'http://192.168.2.11:8090'
+VUE_APP_BASE_API = 'http://192.168.2.42:8090'
 # VUE_APP_BASE_API = 'https://zc.chuangtewl.com'
 # VUE_APP_BASE_API = 'https://zc.chuangtewl.com/prod-api'
 

src/api/rl/deliveryOrder.js

@@ -42,3 +42,12 @@ export function delDeliveryOrder(deliveryId) {
     method: 'delete'
   })
 }
+
+
+// 查询配送工单详细
+export function getDeliveryList(deliveryId) {
+  return request({
+    url: '/system/deliveryOrderOper/listByDeliveryId?deliveryId=' + deliveryId,
+    method: 'get'
+  })
+}

src/views/system/deliveryOrder/index.vue

@@ -153,7 +153,7 @@
     />
 
     <!-- 添加或修改配送工单对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-form-item label="订单号" prop="orderNo">
           <!-- <el-input v-model="form.orderNo" placeholder="请输入订单号" /> -->
@@ -169,14 +169,15 @@
         </el-form-item>
         <el-form-item label="配送员类型" prop="deliverymanType">
           <!-- <div>{{ form.deliverymanType }}</div> -->
-          <el-select v-model="form.deliverymanType" placeholder="请选择配送员类型" disabled>
+          <dict-tag :options="dict.type.rl_deliveryman_type" :value="form.deliverymanType"/>
+          <!-- <el-select v-model="form.deliverymanType" placeholder="请选择配送员类型" disabled>
             <el-option
               v-for="dict in dict.type.rl_deliveryman_type"
               :key="dict.value"
               :label="dict.label"
               :value="dict.value"
             ></el-option>
-          </el-select>
+          </el-select> -->
         </el-form-item>
         <el-form-item label="配送员名称" prop="deliveryman">
           <div>{{ form.deliveryman }}</div>
@@ -187,15 +188,29 @@
           <!-- <el-input v-model="form.deliverymanPhone" placeholder="请输入配送员电话" /> -->
         </el-form-item>
         <el-form-item label="状态" prop="status" >
-          <el-select v-model="form.status" placeholder="请选择状态" disabled>
-            <el-option
-              v-for="dict in dict.type.rl_delivery_status"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
-          </el-select>
+          <dict-tag :options="dict.type.rl_delivery_status" :value="form.status"/>
+        
         </el-form-item>
+        <el-table :data="deliveryOrderOperList">
+      <!-- <el-table-column type="selection" width="55" align="center" /> -->
+      <el-table-column label="操作id" align="center" prop="operId" />
+      <!-- <el-table-column label="配送工单id" align="center" prop="deliveryId" /> -->
+      <el-table-column label="配送类型" align="center" prop="type">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.rl_delivery_type" :value="scope.row.type"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作人" align="center" prop="operUserid" />
+      <el-table-column label="操作人电话" align="center" prop="operPhone" />
+      <el-table-column label="操作人名称" align="center" prop="operName" />
+      <el-table-column label="操作时间" align="center" prop="operTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.operTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+     
+    </el-table>
+
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -206,11 +221,11 @@
 </template>
 
 <script>
-import { listDeliveryOrder, getDeliveryOrder, delDeliveryOrder, addDeliveryOrder, updateDeliveryOrder } from "@/api/rl/deliveryOrder";
+import { listDeliveryOrder, getDeliveryOrder, delDeliveryOrder, addDeliveryOrder, updateDeliveryOrder,getDeliveryList } from "@/api/rl/deliveryOrder";
 
 export default {
   name: "DeliveryOrder",
-  dicts: ['rl_deliveryman_type', 'rl_delivery_status'],
+  dicts: ['rl_deliveryman_type', 'rl_delivery_status','rl_delivery_type'],
   data() {
     return {
       // 遮罩层
@@ -245,6 +260,7 @@ export default {
       },
       // 表单参数
       form: {},
+      deliveryOrderOperList:[],
       // 表单校验
       rules: {
       }
@@ -257,6 +273,12 @@ export default {
     handleView(row) {
       this.open= true;
       this.form = row;
+      
+      getDeliveryList(this.form.deliveryId).then(response => {
+        this.deliveryOrderOperList = response.data;
+        // this.total = response.total;
+        // this.loading = false;
+      });
     },
     /** 查询配送工单列表 */
     getList() {