Merge branch 'hotfix/Hotfix-zh-309' into develop

src/views/supply/pickup/components/pickup_form.vue

@@ -152,6 +152,7 @@
               <template slot-scope="scope">
                 <el-input
                   v-if="!(scope.row.orderType === 'TRADE' || scope.row.orderType === 'HOME')"
+                  :disabled="flag"
                   v-model="scope.row.receivingName"
                   size="mini"
                   @input="handleInput($event, scope.row.invoiceId, 1)"
@@ -163,6 +164,7 @@
               <template slot-scope="scope">
                 <el-input
                   v-if="!(scope.row.orderType === 'TRADE' || scope.row.orderType === 'HOME')"
+                  :disabled="flag"
                   v-model="scope.row.phone"
                   size="mini"
                   @input="handleInput($event, scope.row.invoiceId, 2)"
@@ -174,6 +176,7 @@
               <template slot-scope="scope">
                 <el-input
                   v-if="!(scope.row.orderType === 'TRADE' || scope.row.orderType === 'HOME')"
+                  :disabled="flag"
                   v-model="scope.row.address"
                   size="mini"
                   @input="handleInput($event, scope.row.invoiceId, 3)"