lilei há 2 anos atrás
pai
commit
d1c29c1e58

+ 3 - 1
src/views/salesReturnManagement/custConfirm/list.vue

@@ -430,7 +430,8 @@ export default {
           salesReturnBillSn: this.orderSn,
           returnReason: rows ? rows.dispName : '',
           returnReasonCode: this.plReturnReason,
-          returnReasonRemarks: this.plReturnRemark
+          returnReasonRemarks: this.plReturnRemark,
+          goodFlag: rows.lookupCode
         }).then(res => {
           if (res.status == 200) {
             this.showPlModal = false
@@ -453,6 +454,7 @@ export default {
       }
       const rows = this.returnReasonlist.find(item => item.code == record.returnReasonCode)
       record.returnReason = rows ? rows.dispName : ''
+      record.goodFlag = rows.lookupCode
       this.spinning = true
       updateByCustomerService(record).then(res => {
         if (res.status == 200) {

+ 11 - 5
src/views/salesReturnManagement/receiveCheck/checking.vue

@@ -102,6 +102,9 @@
            <div><returnReason size="large" v-model="plReturnReason"></returnReason></div>
          </div>
          <div style="line-height: 24px;margin-top:10px;">
+           <a-checkbox :checked="showEditRemarks" @change="e => showEditRemarks=!showEditRemarks">是否设置备注</a-checkbox>
+         </div>
+         <div style="line-height: 24px;margin-top:10px;" v-if="showEditRemarks">
            <div>备注</div>
            <div><a-input size="large" :maxlength="50" placeholder="请输入备注(最多50字符)" v-model="plReturnRemark"></a-input></div>
          </div>
@@ -177,8 +180,9 @@ export default {
       },
       rowSelectionInfo: null,
       plReturnReason: undefined,
-      plReturnRemark: '',
+      plReturnRemark: undefined,
       showPlModal: false,
+      showEditRemarks: false,
       returnReasonlist: []
     }
   },
@@ -186,7 +190,8 @@ export default {
     showPlModal (newValue, oldValue) {
       if (!newValue) {
         this.plReturnReason = undefined
-        this.plReturnRemark = ''
+        this.plReturnRemark = undefined
+        this.showEditRemarks = false
       }
     }
   },
@@ -311,7 +316,8 @@ export default {
           salesReturnBillSn : this.orderSn,
           returnReason: rows ? rows.dispName : '',
           returnReasonCode: this.plReturnReason,
-          returnReasonRemarks: this.plReturnRemark
+          returnReasonRemarks: this.plReturnRemark,
+          goodFlag: rows.lookupCode
         }).then(res => {
           if (res.status == 200) {
             this.showPlModal = false
@@ -325,14 +331,14 @@ export default {
     // 修改退货原因
     updateReason (val, record, type) {
       const params = {
-        salesReturnDetailSn: record.salesReturnDetailSn,
-        goodFlag: this.goodFlag
+        salesReturnDetailSn: record.salesReturnDetailSn
       }
       // 退货原因
       if(type == 0){
         const rows = this.returnReasonlist.find(item => item.code == val)
         params.returnReasonCode = val||''
         params.returnReason = rows ? rows.dispName : ''
+        params.goodFlag = rows.lookupCode
       }else{
         // 备注
         params.returnReasonRemarks = val.target.value

+ 3 - 3
src/views/salesReturnManagement/receiveCheck/receiving.vue

@@ -25,16 +25,16 @@
           </a-form-item>
         </a-form>
         <div style="border-top:1px solid #eee;padding-top:10px;">
+          <a-button type="primary" :loading="loading" class="button-error" @click="handlePlss">批量实收</a-button>
+          <span v-if="rowSelectionInfo&&rowSelectionInfo.selectedRowKeys&&rowSelectionInfo.selectedRowKeys.length">已选{{ rowSelectionInfo.selectedRowKeys.length }}项</span>
           <a-button
             type="primary"
             ghost
             :loading="loading"
             @click="openGuideModal=true"
-            style="margin-right:5px;"
+            style="margin:0 5px 0 10px;"
           >导入产品</a-button>
           <a-button type="primary" :loading="loading" class="button-info" @click="openModal = true">新增产品</a-button>
-          <a-button type="primary" :loading="loading" class="button-error" @click="handlePlss">批量实收</a-button>
-          <span v-if="rowSelectionInfo&&rowSelectionInfo.selectedRowKeys&&rowSelectionInfo.selectedRowKeys.length">已选{{ rowSelectionInfo.selectedRowKeys.length }}项</span>
           <div style="float:right;color:#999;margin-top:8px;">说明:红色行表示收货时新增的产品</div>
         </div>
         <!-- 已选配件列表 -->

+ 7 - 2
src/views/salesReturnManagement/salesReturn/salesReturnEdit.vue

@@ -151,6 +151,9 @@
           <div><returnReason size="large" :goodFlag="goodFlag" v-model="plReturnReason"></returnReason></div>
         </div>
         <div style="line-height: 24px;margin-top:10px;">
+          <a-checkbox :checked="showEditRemarks" @change="e => showEditRemarks=!showEditRemarks">是否设置备注</a-checkbox>
+        </div>
+        <div style="line-height: 24px;margin-top:10px;" v-if="showEditRemarks">
           <div>备注</div>
           <div><a-input size="large" :maxlength="50" placeholder="请输入备注(最多50字符)" v-model="plReturnRemark"></a-input></div>
         </div>
@@ -246,7 +249,8 @@ export default {
       total: 0,
       rowSelectionInfo: null,
       plReturnReason: undefined,
-      plReturnRemark: '',
+      plReturnRemark: undefined,
+      showEditRemarks: false,
       showPlModal: false,
       returnReasonlist: [],
     }
@@ -255,7 +259,8 @@ export default {
     showPlModal (newValue, oldValue) {
       if (!newValue) {
         this.plReturnReason = undefined
-        this.plReturnRemark = ''
+        this.plReturnRemark = undefined
+        this.showEditRemarks = false
       }
     }
   },