Merge branch 'master' of http://36.137.93.232:3000/hf/byte-sailing-new

src/views/process/processApproval/index.vue

@@ -118,16 +118,9 @@
             <li
               v-for="item in recordList"
               :key="item.id"
-              :class="
-                item.status == 2
-                  ? 'flow-orange'
-                  : item.status == 3 && !route.query.id
-                  ? 'flow-orange'
-                  : item.status == 3 && route.query.id
-                  ? 'flow-grey'
-                  : ''
-              "
-            >
+              :class="!route.query.id ? '' : 
+                item.status == 2 ? 'flow-orange' : item.status == 3 && !route.query.id ? 'flow-orange' : item.status == 3 && route.query.id ? 'flow-grey' : ''
+              ">
               <div class="left-icon">
                 <i class="iconfont icon-iconm_daick"></i>
                 <i class="iconfont icon-icomx_quertj1 right-btm-status"></i>

src/views/production/factory/farm/index.vue

@@ -74,11 +74,11 @@ const sourceList = ref({
 let dialogVisible = ref(false);
 let modalType = ref("add");
 let rules = ref({
-  type: [{ required: true, message: "请选择车间类型", trigger: "change" }],
+  type: [{ required: true, message: "请选择车间类型", trigger: "blur" }],
   name: [{ required: true, message: "请输入车间名称", trigger: "blur" }],
-  personLiableId: [
-    { required: true, message: "请选择负责人", trigger: "change" },
-  ],
+  // personLiableId: [
+  //   { required: true, message: "请选择负责人", trigger: "change" },
+  // ],
 });
 const { proxy } = getCurrentInstance();
 const selectConfig = reactive([