工序维护、工单管理、区域管理、点位管理、任务管理等bug修复与添加生产区域判断

mes/qd/src/views/wms/sch/region/index.vue

@@ -3,17 +3,41 @@
     <!--工具栏-->
     <div class="head-container">
       <div v-if="crud.props.searchToggle">
-        <!-- 搜索 -->
-        <label class="el-form-item-label">模糊搜索</label>
-        <el-input
-          v-model="query.region_code"
-          clearable
-          placeholder="编码、名称"
-          style="width: 185px;"
-          class="filter-item"
-          @keyup.enter.native="crud.toQuery"
-        />
-        <rrOperation :crud="crud" />
+        <el-form
+          :inline="true"
+          class="demo-form-inline"
+          label-position="right"
+          label-width="90px"
+          label-suffix=":"
+        >
+          <el-form-item label="生产区域">
+            <el-select
+              v-model="query.product_area"
+              clearable
+              filterable
+              size="mini"
+              placeholder="区域类型"
+              class="filter-item"
+              @change="crud.toQuery()"
+            >
+              <el-option
+                v-for="item in dict.product_area"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="编码/名称">
+            <el-input
+              v-model="query.region_code"
+              clearable
+              placeholder="输入编码或名称"
+              class="filter-item"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <rrOperation />
+        </el-form>
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <crudOperation :permission="permission" />
@@ -26,6 +50,20 @@
         width="550px"
       >
         <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="100px">
+          <el-form-item label="生产区域" prop="product_area">
+            <el-select
+              v-model="form.product_area"
+              placeholder=""
+              style="width: 370px"
+            >
+              <el-option
+                v-for="item in dict.product_area"
+                :key="item.id"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
           <el-form-item label="区域编码" prop="region_code">
             <el-input v-model="form.region_code" style="width: 370px;" />
           </el-form-item>
@@ -56,13 +94,13 @@
         style="width: 100%;"
         @selection-change="crud.selectionChangeHandler"
       >
-        <el-table-column prop="region_code" label="区域编码" :min-width="flexWidth('region_code',crud.data,'区域编码')"/>
+        <el-table-column prop="region_code" label="区域编码" :min-width="flexWidth('region_code',crud.data,'区域编码')" />
         <el-table-column prop="region_name" label="区域名称" :min-width="flexWidth('region_name',crud.data,'区域名称')" />
         <el-table-column prop="product_area" label="生产区域" :min-width="flexWidth('product_area',crud.data,'生产区域')" />
         <el-table-column prop="point_type_explain" label="点位类型说明" :min-width="flexWidth('point_type_explain',crud.data,'点位类型说明')" />
         <el-table-column prop="point_status_explain" label="点位状态说明" :min-width="flexWidth('point_status_explain',crud.data,'点位状态说明')" />
-        <el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')"/>
-        <el-table-column prop="create_name" label="创建人" :min-width="flexWidth('create_name',crud.data,'创建人')"/>
+        <el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')" />
+        <el-table-column prop="create_name" label="创建人" :min-width="flexWidth('create_name',crud.data,'创建人')" />
         <el-table-column prop="create_time" label="创建时间" :min-width="flexWidth('create_time',crud.data,'创建时间')" />
         <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
           <template slot-scope="scope">
@@ -90,6 +128,7 @@ import pagination from '@crud/Pagination'
 const defaultForm = {
   region_code: null,
   region_name: null,
+  product_area: 'A1',
   point_type_explain: null,
   point_status_explain: null,
   remark: null,
@@ -102,6 +141,7 @@ const defaultForm = {
 }
 export default {
   name: 'Region',
+  dicts: ['product_area'],
   components: { pagination, crudOperation, rrOperation, udOperation },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   cruds() {
@@ -111,6 +151,9 @@ export default {
       idField: 'region_code',
       sort: 'region_code,desc',
       crudMethod: { ...crudRegion },
+      query: {
+        product_area: 'A1'
+      },
       optShow: {
         add: true,
         edit: false,