批量删除功能增加，导入规则优化

src/views/orderEntry/orderEnter/index.vue

@@ -35,7 +35,7 @@
               style="padding-left: 80px"
             >
               <el-row :gutter="10">
-                <el-col :span="8" style="width: 361px">
+                <el-col :span="7" style="width: 361px">
                   <el-form-item>
                     <periodDatePickerActive
                       :start="parmValue.platform_time_start"
@@ -47,7 +47,7 @@
                     />
                   </el-form-item>
                 </el-col>
-                <el-col :span="4" style="width: 160px">
+                <el-col :span="4" style="width: 150px">
                   <el-form-item prop="status">
                     <el-select
                       @change="
@@ -69,7 +69,7 @@
                     </el-select>
                   </el-form-item>
                 </el-col>
-                <el-col :span="6" style="width: 160px">
+                <el-col :span="6" style="width: 150px; margin-right: auto">
                   <el-form-item prop="platform_code">
                     <el-input
                       v-model="parmValue.platform_code"
@@ -83,30 +83,40 @@
                   </el-form-item>
                 </el-col>
 
+                
+                 <el-col :span="2" class="fr" style="width: 90px;" v-if="
+                      powers &&
+                      powers.length > 0 &&
+                      powers.some((item) => item == '086')
+                    ">
+                  <el-button
+                    class="btn entry"
+                    @click="entry"
+                    size="mini"
+                    type="success"
+                    
+                    >订单导入</el-button
+                  >
+                </el-col>
                 <el-col
                   :span="2"
                   class="fr"
-                  style="width: 132px; margin-left: auto"
+                  style="width: 90px;"
+                  v-if="powers.some((item) => item == '006')&&parmValue.status==='2'"
                 >
                   <el-button
-                    v-if="
-                      powers &&
-                      powers.length > 0 &&
-                      powers.some((item) => item == '085')
-                    "
+                     
                     size="mini"
-                    type="primary"
-                    icon="el-icon-search"
+                    type="danger"
                     class="btn"
-                    @click="selectStock"
-                    >批量关联库存</el-button
+                    @click="batchDel"
+                    >批量删除</el-button
                   >
                 </el-col>
-                <el-col :span="2" class="fr" style="width: 66px">
+                <el-col :span="2" class="fr" style="width: 50px">
                   <el-button
                     size="mini"
                     type="primary"
-                    icon="el-icon-refresh-right"
                     class="btn"
                     @click="resetF5"
                     >刷新</el-button
@@ -128,7 +138,7 @@
                     />
                   </el-form-item>
                 </el-col>
-                <el-col :span="4" style="width: 160px">
+                <el-col :span="4" style="width: 145px">
                   <el-form-item prop="po_code">
                     <el-input
                       v-model="parmValue.po_code"
@@ -141,7 +151,7 @@
                     ></el-input>
                   </el-form-item>
                 </el-col>
-                <el-col :span="6" style="width: 160px">
+                <el-col :span="6" style="width: 145px; margin-right: auto">
                   <el-form-item prop="plat_code">
                     <el-input
                       v-model="parmValue.plat_code"
@@ -158,15 +168,16 @@
                 <el-col
                   :span="2"
                   class="fr"
-                  style="width: 132px; margin-left: auto"
-                >
-                  <el-button
-                    type="primary"
-                    v-if="
+                  style="width: 132px;"
+                  v-if="
                       powers &&
                       powers.length > 0 &&
                       powers.some((item) => item == '013')
                     "
+                >
+                  <el-button
+                    type="primary"
+                    
                     icon="el-icon-download"
                     class="btn"
                     size="mini"
@@ -175,25 +186,30 @@
                     ></el-button
                   >
                 </el-col>
-
-                <el-col :span="2" class="fr" style="width: 90px">
-                  <el-button
-                    class="btn entry"
-                    @click="entry"
-                    size="mini"
-                    type="success"
-                    v-if="
+                <el-col
+                  :span="2"
+                  class="fr"
+                  style="width: 132px; "
+                   v-if="
                       powers &&
                       powers.length > 0 &&
-                      powers.some((item) => item == '086')
+                      powers.some((item) => item == '085')
                     "
-                    >订单导入</el-button
+                >
+                  <el-button
+                   
+                    size="mini"
+                    type="primary"
+                    icon="el-icon-search"
+                    class="btn"
+                    @click="selectStock"
+                    >批量关联库存</el-button
                   >
                 </el-col>
-                <el-col :span="2" class="fr" style="width: 66px">
+               
+                <el-col :span="2" class="fr" style="width: 50px">
                   <el-button
                     type="warning"
-                    icon="el-icon-refresh-right"
                     class="btn"
                     @click="reset"
                     size="mini"
@@ -398,6 +414,10 @@ export default {
       }
       this.loading = false;
     },
+    //点击批量删除按钮
+    batchDel(){
+      console.log(this.changeList)
+    },
     //删除
     async deleteItem(ids) {
       await this.$confirm("确定要删除？", {

src/views/orderEntry/orderImport/index.vue

@@ -128,32 +128,9 @@ export default {
       try {
         list.forEach((v1, index) => {
           let b = Object.values(v1);
-          let numFlag = false;
-          if (b[5] == 0 || b[6] == 0) {
-            this.$message.warning(
-              `excel表格第${index + 1}行，单价,数量的值不能为0`
-            );
-            numFlag = true;
-            throw Error();
-          }
-
-          if (!isNaN(b[5]) && !isNaN(b[6]) && !isNaN(b[7])) {
-          } else {
-            this.$message.warning(
-              `excel表格第${index + 1}行，单价,数量，总金额必须是数字`
-            );
-            numFlag = true;
-            throw Error();
-          }
-
-          if (!Number.isInteger(Number(b[6]))) {
-            this.$message.warning(`excel表格第${index + 1}行,数量必须是整数`);
-            numFlag = true;
-            throw Error();
-          }
-          //   if (numFlag) {
-          //   return;
-          // }
+          // let numFlag = false;
+          
+          
           // let item = this.get_code(b[3], b[4], b[5]);
           let model = {
             platform_code: b[0] + "",
@@ -248,24 +225,53 @@ export default {
       ];
       let flag = true;
       let platform_code_arr = [];
-      model.list.forEach((item, index) => {
+      try{
+        model.list.forEach((item, index) => {
         platform_code_arr.push(item.platform_code);
         //必填判断
         if (flag) {
         } else {
-          return;
+          throw Error();
         }
+        
+
+        if (item.price == 0 || item.num == 0) {
+            this.$message.warning(
+              `表格第${index + 1}行，单价,数量的值不能为0`
+            );
+            flag = false;
+            throw Error();
+          }
+
+          if (!isNaN(item.price) && !isNaN(item.num) && !isNaN(item.before_discount_all_price)) {
+          } else {
+            this.$message.warning(
+              `表格第${index + 1}行，单价,数量，总金额必须是数字`
+            );
+            flag = false;
+            throw Error();
+          }
+
+          if (!Number.isInteger(Number(item.num))) {
+            this.$message.warning(`表格第${index + 1}行,数量必须是整数`);
+            flag = false;
+            throw Error();
+          }
+
         for (let i = 0; i < obj.length; i++) {
           let txt = item[obj[i].str].trim();
           if (txt == "") {
             this.$message.warning(`第${index + 1}行的${obj[i].name}不能为空`);
             flag = false;
-            break;
+            throw Error();
           } else {
             flag = true;
           }
-        }
+        }   
       });
+      }catch{
+
+      }
 
       //去重锁
       if (