lilei 2 年之前
父節點
當前提交
ac80012e27

+ 1 - 1
public/version.json

@@ -1,4 +1,4 @@
 {
-    "version": "2.2.17",
+    "version": "2.2.18",
     "message": "发现有新版本发布,确定更新系统?"
 }

+ 1 - 1
src/views/allocationManagement/transferOut/basicInfoModal.vue

@@ -254,7 +254,7 @@ export default {
       const ind = this.dealerData.findIndex(item => item.dealerSn == value)
       console.log(this.dealerData[ind])
       this.form.targetName = this.dealerData[ind].dealerName
-      this.form.warehouseSn = this.dealerData[ind].warehouseSn
+      this.form.warehouseSn = this.dealerData[ind].defaultWarehouseSn
     },
     //  保存
     handleSave () {

+ 3 - 6
src/views/allocationManagement/transferReturn/basicInfoModal.vue

@@ -58,7 +58,7 @@
             allowClear
             placeholder="请选择"></v-select>
         </a-form-model-item>
-        <a-form-model-item label="调入仓库" :prop="form.grabFlag==0?'warehouseSn':null">
+        <a-form-model-item label="调入仓库" prop="warehouseSn">
           <warehouse
             v-model="form.warehouseSn"
             id="allocateBill-basicInfo-warehouseSn"
@@ -114,7 +114,7 @@ export default {
         costTypeSn: undefined,
         allocateSortSn: undefined,
         allocateReturnTypeSn: undefined,
-        warehouse: undefined,
+        warehouseSn: undefined,
         grabFlag: '1',
         remarks: ''
       },
@@ -158,6 +158,7 @@ export default {
     handleChange (value) {
       const ind = this.dealerData.findIndex(item => item.dealerSn == value)
       this.form.targetName = this.dealerData[ind].dealerName
+      this.form.warehouseSn = this.dealerData[ind].defaultWarehouseSn
     },
     departementChange (v, row) {
        console.log(v,row)
@@ -195,10 +196,6 @@ export default {
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
           const form = JSON.parse(JSON.stringify(_this.form))
-          if(form.grabFlag==0 && !form.warehouseSn){
-            _this.$message.error("请选择调入仓库")
-            return false
-          }
           _this.spinning = true
           allocateReturnSave(form).then(res => {
             if (res.status == 200) {

+ 4 - 4
src/views/allocationManagement/transferReturn/edit.vue

@@ -298,7 +298,7 @@ export default {
         this.disabled = true
         const dealerLevel = this.$route.params.dealerLevel == 'OTHER' ? undefined : this.$route.params.dealerLevel
         const warehouseSn = this.basicInfoData.warehouseSn
-        return queryStockProductPage(Object.assign(parameter, this.queryParam, { dealerLevel: dealerLevel == 0 ? '' : dealerLevel})).then(res => {
+        return queryStockProductPage(Object.assign(parameter, this.queryParam, { dealerLevel: dealerLevel == 0 ? '' : dealerLevel, warehouseSn: warehouseSn})).then(res => {
           const data = res.data
           const no = (data.pageNo - 1) * data.pageSize
           for (var i = 0; i < data.list.length; i++) {
@@ -368,13 +368,13 @@ export default {
   },
   methods: {
     // 修改备注
-    handleEditRemark () {
+    handleEditRemark (flag) {
       const _this = this
       const params = _this.basicInfoData
       allocateReturnSave(params).then(res => {
         if (res.status == 200) {
           _this.$message.success(res.message)
-          _this.getDetail(false)
+          _this.getDetail(flag)
         } else {
           _this.spinning = false
         }
@@ -384,7 +384,7 @@ export default {
     // 修改仓库
     updateWarehouse(warehouseSn){
       this.basicInfoData.warehouseSn = warehouseSn
-      this.handleEditRemark()
+      this.handleEditRemark(true)
     },
     // 修改调拨类型
     changeAllocateType (val, opt) {

+ 3 - 0
src/views/dealerManagement/rebateSettings/queryChild.vue

@@ -68,6 +68,9 @@ export default {
         data: [],
         fetching: false
       })
+      if(!value){
+        this.itemSn = null
+      }
       this.$emit('change', value)
     },
     setVal(value, label){

+ 1 - 1
src/views/inventoryManagement/inventoryQuery/warehouseDetail.vue

@@ -246,7 +246,7 @@ export default {
     handleExcel () {
       const _this = this
       this.$store.state.app.curActionPermission = 'B_inventoryQuery_rkDetail_export'
-      const params = Object.assign(this.queryParam, { productSn: this.$route.params.sn })
+      const params = Object.assign(this.queryParam, { productSn: this.$route.params.sn, warehouseSn: this.$route.params.warehouseSn })
       this.exportLoading = true
       this.spinning = true
       hdExportExcel(stockFlowExport, params, '出入库明细', function () {