Browse Source

1.冲销:一个状态《部分冲销》隐藏物料凭证年度、是否已开票、行号;2.设备基础信息:资产的原值20%颜色预警,资产按分类排序

duanxiaoduan 1 year ago
parent
commit
9a153e9e77

+ 10 - 1
src/views/asset/basics/index.vue

@@ -83,7 +83,16 @@
             </el-table-column>
             <el-table-column label="牧场" align="center" prop="pastureName" />
             <el-table-column label="设备类别" align="center" prop="eqClassName" />
-            <el-table-column label="设备名称" align="center" prop="eqName" />
+            <el-table-column label="设备名称" align="center" prop="eqName">
+              <template slot-scope="{row}">
+                <div v-if="row.exceed == 1">
+                  <div style="background:#EC808D;display:block;line-height: 50px;">{{ row.eqName }}</div>
+                </div>
+                <div v-else>
+                  <div style="background:#fff;display:block;line-height: 50px;">{{ row.eqName }}</div>
+                </div>
+              </template>
+            </el-table-column>
             <el-table-column label="设备内部编号" align="center" prop="eqCode" />
            <el-table-column label="财务编号" align="center" prop="financeCode" />
             <el-table-column label="规格" align="center" prop="specification" />

+ 1 - 0
src/views/custom/outStock/index.vue

@@ -122,6 +122,7 @@
             <el-table-column   prop="sterilisation" label="冲销状态" min-width="80px" align="center">
               <template slot-scope="scope">
                 <span v-if="scope.row.sterilisation == 1">已冲销</span>
+                <span v-if="scope.row.sterilisation == 2">部分冲销</span>
                 <span v-else>未冲销</span>
               </template>
             </el-table-column>

+ 2 - 1
src/views/custom/returngoods/index.vue

@@ -533,9 +533,10 @@
               <span>{{ scope.row.sumPrice }}</span>
             </template>
           </el-table-column>
-          <el-table-column     prop="dflag" label="冲销状态" min-width="80px" align="center">
+          <el-table-column prop="dflag" label="冲销状态" min-width="80px" align="center">
               <template slot-scope="scope">
                 <span v-if="scope.row.dflag == 1">已冲销</span>
+                <span v-if="scope.row.dflag == 2">部分冲销</span>
                 <span v-else>未冲销</span>
               </template>
             </el-table-column>

+ 1 - 0
src/views/custom/storage/index.vue

@@ -108,6 +108,7 @@
             <el-table-column   prop="sterilisation" label="冲销状态" min-width="80px" align="center">
               <template slot-scope="scope">
                 <span v-if="scope.row.sterilisation == 1">已冲销</span>
+                <span v-if="scope.row.sterilisation == 2">部分冲销</span>
                 <span v-else>未冲销</span>
               </template>
             </el-table-column>