Merge remote-tracking branch 'origin/develop' into develop

src/views/supply/retail/components/retail_detail.vue

@@ -209,7 +209,7 @@
         <el-table-column align="right" label="发货数量" prop="hasSendQty" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="right" label="直调数量" prop="adjustNum" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
-            <el-input v-model="scope.row.adjustNum" size="small" type="number" @mousewheel.native.prevent :disabled="!scope.row.isDirectTransfer"></el-input>
+            <el-input v-model="scope.row.adjustNum" size="small" type="number" @mousewheel.native.prevent :disabled="!scope.row.isDirectTransfer || scope.row.adjustNum === 0"></el-input>
           </template>
         </el-table-column>
         <el-table-column align="right" label="单价" prop="price" min-width="100" show-overflow-tooltip>
@@ -464,8 +464,8 @@ export default {
       this.isShowDeliverDialog = true;
         this.detailData.retailOrderItemList.forEach(item => {
             if(item.isDirectTransfer){
-
-               this.$set(item,'adjustNum',item.refundableQty || item.qty)
+              //  this.$set(item,'adjustNum',item.refundableQty || item.qty)
+              this.$set(item, 'adjustNum', (item.qty - item.directTransferQty));
             }else{
 
               this.$set(item,'adjustNum',0)
@@ -487,7 +487,7 @@ export default {
       this.$refs.deliverForm.validate((valid) => {
         if (valid) {
           for(let i=0; i<this.goodsList.length; i++) {
-            if(!this.goodsList[i].adjustNum && this.goodsList[i].isDirectTransfer) {
+            if(this.goodsList[i].adjustNum === '' && this.goodsList[i].isDirectTransfer) {
               this.$errorMsg('请输入直调数量');
               return;
             }