lilei há 1 ano atrás
pai
commit
314cf73bfd

+ 0 - 1
src/views/common/returnReason.js

@@ -54,7 +54,6 @@ const ReturnReason = {
     if(this.goodFlag == 'GOOD_PRODUCT_RETURN'){
       this.list = this.$store.state.app.goodReturnReason
     }
-    console.log(this.list)
   },
   watch: {
     value(newValue, oldValue) {

+ 10 - 6
src/views/purchasingManagement/purchaseReturnApplyForm/edit.vue

@@ -173,7 +173,7 @@
                   v-model="record.initQty"
                   :precision="0"
                   :min="1"
-                  placeholder="请输入"
+                  placeholder="请输入数量"
                   @blur="e => qtyBlur(e.target.value, record)"
                   style="width: 100%;" />
               </template>
@@ -183,7 +183,7 @@
               </template>
               <!-- 备注 -->
               <template slot="returnRemarks" slot-scope="text, record">
-                <a-input size="small" v-model="record.returnReasonRemarks" @change="e => returnReasonChange(e, record, 1)"></a-input>
+                <a-input size="small" placeholder="请输入备注" v-model="record.returnReasonRemarks" @blur="e => returnReasonChange(e, record, 1)"></a-input>
               </template>
               <!-- 操作 -->
               <template slot="action" slot-scope="text, record">
@@ -345,12 +345,13 @@ export default {
     chooseColumns () {
       const arr = [
         { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
-        { title: '产品编码', dataIndex: 'product.code', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品编码', dataIndex: 'product.code', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'product.name', width: '20%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '产品分类', scopedSlots: { customRender: 'productType' }, width: '20%', align: 'center' },
-        { title: '单位', dataIndex: 'product.unit', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品分类', scopedSlots: { customRender: 'productType' }, width: '17%', align: 'center' },
+        { title: '单位', dataIndex: 'product.unit', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '申请退货数量', scopedSlots: { customRender: 'qty' }, width: '10%', align: 'center' },
         { title: '退货原因', scopedSlots: { customRender: 'returnReason' }, width: '10%', align: 'center' },
+        { title: '备注', scopedSlots: { customRender: 'returnRemarks' }, width: '10%', align: 'center' },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
       ]
       return arr
@@ -535,7 +536,10 @@ export default {
         params.returnReason = rows ? rows.dispName : ''
       }else{
         // 备注
-        params.returnReasonRemarks = val
+        params.returnReasonRemarks = val.target.value
+        if(!params.returnReasonRemarks){
+          return
+        }
       }
       this.spinning = true
       modifyReturnInfo(params).then(res => {

+ 1 - 1
src/views/purchasingManagement/purchaseReturnApplyForm/importGuideModal.vue

@@ -82,7 +82,7 @@ export default {
       default: null
     },
     goodFlag: {
-      type: String,
+      type: [String,Number],
       default: ''
     }
   },