页面优化

src/api/task/project.js

@@ -53,9 +53,9 @@ export function getProjectTree() {
 }
 
 // 查询项目列表
-export function getProjectList(categoryId) {
+export function getProjectList(type) {
   return request({
-    url: '/task/project/getProjectList/' + categoryId,
+    url: '/task/project/getProjectList/' + type,
     method: 'get'
   })
 }

src/views/material/asset.vue

@@ -318,16 +318,21 @@
               </el-select>
             </el-form-item>
             <el-form-item label="流转备注" prop="transferRemark">
-              <el-input v-model="transferForm.transferRemark" type="textarea"></el-input>
+              <el-input v-model="transferForm.transferRemark" type="textarea"
+                        :autosize="{ minRows: 4, maxRows: 7}"></el-input>
             </el-form-item>
           </el-form>
+          <div class="transfer-btn">
+            <el-button type="primary" size="mini" @click="submitTransferForm">确 定</el-button>
+            <el-button size="mini" @click="cancelTransferForm">取 消</el-button>
+          </div>
         </el-col>
         <el-col :span="12">
           <div style="margin-top: -15px">
             <span style="font-size: 18px;margin-right: 10px">流转记录</span>
             <span style="font-size: 12px"><i class="el-icon-info"/>红点表示接收人还未确认</span>
           </div>
-          <div style="height: 300px;margin-top: 10px">
+          <div style="height: 500px;margin-top: 10px;overflow: auto">
             <el-timeline :reverse="true">
               <el-timeline-item
                 v-for="(transfer, index) in assetTransferList"
@@ -355,10 +360,6 @@
           </div>
         </el-col>
       </el-row>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" size="mini" @click="submitTransferForm">确 定</el-button>
-        <el-button size="mini" @click="cancelTransferForm">取 消</el-button>
-      </div>
     </el-dialog>
 
     <!-- 资产详情对话框 -->
@@ -706,4 +707,9 @@ export default {
   bottom: 0px;
   right: 20px;
 }
+
+.transfer-btn {
+  text-align: right;
+  margin-top: 20px;
+}
 </style>

src/views/material/components/category.vue

@@ -21,7 +21,6 @@
         :filter-node-method="filterNode"
         ref="categoryTree"
         node-key="id"
-        default-expand-all
         highlight-current
         @node-click="handleNodeClick">
             <span class="custom-tree-node" slot-scope="{ node, data }">

src/views/material/receive.vue

@@ -251,7 +251,8 @@
           </template>
           <template slot-scope="scope">
             <el-input v-model="scope.row.price" :ref="'r'+scope.$index+'price'"
-                      @keyup.native="handleKeyDown($event, scope)" size="mini" placeholder="请输入单价" :disabled="addForm.monthOrWeek==='2'"
+                      @keyup.native="handleKeyDown($event, scope)" size="mini" placeholder="请输入单价"
+                      :disabled="addForm.monthOrWeek==='2'"
                       style="width: 100%"/>
           </template>
         </el-table-column>
@@ -271,7 +272,8 @@
           </template>
           <template slot-scope="scope">
             <el-select v-model="scope.row.materialType" :ref="'r'+scope.$index+'materialType'"
-                       @keyup.native="handleKeyDown($event, scope,'select')" size="mini" :disabled="addForm.monthOrWeek==='2'"
+                       @keyup.native="handleKeyDown($event, scope,'select')" size="mini"
+                       :disabled="addForm.monthOrWeek==='2'"
                        style="width: 100%">
               <el-option label="生产" value="1"></el-option>
               <el-option label="非生产" value="2"></el-option>
@@ -281,7 +283,8 @@
         <el-table-column label="用于项目" prop="projectId" width="120px">
           <template slot-scope="scope">
             <el-select v-model="scope.row.projectId" :ref="'r'+scope.$index+'projectId'"
-                       @keyup.native="handleKeyDown($event, scope,'select')" size="mini" :disabled="addForm.monthOrWeek==='2'"
+                       @keyup.native="handleKeyDown($event, scope,'select')" size="mini"
+                       :disabled="addForm.monthOrWeek==='2'"
                        style="width: 100%">
               <el-option v-for="(item,index) in projectList" :label="item.projectName" :key="index"
                          :value="item.id"></el-option>
@@ -404,7 +407,7 @@ import {
   updateMaterial,
   exportMaterial
 } from "@/api/material/material";
-import {listProject} from "@/api/task/project";
+import {getProjectList} from "@/api/task/project";
 import DateUtil from "@/utils/date"
 import {mapGetters} from "vuex";
 import directionKey from "@/views/mixins/directionKey";
@@ -509,7 +512,7 @@ export default {
       })
     },
     getProjectList() {
-      listProject({type: '2'}).then(res => {
+      getProjectList('2').then(res => {
         this.projectList = res.data
       })
     },

src/views/task/components/project.vue

@@ -218,7 +218,7 @@ export default {
       listProject().then(response => {
         this.projectOptions = this.handleTree(response.data, "id");
       });
-      getDeptUserTree('').then(res => {
+      getDeptUserTree('1').then(res => {
         this.userList = res.data
       })
     },

src/views/task/task.vue

@@ -408,7 +408,7 @@ export default {
   methods: {
     initData() {
       this.getList();
-      getDeptUserTree('').then(res => {
+      getDeptUserTree('1').then(res => {
         this.userList = res.data
       })
     },