Merge tag 'Hotfix-zh-158' into develop

Finish Hotfix-zh-158

src/views/supply/apply/components/apply_detail.vue

@@ -35,7 +35,7 @@
           </el-col>
             <el-col :span="16" class="item">
             <div class="label">文件编号</div>
-            <div class="value">{{detailData.fiileNo}}</div>
+            <div class="value">{{detailData.fileNo}}</div>
           </el-col>
           <el-col :span="24" class="item">
             <div class="label">备注</div>
@@ -128,7 +128,7 @@
               {{scope.row.totalDiscAmount | numToFixed}}
             </template>
           </el-table-column>
-          <el-table-column align="right" label="政策说明" prop="policyTitle" min-width="100" show-overflow-tooltip></el-table-column>
+          <el-table-column align="right" label="销售政策名称" prop="policyTitle" min-width="100" show-overflow-tooltip></el-table-column>
 
           <el-table-column align="right" label="申请数量" prop="invoiceNum" min-width="100" show-overflow-tooltip></el-table-column>
           <el-table-column align="right" label="审批数量" prop="approvalNumber" min-width="100" show-overflow-tooltip></el-table-column>

src/views/supply/apply/components/apply_examine.vue

@@ -36,6 +36,11 @@
           <div class="label">备注</div>
           <div class="value">{{detailData.remark}}</div>
         </el-col>
+
+            <el-col :span="24" class="item">
+            <div class="label">文件编号</div>
+            <div class="value">{{detailData.fileNo}}</div>
+          </el-col>
         <el-col :span="24" class="item file">
           <div class="label">附件</div>
           <div class="value">
@@ -114,6 +119,8 @@
             <el-input v-model="scope.row.invoiceRemark" size="small"></el-input>
           </template>
         </el-table-column>
+                  <el-table-column align="right" label="销售政策名称" prop="policyTitle" min-width="100" show-overflow-tooltip></el-table-column>
+
         <el-table-column align="left" label="业务员" prop="serviceName" 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>
       </el-table>

src/views/supply/apply/components/engin_detail.vue

@@ -38,8 +38,8 @@
             <div class="value">{{detailData.refProjectName}}</div>
           </el-col>
         <el-col :span="8" class="item">
-            <div class="label">文件编码</div>
-            <div class="value">{{detailData.itemFileNo}}</div>
+            <div class="label">文件编号</div>
+            <div class="value">{{detailData.fileNo}}</div>
           </el-col>
 
 

src/views/supply/apply/engin_list.vue

@@ -172,6 +172,8 @@
               </template>
             </el-table-column>
             <el-table-column align="left" label="项目名称" prop="refProjectName" min-width="120" show-overflow-tooltip></el-table-column>
+                        <el-table-column align="left" label="项目类别" prop="refProjectCategory" min-width="120" show-overflow-tooltip></el-table-column>
+
             <el-table-column align="left" label="使用单位" prop="refUseUnit" min-width="120" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="经销商编码" prop="customerNumber" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">

src/views/supply/implement/implement_list.vue

@@ -201,9 +201,9 @@
             <el-table-column align="left" label="表头业务员" prop="serviceName" min-width="100" show-overflow-tooltip></el-table-column>
            <el-table-column align="left" label="表体业务员" prop="itemServiceName" min-width="100" show-overflow-tooltip></el-table-column>
           <el-table-column align="left" label="归属业务员" prop="newServiceName" min-width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="订单备注" prop="headerRemark" 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="表体备注" prop="invoiceRemark" min-width="160" show-overflow-tooltip></el-table-column>
+            <!-- <el-table-column align="left" label="订单备注" prop="headerRemark" 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="表体备注" prop="itemRemark" min-width="160" show-overflow-tooltip></el-table-column>
           </el-table>
         </div>
       </div>

src/views/supply/implement/implement_total_list.vue

@@ -199,9 +199,9 @@
             <el-table-column align="left" label="表头业务员" prop="serviceName" min-width="100" show-overflow-tooltip></el-table-column>
            <el-table-column align="left" label="表体业务员" prop="itemServiceName" min-width="100" show-overflow-tooltip></el-table-column>
           <el-table-column align="left" label="归属业务员" prop="newServiceName" min-width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="订单备注" prop="headerRemark" 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="表体备注" prop="invoiceRemark" min-width="160" show-overflow-tooltip></el-table-column>
+            <!-- <el-table-column align="left" label="订单备注" prop="headerRemark" 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="表体备注" prop="itemRemark" min-width="160" show-overflow-tooltip></el-table-column>
           </el-table>
         </div>
       </div>