Merge tag 'Hotfix-zh-20' into develop

Finish Hotfix-zh-20

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

@@ -1,267 +1,294 @@
 <template>
   <div class="detail-container">
-    <el-page-header content="详情" @back="goBack" />
-    <div class="main-title">
-      <div class="title">提货进度</div>
-    </div>
-    <div class="progress-container">
-      <el-progress
-        :text-inside="true"
-        :stroke-width="26"
-        :percentage="
+    <div v-show="!isShowCheckOrder">
+      <el-page-header content="详情" @back="goBack" />
+      <div class="main-title">
+        <div class="title">提货进度</div>
+      </div>
+      <div class="progress-container">
+        <el-progress
+          :text-inside="true"
+          :stroke-width="26"
+          :percentage="
           detailData.thjd ? ((detailData.thjd * 1000) / 10).toFixed(2) : 0
         "
-      />
-    </div>
+        />
+      </div>
 
-    <div class="main-title">
-      <div class="title">订单信息</div>
-    </div>
+      <div class="main-title">
+        <div class="title">订单信息</div>
+      </div>
 
-    <div class="diy-table-1">
-      <el-row>
-        <el-col :span="8" class="item">
-          <div class="label">订单号</div>
-          <div class="value">{{ detailData.id }}</div>
-        </el-col>
-        <el-col :span="8" class="item">
-          <div class="label">订单日期</div>
-          <div class="value">{{ detailData.theTime }}</div>
-        </el-col>
-        <el-col :span="8" class="item">
-          <div class="label">单据状态</div>
-          <div class="value">{{ detailData.examineStatus | statusFilter }}</div>
-        </el-col>
-        <el-col :span="16" class="item">
-          <div class="label">备注</div>
-          <div class="value">{{ detailData.remark }}</div>
-        </el-col>
-        <el-col :span="8" class="item">
-          <div class="label">业务员</div>
-          <div class="value">{{ detailData.serviceName }}</div>
-        </el-col>
-        <el-col :span="8" class="item">
-          <div class="label">制单人</div>
-          <div class="value">{{ detailData.createName }}</div>
-        </el-col>
-        <el-col :span="8" class="item">
-          <div class="label">制单日期</div>
-          <div class="value">{{ detailData.createTime }}</div>
-        </el-col>
-        <el-col :span="8" class="item">
-          <div class="label">审核人</div>
-          <div class="value">{{ detailData.examineName }}</div>
-        </el-col>
-        <el-col :span="8" class="item">
-          <div class="label">审核日期</div>
-          <div class="value">{{ detailData.examineTime }}</div>
-        </el-col>
-        <el-col :span="8" class="item">
-          <div class="label">关闭人</div>
-          <div class="value">{{ detailData.closeName }}</div>
-        </el-col>
-        <el-col :span="8" class="item">
-          <div class="label">关闭日期</div>
-          <div class="value">{{ detailData.closeTime }}</div>
-        </el-col>
-      </el-row>
-    </div>
+      <div class="diy-table-1">
+        <el-row>
+          <el-col :span="8" class="item">
+            <div class="label">订单号</div>
+            <div class="value">{{ detailData.id }}</div>
+          </el-col>
+          <el-col :span="8" class="item">
+            <div class="label">订单日期</div>
+            <div class="value">{{ detailData.theTime }}</div>
+          </el-col>
+          <el-col :span="8" class="item">
+            <div class="label">单据状态</div>
+            <div class="value">{{ detailData.examineStatus | statusFilter }}</div>
+          </el-col>
+          <el-col :span="16" class="item">
+            <div class="label">备注</div>
+            <div class="value">{{ detailData.remark }}</div>
+          </el-col>
+          <el-col :span="8" class="item">
+            <div class="label">业务员</div>
+            <div class="value">{{ detailData.serviceName }}</div>
+          </el-col>
+          <el-col :span="8" class="item">
+            <div class="label">制单人</div>
+            <div class="value">{{ detailData.createName }}</div>
+          </el-col>
+          <el-col :span="8" class="item">
+            <div class="label">制单日期</div>
+            <div class="value">{{ detailData.createTime }}</div>
+          </el-col>
+          <el-col :span="8" class="item">
+            <div class="label">审核人</div>
+            <div class="value">{{ detailData.examineName }}</div>
+          </el-col>
+          <el-col :span="8" class="item">
+            <div class="label">审核日期</div>
+            <div class="value">{{ detailData.examineTime }}</div>
+          </el-col>
+          <el-col :span="8" class="item">
+            <div class="label">关闭人</div>
+            <div class="value">{{ detailData.closeName }}</div>
+          </el-col>
+          <el-col :span="8" class="item">
+            <div class="label">关闭日期</div>
+            <div class="value">{{ detailData.closeTime }}</div>
+          </el-col>
+        </el-row>
+      </div>
 
-    <div class="main-title">
-      <div class="title">货品信息</div>
-    </div>
+      <div class="main-title">
+        <div class="title">货品信息</div>
+      </div>
 
-    <div class="table" style="margin-top: 20px">
-      <el-table
-        :data="detailData.retailOrderItemList"
-        element-loading-text="Loading"
-        border
-        fit
-        highlight-current-row
-        stripe
-        max-height="400"
-        show-summary
-        :summary-method="$getSummaries"
-      >
-        <el-table-column align="center" label="序号" type="index" width="50" />
-        <el-table-column
-          align="center"
-          label="销售类型"
-          prop="saleTypeName"
-          min-width="100"
-          show-overflow-tooltip
-        />
-        <el-table-column
-          align="center"
-          label="产品编码"
-          prop="materialCode"
-          min-width="160"
-          show-overflow-tooltip
-        />
-        <el-table-column
-          align="center"
-          label="产品名称"
-          prop="materialName"
-          min-width="160"
-          show-overflow-tooltip
-        />
-        <el-table-column
-          align="center"
-          label="规格型号"
-          prop="specification"
-          min-width="160"
-          show-overflow-tooltip
-        />
-        <el-table-column
-          align="center"
-          label="单位"
-          prop="unit"
-          min-width="100"
-          show-overflow-tooltip
-        />
-        <el-table-column
-          align="center"
-          label="单价"
-          prop="price"
-          min-width="100"
-          show-overflow-tooltip
-        >
-          <template slot-scope="scope">
-            {{ scope.row.price | numToFixed }}
-          </template>
-        </el-table-column>
-        <el-table-column
-          align="center"
-          label="数量"
-          prop="qty"
-          min-width="100"
-          show-overflow-tooltip
-        />
-        <el-table-column
-          align="center"
-          label="订单金额"
-          prop="totalAmount"
-          min-width="100"
-          show-overflow-tooltip
-        >
-          <template slot-scope="scope">
-            {{ scope.row.totalAmount | numToFixed }}
-          </template>
-        </el-table-column>
-        <el-table-column
-          align="center"
-          label="返利类型"
-          prop="customerWalletName2"
-          min-width="100"
-          show-overflow-tooltip
-        >
-          <template slot-scope="scope">
-            <!-- v-for="item in scope.row.rebateWallets" -->
-            <el-tag
-              v-if="scope.row.customerWalletName2"
-              type="success"
-              size="small"
-            >
-              {{ scope.row.customerWalletName2 }}
-            </el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column
-          align="center"
-          label="返利金额"
-          prop="payRebateAmount"
-          min-width="100"
-          show-overflow-tooltip
-        >
-          <template slot-scope="scope">
-            {{ scope.row.payRebateAmount | numToFixed }}
-          </template>
-        </el-table-column>
-        <el-table-column
-          align="center"
-          label="格力折扣"
-          prop="totalDiscAmount"
-          min-width="100"
-          show-overflow-tooltip
-        >
-          <template slot-scope="scope">
-            {{ scope.row.totalDiscAmount | numToFixed }}
-          </template>
-        </el-table-column>
-        <el-table-column
-          align="center"
-          label="现金钱包"
-          prop="customerWalletName"
-          min-width="100"
-          show-overflow-tooltip
-        >
-          <template slot-scope="scope">
-            <!-- v-for="item in scope.row.wallets" -->
-            <el-tag type="success" size="small">
-              {{ scope.row.customerWalletName }}
-            </el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column
-          align="center"
-          label="实付金额"
-          prop="payAmount"
-          min-width="100"
-          show-overflow-tooltip
-        >
-          <template slot-scope="scope">
-            {{ scope.row.payAmount | numToFixed }}
-          </template>
-        </el-table-column>
-        <el-table-column
-          align="center"
-          label="是否直调"
-          prop="isDirectTransfer"
-          min-width="100"
-          show-overflow-tooltip
+      <div class="table" style="margin-top: 20px">
+        <el-table
+          :data="detailData.retailOrderItemList"
+          element-loading-text="Loading"
+          border
+          fit
+          highlight-current-row
+          stripe
+          max-height="400"
+          show-summary
+          :summary-method="$getSummaries"
         >
-          <template slot-scope="scope">
-            {{ scope.row.isDirectTransfer ? "是" : "否" }}
-          </template>
-        </el-table-column>
-        <el-table-column
-          align="center"
-          label="直调数量"
-          prop="directTransferQty"
-          min-width="100"
-          show-overflow-tooltip
-        />
+          <el-table-column align="center" label="序号" type="index" width="50" />
+          <el-table-column
+            align="center"
+            label="销售类型"
+            prop="saleTypeName"
+            min-width="100"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            align="center"
+            label="产品编码"
+            prop="materialCode"
+            min-width="160"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            align="center"
+            label="产品名称"
+            prop="materialName"
+            min-width="160"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            align="center"
+            label="规格型号"
+            prop="specification"
+            min-width="160"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            align="center"
+            label="单位"
+            prop="unit"
+            min-width="100"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            align="center"
+            label="单价"
+            prop="price"
+            min-width="100"
+            show-overflow-tooltip
+          >
+            <template slot-scope="scope">
+              {{ scope.row.price | numToFixed }}
+            </template>
+          </el-table-column>
+          <el-table-column
+            align="center"
+            label="数量"
+            prop="qty"
+            min-width="100"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            align="center"
+            label="订单金额"
+            prop="totalAmount"
+            min-width="100"
+            show-overflow-tooltip
+          >
+            <template slot-scope="scope">
+              {{ scope.row.totalAmount | numToFixed }}
+            </template>
+          </el-table-column>
+          <el-table-column
+            align="center"
+            label="返利类型"
+            prop="customerWalletName2"
+            min-width="100"
+            show-overflow-tooltip
+          >
+            <template slot-scope="scope">
+              <!-- v-for="item in scope.row.rebateWallets" -->
+              <el-tag
+                v-if="scope.row.customerWalletName2"
+                type="success"
+                size="small"
+              >
+                {{ scope.row.customerWalletName2 }}
+              </el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column
+            align="center"
+            label="返利金额"
+            prop="payRebateAmount"
+            min-width="100"
+            show-overflow-tooltip
+          >
+            <template slot-scope="scope">
+              {{ scope.row.payRebateAmount | numToFixed }}
+            </template>
+          </el-table-column>
+          <el-table-column
+            align="center"
+            label="格力折扣"
+            prop="totalDiscAmount"
+            min-width="100"
+            show-overflow-tooltip
+          >
+            <template slot-scope="scope">
+              {{ scope.row.totalDiscAmount | numToFixed }}
+            </template>
+          </el-table-column>
+          <el-table-column
+            align="center"
+            label="现金钱包"
+            prop="customerWalletName"
+            min-width="100"
+            show-overflow-tooltip
+          >
+            <template slot-scope="scope">
+              <!-- v-for="item in scope.row.wallets" -->
+              <el-tag type="success" size="small">
+                {{ scope.row.customerWalletName }}
+              </el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column
+            align="center"
+            label="实付金额"
+            prop="payAmount"
+            min-width="100"
+            show-overflow-tooltip
+          >
+            <template slot-scope="scope">
+              {{ scope.row.payAmount | numToFixed }}
+            </template>
+          </el-table-column>
+          <el-table-column
+            align="center"
+            label="是否直调"
+            prop="isDirectTransfer"
+            min-width="100"
+            show-overflow-tooltip
+          >
+            <template slot-scope="scope">
+              {{ scope.row.isDirectTransfer ? "是" : "否" }}
+            </template>
+          </el-table-column>
+          <el-table-column
+            align="center"
+            label="直调数量"
+            prop="directTransferQty"
+            min-width="100"
+            show-overflow-tooltip
+          />
 
-        <!-- <el-table-column
-          align="center"
-          label="已退数量"
-          prop="retiredQty"
-          min-width="100"
-          show-overflow-tooltip
-        ></el-table-column> -->
-        <el-table-column
-          align="center"
-          label="原订单数量"
-          prop="oldQty"
-          min-width="100"
-          show-overflow-tooltip
-        />
-        <el-table-column
-          align="center"
-          label="备注"
-          prop="remark"
-          min-width="160"
-          show-overflow-tooltip
-        />
-        <el-table-column
-          align="center"
-          label="税率"
-          prop="tax"
-          min-width="100"
-          show-overflow-tooltip
-        />
-      </el-table>
+          <!-- <el-table-column
+            align="center"
+            label="已退数量"
+            prop="retiredQty"
+            min-width="100"
+            show-overflow-tooltip
+          ></el-table-column> -->
+          <el-table-column
+            align="center"
+            label="原订单数量"
+            prop="oldQty"
+            min-width="100"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            align="center"
+            label="备注"
+            prop="remark"
+            min-width="160"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            align="center"
+            label="税率"
+            prop="tax"
+            min-width="100"
+            show-overflow-tooltip
+          />
+        </el-table>
+      </div>
+
+      <div v-if="isExamine">
+        <div class="main-title">
+          <div class="title">审批记录</div>
+        </div>
+        <div class="diy-table-1">
+          <el-row :gutter="0">
+            <el-col :span="12" class="item">
+              <div class="label">审批人</div>
+              <div class="value">{{ detailData.examineName }}</div>
+            </el-col>
+            <el-col :span="12" class="item">
+              <div class="label">审批结果</div>
+              <div class="value">
+                {{ detailData.examineStatus | statusFilter }}
+              </div>
+            </el-col>
+            <el-col :span="24" class="item">
+              <div class="label">审批说明</div>
+              <div class="value">{{ detailData.examineRemark }}</div>
+            </el-col>
+          </el-row>
+        </div>
+      </div>
     </div>
+
     <div class="page-footer">
       <div class="footer" :class="classObj">
         <el-button type="success" @click="toCheckOrder">联查单据</el-button>
@@ -279,37 +306,6 @@
         <!-- <el-button @click="goBack">关 闭</el-button> -->
       </div>
     </div>
-    <div v-if="isExamine">
-      <div class="main-title">
-        <div class="title">审批记录</div>
-      </div>
-      <div class="diy-table-1">
-        <el-row :gutter="0">
-          <el-col :span="12" class="item">
-            <div class="label">审批人</div>
-            <div class="value">{{ detailData.examineName }}</div>
-          </el-col>
-          <el-col :span="12" class="item">
-            <div class="label">审批结果</div>
-            <div class="value">
-              {{ detailData.examineStatus | statusFilter }}
-            </div>
-          </el-col>
-          <el-col :span="24" class="item">
-            <div class="label">审批说明</div>
-            <div class="value">{{ detailData.examineRemark }}</div>
-          </el-col>
-        </el-row>
-      </div>
-    </div>
-    <!--
-    <div class="page-footer">
-      <div class="footer" :class="classObj">
-        <el-button type="primary" @click="openDeliverDialog">直调发货</el-button>
-        <el-button @click="goBack">关 闭</el-button>
-      </div>
-    </div> -->
-
     <el-dialog title="直调发货" :visible.sync="isShowDeliverDialog" width="80%">
       <el-form
         ref="deliverForm"
@@ -759,4 +755,7 @@ export default {
     width: 500px;
   }
 }
+.page-footer{
+  height: 0;
+}
 </style>