xiaodai2022 2 jaren geleden
bovenliggende
commit
47f43646ff

+ 19 - 11
src/views/orderEntry/orderEnter/index.vue

@@ -105,10 +105,7 @@
                   :span="2"
                   class="fr"
                   style="width: 90px"
-                  v-if="
-                    powers.some((item) => item == '006') &&
-                    parmValue.status === '2'
-                  "
+                  v-if="powers.some((item) => item == '006')"
                 >
                   <el-button
                     size="mini"
@@ -421,15 +418,26 @@ export default {
     },
     //点击批量删除按钮
     batchDel() {
-      let ids = [];
-      if (this.changeList.length != 0) {
-        this.changeList.forEach((item) => {
-          ids.push(item.id);
-        });
-        this.deleteItem(ids);
-      } else {
+      if (this.changeList.length === 0) {
         this.$message.warning(`请勾选有效数据后在进行删除`);
+        return;
+      }
+      let isok = true,
+        ids = [];
+      this.changeList.forEach((item) => {
+        if (item.status != "2") {
+          isok = false;
+        } else if (item.status != "4") {
+          isok = false;
+        } else {
+          ids.push(item.id);
+        }
+      });
+      if (!isok) {
+        this.$message.warning(`只能删除待确认和库存不足的订单!`);
+        return;
       }
+      this.deleteItem(ids);
     },
     //删除
     async deleteItem(ids) {

+ 9 - 3
src/views/purchaseIn/wsmInOrder/components/wsm-in-order-model.vue

@@ -21,7 +21,7 @@
             :model="ruleForm"
             :rules="rulesThis"
             status-icon
-            :size="'small'"
+            :size="'mini'"
             ref="ruleForm"
             label-width="85px"
             class="demo-ruleForm"
@@ -32,10 +32,12 @@
                   label="可入库总数"
                   prop="wsend_num"
                   required
+                  
                   label-width="95px"
                 >
                   <el-input
                     disabled
+                    :size="'mini'"
                     placeholder="可入库总数"
                     v-model="ruleForm.wsend_num"
                     maxlength="100"
@@ -53,7 +55,7 @@
                     :max="ruleForm.wsend_num"
                     :position="'right'"
                     :precision="0"
-                    :size="'small'"
+                    :size="'mini'"
                     :controls="false"
                     :append="''"
                     @reschange="number_change($event, 'send_num')"
@@ -65,6 +67,7 @@
                   <el-select
                     v-model="ruleForm.sendtype"
                     style="width: 100%"
+                    :size="'mini'"
                     :disabled="
                       (sitem && sitem.order_type === '3') ||
                       (sitem && sitem.order_type === '4')
@@ -92,7 +95,7 @@
                     :max="100000000000"
                     :position="'right'"
                     :precision="2"
-                    :size="'small'"
+                    :size="'mini'"
                     :controls="false"
                     :append="'元'"
                     @reschange="number_change($event, 'post_fee')"
@@ -105,6 +108,7 @@
                     :value="ruleForm.post_company"
                     :placeholder="'物流公司'"
                     :names="''"
+                    :size="'mini'"
                     :is-detail="false"
                     @searchChange="handleCompany"
                   />
@@ -114,6 +118,7 @@
                 <el-form-item label="物流单号" prop="post_code">
                   <el-input
                     placeholder="物流单号"
+                    :size="'mini'"
                     v-model="ruleForm.post_code"
                     maxlength="100"
                   />
@@ -126,6 +131,7 @@
                     v-model="ruleForm.post_time"
                     type="datetime"
                     style="width: 100%"
+                    :size="'mini'"
                     value-format="yyyy-MM-dd HH:mm:ss"
                     placeholder="发货时间"
                     :picker-options="pickerOptions"