浏览代码

Merge remote-tracking branch 'origin/master'

humingbo 1 年之前
父节点
当前提交
fe88475b83
共有 1 个文件被更改,包括 5 次插入5 次删除
  1. 5 5
      src/views/material/asset.vue

+ 5 - 5
src/views/material/asset.vue

@@ -81,7 +81,7 @@
                   size="mini">
           <el-table-column label="唯一编码" prop="deptAssetNumber" :show-overflow-tooltip="true"/>
           <el-table-column label="物品名称" prop="assetName" min-width="100" :show-overflow-tooltip="true"/>
-          <!--          <el-table-column label="公司资产编号" prop="assetNumber" :show-overflow-tooltip="true"/>-->
+          <el-table-column label="公司资产编号" prop="assetNumber" :show-overflow-tooltip="true"/>
           <el-table-column label="资产类型" width="80">
             <template slot-scope="scope">
               <el-tag v-if="scope.row.assetType==='1'" size="mini" type="warning">耗材</el-tag>
@@ -152,7 +152,7 @@
     <!-- 添加或修改对话框 -->
     <el-dialog :title="title" :visible.sync="open" class="asset-dialog" width="800px" append-to-body>
       <el-row :gutter="20">
-        <el-col :span="10">
+        <el-col :span="12">
           <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="100px">
             <el-form-item label="所属分类" prop="categoryId">
               <el-cascader
@@ -220,11 +220,11 @@
               <el-input v-model="form.location" placeholder="请输入定位位置"></el-input>
             </el-form-item>
             <el-form-item label="备注" prop="remark">
-              <el-input v-model="form.remark" type="textarea"></el-input>
+              <el-input v-model="form.remark" type="textarea" :autosize="{ minRows: 5, maxRows: 10}"></el-input>
             </el-form-item>
           </el-form>
         </el-col>
-        <el-col :span="14">
+        <el-col :span="12">
           <div class="accessory-header">
             <div class="a-h-title">
               配件信息
@@ -335,7 +335,7 @@
             </el-form-item>
             <el-form-item label="流转备注" prop="transferRemark">
               <el-input v-model="transferForm.transferRemark" type="textarea"
-                        :autosize="{ minRows: 4, maxRows: 7}"></el-input>
+                        :autosize="{ minRows: 5, maxRows: 10}"></el-input>
             </el-form-item>
           </el-form>
           <div class="transfer-btn">