art: 物料拉动相关代码修改

zhangherong

14 小时以前 3cbfbac2def7eba8a8a7f07aa0ec4426799e8d2a

art: 物料拉动相关代码修改

 src/views/mes/MesMaterialTransferRequestList.vue

@@ -12,24 +12,24 @@
    <!-- 操作按钮区域 -->
    <div class="table-operator">
      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
      <a-button type="primary" icon="download" @click="handleExportXls('物料拉动申请')">导出</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-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-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,27 +46,6 @@
        :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>

@@ -95,138 +74,104 @@

<script>

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

  export default {
    name: 'MesMaterialTransferRequestList',
    mixins:[JeecgListMixin, mixinDevice],
    components: {
      MesMaterialTransferRequestModal
    },
    data () {
      return {
        description: '物料拉动申请管理页面',
        // 表头
        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: 'requestCode'
          },
          {
            title:'工单ID',
            align:"center",
            dataIndex: 'workOrderId'
          },
          {
            title:'SAP预留号',
            align:"center",
            dataIndex: 'reservationCode'
          },
          {
            title:'发布状态',
            align:"center",
            dataIndex: 'publishStatus_dictText'
          },
          {
            title:'请求状态',
            align:"center",
            dataIndex: 'requestStatus_dictText'
          },
          {
            title:'请求时间',
            align:"center",
            dataIndex: 'requestTime'
          },
          {
            title:'原库存地',
            align:"center",
            dataIndex: 'originalWarehouseId'
          },
          {
            title:'目标库存地',
            align:"center",
            dataIndex: 'targetWarehouseId'
          },
          {
            title:'优先级（拉动类型）',
            align:"center",
            dataIndex: 'priority_dictText'
          },
          {
            title:'最晚配送时间',
            align:"center",
            dataIndex: 'latestDeliveryTime'
          },
          {
            title: '操作',
            dataIndex: 'action',
            align:"center",
            fixed:"right",
            width:147,
            scopedSlots: { customRender: 'action' }
export default {
  name: 'MesMaterialTransferRequestList',
  mixins: [JeecgListMixin, mixinDevice],
  components: {
    MesMaterialTransferRequestModal
  },
  data() {
    return {
      description: '物料拉动申请管理页面',
      // 表头
      columns: [
        {
          title: '#',
          dataIndex: '',
          key: 'rowIndex',
          width: 60,
          align: 'center',
          customRender: function(t, r, index) {
            return parseInt(index) + 1
          }
        ],
        url: {
          list: "/mesmaterialtransferrequest/mesMaterialTransferRequest/list",
          delete: "/mesmaterialtransferrequest/mesMaterialTransferRequest/delete",
          deleteBatch: "/mesmaterialtransferrequest/mesMaterialTransferRequest/deleteBatch",
          exportXlsUrl: "/mesmaterialtransferrequest/mesMaterialTransferRequest/exportXls",
          importExcelUrl: "mesmaterialtransferrequest/mesMaterialTransferRequest/importExcel",
          
        },
        dictOptions:{},
        superFieldList:[],
      }
    },
    created() {
    this.getSuperFieldList();
    },
    computed: {
      importExcelUrl: function(){
        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
      },
    },
    methods: {
      initDictConfig(){
      },
      getSuperFieldList(){
        let fieldList=[];
        fieldList.push({type:'int',value:'delFlag',text:'删除标记',dictCode:''})
        fieldList.push({type:'string',value:'requestCode',text:'拉动单号',dictCode:''})
        fieldList.push({type:'string',value:'workOrderId',text:'工单ID',dictCode:''})
        fieldList.push({type:'string',value:'reservationCode',text:'SAP预留号',dictCode:''})
        fieldList.push({type:'string',value:'publishStatus',text:'发布状态',dictCode:'publish_status'})
        fieldList.push({type:'string',value:'requestStatus',text:'请求状态',dictCode:'request_status'})
        fieldList.push({type:'datetime',value:'requestTime',text:'请求时间'})
        fieldList.push({type:'string',value:'originalWarehouseId',text:'原库存地',dictCode:''})
        fieldList.push({type:'string',value:'targetWarehouseId',text:'目标库存地',dictCode:''})
        fieldList.push({type:'string',value:'priority',text:'优先级（拉动类型）',dictCode:'priority'})
        fieldList.push({type:'datetime',value:'latestDeliveryTime',text:'最晚配送时间'})
        this.superFieldList = fieldList
        {
          title: '拉动单号',
          align: 'center',
          dataIndex: 'requestCode'
        },
        {
          title: '工单ID',
          align: 'center',
          dataIndex: 'workOrderId'
        },
        {
          title: 'SAP预留号',
          align: 'center',
          dataIndex: 'reservationCode'
        },
        {
          title: '发布状态',
          align: 'center',
          dataIndex: 'publishStatus_dictText'
        },
        {
          title: '请求状态',
          align: 'center',
          dataIndex: 'requestStatus_dictText'
        },
        {
          title: '请求时间',
          align: 'center',
          dataIndex: 'requestTime'
        },
        {
          title: '原库存地',
          align: 'center',
          dataIndex: 'originalWarehouseId'
        },
        {
          title: '目标库存地',
          align: 'center',
          dataIndex: 'targetWarehouseId'
        },
        {
          title: '优先级（拉动类型）',
          align: 'center',
          dataIndex: 'priority_dictText'
        },
        {
          title: '最晚配送时间',
          align: 'center',
          dataIndex: 'latestDeliveryTime'
        },
        {
          title: '操作',
          dataIndex: 'action',
          align: 'center',
          fixed: 'right',
          width: 147,
          scopedSlots: { customRender: 'action' }
        }
      ],
      url: {
        list: '/mes/mesMaterialTransferRequest/list',
        delete: '/mes/mesMaterialTransferRequest/delete',
        deleteBatch: '/mes/mesMaterialTransferRequest/deleteBatch'
      }
    }
  }
  },
  created() {
  },
  computed: {},
  methods: {}
}
</script>
<style scoped>
  @import '~@assets/less/common.less';
@import '~@assets/less/common.less';
</style>

 src/views/mes/modules/MesMaterialTransferRequestForm.vue

@@ -4,58 +4,43 @@
      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
        <a-row>
          <a-col :span="12">
            <a-form-model-item label="删除标记" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="delFlag">
              <a-input-number v-model="model.delFlag" placeholder="请输入删除标记" style="width: 100%" />
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="拉动单号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="requestCode">
              <a-input v-model="model.requestCode" placeholder="请输入拉动单号"  ></a-input>
              <a-input v-model="model.requestCode" placeholder="拉动单号自动生成" readOnly></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="工单ID" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="workOrderId">
            <a-form-model-item label="起始库存地点" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="originalWarehouseId">
              <j-dict-select-tag type="list" v-model="model.originalWarehouseId" dictCode="original_warehouse_list" placeholder="请选择起始库存地点" />
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="任务号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="workOrderId">
              <a-input v-model="model.workOrderId" placeholder="请输入工单ID"  ></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="SAP预留号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="reservationCode">
              <a-input v-model="model.reservationCode" placeholder="请输入SAP预留号"  ></a-input>
            <a-form-model-item label="目标库存地点" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="targetWarehouseId">
              <a-input v-model="model.targetWarehouseId" placeholder="自动获取" readOnly ></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="发布状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="publishStatus">
              <j-dict-select-tag type="list" v-model="model.publishStatus" dictCode="publish_status" placeholder="请选择发布状态" />
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="请求状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="requestStatus">
              <j-dict-select-tag type="list" v-model="model.requestStatus" dictCode="request_status" placeholder="请选择请求状态" />
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="请求时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="requestTime">
              <j-date placeholder="请选择请求时间"  v-model="model.requestTime" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="原库存地" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="originalWarehouseId">
              <a-input v-model="model.originalWarehouseId" placeholder="请输入原库存地"  ></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="目标库存地" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="targetWarehouseId">
              <a-input v-model="model.targetWarehouseId" placeholder="请输入目标库存地"  ></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="优先级（拉动类型）" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="priority">
              <j-dict-select-tag type="list" v-model="model.priority" dictCode="priority" placeholder="请选择优先级（拉动类型）" />
            <a-form-model-item label="拉动类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="materialTransferCategory">
              <j-dict-select-tag type="list" v-model="model.materialTransferCategory" dictCode="material_transfer_category" placeholder="请选择拉动类型" />
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="最晚配送时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="latestDeliveryTime">
              <j-date placeholder="请选择最晚配送时间"  v-model="model.latestDeliveryTime" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />
              <j-date placeholder="请选择最晚配送时间"  v-model="model.latestDeliveryTime" :show-time="false" date-format="YYYY-MM-DD" style="width: 100%" />
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="拉动物料" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="materialNumber">
              <j-dict-select-tag type="list" v-model="model.materialNumber" dictCode="priority" placeholder="请选择拉动物料" />
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="拉动数量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="specifiedQuantity">
              <a-input-number v-model="model.specifiedQuantity" placeholder="请输入拉动数量" style="width: 100%" />
            </a-form-model-item>
          </a-col>
        </a-row>
@@ -87,7 +72,7 @@
         },
        labelCol: {
          xs: { span: 24 },
          sm: { span: 5 },
          sm: { span: 6 },
        },
        wrapperCol: {
          xs: { span: 24 },
@@ -95,11 +80,26 @@
        },
        confirmLoading: false,
        validatorRules: {
          originalWarehouseId: [
            { required: true, message: '起始库存地点必选', trigger: 'change' }
          ],
          workOrderId: [
            { required: true, message: '任务号必选', trigger: 'change' }
          ],
          materialNumber: [
            { required: true, message: '拉动物料必选', trigger: 'change' }
          ],
          specifiedQuantity: [
            { required: true, message: '拉动数量必填', trigger: 'change' }
          ],
          materialTransferCategory: [
            { required: true, message: '拉动类型必选', trigger: 'change' }
          ],
        },
        url: {
          add: "/mesmaterialtransferrequest/mesMaterialTransferRequest/add",
          edit: "/mesmaterialtransferrequest/mesMaterialTransferRequest/edit",
          queryById: "/mesmaterialtransferrequest/mesMaterialTransferRequest/queryById"
          add: "/mes/mesMaterialTransferRequest/add",
          edit: "/mes/mesMaterialTransferRequest/edit",
          queryById: "/mes/mesMaterialTransferRequest/queryById"
        }
      }
    },
@@ -146,7 +146,7 @@
              that.confirmLoading = false;
            })
          }
         

        })
      },
    }