问题修改

src/views/firstOrder/components/consumableDialog.vue

@@ -27,6 +27,7 @@ export default {
             type: String,
             default: ''
         },
+        tableData: { type: Array, default: () => [] },
     },
     data() {
         return {
@@ -175,6 +176,7 @@ export default {
     },
     mounted() {
         this.consumableVisible = this.consumableVisible
+        this.allSelectedList = this.tableData
     },
     methods: {
         async handleLog(row) {

src/views/firstOrder/components/inDialog.vue

@@ -25,12 +25,12 @@
               :span="12"
               v-show="sizeForm.options == 1 && inDialogType != 'add'"
             >
-              <el-form-item label="入库单号">
+              <el-form-item label="入库单号：" >
                 <el-input v-model="sizeForm.orderNo" disabled></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="入库时间">
+              <el-form-item label="入库时间：">
                 <el-date-picker
                   v-model="sizeForm.inDate"
                   format="yyyy-MM-dd"
@@ -44,7 +44,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="事由">
+              <el-form-item label="事由：" required>
                 <el-input
                   v-model="sizeForm.reason"
                   :disabled="inDialogType == 'details'"
@@ -52,7 +52,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="物资类型">
+              <el-form-item label="物资类型：" required>
                 <el-select
                   v-model="sizeForm.materialType"
                   placeholder="请选择"
@@ -65,7 +65,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item prop="source" label="来源">
+              <el-form-item prop="source" label="来源：" required>
                 <el-select
                   v-model="sizeForm.source"
                   placeholder="请选择"
@@ -78,7 +78,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="选项">
+              <el-form-item label="选项：" required>
                 <el-radio-group
                   v-model="sizeForm.option"
                   @change="radioChange()"
@@ -90,7 +90,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="12" v-if="sizeForm.option == 1">
-              <el-form-item label="采购单名称">
+              <el-form-item label="采购单名称：">
                 <el-input v-model="sizeForm.quarterName" disabled></el-input>
               </el-form-item>
             </el-col>
@@ -829,9 +829,10 @@ export default {
             return;
           }
           if (
-            row.theInboundQuantity + row.yetInboundQuantity >
+            row.theInboundQuantity>0&&
+           ( row.theInboundQuantity + row.yetInboundQuantity >
               row.requiredQuantity &&
-            !row.remark
+            !row.remark)
           ) {
             this.$message.warning(
               row.materialName +

src/views/materials/expend.vue

@@ -191,6 +191,12 @@ export default {
             headerAlign: "center",
             align: "center",
           },
+          {
+            label: "使用人",
+            prop: "proposerName",
+            headerAlign: "center",
+            align: "center",
+          },
           {
             label: "归还时间",
             prop: "returnTime",