Merge branch 'dev' of http://git.local.topsunit.com/mes/mes-ui into dev

src/api/mes/md/vehicle.js

+import request from '@/utils/request'
+
+// 查询车辆列表列表
+export function listVehicle(query) {
+  return request({
+    url: '/md/vehicle/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询车辆列表详细
+export function getVehicle(vehicleId) {
+  return request({
+    url: '/md/vehicle/' + vehicleId,
+    method: 'get'
+  })
+}
+
+// 新增车辆列表
+export function addVehicle(data) {
+  return request({
+    url: '/md/vehicle',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改车辆列表
+export function updateVehicle(data) {
+  return request({
+    url: '/md/vehicle',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除车辆列表
+export function delVehicle(vehicleId) {
+  return request({
+    url: '/md/vehicle/' + vehicleId,
+    method: 'delete'
+  })
+}

src/api/mes/md/vehicleDispatch.js

+import request from '@/utils/request'
+
+// 查询派车记录列表
+export function listVehicleDispatch(query) {
+  return request({
+    url: '/md/vehicleDispatch/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询派车记录详细
+export function getVehicleDispatch(dispatchId) {
+  return request({
+    url: '/md/vehicleDispatch/' + dispatchId,
+    method: 'get'
+  })
+}
+
+// 新增派车记录
+export function addVehicleDispatch(data) {
+  return request({
+    url: '/md/vehicleDispatch',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改派车记录
+export function updateVehicleDispatch(data) {
+  return request({
+    url: '/md/vehicleDispatch',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除派车记录
+export function delVehicleDispatch(dispatchId) {
+  return request({
+    url: '/md/vehicleDispatch/' + dispatchId,
+    method: 'delete'
+  })
+}

src/assets/styles/page-form.scss

 .page-form.el-form--inline {
-  .el-form-item {
-    display: flex;
-    .el-form-item__content {
-      flex: 1;
-      .el-date-editor {
-        width: 100%;
+  .el-row {
+    .el-col {
+      min-height: 51px;
+      .el-form-item {
+        display: flex;
+        .el-form-item__content {
+          flex: 1;
+          .el-date-editor {
+            width: 100%;
+          }
+          .el-select {
+            width: 100%;
+          }
+        }
       }
     }
   }

src/components/SapPropertyData/index.vue

@@ -76,6 +76,7 @@ export default {
         if (valid) {
           this.loading = true
           this.form.sapData = JSON.stringify(this.sapData)
+          console.log(this.form)
           let handleEdit = this.form.id ? updateData : addData
           handleEdit(this.form).then(() => this.$message.success('操作成功')).finally(() => this.loading = false)
         } else {
@@ -126,6 +127,7 @@ export default {
       this.$refs.form && this.$refs.form.resetFields()
       this.form.type = type
       this.form.relationId = relationId
+      this.form.viewType = viewType
       let sapData = {}
       // 获取sap特性列表
       listByType({type, viewType}).then(res => {

src/views/mes/md/client/components/ClientContact.vue

@@ -8,7 +8,6 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['md:contact:add']"
         >新增
         </el-button>
       </el-col>
@@ -20,7 +19,6 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['md:contact:edit']"
         >修改
         </el-button>
       </el-col>
@@ -32,43 +30,30 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['md:contact:remove']"
         >删除
         </el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['md:contact:export']"
-        >导出
-        </el-button>
-      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="contactList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center"/>
-      <el-table-column label="品牌名称" align="center" prop="brandName" width="150"/>
-      <el-table-column label="部门" align="center" prop="department" width="100"/>
-      <el-table-column label="职位" align="center" prop="position" width="100"/>
-      <el-table-column label="联系人" align="center" prop="contact" width="100"/>
-      <el-table-column label="电话号码" align="center" prop="tel" width="150"/>
-      <el-table-column label="email" align="center" prop="email" width="200"/>
-      <el-table-column label="经营类型" align="center" prop="businessType" width="100"/>
-      <el-table-column label="工厂代号" align="center" prop="factoryCode" width="100"/>
-      <el-table-column label="跟单员" align="center" prop="merchandiser" width="100"/>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="200px">
+      <el-table-column type="selection" width="55"/>
+      <el-table-column label="品牌名称" prop="brandName" width="150"/>
+      <el-table-column label="部门" prop="department" width="100"/>
+      <el-table-column label="职位" prop="position" width="100"/>
+      <el-table-column label="联系人" prop="contact" width="100"/>
+      <el-table-column label="电话号码" prop="tel" width="150"/>
+      <el-table-column label="email" prop="email" width="200"/>
+      <el-table-column label="经营类型" prop="businessType" width="100"/>
+      <el-table-column label="工厂代号" prop="factoryCode" width="100"/>
+      <el-table-column label="跟单员" prop="merchandiser" width="100"/>
+      <el-table-column label="操作" class-name="small-padding fixed-width" fixed="right" width="120">
         <template slot-scope="scope">
           <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['md:contact:edit']"
           >修改
           </el-button>
           <el-button
@@ -76,7 +61,6 @@
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['md:contact:remove']"
           >删除
           </el-button>
         </template>

src/views/mes/md/client/components/ClientItem.vue

@@ -9,7 +9,6 @@
           size="mini"
           @click="handleAdd"
           :disabled="!queryParams.clientId"
-          v-hasPermi="['md:clientItem:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -20,7 +19,6 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['md:clientItem:edit']"
         >修改</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -31,7 +29,6 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['md:clientItem:remove']"
         >删除</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -42,21 +39,19 @@
       <el-table-column label="产品" prop="itemName" />
       <el-table-column label="客户产品名称" prop="clientItemName" />
       <el-table-column label="客户产品编码" prop="clientItemCode" />
-      <el-table-column label="操作" class-name="small-padding fixed-width">
+      <el-table-column label="操作" width="120">
         <template slot-scope="scope">
           <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['md:clientItem:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['md:clientItem:remove']"
           >删除</el-button>
         </template>
       </el-table-column>

src/views/mes/md/client/components/PaymentRelation.vue

@@ -8,7 +8,6 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['md:relation:add']"
         >新增
         </el-button>
       </el-col>
@@ -20,7 +19,6 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['md:relation:edit']"
         >修改
         </el-button>
       </el-col>
@@ -32,39 +30,23 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['md:relation:remove']"
         >删除
         </el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['md:relation:export']"
-        >导出
-        </el-button>
-      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="relationList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center"/>
-      <el-table-column label="客户id" align="center" prop="clientId"/>
-      <el-table-column label="支付方客户ID" align="center" prop="relatedClientId"/>
-      <el-table-column label="创建人" align="center" prop="createBy"/>
-      <el-table-column label="创建时间" align="center" prop="createTime"/>
-      <el-table-column label="修改时间" align="center" prop="updateTime"/>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column type="selection" width="55"/>
+      <el-table-column label="支付方客户编码" prop="relatedCode"/>
+      <el-table-column label="支付方客户名称" prop="relatedName"/>
+      <el-table-column label="操作" class-name="small-padding fixed-width" width="120">
         <template slot-scope="scope">
           <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['md:relation:edit']"
           >修改
           </el-button>
           <el-button
@@ -72,7 +54,6 @@
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['md:relation:remove']"
           >删除
           </el-button>
         </template>
@@ -90,8 +71,10 @@
     <!-- 添加或修改客户付款信息关联对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="支付方客户ID" prop="relatedClientId" label-width="8em">
-          <el-input v-model="form.relatedClientId" placeholder="请输入支付方客户ID"/>
+        <el-form-item label="支付方客户" prop="relatedClientId" label-width="8em">
+          <el-select v-model="form.relatedClientId" placeholder="请选择支付方客户" @focus="getClientList()" clearable filterable remote :remote-method="getClientList">
+            <el-option v-for="item in clientList" :key="item.clientId" :value="item.clientId" :label="item.clientName"/>
+          </el-select>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -104,6 +87,7 @@
 
 <script>
 import {listRelation, getRelation, delRelation, addRelation, updateRelation} from "@/api/mes/md/clientPaymentRelation";
+import { listClient } from '@/api/mes/md/client'
 
 export default {
   name: "Relation",
@@ -139,6 +123,7 @@ export default {
       },
       // 表单参数
       form: {},
+      clientList: [],
       // 表单校验
       rules: {
         relatedClientId: [{
@@ -147,9 +132,6 @@ export default {
       }
     };
   },
-  created() {
-    this.getList();
-  },
   methods: {
     /** 查询客户付款信息关联列表 */
     getList() {
@@ -249,6 +231,10 @@ export default {
         ...this.queryParams
       }, `relation_${new Date().getTime()}.xlsx`)
     },
+
+    getClientList(key) {
+      listClient({ clientName: key, pageNum: 1, pageSize: 100 }).then(res => this.clientList = res.rows)
+    },
     init(form) {
       if (!form.clientId) return
       this.queryParams.clientId = form.clientId

src/views/mes/md/client/components/UrgeEmail.vue

@@ -9,7 +9,6 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['md:email:add']"
         >新增
         </el-button>
       </el-col>
@@ -21,7 +20,6 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['md:email:edit']"
         >修改
         </el-button>
       </el-col>
@@ -33,42 +31,28 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['md:email:remove']"
         >删除
         </el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['md:email:export']"
-        >导出
-        </el-button>
-      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="emailList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center"/>
-      <el-table-column label="客户id" align="center" prop="clientId"/>
-      <el-table-column label="邮箱" align="center" prop="email"/>
-      <el-table-column label="联系人" align="center" prop="contact"/>
-      <el-table-column label="是否启用" align="center" prop="enableFlag">
+      <el-table-column type="selection" width="55"/>
+      <el-table-column label="邮箱" prop="email"/>
+      <el-table-column label="联系人" prop="contact"/>
+      <el-table-column label="是否启用" prop="enableFlag">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.enableFlag"/>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" class-name="small-padding fixed-width" width="120">
         <template slot-scope="scope">
           <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['md:email:edit']"
           >修改
           </el-button>
           <el-button
@@ -76,7 +60,6 @@
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['md:email:remove']"
           >删除
           </el-button>
         </template>

src/views/mes/md/client/index.vue

@@ -533,10 +533,10 @@ export default {
     },
     //自动生成编码
     handleAutoGenChange(autoGenFlag){
-      debugger;
       if(autoGenFlag){
         genCode('CLIENT_CODE').then(response =>{
           this.form.clientCode = response;
+          this.$forceUpdate()
         });
       }else{
         this.form.clientCode = null;

src/views/mes/md/product/components/backFaceColor.vue

 <!--产品正反面颜色-->
 <template>
-<!--  v-hasPermi="['mes:md:faceColor:add']"
-  v-hasPermi="['mes:md:faceColor:remove']"
-  v-hasPermi="['mes:md:faceColor:remove']"
-  v-hasPermi="['mes:md:faceColor:edit']"-->
   <div class="app-container">
     <el-row :gutter="10" class="mb8" v-if="optType !='view'">
       <el-col :span="1.5">
@@ -13,7 +9,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-
+          v-hasPermi="['mes:md:faceColor:add']"
         >新增</el-button>
         <ColorSelect ref="colorSelect" @onSelected="onColorSelected" > </ColorSelect>
       </el-col>
@@ -25,7 +21,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-
+          v-hasPermi="['mes:md:faceColor:remove']"
         >删除</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -52,14 +48,14 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-
+            v-hasPermi="['mes:md:faceColor:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-
+            v-hasPermi="['mes:md:faceColor:remove']"
           >删除</el-button>
         </template>
       </el-table-column>

src/views/mes/md/product/components/customerLoss.vue

@@ -9,6 +9,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
+          v-hasPermi="['md:loss:add']"
           >新增</el-button
         >
       </el-col>
@@ -20,6 +21,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
+          v-hasPermi="['md:loss:edit']"
           >修改</el-button
         >
       </el-col>
@@ -31,6 +33,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
+          v-hasPermi="['md:loss:remove']"
           >删除</el-button
         >
       </el-col>
@@ -69,6 +72,7 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
+            v-hasPermi="['md:loss:edit']"
             >修改</el-button
           >
           <el-button
@@ -76,6 +80,7 @@
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
+            v-hasPermi="['md:loss:remove']"
             >删除</el-button
           >
         </template>

src/views/mes/md/product/components/faceColor.vue

@@ -9,6 +9,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
+          v-hasPermi="['mes:md:faceColor:add']"
         >新增</el-button>
         <ColorSelect ref="colorSelect" @onSelected="onColorSelected" > </ColorSelect>
       </el-col>
@@ -20,6 +21,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
+          v-hasPermi="['mes:md:faceColor:remove']"
         >删除</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -46,12 +48,14 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
+            v-hasPermi="['mes:md:faceColor:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
+            v-hasPermi="['mes:md:faceColor:remove']"
           >删除</el-button>
         </template>
       </el-table-column>

src/views/mes/md/product/components/factory.vue

@@ -9,6 +9,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
+          v-hasPermi="['md:factory:add']"
           >新增</el-button
         >
         <FactorySelect ref="FactorySelectRef" @onSelected="onFactorySelect" />
@@ -21,6 +22,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
+          v-hasPermi="['md:factory:remove']"
           >删除</el-button
         >
       </el-col>
@@ -31,6 +33,7 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
+          v-hasPermi="['md:factory:export']"
           >导出</el-button
         >
       </el-col>
@@ -97,6 +100,7 @@
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
+            v-hasPermi="['md:factory:remove']"
             >删除</el-button
           >
         </template>

src/views/mes/md/vehicle/components/singleSelect.vue

+<template>
+  <el-dialog
+    title="车辆选择"
+    v-if="showFlag"
+    :visible.sync="showFlag"
+    :modal="true"
+    width="80%"
+    center
+    append-to-body
+  >
+    <el-row :gutter="20">
+      <el-col :span="20" :xs="24">
+        <el-form
+          :model="queryParams"
+          ref="queryForm"
+          size="small"
+          :inline="true"
+          v-show="showSearch"
+          label-width="68px"
+        >
+          <el-form-item label="车辆名称" prop="vehicleName">
+            <el-input
+              v-model="queryParams.vehicleName"
+              placeholder="请输入车辆名称"
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="车牌号" prop="licensePlate">
+            <el-input
+              v-model="queryParams.licensePlate"
+              placeholder="请输入车牌号"
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item>
+            <el-button
+              type="primary"
+              icon="el-icon-search"
+              size="mini"
+              @click="handleQuery"
+              >搜索</el-button
+            >
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+              >重置</el-button
+            >
+          </el-form-item>
+        </el-form>
+        <el-table
+          v-loading="loading"
+          :data="vehicleList"
+          @current-change="handleCurrent"
+          @row-dblclick="handleRowDbClick"
+        >
+          <el-table-column width="50" align="center">
+            <template v-slot="scope">
+              <el-radio
+                v-model="selectedVehicleId"
+                :label="scope.row.vehicleId"
+                @change="handleRowChange(scope.row)"
+                >{{ "" }}</el-radio
+              >
+            </template>
+          </el-table-column>
+          <el-table-column label="车辆编码" align="center" prop="vehicleCode"/>
+          <el-table-column label="车辆名称" align="center" prop="vehicleName" />
+          <el-table-column label="车牌号" align="center" prop="licensePlate" />
+          <el-table-column label="车型" align="center" prop="vehicleModel">
+            <template slot-scope="scope">
+              <dict-tag
+                :options="dict.type.vehicle_model"
+                :value="scope.row.vehicleModel"
+              />
+            </template>
+          </el-table-column>
+          <el-table-column label="座位数" align="center" prop="seating" />
+          <el-table-column label="购买时间" align="center" prop="purchaseDate" width="180">
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.purchaseDate, '{y}-{m}-{d}') }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="验车时间" align="center" prop="inspectionDate" width="180">
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.inspectionDate, '{y}-{m}-{d}') }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+
+        <pagination
+          v-show="total > 0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
+      </el-col>
+    </el-row>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="confirmSelect">确 定</el-button>
+      <el-button @click="showFlag = false">取 消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+
+import { listVehicle } from "@/api/mes/md/vehicle";
+
+export default {
+  name: "MdItemSingle",
+  dicts: ["sys_yes_no", "mes_item_product"],
+  components: {  },
+  data() {
+    return {
+      showFlag: false,
+      // 选中数组
+      selectedVehicleId: undefined,
+      selectedRows: undefined,
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 物料产品表格数据
+      vehicleList: null,
+      // 部门树选项
+      itemTypeOptions: undefined,
+      // 部门名称
+      itemTypeName: undefined,
+      defaultProps: {
+        children: "children",
+        label: "label",
+      },
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        itemCode: undefined,
+        itemName: undefined,
+        itemTypeId: 0,
+      },
+      // 列信息
+      columns: [
+        { key: 0, label: `物料/产品编码`, visible: true },
+        { key: 1, label: `物料/产品名称`, visible: true },
+        { key: 2, label: `规格型号`, visible: true },
+        { key: 3, label: `单位`, visible: true },
+        { key: 4, label: `物料/产品`, visible: true },
+        { key: 5, label: `物料分类`, visible: true },
+        { key: 6, label: `创建时间`, visible: true },
+        { key: 7, label: `备注`, visible: true },
+      ],
+    };
+  },
+  watch: {
+    // 根据名称筛选分类树
+    itemTypeName(val) {
+      this.$refs.tree.filter(val);
+    },
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询物料编码列表 */
+    getList() {
+      this.loading = true;
+      listVehicle(this.queryParams).then((response) => {
+        this.vehicleList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 筛选节点
+    filterNode(value, data) {
+      if (!value) return true;
+      return data.label.indexOf(value) !== -1;
+    },
+    // 节点单击事件
+    handleNodeClick(data) {
+      this.queryParams.itemTypeId = data.id;
+      this.handleQuery();
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    handleCurrent(row) {
+      if (row) {
+        this.selectedRows = row;
+      }
+    },
+    handleRowDbClick(row) {
+      if (row) {
+        this.selectedRows = row;
+        this.$emit("onSelected", this.selectedRows);
+        this.showFlag = false;
+      }
+    },
+    // 单选选中数据
+    handleRowChange(row) {
+      if (row) {
+        this.selectedRows = row;
+      }
+    },
+    //确定选中
+    confirmSelect() {
+      if (this.selectedVehicleId == null || this.selectedVehicleId == 0) {
+        this.$notify({
+          title: "提示",
+          type: "warning",
+          message: "请至少选择一条数据!",
+        });
+        return;
+      }
+      this.$emit("onSelected", this.selectedRows);
+      this.showFlag = false;
+    },
+  },
+};
+</script>

src/views/mes/md/vehicleDispatch/components/dispatchAdd.vue

+<template>
+  <!-- 车辆派送 -->
+  <el-dialog :title="title" v-if="showFlag" :visible.sync="showFlag" width="700px" append-to-body>
+    <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="派车编号" prop="dispatchCode" disabled="" v-if="form.dispatchId != null">
+            <el-input v-model="form.dispatchCode" placeholder="请输入派车编号" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="用车说明" prop="dispatchTitle">
+            <el-input v-model="form.dispatchTitle" placeholder="请输入名称" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="车辆" prop="vehicleId">
+            <el-input
+              v-model="form.vehicleName"
+              readonly
+              placeholder="请选择车辆"
+            >
+              <el-button
+                slot="append"
+                icon="el-icon-search"
+                @click="$refs['VehicleSelectRef'].showFlag = true"
+              ></el-button>
+            </el-input>
+            <VehicleSelect
+              ref="VehicleSelectRef"
+              @onSelected="onVehicleSelect"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="驾驶人" prop="driverBy">
+            <el-input v-model="form.driverBy" placeholder="请输入驾驶人" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="派车时间" prop="dispatchDate">
+            <el-date-picker clearable
+                            v-model="form.dispatchDate"
+                            type="date"
+                            value-format="yyyy-MM-dd"
+                            placeholder="请选择派车时间">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="派时里程" prop="startMileage">
+            <el-input v-model="form.startMileage" placeholder="请输入派时里程" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="备注" prop="remark">
+            <el-input v-model="form.remark" placeholder="请输入备注" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="submitForm" v-if="optType !='view'">确 定</el-button>
+      <el-button @click="cancel">取 消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+  import { getVehicleDispatch, addVehicleDispatch, updateVehicleDispatch } from "@/api/mes/md/vehicleDispatch";
+  import VehicleSelect from "@/views/mes/md/vehicle/components/singleSelect.vue";
+  import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+
+  export default {
+    name: "DispatchBack",
+    dicts: ["sys_yes_no", "mes_item_product"],
+    components: { VehicleSelect },
+    data() {
+      return {
+        showFlag: false,
+        dispatchId: null,
+        optType:null,
+        // 表单参数
+        form: {
+          dispatchId: null,
+          dispatchCode: null,
+          dispatchTitle: null,
+          vehicleId: null,
+          vehicleName: null,
+          dispatchBy: null,
+          driverBy: null,        dispatchDate: null,
+          backDate: null,        travelMileage: null,
+          startMileage: null,        endMileage: null,
+          oilConsumption: null,        remark: null},
+        // 表单校验
+        rules: {
+          vehicleId: [
+            { required: true, message: "车辆不能为空", trigger: "blur" }
+          ],
+          vehicleId: [
+            { required: true, message: "车辆不能为空", trigger: "blur" }
+          ],
+        },
+        title:'确认派送'
+      };
+    },
+    created() {
+
+    },
+    methods: {
+      // 取消按钮
+      cancel() {
+        this.showFlag = false;
+        this.reset();
+      },
+      // 表单重置
+      reset() {
+        this.form = {
+          dispatchId: null,
+          dispatchCode: null,
+          dispatchTitle: null,
+          vehicleId: null,
+          vehicleName: null,
+          dispatchBy: null,
+          driverBy: null,        dispatchDate: null,
+          backDate: null,        travelMileage: null,
+          startMileage: null,        endMileage: null,
+          oilConsumption: null,        remark: null
+        };
+        this.resetForm("form");
+      },
+      onVehicleSelect(row) {
+        if (row != undefined && row != null) {
+          this.form.vehicleId = row.vehicleId;
+          this.form.vehicleName = row.vehicleName;
+        }
+      },
+      submitForm() {
+        this.$refs["form"].validate(valid => {
+          if (valid) {
+            if (this.form.dispatchId != null) {
+              updateVehicleDispatch(this.form).then(response => {
+                this.$modal.msgSuccess("修改成功");
+                this.showFlag=false;
+                this.$emit("reload");
+              });
+            } else {
+              addVehicleDispatch(this.form).then(response => {
+                this.$modal.msgSuccess("新增成功");
+                this.showFlag=false;
+                this.$emit("reload");
+              });
+            }
+          }
+        });
+      },
+    },
+  };
+</script>

src/views/mes/md/vehicleDispatch/components/dispatchBack.vue

+<template>
+  <!-- 车辆回收 -->
+  <el-dialog :title="title" v-if="showFlag" :visible.sync="showFlag"
+             :modal="true" width="900px" append-to-body>
+    <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-row>
+        <el-col :md="8" :xs="12">
+            <el-form-item label="派车编号" prop="dispatchCode" v-if="form.dispatchId != null">
+              <el-input v-model="form.dispatchCode" disabled placeholder="请输入派车编号" />
+            </el-form-item>
+        </el-col>
+        <el-col :md="8" :xs="12">
+          <el-form-item label="名称" prop="dispatchTitle">
+            <el-input v-model="form.dispatchTitle" disabled placeholder="请输入名称" />
+          </el-form-item>
+        </el-col>
+        <el-col :md="8" :xs="12">
+          <el-form-item label="车辆" prop="vehicleId">
+            <el-input
+              v-model="form.vehicleName"
+              disabled
+              placeholder="请选择车辆"
+            >
+              <el-button
+                slot="append"
+                icon="el-icon-search"
+                @click="$refs['VehicleSelectRef'].showFlag = true"
+              ></el-button>
+            </el-input>
+            <VehicleSelect
+              ref="VehicleSelectRef"
+              @onSelected="onVehicleSelect"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :md="8" :xs="12">
+          <el-form-item label="派车人" prop="dispatchBy">
+            <el-input v-model="form.dispatchBy" disabled placeholder="请输入派车人" />
+          </el-form-item>
+        </el-col>
+        <el-col :md="8" :xs="12">
+          <el-form-item label="驾驶人" prop="driverBy">
+            <el-input v-model="form.driverBy" disabled placeholder="请输入驾驶人" />
+          </el-form-item>
+        </el-col>
+        <el-col :md="8" :xs="12">
+          <el-form-item label="派车时间" required prop="dispatchDate">
+            <el-date-picker clearable readonly
+                            v-model="form.dispatchDate"
+                            type="date"
+                            disabled
+                            value-format="yyyy-MM-dd"
+                            placeholder="请选择派车时间">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+        <el-col :md="8" :xs="12">
+          <el-form-item label="派时总里程" prop="startMileage">
+            <el-input v-model="form.startMileage" disabled placeholder="请输入派时里程"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :md="8" :xs="12">
+          <el-form-item label="返回时间" prop="backDate">
+            <el-date-picker clearable
+                            v-model="form.backDate"
+                            type="date"
+                            value-format="yyyy-MM-dd"
+                            placeholder="请选择返回时间">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+        <el-col :md="8" :xs="12">
+          <el-form-item label="还车总里程" prop="endMileage">
+            <el-input v-model="form.endMileage" placeholder="请输入还车里程"  @change="mileageCalculate"/>
+          </el-form-item>
+        </el-col>
+        <el-col :md="8" :xs="12">
+          <el-form-item label="本次里程数" prop="travelMileage">
+            <el-input v-model="form.travelMileage" placeholder="请输入本次里程数"/>
+          </el-form-item>
+        </el-col>
+        <el-col :md="8" :xs="12">
+          <el-form-item label="耗油量" prop="oilConsumption">
+            <el-input v-model="form.oilConsumption" placeholder="请输入耗油量" />
+          </el-form-item>
+        </el-col>
+        <el-col :md="8" :xs="12">
+          <el-form-item label="备注" prop="remark">
+            <el-input v-model="form.remark" placeholder="请输入备注" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="submitForm" v-if="optType !='view'">确 定</el-button>
+      <el-button  @click="showFlag = false">取 消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getVehicleDispatch, addVehicleDispatch, updateVehicleDispatch } from "@/api/mes/md/vehicleDispatch";
+import VehicleSelect from "@/views/mes/md/vehicle/components/singleSelect.vue";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+
+export default {
+  name: "DispatchBack",
+  dicts: ["sys_yes_no", "mes_item_product"],
+  components: { VehicleSelect },
+  data() {
+    return {
+      showFlag: false,
+      dispatchId: null,
+      optType:null,
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        backDate: [
+          { required: true, message: "返回时间不能为空", trigger: "blur" }
+        ],
+      },
+      title:'确认派送'
+    };
+  },
+  created() {
+
+  },
+  methods: {
+    // 取消按钮
+    cancel() {
+      this.showFlag = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        dispatchId: null,
+        dispatchCode: null,
+        dispatchTitle: null,
+        vehicleId: null,
+        dispatchBy: null,
+        driverBy: null,        dispatchDate: null,
+        backDate: null,        travelMileage: null,
+        startMileage: null,        endMileage: null,
+        oilConsumption: null,        remark: null
+      };
+      this.resetForm("form");
+    },
+    mileageCount(){
+
+    },
+    onVehicleSelect(row) {
+      if (row != undefined && row != null) {
+        this.form.itemId = row.itemId;
+        this.form.itemName = row.itemName;
+        this.form.unit = row.unitOfMeasure;
+      }
+    },
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          updateVehicleDispatch(this.form).then(response => {
+            this.$modal.msgSuccess("修改成功");
+            this.showFlag=false;
+            this.$emit("reload");
+          });
+        }
+      });
+    },
+    mileageCalculate(){
+      if(this.form.startMileage!=null&&this.form.endMileage!=null){
+        this.form.travelMileage = this.form.endMileage-this.form.startMileage;
+      }
+    }
+  },
+};
+</script>

src/views/mes/order/sales/index.vue

@@ -125,14 +125,14 @@
             v-hasPermi="['od:salesOrder:remove']"
           >删除
           </el-button>
-          <el-button
+<!--          <el-button
             size="mini"
             type="text"
             icon="el-icon-refresh"
             @click="onSync(scope.row)"
             v-hasPermi="['od:salesOrder:edit']"
           >同步
-          </el-button>
+          </el-button>-->
         </template>
       </el-table-column>
     </el-table>

src/views/mes/order/salesdetail/index.vue

@@ -254,7 +254,7 @@
       </el-tab-pane>
     </el-tabs>
 
-    <el-dialog :visible="showEditDetail" title="订单详情" width="1200px">
+    <el-dialog :visible.sync="showEditDetail" title="订单详情" width="1200px">
       <el-form :model="itemForm" ref="itemForm" :rules="itemRules" label-width="100px">
         <el-row :gutter="10">
           <el-col :span="8">