Merge tag 'Hotfix-zh-146' into develop

Finish Hotfix-zh-146

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

@@ -41,10 +41,7 @@
             <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.policyTitle}}</div>
-          </el-col>
+
           <el-col :span="24" class="item file">
             <div class="label">附件</div>
             <div class="value">
@@ -127,6 +124,8 @@
               {{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="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>
           <el-table-column align="right" label="已退数量" prop="retiredQty" min-width="100" show-overflow-tooltip v-if="detailData.type !== 2"></el-table-column>

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

@@ -37,10 +37,10 @@
             <div class="label">项目类别</div>
             <div class="value">{{detailData.refProjectName}}</div>
           </el-col>
-<el-col :span="8" class="item">
+        <!-- <el-col :span="8" class="item">
             <div class="label">文件编码</div>
             <div class="value">{{detailData.itemFileNo}}</div>
-          </el-col>
+          </el-col> -->
 
 
           <el-col :span="8" class="item">
@@ -142,8 +142,8 @@
           <el-table-column align="left" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip></el-table-column>
           <el-table-column align="left" label="规格型号" prop="specification" min-width="350" show-overflow-tooltip></el-table-column>
           <el-table-column align="left" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
-             <!-- <el-table-column align="left" label="文件编号" prop="itemFileNo" min-width="200" show-overflow-tooltip>
-            </el-table-column> -->
+             <el-table-column align="left" label="文件编号" prop="itemFileNo" min-width="200" show-overflow-tooltip>
+            </el-table-column>
          <el-table-column align="right" label="含税单价" prop="singlePayPrice" min-width="100" show-overflow-tooltip>
             <template slot-scope="scope">
               {{scope.row.singlePayPrice | numToFixed}}

src/views/supply/deliver/components/deliver_detail.vue

@@ -128,7 +128,8 @@
           <el-table-column align="center" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="规格型号" prop="specification" min-width="160" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="right" label="数量" prop="refundableQty" min-width="100" show-overflow-tooltip></el-table-column>
+
+        <el-table-column align="right" label="数量" prop="refundableQty" min-width="100" show-overflow-tooltip></el-table-column>
           <el-table-column align="right" label="未出库数量" prop="notOutNumber" min-width="100" show-overflow-tooltip></el-table-column>
           <el-table-column align="right" label="含税单价" prop="price" min-width="100" show-overflow-tooltip>
             <template slot-scope="scope">

src/views/supply/deliver/deliver_list.vue

@@ -148,6 +148,7 @@
                 <span>{{scope.row.specification}}</span>
               </template>
             </el-table-column>
+            <!-- <el-table-column align="left" label="文件编号" prop="itemFileNo" min-width="350" show-overflow-tooltip/> -->
             <el-table-column align="right" label="价税合计" prop="payAmount" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{scope.row.payAmount | numToFixed}}