Merge remote-tracking branch 'origin/master'

张含笑

2026-01-19 f925f12d5263c94644bddf6fd2ac3d23b77791cf

 applications/drone-command/src/views/basicManage/deviceStock/FormDiaLog.vue

@@ -53,7 +53,7 @@
         <div class="detail-title">设备跟踪流转</div>
         <div class="command-table-container" v-loading="loading" element-loading-background="rgba(5, 5, 15, 0.6)">
            <div class="command-table-content">
               <el-table class="command-data-cockpit-table" :data="list">
               <el-table class="command-table" :data="list">
                  <el-table-column type="index" width="60" label="序号" />
                  <el-table-column prop="charger" label="用户" />
                  <el-table-column prop="contactPhone" label="电话" />
@@ -64,7 +64,7 @@
            </div>

            <div class="command-table-pagination">
               <el-pagination popper-class="command-data-cockpit-select-popper"
               <el-pagination popper-class="command-select-popper"
                  v-model:current-page="searchParams.current" v-model:page-size="searchParams.size"
                  layout="total, prev, pager, next, sizes" :total="total" @change="getList" />
            </div>
@@ -75,13 +75,13 @@
         <el-row>
            <el-col :span="12">
               <el-form-item label="设备名称" prop="deviceName">
                  <el-input class="command-data-cockpit-search-input" v-model="formData.deviceName" maxlength="50"
                  <el-input class="command-search-input" v-model="formData.deviceName" maxlength="50"
                     placeholder="请输入" clearable />
               </el-form-item>
            </el-col>
            <el-col :span="12">
               <el-form-item label="设备类型" prop="deviceType">
                  <el-select class="command-data-cockpit-select" popper-class="command-data-cockpit-select-popper"
                  <el-select class="command-select" popper-class="command-select-popper"
                     v-model="formData.deviceType" placeholder="请选择" clearable>
                     <el-option v-for="item in dictObj.deviceType" :key="item.dictKey" :label="item.dictValue"
                        :value="item.dictKey" />
@@ -90,7 +90,7 @@
            </el-col>
            <el-col :span="12">
               <el-form-item label="设备属性" prop="deviceAtt">
                  <el-select class="command-data-cockpit-select" popper-class="command-data-cockpit-select-popper"
                  <el-select class="command-select" popper-class="command-select-popper"
                     v-model="formData.deviceAtt" placeholder="请选择" clearable>
                     <el-option v-for="item in dictObj.deviceAtt" :key="item.dictKey" :label="item.dictValue"
                        :value="item.dictKey" />
@@ -99,45 +99,45 @@
            </el-col>
            <el-col :span="12">
               <el-form-item label="型号" prop="deviceModel">
                  <el-input class="command-data-cockpit-search-input" v-model="formData.deviceModel" maxlength="50"
                  <el-input class="command-search-input" v-model="formData.deviceModel" maxlength="50"
                     placeholder="请输入" clearable />
               </el-form-item>
            </el-col>
            <el-col :span="12">
               <el-form-item label="规格" prop="deviceSpecification">
                  <el-input class="command-data-cockpit-search-input" v-model="formData.deviceSpecification"
                  <el-input class="command-search-input" v-model="formData.deviceSpecification"
                     maxlength="50" placeholder="请输入" clearable />
               </el-form-item>
            </el-col>
            <el-col :span="12">
               <el-form-item label="生产厂商" prop="manufacturer">
                  <el-input class="command-data-cockpit-search-input" v-model="formData.manufacturer" maxlength="50"
                  <el-input class="command-search-input" v-model="formData.manufacturer" maxlength="50"
                     placeholder="请输入" clearable />
               </el-form-item>
            </el-col>
            <el-col :span="12">
               <el-form-item label="来源" prop="source">
                  <el-input class="command-data-cockpit-search-input" v-model="formData.source" maxlength="50"
                  <el-input class="command-search-input" v-model="formData.source" maxlength="50"
                     placeholder="请输入" clearable />
               </el-form-item>
            </el-col>
            <el-col :span="12">
               <el-form-item label="用途" prop="purpose">
                  <el-input class="command-data-cockpit-search-input" v-model="formData.purpose" maxlength="50"
                  <el-input class="command-search-input" v-model="formData.purpose" maxlength="50"
                     placeholder="请输入" clearable />
               </el-form-item>
            </el-col>
            <el-col :span="12">
               <el-form-item label="所属部门" prop="belongDept">
                  <el-tree-select class="command-data-cockpit-select"
                     popper-class="command-data-cockpit-tree-select-popper" v-model="formData.belongDept"
                  <el-tree-select class="command-select"
                     popper-class="command-tree-select-popper" v-model="formData.belongDept"
                     node-key="id" :data="deptTree" :props="treeProps" check-strictly @change="belongDeptChange"
                     clearable />
               </el-form-item>
            </el-col>
            <el-col :span="12">
               <el-form-item label="负责人" prop="charger">
                  <el-select class="command-data-cockpit-select" popper-class="command-data-cockpit-select-popper"
                  <el-select class="command-select" popper-class="command-select-popper"
                     v-model="formData.charger" placeholder="请选择" :disabled="!formData.belongDept" clearable>
                     <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.name" />
                  </el-select>
@@ -145,7 +145,7 @@
            </el-col>
            <el-col :span="12">
               <el-form-item label="联系电话" prop="contactPhone">
                  <el-input class="command-data-cockpit-search-input" v-model="formData.contactPhone" maxlength="50"
                  <el-input class="command-search-input" v-model="formData.contactPhone" maxlength="50"
                     placeholder="请输入" clearable />
               </el-form-item>
            </el-col>