diff --git a/src/views/activiti/form/ProcessPermissionAuthorizationForm.vue b/src/views/activiti/form/ProcessPermissionAuthorizationForm.vue
new file mode 100644
index 0000000..f068b04
--- /dev/null
+++ b/src/views/activiti/form/ProcessPermissionAuthorizationForm.vue
@@ -0,0 +1,217 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form :form="form" slot="detail">
+        <a-row>
+          <a-col :span="12">
+            <a-form-item label="流程发起公司" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-dict-select-tag type="list" v-decorator="['company']" :trigger-change="true" dictCode="" placeholder="请选择流程发起公司" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="流程发起时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-date placeholder="请选择流程发起时间" v-decorator="['createTime']" :trigger-change="true" style="width: 100%" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="流程发起部门" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-dict-select-tag type="list" v-decorator="['sysOrgCode']" :trigger-change="true" dictCode="" placeholder="请选择流程发起部门" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="流程发起人" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-dict-select-tag type="list" v-decorator="['createBy']" :trigger-change="true" dictCode="" placeholder="请选择流程发起人" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="授权人" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-dict-select-tag type="list" v-decorator="['authorizationPerson']" :trigger-change="true" dictCode="" placeholder="请选择授权人" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="被授权人" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-dict-select-tag type="list" v-decorator="['authorizedPerson']" :trigger-change="true" dictCode="" placeholder="请选择被授权人" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="授权时间(开启时间)" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-date placeholder="请选择授权时间(开启时间)" v-decorator="['privilegedTimeStart']" :trigger-change="true" style="width: 100%" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="授权时间(结束时间)" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-date placeholder="请选择授权时间(结束时间)" v-decorator="['privilegedTimeEnd']" :trigger-change="true" style="width: 100%" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="是否继续授权" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-switch v-decorator="['continueAuthorize']"  ></j-switch>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="授权时间(确认时间)" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input v-decorator="['privilegedAffirmedTime']" placeholder="请输入授权时间(确认时间)"  ></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="授权天数" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input-number v-decorator="['authorizationNumberDays']" placeholder="请输入授权天数" style="width: 100%" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="文件id" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input v-decorator="['fileId']" placeholder="请输入文件id"  ></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'
+  import JDate from '@/components/jeecg/JDate'  
+  import JDictSelectTag from "@/components/dict/JDictSelectTag"
+  import JSwitch from '@/components/jeecg/JSwitch'
+
+  export default {
+    name: 'ProcessPermissionAuthorizationForm',
+    components: {
+      JFormContainer,
+      JDate,
+      JDictSelectTag,
+      JSwitch,
+    },
+    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: "/processpermissionauthorization/processPermissionAuthorization/add",
+          edit: "/processpermissionauthorization/processPermissionAuthorization/edit",
+          queryById: "/processpermissionauthorization/processPermissionAuthorization/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,'company','createTime','sysOrgCode','createBy','authorizationPerson','authorizedPerson','privilegedTimeStart','privilegedTimeEnd','continueAuthorize','privilegedAffirmedTime','authorizationNumberDays','fileId'))
+        })
+      },
+      //渲染流程表单数据
+      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,'company','createTime','sysOrgCode','createBy','authorizationPerson','authorizedPerson','privilegedTimeStart','privilegedTimeEnd','continueAuthorize','privilegedAffirmedTime','authorizationNumberDays','fileId'))
+      },
+    }
+  }
+</script>
\ No newline at end of file
diff --git a/src/views/activiti/form/ProcessUdgetPlanForm.vue b/src/views/activiti/form/ProcessUdgetPlanForm.vue
index 2661e7a..b3fe185 100644
--- a/src/views/activiti/form/ProcessUdgetPlanForm.vue
+++ b/src/views/activiti/form/ProcessUdgetPlanForm.vue
@@ -1,9 +1,9 @@
 <template>
 
   <a-spin :spinning="confirmLoading">
-    <j-form-container  :disabled="formDisabled">
+    <j-form-container :disabled="formDisabled">
       <!-- 主表单区域 -->
-      <a-form :form="form"  :rules="rules" slot="detail" >
+      <a-form :form="form" slot="detail">
         <a-row>
           <a-col :span="8" v-show="false">
             <a-form-item label="ID" :labelCol="labelCol" :wrapperCol="wrapperCol">
@@ -32,10 +32,9 @@
             </a-form-item>
           </a-col>
           <a-col :span="8">
-            <a-form-item label="物资类型" :labelCol="labelCol" :wrapperCol="wrapperCol" >
-              <j-dict-select-tag type="list" v-decorator="['materialType']"  :trigger-change="true" dictCode="material_type"
-                                 placeholder="请选择物资类型" />
-
+            <a-form-item label="物资类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-dict-select-tag type="list" v-decorator="['materialType']" :trigger-change="true" dictCode="material_type"
+                                 placeholder="请选择物资类型"/>
             </a-form-item>
           </a-col>
           <a-col :span="8">
@@ -45,15 +44,15 @@
             </a-form-item>
           </a-col>
           <a-col :span="8">
-            <a-form-item label="需求时间" :labelCol="labelCol" :wrapperCol="wrapperCol" >
-              <j-date placeholder="请选择需求时间" v-decorator="['needTime']"   :trigger-change="true" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%"/>
+            <a-form-item label="需求时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-date placeholder="请选择需求时间" v-decorator="['needTime']" :trigger-change="true" style="width: 100%"/>
+            </a-form-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-item label="顺序号" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input-number v-decorator="['orderNumber']" placeholder="请输入顺序号" style="width: 100%"/>
             </a-form-item>
           </a-col>
-<!--          <a-col :span="8">-->
-<!--            <a-form-item label="顺序号" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
-<!--              <a-input-number v-decorator="['orderNumber']" placeholder="请输入顺序号" style="width: 100%"/>-->
-<!--            </a-form-item>-->
-<!--          </a-col>-->
           <a-col :span="8">
             <a-form-item label="文件" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-upload v-decorator="['fileId']" :trigger-change="true"></j-upload>
@@ -120,6 +119,8 @@
     data() {
       return {
         bigId:[],
+        bigIdMerchandiseNews:[],
+        bigIdMerchandiseNewsList:[],
         labelCol: {
           xs: { span: 24 },
           sm: { span: 6 }
@@ -172,7 +173,7 @@
               dictCode: '',
               width: '200px',
               placeholder: '请输入${title}',
-              defaultValue: ''
+              options: [],
             },
             // {
             //   title: '物料描述',
@@ -241,7 +242,8 @@
             {
               title: '物料名称及规格型号',
               key: 'materialName',
-              type: FormTypes.sel_search,
+              type: FormTypes.input,
+              // type: FormTypes.sel_search,
               dictCode: '',
               width: '200px',
               placeholder: '请输入${title}',
@@ -250,7 +252,7 @@
             {
               title: '系列',
               key: 'materialSeries',
-              type: FormTypes.sel_search,
+              type: FormTypes.input,
               dictCode: '',
               width: '200px',
               placeholder: '请输入${title}',
@@ -259,7 +261,8 @@
             {
               title: '单位',
               key: 'materialUnit',
-              type: FormTypes.select,
+              type: FormTypes.input,
+              // type: FormTypes.select,
               dictCode: '',
               width: '200px',
               placeholder: '请输入${title}',
@@ -404,17 +407,55 @@
     },
     methods: {
       onSelect(record) {
-        // this.$refs.processUdgetPlanMaterial.getValues((error, values) => {
-        //
-        //     console.log(error, values)
-        // })
-
-        console.log(record.row);
-        console.log(record.row.materialGroup);
-        if(record.row.materialGroup.length > 0){
-          console.log("执行l")
+        // console.log(record.row);
+        if(record.row.materialGroup !== '' && record.row.materialGroup !== undefined && record.row.materialNumber === ''){
+          // console.log("执行materialGroup")
           this.fetchMerchandiseNews(record.row.materialGroup);
         }
+        if(record.row.materialGroup !== '' && record.row.materialGroup !== undefined && record.row.materialNumber !== ''){
+          // console.log("执行materialNumber")
+          let materialName = {  }
+          this.bigIdMerchandiseNewsList.forEach( item => {
+            if( item.id === record.row.materialNumber ){
+              materialName ={
+                name: item.merchandiseName,
+                unit: item.materialsUnit,
+              }
+
+            }
+          })
+          let values = [
+            {
+              rowKey: record.row.id,
+              values: {
+                'materialNumber': record.row.materialNumber,
+                'materialGroup': record.row.materialGroup,
+                'materialSeries':"SM-JD36-BA",
+                'materialName': materialName.name,
+                'materialUnit': materialName.unit,
+              },
+            },
+          ]
+          this.$refs.processUdgetPlanMaterial.setValues(values);
+        }
+
+        if(record.row.materialQuantity !== '' && record.row.materialPrice !== '' && record.row.materialQuantity !== undefined && record.row.materialPrice !== undefined){
+          // record.row.materialAmount = record.row.materialQuantity * record.row.materialPrice;
+          let values = [
+            {
+              rowKey: record.row.id,
+              values: {
+                'materialNumber': record.row.materialNumber,
+                'materialGroup': record.row.materialGroup,
+                'materialSeries': record.row.materialSeries,
+                'materialName': record.row.materialName,
+                'materialUnit': record.row.materialUnit,
+                'materialAmount': record.row.materialQuantity * record.row.materialPrice
+              },
+            },
+          ]
+          this.$refs.processUdgetPlanMaterial.setValues(values);
+        }
 
       },
       fetchMerchandiseNews(value){ //查询物料组
@@ -423,16 +464,54 @@
           delFlag: 0,
           descriptionId:value,
         }
-        this.bigId = [];
+        this.bigIdMerchandiseNews = [];
+        this.bigIdMerchandiseNewsList = [];
+        let qc = [];
+        let numberList = [];
+        if(this.processUdgetPlanMaterialTable.columns[1].options.length > 0){
+          this.processUdgetPlanMaterialTable.columns[1].options = [];
+        }
+        this.$refs.processUdgetPlanMaterial.getValues((a,b,c)=>{
+          // console.log(a,b,c)
+          b.forEach(item =>{
+            if(item.materialNumber !== '' && item.materialNumber !== undefined && item.materialNumber !== null){
+              numberList.push(item.materialNumber);
+            }
+          });
+        });
         getAction(this.url.merchandiseNewsList,par).then((res)=>{
           if(res.success){
-            console.log(res.result);
-            // res.result.forEach( item => {
-            //   this.processUdgetPlanMaterialTable.columns[0].options.push({
-            //     title : item.descriptionName,
-            //     value :  item.id,
-            //   })
-            // })
+            // console.log(res.result);
+            let newList = res.result;
+              // console.log("12312312:"+numberList.length);
+              if(numberList.length > 0){
+                  newList.forEach( item => {
+                    qc.push({
+                      title : item.materialsNumber,
+                      value :  item.id,
+                      disabled : false
+                    })
+                  })
+                numberList.forEach( num => {
+                  qc.forEach( i => {
+                    if(num === i.value){
+                      console.log(num,i.value);
+                      i.disabled = true;
+                    }
+                  });
+                })
+                this.processUdgetPlanMaterialTable.columns[1].options = qc;
+              }else{
+                newList.forEach( item => {
+                  this.processUdgetPlanMaterialTable.columns[1].options.push({
+                    title : item.materialsNumber,
+                    value :  item.id,
+                    disabled : false
+                  })
+                })
+              }
+            // console.log(this.processUdgetPlanMaterialTable.columns[1].options);
+            this.bigIdMerchandiseNewsList = res.result;
           }
         });
       },
@@ -445,7 +524,10 @@
         this.bigId = [];
         getAction(this.url.descriptionRake,par).then((res)=>{
           if(res.success){
-            console.log(res.result);
+            // console.log(res.result);
+            if(this.processUdgetPlanMaterialTable.columns[0].options.length > 0){
+              this.processUdgetPlanMaterialTable.columns[0].options = [];
+            }
             res.result.forEach( item => {
               this.processUdgetPlanMaterialTable.columns[0].options.push({
                 title : item.descriptionName,
diff --git a/src/views/processmaterials/ProcessPermissionAuthorizationList.vue b/src/views/processmaterials/ProcessPermissionAuthorizationList.vue
new file mode 100644
index 0000000..21d8612
--- /dev/null
+++ b/src/views/processmaterials/ProcessPermissionAuthorizationList.vue
@@ -0,0 +1,180 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+        </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-permission-authorization-modal ref="modalForm" @ok="modalFormOk"></process-permission-authorization-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import ProcessPermissionAuthorizationModal from './modules/ProcessPermissionAuthorizationModal'
+  import JSuperQuery from '@/components/jeecg/JSuperQuery.vue'
+
+  export default {
+    name: 'ProcessPermissionAuthorizationList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      ProcessPermissionAuthorizationModal,
+      JSuperQuery,
+    },
+    data () {
+      return {
+        description: '权限授权流程管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/processpermissionauthorization/processPermissionAuthorization/list",
+          delete: "/processpermissionauthorization/processPermissionAuthorization/delete",
+          deleteBatch: "/processpermissionauthorization/processPermissionAuthorization/deleteBatch",
+          exportXlsUrl: "/processpermissionauthorization/processPermissionAuthorization/exportXls",
+          importExcelUrl: "processpermissionauthorization/processPermissionAuthorization/importExcel",
+          
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+      this.$set(this.dictOptions, 'continueAuthorize', [{text:'是',value:'Y'},{text:'否',value:'N'}])
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'string',value:'company',text:'流程发起公司',dictCode:''})
+        fieldList.push({type:'date',value:'createTime',text:'流程发起时间'})
+        fieldList.push({type:'string',value:'sysOrgCode',text:'流程发起部门',dictCode:''})
+        fieldList.push({type:'string',value:'createBy',text:'流程发起人',dictCode:''})
+        fieldList.push({type:'string',value:'authorizationPerson',text:'授权人',dictCode:''})
+        fieldList.push({type:'string',value:'authorizedPerson',text:'被授权人',dictCode:''})
+        fieldList.push({type:'date',value:'privilegedTimeStart',text:'授权时间(开启时间)'})
+        fieldList.push({type:'date',value:'privilegedTimeEnd',text:'授权时间(结束时间)'})
+        fieldList.push({type:'switch',value:'continueAuthorize',text:'是否继续授权'})
+        fieldList.push({type:'string',value:'privilegedAffirmedTime',text:'授权时间(确认时间)',dictCode:''})
+        fieldList.push({type:'int',value:'authorizationNumberDays',text:'授权天数',dictCode:''})
+        fieldList.push({type:'string',value:'fileId',text:'文件id',dictCode:''})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>
\ No newline at end of file
diff --git a/src/views/processmaterials/modules/ProcessPermissionAuthorizationForm.vue b/src/views/processmaterials/modules/ProcessPermissionAuthorizationForm.vue
new file mode 100644
index 0000000..f068b04
--- /dev/null
+++ b/src/views/processmaterials/modules/ProcessPermissionAuthorizationForm.vue
@@ -0,0 +1,217 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form :form="form" slot="detail">
+        <a-row>
+          <a-col :span="12">
+            <a-form-item label="流程发起公司" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-dict-select-tag type="list" v-decorator="['company']" :trigger-change="true" dictCode="" placeholder="请选择流程发起公司" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="流程发起时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-date placeholder="请选择流程发起时间" v-decorator="['createTime']" :trigger-change="true" style="width: 100%" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="流程发起部门" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-dict-select-tag type="list" v-decorator="['sysOrgCode']" :trigger-change="true" dictCode="" placeholder="请选择流程发起部门" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="流程发起人" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-dict-select-tag type="list" v-decorator="['createBy']" :trigger-change="true" dictCode="" placeholder="请选择流程发起人" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="授权人" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-dict-select-tag type="list" v-decorator="['authorizationPerson']" :trigger-change="true" dictCode="" placeholder="请选择授权人" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="被授权人" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-dict-select-tag type="list" v-decorator="['authorizedPerson']" :trigger-change="true" dictCode="" placeholder="请选择被授权人" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="授权时间(开启时间)" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-date placeholder="请选择授权时间(开启时间)" v-decorator="['privilegedTimeStart']" :trigger-change="true" style="width: 100%" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="授权时间(结束时间)" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-date placeholder="请选择授权时间(结束时间)" v-decorator="['privilegedTimeEnd']" :trigger-change="true" style="width: 100%" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="是否继续授权" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-switch v-decorator="['continueAuthorize']"  ></j-switch>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="授权时间(确认时间)" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input v-decorator="['privilegedAffirmedTime']" placeholder="请输入授权时间(确认时间)"  ></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="授权天数" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input-number v-decorator="['authorizationNumberDays']" placeholder="请输入授权天数" style="width: 100%" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="文件id" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input v-decorator="['fileId']" placeholder="请输入文件id"  ></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'
+  import JDate from '@/components/jeecg/JDate'  
+  import JDictSelectTag from "@/components/dict/JDictSelectTag"
+  import JSwitch from '@/components/jeecg/JSwitch'
+
+  export default {
+    name: 'ProcessPermissionAuthorizationForm',
+    components: {
+      JFormContainer,
+      JDate,
+      JDictSelectTag,
+      JSwitch,
+    },
+    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: "/processpermissionauthorization/processPermissionAuthorization/add",
+          edit: "/processpermissionauthorization/processPermissionAuthorization/edit",
+          queryById: "/processpermissionauthorization/processPermissionAuthorization/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,'company','createTime','sysOrgCode','createBy','authorizationPerson','authorizedPerson','privilegedTimeStart','privilegedTimeEnd','continueAuthorize','privilegedAffirmedTime','authorizationNumberDays','fileId'))
+        })
+      },
+      //渲染流程表单数据
+      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,'company','createTime','sysOrgCode','createBy','authorizationPerson','authorizedPerson','privilegedTimeStart','privilegedTimeEnd','continueAuthorize','privilegedAffirmedTime','authorizationNumberDays','fileId'))
+      },
+    }
+  }
+</script>
\ No newline at end of file
diff --git a/src/views/processmaterials/modules/ProcessPermissionAuthorizationModal.vue b/src/views/processmaterials/modules/ProcessPermissionAuthorizationModal.vue
new file mode 100644
index 0000000..6904d32
--- /dev/null
+++ b/src/views/processmaterials/modules/ProcessPermissionAuthorizationModal.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-permission-authorization-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></process-permission-authorization-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import ProcessPermissionAuthorizationForm from './ProcessPermissionAuthorizationForm'
+  export default {
+    name: 'ProcessPermissionAuthorizationModal',
+    components: {
+      ProcessPermissionAuthorizationForm
+    },
+    data () {
+      return {
+        title:'',
+        width:896,
+        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/processmaterials/modules/ProcessPermissionAuthorizationModal__Style#Drawer.vue b/src/views/processmaterials/modules/ProcessPermissionAuthorizationModal__Style#Drawer.vue
new file mode 100644
index 0000000..4043b1e
--- /dev/null
+++ b/src/views/processmaterials/modules/ProcessPermissionAuthorizationModal__Style#Drawer.vue
@@ -0,0 +1,83 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    :visible="visible">
+    <process-permission-authorization-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></process-permission-authorization-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 ProcessPermissionAuthorizationForm from './ProcessPermissionAuthorizationForm'
+
+  export default {
+    name: 'ProcessPermissionAuthorizationModal',
+    components: {
+      ProcessPermissionAuthorizationForm
+    },
+    data () {
+      return {
+        title:"操作",
+        width:896,
+        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/suppliesstronger/ProcessSuppliesStrongerList.vue b/src/views/suppliesstronger/ProcessSuppliesStrongerList.vue
index 41e914b..b171a17 100644
--- a/src/views/suppliesstronger/ProcessSuppliesStrongerList.vue
+++ b/src/views/suppliesstronger/ProcessSuppliesStrongerList.vue
@@ -2,122 +2,31 @@
   <div>
 
 
-  <a-card :bordered="false" v-if="!item">
+  <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.processId"></a-input>-->
-<!--            </a-form-item>-->
-<!--          </a-col>-->
-<!--          <a-col :xl="4" :lg="7" :md="8" :sm="16">-->
-<!--            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">-->
-
-<!--              <a @click="handleToggleSearch" style="margin-left: 8px">-->
-<!--                {{ toggleSearchStatus ? '收起' : '展开' }}-->
-<!--                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>-->
-<!--              </a>-->
-<!--            </span>-->
-<!--          </a-col>-->
-          <a-col :xl="4" :lg="7" :md="8" :sm="16">
-            <a-form-item label="供应商">
-              <a-input placeholder="请输入供应商信息" v-model="queryParam.supplierId"></a-input>
-            </a-form-item>
-          </a-col>
-
-<!--            <a-col :xl="6" :lg="7" :md="8" :sm="24">-->
-<!--              <a-form-item label="供应商描述">-->
-<!--                <j-search-select-tag placeholder="请选择供应商描述" v-model="queryParam.supplierDescription" dict=",,"/>-->
-<!--              </a-form-item>-->
-<!--            </a-col>-->
             <a-col :xl="4" :lg="7" :md="8" :sm="16">
               <a-form-item label="物料组">
-<!--                <a-input placeholder="请输入物料组" v-model="queryParam.itemGroup" dict=",,"/>-->
-                <a-select v-model="queryParam.itemGroup" placeholder="请选择" >
-                  <a-select-option v-for="(item,index) in bigId" :key="index" :value="item.itemGroup">{{item.itemGroup}}</a-select-option>
-                </a-select>
+                <a-input placeholder="请输入物料组" v-model="queryParam.itemGroup"></a-input>
               </a-form-item>
             </a-col>
             <a-col :xl="4" :lg="7" :md="8" :sm="16">
               <a-form-item label="物料">
-                <a-input placeholder="请输入物料" v-model="queryParam.item" dict=",,"/>
+                <a-input placeholder="请输入物料" v-model="queryParam.item"/>
               </a-form-item>
             </a-col>
             <a-col :xl="4" :lg="7" :md="8" :sm="16">
               <a-form-item label="物料描述">
-                <a-input placeholder="请输入物料描述" v-model="queryParam.itemDescription" dict=",,"/>
+                <a-input placeholder="请输入物料描述" v-model="queryParam.itemDescription"/>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="4" :lg="7" :md="8" :sm="16">
+              <a-form-item label="核算属性">
+                <j-dict-select-tag placeholder="请输入核算属性" v-model="queryParam.accountingAttributes" dictCode="material_type"></j-dict-select-tag>
               </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.unitMeasurement"></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.amount"></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.price"></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.rates"></a-input>-->
-<!--              </a-form-item>-->
-<!--            </a-col>-->
-<!--            <a-col :xl="4" :lg="7" :md="8" :sm="16">-->
-<!--              <a-form-item label="仓储地点">-->
-<!--                <j-search-select-tag placeholder="请选择仓储地点" v-model="queryParam.unitWasteWarehouseCodeId" dict=",,"/>-->
-<!--              </a-form-item>-->
-<!--            </a-col>-->
-<!--            <a-col :xl="4" :lg="7" :md="8" :sm="16">-->
-<!--              <a-form-item label="存储仓位">-->
-<!--                <j-search-select-tag placeholder="请选择存储仓位" v-model="queryParam.freightSpace" dict=",,"/>-->
-<!--              </a-form-item>-->
-<!--            </a-col>-->
-<!--            <a-col :xl="4" :lg="7" :md="8" :sm="16">-->
-<!--              <a-form-item label="生产时间">-->
-<!--                <j-date placeholder="请选择生产时间" v-model="queryParam.productionTime"></j-date>-->
-<!--              </a-form-item>-->
-<!--            </a-col>-->
-<!--            <a-col :xl="4" :lg="7" :md="8" :sm="16">-->
-<!--              <a-form-item label="保质期">-->
-<!--                <j-date placeholder="请选择保质期" v-model="queryParam.expirationDate"></j-date>-->
-<!--              </a-form-item>-->
-<!--            </a-col>-->
-<!--            <a-col :xl="4" :lg="7" :md="8" :sm="16">-->
-<!--              <a-form-item label="批次">-->
-<!--                <j-search-select-tag placeholder="请选择批次" v-model="queryParam.batch" dict=",,"/>-->
-<!--              </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.arrivalNotice"></a-input>-->
-<!--              </a-form-item>-->
-<!--            </a-col>-->
-<!--            <a-col :xl="4" :lg="7" :md="8" :sm="16">-->
-<!--              <a-form-item label="入库时间">-->
-<!--                <j-date placeholder="请选择入库时间" v-model="queryParam.inboundTime"></j-date>-->
-<!--              </a-form-item>-->
-<!--            </a-col>-->
-<!--            <a-col :xl="4" :lg="7" :md="8" :sm="16">-->
-<!--              <a-form-item label="入库人">-->
-<!--                <j-search-select-tag placeholder="请选择入库人" v-model="queryParam.librarySign" dict=",,"/>-->
-<!--              </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-row>
       </a-form>
@@ -133,8 +42,6 @@
       </a-upload>
       <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
       <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
-      <!-- 高级查询区域 -->
-<!--      <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>
@@ -186,9 +93,7 @@
 
         <span slot="action" slot-scope="text, record" style="overflow: hidden;" class="table-page-search-submitButtons">
           <a-dropdown>
-
-                 <a class="ant-dropdown-link" @click="handleDetaills(record)">详情<a-icon type="down" /></a>
-
+            <a class="ant-dropdown-link" @click="handleDetaills(record)">详情<a-icon type="down" /></a>
           </a-dropdown>
         </span>
 
@@ -197,7 +102,6 @@
 
     <process-supplies-stronger-modal ref="modalForm" @ok="modalFormOk"></process-supplies-stronger-modal>
   </a-card>
-    <!--<ProcessSuppliesStrongerLists v-if="item" @strongerExit = "strongerExit"/>-->
   </div>
 </template>
 
@@ -223,7 +127,6 @@
     },
     data () {
       return {
-        // item:false,
         description: '物资总库管理页面',
         //  表头
         bigId:[],
@@ -238,21 +141,6 @@
               return parseInt(index)+1;
             }
           },
-          // {
-          //   title:'流程表单号',
-          //   align:"center",
-          //   dataIndex: 'processId'
-          // },
-          {
-            title:'供应商',
-            align:"center",
-            dataIndex: 'supplierId'
-          },
-          // {
-          //   title:'供应商描述',
-          //   align:"center",
-          //   dataIndex: 'supplierDescription_dictText'
-          // },
           {
             title:'物料组',
             align:"center",
@@ -278,69 +166,10 @@
             align:"center",
             dataIndex: 'amount'
           },
-          // {
-          //   title:'价格',
-          //   align:"center",
-          //   dataIndex: 'price'
-          // },
-          // {
-          //   title:'金额',
-          //   align:"center",
-          //   dataIndex: 'rates'
-          // },
-          // {
-          //   title:'仓储地点_id',
-          //   align:"center",
-          //   dataIndex: 'unitWasteWarehouseCodeId_dictText'
-          // },
-          // {
-          //   title:'存储仓位',
-          //   align:"center",
-          //   dataIndex: 'freightSpace_dictText'
-          // },
-          // {
-          //   title:'生产时间',
-          //   align:"center",
-          //   dataIndex: 'productionTime',
-          //   customRender:function (text) {
-          //     return !text?"":(text.length>10?text.substr(0,10):text)
-          //   }
-          // },
-          // {
-          //   title:'保质期',
-          //   align:"center",
-          //   dataIndex: 'expirationDate',
-          //   customRender:function (text) {
-          //     return !text?"":(text.length>10?text.substr(0,10):text)
-          //   }
-          // },
-          // {
-          //   title:'批次',
-          //   align:"center",
-          //   dataIndex: 'batch_dictText'
-          // },
-          // {
-          //   title:'是否到货',
-          //   align:"center",
-          //   dataIndex: 'arrivalNotice'
-          // },
-          // {
-          //   title:'入库时间',
-          //   align:"center",
-          //   dataIndex: 'inboundTime',
-          //   customRender:function (text) {
-          //     return !text?"":(text.length>10?text.substr(0,10):text)
-          //   }
-          // },
-          // {
-          //   title:'入库人',
-          //   align:"center",
-          //   dataIndex: 'librarySign_dictText'
-          // },
           {
             title:'核算属性',
             align:"center",
-            dataIndex: 'accountingAttributes'
+            dataIndex: 'accountingAttributes_dictText'
           },
           {
             title: '详情',
@@ -372,36 +201,31 @@
       },
     },
     methods: {
-      handleDetaills(){
-        // this.item = true;
-       this.$router.push({path:'/src/views/suppliesstronger/ProcessSuppliesStrongerLists'})
-      },
-      strongerExit(){
-        this.item = false;
+      handleDetaills(record){
+        this.$router.push({name:'src-views-suppliesstronger-ProcessSuppliesStrongerLists',params:{item: record.item}})
       },
-
       initDictConfig(){
       },
       getSuperFieldList(){
         let fieldList=[];
         fieldList.push({type:'string',value:'processId',text:'流程表单号',dictCode:''})
-        fieldList.push({type:'string',value:'supplierId',text:'供应商',dictCode:''})
-        fieldList.push({type:'sel_search',value:'supplierDescription',text:'供应商描述',dictTable:'', dictText:'', dictCode:''})
-        fieldList.push({type:'sel_search',value:'itemGroup',text:'物料组',dictTable:'', dictText:'', dictCode:''})
-        fieldList.push({type:'sel_search',value:'item',text:'物料',dictTable:'', dictText:'', dictCode:''})
-        fieldList.push({type:'sel_search',value:'itemDescription',text:'物料描述',dictTable:'', dictText:'', dictCode:''})
+        fieldList.push({type:'string',value:'supplier',text:'供应商',dictCode:''})
+        fieldList.push({type:'string',value:'supplierDescription',text:'供应商描述',dictTable:'', dictText:'', dictCode:''})
+        fieldList.push({type:'string',value:'itemGroup',text:'物料组',dictTable:'', dictText:'', dictCode:''})
+        fieldList.push({type:'string',value:'item',text:'物料',dictTable:'', dictText:'', dictCode:''})
+        fieldList.push({type:'string',value:'itemDescription',text:'物料描述',dictTable:'', dictText:'', dictCode:''})
         fieldList.push({type:'string',value:'unitMeasurement',text:'计量单位',dictCode:''})
         fieldList.push({type:'int',value:'amount',text:'数量',dictCode:''})
         fieldList.push({type:'BigDecimal',value:'price',text:'单价',dictCode:''})
         fieldList.push({type:'BigDecimal',value:'rates',text:'金额',dictCode:''})
-        fieldList.push({type:'sel_search',value:'unitWasteWarehouseCodeId',text:'仓储地点',dictTable:'', dictText:'', dictCode:''})
-        fieldList.push({type:'sel_search',value:'freightSpace',text:'存储仓位',dictTable:'', dictText:'', dictCode:''})
+        fieldList.push({type:'string',value:'unitWasteWarehouseCodeId',text:'仓储地点',dictTable:'', dictText:'', dictCode:''})
+        fieldList.push({type:'string',value:'freightSpace',text:'存储仓位',dictTable:'', dictText:'', dictCode:''})
         fieldList.push({type:'date',value:'productionTime',text:'生产时间'})
         fieldList.push({type:'string',value:'expirationDate',text:'保质期'})
-        fieldList.push({type:'sel_search',value:'batch',text:'批次',dictTable:'', dictText:'', dictCode:''})
+        fieldList.push({type:'string',value:'batch',text:'批次',dictTable:'', dictText:'', dictCode:''})
         fieldList.push({type:'string',value:'arrivalNotice',text:'是否到货',dictCode:''})
         fieldList.push({type:'date',value:'inboundTime',text:'入库时间'})
-        fieldList.push({type:'sel_search',value:'librarySign',text:'入库人',dictTable:'', dictText:'', dictCode:''})
+        fieldList.push({type:'string',value:'librarySign',text:'入库人',dictTable:'', dictText:'', dictCode:''})
         fieldList.push({type:'string',value:'accountingAttributes',text:'核算属性',dictCode:''})
         this.superFieldList = fieldList
 
diff --git a/src/views/suppliesstronger/ProcessSuppliesStrongerLists.vue b/src/views/suppliesstronger/ProcessSuppliesStrongerLists.vue
index bb81ab6..e8afa0e 100644
--- a/src/views/suppliesstronger/ProcessSuppliesStrongerLists.vue
+++ b/src/views/suppliesstronger/ProcessSuppliesStrongerLists.vue
@@ -1,95 +1,54 @@
-
 <template>
-
   <a-card :bordered="false">
     <!-- 查询区域 -->
-    <h3 >总库物资管理详情页</h3>
     <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.processId"></a-input>-->
-<!--            </a-form-item>-->
-<!--          </a-col>-->
-          <a-col :xl="4" :lg="7" :md="8" :sm="16">
-            <a-form-item label="供应商">
-              <a-input placeholder="请输入供应商信息" v-model="queryParam.supplierId"></a-input>
-            </a-form-item>
-          </a-col>
-
-<!--            <a-col :xl="6" :lg="7" :md="8" :sm="24">-->
-<!--              <a-form-item label="供应商描述">-->
-<!--                <j-search-select-tag placeholder="请选择供应商描述" v-model="queryParam.supplierDescription" dict=",,"/>-->
-<!--              </a-form-item>-->
-<!--            </a-col>-->
-<!--            <a-col :xl="4" :lg="7" :md="8" :sm="16">-->
-<!--              <a-form-item label="物料组">-->
-<!--                <a-input placeholder="请输入物料组" v-model="queryParam.itemGroup" dict=",,"/>-->
-<!--              </a-form-item>-->
-<!--            </a-col>-->
-<!--            <a-col :xl="4" :lg="7" :md="8" :sm="16">-->
-<!--              <a-form-item label="物料">-->
-<!--                <a-input placeholder="请输入物料" v-model="queryParam.item" dict=",,"/>-->
-<!--              </a-form-item>-->
-<!--            </a-col>-->
-<!--            <a-col :xl="4" :lg="7" :md="8" :sm="16">-->
-<!--              <a-form-item label="物料描述">-->
-<!--                <a-input placeholder="请输入物料描述" v-model="queryParam.itemDescription" dict=",,"/>-->
-<!--              </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.unitMeasurement"></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.amount"></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.price"></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.rates"></a-input>-->
-<!--              </a-form-item>-->
-<!--            </a-col>-->
+            <a-col :xl="4" :lg="7" :md="8" :sm="16">
+              <a-form-item label="供应商">
+                <a-input placeholder="请输入供应商信息" v-model="queryParam.supplier"></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="4" :lg="7" :md="8" :sm="16">
+              <a-form-item label="物料组">
+                <a-input placeholder="请输入物料组" v-model="queryParam.itemGroup"/>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="4" :lg="7" :md="8" :sm="16">
+              <a-form-item label="物料">
+                <a-input placeholder="请输入物料" v-model="queryParam.item" disabled="disabled"/>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="4" :lg="7" :md="8" :sm="16">
+              <a-form-item label="物料描述">
+                <a-input placeholder="请输入物料描述" v-model="queryParam.itemDescription"/>
+              </a-form-item>
+            </a-col>
             <a-col :xl="4" :lg="7" :md="8" :sm="16">
               <a-form-item label="仓储地点">
-                <a-input placeholder="请选择仓储地点" v-model="queryParam.unitWasteWarehouseCodeId" dict=",,"/>
+                <a-input placeholder="请选择仓储地点" v-model="queryParam.unitWasteWarehouseCodeId"/>
               </a-form-item>
             </a-col>
             <a-col :xl="4" :lg="7" :md="8" :sm="16">
               <a-form-item label="存储仓位">
-                <a-input placeholder="请选择存储仓位" v-model="queryParam.freightSpace" dict=",,"/>
+                <a-input placeholder="请选择存储仓位" v-model="queryParam.freightSpace"/>
               </a-form-item>
             </a-col>
-            <a-col :xl="4" :lg="7" :md="8" :sm="16">
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="生产时间">
                 <j-date placeholder="请选择生产时间" v-model="queryParam.productionTime"></j-date>
               </a-form-item>
             </a-col>
             <a-col :xl="4" :lg="7" :md="8" :sm="16">
-              <a-form-item label="保质期">
-                <j-date placeholder="请选择保质期" v-model="queryParam.expirationDate"></j-date>
+              <a-form-item label="入库批次">
+                <a-input placeholder="请选择批次" v-model="queryParam.batch"/>
               </a-form-item>
             </a-col>
             <a-col :xl="4" :lg="7" :md="8" :sm="16">
-              <a-form-item label="批次">
-                <a-input placeholder="请选择批次" v-model="queryParam.batch" dict=",,"/>
+              <a-form-item label="保质期">
+                <a-input placeholder="请选择保质期" v-model="queryParam.expirationDate"/>
               </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.arrivalNotice"></a-input>-->
-<!--              </a-form-item>-->
-<!--            </a-col>-->
             <a-col :xl="4" :lg="7" :md="8" :sm="16">
               <a-form-item label="入库时间">
                 <j-date placeholder="请选择入库时间" v-model="queryParam.inboundTime"></j-date>
@@ -97,24 +56,9 @@
             </a-col>
             <a-col :xl="4" :lg="7" :md="8" :sm="16">
               <a-form-item label="入库人">
-                <a-input placeholder="请选择入库人" v-model="queryParam.librarySign" dict=",,"/>
+                <a-input placeholder="请选择入库人" v-model="queryParam.librarySign"/>
               </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 @click="handleToggleSearch" style="margin-left: 8px">-->
-<!--                {{ toggleSearchStatus ? '收起' : '展开' }}-->
-<!--                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>-->
-<!--              </a>-->
-<!--            </span>-->
-<!--          </a-col>-->
         </a-row>
       </a-form>
     </div>
@@ -122,7 +66,6 @@
 
     <!-- 操作按钮区域 -->
     <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>
@@ -183,18 +126,6 @@
           </a-button>
         </template>
 
-        <span slot="action" slot-scope="text, record" style="overflow: hidden;" class="table-page-search-submitButtons">
-
-
-
-          <a-dropdown>
-
-              <a class="ant-dropdown-link" @click="handleDetaills(record)">查看详情<a-icon type="down" /></a>
-
-
-          </a-dropdown>
-        </span>
-
       </a-table>
     </div>
 
@@ -211,6 +142,7 @@
   import JDate from '@/components/jeecg/JDate.vue'
   import JSearchSelectTag from '@/components/dict/JSearchSelectTag'
   import JSuperQuery from '@/components/jeecg/JSuperQuery.vue'
+  import { getAction } from '@api/manage'
 
 
   export default {
@@ -224,8 +156,20 @@
     },
     data () {
       return {
+        queryParam: {
+          supplier: null,
+          itemGroup: null,
+          item: this.$route.params.item,
+          itemDescription: null,
+          unitWasteWarehouseCodeId: null,
+          freightSpace: null,
+          productionTime: null,
+          batch: null,
+          expirationDate: null,
+          inboundTime: null,
+          librarySign: null,
+        },
         description: '物资总库管理详情页面',
-        //  表头
         columns: [
           {
             title: '#',
@@ -245,7 +189,7 @@
           {
             title:'供应商',
             align:"center",
-            dataIndex: 'supplierId'
+            dataIndex: 'supplier'
           },
           {
             title:'供应商描述',
@@ -308,10 +252,7 @@
           {
             title:'保质期',
             align:"center",
-            dataIndex: 'expirationDate',
-            customRender:function (text) {
-              return !text?"":(text.length>10?text.substr(0,10):text)
-            }
+            dataIndex: 'expirationDate'
           },
           {
             title:'批次',
@@ -339,19 +280,11 @@
           {
             title:'核算属性',
             align:"center",
-            dataIndex: 'accountingAttributes'
-          },
-          // {
-          //   title: '详情',
-          //   dataIndex: 'action',
-          //   align:"center",
-          //   fixed:"right",
-          //   width:147,
-          //   scopedSlots: { customRender: 'action' }
-          // }
+            dataIndex: 'accountingAttributes_dictText'
+          }
         ],
         url: {
-          list: "/suppliesstronger/processSuppliesStronger/list",
+          list: "/suppliesstronger/processSuppliesStronger/lists",
           delete: "/suppliesstronger/processSuppliesStronger/delete",
           deleteBatch: "/suppliesstronger/processSuppliesStronger/deleteBatch",
           exportXlsUrl: "/suppliesstronger/processSuppliesStronger/exportXls",
@@ -363,7 +296,15 @@
       }
     },
     created() {
-    this.getSuperFieldList();
+      // 判断路由上是否存在参数，如果没有则跳转回帐外物资管理页面
+      this.judgeRouterParam();
+      this.getSuperFieldList();
+    },
+    watch: {
+      $route() {
+        this.queryParam.item = this.$route.params.item
+        this.loadData()
+      }
     },
     computed: {
       importExcelUrl: function(){
@@ -371,34 +312,61 @@
       },
     },
     methods: {
-      handleDetaills(){
-        this.item = true;
+      searchReset(){
+        this.queryParam = {
+          supplier: null,
+            itemGroup: null,
+            item: this.$route.params.item,
+            itemDescription: null,
+            unitWasteWarehouseCodeId: null,
+            freightSpace: null,
+            productionTime: null,
+            batch: null,
+            expirationDate: null,
+            inboundTime: null,
+            librarySign: null,
+            del_flag: 0
+        },
+          getAction(this.url.list,this.queryParam).then((res)=>{
+            if(res.success){
+              this.dataSource=res.result.records;
+            }
+          });
       },
-      handlereturn(){
-       this.$emit("strongerExit",false);
+      judgeRouterParam(){
+        if (this.$route.params.item == null){
+          this.$router.go(-1);
+        }
       },
       initDictConfig(){
       },
+      loadData(){
+        getAction(this.url.list,this.queryParam).then((res)=>{
+          if(res.success){
+            this.dataSource=res.result.records;
+          }
+        });
+      },
       getSuperFieldList(){
         let fieldList=[];
         fieldList.push({type:'string',value:'processId',text:'流程表单号',dictCode:''})
-        fieldList.push({type:'string',value:'supplierId',text:'供应商',dictCode:''})
-        fieldList.push({type:'sel_search',value:'supplierDescription',text:'供应商描述',dictTable:'', dictText:'', dictCode:''})
-        fieldList.push({type:'sel_search',value:'itemGroup',text:'物料组',dictTable:'', dictText:'', dictCode:''})
-        fieldList.push({type:'sel_search',value:'item',text:'物料',dictTable:'', dictText:'', dictCode:''})
-        fieldList.push({type:'sel_search',value:'itemDescription',text:'物料描述',dictTable:'', dictText:'', dictCode:''})
+        fieldList.push({type:'string',value:'supplier',text:'供应商',dictCode:''})
+        fieldList.push({type:'string',value:'supplierDescription',text:'供应商描述',dictTable:'', dictText:'', dictCode:''})
+        fieldList.push({type:'string',value:'itemGroup',text:'物料组',dictTable:'', dictText:'', dictCode:''})
+        fieldList.push({type:'string',value:'item',text:'物料',dictTable:'', dictText:'', dictCode:''})
+        fieldList.push({type:'string',value:'itemDescription',text:'物料描述',dictTable:'', dictText:'', dictCode:''})
         fieldList.push({type:'string',value:'unitMeasurement',text:'计量单位',dictCode:''})
         fieldList.push({type:'int',value:'amount',text:'数量',dictCode:''})
         fieldList.push({type:'BigDecimal',value:'price',text:'单价',dictCode:''})
         fieldList.push({type:'BigDecimal',value:'rates',text:'金额',dictCode:''})
-        fieldList.push({type:'sel_search',value:'unitWasteWarehouseCodeId',text:'仓储地点',dictTable:'', dictText:'', dictCode:''})
-        fieldList.push({type:'sel_search',value:'freightSpace',text:'存储仓位',dictTable:'', dictText:'', dictCode:''})
+        fieldList.push({type:'string',value:'unitWasteWarehouseCodeId',text:'仓储地点',dictTable:'', dictText:'', dictCode:''})
+        fieldList.push({type:'string',value:'freightSpace',text:'存储仓位',dictTable:'', dictText:'', dictCode:''})
         fieldList.push({type:'date',value:'productionTime',text:'生产时间'})
-        fieldList.push({type:'date',value:'expirationDate',text:'保质期'})
-        fieldList.push({type:'sel_search',value:'batch',text:'批次',dictTable:'', dictText:'', dictCode:''})
+        fieldList.push({type:'String',value:'expirationDate',text:'保质期'})
+        fieldList.push({type:'string',value:'batch',text:'批次',dictTable:'', dictText:'', dictCode:''})
         fieldList.push({type:'int',value:'arrivalNotice',text:'是否到货',dictCode:''})
         fieldList.push({type:'date',value:'inboundTime',text:'入库时间'})
-        fieldList.push({type:'sel_search',value:'librarySign',text:'入库人',dictTable:'', dictText:'', dictCode:''})
+        fieldList.push({type:'string',value:'librarySign',text:'入库人',dictTable:'', dictText:'', dictCode:''})
         fieldList.push({type:'string',value:'accountingAttributes',text:'核算属性',dictCode:''})
         this.superFieldList = fieldList
       }
diff --git a/src/views/suppliesstronger/modules/ProcessSuppliesStrongerForm.vue b/src/views/suppliesstronger/modules/ProcessSuppliesStrongerForm.vue
index c7cb6c8..0eed1d1 100644
--- a/src/views/suppliesstronger/modules/ProcessSuppliesStrongerForm.vue
+++ b/src/views/suppliesstronger/modules/ProcessSuppliesStrongerForm.vue
@@ -10,7 +10,7 @@
           </a-col>
           <a-col :span="8">
             <a-form-item label="供应商" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input v-decorator="['supplierId']"   placeholder="请输入供应商id" />
+              <a-input v-decorator="['supplier']"   placeholder="请输入供应商" />
             </a-form-item>
           </a-col>
           <a-col :span="8">
@@ -251,7 +251,7 @@
               that.confirmLoading = false;
             })
           }
-         
+
         })
       },
       popupCallback(row){
diff --git a/src/views/wastematerials/ProcessWasteMaterialsLists.vue b/src/views/wastematerials/ProcessWasteMaterialsLists.vue
index 6862029..c2b1057 100644
--- a/src/views/wastematerials/ProcessWasteMaterialsLists.vue
+++ b/src/views/wastematerials/ProcessWasteMaterialsLists.vue
@@ -20,11 +20,11 @@
                 <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" :read-only="true"></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" disabled="disabled"></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.materialDescription"></a-input>
@@ -267,6 +267,12 @@
       this.judgeRouterParam();
       this.getSuperFieldList();
     },
+    watch: {
+      $route() {
+        this.queryParam.material = this.$route.params.material
+        this.loadData()
+      }
+    },
     computed: {
       importExcelUrl: function(){
         return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;