【修改】bug

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

@@ -264,13 +264,7 @@
             min-width="100"
             show-overflow-tooltip
           />
-           <el-table-column
-              align="left"
-              label="业务员"
-              prop="k3ServiceName"
-              min-width="100"
-              show-overflow-tooltip
-            />
+
              <el-table-column
               align="left"
               label="表体业务员"

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

@@ -236,13 +236,7 @@
           min-width="100"
           show-overflow-tooltip
         ></el-table-column>
-         <el-table-column
-              align="left"
-              label="业务员"
-              prop="k3ServiceName"
-              min-width="100"
-              show-overflow-tooltip
-            />
+
              <el-table-column
               align="left"
               label="表体业务员"

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

@@ -438,11 +438,15 @@
           ref="screenForm"
           :model="screenForm"
           label-width="120px"
+           label-position="left"
           size="small"
         >
           <el-row v-if="factor.length && !dataList.length" style="margin: 0 0 20px 0;font-size: 20px;">
             引用销售政策说明：{{ !remark ? factor[0].name : remark }} 配提比例：{{ pop }}
           </el-row>
+          <el-row v-if="factor.length && !dataList.length && factor[0].remark" style="margin: 0 0 20px 0;font-size: 20px;">
+            备注：{{  factor[0].remark}}
+          </el-row>
           <el-row :gutter="20">
             <el-col :xs="24" :sm="12" :lg="11">
               <el-form-item label="销售政策">
@@ -577,7 +581,7 @@
                       <span>   {{ scope.row[col.prop]}}</span>
                     </template>
                     <template v-else>
-                      {{ scope.row[col.prop]}}
+                      {{ scope.row[col.prop] || 0 | numToFixed}}
                     </template>
                   </template>
                 </el-table-column>
@@ -671,7 +675,7 @@
                 show-overflow-tooltip
               >
                 <template slot-scope="scope">
-                  {{ scope.row.qty * scope.row.price   | numToFixed}}
+                  {{ scope.row.qty * scope.row.price || 0 | numToFixed }}
                 </template>
               </el-table-column>
               <el-table-column
@@ -685,10 +689,10 @@
                 <template slot-scope="scope">
                   <template v-if="col.lable=='产品名称' || col.lable =='规格型号'">
                     <CopyButton :copyText="scope.row[col.prop]" />
-                    <span>     {{ scope.row[col.prop]}}</span>
+                    <span>   {{ scope.row[col.prop]}}</span>
                   </template>
                   <template v-else>
-                    {{ scope.row[col.prop]}}
+                    {{ scope.row[col.prop]  || 0 | numToFixed}}
                   </template>
                 </template>
               </el-table-column>

src/views/supply/policy/policy_list.vue

@@ -389,6 +389,8 @@
               min-width="100"
               show-overflow-tooltip
             />
+              <el-table-column align="left" label="备注" prop="itemRemark" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="表头备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column
               align="left"
               label="业务员"