Merge branch 'feat-two' into feature/two-bug

src/views/sales_control/sales_management/components/return_sales_details.vue

@@ -23,9 +23,10 @@
         <div v-if="!detailsId">
           <el-button type="primary" :disabled="!dis" size="mini" @click="handelSubmit(1)">提交</el-button>
           <el-button v-if="dis" size="mini" @click="onReset">重置</el-button>
-          <el-button v-if="details.stockType ===1 && details.status == 1" size="mini" :disabled="dis" @click="handleInform(2)">退货通知</el-button>
+          <el-button v-if="(details.stockType ==1 && details.status == 1)" size="mini" :disabled="dis" @click="handleInform(2)">退货通知</el-button>
         </div>
         <div v-else>
+          <el-button v-if="(details.stockType ==1 && details.status == 1)" size="mini"  @click="handleInform(2)">退货通知</el-button>
           <el-button v-if="(details.status == 2 && details.stockType == 1)" size="mini" @click="handleSendRevoke(1)">撤销退货</el-button>
         </div>
       </template>
@@ -111,8 +112,7 @@ export default {
           prop: 'qty',
           align: 'left',
           label: '退货数量',
-          width: '180',
-          isInput: true
+          width: '180'
         },
 
         {
@@ -129,7 +129,6 @@ export default {
         {
           prop: 'notes',
           label: '备注',
-          isInput: true,
           type: 'text'
         }
       ],
@@ -149,6 +148,7 @@ export default {
       detailRefund({ id: this.detailsId }).then(res => {
         this.dataList = res.data.orders
         this.details = res.data
+        console.log( this.details, 99);
         this.dataList.forEach(k => {
           this.$set(k, 'refundQty', k.qty)
           k.diffQty = Number(k.qty) - Number(k.refundQty || 0)
@@ -362,7 +362,7 @@ export default {
       }
     },
     handleInform(status = 2) {
-      sendRefund({ id: this.salesId, status }).then(res => {
+      sendRefund({ id: this.details.id , status }).then(res => {
         this.$successMsg('退货通知')
         this.handleBack()
       })

src/views/supply/transferOrder/transferOrderForm.vue

@@ -998,11 +998,8 @@ export default {
     },
     handleChange(e, type) {
       if (e) {
-        if (type === 'transferCustomerNumber') {
-          this.formData.transferCustomerName = this.sonCustomerList.find(k => k.id === e).name
-        } else {
-          this.formData.transferCustomerNumber = this.sonCustomerList.find(k => k.id === e).number
-        }
+        this.formData.transferCustomerName = e
+        this.formData.transferCustomerNumber = e
       } else {
         this.formData.transferCustomerNumber = ''
         this.formData.transferCustomerName = ''
@@ -1029,8 +1026,8 @@ export default {
             return
           }
         }
-        const transfer = this.sonCustomerList.find(k => k.id === this.formData.transferCustomerNumber)
-
+        const transfer = this.sonCustomerList.find(k => k.id === (this.formData.transferCustomerNumber || this.formData.transferCustomerName))
+        console.log(transfer, 999)
         if (valid) {
           const params = {
             ...this.formData,