55

src/views/workOrder/components/order-search.vue

@@ -1,6 +1,11 @@
 <!-- 搜索表单 -->
 <template>
-  <el-form label-width="90px" class="ele-form-search" @keyup.enter.native="search" @submit.native.prevent>
+  <el-form
+    label-width="90px"
+    class="ele-form-search"
+    @keyup.enter.native="search"
+    @submit.native.prevent
+  >
     <el-row :gutter="15">
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="关键字:">
@@ -15,61 +20,108 @@
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="计划编号:">
-          <el-input clearable v-model="where.productionPlanCode" placeholder="请输入" />
+          <el-input
+            clearable
+            v-model="where.productionPlanCode"
+            placeholder="请输入"
+          />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="工艺路线:">
-          <el-input clearable v-model="where.produceRoutingName" placeholder="请输入" />
+          <el-input
+            clearable
+            v-model="where.produceRoutingName"
+            placeholder="请输入"
+          />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="产品编码:">
-          <el-input clearable v-model="where.productCode" placeholder="请输入" />
+          <el-input
+            clearable
+            v-model="where.productCode"
+            placeholder="请输入"
+          />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="产品名称:">
-          <el-input clearable v-model="where.productName" placeholder="请输入" />
+          <el-input
+            clearable
+            v-model="where.productName"
+            placeholder="请输入"
+          />
         </el-form-item>
       </el-col>
+
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="状态:">
-          <el-select v-model="where.status" placeholder="请选择" style="width: 100%">
-            <el-option v-for="item in statusOpt" :key="item.value" :label="item.label" :value="item.value">
-            </el-option>
-          </el-select>
+        <el-form-item label="牌号:">
+          <el-input clearable v-model="where.brandNo" placeholder="请输入" />
         </el-form-item>
       </el-col>
+
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="牌号:">
-          <el-input clearable v-model="where.brandNo" placeholder="请输入" />
+        <el-form-item label="状态:">
+          <el-select
+            v-model="where.status"
+            placeholder="请选择"
+            clearable
+             class="ele-block"
+          >
+            <el-option
+              v-for="item in statusOpt"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
         </el-form-item>
       </el-col>
+
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="型号:">
           <el-input clearable v-model="where.model" placeholder="请输入" />
         </el-form-item>
       </el-col>
-      <el-col v-bind="styleResponsive ?  { lg: 6, md: 6 } : { span: 6 }">
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 6 } : { span: 6 }">
         <el-form-item label="创建时间:">
-          <el-date-picker class="w100" v-model="where.createTime" type="daterange" range-separator="至"
-            start-placeholder="开始日期" end-placeholder="结束日期" value-format="yyyy-MM-dd HH:mm:ss"
-            :default-time="['00:00:00', '23:59:59']">
+          <el-date-picker
+            class="w100"
+            v-model="where.createTime"
+            type="daterange"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            :default-time="['00:00:00', '23:59:59']"
+          >
           </el-date-picker>
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 6 } : { span: 6 }">
         <el-form-item label="组织机构:">
-          <auth-selection data-type="Array" v-model="where.deptIds" style="width: 100%"></auth-selection>
+          <auth-selection
+            data-type="Array"
+            v-model="where.deptIds"
+            style="width: 100%"
+          ></auth-selection>
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label-width="0px">
-          <el-button type="primary" icon="el-icon-search" class="ele-btn-icon" @click="search">
+          <el-button
+            type="primary"
+            icon="el-icon-search"
+            class="ele-btn-icon"
+            @click="search"
+          >
             查询
           </el-button>
-          <el-button @click="reset" icon="el-icon-refresh-left" type="primary">重置</el-button>
+          <el-button @click="reset" icon="el-icon-refresh-left" type="primary"
+            >重置</el-button
+          >
         </el-form-item>
       </el-col>
     </el-row>
@@ -77,70 +129,65 @@
 </template>
 
 <script>
+  export default {
+    props: [],
+    data() {
+      // 默认表单数据
+      const defaultWhere = {
+        keyWord: '',
+        code: '',
+        productionPlanCode: '',
+        produceRoutingName: '',
+        productCode: '',
+        productName: '',
+        brandNo: '',
+        model: '',
 
-export default {
-  props: [],
-  data() {
-    // 默认表单数据
-    const defaultWhere = {
-      keyWord: '',
-      code: '',
-      productionPlanCode: '',
-      produceRoutingName: '',
-      productCode: '',
-      productName: '',
-      brandNo: '',
-      model: '',
-
-      status: '',
-      createTime: []
-    };
-    return {
-      // 表单数据
-      where: { ...defaultWhere },
-      statusOpt: [
-        { label: '待下达', value: 8 },
-        { label: '待生产', value: 4 },
-        { label: '生产中', value: 5 }
-      ],
-      teamList: [],
-    };
-  },
-  computed: {
-    // 是否开启响应式布局
-    styleResponsive() {
-      return this.$store.state.theme.styleResponsive;
-    }
-  },
-  watch: {},
-  created() {
-
-   },
-  methods: {
-    /* 搜索 */
-    search() {
-      const where = { ...this.where };
-      if (where.createTime?.length) {
-        where.createTimeStart = where.createTime[0];
-        where.createTimeEnd = where.createTime[1];
-      }
-      delete where.createTime;
-      this.$emit('search', where);
+        status: '',
+        createTime: []
+      };
+      return {
+        // 表单数据
+        where: { ...defaultWhere },
+        statusOpt: [
+          { label: '待下达', value: 8 },
+          { label: '待生产', value: 4 },
+          { label: '生产中', value: 5 }
+        ],
+        teamList: []
+      };
     },
-    /*  重置 */
-    reset() {
-      this.where = { ...this.defaultWhere };
-      this.search();
+    computed: {
+      // 是否开启响应式布局
+      styleResponsive() {
+        return this.$store.state.theme.styleResponsive;
+      }
     },
-
-
-  }
-};
+    watch: {},
+    created() {},
+    methods: {
+      /* 搜索 */
+      search() {
+        const where = { ...this.where };
+        if (where.createTime?.length) {
+          where.createTimeStart = where.createTime[0];
+          where.createTimeEnd = where.createTime[1];
+        }
+        delete where.createTime;
+        this.$emit('search', where);
+      },
+      /*  重置 */
+      reset() {
+        this.where = { ...this.defaultWhere };
+        this.search();
+      }
+    }
+  };
 </script>
 <style lang="scss" scoped>
-.ele-form-actions {
-  display: flex;
-  align-items: center;
-  justify-content: flex-end;
-}
+  .ele-form-actions {
+    display: flex;
+    align-items: center;
+    justify-content: flex-end;
+  }
 </style>

src/views/workOrder/index.vue

@@ -222,15 +222,8 @@
               message: '请选择班组',
               trigger: ['blur', 'change']
             }
-          ],
-
-          crewIds: [
-            {
-              required: true,
-              message: '请选择人员',
-              trigger: ['blur', 'change']
-            }
           ]
+       
         },
 
         teamList: [],
@@ -525,6 +518,8 @@
       stationChange() {
         this.crewList = []
         this.crewIds = []
+        this.$refs.form.resetFields();
+
         listUserByIds([this.form.teamId]).then((res) => {
           this.crewList = res;
         });