用车计算等

ant-design-vue-jeecg/src/views/tms/basicdata/iogisticsprice/TmsIogisticsPriceList.vue

@@ -26,8 +26,8 @@
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="车型">
+              <a-form-item label="运输类型">
-                <a-input placeholder="请输入车型" v-model="queryParam.carType"></a-input>
+                <a-input placeholder="请输入运输类型" v-model="queryParam.carType"></a-input>
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">

ant-design-vue-jeecg/src/views/tms/carinout/deliveryplan/modules/TakeDeliverPhoneForm.vue

@@ -143,7 +143,14 @@
             httpAction(this.url.take,this.model,'post').then((res)=>{
               if(res.success){
                 this.$message.success(res.message);
-                this.model = {}
+                this.model.logistics = ''
+                this.model.carNum = ''
+                this.model.driverName = ''
+                this.model.driverIdCard = ''
+                this.model.driverTel = ''
+                this.model.etaTime = ''
+                this.model.enterFactoryDoor = ''
+                this.model.exitFactoryDoor = ''
               }else{
                 this.$message.warning(res.message);
               }

ant-design-vue-jeecg/src/views/tms/carinout/deliveryplan/modules/TakeForm.vue

@@ -28,6 +28,11 @@
               <j-date v-model="model.etaTime" placeholder="请选择时间" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%;"></j-date>
             </a-form-model-item>
           </a-col>
+          <a-col :span="8">
+            <a-form-model-item label="车牌号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="carNum">
+              <a-input v-model.trim="model.carNum" placeholder="请输入车牌号"  ></a-input>
+            </a-form-model-item>
+          </a-col>
           <a-col :span="8">
             <a-form-model-item label="进厂门" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="enterFactoryDoor">
               <a-input v-model.trim="model.enterFactoryDoor" placeholder="请输入进厂门"  ></a-input>

ant-design-vue-jeecg/src/views/tms/carinout/vehicleinout/modules/VehicleInOutForm.vue

@@ -168,10 +168,10 @@
         this.visible = true;
       },
       submitForm () {
-        if (this.model.efType == '0' && !this.model.po) {
+        // if (this.model.efType == '0' && !this.model.po) {
-          this.$message.warning('入厂类型为送货时，采购单号必填！');
+        //   this.$message.warning('入厂类型为送货时，采购单号必填！');
-          return;
+        //   return;
-        }
+        // }
         if (this.model.efType == '1' && !this.model.vdNo) {
           this.$message.warning('入厂类型为提货时，用车需求编号必填！');
           return;

ant-design-vue-jeecg/src/views/tms/outbound/vehicledemand/VehicleDemandList.vue

@@ -182,7 +182,7 @@
       return {
         description: '用车需求管理页面',
         queryParam: {
-          shipDate_begin: moment().format('YYYY-MM-DD'),
+          shipDate_begin: moment().subtract(3, 'days').format('YYYY-MM-DD'),
           shipDate_end: moment().format('YYYY-MM-DD'),
         },
         click: '',
@@ -307,6 +307,7 @@
         postAction(this.url.carCount, record).then(res => {
           if (res.success) {
             this.$message.success(res.message);
+            this.loadData();
           } else {
             this.$message.error(res.message);
           }

ant-design-vue-jeecg/src/views/tms/outbound/vehicledemandcount/modules/TakeForm.vue

@@ -35,7 +35,7 @@
           </a-col>
           <a-col :span="8">
             <a-form-model-item label="供应商编码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="supplierCode">
-              <a-input v-model.trim="model.supplierCode" placeholder="请输入供应商编码" disabled/>
+              <a-input v-model.trim="model.supplierCode" placeholder="请输入供应商编码"/>
             </a-form-model-item>
           </a-col>
           <a-col :span="8">
@@ -48,9 +48,10 @@
               <a-input v-model.trim="model.carNum" placeholder="请输入车牌号"  ></a-input>
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
+          <a-col :span="8">
-            <a-form-model-item label="物流公司" :labelCol="{ span: 2 }" :wrapperCol="{ span: 22 }" prop="logistics">
+            <a-form-model-item label="物流公司" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="logistics">
-              <a-auto-complete v-model="model.logistics" placeholder="请输入物流公司"  @select="logisticsSelect" @change="logisticsChange" :dataSource="logisticsList"></a-auto-complete>
+              <a-input v-model="model.logistics" placeholder="请输入物流公司"></a-input>
+              <!-- <a-auto-complete v-model="model.logistics" placeholder="请输入物流公司"  @select="logisticsSelect" @change="logisticsChange" :dataSource="logisticsList"></a-auto-complete> -->
             </a-form-model-item>
           </a-col>
           <a-col :span="8">

ant-design-vue-jeecg/src/views/tms/outbound/vehicledemandcount/modules/TakePhoneForm.vue

@@ -35,7 +35,7 @@
       </a-col>
       <a-col>
         <a-form-model-item label="供应商编码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="supplierCode">
-          <a-input v-model.trim="model.supplierCode" placeholder="请输入供应商编码" disabled/>
+          <a-input v-model.trim="model.supplierCode" placeholder="请输入供应商编码"/>
         </a-form-model-item>
       </a-col>
       <a-col>
@@ -45,7 +45,7 @@
       </a-col>
       <a-col>
         <a-form-model-item label="物流公司" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="logistics">
-          <a-auto-complete v-model="model.logistics" placeholder="请输入物流公司"></a-auto-complete>
+          <a-input v-model="model.logistics" placeholder="请输入物流公司"></a-input>
           <!-- <a-auto-complete v-model="model.logistics" placeholder="请输入物流公司"  @select="logisticsSelect" @change="logisticsChange" :dataSource="logisticsList"></a-auto-complete> -->
         </a-form-model-item>
       </a-col>
@@ -95,6 +95,7 @@
   <script>
   import { httpAction, getAction } from '@/api/manage'
   import { validateDuplicateValue } from '@/utils/util'
+  import { validateCarNumber, validateTel } from '@/utils/validators';
 
   export default {
     data() {
@@ -119,11 +120,15 @@
           pickUpHub :[{required: true, message: '请选择取货仓库!'}],
           deliveryAddress :[{required: true, message: '请选择送货地点!'}],
           supplierCode :[{required: true, message: '请选择供应商编码!'}],
-          carNum :[{required: true, message: '请输入车牌号!'}],
+          carNum :[{required: true, message: '请输入车牌号!'},
+            { validator: validateCarNumber, trigger: 'blur' }
+          ],
           logistics :[{required: true, message: '请输入物流公司!'}],
           driverName :[{required: true, message: '请输入司机姓名!'}],
           // driverIdCard :[{required: true, message: '请输入身份证!'}],
-          driverTel :[{required: true, message: '请输入电话!'}],
+          driverTel :[{required: true, message: '请输入电话!'},
+            { validator: validateTel, trigger: 'blur' }
+          ],
           etaTime :[{required: true, message: '请选择时间!'}],
         },
         url:{
@@ -182,6 +187,14 @@
             httpAction(this.url.take,this.model,'post').then((res)=>{
               if(res.success){
                 this.$message.success(res.message);
+                this.model.logistics = ''
+                this.model.carNum = ''
+                this.model.driverName = ''
+                this.model.driverIdCard = ''
+                this.model.driverTel = ''
+                this.model.etaTime = ''
+                this.model.enterFactoryDoor = ''
+                this.model.exitFactoryDoor = ''
               }else{
                 this.$message.warning(res.message);
               }