Merge branch 'master' of http://git.zthymaoyi.com:3000/gdc/yiliangyiyun-pc

src/views/warehouse/weightedsubsidiary.vue

@@ -120,7 +120,7 @@
         </el-table-column>
         <el-table-column prop="costAfter" label="入库后加权成本" >
           <template slot-scope="scope">
-            <div>{{scope.row.costAfter}}<span v-if='scope.row.grainType'>(改)</span></div>
+            <div>{{scope.row.costAfter}}<span v-if='!scope.row.grainType'>(改)</span></div>
           </template>
         </el-table-column>
         <el-table-column  prop="createDate" label="更新日期">