Bläddra i källkod

删除多余内容

chenrui 4 år sedan
förälder
incheckning
20b59e8a5b

+ 3 - 16
src/views/allocationManagement/chainTransferOut/edit.vue

@@ -105,7 +105,7 @@
             </template>
             <!-- 操作 -->
             <template slot="action" slot-scope="text, record">
-              <a-button size="small" type="link" @click="handleAdd(record)" id="chainTransferOutEdit-add-btn">添加</a-button>
+              <a-button size="small" type="primary" class="button-primary" @click="handleAdd(record)" id="chainTransferOutEdit-add-btn">添加</a-button>
             </template>
           </a-table>
         </a-collapse-panel>
@@ -160,7 +160,7 @@
             bordered>
             <!-- 操作 -->
             <template slot="action" slot-scope="text, record">
-              <a-button size="small" type="link" @click="handleDel(record)" id="chainTransferOutEdit-del-btn">删除</a-button>
+              <a-button size="small" type="primary" class="button-error" @click="handleDel(record)" id="chainTransferOutEdit-del-btn">删除</a-button>
             </template>
           </s-table>
         </a-collapse-panel>
@@ -177,21 +177,18 @@
           style="padding: 0 60px;">提交</a-button>
       </div>
     </a-affix>
-    <!-- 选择基本信息弹框 -->
-    <basic-info-modal :openModal="openModal" @ok="handleOk" @close="openModal=false" />
   </div>
 </template>
 
 <script>
 import { STable, VSelect } from '@/components'
-import basicInfoModal from './basicInfoModal.vue'
 import { allocLinkageOutDetailSn, allocLinkageOutDetailList } from '@/api/allocLinkageOut'
 import { productQuery } from '@/api/allocWarehouse'
 import { dealerProductBrandQuery } from '@/api/dealerProductBrand'
 import { dealerProductTypeList } from '@/api/dealerProductType'
 import { warehouseAllList } from '@/api/warehouse'
 export default {
-  components: { STable, VSelect, basicInfoModal },
+  components: { STable, VSelect },
   data () {
     return {
       queryParam: {
@@ -267,7 +264,6 @@ export default {
           return data
         })
       },
-      openModal: false, // 选择基本信息弹框是否显示
       basicInfoData: null, //  基本信息
       productTotal: null //  合计
     }
@@ -297,14 +293,6 @@ export default {
     handleAdd (row) {},
     //  删除
     handleDel (row) {},
-    //  编辑基本信息
-    handleEditInfo () {
-      this.openModal = true
-    },
-    //  基本信息  保存
-    handleOk () {
-
-    },
     //  提交
     handleSubmit () {},
     //  导入明细
@@ -391,7 +379,6 @@ export default {
   },
   beforeRouteEnter (to, from, next) {
     next(vm => {
-      vm.openModal = false
       vm.getDetail()
       vm.getProductList(1)
       vm.getWarehouseList()

+ 1 - 13
src/views/allocationManagement/storeTransferOut/edit.vue

@@ -5,7 +5,6 @@
       <template slot="subTitle">
         <a id="storeTransferOutEdit-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
         <span style="margin: 0 15px;color: #666;">调往对象名称:{{ (basicInfoData&&basicInfoData.putPersonName) || '--' }}</span>
-        <!-- <a-button id="storeTransferOutEdit-edit-btn" size="small" @click="handleEditInfo" style="margin-left:10px" key="0">编辑</a-button> -->
       </template>
       <!-- 操作区,位于 title 行的行尾 -->
       <template slot="extra">
@@ -175,14 +174,11 @@
           style="padding: 0 60px;">提交</a-button>
       </div>
     </a-affix>
-    <!-- 选择基本信息弹框 -->
-    <basic-info-modal :openModal="openModal" @ok="handleOk" @close="openModal=false" />
   </div>
 </template>
 
 <script>
 import { STable, VSelect } from '@/components'
-import basicInfoModal from './basicInfoModal.vue'
 import { getOperationalPrecision } from '@/libs/tools.js'
 import { storeCallOutDetailList, storeCallOutDetail, storeCallOutDetailCount, storeCallOutDetailSave, storeCallOutDetailDel, storeCallOutSubmit } from '@/api/storeCallOut'
 import { dealerProductBrandQuery } from '@/api/dealerProductBrand'
@@ -190,7 +186,7 @@ import { dealerProductTypeList } from '@/api/dealerProductType'
 import { warehouseAllList } from '@/api/warehouse'
 import { productQuery } from '@/api/allocWarehouse'
 export default {
-  components: { STable, VSelect, basicInfoModal },
+  components: { STable, VSelect },
   data () {
     return {
       queryParam: {
@@ -261,7 +257,6 @@ export default {
         onShowSizeChange: (current, pageSize) => this.changeChoosePageSize(current, pageSize),
         onChange: (current) => this.changeChoosePage(current)
       },
-      openModal: false, // 选择基本信息弹框是否显示
       basicInfoData: null, //  基本信息
       productTotal: null //  合计
     }
@@ -364,12 +359,6 @@ export default {
         }
       })
     },
-    //  编辑基本信息
-    handleEditInfo () {
-      this.openModal = true
-    },
-    //  基本信息  保存
-    handleOk () {},
     //  提交
     handleSubmit () {
       const _this = this
@@ -495,7 +484,6 @@ export default {
   },
   beforeRouteEnter (to, from, next) {
     next(vm => {
-      vm.openModal = false
       vm.getDetail()
       vm.getChooseProductList(1)
       vm.getWarehouseList()

+ 2 - 17
src/views/allocationManagement/warehouseAllocation/edit.vue

@@ -6,7 +6,6 @@
         <a id="warehouseAllocationEdit-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
         <span style="margin: 0 15px;color: #666;">调出仓库:{{ (warehouse&&warehouse.outWarehouseName) || '--' }}</span>
         <span style="margin: 0 15px;color: #666;">调入仓库:{{ (warehouse&&warehouse.putWarehouseName) || '--' }}</span>
-        <!-- <a-button id="warehouseAllocationEdit-edit-btn" size="small" @click="handleEditInfo" style="margin-left:10px" key="0">编辑</a-button> -->
       </template>
       <!-- 操作区,位于 title 行的行尾 -->
       <template slot="extra">
@@ -291,20 +290,17 @@
           style="padding: 0 60px;">提交</a-button>
       </div>
     </a-affix>
-    <!-- 选择基本信息弹框 -->
-    <basic-info-modal :openModal="openModal" @ok="handleOk" @close="openModal=false" />
   </div>
 </template>
 
 <script>
 import { STable, VSelect } from '@/components'
-import basicInfoModal from './basicInfoModal.vue'
 import { dealerProductBrandQuery } from '@/api/dealerProductBrand.js'
 import { dealerProductTypeList } from '@/api/dealerProductType.js'
 import { warehouseLocAllList } from '@/api/warehouse.js'
 import { productQuery, allocWarehouseFind, allocWarehouseDetailTotal, allocWarehouseDetailQuery, allocWarehouseDetailSave, allocWarehouseDetailDelete, allocWarehouseSubmit } from '@/api/allocWarehouse.js'
 export default {
-  components: { STable, VSelect, basicInfoModal },
+  components: { STable, VSelect },
   data () {
     return {
       typeName: [], // 分类
@@ -386,8 +382,7 @@ export default {
           this.disabled = false
           return data
         })
-      },
-      openModal: false // 选择基本信息弹框是否显示
+      }
     }
   },
   methods: {
@@ -559,14 +554,6 @@ export default {
           })
         }
       })
-    },
-    //  编辑基本信息
-    handleEditInfo () {
-      this.openModal = true
-    },
-    //  基本信息  保存
-    handleOk () {
-
     },
     //  提交
     handleSubmit () {
@@ -596,12 +583,10 @@ export default {
   },
   beforeRouteEnter (to, from, next) {
     next(vm => {
-      vm.openModal = false
       vm.pageInit()
       vm.getProductBrand()
       vm.getProductType()
       vm.getHouse()
-      console.log(vm.id, vm.$route.params, 'vm.id')
     })
   }
 }