diff --git a/src/option/basic/basicForklift.js b/src/option/basic/basicForklift.js
index ce70185..cfe25a7 100644
--- a/src/option/basic/basicForklift.js
+++ b/src/option/basic/basicForklift.js
@@ -60,7 +60,7 @@ export default {
       hide: true,
     },
     {
-      label: "事业线;1-川渝事业线,2-广东事业线,3-湖北事业线,4-云贵事业线",
+      label: "事业线",
       prop: "businessLine",
       search: true,
     },
@@ -74,16 +74,16 @@ export default {
       prop: "ticketRecipient",
     },
     {
-      label: "供应商;1-汉智叉车,2-荆门荆拓,3-天津德丰,4-力至优叉车,5-深圳鑫涛",
+      label: "供应商",
       prop: "supplier",
       search: true,
     },
     {
-      label: "资产类型;1-自有,2-租凭",
+      label: "资产类型",
       prop: "assetType",
     },
     {
-      label: "类型;1-高叉,2-托盘车,3-坐叉",
+      label: "类型",
       prop: "forkliftType",
     },
     {
@@ -91,39 +91,39 @@ export default {
       prop: "abstract",
     },
     {
-      label: "载重;单位（T）",
+      label: "载重(T)",
       prop: "load",
     },
     {
-      label: "载高;单位（M）",
+      label: "载高(M)",
       prop: "loadHeight",
     },
     {
-      label: "整车尺寸;长*宽*高",
+      label: "整车尺寸",
       prop: "vehicleSize",
     },
     {
-      label: "货叉宽度;（MAX外宽,单位M）",
+      label: "货叉宽(M)",
       prop: "forkArmsWidth",
     },
     {
-      label: "货叉长度;(单位M)",
+      label: "货叉长(M)",
       prop: "forkArmsHeight",
     },
     {
-      label: "最小转弯半径;(单位M)",
+      label: "最小转弯半径(M)",
       prop: "minimumTurningRadius",
     },
     {
-      label: "通道宽度;((min),单位M)",
+      label: "通道宽(M)",
       prop: "channelWidth",
     },
     {
-      label: "月租;(元/月)",
+      label: "月租(元/月)",
       prop: "monthlyRent",
     },
     {
-      label: "数量;（台）",
+      label: "数量(台)",
       prop: "number",
     },
     {
@@ -132,14 +132,14 @@ export default {
       search: true,
     },
     {
-      label: "起租期限;中文大写",
+      label: "起租期限",
       prop: "leaseStartPeriod",
     },
     {
       label: "租赁开始时间",
       prop: "leaseStartTime",
-      format: "yyyy-MM-dd hh:mm:ss",
-      valueFormat: "yyyy-MM-dd hh:mm:ss",
+      format: "yyyy-MM-dd",
+      valueFormat: "yyyy-MM-dd",
       search: true,
     },
     {
diff --git a/src/option/basic/basicdataPda.js b/src/option/basic/basicdataPda.js
index 5924f4c..ba0ba9a 100644
--- a/src/option/basic/basicdataPda.js
+++ b/src/option/basic/basicdataPda.js
@@ -1,3 +1,5 @@
+import data from "@/views/util/data";
+
 export default {
   size: 'small',
   expand: false,
@@ -110,13 +112,15 @@ export default {
     {
       label: "购买时间",
       prop: "buyingTime",
-      format: "yyyy-MM-dd ",
+      type:"date",
+      format: "yyyy-MM-dd",
       valueFormat: "yyyy-MM-dd",
     },
     {
       label: "保修截止时间",
       prop: "warrantyPeriodEndTime",
-      format: "yyyy-MM-dd ",
+      type:"date",
+      format: "yyyy-MM-dd",
       valueFormat: "yyyy-MM-dd",
     },
     // {
diff --git a/src/views/basic/forklift/basicForklift.vue b/src/views/basic/forklift/basicForklift.vue
index 000ac5a..050dc6b 100644
--- a/src/views/basic/forklift/basicForklift.vue
+++ b/src/views/basic/forklift/basicForklift.vue
@@ -6,13 +6,28 @@ z<template>
         <el-form :inline="true" :size="option.size" :model="query">
           <template>
             <el-form-item label="请选择事业线">
-              <el-input v-model="query.businessLine" placeholder="请输入事业线;1-川渝事业线,2-广东事业线,3-湖北事业线,4-云贵事业线"></el-input>
+              <el-select v-model="query.businessLine" clearable placeholder="请选择事业线" >
+                <el-option
+                  v-for="item in businessLineData"
+                  :key="item.dictKey"
+                  :label="item.dictValue"
+                  :value="item.dictKey">
+                </el-option>
+              </el-select>
             </el-form-item>
 <!--            <el-form-item label="请选择使用单位">-->
 <!--              <el-input v-model="query.useUnit" placeholder="请输入使用单位"></el-input>-->
 <!--            </el-form-item>-->
             <el-form-item label="供应商">
-              <el-input v-model="query.supplier" placeholder="请输入供应商;1-汉智叉车,2-荆门荆拓,3-天津德丰,4-力至优叉车,5-深圳鑫涛"></el-input>
+<!--              <el-input v-model="query.supplier" placeholder="请输入供应商;1-汉智叉车,2-荆门荆拓,3-天津德丰,4-力至优叉车,5-深圳鑫涛"></el-input>-->
+              <el-select v-model="query.supplier" clearable placeholder="请选择供应商" >
+                <el-option
+                  v-for="item in supplierData"
+                  :key="item.dictKey"
+                  :label="item.dictValue"
+                  :value="item.dictKey">
+                </el-option>
+              </el-select>
             </el-form-item>
             <el-form-item label="合同编号">
               <el-input v-model="query.contractNumber" placeholder="请输入合同编号"></el-input>
@@ -53,7 +68,7 @@ z<template>
                   :border="option.border">
           <el-table-column type="selection" v-if="option.selection" width="55" align="center"></el-table-column>
           <el-table-column type="expand" v-if="option.expand" align="center"></el-table-column>
-          <el-table-column v-if="option.index" label="#" type="index" width="50" align="center">
+          <el-table-column v-if="option.index" label="序号" type="index" width="50" align="center">
           </el-table-column>
           <template v-for="(item,index) in option.column">
             <!-- table字段 -->
@@ -91,119 +106,241 @@ z<template>
       <el-dialog :title="title" :visible.sync="box" width="50%" :before-close="beforeClose" append-to-body>
         <el-form :disabled="view" :size="option.size" ref="form" :model="form" label-width="80px">
           <!-- 表单字段 -->
-          <el-form-item label="事业线;1-川渝事业线,2-广东事业线,3-湖北事业线,4-云贵事业线" prop="businessLine">
-              <el-select v-model="form.businessLine" clearable placeholder="请选择事业线;1-川渝事业线,2-广东事业线,3-湖北事业线,4-云贵事业线">
+          <el-row>
+            <el-col :span="11">
+              <el-form-item label="事业线" prop="businessLine">
+                <el-select v-model="form.businessLine" clearable placeholder="请选择事业线">
                   <el-option
                     v-for="item in businessLineData"
                     :key="item.dictKey"
                     :label="item.dictValue"
                     :value="item.dictKey">
                   </el-option>
-              </el-select>
-          </el-form-item>
-          <el-form-item label="使用单位" prop="useUnit">
-            <el-input v-model="form.useUnit" placeholder="请输入使用单位"/>
-          </el-form-item>
-          <el-form-item label="受票主体" prop="ticketRecipient">
-            <el-input v-model="form.ticketRecipient" placeholder="请输入受票主体"/>
-          </el-form-item>
-          <el-form-item label="供应商" prop="supplier">
-              <el-select v-model="form.supplier" clearable placeholder="1-汉智叉车,2-荆门荆拓,3-天津德丰,4-力至优叉车,5-深圳鑫涛">
+                </el-select>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="11">
+              <el-form-item label="使用单位" prop="useUnit">
+                <el-input v-model="form.useUnit" placeholder="请输入使用单位"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row>
+            <el-col :span="11">
+              <el-form-item label="受票主体" prop="ticketRecipient">
+                <el-input v-model="form.ticketRecipient" placeholder="请输入受票主体"/>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="11">
+              <el-form-item label="供应商" prop="supplier">
+                <el-select v-model="form.supplier" clearable placeholder="供应商">
                   <el-option
                     v-for="item in supplierData"
                     :key="item.dictKey"
                     :label="item.dictValue"
                     :value="item.dictKey">
                   </el-option>
-              </el-select>
-          </el-form-item>
-          <el-form-item label="资产类型" prop="assetType">
-              <el-select v-model="form.assetType" clearable placeholder="1-自有,2-租凭">
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row>
+            <el-col :span="11">
+              <el-form-item label="资产类型" prop="assetType">
+                <el-select v-model="form.assetType" clearable placeholder="资产类型">
                   <el-option
                     v-for="item in assetTypeData"
                     :key="item.dictKey"
                     :label="item.dictValue"
                     :value="item.dictKey">
                   </el-option>
-              </el-select>
-          </el-form-item>
-          <el-form-item label="类型;1-高叉,2-托盘车,3-坐叉" prop="forkliftType">
-              <el-select v-model="form.forkliftType" clearable placeholder="请选择类型;1-高叉,2-托盘车,3-坐叉">
+                </el-select>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="11">
+              <el-form-item label="类型" prop="forkliftType">
+                <el-select v-model="form.forkliftType" clearable placeholder="请选择类型;1-高叉,2-托盘车,3-坐叉">
                   <el-option
                     v-for="item in forkliftTypeData"
                     :key="item.dictKey"
                     :label="item.dictValue"
                     :value="item.dictKey">
                   </el-option>
-              </el-select>
-          </el-form-item>
-          <el-form-item label="摘要" prop="abstracts">
-            <el-input v-model="form.abstract" placeholder="请输入摘要"/>
-          </el-form-item>
-          <el-form-item label="载重;单位（T）" prop="load">
-            <el-input v-model="form.load" placeholder="请输入载重;单位（T）"/>
-          </el-form-item>
-          <el-form-item label="载高;单位（M）" prop="loadHeight">
-            <el-input v-model="form.loadHeight" placeholder="请输入载高;单位（M）"/>
-          </el-form-item>
-          <el-form-item label="整车尺寸;长*宽*高" prop="vehicleSize">
-            <el-input v-model="form.vehicleSize" placeholder="请输入整车尺寸;长*宽*高"/>
-          </el-form-item>
-          <el-form-item label="货叉宽度;（MAX外宽,单位M）" prop="forkArmsWidth">
-            <el-input v-model="form.forkArmsWidth" placeholder="请输入货叉宽度;（MAX外宽,单位M）"/>
-          </el-form-item>
-          <el-form-item label="货叉长度;(单位M)" prop="forkArmsHeight">
-            <el-input v-model="form.forkArmsHeight" placeholder="请输入货叉长度;(单位M)"/>
-          </el-form-item>
-          <el-form-item label="最小转弯半径;(单位M)" prop="minimumTurningRadius">
-            <el-input v-model="form.minimumTurningRadius" placeholder="请输入最小转弯半径;(单位M)"/>
-          </el-form-item>
-          <el-form-item label="通道宽度;((min),单位M)" prop="channelWidth">
-            <el-input v-model="form.channelWidth" placeholder="请输入通道宽度;((min),单位M)"/>
-          </el-form-item>
-          <el-form-item label="月租;(元/月)" prop="monthlyRent">
-            <el-input v-model="form.monthlyRent" placeholder="请输入月租;(元/月)"/>
-          </el-form-item>
-          <el-form-item label="数量;（台）" prop="number">
-            <el-input v-model="form.number" placeholder="请输入数量;（台）"/>
-          </el-form-item>
-          <el-form-item label="合同编号" prop="contractNumber">
-            <el-input v-model="form.contractNumber" placeholder="请输入合同编号"/>
-          </el-form-item>
-          <el-form-item label="起租期限;中文大写" prop="leaseStartPeriod">
-            <el-input v-model="form.leaseStartPeriod" placeholder="请输入起租期限;中文大写"/>
-          </el-form-item>
-          <el-form-item label="租赁开始时间" prop="leaseStartTime">
-            <el-date-picker v-model="form.leaseStartTime" type="datetime" value-format="yyyy-MM-dd " placeholder="请选择租赁开始时间"></el-date-picker>
-          </el-form-item>
-          <el-form-item label="租赁结束时间" prop="leaseEndTime">
-            <el-date-picker v-model="form.leaseEndTime" type="datetime" value-format="yyyy-MM-dd" placeholder="请选择租赁结束时间"></el-date-picker>
-          </el-form-item>
-          <el-form-item label="付款周期;(月)" prop="paymentCycle">
-            <el-input v-model="form.paymentCycle" placeholder="请输入付款周期;(月)"/>
-          </el-form-item>
-          <el-form-item label="押金;（元）" prop="deposit">
-            <el-input v-model="form.deposit" placeholder="请输入押金;（元）"/>
-          </el-form-item>
-          <el-form-item label="付款方式;1-先付后租,2-先租后付" prop="paymentMethod">
-              <el-select v-model="form.paymentMethod" clearable placeholder="请选择付款方式;1-先付后租,2-先租后付">
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row>
+            <el-col :span="11">
+              <el-form-item label="摘要" prop="abstracts">
+                <el-input v-model="form.abstract" placeholder="请输入摘要"/>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="11">
+              <el-form-item label="载重" prop="loads">
+                <el-input v-model="form.loads" placeholder="请输入载重;单位（T）"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+
+          <el-row>
+            <el-col :span="11">
+              <el-form-item label="载高" prop="loadHeight">
+                <el-input v-model="form.loadHeight" placeholder="请输入载高;单位（M）"/>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="11">
+              <el-form-item label="整车尺寸" prop="vehicleSize">
+                <el-input v-model="form.vehicleSize" placeholder="请输入整车尺寸;长*宽*高"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+
+
+          <el-row>
+            <el-col :span="11">
+              <el-form-item label="货叉宽度" prop="forkArmsWidth">
+                <el-input v-model="form.forkArmsWidth" placeholder="请输入货叉宽度;（MAX外宽,单位M）"/>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="11">
+              <el-form-item label="货叉长度" prop="forkArmsHeight">
+                <el-input v-model="form.forkArmsHeight" placeholder="请输入货叉长度;(单位M)"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row>
+            <el-col :span="11">
+              <el-form-item label="最小转弯半径" prop="minimumTurningRadius">
+                <el-input v-model="form.minimumTurningRadius" placeholder="请输入最小转弯半径;(单位M)"/>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="11">
+              <el-form-item label="通道宽度" prop="channelWidth">
+                <el-input v-model="form.channelWidth" placeholder="请输入通道宽度;((min),单位M)"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+
+
+          <el-row>
+            <el-col :span="11">
+              <el-form-item label="月租" prop="monthlyRent">
+                <el-input v-model="form.monthlyRent" placeholder="请输入月租;(元/月)"/>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="11">
+              <el-form-item label="数量" prop="number">
+                <el-input v-model="form.number" placeholder="请输入数量;（台）"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+
+          <el-row>
+            <el-col :span="11">
+              <el-form-item label="合同编号" prop="contractNumber">
+                <el-input v-model="form.contractNumber" placeholder="请输入合同编号"/>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="11">
+              <el-form-item label="起租期限" prop="leaseStartPeriod">
+                <el-input v-model="form.leaseStartPeriod" placeholder="请输入起租期限;中文大写"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+
+          <el-row>
+            <el-col :span="11">
+              <el-form-item label="租赁开始时间" prop="leaseStartTime">
+                <el-date-picker v-model="form.leaseStartTime" type="date" value-format="yyyy-MM-dd " placeholder="请选择租赁开始时间"></el-date-picker>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="11">
+              <el-form-item label="租赁结束时间" prop="leaseEndTime">
+                <el-date-picker v-model="form.leaseEndTime" type="date" value-format="yyyy-MM-dd" placeholder="请选择租赁结束时间"></el-date-picker>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+
+          <el-row>
+            <el-col :span="11">
+              <el-form-item label="付款周期" prop="paymentCycle">
+                <el-input v-model="form.paymentCycle" placeholder="请输入付款周期;(月)"/>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="11">
+              <el-form-item label="付款方式" prop="paymentMethod">
+                <el-select v-model="form.paymentMethod" clearable placeholder="请选择付款方式;1-先付后租,2-先租后付">
                   <el-option
                     v-for="item in paymentMethodData"
                     :key="item.dictKey"
                     :label="item.dictValue"
                     :value="item.dictKey">
                   </el-option>
-              </el-select>
-          </el-form-item>
-          <el-form-item label="备注" prop="notes">
-            <el-input v-model="form.notes" placeholder="请输入备注"/>
-          </el-form-item>
-          <el-form-item label="整车图片" prop="forkliftPhoto">
-            <el-input v-model="form.forkliftPhoto" placeholder="请输入整车图片"/>
-          </el-form-item>
-          <el-form-item label="所属仓库" prop="owningWarehouse">
-            <el-input v-model="form.owningWarehouse" placeholder="请输入所属仓库"/>
-          </el-form-item>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row>
+
+
+            <el-col :span="11">
+              <el-form-item label="押金" prop="deposit">
+                <el-input v-model="form.deposit" placeholder="请输入押金;（元）"/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="11">
+              <el-form-item label="备注" prop="notes">
+                <el-input v-model="form.notes" placeholder="请输入备注"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row>
+
+
+            <el-col :span="11">
+              <el-form-item label="所属仓库" prop="owningWarehouse">
+                <el-select v-model="form.owningWarehouse" clearable placeholder="请选择付款方式仓库">
+                  <el-option
+                    v-for="item in owningWarehouseData"
+                    :key="item.dictKey"
+                    :label="item.dictValue"
+                    :value="item.dictKey">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+
+            </el-col>
+          </el-row>
+
+
+<!--          <el-form-item label="整车图片" prop="forkliftPhoto">-->
+<!--            <el-input v-model="form.forkliftPhoto" placeholder="请输入整车图片"/>-->
+<!--          </el-form-item>-->
+
         </el-form>
         <!-- 表单按钮 -->
         <span v-if="!view" slot="footer" class="dialog-footer">
@@ -242,6 +379,12 @@ export default {
         pageSize: 10,
         total: 40
       },
+      businessLineData:[],
+      supplierData:[],
+      owningWarehouseData:[],
+      paymentMethodData:[],
+      forkliftTypeData:[],
+      assetTypeData:[],
       // 表单数据
       form: {},
       // 选择行
diff --git a/src/views/basic/pda/basicPda.vue b/src/views/basic/pda/basicPda.vue
index b2220fa..4c0e43d 100644
--- a/src/views/basic/pda/basicPda.vue
+++ b/src/views/basic/pda/basicPda.vue
@@ -15,7 +15,14 @@
               <el-input v-model="query.deviceSerialNumber" placeholder="请输入设备序列号S/N"></el-input>
             </el-form-item>
             <el-form-item label="状态">
-              <el-input v-model="query.state" placeholder="请选择状态"></el-input>
+              <el-select v-model="query.state" clearable placeholder="请选择设备当前状态" >
+                <el-option
+                  v-for="item in stateData"
+                  :key="item.dictKey"
+                  :label="item.dictValue"
+                  :value="item.dictKey">
+                </el-option>
+              </el-select>
             </el-form-item>
             <el-form-item label="当前使用仓">
               <el-select v-model="query.currentUsageWarehouse" placeholder="请选择当前使用仓"></el-select>
@@ -185,12 +192,12 @@
 
             <el-col :span="11">
               <el-form-item label="保修截止时间" prop="warrantyPeriodEndTime" label-width="80px">
-                <el-date-picker v-model="form.warrantyPeriodEndTime" type="datetime" value-format="yyyy-MM-dd" placeholder="请选择保修截止时间"></el-date-picker>
+                <el-date-picker v-model="form.warrantyPeriodEndTime" type="date" value-format="yyyy-MM-dd" placeholder="请选择保修截止时间"></el-date-picker>
               </el-form-item>
             </el-col>
             <el-col :span="11">
               <el-form-item label="购买时间" prop="buyingTime" label-width="100px">
-                <el-date-picker v-model="form.buyingTime" type="datetime" value-format="yyyy-MM-dd" placeholder="请选择购买时间"></el-date-picker>
+                <el-date-picker v-model="form.buyingTime" type="date" value-format="yyyy-MM-dd" placeholder="请选择购买时间"></el-date-picker>
               </el-form-item>
             </el-col>
           </el-row>
@@ -264,6 +271,8 @@ export default {
       form: {},
       // 选择行
       selectionList: [],
+      //状态地址
+      stateData:[],
       // 表单配置
       option: option,
       // 表单列表