Merge branch 'master' of http://42.192.7.176:3000/suojin/smartpark_durable_front

src/views/firstOrder/components/inDialog.vue

@@ -61,7 +61,7 @@
             v-if="!allDisabled && sizeForm.option == 2">新增</el-button>
           <!-- 批量选择 -->
           <el-table :data="sizeForm.inTableData" border style="width: 100%" v-show="sizeForm.option == 1">
-            <el-table-column prop="inboundDetailCode" label="入库明细单号">
+            <el-table-column prop="inboundDetailCode" label="入库明细单号" v-if="inDialogType == 'details'">
             </el-table-column>
             <el-table-column prop="materialCode" label="物资编码">
             </el-table-column>
@@ -109,10 +109,16 @@
 
               </template>
             </el-table-column>
+             <el-table-column prop="remark" label="备注">
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.remark" placeholder="请输入备注" v-if='inDialogType != "details"'></el-input>
+                <span v-else>{{ scope.row.remark }}</span>
+              </template>
+            </el-table-column>
           </el-table>
           <!-- 单项选择 -->
           <el-table :data="sizeForm.singleData" border style="width: 100%" v-show="sizeForm.option == 2" align="center">
-            <el-table-column prop="inboundDetailCode" label="入库明细单号">
+            <el-table-column prop="inboundDetailCode" label="入库明细单号" v-if="inDialogType == 'details'">
             </el-table-column>
             <el-table-column prop="materialCode" label="物资编码"></el-table-column>
             <el-table-column prop="materialName" label="物资名称">
@@ -168,7 +174,7 @@
           <el-table :data="sizeForm.inTableData" border style="width: 100%"
             v-show="sizeForm.option == 1 && inDialogType !== 'details'">
             <el-table-column prop="date" label="当前库存">
-              <el-table-column prop="inboundDetailCode" label="入库明细单号">
+              <el-table-column prop="inboundDetailCode" label="入库明细单号" v-if="inDialogType == 'details'">
               </el-table-column>
               <el-table-column prop="materialCode" label="物资编码">
               </el-table-column>
@@ -238,7 +244,7 @@
           <el-table :data="sizeForm.singleData" border style="width: 100%"
             v-show="sizeForm.option == 2 && inDialogType !== 'details'">
             <el-table-column prop="date" label="当前库存">
-              <el-table-column prop="inboundDetailCode" label="入库明细单号">
+              <el-table-column prop="inboundDetailCode" label="入库明细单号" v-if="inDialogType == 'details'">
               </el-table-column>
               <el-table-column prop="materialCode" label="物资编码">
               </el-table-column>
@@ -372,7 +378,7 @@ export default {
       batchType: '',//批量选择类型
       materialsType: '',
       allDisabled: false,
-      
+
     }
   },
   computed: {
@@ -517,6 +523,9 @@ export default {
       const res = await getPurchasesByIds(this.batchType);
       if (res.data.success) {
         this.sizeForm.inTableData = res.data.result;
+        this.sizeForm.inTableData.forEach(item => {
+          item.theInboundQuantity = 0
+        })
         this.$message.success("数据获取成功");
         this.inBatchDialogVisible = false;
       } else {
@@ -571,7 +580,7 @@ export default {
         this.$message.error("请选择来源");
         return;
       }
-      if (this.sizeForm.option === 1) {
+      if (this.sizeForm.option === 1) {//批量选择
         if (!this.sizeForm.quarterName) {
           this.$message.error("请选择采购单名称");
           return;
@@ -596,7 +605,7 @@ export default {
               return;
             }
           }
-          if (!row.theInboundQuantity || row.theInboundQuantity < 0) {
+          if ( row.theInboundQuantity < 0) {
             this.$message.error("本次入库数量不能为空");
             return;
           }
@@ -604,6 +613,11 @@ export default {
             this.$message.error("请选择类别");
             return;
           }
+         if ((row.theInboundQuantity+ row.inboundQuantity > row.requiredQuantity)&& !row.remark ) {
+
+            this.$message.error(row.materialName + "本次入库数量不能大于采购单计划数量,请填写备注原因");
+            return;
+          }
         }
       }
       // 单项选择验证
@@ -718,7 +732,7 @@ export default {
 }
 
 ::v-deep.dialog-content {
-  max-height: calc(100vh - 200px); 
+  max-height: calc(100vh - 200px);
   overflow-y: auto;
   padding-right: 10px;
 }