7/19

src/views/main/tmsaip/TmsForwarderOrder/details.vue

@@ -427,23 +427,13 @@
               <vxe-column field="containerPickTime" title="提箱时间" :edit-render="{}">
                 <template #edit="{ row }">
                   <!-- <a-date-picker format="YYYY-MM-DD HH:mm:ss" show-time v-model="row.dispatchTime" allowClear /> -->
-                  <vxe-input
+                  <vxe-input v-model="row.containerPickTime" type="datetime" :disabled="true" transfer></vxe-input>
-                    v-model="row.containerPickTime"
-                    type="datetime"
-                    :disabled="type == 'Details'"
-                    transfer
-                  ></vxe-input>
                 </template>
               </vxe-column>
               <vxe-column field="containerReturnTime" title="返场时间" :edit-render="{}">
                 <template #edit="{ row }">
                   <!-- <a-date-picker format="YYYY-MM-DD HH:mm:ss" show-time v-model="row.dispatchTime" allowClear /> -->
-                  <vxe-input
+                  <vxe-input v-model="row.containerReturnTime" type="datetime" :disabled="true" transfer></vxe-input>
-                    v-model="row.containerReturnTime"
-                    type="datetime"
-                    :disabled="type == 'Details'"
-                    transfer
-                  ></vxe-input>
                 </template>
               </vxe-column>
               <vxe-column field="carLicense" title="车牌号" :edit-render="{}">

src/views/main/tmsaip/tmsCar/addForm.vue

@@ -29,7 +29,7 @@
                 </a-select-option>
               </a-select> -->
               <a-select
-                v-decorator="['driverId', { rules: [{ required: true, message: '请选择司机！' }] }]"
+                v-decorator="['driverId']"
                 allow-clear
                 placeholder="请选择司机"
                 show-search
@@ -56,9 +56,9 @@
                 <a-select-option value="2">
                   社会车辆
                 </a-select-option>
-                <a-select-option value="3">
+                <!-- <a-select-option value="3">
                   加盟车辆
-                </a-select-option>
+                </a-select-option> -->
               </a-select>
             </a-form-item>
           </a-col>

src/views/main/tmsaip/tmsCar/editForm.vue

@@ -20,10 +20,7 @@
           </a-col>
           <a-col :span="24">
             <a-form-item label="司机" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-              <a-select
+              <a-select placeholder="请选择司机" v-decorator="['driverId']">
-                placeholder="请选择司机"
-                v-decorator="['driverId', { rules: [{ required: true, message: '请选择司机！' }] }]"
-              >
                 <a-select-option v-for="item in listAllData" :key="item.id" :value="item.id">
                   {{ item.name }}
                 </a-select-option>
@@ -42,9 +39,9 @@
                 <a-select-option value="2">
                   社会车辆
                 </a-select-option>
-                <a-select-option value="3">
+                <!-- <a-select-option value="3">
                   加盟车辆
-                </a-select-option>
+                </a-select-option> -->
               </a-select>
             </a-form-item>
           </a-col>

src/views/main/tmsaip/tmsTruckerOrder/index.vue

@@ -512,7 +512,7 @@ export default {
           title: '客户名称',
           align: 'center',
           width: '80',
-          dataIndex: 'carGroupId'
+          dataIndex: 'forwarderName'
         },
         {
           title: '派车日期',
@@ -583,7 +583,7 @@ export default {
             title: '客户名称',
             align: 'center',
             width: '80',
-            dataIndex: 'carGroupId'
+            dataIndex: 'forwarderName'
           },
           {
             title: '派单日期',