Finish Hotfix-mo-50

src/components/Common/check-order.vue

@@ -40,7 +40,7 @@
             {{ scope.row.noTotalAmount | numToFixed }}
           </template>
         </el-table-column>
-        <el-table-column align="right" label="单价" prop="afterTaxPrice" min-width="100" show-overflow-tooltip>
+        <el-table-column align="right" label="无税单价" prop="afterTaxPrice" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.afterTaxPrice | numToFixed }}
           </template>

src/views/supply/engin/components/home_detail.vue

@@ -83,11 +83,19 @@
             <!-- <el-col :span="24" class="item">
               <div class="label">格力回复</div>
               <div class="value">{{detailData.note1}}</div>
+            </el-col> -->
+            <el-col :span="16" class="item">
+              <div class="label">项目说明</div>
+              <div class="value">{{detailData.refProjectNote}}</div>
+            </el-col>
+            <el-col :span="8" class="item">
+              <div class="label">项目类型</div>
+              <div class="value">{{detailData.refProjectType}}</div>
             </el-col>
             <el-col :span="24" class="item">
               <div class="label">格力内部备注</div>
-              <div class="value">{{detailData.note2}}</div>
-            </el-col> -->
+              <div class="value">{{detailData.geLiInerNote}}</div>
+            </el-col>
             <el-col :span="16" class="item">
               <div class="label">备注</div>
               <div class="value">{{detailData.remark}}</div>

src/views/supply/engin/components/home_examine.vue

@@ -96,6 +96,18 @@
           </div>
         </el-col> -->
         <el-col :span="16" class="item">
+          <div class="label">项目说明</div>
+          <div class="value">{{detailData.refProjectNote}}</div>
+        </el-col>
+        <el-col :span="8" class="item">
+          <div class="label">项目类型</div>
+          <div class="value">{{detailData.refProjectType}}</div>
+        </el-col>
+        <el-col :span="24" class="item">
+          <div class="label">格力内部备注</div>
+          <div class="value">{{detailData.geLiInerNote}}</div>
+        </el-col>
+        <el-col :span="16" class="item">
           <div class="label">备注</div>
           <div class="value">{{detailData.remark}}</div>
         </el-col>

src/views/supply/engin/components/home_return.vue

@@ -84,6 +84,19 @@
           <div class="label">格力内部备注</div>
           <div class="value">{{detailData.note2}}</div>
         </el-col> -->
+
+        <el-col :span="16" class="item">
+          <div class="label">项目说明</div>
+          <div class="value">{{detailData.refProjectNote}}</div>
+        </el-col>
+        <el-col :span="8" class="item">
+          <div class="label">项目类型</div>
+          <div class="value">{{detailData.refProjectType}}</div>
+        </el-col>
+        <el-col :span="24" class="item">
+          <div class="label">格力内部备注</div>
+          <div class="value">{{detailData.geLiInerNote}}</div>
+        </el-col>
         <el-col :span="16" class="item">
           <div class="label">备注</div>
           <div class="value">{{detailData.remark}}</div>

src/views/supply/engin/home_list.vue

@@ -137,7 +137,7 @@
                 <div v-else>{{scope.row.rebateAmount | numToFixed}}</div>
               </template>
             </el-table-column>
-            <el-table-column align="center" label="业务员" prop="aaa" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="业务员" prop="serviceName" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="制表人" prop="createName" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="制表日期" prop="createTime" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="审核人" prop="confirmName" min-width="100" show-overflow-tooltip></el-table-column>