Finish Hotfix-mo-45

src/views/supply/apply/apply_list.vue

@@ -147,11 +147,29 @@
                   v-if="$checkBtnRole('examine', $route.meta.roles) && scope.row.examineStatus === 'OK'" >
                   <el-button slot="reference" type="text">弃审</el-button>
                 </el-popconfirm>
-                <el-button type="text" @click="toForm(scope.row)" v-if="$checkBtnRole('edit', $route.meta.roles) && (scope.row.examineStatus === 'SAVE' || scope.row.examineStatus === 'FAIL')">编辑</el-button>
-                <el-button type="text" @click="toExamine(scope.row)" v-if="$checkBtnRole('examine', $route.meta.roles) && scope.row.examineStatus === 'WAIT'">审单</el-button>
-                <el-button type="text" @click="toDetail(scope.row)">详情</el-button>
-                <el-popconfirm style="margin-left: 10px;" title="确定删除吗？" @onConfirm="handleDelete(scope.row.id)"  v-if="$checkBtnRole('del', $route.meta.roles) && scope.row.examineStatus !== 'OK'">
-                  <el-button slot="reference" type="text">删除</el-button>
+                <el-button 
+                  type="text" 
+                  @click="toForm(scope.row)" 
+                  v-if="$checkBtnRole('edit', $route.meta.roles) && (scope.row.examineStatus === 'SAVE' || scope.row.examineStatus === 'FAIL')">
+                  编辑
+                </el-button>
+                <el-button 
+                  type="text" 
+                  @click="toExamine(scope.row)" 
+                  v-if="$checkBtnRole('examine', $route.meta.roles) && scope.row.examineStatus === 'WAIT'">
+                  审单
+                </el-button>
+                <el-button 
+                  type="text" 
+                  @click="toDetail(scope.row)">
+                  详情
+                </el-button>
+                <el-popconfirm
+                  style="margin-left: 10px;" 
+                  title="确定删除吗？" 
+                  @onConfirm="handleDelete(scope.row.id)"  
+                  v-if="$checkBtnRole('del', $route.meta.roles) && scope.row.examineStatus !== 'OK'">
+                  <el-button slot="reference" type="text" style="color: #f56c6c;">删除</el-button>
                 </el-popconfirm>
               </template>
             </el-table-column>

src/views/supply/apply/engin_list.vue

@@ -149,11 +149,29 @@
                   v-if="$checkBtnRole('examine', $route.meta.roles) && scope.row.examineStatus === 'OK'" >
                   <el-button slot="reference" type="text">弃审</el-button>
                 </el-popconfirm>
-                <el-button type="text" @click="toForm(scope.row)" v-if="$checkBtnRole('edit', $route.meta.roles) && (scope.row.examineStatus === 'SAVE' || scope.row.examineStatus === 'FAIL')">编辑</el-button>
-                <el-button type="text" @click="toExamine(scope.row)" v-if="$checkBtnRole('examine', $route.meta.roles) && scope.row.examineStatus === 'WAIT'">审单</el-button>
-                <el-button type="text" @click="toDetail(scope.row)">详情</el-button>
-                <el-popconfirm style="margin-left: 10px;" title="确定删除吗？" @onConfirm="handleDelete(scope.row.id)" v-if="$checkBtnRole('del', $route.meta.roles)">
-                  <el-button slot="reference" type="text">删除</el-button>
+                <el-button 
+                  type="text" 
+                  @click="toForm(scope.row)" 
+                  v-if="$checkBtnRole('edit', $route.meta.roles) && (scope.row.examineStatus === 'SAVE' || scope.row.examineStatus === 'FAIL')">
+                  编辑
+                </el-button>
+                <el-button 
+                  type="text" 
+                  @click="toExamine(scope.row)" 
+                  v-if="$checkBtnRole('examine', $route.meta.roles) && scope.row.examineStatus === 'WAIT'">
+                  审单
+                </el-button>
+                <el-button 
+                  type="text" 
+                  @click="toDetail(scope.row)">
+                  详情
+                </el-button>
+                <el-popconfirm
+                  style="margin-left: 10px;" 
+                  title="确定删除吗？" 
+                  @onConfirm="handleDelete(scope.row.id)" 
+                  v-if="$checkBtnRole('del', $route.meta.roles)">
+                  <el-button slot="reference" type="text" style="color: #f56c6c;">删除</el-button>
                 </el-popconfirm>
               </template>
             </el-table-column>

src/views/supply/engin/commerce_list.vue

@@ -165,16 +165,35 @@
                   v-if="$checkBtnRole('examine', $route.meta.roles) && scope.row.examineStatus === 'OK'" >
                   <el-button slot="reference" type="text">弃审</el-button>
                 </el-popconfirm>
-                <el-button type="text" @click="toForm(scope.row)" v-if="$checkBtnRole('edit', $route.meta.roles) && scope.row.examineStatus === 'SAVE'">编辑</el-button>
-                <el-button type="text" @click="toExamine(scope.row)" v-if="$checkBtnRole('examine', $route.meta.roles) && scope.row.examineStatus === 'WAIT'">审批</el-button>
-                <el-button type="text" @click="toReturn(scope.row)" v-if="$checkBtnRole('examine', $route.meta.roles)">退订</el-button>
-                <el-button type="text" @click="toDetail(scope.row)">详情</el-button>
+                <el-button 
+                  type="text" 
+                  @click="toForm(scope.row)"
+                  v-if="$checkBtnRole('edit', $route.meta.roles) && scope.row.examineStatus === 'SAVE'">
+                  编辑
+                </el-button>
+                <el-button 
+                  type="text" 
+                  @click="toExamine(scope.row)" 
+                  v-if="$checkBtnRole('examine', $route.meta.roles) && scope.row.examineStatus === 'WAIT'">
+                  审批
+                </el-button>
+                <el-button 
+                  type="text" 
+                  @click="toReturn(scope.row)" 
+                  v-if="$checkBtnRole('examine', $route.meta.roles)">
+                  退订
+                </el-button>
+                <el-button 
+                  type="text" 
+                  @click="toDetail(scope.row)">
+                  详情
+                </el-button>
                 <el-popconfirm
                   style="margin-left: 10px;" 
                   title="确定删除吗？"
                   @onConfirm="handleDelete(scope.row.parentId)" 
                   v-if="$checkBtnRole('del', $route.meta.roles) && scope.row.examineStatus !== 'OK'">
-                  <el-button slot="reference" type="text">删除</el-button>
+                  <el-button slot="reference" type="text" style="color: #f56c6c;">删除</el-button>
                 </el-popconfirm>
               </template>
             </el-table-column>

src/views/supply/engin/engin_list.vue

@@ -132,15 +132,29 @@
                   v-if="$checkBtnRole('apply', $route.meta.roles) && scope.row.examineStatus === 'WAIT'" >
                   <el-button slot="reference" type="text">撤回</el-button>
                 </el-popconfirm>
-                <el-button type="text" @click="toForm(scope.row)" v-if="$checkBtnRole('edit', $route.meta.roles) && scope.row.examineStatus === 'SAVE'">编辑</el-button>
-                <el-button type="text" @click="toExamine(scope.row)" v-if="$checkBtnRole('examine', $route.meta.roles) && scope.row.examineStatus === 'WAIT'">审批</el-button>
-                <el-button type="text" @click="toDetail(scope.row)">详情</el-button>
+                <el-button 
+                  type="text" 
+                  @click="toForm(scope.row)" 
+                  v-if="$checkBtnRole('edit', $route.meta.roles) && scope.row.examineStatus === 'SAVE'">
+                  编辑
+                </el-button>
+                <el-button 
+                  type="text" 
+                  @click="toExamine(scope.row)" 
+                  v-if="$checkBtnRole('examine', $route.meta.roles) && scope.row.examineStatus === 'WAIT'">
+                  审批
+                </el-button>
+                <el-button 
+                  type="text" 
+                  @click="toDetail(scope.row)">
+                  详情
+                </el-button>
                 <el-popconfirm 
                   style="margin-left: 10px;" 
                   title="确定删除吗？" 
                   @onConfirm="handleDelete(scope.row.enginInfoId)" 
                   v-if="$checkBtnRole('del', $route.meta.roles) && scope.row.examineStatus !== 'OK'">
-                  <el-button slot="reference" type="text">删除</el-button>
+                  <el-button slot="reference" type="text" style="color: #f56c6c;">删除</el-button>
                 </el-popconfirm>
               </template>
             </el-table-column>

src/views/supply/engin/home_list.vue

@@ -165,16 +165,35 @@
                   v-if="$checkBtnRole('examine', $route.meta.roles) && scope.row.examineStatus === 'OK'" >
                   <el-button slot="reference" type="text">弃审</el-button>
                 </el-popconfirm>
-                <el-button type="text" @click="toForm(scope.row)" v-if="$checkBtnRole('edit', $route.meta.roles) && (scope.row.examineStatus === 'SAVE' || scope.row.examineStatus === 'FAIL')">编辑</el-button>
-                <el-button type="text" @click="toExamine(scope.row)" v-if="$checkBtnRole('examine', $route.meta.roles) && scope.row.examineStatus === 'WAIT'">审批</el-button>
-                <el-button type="text" @click="toReturn(scope.row)" v-if="$checkBtnRole('examine', $route.meta.roles) && scope.row.examineStatus !== 'FAIL'">退订</el-button>
-                <el-button type="text" @click="toDetail(scope.row)">详情</el-button>
+                <el-button 
+                  type="text" 
+                  @click="toForm(scope.row)" 
+                  v-if="$checkBtnRole('edit', $route.meta.roles) && (scope.row.examineStatus === 'SAVE' || scope.row.examineStatus === 'FAIL')">
+                  编辑
+                </el-button>
+                <el-button 
+                  type="text" 
+                  @click="toExamine(scope.row)" 
+                  v-if="$checkBtnRole('examine', $route.meta.roles) && scope.row.examineStatus === 'WAIT'">
+                  审批
+                </el-button>
+                <el-button 
+                  type="text" 
+                  @click="toReturn(scope.row)" 
+                  v-if="$checkBtnRole('examine', $route.meta.roles) && scope.row.examineStatus !== 'FAIL'">
+                  退订
+                </el-button>
+                <el-button 
+                  type="text" 
+                  @click="toDetail(scope.row)">
+                  详情
+                </el-button>
                 <el-popconfirm 
                   style="margin-left: 10px;" 
                   title="确定删除吗？" 
                   @onConfirm="handleDelete(scope.row.parentId)" 
                   v-if="$checkBtnRole('del', $route.meta.roles) && scope.row.examineStatus !== 'OK'">
-                  <el-button slot="reference" type="text">删除</el-button>
+                  <el-button slot="reference" type="text" style="color: #f56c6c;">删除</el-button>
                 </el-popconfirm>
               </template>
             </el-table-column>

src/views/supply/reserve/components/reserve_detail.vue

@@ -57,6 +57,7 @@
           <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="center" label="原预留数量" prop="oldNum" min-width="100" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="预留数量" prop="reservedNum" min-width="100" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="订单数量" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="预留仓库" prop="correspondName" min-width="100" show-overflow-tooltip></el-table-column>
@@ -140,7 +141,7 @@ export default {
       getDetail({id: this.listItem.id}).then(res => {
         if(res.data.reservedOrderItems) {
           res.data.reservedOrderItems.forEach(item => {
-            item.sums1 = ['reservedNum', 'qty'];
+            item.sums1 = ['oldNum', 'reservedNum', 'qty'];
             item.sums2 = [];
           })
         }

src/views/supply/reserve/reserve_list.vue

@@ -108,6 +108,7 @@
             <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="oldNum" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="right" label="预留数量" prop="reservedNum" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="right" label="开单数量" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
@@ -241,7 +242,7 @@ export default {
       };
       getList(params).then((res) => {
         res.data.records.forEach(item => {
-          item.sums1 = ['reservedNum', 'qty'];
+          item.sums1 = ['oldNum', 'reservedNum', 'qty'];
           item.sums2 = [];
         })
         this.dataList = res.data.records;