From 9400c9b1eb30dd02e34cef926a838442a19d2c87 Mon Sep 17 00:00:00 2001
From: caoyizhong <1270296080@qq.com>
Date: Wed, 19 Oct 2022 15:49:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=9F=BA=E7=A1=80=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A21?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../description/ProcessDescriptionList.vue    |   4 +-
 src/views/supplier/ProcessSupplierList.vue    |  36 ++-
 .../ProcessUnitWasteWarehouseCodeList.vue     | 218 +++++++++++++++++
 .../ProcessUnitWasteWarehouseCodeForm.vue     | 171 ++++++++++++++
 .../ProcessUnitWasteWarehouseCodeModal.vue    |  60 +++++
 ...tWasteWarehouseCodeModal__Style#Drawer.vue |  83 +++++++
 .../ProcessWasteMaterialsList.vue             | 205 +++++++++-------
 .../wastematerials/modules/ProcessWaste.vue   | 222 ++++++++++++++++++
 8 files changed, 901 insertions(+), 98 deletions(-)
 create mode 100644 src/views/unitwaste/ProcessUnitWasteWarehouseCodeList.vue
 create mode 100644 src/views/unitwaste/modules/ProcessUnitWasteWarehouseCodeForm.vue
 create mode 100644 src/views/unitwaste/modules/ProcessUnitWasteWarehouseCodeModal.vue
 create mode 100644 src/views/unitwaste/modules/ProcessUnitWasteWarehouseCodeModal__Style#Drawer.vue
 create mode 100644 src/views/wastematerials/modules/ProcessWaste.vue

diff --git a/src/views/description/ProcessDescriptionList.vue b/src/views/description/ProcessDescriptionList.vue
index 744d59f..e08a98a 100644
--- a/src/views/description/ProcessDescriptionList.vue
+++ b/src/views/description/ProcessDescriptionList.vue
@@ -141,7 +141,7 @@
         // 表头
         columns: [
           {
-            title: '#',
+            title: '序号',
             dataIndex: '',
             key:'rowIndex',
             width:60,
@@ -180,7 +180,7 @@
           deleteBatch: "/description/processDescription/deleteBatch",
           exportXlsUrl: "/description/processDescription/exportXls",
           importExcelUrl: "description/processDescription/importExcel",
-          
+
         },
         dictOptions:{},
         superFieldList:[],
diff --git a/src/views/supplier/ProcessSupplierList.vue b/src/views/supplier/ProcessSupplierList.vue
index df035a6..9b2785c 100644
--- a/src/views/supplier/ProcessSupplierList.vue
+++ b/src/views/supplier/ProcessSupplierList.vue
@@ -137,7 +137,7 @@
         // 表头
         columns: [
           {
-            title: '#',
+            title: '序号',
             dataIndex: '',
             key:'rowIndex',
             width:60,
@@ -159,18 +159,38 @@
           {
             title:'级别',
             align:"center",
-            dataIndex: 'rank'
+            dataIndex: 'rank',
+            customRender:function (t,r,index) {
+              // console.log(t,r,index);
+              let name = '';
+              if(r.rank === 0){
+                name = "一级物资供应商";
+              }else if(r.rank === 1){
+                name = "非集中采购物资供应商";
+              }
+              return name;
+            }
           },
           {
             title:'状态',
             align:"center",
-            dataIndex: 'state_dictText'
-          },
-          {
-            title:'删除标志',
-            align:"center",
-            dataIndex: 'delFlag'
+            dataIndex: 'state',
+            customRender:function (t,r,index) {
+              // console.log(t,r,index);
+              let name = '';
+              if(r.state === 0){
+                name = "正常";
+              }else if(r.state === 1){
+                name = "停用";
+              }
+              return name;
+            }
           },
+          // {
+          //   title:'删除标志',
+          //   align:"center",
+          //   dataIndex: 'delFlag'
+          // },
           {
             title: '操作',
             dataIndex: 'action',
diff --git a/src/views/unitwaste/ProcessUnitWasteWarehouseCodeList.vue b/src/views/unitwaste/ProcessUnitWasteWarehouseCodeList.vue
new file mode 100644
index 0000000..2210884
--- /dev/null
+++ b/src/views/unitwaste/ProcessUnitWasteWarehouseCodeList.vue
@@ -0,0 +1,218 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <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="单位">
+              <a-input placeholder="请输入单位" v-model="queryParam.unit"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="账外物资编码">
+              <a-input placeholder="请输入账外物资编码" v-model="queryParam.invisibleCode"></a-input>
+            </a-form-item>
+          </a-col>
+          <template v-if="toggleSearchStatus">
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="废旧物资编码">
+                <a-input placeholder="请输入废旧物资编码" v-model="queryParam.wasteCode"></a-input>
+              </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 @click="handleToggleSearch" style="margin-left: 8px">
+                {{ toggleSearchStatus ? '收起' : '展开' }}
+                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+              </a>
+            </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('单位、废旧库房编码')">导出</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>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :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">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+          <img v-else :src="getImgView(text)" 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>
+        </span>
+
+      </a-table>
+    </div>
+
+    <process-unit-waste-warehouse-code-modal ref="modalForm" @ok="modalFormOk"></process-unit-waste-warehouse-code-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import ProcessUnitWasteWarehouseCodeModal from './modules/ProcessUnitWasteWarehouseCodeModal'
+  import JSuperQuery from '@/components/jeecg/JSuperQuery.vue'
+
+  export default {
+    name: 'ProcessUnitWasteWarehouseCodeList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      ProcessUnitWasteWarehouseCodeModal,
+      JSuperQuery,
+    },
+    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: 'unit'
+          },
+          {
+            title:'账外物资编码',
+            align:"center",
+            dataIndex: 'invisibleCode'
+          },
+          {
+            title:'废旧物资编码',
+            align:"center",
+            dataIndex: 'wasteCode'
+          },
+          {
+            title:'备注',
+            align:"center",
+            dataIndex: 'remark'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/unitwaste/processUnitWasteWarehouseCode/list",
+          delete: "/unitwaste/processUnitWasteWarehouseCode/delete",
+          deleteBatch: "/unitwaste/processUnitWasteWarehouseCode/deleteBatch",
+          exportXlsUrl: "/unitwaste/processUnitWasteWarehouseCode/exportXls",
+          importExcelUrl: "unitwaste/processUnitWasteWarehouseCode/importExcel",
+
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'string',value:'unit',text:'单位',dictCode:''})
+        fieldList.push({type:'string',value:'invisibleCode',text:'账外物资编码',dictCode:''})
+        fieldList.push({type:'string',value:'wasteCode',text:'废旧物资编码',dictCode:''})
+        fieldList.push({type:'string',value:'remark',text:'备注',dictCode:''})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>
\ No newline at end of file
diff --git a/src/views/unitwaste/modules/ProcessUnitWasteWarehouseCodeForm.vue b/src/views/unitwaste/modules/ProcessUnitWasteWarehouseCodeForm.vue
new file mode 100644
index 0000000..cc8acde
--- /dev/null
+++ b/src/views/unitwaste/modules/ProcessUnitWasteWarehouseCodeForm.vue
@@ -0,0 +1,171 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form :form="form" slot="detail">
+        <a-row>
+          <a-col :span="8">
+            <a-form-item label="单位" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input v-decorator="['unit']" placeholder="请输入单位"  ></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-item label="账外物资编码" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input v-decorator="['invisibleCode']" placeholder="请输入账外物资编码"  ></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-item label="废旧物资编码" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input v-decorator="['wasteCode']" placeholder="请输入废旧物资编码"  ></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input v-decorator="['remark']" placeholder="请输入备注"  ></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col v-if="showFlowSubmitButton" :span="24" style="text-align: center">
+            <a-button @click="submitForm">提 交</a-button>
+          </a-col>
+        </a-row>
+      </a-form>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import pick from 'lodash.pick'
+  import { validateDuplicateValue } from '@/utils/util'
+  import JFormContainer from '@/components/jeecg/JFormContainer'
+
+  export default {
+    name: 'ProcessUnitWasteWarehouseCodeForm',
+    components: {
+      JFormContainer,
+    },
+    props: {
+      //流程表单data
+      formData: {
+        type: Object,
+        default: ()=>{},
+        required: false
+      },
+      //表单模式：true流程表单 false普通表单
+      formBpm: {
+        type: Boolean,
+        default: false,
+        required: false
+      },
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        form: this.$form.createForm(this),
+        model: {},
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+        },
+        url: {
+          add: "/unitwaste/processUnitWasteWarehouseCode/add",
+          edit: "/unitwaste/processUnitWasteWarehouseCode/edit",
+          queryById: "/unitwaste/processUnitWasteWarehouseCode/queryById"
+        }
+      }
+    },
+    computed: {
+      formDisabled(){
+        if(this.formBpm===true){
+          if(this.formData.disabled===false){
+            return false
+          }
+          return true
+        }
+        return this.disabled
+      },
+      showFlowSubmitButton(){
+        if(this.formBpm===true){
+          if(this.formData.disabled===false){
+            return true
+          }
+        }
+        return false
+      }
+    },
+    created () {
+      //如果是流程中表单，则需要加载流程表单data
+      this.showFlowData();
+    },
+    methods: {
+      add () {
+        this.edit({});
+      },
+      edit (record) {
+        this.form.resetFields();
+        this.model = Object.assign({}, record);
+        this.visible = true;
+        this.$nextTick(() => {
+          this.form.setFieldsValue(pick(this.model,'unit','invisibleCode','wasteCode','remark'))
+        })
+      },
+      //渲染流程表单数据
+      showFlowData(){
+        if(this.formBpm === true){
+          let params = {id:this.formData.dataId};
+          getAction(this.url.queryById,params).then((res)=>{
+            if(res.success){
+              this.edit (res.result);
+            }
+          });
+        }
+      },
+      submitForm () {
+        const that = this;
+        // 触发表单验证
+        this.form.validateFields((err, values) => {
+          if (!err) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            let formData = Object.assign(this.model, values);
+            console.log("表单提交数据",formData)
+            httpAction(httpurl,formData,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+            })
+          }
+         
+        })
+      },
+      popupCallback(row){
+        this.form.setFieldsValue(pick(row,'unit','invisibleCode','wasteCode','remark'))
+      },
+    }
+  }
+</script>
\ No newline at end of file
diff --git a/src/views/unitwaste/modules/ProcessUnitWasteWarehouseCodeModal.vue b/src/views/unitwaste/modules/ProcessUnitWasteWarehouseCodeModal.vue
new file mode 100644
index 0000000..aa38ad1
--- /dev/null
+++ b/src/views/unitwaste/modules/ProcessUnitWasteWarehouseCodeModal.vue
@@ -0,0 +1,60 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <process-unit-waste-warehouse-code-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></process-unit-waste-warehouse-code-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import ProcessUnitWasteWarehouseCodeForm from './ProcessUnitWasteWarehouseCodeForm'
+  export default {
+    name: 'ProcessUnitWasteWarehouseCodeModal',
+    components: {
+      ProcessUnitWasteWarehouseCodeForm
+    },
+    data () {
+      return {
+        title:'',
+        width:1024,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
\ No newline at end of file
diff --git a/src/views/unitwaste/modules/ProcessUnitWasteWarehouseCodeModal__Style#Drawer.vue b/src/views/unitwaste/modules/ProcessUnitWasteWarehouseCodeModal__Style#Drawer.vue
new file mode 100644
index 0000000..d2ae682
--- /dev/null
+++ b/src/views/unitwaste/modules/ProcessUnitWasteWarehouseCodeModal__Style#Drawer.vue
@@ -0,0 +1,83 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    :visible="visible">
+    <process-unit-waste-warehouse-code-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></process-unit-waste-warehouse-code-form>
+    <div class="drawer-footer">
+      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
+      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+
+  import ProcessUnitWasteWarehouseCodeForm from './ProcessUnitWasteWarehouseCodeForm'
+
+  export default {
+    name: 'ProcessUnitWasteWarehouseCodeModal',
+    components: {
+      ProcessUnitWasteWarehouseCodeForm
+    },
+    data () {
+      return {
+        title:"操作",
+        width:1024,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 30px;
+    margin-bottom: 30px;
+    float: right;
+  }
+  .drawer-footer{
+    position: absolute;
+    bottom: -8px;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+</style>
\ No newline at end of file
diff --git a/src/views/wastematerials/ProcessWasteMaterialsList.vue b/src/views/wastematerials/ProcessWasteMaterialsList.vue
index 452ad49..d1a1a61 100644
--- a/src/views/wastematerials/ProcessWasteMaterialsList.vue
+++ b/src/views/wastematerials/ProcessWasteMaterialsList.vue
@@ -1,32 +1,33 @@
 <template>
-  <a-card :bordered="false">
-    <!-- 查询区域 -->
-    <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="物料组">
-              <a-input placeholder="请输入物料组" v-model="queryParam.materialGroup"></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="物料">
-              <a-input placeholder="请输入物料" v-model="queryParam.material"></a-input>
-            </a-form-item>
-          </a-col>
-          <template v-if="toggleSearchStatus">
+  <div>
+    <a-card :bordered="false" v-if="!item">
+      <!-- 查询区域 -->
+      <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="物料描述">
-                <a-input placeholder="请输入物料描述" v-model="queryParam.materialDescription"></a-input>
+              <a-form-item label="物料组">
+                <a-input placeholder="请输入物料组" v-model="queryParam.materialGroup"></a-input>
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="核算属性">
-                <a-input placeholder="请输入核算属性" v-model="queryParam.accountingAttributes"></a-input>
+              <a-form-item label="物料">
+                <a-input placeholder="请输入物料" v-model="queryParam.material"></a-input>
               </a-form-item>
             </a-col>
-          </template>
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <template v-if="toggleSearchStatus">
+              <a-col :xl="6" :lg="7" :md="8" :sm="24">
+                <a-form-item label="物料描述">
+                  <a-input placeholder="请输入物料描述" v-model="queryParam.materialDescription"></a-input>
+                </a-form-item>
+              </a-col>
+              <a-col :xl="6" :lg="7" :md="8" :sm="24">
+                <a-form-item label="核算属性">
+                  <a-input placeholder="请输入核算属性" v-model="queryParam.accountingAttributes"></a-input>
+                </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>
@@ -35,82 +36,84 @@
                 <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
               </a>
             </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('账外物资库')">导出</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>
+            </a-col>
+          </a-row>
+        </a-form>
+      </div>
+      <!-- 查询区域-END -->
 
-    <!-- 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 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>
+          <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+        </a-dropdown>
       </div>
 
-      <a-table
-        ref="table"
-        size="middle"
-        :scroll="{x:true}"
-        bordered
-        rowKey="id"
-        :columns="columns"
-        :dataSource="dataSource"
-        :pagination="ipagination"
-        :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-        class="j-table-force-nowrap"
-        @change="handleTableChange">
+      <!-- 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"
+          :scroll="{x:true}"
+          bordered
+          rowKey="id"
+          :columns="columns"
+          :dataSource="dataSource"
+          :pagination="ipagination"
+          :loading="loading"
+          :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">
-          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
-          <img v-else :src="getImgView(text)" 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>
+          <template slot="htmlSlot" slot-scope="text">
+            <div v-html="text"></div>
+          </template>
+          <template slot="imgSlot" slot-scope="text">
+            <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+            <img v-else :src="getImgView(text)" 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">
+          <span slot="action" slot-scope="text, record">
 
           <a-dropdown>
-            <a class="ant-dropdown-link" @click="handleDetail(record)">查看详情<a-icon type="down" /></a>
+            <a class="ant-dropdown-link" @click="handleDetails(record)">查看详情<a-icon type="down" /></a>
           </a-dropdown>
         </span>
 
-      </a-table>
-    </div>
+        </a-table>
+      </div>
+      <process-waste-materials-modal ref="modalForm" @ok="modalFormOk" ></process-waste-materials-modal>
+    </a-card>
+    <ProcessWaste v-if="item"/>
+  </div>
 
-    <process-waste-materials-modal ref="modalForm" @ok="modalFormOk"></process-waste-materials-modal>
-  </a-card>
 </template>
 
 <script>
@@ -120,6 +123,7 @@
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import ProcessWasteMaterialsModal from './modules/ProcessWasteMaterialsModal'
   import JSuperQuery from '@/components/jeecg/JSuperQuery.vue'
+  import ProcessWaste from '@views/wastematerials/modules/ProcessWaste'
 
   export default {
     name: 'ProcessWasteMaterialsList',
@@ -127,9 +131,11 @@
     components: {
       ProcessWasteMaterialsModal,
       JSuperQuery,
+      ProcessWaste,
     },
     data () {
       return {
+        item: false,
         description: '账外物资库管理页面',
         // 表头
         columns: [
@@ -173,6 +179,26 @@
             align:"center",
             dataIndex: 'consumeNumber'
           },
+          {
+            title:'物料描述',
+            align:"center",
+            dataIndex: 'materialDescription1'
+          },
+          {
+            title:'计量单位',
+            align:"center",
+            dataIndex: 'unitMeasurement1'
+          },
+          {
+            title:'现有数量',
+            align:"center",
+            dataIndex: 'existingNumber1'
+          },
+          {
+            title:'消耗数量',
+            align:"center",
+            dataIndex: 'consumeNumber1'
+          },
           {
             title: '查看详情',
             dataIndex: 'action',
@@ -188,7 +214,7 @@
           deleteBatch: "/wastematerials/processWasteMaterials/deleteBatch",
           exportXlsUrl: "/wastematerials/processWasteMaterials/exportXls",
           importExcelUrl: "wastematerials/processWasteMaterials/importExcel",
-          
+
         },
         dictOptions:{},
         superFieldList:[],
@@ -203,6 +229,9 @@
       },
     },
     methods: {
+      handleDetails(){
+        this.item = true;
+      },
       initDictConfig(){
       },
       getSuperFieldList(){
diff --git a/src/views/wastematerials/modules/ProcessWaste.vue b/src/views/wastematerials/modules/ProcessWaste.vue
new file mode 100644
index 0000000..bb5c59e
--- /dev/null
+++ b/src/views/wastematerials/modules/ProcessWaste.vue
@@ -0,0 +1,222 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <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>
+        <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"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :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">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+          <img v-else :src="getImgView(text)" 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-dropdown>
+            <a class="ant-dropdown-link" @click="handleDetails(record)">查看详情<a-icon type="down" /></a>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+
+    <process-waste-materials-modal ref="modalForm" @ok="modalFormOk" ></process-waste-materials-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import ProcessWasteMaterialsModal from '@/views/wastematerials/modules/ProcessWasteMaterialsModal'
+  import JSuperQuery from '@/components/jeecg/JSuperQuery.vue'
+
+  export default {
+    name: 'ProcessWaste',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      ProcessWasteMaterialsModal,
+      JSuperQuery,
+    },
+    data () {
+      return {
+        item: false,
+        description: '账外物资库管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'物料组',
+            align:"center",
+            dataIndex: 'materialGroup'
+          },
+          {
+            title:'物料',
+            align:"center",
+            dataIndex: 'material'
+          },
+          {
+            title:'物料描述',
+            align:"center",
+            dataIndex: 'materialDescription'
+          },
+          {
+            title:'计量单位',
+            align:"center",
+            dataIndex: 'unitMeasurement'
+          },
+          {
+            title:'现有数量',
+            align:"center",
+            dataIndex: 'existingNumber'
+          },
+          {
+            title:'消耗数量',
+            align:"center",
+            dataIndex: 'consumeNumber'
+          },
+          {
+            title:'物料描述',
+            align:"center",
+            dataIndex: 'materialDescription1'
+          },
+          {
+            title:'计量单位',
+            align:"center",
+            dataIndex: 'unitMeasurement1'
+          },
+          {
+            title:'现有数量',
+            align:"center",
+            dataIndex: 'existingNumber1'
+          },
+          {
+            title:'消耗数量',
+            align:"center",
+            dataIndex: 'consumeNumber1'
+          },
+          {
+            title: '查看详情',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/wastematerials/processWasteMaterials/list",
+          delete: "/wastematerials/processWasteMaterials/delete",
+          deleteBatch: "/wastematerials/processWasteMaterials/deleteBatch",
+          exportXlsUrl: "/wastematerials/processWasteMaterials/exportXls",
+          importExcelUrl: "wastematerials/processWasteMaterials/importExcel",
+
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      handleDetails(){
+        this.item = true;
+      },
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'string',value:'supplier',text:'供应商',dictCode:''})
+        fieldList.push({type:'string',value:'supplierDescription',text:'供应商描述',dictCode:''})
+        fieldList.push({type:'string',value:'materialGroup',text:'物料组',dictCode:''})
+        fieldList.push({type:'string',value:'material',text:'物料',dictCode:''})
+        fieldList.push({type:'string',value:'materialDescription',text:'物料描述',dictCode:''})
+        fieldList.push({type:'string',value:'materialStorageId',text:'库存位置',dictCode:''})
+        fieldList.push({type:'string',value:'freightSpace',text:'库存仓位',dictCode:''})
+        fieldList.push({type:'string',value:'unitMeasurement',text:'计量单位',dictCode:''})
+        fieldList.push({type:'int',value:'existingNumber',text:'现有数量',dictCode:''})
+        fieldList.push({type:'string',value:'consumeNumber',text:'消耗数量',dictCode:''})
+        fieldList.push({type:'int',value:'number',text:'数量',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'price',text:'单价',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'money',text:'金额',dictCode:''})
+        fieldList.push({type:'date',value:'productionDate',text:'生产日期'})
+        fieldList.push({type:'date',value:'expirationDate',text:'保质期'})
+        fieldList.push({type:'string',value:'inboundTime',text:'入库时间',dictCode:''})
+        fieldList.push({type:'string',value:'warehousePeople',text:'入库人',dictCode:''})
+        fieldList.push({type:'string',value:'accountingAttributes',text:'核算属性',dictCode:''})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>
\ No newline at end of file