wenhongquan 2 лет назад
Родитель
Сommit
baa63d5a05
3 измененных файлов с 432 добавлено и 516 удалено
  1. 302 385
      src/views/car/carInfo/add.vue
  2. 119 127
      src/views/car/work/addCarWork.vue
  3. 11 4
      src/views/car/work/schedule.vue

+ 302 - 385
src/views/car/carInfo/add.vue

@@ -1,390 +1,308 @@
 <template>
-    <div style="padding: 10px 15px">
-        <el-card class="box-card">
-            <template #header>
-                <div class="card-header">
-                    <span>车辆信息</span>
-                    <div>
-                        <el-button type="warning" @click="goBack()">取消</el-button>
-                        <el-button :loading="buttonLoading" type="primary" @click="submit()">保存</el-button>
-                    </div>
+  <div style="padding: 10px 15px">
+    <el-card class="box-card">
+      <template #header>
+        <div class="card-header">
+          <span>车辆信息</span>
+          <div>
+            <el-button type="warning" @click="goBack()">取消</el-button>
+            <el-button :loading="buttonLoading" type="primary" @click="submit()">保存</el-button>
+          </div>
+        </div>
+      </template>
+      <el-row>
+        <el-col :span="24">
+          <el-descriptions :column="3">
+            <el-descriptions-item>
+              <template #label>
+                <div style="display: inline-block;min-width: 100px;text-align: right"><span style="color: red">*</span> 车牌</div>
+              </template>
+              <div class="content-w">
+                <el-input v-model="form.carNum" placeholder="请输入车牌" />
+              </div>
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template #label>
+                <div style="display: inline-block;min-width: 100px;text-align: right"><span style="color: red">*</span> 车辆分类</div>
+              </template>
+              <div class="content-w">
+                <el-select v-model="form.carType" filterable placeholder="车辆分类">
+                  <el-option v-for="item in carTypeList" :key="item.dictValue" :label="item.dictLabel" :value="item.dictValue" />
+                </el-select>
+              </div>
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template #label>
+                <div style="display: inline-block;min-width: 100px;text-align: right"><span style="color: red">*</span> 业务分类</div>
+              </template>
+              <div class="content-w">
+                <el-select v-model="formParams.bussinessType" filterable placeholder="业务分类">
+                  <el-option v-for="item in bussinessTypeList" :key="item.dictValue" :label="item.dictLabel" :value="item.dictValue" />
+                </el-select>
+              </div>
+            </el-descriptions-item>
+
+            <el-descriptions-item>
+              <template #label>
+                <div style="display: inline-block;min-width: 100px;text-align: right"><span style="color: red">*</span> 所属网格</div>
+              </template>
+              <div class="content-w">
+                <el-input v-model="formParams.wangge" placeholder="请输入网格" />
+              </div>
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template #label>
+                <div style="display: inline-block;min-width: 100px;text-align: right"><span style="color: red">*</span> 能耗类型</div>
+              </template>
+              <div class="content-w">
+                <el-select v-model="formParams.energyType" filterable placeholder="业务分类">
+                  <el-option v-for="item in energyTypeList" :key="item.dictValue" :label="item.dictLabel" :value="item.dictValue" />
+                </el-select>
+              </div>
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template #label>
+                <div style="display: inline-block;min-width: 100px;text-align: right"><span style="color: red">*</span> 所属单位</div>
+              </template>
+              <div class="content-w">
+                <el-input v-model="formParams.dept" placeholder="请输入所属单位" />
+              </div>
+            </el-descriptions-item>
+
+            <el-descriptions-item>
+              <template #label>
+                <div style="display: inline-block;min-width: 100px;text-align: right">车辆编号</div>
+              </template>
+              <div class="content-w">
+                <el-input v-model="formParams.carNo" placeholder="请输入车牌编号" />
+              </div>
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template #label>
+                <div style="display: inline-block;min-width: 100px;text-align: right">车辆识别号</div>
+              </template>
+              <div class="content-w">
+                <div class="content-w">
+                  <el-input v-model="formParams.Identification" placeholder="请输入车牌识别号" />
                 </div>
-
-            </template>
-            <el-row>
-                <el-col :span="24">
-                    <el-descriptions :column="3">
-                        <el-descriptions-item>
-
-                            <template #label>
-                                <div style="display: inline-block;min-width: 100px;text-align: right">
-                                    <span style="color: red">*</span> 车牌
-                                </div>
-                            </template>
-                            <div class="content-w">
-                                <el-input v-model="form.carNum" placeholder="请输入车牌" />
-                            </div>
-                        </el-descriptions-item>
-                        <el-descriptions-item>
-
-                            <template #label>
-                                <div style="display: inline-block;min-width: 100px;text-align: right">
-                                    <span style="color: red">*</span> 车辆分类
-                                </div>
-                            </template>
-                            <div class="content-w">
-                                <el-select v-model="form.carType" filterable placeholder="车辆分类">
-                                    <el-option v-for="item in carTypeList" :key="item.dictValue" :label="item.dictLabel"
-                                        :value="item.dictValue" />
-                                </el-select>
-                            </div>
-                        </el-descriptions-item>
-                        <el-descriptions-item>
-
-                            <template #label>
-                                <div style="display: inline-block;min-width: 100px;text-align: right">
-                                    <span style="color: red">*</span> 业务分类
-                                </div>
-                            </template>
-                            <div class="content-w">
-                                <el-select v-model="formParams.bussinessType" filterable placeholder="业务分类">
-                                    <el-option v-for="item in bussinessTypeList" :key="item.dictValue"
-                                        :label="item.dictLabel" :value="item.dictValue" />
-                                </el-select>
-                            </div>
-                        </el-descriptions-item>
-
-                        <el-descriptions-item>
-
-                            <template #label>
-                                <div style="display: inline-block;min-width: 100px;text-align: right">
-                                    <span style="color: red">*</span> 所属网格
-                                </div>
-                            </template>
-                            <div class="content-w">
-                                <el-input v-model="formParams.wangge" placeholder="请输入网格" />
-                            </div>
-                        </el-descriptions-item>
-                        <el-descriptions-item>
-
-                            <template #label>
-                                <div style="display: inline-block;min-width: 100px;text-align: right">
-                                    <span style="color: red">*</span> 能耗类型
-                                </div>
-                            </template>
-                            <div class="content-w">
-                                <el-select v-model="formParams.energyType" filterable placeholder="业务分类">
-                                    <el-option v-for="item in energyTypeList" :key="item.dictValue"
-                                        :label="item.dictLabel" :value="item.dictValue" />
-                                </el-select>
-                            </div>
-                        </el-descriptions-item>
-                        <el-descriptions-item>
-
-                            <template #label>
-                                <div style="display: inline-block;min-width: 100px;text-align: right">
-                                    <span style="color: red">*</span> 所属单位
-                                </div>
-                            </template>
-                            <div class="content-w">
-                                <el-input v-model="formParams.dept" placeholder="请输入所属单位" />
-                            </div>
-                        </el-descriptions-item>
-
-                        <el-descriptions-item>
-
-                            <template #label>
-                                <div style="display: inline-block;min-width: 100px;text-align: right">
-                                    车辆编号
-                                </div>
-                            </template>
-                            <div class="content-w">
-                                <el-input v-model="formParams.carNo" placeholder="请输入车牌编号" />
-                            </div>
-                        </el-descriptions-item>
-                        <el-descriptions-item>
-
-                            <template #label>
-                                <div style="display: inline-block;min-width: 100px;text-align: right">
-                                    车辆识别号
-                                </div>
-                            </template>
-                            <div class="content-w">
-                                <div class="content-w">
-                                    <el-input v-model="formParams.Identification" placeholder="请输入车牌识别号" />
-                                </div>
-                            </div>
-                        </el-descriptions-item>
-                        <el-descriptions-item>
-
-                            <template #label>
-                                <div style="display: inline-block;min-width: 100px;text-align: right">
-                                    发动机号
-                                </div>
-                            </template>
-                            <div class="content-w">
-                                <div class="content-w">
-                                    <el-input v-model="formParams.fdj" placeholder="请输入发动机" />
-                                </div>
-                            </div>
-                        </el-descriptions-item>
-
-                        <el-descriptions-item>
-
-                            <template #label>
-                                <div style="display: inline-block;min-width: 100px;text-align: right">
-                                    行驶证编号
-                                </div>
-
-                            </template>
-                            <div class="content-w">
-                                <el-input v-model="formParams.xszbh" placeholder="请输入行驶证编号" />
-                            </div>
-                        </el-descriptions-item>
-                        <el-descriptions-item>
-
-                            <template #label>
-                                <div style="display: inline-block;min-width: 100px;text-align: right">
-                                    行驶证保管人
-                                </div>
-                            </template>
-                            <div class="content-w">
-                                <div class="content-w">
-                                    <el-input v-model="formParams.xszbgr" placeholder="请输入行驶证保管人" />
-                                </div>
-                            </div>
-                        </el-descriptions-item>
-                        <el-descriptions-item>
-
-                            <template #label>
-                                <div style="display: inline-block;min-width: 100px;text-align: right">
-                                    采购审批单号
-                                </div>
-                            </template>
-                            <div class="content-w">
-                                <div class="content-w">
-                                    <el-input v-model="formParams.cgsp" placeholder="请输入采购审批单号" />
-                                </div>
-                            </div>
-                        </el-descriptions-item>
-
-                        <el-descriptions-item>
-
-                            <template #label>
-                                <div style="display: inline-block;min-width: 100px;text-align: right">
-                                    车辆品牌
-                                </div>
-                            </template>
-                            <div class="content-w">
-                                <el-input v-model="formParams.clpp" placeholder="请输入车牌品牌" />
-                            </div>
-                        </el-descriptions-item>
-                        <el-descriptions-item>
-
-                            <template #label>
-                                <div style="display: inline-block;min-width: 100px;text-align: right">
-                                    车辆信号
-                                </div>
-                            </template>
-                            <div class="content-w">
-                                <div class="content-w">
-                                    <el-input v-model="formParams.clxx" placeholder="请输入车辆信号" />
-                                </div>
-                            </div>
-                        </el-descriptions-item>
-                        <el-descriptions-item>
-
-                            <template #label>
-                                <div style="display: inline-block;min-width: 100px;text-align: right">
-                                    购置日期
-                                </div>
-                            </template>
-                            <div class="content-w">
-                                <div class="content-w">
-                                    <el-date-picker value-format="YYYY-MM-DD HH:mm:ss" v-model="formParams.gzrq"
-                                        type="date" placeholder="请选择购置日期" />
-                                </div>
-                            </div>
-                        </el-descriptions-item>
-
-                        <el-descriptions-item>
-
-                            <template #label>
-                                <div style="display: inline-block;min-width: 100px;text-align: right">
-                                    购置金额
-                                </div>
-                            </template>
-                            <div class="content-w">
-                                <el-input v-model="formParams.gzje" placeholder="请输入购置金额" />
-                            </div>
-                        </el-descriptions-item>
-                        <el-descriptions-item>
-
-                            <template #label>
-                                <div style="display: inline-block;min-width: 100px;text-align: right">
-                                    使用年限
-                                </div>
-                            </template>
-                            <div class="content-w">
-                                <div class="content-w">
-                                    <el-input v-model="formParams.synx" placeholder="请输入使用年限" />
-                                </div>
-                            </div>
-                        </el-descriptions-item>
-                        <el-descriptions-item>
-
-                            <template #label>
-                                <div style="display: inline-block;min-width: 100px;text-align: right">
-                                    额定载重
-                                </div>
-                            </template>
-                            <div class="content-w">
-                                <div class="content-w">
-                                    <el-input v-model="formParams.edzz" placeholder="请输入额定载重" />
-                                </div>
-                            </div>
-                        </el-descriptions-item>
-
-                        <el-descriptions-item>
-
-                            <template #label>
-                                <div style="display: inline-block;min-width: 100px;text-align: right">
-                                    使用单位
-                                </div>
-                            </template>
-                            <div class="content-w">
-                                <div class="content-w">
-                                    <el-input v-model="formParams.sydw" placeholder="请输入使用单位" />
-                                </div>
-                            </div>
-                        </el-descriptions-item>
-                    </el-descriptions>
-
-                    <el-descriptions :column="3">
-                        <el-descriptions-item>
-                            <template #label>
-                                <div style="display: inline-block;min-width: 100px;text-align: right">
-                                    <span style="color: red">*</span> 路线
-                                </div>
-                            </template>
-                            <div class="content-w">
-                                <el-select v-model="ext2.pathId" filterable placeholder="业务分类">
-                                    <el-option v-for="item in carPathList" :key="item.id" :label="item.name"
-                                        :value="item.id" />
-                                </el-select>
-                            </div>
-                        </el-descriptions-item>
-
-                        <el-descriptions-item>
-                            <template #label>
-                                <div style="display: inline-block;min-width: 100px;text-align: right">
-                                    <span style="color: red">*</span> 司机
-                                </div>
-                            </template>
-                            <div class="content-w">
-                                <el-select v-model="ext2.driverInfo" class="m-2" placeholder="请选择司机"
-                                    style="width: 240px">
-                                    <el-option v-for="item in sjList" :key="item.userId" :label="item.nickName"
-                                        :value="item.userId" />
-                                </el-select>
-                            </div>
-                        </el-descriptions-item>
-
-                        <el-descriptions-item>
-                            <template #label>
-                                <div style="display: inline-block;min-width: 100px;text-align: right">
-                                    <span style="color: red"></span> 跟车人员
-                                </div>
-                            </template>
-                            <div class="content-w">
-                                <el-select v-model="ext2.attendantInfo" class="m-2" placeholder="请选择跟车人员"
-                                    style="width: 240px">
-                                    <el-option v-for="item in ckList" :key="item.userId" :label="item.nickName"
-                                        :value="item.userId" />
-                                </el-select>
-                            </div>
-                        </el-descriptions-item>
-                    </el-descriptions>
-
-                </el-col>
-
-                <div style="margin-left: auto;margin-right: 20px;" v-if="carId != 0 && carId != null"><el-button
-                        type="primary" @click="addObj()">新增</el-button></div>
-
-                <el-col :span="24" v-if="carId != 0 && carId != null">
-                    <el-tabs type="card" class="demo-tabs" v-model="activeName" @tab-click="tabClick">
-                        <el-tab-pane label="车辆设备" name="1">
-                            <tableElm @childToParent='childrenClick' v-if="activeName == 1" :columns="columns[0]"
-                                ref="table">
-                            </tableElm>
-                        </el-tab-pane>
-                        <el-tab-pane label="维修记录" name="2">
-                            <tableElm @childToParent='childrenClick' v-if="activeName == 2" :columns="columns[1]"
-                                ref="table">
-                            </tableElm>
-                        </el-tab-pane>
-                        <el-tab-pane label="保养记录" name="3">
-                            <tableElm @childToParent='childrenClick' v-if="activeName == 3" :columns="columns[2]"
-                                ref="table">
-                            </tableElm>
-                        </el-tab-pane>
-                        <el-tab-pane label="保险记录" name="4">
-                            <tableElm @childToParent='childrenClick' v-if="activeName == 4" :columns="columns[3]"
-                                ref="table">
-                            </tableElm>
-                        </el-tab-pane>
-                        <el-tab-pane label="年检记录" name="5">
-                            <tableElm @childToParent='childrenClick' v-if="activeName == 5" :columns="columns[4]"
-                                ref="table">
-                            </tableElm>
-
-                        </el-tab-pane>
-                        <el-tab-pane label="交通事故记录" name="6">
-                            <tableElm @childToParent='childrenClick' v-if="activeName == 6" :columns="columns[5]"
-                                ref="table">
-                            </tableElm>
-                        </el-tab-pane>
-                        <el-tab-pane label="违章记录" name="7">
-                            <tableElm @childToParent='childrenClick' v-if="activeName == 7" :columns="columns[6]"
-                                ref="table">
-                            </tableElm>
-                        </el-tab-pane>
-                        <el-tab-pane label="车辆变更记录" name="8">
-                            <tableElm @childToParent='childrenClick' v-if="activeName == 8" :columns="columns[7]"
-                                ref="table">
-                            </tableElm>
-                        </el-tab-pane>
-                    </el-tabs>
-                </el-col>
-            </el-row>
-        </el-card>
-
-        <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
-            <el-form ref="" :model="form" :rules="rules" label-width="120px">
-                <el-form-item v-for="(item, index) in formList" :label="item.label" prop="carNum">
-                    <el-input v-if="item.type == 'input'" v-model="addForm[item.prop]"
-                        :placeholder="item.placeholder" />
-                    <el-date-picker v-if="item.type == 'date'" value-format="YYYY-MM-DD HH:mm:ss"
-                        v-model="addForm[item.prop]" type="date" :placeholder="item.placeholder" />
-                    <el-upload v-if="item.type == 'image'" v-model:file-list="fileList"
-                        :headers="headers"
-                        :action="uploadImgUrl" list-type="picture-card"
-                        :on-remove="handleRemove"  :on-success="handleUploadSuccess">
-                        <el-icon>
-                            <Plus />
-                        </el-icon>
-                    </el-upload>
-                </el-form-item>
-            </el-form>
-
-            <template #footer>
-                <div class="dialog-footer">
-                    <el-button type="primary" @click="submitForm">确 定</el-button>
-                    <el-button @click="dialog.visible = false">取 消</el-button>
+              </div>
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template #label>
+                <div style="display: inline-block;min-width: 100px;text-align: right">发动机号</div>
+              </template>
+              <div class="content-w">
+                <div class="content-w">
+                  <el-input v-model="formParams.fdj" placeholder="请输入发动机" />
+                </div>
+              </div>
+            </el-descriptions-item>
+
+            <el-descriptions-item>
+              <template #label>
+                <div style="display: inline-block;min-width: 100px;text-align: right">行驶证编号</div>
+              </template>
+              <div class="content-w">
+                <el-input v-model="formParams.xszbh" placeholder="请输入行驶证编号" />
+              </div>
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template #label>
+                <div style="display: inline-block;min-width: 100px;text-align: right">行驶证保管人</div>
+              </template>
+              <div class="content-w">
+                <div class="content-w">
+                  <el-input v-model="formParams.xszbgr" placeholder="请输入行驶证保管人" />
+                </div>
+              </div>
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template #label>
+                <div style="display: inline-block;min-width: 100px;text-align: right">采购审批单号</div>
+              </template>
+              <div class="content-w">
+                <div class="content-w">
+                  <el-input v-model="formParams.cgsp" placeholder="请输入采购审批单号" />
+                </div>
+              </div>
+            </el-descriptions-item>
+
+            <el-descriptions-item>
+              <template #label>
+                <div style="display: inline-block;min-width: 100px;text-align: right">车辆品牌</div>
+              </template>
+              <div class="content-w">
+                <el-input v-model="formParams.clpp" placeholder="请输入车牌品牌" />
+              </div>
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template #label>
+                <div style="display: inline-block;min-width: 100px;text-align: right">车辆信号</div>
+              </template>
+              <div class="content-w">
+                <div class="content-w">
+                  <el-input v-model="formParams.clxx" placeholder="请输入车辆信号" />
+                </div>
+              </div>
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template #label>
+                <div style="display: inline-block;min-width: 100px;text-align: right">购置日期</div>
+              </template>
+              <div class="content-w">
+                <div class="content-w">
+                  <el-date-picker value-format="YYYY-MM-DD HH:mm:ss" v-model="formParams.gzrq" type="date" placeholder="请选择购置日期" />
                 </div>
-            </template>
-        </el-dialog>
-    </div>
+              </div>
+            </el-descriptions-item>
+
+            <el-descriptions-item>
+              <template #label>
+                <div style="display: inline-block;min-width: 100px;text-align: right">购置金额</div>
+              </template>
+              <div class="content-w">
+                <el-input v-model="formParams.gzje" placeholder="请输入购置金额" />
+              </div>
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template #label>
+                <div style="display: inline-block;min-width: 100px;text-align: right">使用年限</div>
+              </template>
+              <div class="content-w">
+                <div class="content-w">
+                  <el-input v-model="formParams.synx" placeholder="请输入使用年限" />
+                </div>
+              </div>
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template #label>
+                <div style="display: inline-block;min-width: 100px;text-align: right">额定载重</div>
+              </template>
+              <div class="content-w">
+                <div class="content-w">
+                  <el-input v-model="formParams.edzz" placeholder="请输入额定载重" />
+                </div>
+              </div>
+            </el-descriptions-item>
+
+            <el-descriptions-item>
+              <template #label>
+                <div style="display: inline-block;min-width: 100px;text-align: right">使用单位</div>
+              </template>
+              <div class="content-w">
+                <div class="content-w">
+                  <el-input v-model="formParams.sydw" placeholder="请输入使用单位" />
+                </div>
+              </div>
+            </el-descriptions-item>
+          </el-descriptions>
+
+          <el-descriptions :column="3">
+            <el-descriptions-item>
+              <template #label>
+                <div style="display: inline-block;min-width: 100px;text-align: right"><span style="color: red">*</span> 路线</div>
+              </template>
+              <div class="content-w">
+                <el-select v-model="ext2.pathId" filterable placeholder="业务分类">
+                  <el-option v-for="item in carPathList" :key="item.id" :label="item.name" :value="item.id" />
+                </el-select>
+              </div>
+            </el-descriptions-item>
+
+            <el-descriptions-item>
+              <template #label>
+                <div style="display: inline-block;min-width: 100px;text-align: right"><span style="color: red">*</span> 司机</div>
+              </template>
+              <div class="content-w">
+                <el-select v-model="ext2.driverInfo" class="m-2" placeholder="请选择司机" style="width: 240px">
+                  <el-option v-for="item in sjList" :key="item.userId" :label="item.nickName" :value="item.userId" />
+                </el-select>
+              </div>
+            </el-descriptions-item>
+
+            <el-descriptions-item>
+              <template #label>
+                <div style="display: inline-block;min-width: 100px;text-align: right"><span style="color: red"></span> 跟车人员</div>
+              </template>
+              <div class="content-w">
+                <el-select v-model="ext2.attendantInfo" class="m-2" placeholder="请选择跟车人员" style="width: 240px">
+                  <el-option v-for="item in ckList" :key="item.userId" :label="item.nickName" :value="item.userId" />
+                </el-select>
+              </div>
+            </el-descriptions-item>
+          </el-descriptions>
+        </el-col>
+
+        <div style="margin-left: auto;margin-right: 20px;" v-if="carId != 0 && carId != null">
+          <el-button type="primary" @click="addObj()">新增</el-button>
+        </div>
+
+        <el-col :span="24" v-if="carId != 0 && carId != null">
+          <el-tabs type="card" class="demo-tabs" v-model="activeName" @tab-click="tabClick">
+            <el-tab-pane label="车辆设备" name="1">
+              <tableElm @childToParent="childrenClick" v-if="activeName == 1" :columns="columns[0]" ref="table"> </tableElm>
+            </el-tab-pane>
+            <el-tab-pane label="维修记录" name="2">
+              <tableElm @childToParent="childrenClick" v-if="activeName == 2" :columns="columns[1]" ref="table"> </tableElm>
+            </el-tab-pane>
+            <el-tab-pane label="保养记录" name="3">
+              <tableElm @childToParent="childrenClick" v-if="activeName == 3" :columns="columns[2]" ref="table"> </tableElm>
+            </el-tab-pane>
+            <el-tab-pane label="保险记录" name="4">
+              <tableElm @childToParent="childrenClick" v-if="activeName == 4" :columns="columns[3]" ref="table"> </tableElm>
+            </el-tab-pane>
+            <el-tab-pane label="年检记录" name="5">
+              <tableElm @childToParent="childrenClick" v-if="activeName == 5" :columns="columns[4]" ref="table"> </tableElm>
+            </el-tab-pane>
+            <el-tab-pane label="交通事故记录" name="6">
+              <tableElm @childToParent="childrenClick" v-if="activeName == 6" :columns="columns[5]" ref="table"> </tableElm>
+            </el-tab-pane>
+            <el-tab-pane label="违章记录" name="7">
+              <tableElm @childToParent="childrenClick" v-if="activeName == 7" :columns="columns[6]" ref="table"> </tableElm>
+            </el-tab-pane>
+            <el-tab-pane label="车辆变更记录" name="8">
+              <tableElm @childToParent="childrenClick" v-if="activeName == 8" :columns="columns[7]" ref="table"> </tableElm>
+            </el-tab-pane>
+          </el-tabs>
+        </el-col>
+      </el-row>
+    </el-card>
+
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+      <el-form ref="" :model="form" :rules="rules" label-width="120px">
+        <el-form-item v-for="(item, index) in formList" :label="item.label" prop="carNum">
+          <el-input v-if="item.type == 'input'" v-model="addForm[item.prop]" :placeholder="item.placeholder" />
+          <el-date-picker
+            v-if="item.type == 'date'"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            v-model="addForm[item.prop]"
+            type="date"
+            :placeholder="item.placeholder"
+          />
+          <el-upload
+            v-if="item.type == 'image'"
+            v-model:file-list="fileList"
+            :headers="headers"
+            :action="uploadImgUrl"
+            list-type="picture-card"
+            :on-remove="handleRemove"
+            :on-success="handleUploadSuccess"
+          >
+            <el-icon>
+              <Plus />
+            </el-icon>
+          </el-upload>
+        </el-form-item>
+      </el-form>
+
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="dialog.visible = false">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
 </template>
 
 <script setup name="CarInfo" lang="ts">
@@ -794,7 +712,6 @@ reset();
 setTimeout(() => {
     getData();
 }, 100);
-
 </script>
 
 <style lang="scss" scoped>

+ 119 - 127
src/views/car/work/addCarWork.vue

@@ -1,62 +1,51 @@
 <template>
-    <div style="padding: 10px 15px">
-        <el-card class="box-card">
-            <template #header>
-                <div class="card-header">
-                    <div style="display: flex;flex-direction: row;">
-                        <div style="width: 8px;height: 19px;opacity: 1;background: #409EFF"></div>
-                        <span
-                            style="font-family: PingFang SC;font-size: 14px;font-weight: normal;line-height: 19px;height: 19px;margin-left: 8px;">路线作业</span>
-                    </div>
-                    <div>
-                        <el-button type="warning" @click="goBack()">取消</el-button>
-                        <el-button type="primary" @click="submit()">保存</el-button>
-                    </div>
-                </div>
-
-            </template>
-            <el-row>
-                <el-col :span="24">
-                    <el-descriptions :column="3">
-                        <el-descriptions-item>
-
-                            <template #label>
-                                <div style="display: inline-block;min-width: 60px;text-align: right">
-                                    <span style="color: red">*</span> 作业名称
-                                </div>
-                            </template>
-                            <div class="content-w">
-                                <el-input v-model="form.name" placeholder="请输入作业名称" />
-                            </div>
-                        </el-descriptions-item>
-                        <el-descriptions-item>
-
-                            <template #label>
-                                <div style="display: inline-block;min-width: 60px;text-align: right">
-                                    <span style="color: red">*</span> 作业类型
-                                </div>
-                            </template>
-                            <div class="content-w">
-                                <el-select v-model="extObj.type" class="m-2" placeholder="请选择作业类型" style="width: 240px">
-                                    <el-option v-for="item in workTypeList" :key="item.dictValue"
-                                        :label="item.dictLabel" :value="item.dictValue" />
-                                </el-select>
-                            </div>
-                        </el-descriptions-item>
-                        <el-descriptions-item>
-
-                            <template #label>
-                                <div style="display: inline-block;min-width: 60px;text-align: right">
-                                    <span style="color: red">*</span> 所属网格
-                                </div>
-                            </template>
-                            <div class="content-w">
-                                <el-input v-model="extObj.wangge" placeholder="请输入网格" />
-                            </div>
-                        </el-descriptions-item>
-
-                    </el-descriptions>
-                    <!-- <el-descriptions :column="4" style="width: 100%;">
+  <div style="padding: 10px 15px">
+    <el-card class="box-card">
+      <template #header>
+        <div class="card-header">
+          <div style="display: flex;flex-direction: row;">
+            <div style="width: 8px;height: 19px;opacity: 1;background: #409EFF"></div>
+            <span style="font-family: PingFang SC;font-size: 14px;font-weight: normal;line-height: 19px;height: 19px;margin-left: 8px;"
+              >路线作业</span
+            >
+          </div>
+          <div>
+            <el-button type="warning" @click="goBack()">取消</el-button>
+            <el-button type="primary" @click="submit()">保存</el-button>
+          </div>
+        </div>
+      </template>
+      <el-row>
+        <el-col :span="24">
+          <el-descriptions :column="3">
+            <el-descriptions-item>
+              <template #label>
+                <div style="display: inline-block;min-width: 60px;text-align: right"><span style="color: red">*</span> 作业名称</div>
+              </template>
+              <div class="content-w">
+                <el-input v-model="form.name" placeholder="请输入作业名称" />
+              </div>
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template #label>
+                <div style="display: inline-block;min-width: 60px;text-align: right"><span style="color: red">*</span> 作业类型</div>
+              </template>
+              <div class="content-w">
+                <el-select v-model="extObj.type" class="m-2" placeholder="请选择作业类型" style="width: 240px">
+                  <el-option v-for="item in workTypeList" :key="item.dictValue" :label="item.dictLabel" :value="item.dictValue" />
+                </el-select>
+              </div>
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template #label>
+                <div style="display: inline-block;min-width: 60px;text-align: right"><span style="color: red">*</span> 所属网格</div>
+              </template>
+              <div class="content-w">
+                <el-input v-model="extObj.wangge" placeholder="请输入网格" />
+              </div>
+            </el-descriptions-item>
+          </el-descriptions>
+          <!-- <el-descriptions :column="4" style="width: 100%;">
                         <el-descriptions-item>
 
                             <template #label>
@@ -103,77 +92,81 @@
                             </div>
                         </el-descriptions-item>
                     </el-descriptions> -->
-                    <!-- <tableElm :columns="columns" ref="table"></tableElm> -->
-                </el-col>
-            </el-row>
-        </el-card>
-        <el-card class="box-card">
-
-            <template #header>
-                <div class="card-header">
-                    <div style="display: flex;flex-direction: row;">
-                        <div style="width: 8px;height: 19px;opacity: 1;background: #409EFF"></div>
-                        <span
-                            style="font-family: PingFang SC;font-size: 14px;font-weight: normal;line-height: 19px;height: 19px;margin-left: 8px;">路线站点</span>
-                    </div>
-                </div>
-            </template>
-            <div style="display: flex;flex-direction: row;width: 100%;">
-                <div style="width:25%">
-                    <el-timeline>
-                        <el-timeline-item v-for="(activity, index) in activities" :key="index" :icon="activity.icon"
-                            :type="activity.type" :color="activity.color" :size="activity.size"
-                            :hollow="activity.hollow">
-                            <!-- {{ activity.content }} -->
-                            <div style="display: flex;flex-direction: column;" v-show="!activity.isadd">
-                                <div v-if="activity.rank == 1 || activity.rank == 999">{{ activity.content }}</div>
-                                <div v-if="activity.data != null">{{ activity.data.dictLabel }}</div>
-                                <div v-if="activity.timeObj != null">{{ activity.timeObj.startTime }}</div>
-                                <div style="display: flex;flex-direction: row;">
-                                    <el-button style="width: 80px;" @click="selectSite(index)">选择地点</el-button>
-                                    <el-button style="width: 80px;" @click="selectTime(index)">选择时间</el-button>
-                                    <div style="margin-left:5px" @click="deleteItem(activity)">
-                                        <el-icon :size="20" style="color:red;padding-top: 10px;">
-                                            <CircleClose />
-                                        </el-icon>
-                                    </div>
-                                </div>
-                            </div>
-                            <div v-show="activity.isadd">
-                                <el-button type="primary" style="width: 80px;" @click="addSite()">新增站点</el-button>
-                            </div>
-                        </el-timeline-item>
-                    </el-timeline>
+          <!-- <tableElm :columns="columns" ref="table"></tableElm> -->
+        </el-col>
+      </el-row>
+    </el-card>
+    <el-card class="box-card">
+      <template #header>
+        <div class="card-header">
+          <div style="display: flex;flex-direction: row;">
+            <div style="width: 8px;height: 19px;opacity: 1;background: #409EFF"></div>
+            <span style="font-family: PingFang SC;font-size: 14px;font-weight: normal;line-height: 19px;height: 19px;margin-left: 8px;"
+              >路线站点</span
+            >
+          </div>
+        </div>
+      </template>
+      <div style="display: flex;flex-direction: row;width: 100%;">
+        <div style="width:25%">
+          <el-timeline>
+            <el-timeline-item
+              v-for="(activity, index) in activities"
+              :key="index"
+              :icon="activity.icon"
+              :type="activity.type"
+              :color="activity.color"
+              :size="activity.size"
+              :hollow="activity.hollow"
+            >
+              <!-- {{ activity.content }} -->
+              <div style="display: flex;flex-direction: column;" v-show="!activity.isadd">
+                <div v-if="activity.rank == 1 || activity.rank == 999">{{ activity.content }}</div>
+                <div v-if="activity.data != null">{{ activity.data.dictLabel }}</div>
+                <div v-if="activity.timeObj != null">{{ activity.timeObj.startTime }}</div>
+                <div style="display: flex;flex-direction: row;">
+                  <el-button style="width: 80px;" @click="selectSite(index)">选择地点</el-button>
+                  <el-button style="width: 80px;" @click="selectTime(index)">选择时间</el-button>
+                  <div style="margin-left:5px" @click="deleteItem(activity)">
+                    <el-icon :size="20" style="color:red;padding-top: 10px;">
+                      <CircleClose />
+                    </el-icon>
+                  </div>
                 </div>
-                <div style="width: 75%;">
-                    <!-- <mapDiv></mapDiv> -->
-                    <!-- <img style="width:90%" src="@/assets/images/map.png"/> -->
-                    <mapDiv style="width:90%;height: 100%;" @childToParent='childrenClick'></mapDiv>
-                </div>
-            </div>
-        </el-card>
-
-        <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
-            <el-form ref="carInfoFormRef" :model="dateObj" :rules="rules" label-width="80px">
-                <el-form-item label="时间">
-                    <el-time-select v-model="dateObj.startTime" style="width: 240px" start="00:00" step="00:15"
-                        end="23:59" placeholder="时间" />
-                </el-form-item>
-                <!-- <el-form-item label="出站时间">
+              </div>
+              <div v-show="activity.isadd">
+                <el-button type="primary" style="width: 80px;" @click="addSite()">新增站点</el-button>
+              </div>
+            </el-timeline-item>
+          </el-timeline>
+        </div>
+        <div style="width: 75%;">
+          <!-- <mapDiv></mapDiv> -->
+          <!-- <img style="width:90%" src="@/assets/images/map.png"/> -->
+          <mapDiv style="width:90%;height: 100%;" @childToParent="childrenClick"></mapDiv>
+        </div>
+      </div>
+    </el-card>
+
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+      <el-form ref="carInfoFormRef" :model="dateObj" :rules="rules" label-width="80px">
+        <el-form-item label="时间">
+          <el-time-select v-model="dateObj.startTime" style="width: 240px" start="00:00" step="00:15" end="23:59" placeholder="时间" />
+        </el-form-item>
+        <!-- <el-form-item label="出站时间">
                     <el-time-select v-model="dateObj.endTime" style="width: 240px" start="00:00" step="00:15"
                         end="23:59" placeholder="出站时间" />
                 </el-form-item> -->
-            </el-form>
-
-            <template #footer>
-                <div class="dialog-footer">
-                    <el-button :loading="buttonLoading" type="primary" @click="submitTime">确 定</el-button>
-                    <el-button @click="dialog.visible = false">取 消</el-button>
-                </div>
-            </template>
-        </el-dialog>
-
-    </div>
+      </el-form>
+
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button :loading="buttonLoading" type="primary" @click="submitTime">确 定</el-button>
+          <el-button @click="dialog.visible = false">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
 </template>
 
 <script setup lang="ts">
@@ -495,7 +488,6 @@ const goBack = () => {
 onMounted(() => {
     initData()
 });
-
 </script>
 
 <style lang="scss" scoped>
@@ -509,4 +501,4 @@ onMounted(() => {
     display: inline-flex;
     max-width: 160px;
 }
-</style>
+</style>

+ 11 - 4
src/views/car/work/schedule.vue

@@ -45,8 +45,8 @@
         v-model:limit="queryParams.pageSize" @pagination="getList" />
     </el-card>
 
-    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
-      <el-form ref="carInfoFormRef" :model="dateObj" :rules="rules" label-width="80px">
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="50vw" append-to-body>
+      <el-form ref="carInfoFormRef" :model="dateObj" :rules="rules" label-width="120px">
         <el-form-item label="出发时间">
           <el-time-picker v-model="startTime" :picker-options="{
             selectableRange: '00:00:00 - 23:59:59'
@@ -73,6 +73,9 @@
             <el-option v-for="item in ckList" :key="item.userId" :label="item.nickName" :value="item.userId" />
           </el-select>
         </el-form-item>
+        <el-form-item label="是否自动排班">
+           <el-switch v-model="formParams.isauto" />
+        </el-form-item>
       </el-form>
 
       <template #footer>
@@ -150,7 +153,8 @@ const table = ref(tableElm)
 
 const formParams = ref({
   driverInfo: null,
-  attendantInfo: null
+  attendantInfo: null,
+  isauto:false
 });
 
 const data = reactive<PageData<CarScheduleForm, CarScheduleQuery>>({
@@ -345,7 +349,8 @@ const reset = () => {
   form.value = { ...initFormData };
   formParams.value = {
     driverInfo: null,
-    attendantInfo: null
+    attendantInfo: null,
+    isauto:false
   }
   line.value = null;
   carPathObj.value = null;
@@ -391,6 +396,7 @@ const handleUpdate = async (row?: CarScheduleVO) => {
   form.value.carId = getCarId(row.carNum);
   formParams.value.driverInfo = data.driverInfo
   formParams.value.attendantInfo = data.attendantInfo
+  formParams.value.isauto = JSON.parse(row.ext2==""||row.ext2==null?'{"isauto":false}':row.ext2).isauto
   line.value = data.lineID
   dialog.visible = true;
   dialog.title = "修改车及人员排班";
@@ -462,6 +468,7 @@ const submitSchedule = async () => {
   lineobj.pathLine = dataList
   form.value.pathInfo = JSON.stringify(lineobj);
   form.value.carNum = getCarNum(form.value.carId);
+  form.value.ext2 = JSON.stringify({isauto:lineobj.isauto}  )
   if (form.value.id) {
     await updateCarSchedule(form.value).finally(() => buttonLoading.value = false);
   } else {