Merge remote-tracking branch 'origin/master'

张含笑

2026-01-27 9e0f0ee575c7b490e768af0188a494eec7944492

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

@@ -62,15 +62,20 @@
                  <el-table-column prop="charger" label="负责人" />
                  <el-table-column prop="contactPhone" label="联系电话" />
                  <el-table-column prop="outTarget" label="出库去向" />
                  <el-table-column prop="outTime" label="出库时间" />

                  <el-table-column prop="outTime" show-overflow-tooltip label="出库时间">
                     <template v-slot="{ row }">
                        {{ dayjs(row.outTime).format('YYYY-MM-DD') }}
                     </template>
                  </el-table-column>
                  <el-table-column prop="purpose" label="用途" />
               </el-table>
            </div>

            <div class="command-table-pagination">
               <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" />
               <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>
         </div>
      </div>
@@ -79,8 +84,8 @@
         <el-row>
            <el-col :span="12">
               <el-form-item label="设备名称" prop="deviceName">
                  <el-input class="command-input" v-model="formData.deviceName" maxlength="50"
                     placeholder="请输入" clearable />
                  <el-input class="command-input" v-model="formData.deviceName" maxlength="50" placeholder="请输入"
                     clearable />
               </el-form-item>
            </el-col>
            <el-col :span="12">
@@ -94,8 +99,8 @@
            </el-col>
            <el-col :span="12">
               <el-form-item label="设备编码" prop="deviceSn">
                  <el-input class="command-input" v-model="formData.deviceSn" maxlength="50"
                     placeholder="请输入" clearable />
                  <el-input class="command-input" v-model="formData.deviceSn" maxlength="50" placeholder="请输入"
                     clearable />
               </el-form-item>
            </el-col>
            <el-col :span="12">
@@ -109,40 +114,39 @@
            </el-col>
            <el-col :span="12">
               <el-form-item label="型号" prop="deviceModel">
                  <el-input class="command-input" v-model="formData.deviceModel" maxlength="50"
                     placeholder="请输入" clearable />
                  <el-input class="command-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-input" v-model="formData.deviceSpecification"
                     maxlength="50" placeholder="请输入" clearable />
                  <el-input class="command-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-input" v-model="formData.manufacturer" maxlength="50"
                     placeholder="请输入" clearable />
                  <el-input class="command-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-input" v-model="formData.source" maxlength="50"
                     placeholder="请输入" clearable />
                  <el-input class="command-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-input" v-model="formData.purpose" maxlength="50"
                     placeholder="请输入" clearable />
                  <el-input class="command-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-select"
                     popper-class="command-tree-select-popper" v-model="formData.belongDept"
                     node-key="id" :data="deptTree" :props="treeProps" check-strictly @change="belongDeptChange"
                     clearable />
                  <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">
@@ -155,14 +159,15 @@
            </el-col>
            <el-col :span="12">
               <el-form-item label="联系电话" prop="contactPhone">
                  <el-input class="command-input" v-model="formData.contactPhone" maxlength="50"
                     placeholder="请输入" clearable />
                  <el-input class="command-input" v-model="formData.contactPhone" maxlength="50" placeholder="请输入"
                     clearable />
               </el-form-item>
            </el-col>
         </el-row>
      </el-form>
      <template #footer>
         <el-button v-if="dialogMode != 'view'" color="#2B2B4C" @click="handleCancel">{{ dialogReadonly ? '关闭' : '取消' }}</el-button>
         <el-button v-if="dialogMode != 'view'" color="#2B2B4C" @click="handleCancel">{{ dialogReadonly ? '关闭' : '取消'
            }}</el-button>
         <el-button color="#284FE3" v-if="!dialogReadonly" type="primary" :loading="submitting"
            :disabled="submitting" @click="handleSubmit">
            保存
@@ -172,6 +177,8 @@
</template>

<script setup>
import dayjs from 'dayjs'

import { computed, ref } from 'vue'
import { ElMessage } from 'element-plus'
import { fwDeviceDetailApi, fwDeviceSubmitApi } from '@/views/basicManage/deviceStock/fwDevice'