qukaidi hace 4 años
padre
commit
3eaa0fe4be

+ 0 - 1
src/views/Warehousing/inStock/AddOrUpdate.vue

@@ -3329,7 +3329,6 @@ export default {
         fBusinessType: [{ required: true, message: " ", trigger: "blur" }],
         fMarks: [{ required: true, message: " ", trigger: "blur" }],
         fPackagespecs: [{ required: true, message: " ", trigger: "blur" }],
-        fTruckno: [{ required: true, message: " ", trigger: "blur" }],
       },
       browseStatus: false,
       goodsOptions: [],

+ 4 - 8
src/views/Warehousing/inStock/uploadExcel.vue

@@ -2,9 +2,10 @@
   <el-dialog
     title="提示"
     :visible.sync="uploadVisible"
-    width="70%"
+    width="85%"
     :close-on-click-modal="false"
     @close="handleClose"
+    v-dialogDrag
   >
     <span>
       <div style="display: flex; justify-content: space-between">
@@ -19,7 +20,7 @@
             }
           "
         >
-          <el-button size="small" type="primary">上传Excel</el-button>
+          <el-button size="small" type="primary">导入Excel</el-button>
         </el-upload>
         <div style="margin: 0 10px">
           <el-button
@@ -235,7 +236,7 @@
     </span>
     <span slot="footer" class="dialog-footer">
       <el-button @click="uploadVisible = false">取 消</el-button>
-      <el-button type="primary" @click="importData">导 入</el-button>
+      <el-button type="primary" @click="importData">确 定</el-button>
     </span>
     <el-dialog
       title="选择库位"
@@ -552,11 +553,6 @@ export default {
             "请输入第" + (Number(item) + 1) + "行的箱号"
           );
         }
-        if (this.excelList[item].fTruckno == null) {
-          return this.$message.error(
-            "请输入第" + (Number(item) + 1) + "行的车号"
-          );
-        }
       }
       this.$emit("adddetailList", this.excelList);
       this.uploadVisible = false;