Merge remote-tracking branch 'origin/master'

cuilei

8 天以前 bbbd9a413e668aa3e93b6bdd46d4b5113189bcbc

 src/views/mes/MesProductionOrderList.vue

@@ -4,32 +4,49 @@
    <div class="table-page-search-wrapper">
      <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-input placeholder="请输入生产订单号" v-model="queryParam.orderCode"></j-input>
            </a-form-item>
          </a-col>
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
            <a-form-item label="订单类型">
              <j-dict-select-tag dictCode="production_order_category" placeholder="请选择订单类型"
                                 v-model="queryParam.orderCategory"></j-dict-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.materialNumber"></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.materialName"></j-input>
            </a-form-item>
          </a-col>
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
            <a-form-item label="订单状态">
              <j-dict-select-tag dictCode="production_order_status" placeholder="请选择订单状态"
                                 v-model="queryParam.orderStatus"></j-dict-select-tag>
            </a-form-item>
          </a-col>
          <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="info" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
            </span>
          </a-col>
        </a-row>
      </a-form>
    </div>
    <!-- 查询区域-END -->

    <!-- 操作按钮区域 -->
    <div class="table-operator">
      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
      <a-button type="primary" icon="download" @click="handleExportXls('SAP生产订单')">导出</a-button>
      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
        <a-button type="primary" icon="import">导入</a-button>
      </a-upload>
      <!-- 高级查询区域 -->
      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
      <a-dropdown v-if="selectedRowKeys.length > 0">
        <a-menu slot="overlay">
          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
        </a-menu>
        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
      </a-dropdown>
    </div>

    <!-- 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>项
        <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>

@@ -46,46 +63,11 @@
        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
        class="j-table-force-nowrap"
        @change="handleTableChange">

        <template slot="htmlSlot" slot-scope="text">
          <div v-html="text"></div>
        </template>
        <template slot="imgSlot" slot-scope="text,record">
          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
        </template>
        <template slot="fileSlot" slot-scope="text">
          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
          <a-button
            v-else
            :ghost="true"
            type="primary"
            icon="download"
            size="small"
            @click="downloadFile(text)">
            下载
          </a-button>
        </template>

        <span slot="action" slot-scope="text, record">
          <a @click="handleEdit(record)">编辑</a>

          <a-divider type="vertical" />
          <a-dropdown>
            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
            <a-menu slot="overlay">
              <a-menu-item>
                <a @click="handleDetail(record)">详情</a>
              </a-menu-item>
              <a-menu-item>
                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
                  <a>删除</a>
                </a-popconfirm>
              </a-menu-item>
            </a-menu>
          </a-dropdown>
          <a @click="handleDetail(record)">详情</a>
        </span>

      </a-table>
    </div>

@@ -95,180 +77,179 @@

<script>

  import '@/assets/less/TableExpand.less'
  import { mixinDevice } from '@/utils/mixin'
  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
  import MesProductionOrderModal from './modules/MesProductionOrderModal'
  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
import '@/assets/less/TableExpand.less'
import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import MesProductionOrderModal from './modules/MesProductionOrderModal'

  export default {
    name: 'MesProductionOrderList',
    mixins:[JeecgListMixin, mixinDevice],
    components: {
      MesProductionOrderModal
    },
    data () {
      return {
        description: 'SAP生产订单管理页面',
        // 表头
        columns: [
          {
            title: '#',
            dataIndex: '',
            key:'rowIndex',
            width:60,
            align:"center",
            customRender:function (t,r,index) {
              return parseInt(index)+1;
            }
export default {
  name: 'MesProductionOrderList',
  mixins: [JeecgListMixin, mixinDevice],
  components: {
    MesProductionOrderModal
  },
  data() {
    return {
      description: 'SAP生产订单管理页面',
      // 表头
      columns: [
        {
          title: '#',
          dataIndex: '',
          key: 'rowIndex',
          width: 60,
          align: 'center',
          customRender: function(t, r, index) {
            return parseInt(index) + 1
          },
          {
            title:'删除标记',
            align:"center",
            dataIndex: 'delFlag'
          },
          {
            title:'生产订单号',
            align:"center",
            dataIndex: 'orderCode'
          },
          {
            title:'订单类型',
            align:"center",
            dataIndex: 'orderCategory'
          },
          {
            title:'物料编号',
            align:"center",
            dataIndex: 'materialNumber'
          },
          {
            title:'物料名称',
            align:"center",
            dataIndex: 'materialName'
          },
          {
            title:'计划开始日期',
            align:"center",
            dataIndex: 'planStart'
          },
          {
            title:'计划结束日期',
            align:"center",
            dataIndex: 'planEnd'
          },
          {
            title:'订单数量',
            align:"center",
            dataIndex: 'orderQuantity'
          },
          {
            title:'产品单位',
            align:"center",
            dataIndex: 'productionUnit_dictText'
          },
          {
            title:'订单状态',
            align:"center",
            dataIndex: 'orderStatus_dictText'
          },
          {
            title:'优先级',
            align:"center",
            dataIndex: 'priority_dictText'
          },
          {
            title:'计划工艺路线',
            align:"center",
            dataIndex: 'processRoute'
          },
          {
            title:'计划物料清单',
            align:"center",
            dataIndex: 'materialListCode'
          },
          {
            title:'工厂编码',
            align:"center",
            dataIndex: 'factoryCode'
          },
          {
            title:'工厂名称',
            align:"center",
            dataIndex: 'factoryName'
          },
          {
            title:'客户型号',
            align:"center",
            dataIndex: 'customerOrderModel'
          },
          {
            title:'客户名称',
            align:"center",
            dataIndex: 'customer'
          },
          {
            title:'备注',
            align:"center",
            dataIndex: 'remark'
          },
          {
            title: '操作',
            dataIndex: 'action',
            align:"center",
            fixed:"right",
            width:147,
            scopedSlots: { customRender: 'action' }
          }
        ],
        url: {
          list: "/mesproductionwork/mesProductionOrder/list",
          delete: "/mesproductionwork/mesProductionOrder/delete",
          deleteBatch: "/mesproductionwork/mesProductionOrder/deleteBatch",
          exportXlsUrl: "/mesproductionwork/mesProductionOrder/exportXls",
          importExcelUrl: "mesproductionwork/mesProductionOrder/importExcel",
          
          fixed: 'left',
        },
        dictOptions:{},
        superFieldList:[],
      }
    },
    created() {
    this.getSuperFieldList();
    },
    computed: {
      importExcelUrl: function(){
        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
        {
          title: '生产订单号',
          align: 'center',
          dataIndex: 'orderCode',
          fixed: 'left',
        },
        {
          title: '订单类型',
          align: 'center',
          dataIndex: 'orderCategory_dictText',
          fixed: 'left',
        },
        {
          title: '物料编号',
          align: 'center',
          dataIndex: 'materialNumber',
          fixed: 'left',
        },
        {
          title: '物料名称',
          align: 'center',
          dataIndex: 'materialName'
        },
        {
          title: '计划开始日期',
          align: 'center',
          dataIndex: 'planStart'
        },
        {
          title: '计划结束日期',
          align: 'center',
          dataIndex: 'planEnd'
        },
        {
          title: '订单数量',
          align: 'center',
          dataIndex: 'orderQuantity'
        },
        {
          title: '基本计量单位',
          align: 'center',
          dataIndex: 'productionUnit'
        },
        {
          title: '订单状态',
          align: 'center',
          dataIndex: 'orderStatus'
        },
        {
          title: '订单状态描述',
          align: 'center',
          dataIndex: 'orderStatusName'
        },
        {
          title: '优先级',
          align: 'center',
          dataIndex: 'priority'
        },
        {
          title: '计划工艺路线',
          align: 'center',
          dataIndex: 'processRoute'
        },
        {
          title: '计划物料清单',
          align: 'center',
          dataIndex: 'materialListCode'
        },
        {
          title: '工厂编码',
          align: 'center',
          dataIndex: 'factoryCode'
        },
        {
          title: '工厂名称',
          align: 'center',
          dataIndex: 'factoryName'
        },
        {
          title: '调度员编号',
          align: 'center',
          dataIndex: 'dispatcherCode'
        },
        {
          title: '调度员名称',
          align: 'center',
          dataIndex: 'dispatcherName'
        },
        {
          title: '订单创建日期',
          align: 'center',
          dataIndex: 'orderCreateDate'
        },
        {
          title: '订单更新日期',
          align: 'center',
          dataIndex: 'orderUpdateDate'
        },
        {
          title: '订单更新时间',
          align: 'center',
          dataIndex: 'orderUpdateTime'
        },
        {
          title: '订单修改人',
          align: 'center',
          dataIndex: 'orderUpdateUser'
        },
        {
          title: '客户型号',
          align: 'center',
          dataIndex: 'customerOrderModel'
        },
        {
          title: '客户名称',
          align: 'center',
          dataIndex: 'customer'
        },
        {
          title: '备注',
          align: 'center',
          dataIndex: 'remark'
        },
        {
          title: '操作',
          dataIndex: 'action',
          align: 'center',
          fixed: 'right',
          width: 147,
          scopedSlots: { customRender: 'action' }
        }
      ],
      url: {
        list: '/mes/productionOrder/list',
      },
    },
    methods: {
      initDictConfig(){
      },
      getSuperFieldList(){
        let fieldList=[];
        fieldList.push({type:'int',value:'delFlag',text:'删除标记',dictCode:''})
        fieldList.push({type:'string',value:'orderCode',text:'生产订单号',dictCode:''})
        fieldList.push({type:'string',value:'orderCategory',text:'订单类型',dictCode:''})
        fieldList.push({type:'string',value:'materialNumber',text:'物料编号',dictCode:''})
        fieldList.push({type:'string',value:'materialName',text:'物料名称',dictCode:''})
        fieldList.push({type:'datetime',value:'planStart',text:'计划开始日期'})
        fieldList.push({type:'datetime',value:'planEnd',text:'计划结束日期'})
        fieldList.push({type:'double',value:'orderQuantity',text:'订单数量',dictCode:''})
        fieldList.push({type:'string',value:'productionUnit',text:'产品单位',dictCode:'production_unit'})
        fieldList.push({type:'string',value:'orderStatus',text:'订单状态',dictCode:'order_status'})
        fieldList.push({type:'string',value:'priority',text:'优先级',dictCode:'priority'})
        fieldList.push({type:'string',value:'processRoute',text:'计划工艺路线',dictCode:''})
        fieldList.push({type:'string',value:'materialListCode',text:'计划物料清单',dictCode:''})
        fieldList.push({type:'string',value:'factoryCode',text:'工厂编码',dictCode:''})
        fieldList.push({type:'string',value:'factoryName',text:'工厂名称',dictCode:''})
        fieldList.push({type:'string',value:'customerOrderModel',text:'客户型号',dictCode:''})
        fieldList.push({type:'string',value:'customer',text:'客户名称',dictCode:''})
        fieldList.push({type:'string',value:'remark',text:'备注',dictCode:''})
        this.superFieldList = fieldList
      }
      dictOptions: {},
    }
  },
  created() {
  },
  computed: {
  },
  methods: {
  }
}
</script>
<style scoped>
  @import '~@assets/less/common.less';
@import '~@assets/less/common.less';
</style>