From 8e2253697fd6da86a4a08669fe959009d2f3cc3d Mon Sep 17 00:00:00 2001
From: 13208366016 <47278630@qq.com>
Date: Sun, 15 Oct 2023 23:14:13 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=89=BF=E8=BF=90=E5=95=86=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/option/basicdata/basicdataCarrier.js      |  19 +-
 src/views/basic/pda/basicPda.vue              | 869 ++++++++++--------
 src/views/basic/pda/basicPdaTT.vue            | 399 ++++++++
 src/views/basic/pda/basicPdaTTTT.vue          | 513 -----------
 .../driverArtery/basicdataDriverArtery.vue    |  81 +-
 .../basicdata/vehicle/basicdataVehicle.vue    |   4 +-
 6 files changed, 944 insertions(+), 941 deletions(-)
 create mode 100644 src/views/basic/pda/basicPdaTT.vue
 delete mode 100644 src/views/basic/pda/basicPdaTTTT.vue

diff --git a/src/option/basicdata/basicdataCarrier.js b/src/option/basicdata/basicdataCarrier.js
index c69ead95..27c96a37 100644
--- a/src/option/basicdata/basicdataCarrier.js
+++ b/src/option/basicdata/basicdataCarrier.js
@@ -170,6 +170,15 @@ export default {
     //   prop: "warehouseId",
     //   type: "input",
     // },
+    {
+      label: '承运商名称',
+      prop: 'carrierName',
+      type: 'input',
+      labelWidth: '150',
+      span: 11,
+      width: '150',
+      align: 'center',
+    },
     {
       label: '负责人',
       prop: 'head',
@@ -313,15 +322,7 @@ export default {
       width: 'fit-content',
       align: 'center',
     },
-    {
-      label: '承运商名称',
-      prop: 'carrierName',
-      type: 'input',
-      labelWidth: '150',
-      span: 11,
-      width: 'fit-content',
-      align: 'center',
-    },
+
     {
       label: '自由车辆数',
       prop: 'freeVehiclesNub',
diff --git a/src/views/basic/pda/basicPda.vue b/src/views/basic/pda/basicPda.vue
index a739b778..2305f234 100644
--- a/src/views/basic/pda/basicPda.vue
+++ b/src/views/basic/pda/basicPda.vue
@@ -1,399 +1,514 @@
 <template>
-  <basic-container>
-    <avue-crud
-      v-if="edit"
-      :option="option"
-      v-model:search="search"
-      v-model:page="page"
-      v-model="form"
-      :table-loading="loading"
-      :data="data"
-      :permission="permissionList"
-      :before-open="beforeOpen"
-      ref="crud"
-      @row-update="rowUpdate"
-      @row-save="rowSave"
-      @row-del="rowDel"
-      @search-change="searchChange"
-      @search-reset="searchReset"
-      @selection-change="selectionChange"
-      @current-change="currentChange"
-      @size-change="sizeChange"
-      @refresh-change="refreshChange"
-      @on-load="onLoad"
-    >
-      <template #menu-left>
-        <el-button type="danger" icon="el-icon-delete" plain v-if="permission.basicdataPda_delete" @click="handleDelete"
-          >删 除
-        </el-button>
-        <el-button type="primary" @click="viewrepairs()">查看维修记录</el-button>
-      </template>
-      <template #menu="{ size, row, index }">
-        <el-button type="primary" text icon="el-icon-view" @click="handleEdit(row)">编辑</el-button>
-        <el-button type="primary" text icon="el-icon-view" @click="handleview(row)">查看</el-button>
-      </template>
-    </avue-crud>
+<!-- 表格组件 -->
+   <div class='el-content-el' ref='TabHeight'>
+    <!-- 顶部开始 -->
+    <div class="el-Cart-button">
+      <!-- 表格顶部左侧按钮 -->
+      <div class="el-Cart-button-left">
+            <el-button  type="primary" @click="AddInfo"><el-icon><Plus /></el-icon>新 增</el-button>
+            <el-button @click="handleDelete"><el-icon><Delete /></el-icon>删 除</el-button>
+            <el-button @click="handleDelete"><el-icon><Edit /></el-icon>查看维修记录</el-button>
+      </div>
+      <!-- 表格顶部右侧按钮 -->
+      <div class="el-Cart-button-right">
+        <!-- 刷新按钮 -->
+        <button>
+          <el-icon color="#ccc"><Refresh /></el-icon>
+        </button>
+        <!-- 功能按钮 -->
+        <button>
+          <el-icon color="#ccc"><Operation /></el-icon>
+        </button>
+        <!-- 搜索按钮 -->
+        <button>
+          <el-icon color="#ccc"><Search /></el-icon>
+        </button>
+      </div>
+    </div>
+    <!-- 顶部结束 -->
+    <div class='el-Cart'>
+      <!-- 表格列开始 -->
+      <el-table :data="data" border  :height="TabHeight+'px'" style="width: 100%;">
+      <el-table-column type="selection" width="55" fixed="left"/>
+      <el-table-column type="index" fixed="left" width="50" height="100" label="#" align="center"/>
+      <el-table-column prop="name" label="产品名称" width="180" align="center " sortable/>
+      <el-table-column prop="model" label="型号" width="180" align="center " />
+      <el-table-column prop="purchaseAmount" label="购买金额" width="180"  align="center "/>
+      <el-table-column prop="state" label="状态" width="180"  align="center "/>
+      <el-table-column prop="currentUsageWarehouse" label="当前使用仓" width="180"  align="center "/>
+      <el-table-column prop="user" label="使用人" width="180" align="center " />
+      <el-table-column prop="deviceSerialNumber" label="设备序列号S/N" width="180" align="center "/>
+      <el-table-column prop="userPosition" label="使用人岗位" width="180" align="center "/>
+      <el-table-column prop="isDeposit" label="是否收取押金" width="180" align="center "/>
+      <el-table-column prop="deposit" label="押金金额(元)" width="180" align="center "/>
+      <el-table-column prop="purchasingCompany" label="采购公司" width="180" align="center "/>
+        <el-table-column label="商品图片" width="180" align="center"  >
+          <template #default="props">
+              <img :src="props.row.photo" class='el-Img'>
+        </template>
+      </el-table-column>
+      <el-table-column prop="buyingTime" label="购买时间" width="180" align="center "/>
+      <el-table-column prop="notes" label="备注" width="180" align="center "/>
+      <el-table-column prop="warrantyPeriodEndTime" label="保修截止时间" width="180" align="center "/>
+      <el-table-column fixed="right" label="操作" width="280" align="center ">
+        <template #default>
+          <el-button link type="primary" icon="el-icon-delete"  @click="handleDelete">删除</el-button>
+          <el-button link type="primary" icon="el-icon-view"    @click="handleEdit(row)">编辑</el-button>
+          <el-button link type="primary" icon="el-icon-view"    @click="handleview(row)">查看</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 表格翻页功能 -->
+    <div class="demo-pagination-block">
+      <el-pagination
+      v-model:current-page="currentPage"
+      v-model:page-size="pageSize"
+      :page-sizes="pageList"
+      :small="small"
+      :disabled="disabled"
+      :background="background"
+      layout="total, sizes, prev, pager, next, jumper"
+      :total="2"
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+      />
+    </div>
 
-    <!-- <basic-pdaform v-if="!edit" @returnpda="returnpda" :pdaformdata="pdaformdata" /> -->
-  </basic-container>
+  </div>
+  <!-- 弹窗组件 -->
+  <div class='addlalog'>
+    <el-dialog v-model="AddLalog" title="新增产品" >
+    <el-form  label-position="top" label-width="100px" :model="AddForm">
+    <el-form-item label="产品名称">
+      <el-input v-model="AddForm.name"  placeholder="请输入产品名称"/>
+    </el-form-item>
+    <el-form-item label="购买金额">
+      <el-input v-model="AddForm.purchaseAmount" placeholder="请输入购买金额"/>
+    </el-form-item>
+    <el-form-item label="当前使用仓">
+      <el-input v-model="AddForm.currentUsageWarehouse" placeholder="请输入当前使用仓"/>
+    </el-form-item>
+    
+    <el-form-item label="设备序列号S/N">
+      <el-input v-model="AddForm.deviceSerialNumber" placeholder="请输入设备序列号" />
+    </el-form-item>
+    
+    <el-form-item label="是否收取押金">
+        <el-select v-model="AddForm.isDeposit" class="m-2" placeholder="选择是否收取押金">
+    <el-option
+      v-for="item in options"
+      :key="item.value"
+      :label="item.label"
+      :value="item.value"
+    />
+  </el-select>
+    </el-form-item>
+    
+    <el-form-item label="采购公司">
+      <el-input v-model="AddForm.purchasingCompany" placeholder="请输入采购公司"/>
+    </el-form-item>
+      <el-form-item label="保修截至时间">
+        <el-date-picker
+        v-model="AddForm.warrantyPeriodEndTime"
+        type="date"
+        placeholder="选择保修截至日期"
+        size="default"
+        format="YYYY/MM/DD"
+      />
+    </el-form-item>
+    <el-form-item label="图片">
+    <!-- photo -->
+        <el-upload
+    ref="uploadRef"
+    class="upload-demo"
+    :action=doubledCount
+    :on-success="ImgSuccess"
+    :before-upload="beforeAvatarUpload"
+    :headers="headers"
+    v-if='!img'
+  > 
+    <template #trigger >
+      <div class='img-icon'>
+      <el-button type="primary">点击上传图片</el-button>
+       <el-icon><UploadFilled /></el-icon>
+      </div>
+    </template>
+    </el-upload>
+    <div v-else class='el-img'>
+      <div class='el-img-left'>
+        <el-icon><Link /></el-icon>
+        <span>{{ImgText}}</span>
+      </div>
+    
+    <el-icon><SuccessFilled /></el-icon>
+    </div>
+    </el-form-item>
+
+    <el-form-item label="型号">
+      <el-input v-model="AddForm.model" placeholder="请输入型号"/>
+    </el-form-item>
+
+          <el-form-item label="状态">
+        <el-select v-model="AddForm.state" class="m-2" placeholder="选择状态">
+    <el-option
+      v-for="item in options2"
+      :key="item.value"
+      :label="item.label"
+      :value="item.value"
+    />
+  </el-select>
+    </el-form-item>
+
+    <el-form-item label="使用人">
+      <el-input v-model="AddForm.user"  placeholder="请输入使用人"/>
+    </el-form-item>
+
+          <el-form-item label="使用人岗位">
+      <el-input v-model="AddForm.userPosition" placeholder="请输入使用人岗位"/>
+    </el-form-item>
+
+    <el-form-item label="押金金额(RMB)">
+      <el-input v-model="AddForm.deposit" placeholder="请输入押金金额(元)" />
+    </el-form-item>
+
+    <el-form-item label="购买时间">
+      <el-date-picker
+        v-model="AddForm.buyingTime"
+        type="date"
+        placeholder="选择购买日期"
+        size="default"
+        format="YYYY/MM/DD"
+      />
+    </el-form-item>
+
+    <el-form-item label="备注">
+      <el-input v-model="AddForm.notes"  placeholder="请输入备注"/>
+    </el-form-item>
+  </el-form>
+<!-- 弹窗底部提交按钮 -->
+  <div class='el-dialog-button'>
+   <el-button type="danger" @click="submit">
+    <el-icon><Select/></el-icon>
+         确认提交
+    </el-button>
+  </div>
+  </el-dialog>
+  </div>
+  <!-- 弹窗结束 -->
+</div> 
 </template>
 
- <script>
-import { getList, getDetail, add, update, remove } from '@/api/basic/basicPda';
-import option from '@/option/basic/basicPda';
-import { mapGetters } from 'vuex';
-import { exportBlob } from '@/api/common';
+<script setup lang='ts'>
+import { ref, reactive,onMounted,computed } from 'vue';
+import { getList, getDetail, add, update, remove,$_TableList } from '@/api/basic/basicPda'; //API
+import { ElMessage, type UploadProps } from 'element-plus'
 import { getToken } from '@/utils/auth';
-import { downloadXls } from '@/utils/util';
-import { dateNow } from '@/utils/date';
-import NProgress from 'nprogress';
-import 'nprogress/nprogress.css';
-import BasicPdaform from '/src/views/basic/pda/basicPdaform.vue';
+const currentPage = ref(1); // 默认页码
+const pageSize = ref(30); // 默认每一页几条
+const pageList = ref([5, 10, 50, 100, 200]); // 选择每页显示多少条
+const small = ref(false);
+const background = ref(true); // 是否开启背景颜色
+const disabled = ref(false); // 是否禁止使用页码功能
+const data = ref([]); // 表单数据
+const TabHeight = ref();//动态获取表格高度
+const AddLalog = ref(false)//提交弹窗
+const img=ref(false);//图片是否上传成功
+const ImgText=ref('')
+const AddForm = ref({ //表单信息
+})
+const value1 = ref('') //日期
+const optionsvalue = ref('')//下拉框值
+const optionsvalue2=ref('')//状态值
+const uploadRef = ref()//图片上传
+const options = [//下拉选择框
+  {
+    value: '0',
+    label: '是',
+  },
+  {
+    value: '1',
+    label: '否',
+  },
 
-export default {
-  components: { BasicPdaform },
-  data() {
-    return {
-      form: {},
-      query: {},
-      search: {},
-      loading: true,
-      edit: true,
-      pdaformdata: {
-        view: false,
-      },
-      page: {
-        pageSize: 30,
-        currentPage: 1,
-        total: 0,
-      },
-      selectionList: [],
-      option: option,
-      data: [],
-    };
+]
+const options2 = [//下拉选择框
+  {
+    value: '1',
+    label: '正常',
   },
-  computed: {
-    ...mapGetters(['permission']),
-    permissionList() {
-      return {
-        addBtn: this.validData(this.permission.basicdataPda_add, false),
-        viewBtn: this.validData(this.permission.basicdataPda_view, false),
-        delBtn: this.validData(this.permission.basicdataPda_delete, false),
-        editBtn: this.validData(this.permission.basicdataPda_edit, false),
-        viewRecordsBtn: this.validData(this.permission.basicdataPda_viewRecords, false),
-      };
-    },
-    ids() {
-      let ids = [];
-      this.selectionList.forEach(ele => {
-        ids.push(ele.id);
-      });
-      return ids.join(',');
-    },
+  {
+    value: '2',
+    label: '维修',
   },
-  methods: {
-    //查看全部维修记录
-    viewrepairs() {
-      this.$router.push({
-        path: '/basic/pdarecords/basicPdarecordslist',
-        query: {},
-      });
-    },
-    //查看维修记录
-    handleViewrecords(row) {
-      console.log('>>>>>>>>>>>>>>>', row);
-      this.$router.push({
-        path: '/basic/pdarecords/basicPdarecords',
-        query: {
-          data: row.id,
-        },
-      });
-    },
-    //编辑
-    handleEdit(row) {
-      console.log('>>>>>>>>>>>>>>>', row);
-      //
-      //  this.pdaformdata = row;
-      //   this.pdaformdata.view =false;
-      //  this.edit =false;
-      this.$router.push({
-        path: '/basic/pda/basicPdaform',
-        query: {
-          data: row.id,
-          edt: false,
-          name: row.name + '-pad信息编辑',
-        },
-      });
-    },
-    //查看
-    handleview(row) {
-      // this.pdaformdata = row;
-      // this.pdaformdata.view = true ;
-      // console.log("this.pdaformdata.view>>>>>>>>>>>>>>>",this.pdaformdata.view);
-      // this.edit =false;
-      this.$router.push({
-        path: '/basic/pda/basicPdaform',
-        query: {
-          data: row.id,
-          edt: true,
-          name: row.name + '-pad信息查看',
-        },
-      });
-    },
-    //数据返回
-    returnpda(str) {
-      console.log('返回>>>>', str);
-      this.edit = true;
-    },
-    // 新增数据确定后执行
-    rowSave(row, done, loading) {
-      add(row).then(
-        () => {
-          this.onLoad(this.page);
-          this.$message({
-            type: 'success',
-            message: '操作成功!',
-          });
-          done();
-        },
-        error => {
-          loading();
-          window.console.log(error);
+  {
+    value: '3',
+    label: '不能使用(不能开机)',
+  },
+]
+// 图片上传接口
+const doubledCount = computed(() => {
+  return '/api/blade-resource/oss/endpoint/put-file'
+})
+ // 图片上传写代码TOKEN
+const headers =computed(()=>{
+  return {'Blade-Auth': 'Bearer ' + getToken(),
+      };
+    })
+// 获取表格数据
+function onLoad(){
+    // 获取表格数据API（$_TableList）
+    $_TableList({ current:currentPage.value, size: pageSize.value }).then(res=>{
+    console.log(res.data.data.records);
+    //表格信息
+    data.value=res.data.data.records 
+})
+}
+// 动态获取DOM高度给表单防止页面出现滚动条
+onMounted(() => {
+//默认值88
+   TabHeight.value = TabHeight.value.offsetHeight-91;
+// 等待DOM高度被复制之后在请求数据，防止被数据撑开高度
+   onLoad()
+})
+// 新增数据功能
+const AddInfo=()=>{
+  console.log(111);
+  AddLalog.value=true;
+}
+// 图片上传
+const imageUrl = ref('')
+// 图片上传成功回调函数
+const ImgSuccess: UploadProps['onSuccess'] = (response,uploadFile) => {
+  console.log(response,uploadFile,'123123123123123122312123');
+  console.log('================================================================');
+  if(response.success===true){
+    img.value=true;
+    console.log(img.value);
+     ImgText.value = response.data.originalName
+    
+  }
+}
+// 上传图片规则
+const beforeAvatarUpload: UploadProps['beforeUpload'] = (rawFile) => {
+  if (rawFile.type !== 'image/png') {
+        ElMessage.error('图片格式只能为image/png!')
+        return false
+    } else if (rawFile.size / 1024 / 1024 > 2) {
+    ElMessage.error('图片大小不能大于2MB!')
+    return false
+  }
+  return true
+}
+</script>
+
+<style scoped lang='scss'>
+// 最外层 IDV
+.el-content-el {
+  padding: 0 8px;
+  padding-top:8px;
+  background-color: #fff;
+  height: 100%;
+  box-sizing: border-box;
+// 表格顶部按钮
+    :deep(.el-Cart-button) {
+      margin-bottom: 8px;
+      display: flex;
+      justify-content: space-between;
+    }
+    // 表格顶部左侧、右侧按钮样式
+    .el-Cart-button-left,.el-Cart-button-right{
+      display: flex;
+      margin: 0 0px;
+      justify-content: space-between;
+    }
+    .el-Cart-button-left{
+    :deep( button){
+    padding: 0 14px;
+    min-width: 70px;
+    display: flex;
+    span{
+    width: 100%;
+    display: inline-flex;
+    align-items: center;
+    justify-content: space-between;
+    i{
+      margin-right: 6px;
+    }
+    }
+    }
+    
+    }
+    .el-Cart-button-right {
+    display: flex;
+    margin: 0 0px;
+    justify-content: space-between;
+    align-items: center;
+    button {
+        background-color: transparent;
+        border-radius: 50%;
+        width: 30px;
+        height: 30px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        border: 1px solid #ccc;
+        margin-right: 8px;
+        
+        &:hover {
+          background-color: #172e601f;
+          i {
+            color: #0e2549;
+          }
         }
-      );
-    },
-    // 数据编辑后触发
-    rowUpdate(row, index, done, loading) {
-      update(row).then(
-        () => {
-          this.onLoad(this.page);
-          this.$message({
-            type: 'success',
-            message: '操作成功!',
-          });
-          done();
-        },
-        error => {
-          loading();
-          console.log(error);
+        // 去掉最后一个按钮右侧边距
+        &:last-child {
+          margin-right: 0;
         }
-      );
-    },
-    // 行删除
-    rowDel(row) {
-      this.$confirm('确定将选择数据删除?', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-      })
-        .then(() => {
-          return remove(row.id);
-        })
-        .then(() => {
-          this.onLoad(this.page);
-          this.$message({
-            type: 'success',
-            message: '操作成功!',
-          });
-        });
-    },
-    handleDelete() {
-      if (this.selectionList.length === 0) {
-        this.$message.warning('请选择至少一条数据');
-        return;
       }
-      this.$confirm('确定将选择数据删除?', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-      })
-        .then(() => {
-          return remove(this.ids);
-        })
-        .then(() => {
-          this.onLoad(this.page);
-          this.$message({
-            type: 'success',
-            message: '操作成功!',
-          });
-          this.$refs.crud.toggleSelection();
-        });
-    },
-    handleExport() {
-      let downloadUrl = `/basic/basicdataPda/export-basicdataPda?${
-        this.website.tokenHeader
-      }=${getToken()}`;
-      const {
-        name,
-        model,
-        deviceSerialNumber,
-        state,
-        currentUsageWarehouse,
-        user,
-        userPositionId,
-        isDeposit,
-      } = this.query;
-      let values = {
-        name_like: name,
-        model_like: model,
-        deviceSerialNumber_equal: deviceSerialNumber,
-        state_equal: state,
-        currentUsageWarehouse_equal: currentUsageWarehouse,
-        user_like: user,
-        userPositionId_equal: userPositionId,
-        isDeposit_equal: isDeposit,
-      };
-      this.$confirm('是否导出数据?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-      }).then(() => {
-        NProgress.start();
-        exportBlob(downloadUrl, values).then(res => {
-          downloadXls(res.data, `pda信息${dateNow()}.xlsx`);
-          NProgress.done();
-        });
-      });
-    },
-    beforeOpen(done, type) {
-      if (['edit', 'view'].includes(type)) {
-        getDetail(this.form.id).then(res => {
-          this.form = res.data.data;
-        });
+    }
+  .el-Cart {
+    // 表格标题颜色
+    :deep(.el-table__header) {
+      th {
+        background-color: #fafafa;
+        color: #000;
       }
-      done();
-    },
-    // 清空搜索回调方法
-    searchReset() {
-      this.query = {};
-      this.onLoad(this.page);
-    },
-    // 点击搜索后触发该事件
-    searchChange(params, done) {
-      this.query = params;
-      this.page.currentPage = 1;
-      this.onLoad(this.page, params);
-      done();
-    },
-    // 当选择项发生变化时会触发该事件
-    selectionChange(list) {
-      this.selectionList = list;
-    },
-    selectionClear() {
-      this.selectionList = [];
-      this.$refs.crud.toggleSelection();
-    },
-    // 当选择项发生变化时会触发该事件
-    currentChange(currentPage) {
-      this.page.currentPage = currentPage;
-    },
-    // 点击每页多少条
-    sizeChange(pageSize) {
-      this.page.pageSize = pageSize;
-    },
-    // 点击刷新
-    refreshChange() {
-      this.onLoad(this.page, this.query);
-      console.log('点击刷新');
-    },
-    // 初始化页面
-    onLoad(page, params = {}) {
-      this.loading = true;
-
-      const {
-        name,
-        model,
-        deviceSerialNumber,
-        state,
-        currentUsageWarehouse,
-        user,
-        userPositionId,
-        isDeposit,
-      } = this.query;
-
-      let values = {
-        name_like: name,
-        model_like: model,
-        deviceSerialNumber_equal: deviceSerialNumber,
-        state_equal: state,
-        currentUsageWarehouse_equal: currentUsageWarehouse,
-        user_like: user,
-        userPositionId_equal: userPositionId,
-        isDeposit_equal: isDeposit,
-      };
-
-      getList(page.currentPage, page.pageSize, values).then(res => {
-        console.log(res.data.data.records, 'res');
-        const data = res.data.data;
-        this.page.total = data.total;
-        console.log(data.total, 'sss');
-        this.data = data.records;
-        console.log(this.data, 'this.data');
-        this.loading = false;
-        this.selectionClear();
-      });
-    },
-  },
-};
-</script> 
+    }
+    // 组件样式开始
+    // 分页样式
+    .demo-pagination-block {
+      display: flex;
+      justify-content: flex-end;
+      margin-top: 6px;
+    }
 
+    // 表格行高度
+    :deep(.el-table__row) {
+      height: 60px;
+    }
+    // 表格图片
+    .el-Img {
+      width: 100%;
+      height: 40px;
 
-
-<style scoped lang="scss">
-:deep(.el-form-item__content) {
-  div:first-child {
-    width: auto;
+      img {
+        width: 100%;
+        height: 100%;
+      }
+    }
   }
-}
-:deep(.el-form-item__label) {
-  width: 90px !important;
-  justify-content: flex-start;
-}
-:deep(.avue-form__menu) {
-  width: 120px !important;
-}
-div:last-child {
-  margin-left: auto;
-}
-.avue-form__group {
-  .avue-form__menu--center {
-    margin-left: auto !important;
+  // 新增数据弹窗组件样式
+  :deep(.addlalog){
+          // 弹窗
+  .el-dialog__header{
+        border-bottom: 1px solid #172e607d ;
+        margin-right:0;
+        margin-bottom:0;
+        padding-bottom:20px;
+        position: relative;
+        i{
+          color:#172e60;
+        }
   }
-  .el-col:last-child {
-    margin-left: auto !important;
+  // 弹窗标题左侧小竖线
+  .el-dialog__header::after{
+    content: "";
+    display: block;
+    width: 3px;
+    height: 16px;
+    background-color: #172e60;
+    position: absolute;
+    left: 8px;
+    top: 24px;
   }
+  .el-dialog__body{
+    .el-form{
+      width: 100%;
+      display:flex;
+      flex-wrap: wrap;
+      justify-content: space-between;
+    }
+    .el-form-item{
+      width:276px;
+      
+    }
+ /* 去掉第三个、第六个、第九个div的右外边距 */
+.el-form-item:nth-child(3n) {
+  margin-right: 0; 
 }
-.no-print {
-  margin-left: auto !important;
-}
-:deep(.avue-form__menu--center) {
-  margin-left: auto !important;
-  display: flex;
+  }
+
+.el-form-item__content{
+  height:30px;
+  // 日期选择框
+     .el-input{
+      width: 100%;
+      height:30px !important;  
+     }
+//  下拉选择框
+    .el-select{
+      width: 100%;
+    }
+  }
+
+  }
+
+  // 底部提交
+  .el-dialog-button{
+    display:flex;
   justify-content: flex-end;
-  button {
-    margin-right: 0 !important;
   }
-}
-.avue-form__menu--center {
-  margin-left: auto !important;
-}
-:deep(.el-form-item__label) {
-  width: auto !important;
-}
-:deep(.avue-form__row) {
-  max-width: 270px !important;
-  margin-right: 2px;
-}
-:deep(.avue-form__row) {
-  .el-form-item {
-    margin-right: 0;
+  // 图片上传
+  .img-icon{
+    width: 100%;
+    position: relative;
+    .el-button{
+     width: 100%;
+    background-color: #fff;
+    color: #a8abb9;
+    justify-content: flex-start;
+    border: 1px solid #dcdfe6;
+    }
+    i{
+      position:absolute;
+      left: 110px;
+      top: 8px;
+      font-size:18px
+    }
   }
-}
-:deep(.avue-form__group--flex) {
-  justify-content: space-between;
-}
-:deep(.el-form-item__label) {
-  padding-right: 8px;
-}
+  :deep(.upload-demo){
+    
+    width:100%;
+    .el-upload{
+      width:100%
+    }
+    ul{
+      margin-top:0;
+    }
 
-</style>
+  }
+  // 图片上传成功
+  .el-img{
+    border: 1px solid #ccc;
+    width: 100%;
+    border-radius: 4px;
+    padding: 0 8px;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    height: 30px;
+    .el-img-left{
+      display:flex;
+      align-items:center; 
+      i{
+        margin-right:8px;
+        color:#ccc;
+      }
+    }
+    i{
+      color: #10d070;
+    margin-left: 6px; 
+    }
+    }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/basic/pda/basicPdaTT.vue b/src/views/basic/pda/basicPdaTT.vue
new file mode 100644
index 00000000..a739b778
--- /dev/null
+++ b/src/views/basic/pda/basicPdaTT.vue
@@ -0,0 +1,399 @@
+<template>
+  <basic-container>
+    <avue-crud
+      v-if="edit"
+      :option="option"
+      v-model:search="search"
+      v-model:page="page"
+      v-model="form"
+      :table-loading="loading"
+      :data="data"
+      :permission="permissionList"
+      :before-open="beforeOpen"
+      ref="crud"
+      @row-update="rowUpdate"
+      @row-save="rowSave"
+      @row-del="rowDel"
+      @search-change="searchChange"
+      @search-reset="searchReset"
+      @selection-change="selectionChange"
+      @current-change="currentChange"
+      @size-change="sizeChange"
+      @refresh-change="refreshChange"
+      @on-load="onLoad"
+    >
+      <template #menu-left>
+        <el-button type="danger" icon="el-icon-delete" plain v-if="permission.basicdataPda_delete" @click="handleDelete"
+          >删 除
+        </el-button>
+        <el-button type="primary" @click="viewrepairs()">查看维修记录</el-button>
+      </template>
+      <template #menu="{ size, row, index }">
+        <el-button type="primary" text icon="el-icon-view" @click="handleEdit(row)">编辑</el-button>
+        <el-button type="primary" text icon="el-icon-view" @click="handleview(row)">查看</el-button>
+      </template>
+    </avue-crud>
+
+    <!-- <basic-pdaform v-if="!edit" @returnpda="returnpda" :pdaformdata="pdaformdata" /> -->
+  </basic-container>
+</template>
+
+ <script>
+import { getList, getDetail, add, update, remove } from '@/api/basic/basicPda';
+import option from '@/option/basic/basicPda';
+import { mapGetters } from 'vuex';
+import { exportBlob } from '@/api/common';
+import { getToken } from '@/utils/auth';
+import { downloadXls } from '@/utils/util';
+import { dateNow } from '@/utils/date';
+import NProgress from 'nprogress';
+import 'nprogress/nprogress.css';
+import BasicPdaform from '/src/views/basic/pda/basicPdaform.vue';
+
+export default {
+  components: { BasicPdaform },
+  data() {
+    return {
+      form: {},
+      query: {},
+      search: {},
+      loading: true,
+      edit: true,
+      pdaformdata: {
+        view: false,
+      },
+      page: {
+        pageSize: 30,
+        currentPage: 1,
+        total: 0,
+      },
+      selectionList: [],
+      option: option,
+      data: [],
+    };
+  },
+  computed: {
+    ...mapGetters(['permission']),
+    permissionList() {
+      return {
+        addBtn: this.validData(this.permission.basicdataPda_add, false),
+        viewBtn: this.validData(this.permission.basicdataPda_view, false),
+        delBtn: this.validData(this.permission.basicdataPda_delete, false),
+        editBtn: this.validData(this.permission.basicdataPda_edit, false),
+        viewRecordsBtn: this.validData(this.permission.basicdataPda_viewRecords, false),
+      };
+    },
+    ids() {
+      let ids = [];
+      this.selectionList.forEach(ele => {
+        ids.push(ele.id);
+      });
+      return ids.join(',');
+    },
+  },
+  methods: {
+    //查看全部维修记录
+    viewrepairs() {
+      this.$router.push({
+        path: '/basic/pdarecords/basicPdarecordslist',
+        query: {},
+      });
+    },
+    //查看维修记录
+    handleViewrecords(row) {
+      console.log('>>>>>>>>>>>>>>>', row);
+      this.$router.push({
+        path: '/basic/pdarecords/basicPdarecords',
+        query: {
+          data: row.id,
+        },
+      });
+    },
+    //编辑
+    handleEdit(row) {
+      console.log('>>>>>>>>>>>>>>>', row);
+      //
+      //  this.pdaformdata = row;
+      //   this.pdaformdata.view =false;
+      //  this.edit =false;
+      this.$router.push({
+        path: '/basic/pda/basicPdaform',
+        query: {
+          data: row.id,
+          edt: false,
+          name: row.name + '-pad信息编辑',
+        },
+      });
+    },
+    //查看
+    handleview(row) {
+      // this.pdaformdata = row;
+      // this.pdaformdata.view = true ;
+      // console.log("this.pdaformdata.view>>>>>>>>>>>>>>>",this.pdaformdata.view);
+      // this.edit =false;
+      this.$router.push({
+        path: '/basic/pda/basicPdaform',
+        query: {
+          data: row.id,
+          edt: true,
+          name: row.name + '-pad信息查看',
+        },
+      });
+    },
+    //数据返回
+    returnpda(str) {
+      console.log('返回>>>>', str);
+      this.edit = true;
+    },
+    // 新增数据确定后执行
+    rowSave(row, done, loading) {
+      add(row).then(
+        () => {
+          this.onLoad(this.page);
+          this.$message({
+            type: 'success',
+            message: '操作成功!',
+          });
+          done();
+        },
+        error => {
+          loading();
+          window.console.log(error);
+        }
+      );
+    },
+    // 数据编辑后触发
+    rowUpdate(row, index, done, loading) {
+      update(row).then(
+        () => {
+          this.onLoad(this.page);
+          this.$message({
+            type: 'success',
+            message: '操作成功!',
+          });
+          done();
+        },
+        error => {
+          loading();
+          console.log(error);
+        }
+      );
+    },
+    // 行删除
+    rowDel(row) {
+      this.$confirm('确定将选择数据删除?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          return remove(row.id);
+        })
+        .then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: 'success',
+            message: '操作成功!',
+          });
+        });
+    },
+    handleDelete() {
+      if (this.selectionList.length === 0) {
+        this.$message.warning('请选择至少一条数据');
+        return;
+      }
+      this.$confirm('确定将选择数据删除?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          return remove(this.ids);
+        })
+        .then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: 'success',
+            message: '操作成功!',
+          });
+          this.$refs.crud.toggleSelection();
+        });
+    },
+    handleExport() {
+      let downloadUrl = `/basic/basicdataPda/export-basicdataPda?${
+        this.website.tokenHeader
+      }=${getToken()}`;
+      const {
+        name,
+        model,
+        deviceSerialNumber,
+        state,
+        currentUsageWarehouse,
+        user,
+        userPositionId,
+        isDeposit,
+      } = this.query;
+      let values = {
+        name_like: name,
+        model_like: model,
+        deviceSerialNumber_equal: deviceSerialNumber,
+        state_equal: state,
+        currentUsageWarehouse_equal: currentUsageWarehouse,
+        user_like: user,
+        userPositionId_equal: userPositionId,
+        isDeposit_equal: isDeposit,
+      };
+      this.$confirm('是否导出数据?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        NProgress.start();
+        exportBlob(downloadUrl, values).then(res => {
+          downloadXls(res.data, `pda信息${dateNow()}.xlsx`);
+          NProgress.done();
+        });
+      });
+    },
+    beforeOpen(done, type) {
+      if (['edit', 'view'].includes(type)) {
+        getDetail(this.form.id).then(res => {
+          this.form = res.data.data;
+        });
+      }
+      done();
+    },
+    // 清空搜索回调方法
+    searchReset() {
+      this.query = {};
+      this.onLoad(this.page);
+    },
+    // 点击搜索后触发该事件
+    searchChange(params, done) {
+      this.query = params;
+      this.page.currentPage = 1;
+      this.onLoad(this.page, params);
+      done();
+    },
+    // 当选择项发生变化时会触发该事件
+    selectionChange(list) {
+      this.selectionList = list;
+    },
+    selectionClear() {
+      this.selectionList = [];
+      this.$refs.crud.toggleSelection();
+    },
+    // 当选择项发生变化时会触发该事件
+    currentChange(currentPage) {
+      this.page.currentPage = currentPage;
+    },
+    // 点击每页多少条
+    sizeChange(pageSize) {
+      this.page.pageSize = pageSize;
+    },
+    // 点击刷新
+    refreshChange() {
+      this.onLoad(this.page, this.query);
+      console.log('点击刷新');
+    },
+    // 初始化页面
+    onLoad(page, params = {}) {
+      this.loading = true;
+
+      const {
+        name,
+        model,
+        deviceSerialNumber,
+        state,
+        currentUsageWarehouse,
+        user,
+        userPositionId,
+        isDeposit,
+      } = this.query;
+
+      let values = {
+        name_like: name,
+        model_like: model,
+        deviceSerialNumber_equal: deviceSerialNumber,
+        state_equal: state,
+        currentUsageWarehouse_equal: currentUsageWarehouse,
+        user_like: user,
+        userPositionId_equal: userPositionId,
+        isDeposit_equal: isDeposit,
+      };
+
+      getList(page.currentPage, page.pageSize, values).then(res => {
+        console.log(res.data.data.records, 'res');
+        const data = res.data.data;
+        this.page.total = data.total;
+        console.log(data.total, 'sss');
+        this.data = data.records;
+        console.log(this.data, 'this.data');
+        this.loading = false;
+        this.selectionClear();
+      });
+    },
+  },
+};
+</script> 
+
+
+
+<style scoped lang="scss">
+:deep(.el-form-item__content) {
+  div:first-child {
+    width: auto;
+  }
+}
+:deep(.el-form-item__label) {
+  width: 90px !important;
+  justify-content: flex-start;
+}
+:deep(.avue-form__menu) {
+  width: 120px !important;
+}
+div:last-child {
+  margin-left: auto;
+}
+.avue-form__group {
+  .avue-form__menu--center {
+    margin-left: auto !important;
+  }
+  .el-col:last-child {
+    margin-left: auto !important;
+  }
+}
+.no-print {
+  margin-left: auto !important;
+}
+:deep(.avue-form__menu--center) {
+  margin-left: auto !important;
+  display: flex;
+  justify-content: flex-end;
+  button {
+    margin-right: 0 !important;
+  }
+}
+.avue-form__menu--center {
+  margin-left: auto !important;
+}
+:deep(.el-form-item__label) {
+  width: auto !important;
+}
+:deep(.avue-form__row) {
+  max-width: 270px !important;
+  margin-right: 2px;
+}
+:deep(.avue-form__row) {
+  .el-form-item {
+    margin-right: 0;
+  }
+}
+:deep(.avue-form__group--flex) {
+  justify-content: space-between;
+}
+:deep(.el-form-item__label) {
+  padding-right: 8px;
+}
+
+</style>
diff --git a/src/views/basic/pda/basicPdaTTTT.vue b/src/views/basic/pda/basicPdaTTTT.vue
deleted file mode 100644
index d4902955..00000000
--- a/src/views/basic/pda/basicPdaTTTT.vue
+++ /dev/null
@@ -1,513 +0,0 @@
-<template>
-<!-- 表格组件 -->
-   <div class='el-content-el' ref='TabHeight'>
-    <!-- 顶部开始 -->
-    <div class="el-Cart-button">
-      <!-- 表格顶部左侧按钮 -->
-      <div class="el-Cart-button-left">
-            <el-button  type="primary" @click="AddInfo"><el-icon><Plus /></el-icon>新 增</el-button>
-            <el-button @click="handleDelete"><el-icon><Delete /></el-icon>删 除</el-button>
-            <el-button @click="handleDelete"><el-icon><Edit /></el-icon>查看维修记录</el-button>
-      </div>
-      <!-- 表格顶部右侧按钮 -->
-      <div class="el-Cart-button-right">
-        <!-- 刷新按钮 -->
-        <button>
-          <el-icon color="#ccc"><Refresh /></el-icon>
-        </button>
-        <!-- 功能按钮 -->
-        <button>
-          <el-icon color="#ccc"><Operation /></el-icon>
-        </button>
-        <!-- 搜索按钮 -->
-        <button>
-          <el-icon color="#ccc"><Search /></el-icon>
-        </button>
-      </div>
-    </div>
-    <!-- 顶部结束 -->
-    <div class='el-Cart'>
-      <!-- 表格列开始 -->
-      <el-table :data="data" border  :height="TabHeight+'px'" style="width: 100%;">
-      <el-table-column type="selection" width="55" fixed="left"/>
-      <el-table-column type="index" fixed="left" width="50" height="100" label="#" align="center"/>
-      <el-table-column prop="name" label="产品名称" width="180" align="center " sortable/>
-      <el-table-column prop="model" label="型号" width="180" align="center " />
-      <el-table-column prop="purchaseAmount" label="购买金额" width="180"  align="center "/>
-      <el-table-column prop="state" label="状态" width="180"  align="center "/>
-      <el-table-column prop="currentUsageWarehouse" label="当前使用仓" width="180"  align="center "/>
-      <el-table-column prop="user" label="使用人" width="180" align="center " />
-      <el-table-column prop="deviceSerialNumber" label="设备序列号S/N" width="180" align="center "/>
-      <el-table-column prop="userPosition" label="使用人岗位" width="180" align="center "/>
-      <el-table-column prop="isDeposit" label="是否收取押金" width="180" align="center "/>
-      <el-table-column prop="deposit" label="押金金额(元)" width="180" align="center "/>
-      <el-table-column prop="purchasingCompany" label="采购公司" width="180" align="center "/>
-        <el-table-column label="商品图片" width="180" align="center"  >
-          <template #default="props">
-              <img :src="props.row.photo" class='el-Img'>
-        </template>
-      </el-table-column>
-      <el-table-column prop="buyingTime" label="购买时间" width="180" align="center "/>
-      <el-table-column prop="notes" label="备注" width="180" align="center "/>
-      <el-table-column prop="warrantyPeriodEndTime" label="保修截止时间" width="180" align="center "/>
-      <el-table-column fixed="right" label="操作" width="280" align="center ">
-        <template #default>
-          <el-button link type="primary" icon="el-icon-delete"  @click="handleDelete">删除</el-button>
-          <el-button link type="primary" icon="el-icon-view"    @click="handleEdit(row)">编辑</el-button>
-          <el-button link type="primary" icon="el-icon-view"    @click="handleview(row)">查看</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!-- 表格翻页功能 -->
-    <div class="demo-pagination-block">
-      <el-pagination
-      v-model:current-page="currentPage"
-      v-model:page-size="pageSize"
-      :page-sizes="pageList"
-      :small="small"
-      :disabled="disabled"
-      :background="background"
-      layout="total, sizes, prev, pager, next, jumper"
-      :total="2"
-      @size-change="handleSizeChange"
-      @current-change="handleCurrentChange"
-      />
-    </div>
-
-  </div>
-  <!-- 弹窗组件 -->
-  <div class='addlalog'>
-    <el-dialog v-model="AddLalog" title="新增产品" >
-    <el-form  label-position="top" label-width="100px" :model="AddForm">
-    <el-form-item label="产品名称">
-      <el-input v-model="AddForm.name"  placeholder="请输入产品名称"/>
-    </el-form-item>
-    <el-form-item label="购买金额">
-      <el-input v-model="AddForm.purchaseAmount" placeholder="请输入购买金额"/>
-    </el-form-item>
-    <el-form-item label="当前使用仓">
-      <el-input v-model="AddForm.currentUsageWarehouse" placeholder="请输入当前使用仓"/>
-    </el-form-item>
-    
-    <el-form-item label="设备序列号S/N">
-      <el-input v-model="AddForm.deviceSerialNumber" placeholder="请输入设备序列号" />
-    </el-form-item>
-    
-    <el-form-item label="是否收取押金">
-        <el-select v-model="AddForm.isDeposit" class="m-2" placeholder="选择是否收取押金">
-    <el-option
-      v-for="item in options"
-      :key="item.value"
-      :label="item.label"
-      :value="item.value"
-    />
-  </el-select>
-    </el-form-item>
-    
-    <el-form-item label="采购公司">
-      <el-input v-model="AddForm.purchasingCompany" placeholder="请输入采购公司"/>
-    </el-form-item>
-      <el-form-item label="保修截至时间">
-        <el-date-picker
-        v-model="AddForm.warrantyPeriodEndTime"
-        type="date"
-        placeholder="选择保修截至日期"
-        size="default"
-        format="YYYY/MM/DD"
-      />
-    </el-form-item>
-    <el-form-item label="图片">
-    <!-- photo -->
-        <el-upload
-    ref="uploadRef"
-    class="upload-demo"
-    :action=doubledCount
-    :on-success="ImgSuccess"
-    :before-upload="beforeAvatarUpload"
-    :headers="headers"
-    v-if='!img'
-  > 
-    <template #trigger >
-      <div class='img-icon'>
-      <el-button type="primary">点击上传图片</el-button>
-       <el-icon><UploadFilled /></el-icon>
-      </div>
-    </template>
-    </el-upload>
-    <div v-else class='el-img'>
-      <div class='el-img-left'>
-        <el-icon><PictureFilled /></el-icon>
-        <span>{{ImgText}}</span>
-      </div>
-    
-    <el-icon><SuccessFilled /></el-icon>
-    </div>
-    </el-form-item>
-
-    <el-form-item label="型号">
-      <el-input v-model="AddForm.model" placeholder="请输入型号"/>
-    </el-form-item>
-
-          <el-form-item label="状态">
-        <el-select v-model="AddForm.state" class="m-2" placeholder="选择状态">
-    <el-option
-      v-for="item in options2"
-      :key="item.value"
-      :label="item.label"
-      :value="item.value"
-    />
-  </el-select>
-    </el-form-item>
-
-    <el-form-item label="使用人">
-      <el-input v-model="AddForm.user"  placeholder="请输入使用人"/>
-    </el-form-item>
-
-          <el-form-item label="使用人岗位">
-      <el-input v-model="AddForm.userPosition" placeholder="请输入使用人岗位"/>
-    </el-form-item>
-
-    <el-form-item label="押金金额(RMB)">
-      <el-input v-model="AddForm.deposit" placeholder="请输入押金金额(元)" />
-    </el-form-item>
-
-    <el-form-item label="购买时间">
-      <el-date-picker
-        v-model="AddForm.buyingTime"
-        type="date"
-        placeholder="选择购买日期"
-        size="default"
-        format="YYYY/MM/DD"
-      />
-    </el-form-item>
-
-    <el-form-item label="备注">
-      <el-input v-model="AddForm.notes"  placeholder="请输入备注"/>
-    </el-form-item>
-  </el-form>
-<!-- 弹窗底部提交按钮 -->
-  <div class='el-dialog-button'>
-   <el-button type="danger" @click="submit">
-    <el-icon><Select/></el-icon>
-         确认提交
-    </el-button>
-  </div>
-  </el-dialog>
-  </div>
-  <!-- 弹窗结束 -->
-</div> 
-</template>
-
-<script setup lang='ts'>
-import { ref, reactive,onMounted,computed } from 'vue';
-import { getList, getDetail, add, update, remove,$_TableList } from '@/api/basic/basicPda'; //API
-import { ElMessage, type UploadProps } from 'element-plus'
-import { getToken } from '@/utils/auth';
-const currentPage = ref(1); // 默认页码
-const pageSize = ref(30); // 默认每一页几条
-const pageList = ref([5, 10, 50, 100, 200]); // 选择每页显示多少条
-const small = ref(false);
-const background = ref(true); // 是否开启背景颜色
-const disabled = ref(false); // 是否禁止使用页码功能
-const data = ref([]); // 表单数据
-const TabHeight = ref();//动态获取表格高度
-const AddLalog = ref(false)//提交弹窗
-const img=ref(false);//图片是否上传成功
-const ImgText=ref('')
-const AddForm = ref({ //表单信息
-})
-const value1 = ref('') //日期
-const optionsvalue = ref('')//下拉框值
-const optionsvalue2=ref('')//状态值
-const uploadRef = ref()//图片上传
-const options = [//下拉选择框
-  {
-    value: '0',
-    label: '是',
-  },
-  {
-    value: '1',
-    label: '否',
-  },
-
-]
-const options2 = [//下拉选择框
-  {
-    value: '1',
-    label: '正常',
-  },
-  {
-    value: '2',
-    label: '维修',
-  },
-  {
-    value: '3',
-    label: '不能使用(不能开机)',
-  },
-]
-// 图片上传接口
-const doubledCount = computed(() => {
-  return '/api/blade-resource/oss/endpoint/put-file'
-})
- // 图片上传写代码TOKEN
-const headers =computed(()=>{
-  return {'Blade-Auth': 'Bearer ' + getToken(),
-      };
-    })
-// 获取表格数据
-function onLoad(){
-    // 获取表格数据API（$_TableList）
-    $_TableList({ current:currentPage.value, size: pageSize.value }).then(res=>{
-    console.log(res.data.data.records);
-    //表格信息
-    data.value=res.data.data.records 
-})
-}
-// 动态获取DOM高度给表单防止页面出现滚动条
-onMounted(() => {
-//默认值88
-   TabHeight.value = TabHeight.value.offsetHeight-91;
-// 等待DOM高度被复制之后在请求数据，防止被数据撑开高度
-   onLoad()
-})
-// 新增数据功能
-const AddInfo=()=>{
-  console.log(111);
-  AddLalog.value=true;
-}
-// 图片上传
-const imageUrl = ref('')
-// 图片上传成功回调函数
-const ImgSuccess: UploadProps['onSuccess'] = (response,uploadFile) => {
-  console.log(response,uploadFile,'123123123123123122312123');
-  console.log('================================================================');
-  if(response.success===true){
-    img.value=true;
-    console.log(img.value);
-     ImgText.value = response.data.originalName
-    
-  }
-}
-// 上传图片规则
-const beforeAvatarUpload: UploadProps['beforeUpload'] = (rawFile) => {
-  if (rawFile.type !== 'image/png') {
-        ElMessage.error('图片格式只能为image/png!')
-        return false
-    } else if (rawFile.size / 1024 / 1024 > 2) {
-    ElMessage.error('图片大小不能大于2MB!')
-    return false
-  }
-  return true
-}
-</script>
-
-<style scoped lang='scss'>
-// 最外层 IDV
-.el-content-el {
-  padding: 0 8px;
-  padding-top:8px;
-  background-color: #fff;
-  height: 100%;
-  box-sizing: border-box;
-// 表格顶部按钮
-    :deep(.el-Cart-button) {
-      margin-bottom: 8px;
-      display: flex;
-      justify-content: space-between;
-    }
-    // 表格顶部左侧、右侧按钮样式
-    .el-Cart-button-left,.el-Cart-button-right{
-      display: flex;
-      margin: 0 0px;
-      justify-content: space-between;
-    }
-    .el-Cart-button-left{
-    :deep( button){
-    padding: 0 7px;
-    min-width: 70px;
-    display: flex;
-    span{
-    width: 100%;
-    display: inline-flex;
-    align-items: center;
-    justify-content: space-between;
-    i{
-      margin-right: 6px;
-    }
-    }
-    }
-    
-    }
-    .el-Cart-button-right {
-    display: flex;
-    margin: 0 0px;
-    justify-content: space-between;
-    align-items: center;
-    button {
-        background-color: transparent;
-        border-radius: 50%;
-        width: 30px;
-        height: 30px;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        border: 1px solid #ccc;
-        margin-right: 8px;
-        
-        &:hover {
-          background-color: #172e601f;
-          i {
-            color: #0e2549;
-          }
-        }
-        // 去掉最后一个按钮右侧边距
-        &:last-child {
-          margin-right: 0;
-        }
-      }
-    }
-  .el-Cart {
-    // 表格标题颜色
-    :deep(.el-table__header) {
-      th {
-        background-color: #fafafa;
-        color: #000;
-      }
-    }
-    // 组件样式开始
-    // 分页样式
-    .demo-pagination-block {
-      display: flex;
-      justify-content: flex-end;
-      margin-top: 6px;
-    }
-
-    // 表格行高度
-    :deep(.el-table__row) {
-      height: 60px;
-    }
-    // 表格图片
-    .el-Img {
-      width: 100%;
-      height: 40px;
-
-      img {
-        width: 100%;
-        height: 100%;
-      }
-    }
-  }
-  // 新增数据弹窗组件样式
-  :deep(.addlalog){
-          // 弹窗
-  .el-dialog__header{
-        border-bottom: 1px solid #172e607d ;
-        margin-right:0;
-        margin-bottom:0;
-        padding-bottom:20px;
-        position: relative;
-        i{
-          color:#172e60;
-        }
-  }
-  // 弹窗标题左侧小竖线
-  .el-dialog__header::after{
-    content: "";
-    display: block;
-    width: 3px;
-    height: 16px;
-    background-color: #172e60;
-    position: absolute;
-    left: 8px;
-    top: 24px;
-  }
-  .el-dialog__body{
-    .el-form{
-      width: 100%;
-      display:flex;
-      flex-wrap: wrap;
-      justify-content: space-between;
-    }
-    .el-form-item{
-      width:276px;
-      
-    }
- /* 去掉第三个、第六个、第九个div的右外边距 */
-.el-form-item:nth-child(3n) {
-  margin-right: 0; 
-}
-  }
-
-.el-form-item__content{
-  height:30px;
-  // 日期选择框
-     .el-input{
-      width: 100%;
-      height:30px !important;  
-     }
-//  下拉选择框
-    .el-select{
-      width: 100%;
-    }
-  }
-
-  }
-
-  // 底部提交
-  .el-dialog-button{
-    display:flex;
-  justify-content: flex-end;
-  }
-  // 图片上传
-  .img-icon{
-    width: 100%;
-    position: relative;
-    .el-button{
-     width: 100%;
-    background-color: #fff;
-    color: #a8abb9;
-    justify-content: flex-start;
-    border: 1px solid #dcdfe6;
-    }
-    i{
-      position:absolute;
-      left: 110px;
-      top: 8px;
-      font-size:18px
-    }
-  }
-  :deep(.upload-demo){
-    
-    width:100%;
-    .el-upload{
-      width:100%
-    }
-    ul{
-      margin-top:0;
-    }
-
-  }
-  // 图片上传成功
-  .el-img{
-    border: 1px solid #ccc;
-    width: 100%;
-    border-radius: 4px;
-    padding: 0 8px;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    .el-img-left{
-      display:flex;
-      align-items:center; 
-      i{
-        margin-right:8px;
-        color:#ccc;
-      }
-    }
-    i{
-      color: #10d070;
-    margin-left: 6px; 
-    }
-    }
-}
-</style>
\ No newline at end of file
diff --git a/src/views/basicdata/driverArtery/basicdataDriverArtery.vue b/src/views/basicdata/driverArtery/basicdataDriverArtery.vue
index 89e7221c..df684e08 100644
--- a/src/views/basicdata/driverArtery/basicdataDriverArtery.vue
+++ b/src/views/basicdata/driverArtery/basicdataDriverArtery.vue
@@ -194,14 +194,14 @@ export default {
           //   },
           // },
           {
-            label: "姓名",
-            prop: "name",
-            type: "input",
+            label: '姓名',
+            prop: 'name',
+            type: 'input',
             search: true,
-            labelWidth:'150',
-            width:"100px",
-            align:'center',
-            span:11,
+            labelWidth: '150',
+            width: '100px',
+            align: 'center',
+            span: 11,
           },
           {
             label: '手机号码',
@@ -212,13 +212,13 @@ export default {
             width: '130px',
             align: 'center',
             span: 11,
-              rules: [
-                {
-                  required: true,
-                  message: '请输入电话号码',
-                  trigger: 'blur',
-                },
-              ],
+            rules: [
+              {
+                required: true,
+                message: '请输入电话号码',
+                trigger: 'blur',
+              },
+            ],
           },
           {
             label: '司机类型',
@@ -440,7 +440,7 @@ export default {
             filterable: true,
             dicUrl: '/api/logpm-basicdata/carrier/dictionary',
             props: {
-              label: 'number',
+              label: 'carrierName',
               value: 'id',
             },
             rules: [{ required: true, message: '请选择承运商!', trigger: 'blur' }],
@@ -615,7 +615,7 @@ export default {
   },
   methods: {
     rowSave(row, done, loading) {
-      console.log(row,'row信息');
+      console.log(row, 'row信息');
       add(row).then(
         () => {
           this.onLoad(this.page);
@@ -801,40 +801,39 @@ export default {
       });
     },
     //查询人员绑定情况
-    getpeople() {
-      getUserList(1, 100000, null, '').then(res => {
-        const data = res.data.data;
-        data.records.map(v => {
-          let value = {
-            label: v.name,
-            value: v.id,
-          };
-          this.option.column[9].dicData.push(value);
-        });
-      });
-    },
+    // getpeople() {
+    //   getUserList(1, 100000, null, '').then(res => {
+    //     const data = res.data.data;
+    //     data.records.map(v => {
+    //       let value = {
+    //         label: v.name,
+    //         value: v.id,
+    //       };
+    //       this.option.column[9].dicData.push(value);
+    //     });
+    //   });
+    // },
   },
 };
 </script>
 
-<style scoped lang='scss'>
-:deep(.avue-form__row){
-  max-width:250px !important;
+<style scoped lang="scss">
+:deep(.avue-form__row) {
+  max-width: 250px !important;
 }
-:deep(.avue-form__group--flex){
+:deep(.avue-form__group--flex) {
   justify-content: space-between;
-
 }
-.avue-form__row{
-  margin-left:0 !important;
+.avue-form__row {
+  margin-left: 0 !important;
 }
-:deep(.el-form-item__label){
-  width:auto !important;
+:deep(.el-form-item__label) {
+  width: auto !important;
 }
-:deep(.no-print){
-  margin-left:auto;
-  .el-button{
-     margin-right:0
+:deep(.no-print) {
+  margin-left: auto;
+  .el-button {
+    margin-right: 0;
   }
 }
 </style>
diff --git a/src/views/basicdata/vehicle/basicdataVehicle.vue b/src/views/basicdata/vehicle/basicdataVehicle.vue
index d521c888..9cae32e1 100644
--- a/src/views/basicdata/vehicle/basicdataVehicle.vue
+++ b/src/views/basicdata/vehicle/basicdataVehicle.vue
@@ -206,6 +206,8 @@ export default {
           span: 11,
           prop: 'carrierName',
           type: 'input',
+          editDisplay: false,
+          addDisplay: false,
        },
           {
             label: '绑定驾驶人',
@@ -555,7 +557,7 @@ export default {
             filterable: true,
             dicUrl: '/api/logpm-basicdata/carrier/dictionary',
             props: {
-              label: 'number',
+              label: 'carrierName',
               value: 'id',
             },
             rules: [{ required: true, message: '请选择承运商!', trigger: 'blur' }],

From 8b20cecab5e5288faca170ab3529c6ca472da9e9 Mon Sep 17 00:00:00 2001
From: 13208366016 <47278630@qq.com>
Date: Sun, 15 Oct 2023 23:17:08 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=89=BF=E8=BF=90=E5=95=86=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/pda/basicPda.vue    | 869 ++++++++++++----------------
 src/views/basic/pda/basicPdaTT.vue  | 399 -------------
 src/views/basic/pda/basicPdaTTT.vue | 514 ++++++++++++++++
 3 files changed, 891 insertions(+), 891 deletions(-)
 delete mode 100644 src/views/basic/pda/basicPdaTT.vue
 create mode 100644 src/views/basic/pda/basicPdaTTT.vue

diff --git a/src/views/basic/pda/basicPda.vue b/src/views/basic/pda/basicPda.vue
index 2305f234..a739b778 100644
--- a/src/views/basic/pda/basicPda.vue
+++ b/src/views/basic/pda/basicPda.vue
@@ -1,514 +1,399 @@
 <template>
-<!-- 表格组件 -->
-   <div class='el-content-el' ref='TabHeight'>
-    <!-- 顶部开始 -->
-    <div class="el-Cart-button">
-      <!-- 表格顶部左侧按钮 -->
-      <div class="el-Cart-button-left">
-            <el-button  type="primary" @click="AddInfo"><el-icon><Plus /></el-icon>新 增</el-button>
-            <el-button @click="handleDelete"><el-icon><Delete /></el-icon>删 除</el-button>
-            <el-button @click="handleDelete"><el-icon><Edit /></el-icon>查看维修记录</el-button>
-      </div>
-      <!-- 表格顶部右侧按钮 -->
-      <div class="el-Cart-button-right">
-        <!-- 刷新按钮 -->
-        <button>
-          <el-icon color="#ccc"><Refresh /></el-icon>
-        </button>
-        <!-- 功能按钮 -->
-        <button>
-          <el-icon color="#ccc"><Operation /></el-icon>
-        </button>
-        <!-- 搜索按钮 -->
-        <button>
-          <el-icon color="#ccc"><Search /></el-icon>
-        </button>
-      </div>
-    </div>
-    <!-- 顶部结束 -->
-    <div class='el-Cart'>
-      <!-- 表格列开始 -->
-      <el-table :data="data" border  :height="TabHeight+'px'" style="width: 100%;">
-      <el-table-column type="selection" width="55" fixed="left"/>
-      <el-table-column type="index" fixed="left" width="50" height="100" label="#" align="center"/>
-      <el-table-column prop="name" label="产品名称" width="180" align="center " sortable/>
-      <el-table-column prop="model" label="型号" width="180" align="center " />
-      <el-table-column prop="purchaseAmount" label="购买金额" width="180"  align="center "/>
-      <el-table-column prop="state" label="状态" width="180"  align="center "/>
-      <el-table-column prop="currentUsageWarehouse" label="当前使用仓" width="180"  align="center "/>
-      <el-table-column prop="user" label="使用人" width="180" align="center " />
-      <el-table-column prop="deviceSerialNumber" label="设备序列号S/N" width="180" align="center "/>
-      <el-table-column prop="userPosition" label="使用人岗位" width="180" align="center "/>
-      <el-table-column prop="isDeposit" label="是否收取押金" width="180" align="center "/>
-      <el-table-column prop="deposit" label="押金金额(元)" width="180" align="center "/>
-      <el-table-column prop="purchasingCompany" label="采购公司" width="180" align="center "/>
-        <el-table-column label="商品图片" width="180" align="center"  >
-          <template #default="props">
-              <img :src="props.row.photo" class='el-Img'>
-        </template>
-      </el-table-column>
-      <el-table-column prop="buyingTime" label="购买时间" width="180" align="center "/>
-      <el-table-column prop="notes" label="备注" width="180" align="center "/>
-      <el-table-column prop="warrantyPeriodEndTime" label="保修截止时间" width="180" align="center "/>
-      <el-table-column fixed="right" label="操作" width="280" align="center ">
-        <template #default>
-          <el-button link type="primary" icon="el-icon-delete"  @click="handleDelete">删除</el-button>
-          <el-button link type="primary" icon="el-icon-view"    @click="handleEdit(row)">编辑</el-button>
-          <el-button link type="primary" icon="el-icon-view"    @click="handleview(row)">查看</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!-- 表格翻页功能 -->
-    <div class="demo-pagination-block">
-      <el-pagination
-      v-model:current-page="currentPage"
-      v-model:page-size="pageSize"
-      :page-sizes="pageList"
-      :small="small"
-      :disabled="disabled"
-      :background="background"
-      layout="total, sizes, prev, pager, next, jumper"
-      :total="2"
-      @size-change="handleSizeChange"
-      @current-change="handleCurrentChange"
-      />
-    </div>
+  <basic-container>
+    <avue-crud
+      v-if="edit"
+      :option="option"
+      v-model:search="search"
+      v-model:page="page"
+      v-model="form"
+      :table-loading="loading"
+      :data="data"
+      :permission="permissionList"
+      :before-open="beforeOpen"
+      ref="crud"
+      @row-update="rowUpdate"
+      @row-save="rowSave"
+      @row-del="rowDel"
+      @search-change="searchChange"
+      @search-reset="searchReset"
+      @selection-change="selectionChange"
+      @current-change="currentChange"
+      @size-change="sizeChange"
+      @refresh-change="refreshChange"
+      @on-load="onLoad"
+    >
+      <template #menu-left>
+        <el-button type="danger" icon="el-icon-delete" plain v-if="permission.basicdataPda_delete" @click="handleDelete"
+          >删 除
+        </el-button>
+        <el-button type="primary" @click="viewrepairs()">查看维修记录</el-button>
+      </template>
+      <template #menu="{ size, row, index }">
+        <el-button type="primary" text icon="el-icon-view" @click="handleEdit(row)">编辑</el-button>
+        <el-button type="primary" text icon="el-icon-view" @click="handleview(row)">查看</el-button>
+      </template>
+    </avue-crud>
 
-  </div>
-  <!-- 弹窗组件 -->
-  <div class='addlalog'>
-    <el-dialog v-model="AddLalog" title="新增产品" >
-    <el-form  label-position="top" label-width="100px" :model="AddForm">
-    <el-form-item label="产品名称">
-      <el-input v-model="AddForm.name"  placeholder="请输入产品名称"/>
-    </el-form-item>
-    <el-form-item label="购买金额">
-      <el-input v-model="AddForm.purchaseAmount" placeholder="请输入购买金额"/>
-    </el-form-item>
-    <el-form-item label="当前使用仓">
-      <el-input v-model="AddForm.currentUsageWarehouse" placeholder="请输入当前使用仓"/>
-    </el-form-item>
-    
-    <el-form-item label="设备序列号S/N">
-      <el-input v-model="AddForm.deviceSerialNumber" placeholder="请输入设备序列号" />
-    </el-form-item>
-    
-    <el-form-item label="是否收取押金">
-        <el-select v-model="AddForm.isDeposit" class="m-2" placeholder="选择是否收取押金">
-    <el-option
-      v-for="item in options"
-      :key="item.value"
-      :label="item.label"
-      :value="item.value"
-    />
-  </el-select>
-    </el-form-item>
-    
-    <el-form-item label="采购公司">
-      <el-input v-model="AddForm.purchasingCompany" placeholder="请输入采购公司"/>
-    </el-form-item>
-      <el-form-item label="保修截至时间">
-        <el-date-picker
-        v-model="AddForm.warrantyPeriodEndTime"
-        type="date"
-        placeholder="选择保修截至日期"
-        size="default"
-        format="YYYY/MM/DD"
-      />
-    </el-form-item>
-    <el-form-item label="图片">
-    <!-- photo -->
-        <el-upload
-    ref="uploadRef"
-    class="upload-demo"
-    :action=doubledCount
-    :on-success="ImgSuccess"
-    :before-upload="beforeAvatarUpload"
-    :headers="headers"
-    v-if='!img'
-  > 
-    <template #trigger >
-      <div class='img-icon'>
-      <el-button type="primary">点击上传图片</el-button>
-       <el-icon><UploadFilled /></el-icon>
-      </div>
-    </template>
-    </el-upload>
-    <div v-else class='el-img'>
-      <div class='el-img-left'>
-        <el-icon><Link /></el-icon>
-        <span>{{ImgText}}</span>
-      </div>
-    
-    <el-icon><SuccessFilled /></el-icon>
-    </div>
-    </el-form-item>
-
-    <el-form-item label="型号">
-      <el-input v-model="AddForm.model" placeholder="请输入型号"/>
-    </el-form-item>
-
-          <el-form-item label="状态">
-        <el-select v-model="AddForm.state" class="m-2" placeholder="选择状态">
-    <el-option
-      v-for="item in options2"
-      :key="item.value"
-      :label="item.label"
-      :value="item.value"
-    />
-  </el-select>
-    </el-form-item>
-
-    <el-form-item label="使用人">
-      <el-input v-model="AddForm.user"  placeholder="请输入使用人"/>
-    </el-form-item>
-
-          <el-form-item label="使用人岗位">
-      <el-input v-model="AddForm.userPosition" placeholder="请输入使用人岗位"/>
-    </el-form-item>
-
-    <el-form-item label="押金金额(RMB)">
-      <el-input v-model="AddForm.deposit" placeholder="请输入押金金额(元)" />
-    </el-form-item>
-
-    <el-form-item label="购买时间">
-      <el-date-picker
-        v-model="AddForm.buyingTime"
-        type="date"
-        placeholder="选择购买日期"
-        size="default"
-        format="YYYY/MM/DD"
-      />
-    </el-form-item>
-
-    <el-form-item label="备注">
-      <el-input v-model="AddForm.notes"  placeholder="请输入备注"/>
-    </el-form-item>
-  </el-form>
-<!-- 弹窗底部提交按钮 -->
-  <div class='el-dialog-button'>
-   <el-button type="danger" @click="submit">
-    <el-icon><Select/></el-icon>
-         确认提交
-    </el-button>
-  </div>
-  </el-dialog>
-  </div>
-  <!-- 弹窗结束 -->
-</div> 
+    <!-- <basic-pdaform v-if="!edit" @returnpda="returnpda" :pdaformdata="pdaformdata" /> -->
+  </basic-container>
 </template>
 
-<script setup lang='ts'>
-import { ref, reactive,onMounted,computed } from 'vue';
-import { getList, getDetail, add, update, remove,$_TableList } from '@/api/basic/basicPda'; //API
-import { ElMessage, type UploadProps } from 'element-plus'
+ <script>
+import { getList, getDetail, add, update, remove } from '@/api/basic/basicPda';
+import option from '@/option/basic/basicPda';
+import { mapGetters } from 'vuex';
+import { exportBlob } from '@/api/common';
 import { getToken } from '@/utils/auth';
-const currentPage = ref(1); // 默认页码
-const pageSize = ref(30); // 默认每一页几条
-const pageList = ref([5, 10, 50, 100, 200]); // 选择每页显示多少条
-const small = ref(false);
-const background = ref(true); // 是否开启背景颜色
-const disabled = ref(false); // 是否禁止使用页码功能
-const data = ref([]); // 表单数据
-const TabHeight = ref();//动态获取表格高度
-const AddLalog = ref(false)//提交弹窗
-const img=ref(false);//图片是否上传成功
-const ImgText=ref('')
-const AddForm = ref({ //表单信息
-})
-const value1 = ref('') //日期
-const optionsvalue = ref('')//下拉框值
-const optionsvalue2=ref('')//状态值
-const uploadRef = ref()//图片上传
-const options = [//下拉选择框
-  {
-    value: '0',
-    label: '是',
-  },
-  {
-    value: '1',
-    label: '否',
-  },
+import { downloadXls } from '@/utils/util';
+import { dateNow } from '@/utils/date';
+import NProgress from 'nprogress';
+import 'nprogress/nprogress.css';
+import BasicPdaform from '/src/views/basic/pda/basicPdaform.vue';
 
-]
-const options2 = [//下拉选择框
-  {
-    value: '1',
-    label: '正常',
-  },
-  {
-    value: '2',
-    label: '维修',
+export default {
+  components: { BasicPdaform },
+  data() {
+    return {
+      form: {},
+      query: {},
+      search: {},
+      loading: true,
+      edit: true,
+      pdaformdata: {
+        view: false,
+      },
+      page: {
+        pageSize: 30,
+        currentPage: 1,
+        total: 0,
+      },
+      selectionList: [],
+      option: option,
+      data: [],
+    };
   },
-  {
-    value: '3',
-    label: '不能使用(不能开机)',
-  },
-]
-// 图片上传接口
-const doubledCount = computed(() => {
-  return '/api/blade-resource/oss/endpoint/put-file'
-})
- // 图片上传写代码TOKEN
-const headers =computed(()=>{
-  return {'Blade-Auth': 'Bearer ' + getToken(),
+  computed: {
+    ...mapGetters(['permission']),
+    permissionList() {
+      return {
+        addBtn: this.validData(this.permission.basicdataPda_add, false),
+        viewBtn: this.validData(this.permission.basicdataPda_view, false),
+        delBtn: this.validData(this.permission.basicdataPda_delete, false),
+        editBtn: this.validData(this.permission.basicdataPda_edit, false),
+        viewRecordsBtn: this.validData(this.permission.basicdataPda_viewRecords, false),
       };
-    })
-// 获取表格数据
-function onLoad(){
-    // 获取表格数据API（$_TableList）
-    $_TableList({ current:currentPage.value, size: pageSize.value }).then(res=>{
-    console.log(res.data.data.records);
-    //表格信息
-    data.value=res.data.data.records 
-})
-}
-// 动态获取DOM高度给表单防止页面出现滚动条
-onMounted(() => {
-//默认值88
-   TabHeight.value = TabHeight.value.offsetHeight-91;
-// 等待DOM高度被复制之后在请求数据，防止被数据撑开高度
-   onLoad()
-})
-// 新增数据功能
-const AddInfo=()=>{
-  console.log(111);
-  AddLalog.value=true;
-}
-// 图片上传
-const imageUrl = ref('')
-// 图片上传成功回调函数
-const ImgSuccess: UploadProps['onSuccess'] = (response,uploadFile) => {
-  console.log(response,uploadFile,'123123123123123122312123');
-  console.log('================================================================');
-  if(response.success===true){
-    img.value=true;
-    console.log(img.value);
-     ImgText.value = response.data.originalName
-    
-  }
-}
-// 上传图片规则
-const beforeAvatarUpload: UploadProps['beforeUpload'] = (rawFile) => {
-  if (rawFile.type !== 'image/png') {
-        ElMessage.error('图片格式只能为image/png!')
-        return false
-    } else if (rawFile.size / 1024 / 1024 > 2) {
-    ElMessage.error('图片大小不能大于2MB!')
-    return false
-  }
-  return true
-}
-</script>
-
-<style scoped lang='scss'>
-// 最外层 IDV
-.el-content-el {
-  padding: 0 8px;
-  padding-top:8px;
-  background-color: #fff;
-  height: 100%;
-  box-sizing: border-box;
-// 表格顶部按钮
-    :deep(.el-Cart-button) {
-      margin-bottom: 8px;
-      display: flex;
-      justify-content: space-between;
-    }
-    // 表格顶部左侧、右侧按钮样式
-    .el-Cart-button-left,.el-Cart-button-right{
-      display: flex;
-      margin: 0 0px;
-      justify-content: space-between;
-    }
-    .el-Cart-button-left{
-    :deep( button){
-    padding: 0 14px;
-    min-width: 70px;
-    display: flex;
-    span{
-    width: 100%;
-    display: inline-flex;
-    align-items: center;
-    justify-content: space-between;
-    i{
-      margin-right: 6px;
-    }
-    }
-    }
-    
-    }
-    .el-Cart-button-right {
-    display: flex;
-    margin: 0 0px;
-    justify-content: space-between;
-    align-items: center;
-    button {
-        background-color: transparent;
-        border-radius: 50%;
-        width: 30px;
-        height: 30px;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        border: 1px solid #ccc;
-        margin-right: 8px;
-        
-        &:hover {
-          background-color: #172e601f;
-          i {
-            color: #0e2549;
-          }
+    },
+    ids() {
+      let ids = [];
+      this.selectionList.forEach(ele => {
+        ids.push(ele.id);
+      });
+      return ids.join(',');
+    },
+  },
+  methods: {
+    //查看全部维修记录
+    viewrepairs() {
+      this.$router.push({
+        path: '/basic/pdarecords/basicPdarecordslist',
+        query: {},
+      });
+    },
+    //查看维修记录
+    handleViewrecords(row) {
+      console.log('>>>>>>>>>>>>>>>', row);
+      this.$router.push({
+        path: '/basic/pdarecords/basicPdarecords',
+        query: {
+          data: row.id,
+        },
+      });
+    },
+    //编辑
+    handleEdit(row) {
+      console.log('>>>>>>>>>>>>>>>', row);
+      //
+      //  this.pdaformdata = row;
+      //   this.pdaformdata.view =false;
+      //  this.edit =false;
+      this.$router.push({
+        path: '/basic/pda/basicPdaform',
+        query: {
+          data: row.id,
+          edt: false,
+          name: row.name + '-pad信息编辑',
+        },
+      });
+    },
+    //查看
+    handleview(row) {
+      // this.pdaformdata = row;
+      // this.pdaformdata.view = true ;
+      // console.log("this.pdaformdata.view>>>>>>>>>>>>>>>",this.pdaformdata.view);
+      // this.edit =false;
+      this.$router.push({
+        path: '/basic/pda/basicPdaform',
+        query: {
+          data: row.id,
+          edt: true,
+          name: row.name + '-pad信息查看',
+        },
+      });
+    },
+    //数据返回
+    returnpda(str) {
+      console.log('返回>>>>', str);
+      this.edit = true;
+    },
+    // 新增数据确定后执行
+    rowSave(row, done, loading) {
+      add(row).then(
+        () => {
+          this.onLoad(this.page);
+          this.$message({
+            type: 'success',
+            message: '操作成功!',
+          });
+          done();
+        },
+        error => {
+          loading();
+          window.console.log(error);
         }
-        // 去掉最后一个按钮右侧边距
-        &:last-child {
-          margin-right: 0;
+      );
+    },
+    // 数据编辑后触发
+    rowUpdate(row, index, done, loading) {
+      update(row).then(
+        () => {
+          this.onLoad(this.page);
+          this.$message({
+            type: 'success',
+            message: '操作成功!',
+          });
+          done();
+        },
+        error => {
+          loading();
+          console.log(error);
         }
+      );
+    },
+    // 行删除
+    rowDel(row) {
+      this.$confirm('确定将选择数据删除?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          return remove(row.id);
+        })
+        .then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: 'success',
+            message: '操作成功!',
+          });
+        });
+    },
+    handleDelete() {
+      if (this.selectionList.length === 0) {
+        this.$message.warning('请选择至少一条数据');
+        return;
       }
-    }
-  .el-Cart {
-    // 表格标题颜色
-    :deep(.el-table__header) {
-      th {
-        background-color: #fafafa;
-        color: #000;
+      this.$confirm('确定将选择数据删除?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          return remove(this.ids);
+        })
+        .then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: 'success',
+            message: '操作成功!',
+          });
+          this.$refs.crud.toggleSelection();
+        });
+    },
+    handleExport() {
+      let downloadUrl = `/basic/basicdataPda/export-basicdataPda?${
+        this.website.tokenHeader
+      }=${getToken()}`;
+      const {
+        name,
+        model,
+        deviceSerialNumber,
+        state,
+        currentUsageWarehouse,
+        user,
+        userPositionId,
+        isDeposit,
+      } = this.query;
+      let values = {
+        name_like: name,
+        model_like: model,
+        deviceSerialNumber_equal: deviceSerialNumber,
+        state_equal: state,
+        currentUsageWarehouse_equal: currentUsageWarehouse,
+        user_like: user,
+        userPositionId_equal: userPositionId,
+        isDeposit_equal: isDeposit,
+      };
+      this.$confirm('是否导出数据?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        NProgress.start();
+        exportBlob(downloadUrl, values).then(res => {
+          downloadXls(res.data, `pda信息${dateNow()}.xlsx`);
+          NProgress.done();
+        });
+      });
+    },
+    beforeOpen(done, type) {
+      if (['edit', 'view'].includes(type)) {
+        getDetail(this.form.id).then(res => {
+          this.form = res.data.data;
+        });
       }
-    }
-    // 组件样式开始
-    // 分页样式
-    .demo-pagination-block {
-      display: flex;
-      justify-content: flex-end;
-      margin-top: 6px;
-    }
+      done();
+    },
+    // 清空搜索回调方法
+    searchReset() {
+      this.query = {};
+      this.onLoad(this.page);
+    },
+    // 点击搜索后触发该事件
+    searchChange(params, done) {
+      this.query = params;
+      this.page.currentPage = 1;
+      this.onLoad(this.page, params);
+      done();
+    },
+    // 当选择项发生变化时会触发该事件
+    selectionChange(list) {
+      this.selectionList = list;
+    },
+    selectionClear() {
+      this.selectionList = [];
+      this.$refs.crud.toggleSelection();
+    },
+    // 当选择项发生变化时会触发该事件
+    currentChange(currentPage) {
+      this.page.currentPage = currentPage;
+    },
+    // 点击每页多少条
+    sizeChange(pageSize) {
+      this.page.pageSize = pageSize;
+    },
+    // 点击刷新
+    refreshChange() {
+      this.onLoad(this.page, this.query);
+      console.log('点击刷新');
+    },
+    // 初始化页面
+    onLoad(page, params = {}) {
+      this.loading = true;
 
-    // 表格行高度
-    :deep(.el-table__row) {
-      height: 60px;
-    }
-    // 表格图片
-    .el-Img {
-      width: 100%;
-      height: 40px;
+      const {
+        name,
+        model,
+        deviceSerialNumber,
+        state,
+        currentUsageWarehouse,
+        user,
+        userPositionId,
+        isDeposit,
+      } = this.query;
 
-      img {
-        width: 100%;
-        height: 100%;
-      }
-    }
-  }
-  // 新增数据弹窗组件样式
-  :deep(.addlalog){
-          // 弹窗
-  .el-dialog__header{
-        border-bottom: 1px solid #172e607d ;
-        margin-right:0;
-        margin-bottom:0;
-        padding-bottom:20px;
-        position: relative;
-        i{
-          color:#172e60;
-        }
-  }
-  // 弹窗标题左侧小竖线
-  .el-dialog__header::after{
-    content: "";
-    display: block;
-    width: 3px;
-    height: 16px;
-    background-color: #172e60;
-    position: absolute;
-    left: 8px;
-    top: 24px;
+      let values = {
+        name_like: name,
+        model_like: model,
+        deviceSerialNumber_equal: deviceSerialNumber,
+        state_equal: state,
+        currentUsageWarehouse_equal: currentUsageWarehouse,
+        user_like: user,
+        userPositionId_equal: userPositionId,
+        isDeposit_equal: isDeposit,
+      };
+
+      getList(page.currentPage, page.pageSize, values).then(res => {
+        console.log(res.data.data.records, 'res');
+        const data = res.data.data;
+        this.page.total = data.total;
+        console.log(data.total, 'sss');
+        this.data = data.records;
+        console.log(this.data, 'this.data');
+        this.loading = false;
+        this.selectionClear();
+      });
+    },
+  },
+};
+</script> 
+
+
+
+<style scoped lang="scss">
+:deep(.el-form-item__content) {
+  div:first-child {
+    width: auto;
   }
-  .el-dialog__body{
-    .el-form{
-      width: 100%;
-      display:flex;
-      flex-wrap: wrap;
-      justify-content: space-between;
-    }
-    .el-form-item{
-      width:276px;
-      
-    }
- /* 去掉第三个、第六个、第九个div的右外边距 */
-.el-form-item:nth-child(3n) {
-  margin-right: 0; 
 }
+:deep(.el-form-item__label) {
+  width: 90px !important;
+  justify-content: flex-start;
+}
+:deep(.avue-form__menu) {
+  width: 120px !important;
+}
+div:last-child {
+  margin-left: auto;
+}
+.avue-form__group {
+  .avue-form__menu--center {
+    margin-left: auto !important;
   }
-
-.el-form-item__content{
-  height:30px;
-  // 日期选择框
-     .el-input{
-      width: 100%;
-      height:30px !important;  
-     }
-//  下拉选择框
-    .el-select{
-      width: 100%;
-    }
-  }
-
+  .el-col:last-child {
+    margin-left: auto !important;
   }
-
-  // 底部提交
-  .el-dialog-button{
-    display:flex;
+}
+.no-print {
+  margin-left: auto !important;
+}
+:deep(.avue-form__menu--center) {
+  margin-left: auto !important;
+  display: flex;
   justify-content: flex-end;
+  button {
+    margin-right: 0 !important;
   }
-  // 图片上传
-  .img-icon{
-    width: 100%;
-    position: relative;
-    .el-button{
-     width: 100%;
-    background-color: #fff;
-    color: #a8abb9;
-    justify-content: flex-start;
-    border: 1px solid #dcdfe6;
-    }
-    i{
-      position:absolute;
-      left: 110px;
-      top: 8px;
-      font-size:18px
-    }
-  }
-  :deep(.upload-demo){
-    
-    width:100%;
-    .el-upload{
-      width:100%
-    }
-    ul{
-      margin-top:0;
-    }
-
+}
+.avue-form__menu--center {
+  margin-left: auto !important;
+}
+:deep(.el-form-item__label) {
+  width: auto !important;
+}
+:deep(.avue-form__row) {
+  max-width: 270px !important;
+  margin-right: 2px;
+}
+:deep(.avue-form__row) {
+  .el-form-item {
+    margin-right: 0;
   }
-  // 图片上传成功
-  .el-img{
-    border: 1px solid #ccc;
-    width: 100%;
-    border-radius: 4px;
-    padding: 0 8px;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    height: 30px;
-    .el-img-left{
-      display:flex;
-      align-items:center; 
-      i{
-        margin-right:8px;
-        color:#ccc;
-      }
-    }
-    i{
-      color: #10d070;
-    margin-left: 6px; 
-    }
-    }
 }
-</style>
\ No newline at end of file
+:deep(.avue-form__group--flex) {
+  justify-content: space-between;
+}
+:deep(.el-form-item__label) {
+  padding-right: 8px;
+}
+
+</style>
diff --git a/src/views/basic/pda/basicPdaTT.vue b/src/views/basic/pda/basicPdaTT.vue
deleted file mode 100644
index a739b778..00000000
--- a/src/views/basic/pda/basicPdaTT.vue
+++ /dev/null
@@ -1,399 +0,0 @@
-<template>
-  <basic-container>
-    <avue-crud
-      v-if="edit"
-      :option="option"
-      v-model:search="search"
-      v-model:page="page"
-      v-model="form"
-      :table-loading="loading"
-      :data="data"
-      :permission="permissionList"
-      :before-open="beforeOpen"
-      ref="crud"
-      @row-update="rowUpdate"
-      @row-save="rowSave"
-      @row-del="rowDel"
-      @search-change="searchChange"
-      @search-reset="searchReset"
-      @selection-change="selectionChange"
-      @current-change="currentChange"
-      @size-change="sizeChange"
-      @refresh-change="refreshChange"
-      @on-load="onLoad"
-    >
-      <template #menu-left>
-        <el-button type="danger" icon="el-icon-delete" plain v-if="permission.basicdataPda_delete" @click="handleDelete"
-          >删 除
-        </el-button>
-        <el-button type="primary" @click="viewrepairs()">查看维修记录</el-button>
-      </template>
-      <template #menu="{ size, row, index }">
-        <el-button type="primary" text icon="el-icon-view" @click="handleEdit(row)">编辑</el-button>
-        <el-button type="primary" text icon="el-icon-view" @click="handleview(row)">查看</el-button>
-      </template>
-    </avue-crud>
-
-    <!-- <basic-pdaform v-if="!edit" @returnpda="returnpda" :pdaformdata="pdaformdata" /> -->
-  </basic-container>
-</template>
-
- <script>
-import { getList, getDetail, add, update, remove } from '@/api/basic/basicPda';
-import option from '@/option/basic/basicPda';
-import { mapGetters } from 'vuex';
-import { exportBlob } from '@/api/common';
-import { getToken } from '@/utils/auth';
-import { downloadXls } from '@/utils/util';
-import { dateNow } from '@/utils/date';
-import NProgress from 'nprogress';
-import 'nprogress/nprogress.css';
-import BasicPdaform from '/src/views/basic/pda/basicPdaform.vue';
-
-export default {
-  components: { BasicPdaform },
-  data() {
-    return {
-      form: {},
-      query: {},
-      search: {},
-      loading: true,
-      edit: true,
-      pdaformdata: {
-        view: false,
-      },
-      page: {
-        pageSize: 30,
-        currentPage: 1,
-        total: 0,
-      },
-      selectionList: [],
-      option: option,
-      data: [],
-    };
-  },
-  computed: {
-    ...mapGetters(['permission']),
-    permissionList() {
-      return {
-        addBtn: this.validData(this.permission.basicdataPda_add, false),
-        viewBtn: this.validData(this.permission.basicdataPda_view, false),
-        delBtn: this.validData(this.permission.basicdataPda_delete, false),
-        editBtn: this.validData(this.permission.basicdataPda_edit, false),
-        viewRecordsBtn: this.validData(this.permission.basicdataPda_viewRecords, false),
-      };
-    },
-    ids() {
-      let ids = [];
-      this.selectionList.forEach(ele => {
-        ids.push(ele.id);
-      });
-      return ids.join(',');
-    },
-  },
-  methods: {
-    //查看全部维修记录
-    viewrepairs() {
-      this.$router.push({
-        path: '/basic/pdarecords/basicPdarecordslist',
-        query: {},
-      });
-    },
-    //查看维修记录
-    handleViewrecords(row) {
-      console.log('>>>>>>>>>>>>>>>', row);
-      this.$router.push({
-        path: '/basic/pdarecords/basicPdarecords',
-        query: {
-          data: row.id,
-        },
-      });
-    },
-    //编辑
-    handleEdit(row) {
-      console.log('>>>>>>>>>>>>>>>', row);
-      //
-      //  this.pdaformdata = row;
-      //   this.pdaformdata.view =false;
-      //  this.edit =false;
-      this.$router.push({
-        path: '/basic/pda/basicPdaform',
-        query: {
-          data: row.id,
-          edt: false,
-          name: row.name + '-pad信息编辑',
-        },
-      });
-    },
-    //查看
-    handleview(row) {
-      // this.pdaformdata = row;
-      // this.pdaformdata.view = true ;
-      // console.log("this.pdaformdata.view>>>>>>>>>>>>>>>",this.pdaformdata.view);
-      // this.edit =false;
-      this.$router.push({
-        path: '/basic/pda/basicPdaform',
-        query: {
-          data: row.id,
-          edt: true,
-          name: row.name + '-pad信息查看',
-        },
-      });
-    },
-    //数据返回
-    returnpda(str) {
-      console.log('返回>>>>', str);
-      this.edit = true;
-    },
-    // 新增数据确定后执行
-    rowSave(row, done, loading) {
-      add(row).then(
-        () => {
-          this.onLoad(this.page);
-          this.$message({
-            type: 'success',
-            message: '操作成功!',
-          });
-          done();
-        },
-        error => {
-          loading();
-          window.console.log(error);
-        }
-      );
-    },
-    // 数据编辑后触发
-    rowUpdate(row, index, done, loading) {
-      update(row).then(
-        () => {
-          this.onLoad(this.page);
-          this.$message({
-            type: 'success',
-            message: '操作成功!',
-          });
-          done();
-        },
-        error => {
-          loading();
-          console.log(error);
-        }
-      );
-    },
-    // 行删除
-    rowDel(row) {
-      this.$confirm('确定将选择数据删除?', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-      })
-        .then(() => {
-          return remove(row.id);
-        })
-        .then(() => {
-          this.onLoad(this.page);
-          this.$message({
-            type: 'success',
-            message: '操作成功!',
-          });
-        });
-    },
-    handleDelete() {
-      if (this.selectionList.length === 0) {
-        this.$message.warning('请选择至少一条数据');
-        return;
-      }
-      this.$confirm('确定将选择数据删除?', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-      })
-        .then(() => {
-          return remove(this.ids);
-        })
-        .then(() => {
-          this.onLoad(this.page);
-          this.$message({
-            type: 'success',
-            message: '操作成功!',
-          });
-          this.$refs.crud.toggleSelection();
-        });
-    },
-    handleExport() {
-      let downloadUrl = `/basic/basicdataPda/export-basicdataPda?${
-        this.website.tokenHeader
-      }=${getToken()}`;
-      const {
-        name,
-        model,
-        deviceSerialNumber,
-        state,
-        currentUsageWarehouse,
-        user,
-        userPositionId,
-        isDeposit,
-      } = this.query;
-      let values = {
-        name_like: name,
-        model_like: model,
-        deviceSerialNumber_equal: deviceSerialNumber,
-        state_equal: state,
-        currentUsageWarehouse_equal: currentUsageWarehouse,
-        user_like: user,
-        userPositionId_equal: userPositionId,
-        isDeposit_equal: isDeposit,
-      };
-      this.$confirm('是否导出数据?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-      }).then(() => {
-        NProgress.start();
-        exportBlob(downloadUrl, values).then(res => {
-          downloadXls(res.data, `pda信息${dateNow()}.xlsx`);
-          NProgress.done();
-        });
-      });
-    },
-    beforeOpen(done, type) {
-      if (['edit', 'view'].includes(type)) {
-        getDetail(this.form.id).then(res => {
-          this.form = res.data.data;
-        });
-      }
-      done();
-    },
-    // 清空搜索回调方法
-    searchReset() {
-      this.query = {};
-      this.onLoad(this.page);
-    },
-    // 点击搜索后触发该事件
-    searchChange(params, done) {
-      this.query = params;
-      this.page.currentPage = 1;
-      this.onLoad(this.page, params);
-      done();
-    },
-    // 当选择项发生变化时会触发该事件
-    selectionChange(list) {
-      this.selectionList = list;
-    },
-    selectionClear() {
-      this.selectionList = [];
-      this.$refs.crud.toggleSelection();
-    },
-    // 当选择项发生变化时会触发该事件
-    currentChange(currentPage) {
-      this.page.currentPage = currentPage;
-    },
-    // 点击每页多少条
-    sizeChange(pageSize) {
-      this.page.pageSize = pageSize;
-    },
-    // 点击刷新
-    refreshChange() {
-      this.onLoad(this.page, this.query);
-      console.log('点击刷新');
-    },
-    // 初始化页面
-    onLoad(page, params = {}) {
-      this.loading = true;
-
-      const {
-        name,
-        model,
-        deviceSerialNumber,
-        state,
-        currentUsageWarehouse,
-        user,
-        userPositionId,
-        isDeposit,
-      } = this.query;
-
-      let values = {
-        name_like: name,
-        model_like: model,
-        deviceSerialNumber_equal: deviceSerialNumber,
-        state_equal: state,
-        currentUsageWarehouse_equal: currentUsageWarehouse,
-        user_like: user,
-        userPositionId_equal: userPositionId,
-        isDeposit_equal: isDeposit,
-      };
-
-      getList(page.currentPage, page.pageSize, values).then(res => {
-        console.log(res.data.data.records, 'res');
-        const data = res.data.data;
-        this.page.total = data.total;
-        console.log(data.total, 'sss');
-        this.data = data.records;
-        console.log(this.data, 'this.data');
-        this.loading = false;
-        this.selectionClear();
-      });
-    },
-  },
-};
-</script> 
-
-
-
-<style scoped lang="scss">
-:deep(.el-form-item__content) {
-  div:first-child {
-    width: auto;
-  }
-}
-:deep(.el-form-item__label) {
-  width: 90px !important;
-  justify-content: flex-start;
-}
-:deep(.avue-form__menu) {
-  width: 120px !important;
-}
-div:last-child {
-  margin-left: auto;
-}
-.avue-form__group {
-  .avue-form__menu--center {
-    margin-left: auto !important;
-  }
-  .el-col:last-child {
-    margin-left: auto !important;
-  }
-}
-.no-print {
-  margin-left: auto !important;
-}
-:deep(.avue-form__menu--center) {
-  margin-left: auto !important;
-  display: flex;
-  justify-content: flex-end;
-  button {
-    margin-right: 0 !important;
-  }
-}
-.avue-form__menu--center {
-  margin-left: auto !important;
-}
-:deep(.el-form-item__label) {
-  width: auto !important;
-}
-:deep(.avue-form__row) {
-  max-width: 270px !important;
-  margin-right: 2px;
-}
-:deep(.avue-form__row) {
-  .el-form-item {
-    margin-right: 0;
-  }
-}
-:deep(.avue-form__group--flex) {
-  justify-content: space-between;
-}
-:deep(.el-form-item__label) {
-  padding-right: 8px;
-}
-
-</style>
diff --git a/src/views/basic/pda/basicPdaTTT.vue b/src/views/basic/pda/basicPdaTTT.vue
new file mode 100644
index 00000000..2305f234
--- /dev/null
+++ b/src/views/basic/pda/basicPdaTTT.vue
@@ -0,0 +1,514 @@
+<template>
+<!-- 表格组件 -->
+   <div class='el-content-el' ref='TabHeight'>
+    <!-- 顶部开始 -->
+    <div class="el-Cart-button">
+      <!-- 表格顶部左侧按钮 -->
+      <div class="el-Cart-button-left">
+            <el-button  type="primary" @click="AddInfo"><el-icon><Plus /></el-icon>新 增</el-button>
+            <el-button @click="handleDelete"><el-icon><Delete /></el-icon>删 除</el-button>
+            <el-button @click="handleDelete"><el-icon><Edit /></el-icon>查看维修记录</el-button>
+      </div>
+      <!-- 表格顶部右侧按钮 -->
+      <div class="el-Cart-button-right">
+        <!-- 刷新按钮 -->
+        <button>
+          <el-icon color="#ccc"><Refresh /></el-icon>
+        </button>
+        <!-- 功能按钮 -->
+        <button>
+          <el-icon color="#ccc"><Operation /></el-icon>
+        </button>
+        <!-- 搜索按钮 -->
+        <button>
+          <el-icon color="#ccc"><Search /></el-icon>
+        </button>
+      </div>
+    </div>
+    <!-- 顶部结束 -->
+    <div class='el-Cart'>
+      <!-- 表格列开始 -->
+      <el-table :data="data" border  :height="TabHeight+'px'" style="width: 100%;">
+      <el-table-column type="selection" width="55" fixed="left"/>
+      <el-table-column type="index" fixed="left" width="50" height="100" label="#" align="center"/>
+      <el-table-column prop="name" label="产品名称" width="180" align="center " sortable/>
+      <el-table-column prop="model" label="型号" width="180" align="center " />
+      <el-table-column prop="purchaseAmount" label="购买金额" width="180"  align="center "/>
+      <el-table-column prop="state" label="状态" width="180"  align="center "/>
+      <el-table-column prop="currentUsageWarehouse" label="当前使用仓" width="180"  align="center "/>
+      <el-table-column prop="user" label="使用人" width="180" align="center " />
+      <el-table-column prop="deviceSerialNumber" label="设备序列号S/N" width="180" align="center "/>
+      <el-table-column prop="userPosition" label="使用人岗位" width="180" align="center "/>
+      <el-table-column prop="isDeposit" label="是否收取押金" width="180" align="center "/>
+      <el-table-column prop="deposit" label="押金金额(元)" width="180" align="center "/>
+      <el-table-column prop="purchasingCompany" label="采购公司" width="180" align="center "/>
+        <el-table-column label="商品图片" width="180" align="center"  >
+          <template #default="props">
+              <img :src="props.row.photo" class='el-Img'>
+        </template>
+      </el-table-column>
+      <el-table-column prop="buyingTime" label="购买时间" width="180" align="center "/>
+      <el-table-column prop="notes" label="备注" width="180" align="center "/>
+      <el-table-column prop="warrantyPeriodEndTime" label="保修截止时间" width="180" align="center "/>
+      <el-table-column fixed="right" label="操作" width="280" align="center ">
+        <template #default>
+          <el-button link type="primary" icon="el-icon-delete"  @click="handleDelete">删除</el-button>
+          <el-button link type="primary" icon="el-icon-view"    @click="handleEdit(row)">编辑</el-button>
+          <el-button link type="primary" icon="el-icon-view"    @click="handleview(row)">查看</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 表格翻页功能 -->
+    <div class="demo-pagination-block">
+      <el-pagination
+      v-model:current-page="currentPage"
+      v-model:page-size="pageSize"
+      :page-sizes="pageList"
+      :small="small"
+      :disabled="disabled"
+      :background="background"
+      layout="total, sizes, prev, pager, next, jumper"
+      :total="2"
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+      />
+    </div>
+
+  </div>
+  <!-- 弹窗组件 -->
+  <div class='addlalog'>
+    <el-dialog v-model="AddLalog" title="新增产品" >
+    <el-form  label-position="top" label-width="100px" :model="AddForm">
+    <el-form-item label="产品名称">
+      <el-input v-model="AddForm.name"  placeholder="请输入产品名称"/>
+    </el-form-item>
+    <el-form-item label="购买金额">
+      <el-input v-model="AddForm.purchaseAmount" placeholder="请输入购买金额"/>
+    </el-form-item>
+    <el-form-item label="当前使用仓">
+      <el-input v-model="AddForm.currentUsageWarehouse" placeholder="请输入当前使用仓"/>
+    </el-form-item>
+    
+    <el-form-item label="设备序列号S/N">
+      <el-input v-model="AddForm.deviceSerialNumber" placeholder="请输入设备序列号" />
+    </el-form-item>
+    
+    <el-form-item label="是否收取押金">
+        <el-select v-model="AddForm.isDeposit" class="m-2" placeholder="选择是否收取押金">
+    <el-option
+      v-for="item in options"
+      :key="item.value"
+      :label="item.label"
+      :value="item.value"
+    />
+  </el-select>
+    </el-form-item>
+    
+    <el-form-item label="采购公司">
+      <el-input v-model="AddForm.purchasingCompany" placeholder="请输入采购公司"/>
+    </el-form-item>
+      <el-form-item label="保修截至时间">
+        <el-date-picker
+        v-model="AddForm.warrantyPeriodEndTime"
+        type="date"
+        placeholder="选择保修截至日期"
+        size="default"
+        format="YYYY/MM/DD"
+      />
+    </el-form-item>
+    <el-form-item label="图片">
+    <!-- photo -->
+        <el-upload
+    ref="uploadRef"
+    class="upload-demo"
+    :action=doubledCount
+    :on-success="ImgSuccess"
+    :before-upload="beforeAvatarUpload"
+    :headers="headers"
+    v-if='!img'
+  > 
+    <template #trigger >
+      <div class='img-icon'>
+      <el-button type="primary">点击上传图片</el-button>
+       <el-icon><UploadFilled /></el-icon>
+      </div>
+    </template>
+    </el-upload>
+    <div v-else class='el-img'>
+      <div class='el-img-left'>
+        <el-icon><Link /></el-icon>
+        <span>{{ImgText}}</span>
+      </div>
+    
+    <el-icon><SuccessFilled /></el-icon>
+    </div>
+    </el-form-item>
+
+    <el-form-item label="型号">
+      <el-input v-model="AddForm.model" placeholder="请输入型号"/>
+    </el-form-item>
+
+          <el-form-item label="状态">
+        <el-select v-model="AddForm.state" class="m-2" placeholder="选择状态">
+    <el-option
+      v-for="item in options2"
+      :key="item.value"
+      :label="item.label"
+      :value="item.value"
+    />
+  </el-select>
+    </el-form-item>
+
+    <el-form-item label="使用人">
+      <el-input v-model="AddForm.user"  placeholder="请输入使用人"/>
+    </el-form-item>
+
+          <el-form-item label="使用人岗位">
+      <el-input v-model="AddForm.userPosition" placeholder="请输入使用人岗位"/>
+    </el-form-item>
+
+    <el-form-item label="押金金额(RMB)">
+      <el-input v-model="AddForm.deposit" placeholder="请输入押金金额(元)" />
+    </el-form-item>
+
+    <el-form-item label="购买时间">
+      <el-date-picker
+        v-model="AddForm.buyingTime"
+        type="date"
+        placeholder="选择购买日期"
+        size="default"
+        format="YYYY/MM/DD"
+      />
+    </el-form-item>
+
+    <el-form-item label="备注">
+      <el-input v-model="AddForm.notes"  placeholder="请输入备注"/>
+    </el-form-item>
+  </el-form>
+<!-- 弹窗底部提交按钮 -->
+  <div class='el-dialog-button'>
+   <el-button type="danger" @click="submit">
+    <el-icon><Select/></el-icon>
+         确认提交
+    </el-button>
+  </div>
+  </el-dialog>
+  </div>
+  <!-- 弹窗结束 -->
+</div> 
+</template>
+
+<script setup lang='ts'>
+import { ref, reactive,onMounted,computed } from 'vue';
+import { getList, getDetail, add, update, remove,$_TableList } from '@/api/basic/basicPda'; //API
+import { ElMessage, type UploadProps } from 'element-plus'
+import { getToken } from '@/utils/auth';
+const currentPage = ref(1); // 默认页码
+const pageSize = ref(30); // 默认每一页几条
+const pageList = ref([5, 10, 50, 100, 200]); // 选择每页显示多少条
+const small = ref(false);
+const background = ref(true); // 是否开启背景颜色
+const disabled = ref(false); // 是否禁止使用页码功能
+const data = ref([]); // 表单数据
+const TabHeight = ref();//动态获取表格高度
+const AddLalog = ref(false)//提交弹窗
+const img=ref(false);//图片是否上传成功
+const ImgText=ref('')
+const AddForm = ref({ //表单信息
+})
+const value1 = ref('') //日期
+const optionsvalue = ref('')//下拉框值
+const optionsvalue2=ref('')//状态值
+const uploadRef = ref()//图片上传
+const options = [//下拉选择框
+  {
+    value: '0',
+    label: '是',
+  },
+  {
+    value: '1',
+    label: '否',
+  },
+
+]
+const options2 = [//下拉选择框
+  {
+    value: '1',
+    label: '正常',
+  },
+  {
+    value: '2',
+    label: '维修',
+  },
+  {
+    value: '3',
+    label: '不能使用(不能开机)',
+  },
+]
+// 图片上传接口
+const doubledCount = computed(() => {
+  return '/api/blade-resource/oss/endpoint/put-file'
+})
+ // 图片上传写代码TOKEN
+const headers =computed(()=>{
+  return {'Blade-Auth': 'Bearer ' + getToken(),
+      };
+    })
+// 获取表格数据
+function onLoad(){
+    // 获取表格数据API（$_TableList）
+    $_TableList({ current:currentPage.value, size: pageSize.value }).then(res=>{
+    console.log(res.data.data.records);
+    //表格信息
+    data.value=res.data.data.records 
+})
+}
+// 动态获取DOM高度给表单防止页面出现滚动条
+onMounted(() => {
+//默认值88
+   TabHeight.value = TabHeight.value.offsetHeight-91;
+// 等待DOM高度被复制之后在请求数据，防止被数据撑开高度
+   onLoad()
+})
+// 新增数据功能
+const AddInfo=()=>{
+  console.log(111);
+  AddLalog.value=true;
+}
+// 图片上传
+const imageUrl = ref('')
+// 图片上传成功回调函数
+const ImgSuccess: UploadProps['onSuccess'] = (response,uploadFile) => {
+  console.log(response,uploadFile,'123123123123123122312123');
+  console.log('================================================================');
+  if(response.success===true){
+    img.value=true;
+    console.log(img.value);
+     ImgText.value = response.data.originalName
+    
+  }
+}
+// 上传图片规则
+const beforeAvatarUpload: UploadProps['beforeUpload'] = (rawFile) => {
+  if (rawFile.type !== 'image/png') {
+        ElMessage.error('图片格式只能为image/png!')
+        return false
+    } else if (rawFile.size / 1024 / 1024 > 2) {
+    ElMessage.error('图片大小不能大于2MB!')
+    return false
+  }
+  return true
+}
+</script>
+
+<style scoped lang='scss'>
+// 最外层 IDV
+.el-content-el {
+  padding: 0 8px;
+  padding-top:8px;
+  background-color: #fff;
+  height: 100%;
+  box-sizing: border-box;
+// 表格顶部按钮
+    :deep(.el-Cart-button) {
+      margin-bottom: 8px;
+      display: flex;
+      justify-content: space-between;
+    }
+    // 表格顶部左侧、右侧按钮样式
+    .el-Cart-button-left,.el-Cart-button-right{
+      display: flex;
+      margin: 0 0px;
+      justify-content: space-between;
+    }
+    .el-Cart-button-left{
+    :deep( button){
+    padding: 0 14px;
+    min-width: 70px;
+    display: flex;
+    span{
+    width: 100%;
+    display: inline-flex;
+    align-items: center;
+    justify-content: space-between;
+    i{
+      margin-right: 6px;
+    }
+    }
+    }
+    
+    }
+    .el-Cart-button-right {
+    display: flex;
+    margin: 0 0px;
+    justify-content: space-between;
+    align-items: center;
+    button {
+        background-color: transparent;
+        border-radius: 50%;
+        width: 30px;
+        height: 30px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        border: 1px solid #ccc;
+        margin-right: 8px;
+        
+        &:hover {
+          background-color: #172e601f;
+          i {
+            color: #0e2549;
+          }
+        }
+        // 去掉最后一个按钮右侧边距
+        &:last-child {
+          margin-right: 0;
+        }
+      }
+    }
+  .el-Cart {
+    // 表格标题颜色
+    :deep(.el-table__header) {
+      th {
+        background-color: #fafafa;
+        color: #000;
+      }
+    }
+    // 组件样式开始
+    // 分页样式
+    .demo-pagination-block {
+      display: flex;
+      justify-content: flex-end;
+      margin-top: 6px;
+    }
+
+    // 表格行高度
+    :deep(.el-table__row) {
+      height: 60px;
+    }
+    // 表格图片
+    .el-Img {
+      width: 100%;
+      height: 40px;
+
+      img {
+        width: 100%;
+        height: 100%;
+      }
+    }
+  }
+  // 新增数据弹窗组件样式
+  :deep(.addlalog){
+          // 弹窗
+  .el-dialog__header{
+        border-bottom: 1px solid #172e607d ;
+        margin-right:0;
+        margin-bottom:0;
+        padding-bottom:20px;
+        position: relative;
+        i{
+          color:#172e60;
+        }
+  }
+  // 弹窗标题左侧小竖线
+  .el-dialog__header::after{
+    content: "";
+    display: block;
+    width: 3px;
+    height: 16px;
+    background-color: #172e60;
+    position: absolute;
+    left: 8px;
+    top: 24px;
+  }
+  .el-dialog__body{
+    .el-form{
+      width: 100%;
+      display:flex;
+      flex-wrap: wrap;
+      justify-content: space-between;
+    }
+    .el-form-item{
+      width:276px;
+      
+    }
+ /* 去掉第三个、第六个、第九个div的右外边距 */
+.el-form-item:nth-child(3n) {
+  margin-right: 0; 
+}
+  }
+
+.el-form-item__content{
+  height:30px;
+  // 日期选择框
+     .el-input{
+      width: 100%;
+      height:30px !important;  
+     }
+//  下拉选择框
+    .el-select{
+      width: 100%;
+    }
+  }
+
+  }
+
+  // 底部提交
+  .el-dialog-button{
+    display:flex;
+  justify-content: flex-end;
+  }
+  // 图片上传
+  .img-icon{
+    width: 100%;
+    position: relative;
+    .el-button{
+     width: 100%;
+    background-color: #fff;
+    color: #a8abb9;
+    justify-content: flex-start;
+    border: 1px solid #dcdfe6;
+    }
+    i{
+      position:absolute;
+      left: 110px;
+      top: 8px;
+      font-size:18px
+    }
+  }
+  :deep(.upload-demo){
+    
+    width:100%;
+    .el-upload{
+      width:100%
+    }
+    ul{
+      margin-top:0;
+    }
+
+  }
+  // 图片上传成功
+  .el-img{
+    border: 1px solid #ccc;
+    width: 100%;
+    border-radius: 4px;
+    padding: 0 8px;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    height: 30px;
+    .el-img-left{
+      display:flex;
+      align-items:center; 
+      i{
+        margin-right:8px;
+        color:#ccc;
+      }
+    }
+    i{
+      color: #10d070;
+    margin-left: 6px; 
+    }
+    }
+}
+</style>
\ No newline at end of file