chenrui 4 rokov pred
rodič
commit
adcebd6a7b

+ 3 - 1
src/views/allocationManagement/warehouseAllocation/edit.vue

@@ -355,6 +355,7 @@ export default {
       allocWarehouseDetail({ id: this.$route.params.id }).then(res => {
         if (res.status == 200) {
           this.basicInfoData = res.data
+          this.getProductList(1)
           this.getWarehouseLoc(res.data.putWarehouseSn, 'put')
           this.getWarehouseLoc(res.data.outWarehouseSn, 'out')
         } else {
@@ -463,6 +464,7 @@ export default {
       this.pageNo = pageNo || this.pageNo
       const params = Object.assign({ pageNo: this.pageNo, pageSize: this.pageSize }, this.queryParam)
       params.enabledFlag = 1
+      params.warehouseSn = this.basicInfoData.outWarehouseSn
       productQuery(params).then(res => {
         if (res.status == 200) {
           const data = res.data
@@ -592,7 +594,7 @@ export default {
   beforeRouteEnter (to, from, next) {
     next(vm => {
       vm.getDetail()
-      vm.getProductList(1)
+      // vm.getProductList(1)
       vm.getChooseProductList(1)
       vm.getProductBrand()
       vm.getProductType()

+ 0 - 6
src/views/financialManagement/expenseManagement/edit.vue

@@ -20,7 +20,6 @@
         <a-form-model-item label="费用类型" prop="costType">
           <a-cascader
             @change="changeCostType"
-            change-on-select
             v-model="form.costType"
             expand-trigger="hover"
             :options="costTypeList"
@@ -133,7 +132,6 @@ export default {
     },
     //  费用类型  change
     changeCostType (val, opt) {
-      console.log(val, opt)
       this.form.expensesTypeSn1 = val[0] ? val[0] : ''
       this.form.expensesTypeSn2 = val[1] ? val[1] : ''
       this.form.expensesTypeSn3 = val[2] ? val[2] : ''
@@ -158,10 +156,6 @@ export default {
       const _this = this
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
-          // if (!this.form.expensesTypeSn3) {
-          //   this.$message.warning('费用类型未选到第三级,请修改后再提交!')
-          //   return
-          // }
           if (this.form.settleAmount <= 0) {
             this.$message.warning('费用金额必须大于0!')
             return

+ 3 - 5
src/views/purchasingManagement/purchaseOrder/warehousing.vue

@@ -100,7 +100,6 @@ export default {
       chooseLoadData: [],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
-        console.log(parameter)
         this.disabled = true
         this.queryParam.receivingBillSn = parameter.tableId
         return receivingDetail(Object.assign(parameter, this.queryParam)).then(res => {
@@ -152,7 +151,6 @@ export default {
     //  确认入库
     handleWarehousing (row, index) {
       const list = this.chooseLoadData[index]
-      console.log(list)
       if (this.hasChoseWarehousing(list)) {
         this.$message.warning('请选择仓库仓位!')
         return
@@ -169,9 +167,9 @@ export default {
       this.$router.push({ path: '/purchasingManagement/purchaseOrder/list' })
     },
     filterOption (input, option) {
-      	return (
-      		option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
-      	)
+      return (
+        option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+      )
     },
     //  详情
     getDetail () {