Merge remote-tracking branch 'origin/master'

cuilei

5 天以前 ba77fdc6a30c9ad0941e40319f8c4f6fe6fdf9f1

 src/views/pms/PmsProcessBillMaterialsList.vue

@@ -5,19 +5,24 @@
      <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="订单号">
              <a-input placeholder="请输入订单号" v-model="queryParam.orderCode" allowClear></a-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.materialNumber"></j-input>
              <a-input placeholder="请输入物料编码" v-model="queryParam.materialNumber" allowClear></a-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-input placeholder="请输入物料名称" v-model="queryParam.materialName" allowClear></a-input>
            </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="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>
            </span>
          </a-col>
        </a-row>
@@ -25,24 +30,8 @@
    </div>
    <!-- 查询区域-END -->

    <!-- 操作按钮区域 -->
    <div class="table-operator">
      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
      <!-- 高级查询区域 -->
      <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>项
        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
      </div>

      <a-table
        ref="table"
        size="middle"
@@ -53,189 +42,152 @@
        :dataSource="dataSource"
        :pagination="ipagination"
        :loading="loading"
        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
        class="j-table-force-nowrap"
        :expandedRowKeys.sync="expandedRowKeys"
        @expand="handleExpand"
        @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>

        <a-table
          slot="expandedRowRender"
          slot-scope="text"
          :scroll="{x:true}"
          :columns="innerColumns"
          :data-source="innerData"
          :pagination="false"
        ></a-table>
        <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>
        </span>
        <span slot="figureNum" slot-scope="text, record">
          <span v-if="record.materialNumber == null || '' == record.materialNumber">无数据</span>
          <span v-else>
            <a-popover placement="top" :title="'物料基本信息:'" arrow-point-at-center>
              <template slot="content">
              </template>
              <a-button class="fontweight" style="font-weight: bold;color: inherit;" @click="handleMaterialClick(record)">
                {{ record.materialNumber }}
              </a-button>
            </a-popover>
          </span>
          <a @click="handleDetail(record)">详情</a>
        </span>
      </a-table>
    </div>

    <pms-process-bill-materials-modal ref="modalForm" @ok="modalFormOk"></pms-process-bill-materials-modal>
    <PmsProcessBillMaterialsDetailModal ref="PmsProcessBillMaterialsDetailModal"></PmsProcessBillMaterialsDetailModal>
  </a-card>
</template>

<script>

  import '@/assets/less/TableExpand.less'
  import { mixinDevice } from '@/utils/mixin'
  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
  import PmsProcessBillMaterialsModal from './modules/PmsProcessBillMaterialsModal'
  import PmsProcessBillMaterialsDetailModal from './modules/PmsProcessBillMaterialsDetailModal.vue'
  import { getAction } from '@api/manage'
import '@/assets/less/TableExpand.less'
import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import PmsProcessBillMaterialsModal from './modules/PmsProcessBillMaterialsModal'
import { getAction } from '@api/manage'

  export default {
    name: 'PmsProcessBillMaterialsList',
    mixins:[JeecgListMixin, mixinDevice],
    components: {
      PmsProcessBillMaterialsModal,
      PmsProcessBillMaterialsDetailModal
    },
    data () {
      return {
        description: '订单BOM管理页面',
        // 表头
        columns: [
          {
            title: '#',
            dataIndex: '',
            key:'rowIndex',
            width:60,
            align:"center",
            customRender:function (t,r,index) {
              return parseInt(index)+1;
            }
          },
          {
            title:'生成订单ID',
            align:"center",
            dataIndex: 'orderId'
          },
          {
            title:'物料编码',
            align:"center",
            dataIndex: 'materialNumber',
            defaultSortOrder: 'descend',
            scopedSlots: { customRender: 'figureNum', },
          },
          {
            title:'物料名称',
            align:"center",
            dataIndex: 'materialName'
          },
          {
            title:'BOM代码',
            align:"center",
            dataIndex: 'billMaterialsCode'
          },
          {
            title:'基本单位',
            align:"center",
            dataIndex: 'productionUnit'
          },
          {
            title:'订单数量',
            align:"center",
            dataIndex: 'productionQuantity'
          },
          {
            title: '操作',
            dataIndex: 'action',
            align:"center",
            fixed:"right",
            width:147,
            scopedSlots: { customRender: 'action' }
export default {
  name: 'PmsProcessBillMaterialsList',
  mixins: [JeecgListMixin, mixinDevice],
  components: {
    PmsProcessBillMaterialsModal
  },
  data() {
    return {
      description: '订单BOM管理页面',
      innerData: [],
      expandedRowKeys: [],
      // 表头
      columns: [
        {
          title: '#',
          dataIndex: '',
          key: 'rowIndex',
          width: 60,
          align: 'center',
          customRender: function(t, r, index) {
            return parseInt(index) + 1
          }
        ],
        url: {
          list: "/pmsprocessbillmaterials/pmsProcessBillMaterials/list",
          delete: "/pmsprocessbillmaterials/pmsProcessBillMaterials/delete",
          deleteBatch: "/pmsprocessbillmaterials/pmsProcessBillMaterials/deleteBatch",
          exportXlsUrl: "/pmsprocessbillmaterials/pmsProcessBillMaterials/exportXls",
          importExcelUrl: "pmsprocessbillmaterials/pmsProcessBillMaterials/importExcel",
          queryByMaterialId:'/pms/pmsProcessBillMaterialsDetail/queryByMaterialId'
        },
        dictOptions:{},
        superFieldList:[],
      }
    },
    created() {
    this.getSuperFieldList();
    },
    computed: {
      importExcelUrl: function(){
        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
        {
          title: '订单号',
          align: 'center',
          dataIndex: 'orderCode'
        },
        {
          title: '物料编码',
          align: 'center',
          dataIndex: 'materialNumber'
        },
        {
          title: '物料名称',
          align: 'center',
          dataIndex: 'materialName'
        },
        {
          title: '基本单位',
          align: 'center',
          dataIndex: 'productionUnit'
        },
        {
          title: '订单数量',
          align: 'center',
          dataIndex: 'productionQuantity'
        },
        {
          title: '操作',
          dataIndex: 'action',
          align: 'center',
          width: 147,
          scopedSlots: { customRender: 'action' }
        }
      ],
      innerColumns: [
        {
          title: '#',
          dataIndex: '',
          key: 'rowIndex',
          width: 60,
          align: 'center',
          customRender: function(t, r, index) {
            return parseInt(index) + 1
          }
        },
        {
          title: '物料编码',
          align: 'center',
          dataIndex: 'materialNumber'
        },
        {
          title: '物料名称',
          align: 'center',
          dataIndex: 'materialName'
        },
        {
          title: '基本单位',
          align: 'center',
          dataIndex: 'productionUnit'
        },
        {
          title: '需求数量',
          align: 'center',
          dataIndex: 'usageQuantity'
        }
      ],
      url: {
        list: '/pms/processBillMaterials/list',
        queryByMaterialId: '/pms/processBillMaterialsDetail/queryByMaterialId'
      },
    },
    methods: {
      handleMaterialClick(record){
        console.log('record----->',record)
        getAction(this.url.queryByMaterialId,{'materialId':record.id}).then(res=>{
    }
  },
  created() {
  },
  computed: {},
  methods: {
    handleExpand(expanded, record) {
      let that = this
      if(expanded) {
        this.expandedRowKeys = [record.id];
        getAction(that.url.queryByMaterialId, {materialId: record.id}).then((res)=>{
          if(res.success){
            this.$refs.PmsProcessBillMaterialsDetailModal.edit(res.result);
            this.$refs.PmsProcessBillMaterialsDetailModal.title="物料清单";
            this.$refs.PmsProcessBillMaterialsDetailModal.disableSubmit = true;
            this.innerData = [...res.result];
          }else{
            this.$message.error('没查到数据，请联系管理员')
            that.$message.warning(res.message);
            this.innerData = [];
          }
        })
      },
      initDictConfig(){
      },
      getSuperFieldList(){
        let fieldList=[];
        fieldList.push({type:'int',value:'delFlag',text:'删除标记',dictCode:''})
        fieldList.push({type:'string',value:'orderId',text:'生成订单ID',dictCode:''})
        fieldList.push({type:'string',value:'materialNumber',text:'物料编码',dictCode:''})
        fieldList.push({type:'string',value:'materialName',text:'物料名称',dictCode:''})
        fieldList.push({type:'string',value:'billMaterialsCode',text:'BOM代码',dictCode:''})
        fieldList.push({type:'string',value:'productionUnit',text:'基本单位',dictCode:''})
        fieldList.push({type:'double',value:'productionQuantity',text:'订单数量',dictCode:''})
        this.superFieldList = fieldList
      } else {
        this.expandedRowKeys = [];
      }
    }
  }
}
</script>
<style scoped>
  @import '~@assets/less/common.less';
@import '~@assets/less/common.less';
</style>