Merge remote-tracking branch 'origin/master'

rk

2025-09-24 f3c59a17062fb0a89b5f89b7845341386952a6b1

 admin/src/components/business/OperaCarsWindow.vue

@@ -1,41 +1,71 @@
<template>
    <GlobalWindow
        :title="title"
        width="500px"
        :visible.sync="visible"
        :confirm-working="isWorking"
        @confirm="confirm"
    >
      <el-form :model="form" ref="form" :rules="rules">
          <el-form-item label="车牌号" prop="code">
            <el-input v-model="form.code" placeholder="请输入车牌号" v-trim/>
          </el-form-item>
          <el-form-item label="车辆类型" prop="type">
            <el-radio-group v-model="form.type" >
              <el-radio :label="0"  >员工车辆</el-radio>
              <el-radio  :label="1"  >安泰公务车</el-radio>
              <el-radio  :label="2"  >安泰物流车</el-radio>
              <el-radio  :label="3"  >市公司公车</el-radio>
            </el-radio-group>
          </el-form-item>
          <el-form-item label="选择车主：" prop="memberId">
            <el-select v-model="form.memberId" clearable filterable placeholder="请选择">
              <el-option
                  v-for="item in memberList"
                  :key="item.id"
                  :label="item.name"
                  :value="item.id">
              </el-option>
            </el-select>
          </el-form-item>
        </el-form>
    </GlobalWindow>
  <GlobalWindow :title="title" width="500px" @close="close" :visible.sync="visible" :confirm-working="isWorking"
    @confirm="confirm">
    <el-form :model="form" ref="form" :rules="rules">
      <el-form-item label="车牌号" prop="code">
        <el-input v-model="form.code" placeholder="请输入车牌号" v-trim />
      </el-form-item>
<!--      <el-form-item label="备注" prop="type">
        <el-radio-group v-model="form.type">
          <el-radio :label="0">安泰公务车</el-radio>
          <el-radio :label="1">安泰物流车</el-radio>
          <el-radio :label="2">其他</el-radio>
        </el-radio-group>
      </el-form-item>-->
      <el-form-item label="选择分类：" prop="cateId">
<!--        <el-cascader v-model="form.cateId" @change="changeSel" :options="cateList" :props="{
          label: 'name',
          value: 'id',
          children: 'childCategoryList',
          checkStrictly: true
        }"></el-cascader>-->
        <treeselect
            @select="cateChange"
            v-model="form.cateId"
            placeholder="请选择"
            :options="cateList"
            :normalizer="normalizeOptions1"
            :default-expand-level="1"
            noChildrenText="没有子选项"
            noOptionsText="没有可选项"
            noResultsText="没有匹配的结果" />
      </el-form-item>
      <el-form-item label="选择组织：" prop="groupId">
        <treeselect
            @input="changeSel"
            v-model="form.groupId"
            placeholder="请选择"
            :options="companyTree"
            :normalizer="normalizeOptions"
            :default-expand-level="1"
            noChildrenText="没有子选项"
            noOptionsText="没有可选项"
            noResultsText="没有匹配的结果" />
<!--        <el-select v-model="form.groupId" @change="changeSel" clearable filterable placeholder="请选择">
              <template v-for="item in companyList">
                <el-option  v-if="item.countNum && item.countNum>0" :key="item.id" :label="item.name" :value="item.id">
                </el-option>
              </template>
        </el-select>-->
      </el-form-item>
      <el-form-item label="选择车主：" prop="memberId">
        <el-select v-model="form.memberId" clearable filterable placeholder="请选择">
          <el-option v-for="item in memberList" :key="item.id" :label="item.name" :value="item.id">
          </el-option>
        </el-select>
      </el-form-item>
    </el-form>
  </GlobalWindow>
</template>

<script>
import BaseOpera from '@/components/base/BaseOpera'
import GlobalWindow from '@/components/common/GlobalWindow'
import { allList } from '@/api/business/member'
import { fetchList } from '@/api/business/category.js'
import { create, updateById } from '@/api/business/cars'
import { companyGetList, fetchList as companyTree } from '@/api/business/company'
import { Message } from 'element-ui'
export default {
  name: 'OperaInternalCompanyWindow',
  extends: BaseOpera,
@@ -48,16 +78,21 @@
        id: null,
        code: null,
        memberId: null,
        type: 0
        // type: 0,
        groupId: null,
        cateId: null
      },
      selectCate: null,
      cateList: [],
      companyList: [],
      companyTree: [],
      // 验证规则
      rules: {
        code: [
          { required: true, message: '请输入车牌号' }
        ],
        type: [
          { required: true, message: '请选择车辆类型' }
        ]
        code: [{ required: true, message: '请输入车牌号' }],
        groupId: [{ required: true, message: '请选择组织' }]
        /* type: [
          { required: true, message: '请选择备注' }
        ] */
      }
    }
  },
@@ -71,32 +106,128 @@
    open (title, target) {
      this.title = title
      this.visible = true
      this.loadMember()
      this.getCate()
      this.getfindCompanyTreePage()
      // 新建组织
      if (target == null) {
        this.$nextTick(() => {
          this.$refs.form.resetFields()
          this.form[this.configData['field.id']] = null
          this.form.type=0
          this.form.type = 0
        })
        return
      }
      // 编辑
      this.$nextTick(() => {
        for (const key in this.form) {
          this.form[key] = target[key]
      // this.$nextTick(() => {
      //   for (const key in this.form) {
      //     this.form[key] = target[key]
      //   }
      // })
    },
    cateChange(node){
      this.selectCate = node
    },
    // 规范化选项数据的方法
    normalizeOptions1 (node) {
      if (!node.childCategoryList || !node.childCategoryList.length) {
        // 去掉children=[]的children属性
        delete node.childCategoryList
      }
      var node1 = {
        id: node.id,
        label: node.name,
        parentId: node.parentId,
        children: node.childCategoryList,
      }
      return node1
    },
    normalizeOptions (node) {
      if (!node.childList || !node.childList.length) {
        // 去掉children=[]的children属性
        delete node.childList
      }
      return {
        id: node.id,
        label: node.name,
        children: node.childList
      }
    },
    changeSel () {
      const { form } = this
      if (form.groupId) {
        this.loadMember()
      }
      this.form.memberId = ''
    },
    confirm () {
      console.log('form', this.form.cateId)
      const { form } = this
      if(this.selectCate && this.selectCate.childCategoryList &&  this.selectCate.childCategoryList.length) {
        return Message.error('请选择二级分类')
      }
      this.$refs.form.validate((valid) => {
        if (valid) {
          const fn = form.id ? updateById : create
          fn({
            ...form
            // cateId: form.cateId[1]
          }).then(res => {
            Message.success('保存成功')
            this.visible = false
            this.$emit('success')
          })
        }
      })
    },
    close () {
      this.visible = false
      this.$emit('close')
    },
    handleChange (val) {

    },
    getCate () {
      fetchList({
        model: { type: 1 },
        capacity: 1000,
        page: 1
      }).then(res => {
        if (res && res.records && res.records.length > 0) {
          res.records[0].fsStatus = 1
          this.cateList = res.records || []

        }
      })
    },
    getCompany () {
      companyGetList({
        model: { }, // 有员工的数据
        capacity: 10000,
        page: 1
      }).then(res => {
        this.companyList = res.records || []
      })
    },
    getfindCompanyTreePage () {
      companyTree()
        .then(res => {
          if (res && res.length > 0) {
            res[0].fsStatus = 1
            this.companyTree = res
          }
        })
    },
    loadMember () {
      const { form } = this
      allList({
        type: 2
        type: 2,
        companyId: form.groupId

      })
        .then(res => {
          this.memberList = res
        })
        .catch(e => {
          this.$tip.apiFailed(e)
          // this.$tip.apiFailed(e)
        })
        .finally(() => {
          this.isWorking = false