物料申领弹窗

src/views/activiti/form/materialSlModal.vue

@@ -56,7 +56,7 @@
 import { JeecgListMixin } from '@/mixins/JeecgListMixin'
 import JEllipsis from '@/components/jeecg/JEllipsis'
 import moment from 'moment'
-import {getFixedZy} from '@api/oa/cd-personnel-files'
+import {getGoods} from '@api/oa/cd-personnel-files'
 
 export default {
   name: 'MaterialSlModal', // 报关要素
@@ -72,37 +72,37 @@ export default {
       // 子表表头
       materialSlColumns: [ 
         {
-          title: '入库单号',
-          dataIndex: 'realname',
+          title: '所属部门',
+          dataIndex: 'sysOrgCode',
           width: 140,
           ellipsis: true,
           className: 'replacecolor'
         },
         {
-          title: '资产类别',
-          dataIndex: 'assetsCategory',
+          title: '物料编号',
+          dataIndex: 'materialNumber',
           width: 140,
           ellipsis: true,
           className: 'replacecolor'
         },
          {
-          title: '资产编号',
-          dataIndex: 'assetNumber',
+          title: '录入人账号',
+          dataIndex: 'inputAccount',
           width: 130,
           ellipsis: true,
           className: 'replacecolor'
         },
         {
-          title: '资产名称',
-          dataIndex: 'assetName',
+          title: '部门',
+          dataIndex: 'department',
           width: 130,
           ellipsis: true,
           className: 'replacecolor'
         },
 
         {
-          title: '规则型号',
-          dataIndex: 'specificationsModels',
+          title: '品名',
+          dataIndex: 'tradeName',
           width: 130,
           ellipsis: true,
           className: 'replacecolor'
@@ -115,73 +115,49 @@ export default {
           className: 'replacecolor'
         },
         {
-          title: '单位',
-          dataIndex: 'unit',
+          title: '类别',
+          dataIndex: 'category',
           width: 120,
           ellipsis: true,
           className: 'replacecolor'
         },
         {
-          title: '价值',
-          dataIndex: 'unitPrice',
+          title: '规格型号',
+          dataIndex: 'specificationsModels',
           ellipsis: true,
           width: 180,
           className: 'replacecolor'
         },
         {
-          title: '购置日期',
-          dataIndex: 'acquisitionDate',
+          title: '数量',
+          dataIndex: 'amount',
           width: 120,
           ellipsis: true,
           className: 'replacecolor'
         },
         {
-          title: '厂家',
-          dataIndex: 'manufacturer',
+          title: '单位',
+          dataIndex: 'unit',
           width: 120,
           ellipsis: true,
           className: 'replacecolor'
         },
          {
-          title: '使用部门',
-          dataIndex: 'useDepartment',
+          title: '单价(元)',
+          dataIndex: 'unitPrice',
           width: 120,
           ellipsis: true,
           className: 'replacecolor'
         },
         {
-          title: '入库时间',
-          dataIndex: 'inputDate',
-          width: 90,
-          className: 'replacecolor',
-        },
-        {
-          title: '采购人',
-          dataIndex: 'purchasingStaff',
-          width: 90,
-          className: 'replacecolor',
-        },
-        {
-          title: '采购人',
-          dataIndex: 'acceptPersonnel: ',
+          title: '金额',
+          dataIndex: 'money',
           width: 90,
           className: 'replacecolor',
         },
         {
-          title: '其他说明',
-          dataIndex: 'otherDescription',
-          width: 90,
-          className: 'replacecolor',
-        },
-        {
-          title: '采购单号',
-          dataIndex: 'buyid',
-          width: 90,
-          className: 'replacecolor',
-        },
-        {
-          title: '资产状态',
-          dataIndex: 'assetState',
+          title: '入库日期',
+          dataIndex: 'inputWarehouseDate',
           width: 90,
           className: 'replacecolor',
         },
@@ -190,7 +166,6 @@ export default {
       materialSlModVis: false,
       selectedRowKeys:[],
       selectedRows:[],
-      sat:''
     }
   },
   // 接收父组件 方法
@@ -200,8 +175,9 @@ export default {
   },
   methods: {
     personLists(value){
-      getFixedZy({state:value}).then(res => {
+      getGoods({tableName:'material_apply'}).then(res => {
                     if (res.success) {
+                      debugger
                       this.materialSlData = res.result
                     }else{
                        this.$message.error(res.message);
@@ -213,8 +189,7 @@ export default {
       this.materialSlModVis = false
       this.declareElements = {}
       this.declareElementsData = []
-      this.selectedRowKeys = [],
-      this.sat = ''
+      this.selectedRowKeys = []
     },
     handleCancel() {
       this.close()
@@ -229,35 +204,15 @@ export default {
         }else if(this.selectedRowKeys.length >1){
           this.$message.error('一次只可勾选一行数据');
         }else{
-          if(this.sat == '转移'){
             var data ={
-            assets_category : this.selectedRows[0].assetsCategory,
-            asset_encoding:this.selectedRows[0].assetNumber,
-            asset_name:this.selectedRows[0].assetName,
-            specifications_models:this.selectedRows[0].specificationsModels
-           }
-          }else if(this.sat == '归还'){
-            var data ={
-            assets_category : this.selectedRows[0].assetsCategory,
-            asset_encoding:this.selectedRows[0].assetNumber,
-            asset_name:this.selectedRows[0].assetName,
-            specifications_models:this.selectedRows[0].specificationsModels
-           }
-          }else if(this.sat == '调拨'){
-            var data ={
-            asset_encoding:this.selectedRows[0].assetNumber,
-            assets_category : this.selectedRows[0].assetsCategory,
-            asset_name:this.selectedRows[0].assetName,
-            specifications_models:this.selectedRows[0].specificationsModels
-           }
-          }else if(this.sat == '报废'){
-            var data ={
-            asset_encoding:this.selectedRows[0].assetNumber,
-            assets_category : this.selectedRows[0].assetsCategory,
-            asset_name:this.selectedRows[0].assetName,
-            specifications_models:this.selectedRows[0].specificationsModels
+              trade_name : this.selectedRows[0].tradeName,
+              brand:this.selectedRows[0].brand,
+              category:this.selectedRows[0].category,
+              specifications_models:this.selectedRows[0].specificationsModels,
+              unit:this.selectedRows[0].unit,
+              unit_price:this.selectedRows[0].unitPrice,
+              
            }
-          }
           
           this.$emit('close',data)
           this.close()