lilei 1 éve
szülő
commit
f1aa0b5292

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

@@ -209,6 +209,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>
@@ -243,6 +246,7 @@ export default {
       tableHeight: 0, // 表格高度
       orderSn: null,
       disabled: false,
+      showEditRemarks: false,
       ordeDetail: null,
       loading: false,
       queryParam: {
@@ -275,7 +279,7 @@ export default {
       returnReasonList: [],
       openProductModal: false,
       plReturnReason: undefined,
-      plReturnRemark: '',
+      plReturnRemark: undefined,
       showPlModal: false,
       labelCol: { span: 8 },
       wrapperCol: { span: 14 }
@@ -285,7 +289,8 @@ export default {
     showPlModal (newValue, oldValue) {
       if (!newValue) {
         this.plReturnReason = undefined
-        this.plReturnRemark = ''
+        this.plReturnRemark = undefined
+        this.showEditRemarks = false
       }
     }
   },
@@ -363,10 +368,14 @@ export default {
     },
     // 添加产品
     addProduct (data) {
+      const a = this.$store.state.app.goodReturnReason.find(item => item.code == data.returnReasonCode)
+      const b = this.$store.state.app.defectiveReturnReason.find(item => item.code == data.returnReasonCode)
+      const goodFlag = a ? a.lookupCode : b.lookupCode
+      
       const params = {
         'salesReturnBillSn': this.orderSn,
         'salesReturnBillNo': this.ordeDetail.salesReturnBillNo,
-        'goodFlag': this.goodFlag,
+        'goodFlag': goodFlag,
         ...data
       }
       insertByCustomerService(params).then(res => {

+ 1 - 0
src/views/salesReturnManagement/receiveCheck/receiving.vue

@@ -243,6 +243,7 @@ export default {
       const params = {
         'salesReturnBillSn': this.orderSn,
         'salesReturnBillNo': this.ordeDetail.salesReturnBillNo,
+        'goodFlag': this.goodFlag,
         ...data
       }
       insertByReceive(params).then(res => {