物料领取功能修改

src/views/material/receive.vue

@@ -73,9 +73,18 @@
         </template>
       </el-table-column>
       <el-table-column label="领用人" prop="receiveUserName"/>
-      <el-table-column label="周期" prop="recordDate" width="180"/>
-      <el-table-column label="操作" align="center" width="130">
+      <el-table-column label="周期" prop="recordDate" width="150"/>
+      <el-table-column label="操作" align="center" width="200">
         <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleSplit(scope.row)"
+            v-if="scope.row.monthOrWeek==='1'"
+            v-hasPermi="['material:material:add']"
+          >周数据
+          </el-button>
           <el-button
             size="mini"
             type="text"
@@ -112,36 +121,52 @@
     <!-- 添加或修改物料配置对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
-        <el-form-item label="物料名称" prop="MaterialName">
-          <el-input v-model="form.materialName" placeholder="请输入物料名称"/>
+        <el-form-item label="数据周期">
+          <div v-if="form.monthOrWeek==='1'">
+            <el-date-picker
+              v-model="form.recordDate"
+              type="month"
+              value-format="yyyy-MM"
+              placeholder="选择月份"
+              :picker-options="{ disabledDate: time => time.getTime() < Date.now() }"
+              clearable>
+            </el-date-picker>
+          </div>
+          <div v-else>
+            <el-date-picker
+              v-model="form.recordDate"
+              type="week"
+              format="yyyy 第 WW 周"
+              placeholder="选择周"
+              :picker-options="{ disabledDate: time => time.getTime() < Date.now() }"
+              clearable>
+            </el-date-picker>
+          </div>
+        </el-form-item>
+        <el-form-item label="物料名称" prop="materialName">
+          <el-input v-model="form.materialName" placeholder="请输入物料名称" :disabled="form.monthOrWeek==='2'"/>
         </el-form-item>
         <el-form-item label="物料规格" prop="specification">
-          <el-input v-model="form.specification" placeholder="请输入物料规格"/>
+          <el-input v-model="form.specification" placeholder="请输入物料规格" :disabled="form.monthOrWeek==='2'"/>
         </el-form-item>
         <el-form-item label="品牌/货号" prop="articleNo">
-          <el-input v-model="form.articleNo" placeholder="请输入品牌/货号"/>
+          <el-input v-model="form.articleNo" placeholder="请输入品牌/货号" :disabled="form.monthOrWeek==='2'"/>
         </el-form-item>
         <el-form-item label="厂商" prop="factory">
-          <el-input v-model="form.factory" placeholder="请输入厂商"/>
+          <el-input v-model="form.factory" placeholder="请输入厂商" :disabled="form.monthOrWeek==='2'"/>
         </el-form-item>
         <el-form-item label="单位" prop="unit">
-          <el-input v-model="form.unit" placeholder="请输入单位"/>
+          <el-input v-model="form.unit" placeholder="请输入单位" :disabled="form.monthOrWeek==='2'"/>
         </el-form-item>
         <el-form-item label="领取量" prop="num">
           <el-input-number v-model="form.num" controls-position="right" :min="0" placeholder="请输入领取量"/>
         </el-form-item>
-        <el-form-item label="物料类型" prop="materialType">
+        <el-form-item label="物料类型" prop="materialType" :disabled="form.monthOrWeek==='2'">
           <el-radio-group v-model="form.materialType">
             <el-radio label="1">生产</el-radio>
             <el-radio label="2">非生产</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="月/周数据" prop="monthOrWeek">
-          <el-radio-group v-model="form.monthOrWeek">
-            <el-radio label="1">月</el-radio>
-            <el-radio label="2">周</el-radio>
-          </el-radio-group>
-        </el-form-item>
         <el-form-item label="备注">
           <el-input v-model="form.remark" type="textarea"/>
         </el-form-item>
@@ -164,6 +189,7 @@ import {
   updateMaterial,
   exportMaterial
 } from "@/api/material/material";
+import DateUtil from "@/utils/date"
 
 export default {
   name: "Receive",
@@ -183,7 +209,7 @@ export default {
         pageSize: 10,
         materialName: undefined,
         factory: undefined,
-        status: undefined
+        monthOrWeek: undefined
       },
       // 表单参数
       form: {},
@@ -275,12 +301,24 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
+      this.form.monthOrWeek = '1'
+      this.title = "添加月物料计划";
       this.open = true;
-      this.title = "添加物料计划";
     },
     handleExport() {
       exportMaterial()
     },
+    /** 周数据填报操作 */
+    handleSplit(row) {
+      this.form = row;
+      this.form.parentId = row.id;
+      this.form.id = undefined;
+      this.form.num = undefined;
+      this.form.monthOrWeek = '2'
+      this.form.recordDate=DateUtil.day()
+      this.title = "添加周物料计划";
+      this.open = true;
+    },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();