物料领取修改

src/views/material/receive.vue

@@ -89,7 +89,8 @@
               border
               size="mini"
               @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="40" v-if="queryParams.monthOrWeek==='1'"/>
+      <el-table-column type="selection" width="40" :selectable="selectableHandler"
+                       v-if="queryParams.monthOrWeek==='1'"/>
       <el-table-column label="编号" prop="id" width="80"/>
       <el-table-column label="物料名称" prop="materialName" :show-overflow-tooltip="true"/>
       <el-table-column label="规格" prop="specification" :show-overflow-tooltip="true"/>
@@ -233,9 +234,8 @@
           <template slot-scope="scope">
             <el-select v-model="scope.row.projectId" size="mini" :disabled="addForm.monthOrWeek==='2'"
                        style="width: 100%">
-              <el-option label="项目1" value="1"></el-option>
-              <el-option label="项目2" value="2"></el-option>
-              <el-option label="其他" value="0"></el-option>
+              <el-option v-for="(item,index) in projectList" :label="item.projectName" :key="index"
+                         :value="item.id"></el-option>
             </el-select>
           </template>
         </el-table-column>
@@ -280,6 +280,9 @@
         <el-form-item label="单位" prop="unit">
           <el-input v-model="editForm.unit" placeholder="请输入单位" :disabled="editForm.monthOrWeek==='2'"/>
         </el-form-item>
+        <el-form-item label="价格" prop="price">
+          <el-input v-model="editForm.price" placeholder="请输入价格" :disabled="editForm.monthOrWeek==='2'"/>
+        </el-form-item>
         <el-form-item label="领取量" prop="num">
           <el-input-number v-model="editForm.num" controls-position="right" :min="0" placeholder="请输入领取量"/>
         </el-form-item>
@@ -289,13 +292,20 @@
             <el-radio label="2">非生产</el-radio>
           </el-radio-group>
         </el-form-item>
+        <el-form-item label="用于项目" prop="projectId">
+          <el-select v-model="editForm.projectId" size="mini" :disabled="editForm.monthOrWeek==='2'"
+                     style="width: 100%">
+            <el-option v-for="(item,index) in projectList" :label="item.projectName" :key="index"
+                       :value="item.id"></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="备注">
           <el-input v-model="editForm.remark" type="textarea"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitEditForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" size="mini" @click="submitEditForm">确 定</el-button>
+        <el-button size="mini" @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
 
@@ -311,6 +321,7 @@ import {
   updateMaterial,
   exportMaterial
 } from "@/api/material/material";
+import {listProject} from "@/api/task/project";
 import DateUtil from "@/utils/date"
 
 export default {
@@ -357,6 +368,8 @@ export default {
         remark: undefined
       },
 
+      projectList: [],
+
       // 表单校验
       rules: {
         materialName: [
@@ -388,6 +401,7 @@ export default {
   },
   created() {
     this.getList();
+    this.getProjectList();
   },
   methods: {
     /** 查询物料列表 */
@@ -397,6 +411,14 @@ export default {
         this.total = res.data.total;
       })
     },
+    getProjectList() {
+      listProject({type: '2'}).then(res => {
+        this.projectList = res.data
+      })
+    },
+    selectableHandler(row, index) {
+      return row.num > row.receivedNum
+    },
     // 取消按钮
     cancel() {
       this.open = false;
@@ -452,6 +474,7 @@ export default {
         item.id = undefined
         return item
       })
+      console.log(this.addList);
     },
 
     handleSizeChange(val) {
@@ -506,6 +529,8 @@ export default {
         factory: undefined,
         unit: undefined,
         num: 0,
+        price: 0,
+        projectId: undefined,
         materialType: undefined,
         monthOrWeek: '1',
         remark: undefined
@@ -539,6 +564,8 @@ export default {
             factory: undefined,
             unit: undefined,
             num: 0,
+            price: 0,
+            projectId: undefined,
             materialType: undefined,
             monthOrWeek: '1',
             remark: undefined