1

src/components/makeBOM/index.vue

@@ -168,7 +168,7 @@
             </el-table-column>
             <el-table-column label="操作" align="center" fixed="right" width="80">
               <template #default="{ $index }">
-                <el-button type="primary" @click="clickDelete($index)" text>删除</el-button>
+                <el-button type="danger" @click="clickDelete($index)" text>删除</el-button>
               </template>
             </el-table-column>
           </el-table>

src/components/makeGroupProduct/index.vue

@@ -168,7 +168,7 @@
             </el-table-column>
             <el-table-column label="操作" align="center" fixed="right" width="60">
               <template #default="{ $index }">
-                <el-button type="primary" @click="clickDelete($index)" text>删除</el-button>
+                <el-button type="danger" @click="clickDelete($index)" text>删除</el-button>
               </template>
             </el-table-column>
           </el-table>

src/components/makeProduct/index.vue

@@ -47,7 +47,8 @@
                                 placeholder="数量"
                                 style="width: 100%"
                                 :controls="false"
-                                :min="0" />
+                                :min="0"
+                                :precision="0" />
                             </el-form-item>
                           </template>
                         </el-table-column>
@@ -77,7 +78,8 @@
                                 placeholder="数量"
                                 style="width: 100%"
                                 :controls="false"
-                                :min="0" />
+                                :min="0"
+                                :precision="0" />
                             </el-form-item>
                           </template>
                         </el-table-column>
@@ -228,7 +230,7 @@
             </el-table-column>
             <el-table-column label="操作" align="center" fixed="right" width="60">
               <template #default="{ $index }">
-                <el-button type="primary" @click="clickDelete($index)" text>删除</el-button>
+                <el-button type="danger" @click="clickDelete($index)" text>删除</el-button>
               </template>
             </el-table-column>
           </el-table>

src/views/group/BOM/classification/index.vue

@@ -26,7 +26,7 @@
           <div>
             <el-button type="primary" @click="addChildNode(row)" text>添加子节点</el-button>
             <el-button type="primary" @click="clickUpdate(row)" v-if="row.parentId" text>编辑</el-button>
-            <el-button type="primary" @click="clickDelete(row)" v-if="row.parentId" text>删除</el-button>
+            <el-button type="danger" @click="clickDelete(row)" v-if="row.parentId" text>删除</el-button>
           </div>
         </template>
       </el-table-column>

src/views/group/finance/check-bill/index.vue

@@ -62,7 +62,7 @@
               <el-table-column label="包材费 ¥" prop="packagingMaterialCost" align="right" width="100" />
               <el-table-column label="操作" align="center" fixed="right" width="60">
                 <template #default="{ $index }">
-                  <el-button type="primary" @click="clickOrderDelete($index)" text>删除</el-button>
+                  <el-button type="danger" @click="clickOrderDelete($index)" text>删除</el-button>
                 </template>
               </el-table-column>
             </el-table>

src/views/group/product/classification/index.vue

@@ -26,7 +26,7 @@
           <div>
             <el-button type="primary" @click="addChildNode(row)" text>添加子节点</el-button>
             <el-button type="primary" @click="clickUpdate(row)" v-if="row.parentId" text>编辑</el-button>
-            <el-button type="primary" @click="clickDelete(row)" v-if="row.parentId" text>删除</el-button>
+            <el-button type="danger" @click="clickDelete(row)" v-if="row.parentId" text>删除</el-button>
           </div>
         </template>
       </el-table-column> -->

src/views/group/selling-price/charging-standard/addOrModify.vue

@@ -127,7 +127,7 @@
             </el-table-column>
             <el-table-column label="操作" align="center" fixed="right" width="80">
               <template #default="{ $index }">
-                <el-button type="primary" @click="clickDelete($index)" text>删除</el-button>
+                <el-button type="danger" @click="clickDelete($index)" text>删除</el-button>
               </template>
             </el-table-column>
           </el-table>

src/views/process/processApproval/index.vue

@@ -6,7 +6,7 @@
           {{ route.query.flowName ? route.query.flowName : "流程标题（发起）" }}
         </div>
         <div class="line"></div>
-        <Subscribe ref="makeDom"></Subscribe>
+        <Subscribe :queryData="queryData.data" v-if="flowForm.flowKey == 'apply_buy'" ref="makeDom"></Subscribe>
       </div>
       <div class="bottom" v-if="route.query.processType != 20">
         <div class="commons-title title">处理意见</div>
@@ -296,7 +296,7 @@ onMounted(async () => {
     }
     .bottom {
       margin-top: 10px;
-      height: 200px;
+      height: 190px;
       background: #fff;
       padding: 20px;
       overflow-y: auto;

src/views/production/warehouse/check/add.vue

@@ -60,7 +60,7 @@
               </el-table-column>
               <el-table-column label="操作" align="center" fixed="right" width="60">
                 <template #default="{ $index }">
-                  <el-button type="primary" @click="clickDelete($index)" text>删除</el-button>
+                  <el-button type="danger" @click="clickDelete($index)" text>删除</el-button>
                 </template>
               </el-table-column>
             </el-table>

src/views/production/warehouse/outbound/add.vue

@@ -58,7 +58,7 @@
               </el-table-column>
               <el-table-column label="操作" align="center" fixed="right" width="60">
                 <template #default="{ $index }">
-                  <el-button type="primary" @click="clickDelete($index)" text>删除</el-button>
+                  <el-button type="danger" @click="clickDelete($index)" text>删除</el-button>
                 </template>
               </el-table-column>
             </el-table>

src/views/production/warehouse/putInStorage/add.vue

@@ -67,7 +67,7 @@
               </el-table-column>
               <el-table-column label="操作" align="center" fixed="right" width="60">
                 <template #default="{ $index }">
-                  <el-button type="primary" @click="clickDelete($index)" text>删除</el-button>
+                  <el-button type="danger" @click="clickDelete($index)" text>删除</el-button>
                 </template>
               </el-table-column>
             </el-table>

src/views/production/warehouse/transfer/index.vue

@@ -62,7 +62,7 @@
               </el-table-column>
               <el-table-column label="操作" align="center" fixed="right" width="60">
                 <template #default="{ $index }">
-                  <el-button type="primary" @click="clickDelete($index)" text>删除</el-button>
+                  <el-button type="danger" @click="clickDelete($index)" text>删除</el-button>
                 </template>
               </el-table-column>
             </el-table>

src/views/subsidiary/order/management/add.vue

@@ -216,7 +216,7 @@
                     </el-table-column>
                     <el-table-column label="操作" align="center" fixed="right" width="60" v-if="!(route.query && route.query.detailId)">
                       <template #default="{}">
-                        <el-button type="primary" @click="clickDelete(index)" text>删除</el-button>
+                        <el-button type="danger" @click="clickDelete(index)" text>删除</el-button>
                       </template>
                     </el-table-column>
                   </el-table>

src/views/system/config/index.vue

@@ -116,7 +116,7 @@
          <el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width">
             <template #default="scope">
                <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:config:edit']" >修改</el-button>
-               <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:config:remove']">删除</el-button>
+               <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:config:remove']">删除</el-button>
             </template>
          </el-table-column>
       </el-table>

src/views/system/dept/index.vue

@@ -71,7 +71,7 @@
             <template #default="scope">
                <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:dept:edit']">修改</el-button>
                <el-button link type="primary" icon="Plus" @click="handleAdd(scope.row)" v-hasPermi="['system:dept:add']">新增</el-button>
-               <el-button v-if="scope.row.parentId != 0" link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:dept:remove']">删除</el-button>
+               <el-button v-if="scope.row.parentId != 0" link type="danger" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:dept:remove']">删除</el-button>
             </template>
          </el-table-column>
       </el-table>

src/views/system/dict/data.vue

@@ -111,7 +111,7 @@
          <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">
             <template #default="scope">
                <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:dict:edit']">修改</el-button>
-               <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:dict:remove']">删除</el-button>
+               <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:dict:remove']">删除</el-button>
             </template>
          </el-table-column>
       </el-table>

src/views/system/dict/index.vue

@@ -71,7 +71,7 @@
       <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">
         <template #default="scope">
           <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:dict:edit']">修改</el-button>
-          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:dict:remove']">删除</el-button>
+          <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:dict:remove']">删除</el-button>
         </template>
       </el-table-column>
     </el-table>

src/views/system/menu/index.vue

@@ -55,7 +55,7 @@
         <template #default="scope">
           <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:menu:edit']">修改</el-button>
           <el-button link type="primary" icon="Plus" @click="handleAdd(scope.row)" v-hasPermi="['system:menu:add']">新增</el-button>
-          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:menu:remove']">删除</el-button>
+          <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:menu:remove']">删除</el-button>
         </template>
       </el-table-column>
     </el-table>

src/views/system/notice/index.vue

@@ -96,7 +96,7 @@
          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
             <template #default="scope">
                <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:notice:edit']">修改</el-button>
-               <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:notice:remove']" >删除</el-button>
+               <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:notice:remove']" >删除</el-button>
             </template>
          </el-table-column>
       </el-table>

src/views/system/post/index.vue

@@ -96,7 +96,7 @@
          <el-table-column label="操作" width="180" align="center" class-name="small-padding fixed-width">
             <template #default="scope">
                <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:post:edit']">修改</el-button>
-               <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:post:remove']">删除</el-button>
+               <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:post:remove']">删除</el-button>
             </template>
          </el-table-column>
       </el-table>