【修改】零售发货申请单

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 }}
@@ -370,7 +375,11 @@
             <el-table-column align="center" label="操作" width="180" fixed="right">
               <template slot-scope="scope">
                 <el-popconfirm
-                  v-if="$checkBtnRole('apply', $route.meta.roles) && scope.row.examineStatus === 'SAVE'"
+                  v-if="
+                    $checkBtnRole('apply', $route.meta.roles) &&
+                    scope.row.automaticStatus &&
+                    scope.row.examineStatus === 'SAVE'
+                  "
                   style="margin-right: 10px"
                   title="确定申请吗？"
                   @onConfirm="handleSubmit(scope.row.id, 'WAIT')"
@@ -378,7 +387,11 @@
                   <el-button slot="reference" type="text">申请</el-button>
                 </el-popconfirm>
                 <el-popconfirm
-                  v-if="$checkBtnRole('apply', $route.meta.roles) && scope.row.examineStatus === 'WAIT'"
+                  v-if="
+                    $checkBtnRole('apply', $route.meta.roles) &&
+                    scope.row.automaticStatus &&
+                    scope.row.examineStatus === 'WAIT'
+                  "
                   style="margin-right: 10px"
                   title="确定撤回吗？"
                   @onConfirm="handleSubmit(scope.row.id, 'SAVE')"
@@ -386,7 +399,11 @@
                   <el-button slot="reference" type="text">撤回</el-button>
                 </el-popconfirm>
                 <el-popconfirm
-                  v-if="$checkBtnRole('examine', $route.meta.roles) && scope.row.examineStatus === 'OK'"
+                  v-if="
+                    $checkBtnRole('examine', $route.meta.roles) &&
+                    scope.row.automaticStatus &&
+                    scope.row.examineStatus === 'OK'
+                  "
                   style="margin-right: 10px"
                   title="确定弃审吗？"
                   @onConfirm="handleAbandon(scope.row.id)"
@@ -396,6 +413,7 @@
                 <el-button
                   v-if="
                     $checkBtnRole('edit', $route.meta.roles) &&
+                    scope.row.automaticStatus &&
                     (scope.row.examineStatus === 'SAVE' || scope.row.examineStatus === 'FAIL') &&
                     scope.row.type === 1
                   "
@@ -407,6 +425,7 @@
                 <el-button
                   v-if="
                     $checkBtnRole('edit', $route.meta.roles) &&
+                    scope.row.automaticStatus &&
                     (scope.row.examineStatus === 'SAVE' || scope.row.examineStatus === 'FAIL') &&
                     scope.row.type === 2
                   "
@@ -416,7 +435,11 @@
                   编辑
                 </el-button>
                 <el-button
-                  v-if="$checkBtnRole('examine', $route.meta.roles) && scope.row.examineStatus === 'WAIT'"
+                  v-if="
+                    $checkBtnRole('examine', $route.meta.roles) &&
+                    scope.row.automaticStatus &&
+                    scope.row.examineStatus === 'WAIT'
+                  "
                   type="text"
                   @click="toExamine(scope.row)"
                 >
@@ -424,7 +447,11 @@
                 </el-button>
                 <el-button type="text" @click="toDetail(scope.row)"> 详情 </el-button>
                 <el-popconfirm
-                  v-if="$checkBtnRole('del', $route.meta.roles) && scope.row.examineStatus !== 'OK'"
+                  v-if="
+                    $checkBtnRole('del', $route.meta.roles) &&
+                    scope.row.automaticStatus &&
+                    scope.row.examineStatus !== 'OK'
+                  "
                   style="margin-left: 10px"
                   title="确定删除吗？"
                   @onConfirm="handleDelete(scope.row.id)"

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>