Merge branch 'new' into develop

src/views/supply/apply/apply_list.vue

@@ -195,6 +195,11 @@
             @selection-change="handleSelectionChange"
           >
             <el-table-column align="center" type="selection" width="55" fixed="left" />
+            <el-table-column align="left" label="订单状态" prop="type" min-width="120" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{ scope.row.automaticStatus ? '非计划单推发货' : '计划单推发货' }}
+              </template>
+            </el-table-column>
             <el-table-column align="left" label="订单类型" prop="type" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.type | orderTypeFilter }}

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

@@ -235,21 +235,22 @@
       <div class="footer" :class="classObj">
         <el-button type="success" @click="toCheckOrder">联查单据</el-button>
         <!-- <el-button v-if="isCustomer" type="primary" :disabled="detailData.examineStatus !== 'OK'" @click="openDirectDialog">提前开票</el-button> -->
-
-        <el-button
-          v-if="isCustomer"
-          :type="status ? 'info' : 'primary'"
-          :disabled="detailData.examineStatus !== 'OK' || status || detailData.directTransferStatus"
-          @click="openDeliverDialog"
-          >直调发货</el-button
-        >
-        <el-button
-          v-if="isCustomer"
-          :type="status ? 'info' : 'primary'"
-          :disabled="detailData.examineStatus !== 'OK' || status || detailData.directTransferStatus"
-          @click="handleFinish"
-          >直调完成</el-button
-        >
+        <template v-if="!detailData.isPlanOrder">
+          <el-button
+            v-if="isCustomer"
+            :type="status ? 'info' : 'primary'"
+            :disabled="detailData.examineStatus !== 'OK' || status || detailData.directTransferStatus"
+            @click="openDeliverDialog"
+            >直调发货</el-button
+          >
+          <el-button
+            v-if="isCustomer"
+            :type="status ? 'info' : 'primary'"
+            :disabled="detailData.examineStatus !== 'OK' || status || detailData.directTransferStatus"
+            @click="handleFinish"
+            >直调完成</el-button
+          >
+        </template>
         <el-button @click="goBack">返回列表</el-button>
       </div>
     </div>