Finish Hotfix-mo-153

src/views/sales_policy/policy_list.vue

@@ -320,7 +320,7 @@
         <el-table-column
           show-overflow-tooltip
           prop="remark"
-          label="表头备注"
+          label="销售政策说明"
          min-width="150"
           align="left"
         />

src/views/supply/deliver/sum_list.vue

@@ -121,6 +121,11 @@
             :summary-method="$getSummaries">
             <el-table-column align="center" type="selection" width="55"></el-table-column>
 
+            <el-table-column align="left" label="订单类型" prop="orderType" min-width="100" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{ scope.row.orderType | orderTypeFilter }}
+              </template>
+            </el-table-column>
             <el-table-column align="left" label="制单日期" prop="createTime" min-width="160" show-overflow-tooltip>
             </el-table-column>
             <el-table-column align="left" label="发货日期" prop="orderTime" min-width="160" show-overflow-tooltip>
@@ -286,6 +291,25 @@ export default {
   components: {
     SumPrint,
   },
+  filters: {
+    orderTypeFilter(val) {
+      const MAP = {
+        HOME: '家用单',
+        TRADE: '商用单',
+        RETAIL: '零售单',
+        RETAIL_POLICY: '销售政策单',
+        PERMU_HOME: '置换家用单',
+        PERMU_TRADE: '置换商用单',
+        PERMU_RETAIL: '置换零售单',
+        PERMU_RETAIL_POLICY: '置换销售政策单',
+        REQUISITION_HOME: '调拨家用单',
+        REQUISITION_TRADE: '调拨商用单',
+        REQUISITION_RETAIL: '调拨零售单',
+        REQUISITION_RETAIL_POLICY: '调拨销售政策单',
+      }
+      return MAP[val];
+    }
+  },
   data() {
     return {
       currentPage: 1, // 当前页码

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

@@ -69,6 +69,10 @@
             <div class="label">关闭日期</div>
             <div class="value">{{ detailData.closeTime }}</div>
           </el-col>
+          <el-col :span="16" class="item">
+            <div class="label">销售政策说明</div>
+            <div class="value">{{ detailData.policyRemark }}</div>
+          </el-col>
         </el-row>
       </div>
 

src/views/supply/policy/policy_list.vue

@@ -250,13 +250,20 @@
             />
             <el-table-column
               align="left"
-              label="销售政策说明"
+              label="销售政策名称"
               prop="policyTitle"
               min-width="160"
               show-overflow-tooltip
             />
             <el-table-column
               align="left"
+              label="销售政策说明"
+              prop="policyRemark"
+              min-width="160"
+              show-overflow-tooltip
+            />
+            <el-table-column
+              align="left"
               label="经销商"
               prop="customerName"
               min-width="200"

src/views/supply/reserve/reserve_list.vue

@@ -19,8 +19,8 @@
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="产品编码" prop="goodsNum">
-                <el-input v-model="screenForm.goodsNum" placeholder="请输入产品编码"></el-input>
+              <el-form-item label="物料编码" prop="goodsNum">
+                <el-input v-model="screenForm.goodsNum" placeholder="请输入物料编码"></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">