LAPTOP-16IUEB3P\Lenovo 3 年 前
コミット
140c879b17

+ 4 - 0
src/views/codeManagement/components/myTable.vue

@@ -199,6 +199,10 @@
             {
               value: 'yyyyMMddHHmmss',
               label: '年月日时分秒'
+            },
+            {
+              value: 'yyyyMMddHHmmssSSS',
+              label: '年月日时分秒毫秒'
             }
           ]
         }

+ 5 - 5
src/views/ledgerAssets/sparepart/components/sparepart-search.vue

@@ -11,7 +11,7 @@
         <el-form-item label="编码:" label-width="50px">
           <el-input clearable v-model="where.code" placeholder="请输入" />
         </el-form-item>
-        <el-form-item label="型号:">
+        <el-form-item label="型号:" label-width="50px">
           <el-input clearable v-model="where.spaceModule" placeholder="请输入" />
         </el-form-item>
       </el-col>
@@ -23,7 +23,7 @@
            <ele-tree-select
               clearable
               :data="treeData"
-              v-model="where.dept"
+              v-model="where.ownershipGroupId"
               placeholder="请选择"
               default-expand-all
               labelKey="name"
@@ -35,13 +35,13 @@
         <el-form-item label="固定资产编码:" label-width="100px">
           <el-input clearable v-model="where.fixCode" placeholder="请输入" />
         </el-form-item>
-        <el-form-item label="生命周期:">
+        <el-form-item label="生命周期:" label-width="75px">
           <DictSelection dictName="生命周期" clearable v-model="where.source">
           </DictSelection>
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-         <el-form-item label="材质:">
+         <el-form-item label="材质:" label-width="50px">
            <el-input clearable v-model="where.texture" placeholder="请输入" />
          </el-form-item>
         <div class="ele-form-actions">
@@ -80,7 +80,7 @@
         // source:'',
         // texture:'',
         // spaceModule:'',
-        // dept:''
+        ownershipGroupId:''
       };
       return {
         // 表单数据

+ 14 - 14
src/views/ledgerAssets/turnoverCar/components/turnovercar-search.vue

@@ -1,7 +1,7 @@
 <!-- 搜索表单 -->
 <template>
   <el-form
-    label-width="77px"
+    label-width="75px"
     class="ele-form-search"
     @keyup.enter.native="search"
     @submit.native.prevent
@@ -11,22 +11,13 @@
         <el-form-item label="编码:" label-width="50px">
           <el-input clearable v-model="where.code" placeholder="请输入" />
         </el-form-item>
-        <el-form-item label="名称:" label-width="50px">
-          <el-input clearable v-model="where.name" placeholder="请输入" />
-        </el-form-item>
-      </el-col>
-      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="生命周期:">
-          <DictSelection dictName="生命周期" clearable v-model="where.source">
-          </DictSelection>
-        </el-form-item>
-        <el-form-item label="材质:">
-          <el-input clearable v-model="where.texture" placeholder="请输入" />
+        <el-form-item label="型号:" label-width="50px">
+          <el-input clearable v-model="where.spaceModule" placeholder="请输入" />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="型号:">
-          <el-input clearable v-model="where.spaceModule" placeholder="请输入" />
+        <el-form-item label="名称:" label-width="50px">
+          <el-input clearable v-model="where.name" placeholder="请输入" />
         </el-form-item>
         <el-form-item label="所在部门:">
            <ele-tree-select
@@ -44,6 +35,15 @@
         <el-form-item label="固定资产编码:" label-width="100px">
           <el-input clearable v-model="where.fixCode" placeholder="请输入" />
         </el-form-item>
+        <el-form-item label="生命周期:">
+          <DictSelection dictName="生命周期" clearable v-model="where.source">
+          </DictSelection>
+        </el-form-item>
+      </el-col>
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+        <el-form-item label="材质:" label-width="50px">
+          <el-input clearable v-model="where.texture" placeholder="请输入" />
+        </el-form-item>
         <div class="ele-form-actions">
           <el-button
             type="primary"