报工查询页面、产线选择下拉框调整

cuilei

昨天 8e451b57702434dcf0ec9deb2e7398d235970260

报工查询页面、产线选择下拉框调整

 src/views/mes/MesKittingCompletenessCheckList.vue

@@ -6,14 +6,15 @@
        <a-row :gutter="24">
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
            <a-form-item label="产线">
              <j-tree-select dict="base_factory,factory_name,id" pid-field="parent_id"
                             v-model="queryParam.factoryId" style="width: 100%"></j-tree-select>
<!--              <j-search-select-tag placeholder="请选择产线" v-model="queryParam.factoryId" dict="base_factory,factory_name,id,del_flag=0"></j-search-select-tag>-->
              <j-search-select-tag placeholder="请选择" v-model="queryParam.factoryId"
                                   dict="base_factory,factory_name,id,del_flag=0 and factory_category = '3'"
              ></j-search-select-tag>
            </a-form-item>
          </a-col>
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
            <a-form-item label="工单号">
              <j-search-select-tag placeholder="请输入工工单号" v-model="queryParam.workOrderId" dict="mes_production_work_order,work_order_code,id,del_flag=0 and work_order_status != 'NEW'"></j-search-select-tag>
              <j-search-select-tag placeholder="请输入工工单号" v-model="queryParam.workOrderId"
                                   dict="mes_production_work_order,work_order_code,id,del_flag=0 and work_order_status != 'NEW'"></j-search-select-tag>
            </a-form-item>
          </a-col>
          <a-col :xl="6" :lg="7" :md="8" :sm="24">

 src/views/mes/MesMaterialLoadingListView.vue

@@ -6,8 +6,9 @@
        <a-row :gutter="24">
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
            <a-form-item label="产线">
              <j-tree-select placeholder="请选择产线" dict="base_factory,factory_name,id" pid-field="parent_id"
                             v-model="queryParam.factoryId" style="width: 100%"></j-tree-select>
              <j-search-select-tag placeholder="请选择" v-model="queryParam.factoryId"
                                   dict="base_factory,factory_name,id,del_flag=0 and factory_category = '3'"
              ></j-search-select-tag>
            </a-form-item>
          </a-col>
          <a-col :xl="6" :lg="7" :md="8" :sm="24">

 src/views/mes/MesProductionWorkOrderListView.vue

@@ -6,8 +6,9 @@
        <a-row :gutter="24">
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
            <a-form-item label="产线">
              <j-tree-select dict="base_factory,factory_name,id" pid-field="parent_id"
                             v-model="queryParam.factoryId" style="width: 100%"></j-tree-select>
              <j-search-select-tag placeholder="请选择" v-model="queryParam.factoryId"
                                   dict="base_factory,factory_name,id,del_flag=0 and factory_category = '3'"
              ></j-search-select-tag>
            </a-form-item>
          </a-col>
          <a-col :xl="6" :lg="7" :md="8" :sm="24">

 src/views/mes/MesWorkReportingList.vue

@@ -5,6 +5,13 @@
      <a-form layout="inline" @keyup.enter.native="searchQuery">
        <a-row :gutter="24">
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
            <a-form-item label="产线">
              <j-search-select-tag placeholder="请选择" v-model="queryParam.factoryId"
                                   dict="base_factory,factory_name,id,del_flag=0 and factory_category = '3'"
              ></j-search-select-tag>
            </a-form-item>
          </a-col>
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
            <a-form-item label="订单号">
              <j-search-select-tag placeholder="请输入订单号" v-model="queryParam.orderId"
                                   dict="mes_production_order,order_code,id"
@@ -14,46 +21,41 @@
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
            <a-form-item label="工单号">
              <j-search-select-tag placeholder="请输入工单号" v-model="queryParam.workOrderId"
                                   dict="mes_production_work_order,work_order_code,id"
                                   dict="mes_production_work_order,work_order_code,id,del_flag=0 and work_order_status != 'NEW'"
              ></j-search-select-tag>
            </a-form-item>
          </a-col>
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
            <a-form-item label="产线名称">
              <j-search-select-tag
                dict="base_factory,factory_name,id"
                placeholder="请选择产线名称"
                v-model="queryParam.factoryId"
                display="factoryName"
                codeField="id"
              />
          <template v-if="toggleSearchStatus">
            <a-col :xl="6" :lg="7" :md="8" :sm="24">
              <a-form-item label="批次号">
                <j-input placeholder="请输入批次号" v-model="queryParam.batchNumber"></j-input>
              </a-form-item>
            </a-col>
            <a-col :xl="6" :lg="7" :md="8" :sm="24">
              <a-form-item label="托号">
                <j-input placeholder="请输入托号" v-model="queryParam.palletNumber"></j-input>
              </a-form-item>
            </a-col>
            <a-col :xl="6" :lg="7" :md="8" :sm="24">
              <a-form-item label="报工人">
                <j-select-user-by-dep placeholder="请输入报工人" v-model="queryParam.reporter"></j-select-user-by-dep>
              </a-form-item>
            </a-col><a-col :xl="6" :lg="7" :md="8" :sm="24">
            <a-form-item label="线边仓">
              <j-search-select-tag placeholder="请输入线边仓名称" v-model="queryParam.warehouseId"
                                   dict="base_line_side_warehouse,warehouse_name,id,del_flag=0 and warehouse_status = '1'"
              ></j-search-select-tag>
            </a-form-item>
          </a-col>
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
            <a-form-item label="批次号">
              <j-input placeholder="请输入批次号" v-model="queryParam.batchNumber"></j-input>
            </a-form-item>
          </a-col>
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
            <a-form-item label="托号">
              <j-input placeholder="请输入托号" v-model="queryParam.palletNumber"></j-input>
            </a-form-item>
          </a-col>
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
            <a-form-item label="报工人">
              <j-select-user-by-dep placeholder="请输入报工人" v-model="queryParam.reporter"></j-select-user-by-dep>
            </a-form-item>
          </a-col><a-col :xl="6" :lg="7" :md="8" :sm="24">
          <a-form-item label="线边仓">
            <j-search-select-tag placeholder="请输入线边仓名称" v-model="queryParam.warehouseId"
                                 dict="base_line_side_warehouse,warehouse_name,id"
            ></j-search-select-tag>
          </a-form-item>
        </a-col>
          </template>
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
              <a-button type="info" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
              <a @click="handleToggleSearch" style="margin-left: 8px">
                {{ toggleSearchStatus ? '收起' : '展开' }}
                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
              </a>
            </span>
          </a-col>
        </a-row>
@@ -73,10 +75,10 @@

    <!-- table区域-begin -->
    <div>
      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
      </div>
<!--      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">-->
<!--        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项-->
<!--        <a style="margin-left: 24px" @click="onClearSelected">清空</a>-->
<!--      </div>-->

      <a-table
        ref="table"
@@ -88,7 +90,7 @@
        :dataSource="dataSource"
        :pagination="ipagination"
        :loading="loading"
        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
        :rowSelection="null"
        class="j-table-force-nowrap"
        @change="handleTableChange">

@@ -168,17 +170,17 @@
            }
          },
          {
            title:'订单ID',
            title:'生产订单号',
            align:"center",
            dataIndex: 'orderId_dictText'
          },
          {
            title:'工单ID',
            title:'排产工单号',
            align:"center",
            dataIndex: 'workOrderId_dictText'
          },
          {
            title:'产线ID',
            title:'产线',
            align:"center",
            dataIndex: 'factoryId_dictText'
          },
@@ -198,6 +200,11 @@
            dataIndex: 'quantity'
          },
          {
            title:'线边仓',
            align:"center",
            dataIndex: 'warehouseId_dictText'
          },
          {
            title:'报工人',
            align:"center",
            dataIndex: 'reporter'
@@ -207,24 +214,19 @@
            align:"center",
            dataIndex: 'reportTime'
          },
          {
            title:'线边仓ID',
            align:"center",
            dataIndex: 'warehouseId_dictText'
          },
          {
            title:'成品下线打印状态',
            align:"center",
            dataIndex: 'printStatus_dictText'
          },
          {
            title: '操作',
            dataIndex: 'action',
            align:"center",
            fixed:"right",
            width:147,
            scopedSlots: { customRender: 'action' }
          }
          // {
          //   title:'成品下线打印状态',
          //   align:"center",
          //   dataIndex: 'printStatus_dictText'
          // },
          // {
          //   title: '操作',
          //   dataIndex: 'action',
          //   align:"center",
          //   fixed:"right",
          //   width:147,
          //   scopedSlots: { customRender: 'action' }
          // }
        ],
        url: {
          list: "/mes/mesWorkReporting/list",

 src/views/mes/modules/MesProductionWorkOrderScheduleModal.vue

@@ -19,8 +19,9 @@
              <a-row :gutter="12">
                <a-col :span="7">
                  <a-form-item label="产线" :label-col="{span: 6}" :wrapper-col="{span: 18}">
                    <j-tree-select dict="base_factory,factory_name,id" pid-field="parent_id"
                                   v-model="queryParam.factoryId" style="width: 100%"></j-tree-select>
                    <j-search-select-tag placeholder="请选择" v-model="queryParam.factoryId"
                                         dict="base_factory,factory_name,id,del_flag=0 and factory_category = '3'"
                    ></j-search-select-tag>
                  </a-form-item>
                </a-col>
                <a-col :span="9">