no message

src/views/mallManagement/purchaseScheduleManagement/purchasePlanAdjustment/mixins/common_form.js

@@ -1,6 +1,6 @@
 import { required, diyRequired } from '@/components/template/rules_verify.js'
 import { listPageV2 } from '@/api/auxiliaryFittings/supplier'
-import { goodsPlanList, goodsAdjustPlanDetail } from '@/api/purchaseSchedule.js'
+import { goodsPlanList, goodsPlanDetail } from '@/api/purchaseSchedule.js'
 import ImageUpload from '@/components/file-upload'
 
 export default {
@@ -74,7 +74,7 @@ export default {
                             this.formData.venderId = val
                           }}
                           placeholder="请选择"
-                          disabled={!!~['WAIT', 'OK', 'FAIL'].indexOf(this.formData.status)}
+                          disabled={!~[0, 1].indexOf(this.formDialogType)}
                           onChange={val => {
                             if (val) {
                               this.formData['venderName'] = this.gysList.find(item => item.venderId == val).venderName
@@ -115,11 +115,11 @@ export default {
                             this.formData.goodsPlanId = val
                           }}
                           placeholder="请选择"
-                          disabled={!!~['WAIT', 'OK', 'FAIL'].indexOf(this.formData.status)}
+                          disabled={!~[0, 1].indexOf(this.formDialogType)}
                           onChange={val => {
                             this.formData.items = []
                             if (val) {
-                              goodsAdjustPlanDetail({ id: val }).then(res => {
+                              goodsPlanDetail({ id: val }).then(res => {
                                 this.formData.items = res.data.items.map(item => ({
                                   adjustQty: '',
                                   amount: item.amount,
@@ -197,7 +197,7 @@ export default {
                       maxlength="200"
                       show-word-limit
                       autosize={{ minRows: 2, maxRows: 4 }}
-                      disabled={!!~['WAIT', 'OK', 'FAIL'].indexOf(this.formData.status)}
+                      disabled={!~[0, 1].indexOf(this.formDialogType)}
                     ></el-input>
                   </el-descriptions-item>
                 </el-descriptions>

src/views/mallManagement/purchaseScheduleManagement/purchasePlanAdjustment/mixins/storage_goods.js

@@ -9,7 +9,8 @@ export default {
     return {
       brandList: [],
       ClassifyList: [],
-      goodsMaterialList: []
+      goodsMaterialList: [],
+      isEditIndex: -1
     }
   },
   computed: {
@@ -23,7 +24,7 @@ export default {
             width: 160
           },
           render: (h, { row, column, index }) => {
-            return this.isEditIndex == index ? (
+            return this.isEditIndex == index && !!~[0, 1].indexOf(this.formDialogType) ? (
               <div class="redbordererr">
                 <el-form-item
                   label=""
@@ -74,7 +75,7 @@ export default {
             width: 160
           },
           render: (h, { row, column, index }) => {
-            return this.isEditIndex == index ? (
+            return this.isEditIndex == index && !!~[0, 1].indexOf(this.formDialogType) ? (
               <div class="redbordererr">
                 <el-form-item
                   label=""
@@ -127,7 +128,7 @@ export default {
             width: 160
           },
           render: (h, { row, column, index }) => {
-            return this.isEditIndex == index ? (
+            return this.isEditIndex == index && !!~[0, 1].indexOf(this.formDialogType) ? (
               <div class="redbordererr">
                 <el-form-item
                   label=""
@@ -182,7 +183,7 @@ export default {
             width: 160
           },
           render: (h, { row, column, index }) => {
-            return this.isEditIndex == index ? (
+            return this.isEditIndex == index && !!~[0, 1].indexOf(this.formDialogType) ? (
               <div class="redbordererr">
                 <el-form-item
                   label=""
@@ -293,7 +294,7 @@ export default {
             width: 160
           },
           render: (h, { row, column, index }) => {
-            return this.isEditIndex == index ? (
+            return this.isEditIndex == index && !!~[0, 1].indexOf(this.formDialogType) ? (
               <div class="redbordererr">
                 <el-form-item
                   label=""
@@ -337,7 +338,7 @@ export default {
           }
         },
         ...(() => {
-          if (this.formDialogType < 2 && !~['WAIT', 'OK', 'FAIL'].indexOf(this.formData.status)) {
+          if (!!~[0, 1].indexOf(this.formDialogType)) {
             return [
               {
                 columnAttributes: {
@@ -366,7 +367,7 @@ export default {
                             保存
                           </el-button>
                         ) : null,
-                        this.isEditIndex == -1 && this.formDialogType == 0 ? (
+                        this.isEditIndex == -1 ? (
                           <el-button
                             type="text"
                             onClick={() => {
@@ -376,16 +377,14 @@ export default {
                             编辑
                           </el-button>
                         ) : null,
-                        this.formDialogType == 0 ? (
-                          <el-button
-                            type="text"
-                            onClick={() => {
-                              this.delGoodsInfo(row, index)
-                            }}
-                          >
-                            删除
-                          </el-button>
-                        ) : null
+                        <el-button
+                          type="text"
+                          onClick={() => {
+                            this.delGoodsInfo(row, index)
+                          }}
+                        >
+                          删除
+                        </el-button>
                       ]}
                     </div>
                   )
@@ -490,6 +489,18 @@ export default {
         this.$message.warning('重复')
         return false
       }
+
+      try {
+        this.formData.items.map((item, index) => {
+          if (!item.adjustQty || item.adjustQty == 0) {
+            throw new Error('')
+          }
+        })
+      } catch (error) {
+        this.$message.warning('新采购数量全部必填')
+        return false
+      }
+
       return true
     },
     // 添加商品信息

src/views/mallManagement/purchaseScheduleManagement/purchasePlanAdjustment/mixins/storage_table.js

@@ -20,23 +20,14 @@ export default {
             var { value } = props
             return (
               <div>
-                {[
-                  !!~[0, 1].indexOf(this.formDialogType) ? (
-                    <div style="margin-bottom:10px">
-                      <el-button type="primary" onClick={this.addGoodsInfo}>
-                        添加
-                      </el-button>
-                    </div>
-                  ) : null,
-                  <zj-table
-                    columns={this.storage_goods}
-                    tableData={this.formData.items}
-                    tableAttributes={{
-                      size: 'mini',
-                      border: true
-                    }}
-                  />
-                ]}
+                <zj-table
+                  columns={this.storage_goods}
+                  tableData={this.formData.items}
+                  tableAttributes={{
+                    size: 'mini',
+                    border: true
+                  }}
+                />
               </div>
             )
           }

src/views/mallManagement/purchaseScheduleManagement/purchaseSchedule/mixins/storage_goods.js

@@ -24,7 +24,7 @@ export default {
             width: 160
           },
           render: (h, { row, column, index }) => {
-            return this.isEditIndex == index ? (
+            return this.isEditIndex == index && !!~[0, 1].indexOf(this.formDialogType) ? (
               <div class="redbordererr">
                 <el-form-item
                   label=""
@@ -74,7 +74,7 @@ export default {
             width: 160
           },
           render: (h, { row, column, index }) => {
-            return this.isEditIndex == index ? (
+            return this.isEditIndex == index && !!~[0, 1].indexOf(this.formDialogType) ? (
               <div class="redbordererr">
                 <el-form-item
                   label=""
@@ -126,7 +126,7 @@ export default {
             width: 160
           },
           render: (h, { row, column, index }) => {
-            return this.isEditIndex == index ? (
+            return this.isEditIndex == index && !!~[0, 1].indexOf(this.formDialogType) ? (
               <div class="redbordererr">
                 <el-form-item
                   label=""
@@ -180,7 +180,7 @@ export default {
             width: 160
           },
           render: (h, { row, column, index }) => {
-            return this.isEditIndex == index ? (
+            return this.isEditIndex == index && !!~[0, 1].indexOf(this.formDialogType) ? (
               <div class="redbordererr">
                 <el-form-item
                   label=""
@@ -283,7 +283,7 @@ export default {
             width: 160
           },
           render: (h, { row, column, index }) => {
-            return this.isEditIndex == index ? (
+            return this.isEditIndex == index && !!~[0, 1].indexOf(this.formDialogType) ? (
               <div class="redbordererr">
                 <el-form-item
                   label=""
@@ -370,7 +370,7 @@ export default {
             width: 160
           },
           render: (h, { row, column, index }) => {
-            return this.isEditIndex == index ? (
+            return this.isEditIndex == index && !!~[0, 1].indexOf(this.formDialogType) ? (
               <div class="redbordererr">
                 <el-form-item
                   label=""