Browse Source

物料领取页面修改

ysc 1 year ago
parent
commit
556604f56e
2 changed files with 9 additions and 13 deletions
  1. 6 10
      src/views/material/receive.vue
  2. 3 3
      src/views/task/task.vue

+ 6 - 10
src/views/material/receive.vue

@@ -19,15 +19,11 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="领取时间">
-        <el-date-picker
-          v-model="queryParams.rangeDate"
-          type="daterange"
-          value-format="yyyy-MM-dd"
-          range-separator="至"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期">
-        </el-date-picker>
+      <el-form-item label="月/周数据">
+        <el-radio-group v-model="queryParams.monthOrWeek">
+          <el-radio-button label="1">月</el-radio-button>
+          <el-radio-button label="2">周</el-radio-button>
+        </el-radio-group>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -77,7 +73,7 @@
         </template>
       </el-table-column>
       <el-table-column label="领用人" prop="receiveUserName"/>
-      <el-table-column label="时间" prop="receiveDate" width="180"/>
+      <el-table-column label="周期" prop="recordDate" width="180"/>
       <el-table-column label="操作" align="center" width="130">
         <template slot-scope="scope">
           <el-button

+ 3 - 3
src/views/task/task.vue

@@ -229,14 +229,14 @@
         </el-form-item>
         <el-form-item label="所属项目:">
           <span>{{ splitForm.projectName }}</span>
-          <el-button type="text" size="medium" icon="el-icon-circle-plus-outline"
+          <el-button type="text" icon="el-icon-circle-plus-outline"
                      style="float: right; padding: -1px 3px" @click="addChild"></el-button>
         </el-form-item>
         <el-card shadow="always" v-for="(child,index) in splitForm.children" :key="index">
           <div slot="header" class="clearfix">
             <span>子任务{{ index + 1 }}</span>
-            <el-button type="text" icon="el-icon-close" @click="delChild(index)"
-                       style="float: right; padding: 3px 0"></el-button>
+            <el-button type="text" icon="el-icon-delete" @click="delChild(index)"
+                       style="float: right;color: red; padding: 3px 0"></el-button>
           </div>
           <el-form ref="splitChild" :rules="rules" label-width="80px">
             <el-form-item label="任务名称" prop="taskName">