Merge remote-tracking branch 'origin/master'

src/views/basic/product/product.vue

@@ -143,12 +143,16 @@
             <el-table-column label="生产企业" prop="ylqxzcrbarmc" width="180" show-overflow-tooltip></el-table-column>
             <el-table-column label="集采状态" prop="groupBuy" width="120" show-overflow-tooltip>
               <template slot-scope="scope">
+              <el-tag :type="(scope.row.groupBuy) | statusFilterType">
                 {{ groupBuyMap[scope.row.groupBuy] }}
+              </el-tag>
               </template>
             </el-table-column>
             <el-table-column label="可配送状态" prop="dispatch" width="120" show-overflow-tooltip>
               <template slot-scope="scope">
-                {{ dispatchMap[scope.row.dispatch] }}
+                <el-tag :type="(scope.row.dispatch) | statusFilterType">
+                  {{ dispatchMap[scope.row.dispatch] }}
+                </el-tag>
               </template>
             </el-table-column>
             <el-table-column width="180" label="操作" fixed="right">
@@ -1282,6 +1286,16 @@ export default {
       useNumEnable: true,
     };
   },
+  filters: {
+
+    statusFilterType(status) {
+      const statusMap = {
+        false: "warning",
+        true: "success",
+      };
+      return statusMap[status];
+    },
+  },
 
   methods: {
     onReset() {

src/views/inventory/addInvRemindSetDialog.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-form :model="formData" label-width="200px" style="margin-bottom: -15px">
+    <el-form :model="formData" label-width="200px" >
       <el-row>
         <el-col :span="10">
           <el-form-item class="query-form-item" label="仓库：">