From 7a4dc7a32ac524b3d5b16c0296ea2da234d3ff52 Mon Sep 17 00:00:00 2001
From: long <18782126717@163.com>
Date: Mon, 31 Oct 2022 23:13:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=81=E7=A8=8B=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=9B=9E=E6=98=BE=E5=AD=98=E5=9C=A8=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/jeecg/HDelivery.vue            |  11 +-
 src/components/jeecg/HPlan.vue                |   1 -
 .../jeecg/modal/ProcessDelivery.vue           | 287 ++++++++++--------
 src/components/jeecg/modal/ProcessPlan.vue    |  34 ++-
 .../form/ProcessMaterialWarehousingForm.vue   |  10 +-
 .../form/ProcessMaterialsAllotForm.vue        |   5 +
 .../form/ProcessMaterialsDeliveryForm.vue     |   5 +
 .../ProcessPermissionAuthorizationForm.vue    |   8 +-
 .../form/ProcessSmaterialsScrapForm.vue       |   7 +-
 .../form/ProcessSpecialMaterialsForm.vue      |   3 +-
 .../ProcessMaterialsDeliveryListList.vue      |  29 +-
 11 files changed, 219 insertions(+), 181 deletions(-)

diff --git a/src/components/jeecg/HDelivery.vue b/src/components/jeecg/HDelivery.vue
index d4a739c..a2139bc 100644
--- a/src/components/jeecg/HDelivery.vue
+++ b/src/components/jeecg/HDelivery.vue
@@ -128,8 +128,13 @@
     },
     methods: {
       openModal() {
-        if (this.disabled === false) {
-          this.$refs.ProcessDelivery.show();
+
+        if (this.showText){
+          this.$refs.ProcessDelivery.show(this.showText);
+        }else {
+          if (this.disabled === false) {
+            this.$refs.ProcessDelivery.show();
+          }
         }
       },
       handleEmpty() {
@@ -195,7 +200,7 @@
         } else {
           //v-model时 需要传一个参数field 表示当前这个字段 从而根据这个字段的顺序找到原始值
           // this.$emit("input",row[orgFieldsArr[destFieldsArr.indexOf(this.field)]])
-          this.$emit('input', this.showText, rows[0].id)
+          this.$emit('input', this.showText, rows[0])
           this.$emit('mounted', rows[0].id)
           this.$emit('callType', rows[0])
         }
diff --git a/src/components/jeecg/HPlan.vue b/src/components/jeecg/HPlan.vue
index ef0be02..3cb823f 100644
--- a/src/components/jeecg/HPlan.vue
+++ b/src/components/jeecg/HPlan.vue
@@ -96,7 +96,6 @@
     computed: {
       uniqGroupId() {
         if (this.groupId) {
-          console.log('*-*-*-*-*->',this.groupId)
           let { groupId, code, field, orgFields, destFields } = this
           return `${groupId}_${code}_${field}_${orgFields}_${destFields}`
         }
diff --git a/src/components/jeecg/modal/ProcessDelivery.vue b/src/components/jeecg/modal/ProcessDelivery.vue
index 2bcb9d8..208e6b0 100644
--- a/src/components/jeecg/modal/ProcessDelivery.vue
+++ b/src/components/jeecg/modal/ProcessDelivery.vue
@@ -49,7 +49,8 @@
       <!-- 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">{{ this.selectedRowKeys.length }}</a>项
+          <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{
+          this.selectedRowKeys.length }}</a>项
           <a style="margin-left: 24px" @click="onClearSelected">清空</a>
         </div>
 
@@ -73,7 +74,8 @@
           </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;"/>
+            <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>
@@ -103,9 +105,9 @@
           <span slot="action" slot-scope="text, record">
           <a @click="handleEdit(record)">编辑</a>
 
-          <a-divider type="vertical" />
+          <a-divider type="vertical"/>
           <a-dropdown>
-            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a class="ant-dropdown-link">更多 <a-icon type="down"/></a>
             <a-menu slot="overlay">
               <a-menu-item>
                 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
@@ -120,8 +122,8 @@
       </div>
 
       <a-tabs defaultActiveKey="1">
-        <a-tab-pane tab="物资出库流程出库清单" key="1" >
-          <ProcessMaterialsDeliveryListList :mainId="selectedMainId" />
+        <a-tab-pane tab="物资出库流程出库清单" key="1">
+          <ProcessMaterialsDeliveryListList :mainId="selectedMainId"/>
         </a-tab-pane>
       </a-tabs>
     </a-card>
@@ -132,100 +134,101 @@
 <script>
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import { getAction } from '@/api/manage'
-  import {filterObj} from '@/utils/util'
+  import { filterObj } from '@/utils/util'
   import ProcessMaterialsDeliveryListList from '../../../views/processmaterials/ProcessMaterialsDeliveryListList'
   import JDictSelectTag from '@/components/dict/JDictSelectTag.vue'
   import JSuperQuery from '@/components/jeecg/JSuperQuery.vue'
   import '@/assets/less/TableExpand.less'
-  const MODAL_WIDTH = 1200;
+
+  const MODAL_WIDTH = 1200
   export default {
     name: 'ProcessDelivery',
     props: ['multi', 'code', 'groupId', 'param'],
-    components:{
+    components: {
       ProcessMaterialsDeliveryListList,
       JSuperQuery,
       JDictSelectTag
     },
-    mixins:[JeecgListMixin],
-    data(){
+    mixins: [JeecgListMixin],
+    data() {
       return {
-        visible:false,
-        confirmLoading:false,
-        title:'物资出库流程管理列表',
+        visible: false,
+        confirmLoading: false,
+        title: '物资出库流程管理列表',
         description: '物资出库流程管理页面',
-        queryParam:{
-
-        },
+        queryParam: {},
         columns: [
           {
-            title:'流程发起公司',
-            align:"center",
-            dataIndex: 'company_dictText',
+            title: '流程发起公司',
+            align: 'center',
+            dataIndex: 'company_dictText'
           },
           {
-            title:'流程发起时间',
-            align:"center",
+            title: '流程发起时间',
+            align: 'center',
             dataIndex: 'createTime'
           },
           {
-            title:'流程发起部门',
-            align:"center",
-            dataIndex: 'sysOrgCode_dictText',
+            title: '流程发起部门',
+            align: 'center',
+            dataIndex: 'sysOrgCode_dictText'
           },
           {
-            title:'流程发起人',
-            align:"center",
+            title: '流程发起人',
+            align: 'center',
             dataIndex: 'createBy'
           },
           {
-            title:'物资类型',
-            align:"center",
-            dataIndex: 'materialType_dictText',
+            title: '物资类型',
+            align: 'center',
+            dataIndex: 'materialType_dictText'
           },
           {
-            title:'出库时间',
-            align:"center",
+            title: '出库时间',
+            align: 'center',
             dataIndex: 'deliveryTime',
-            customRender:function (text) {
-              return !text?"":(text.length>10?text.substr(0,10):text)
+            customRender: function(text) {
+              return !text ? '' : (text.length > 10 ? text.substr(0, 10) : text)
             }
-          },
-          {
-            title:'文件id',
-            align:"center",
-            dataIndex: 'fileId',
-            scopedSlots: {customRender: 'fileSlot'}
           }
+          // {
+          //   title:'文件id',
+          //   align:"center",
+          //   dataIndex: 'fileId',
+          //   scopedSlots: {customRender: 'fileSlot'}
+          // }
         ],
         url: {
-          list: "/hy/processMaterialsDelivery/list",
-          delete: "/hy/processMaterialsDelivery/delete",
-          deleteBatch: "/hy/processMaterialsDelivery/deleteBatch",
-          exportXlsUrl: "/hy/processMaterialsDelivery/exportXls",
-          importExcelUrl: "hy/processMaterialsDelivery/importExcel",
+          list: '/hy/processMaterialsDelivery/list',
+          delete: '/hy/processMaterialsDelivery/delete',
+          deleteBatch: '/hy/processMaterialsDelivery/deleteBatch',
+          exportXlsUrl: '/hy/processMaterialsDelivery/exportXls',
+          importExcelUrl: 'hy/processMaterialsDelivery/importExcel'
         },
-        dictOptions:{
-          company:[],
-          sysOrgCode:[],
-          materialType:[],
-          processPlan:[],
+        dictOptions: {
+          company: [],
+          sysOrgCode: [],
+          materialType: [],
+          processPlan: []
         },
         /* 分页参数 */
-        pagination:{
+        pagination: {
           current: 1,
           pageSize: 5,
           pageSizeOptions: ['5', '10', '50'],
           showTotal: (total, range) => {
-            return range[0] + "-" + range[1] + " 共" + total + "条"
+            return range[0] + '-' + range[1] + ' 共' + total + '条'
           },
           showQuickJumper: true,
           showSizeChanger: true,
           total: 0
         },
-        selectedMainId:'',
-        superFieldList:[],
-        selectedRowKeys:[],
-        modalWidth:MODAL_WIDTH,
+        selectedMainId: '',
+        superFieldList: [],
+        selectedRowKeys: [],
+        modalWidth: MODAL_WIDTH,
+        changeData: '',
+        getFileData: false
       }
     },
     mounted() {
@@ -244,89 +247,91 @@
         },
       }
     },*/
-    computed:{
-      showSearchFlag(){
-        return this.queryInfo && this.queryInfo.length>0
+    computed: {
+      showSearchFlag() {
+        return this.queryInfo && this.queryInfo.length > 0
       }
     },
-    methods:{
+    methods: {
       onClearSelected() {
-        this.selectedRowKeys = [];
-        this.selectionRows = [];
-        this.selectedMainId=''
+        this.selectedRowKeys = []
+        this.selectionRows = []
+        this.selectedMainId = ''
       },
       onSelectChange(selectedRowKeys, selectionRows) {
-        this.selectedMainId=selectedRowKeys[0]
-        this.selectedRowKeys = selectedRowKeys;
-        this.selectionRows = selectionRows;
+        this.selectedMainId = selectedRowKeys[0]
+        this.selectedRowKeys = selectedRowKeys
+        this.selectionRows = selectionRows
       },
       loadPlan(arg) {
-        if(!this.url.list){
-          this.$message.error("请设置url.list属性!")
+        if (!this.url.list) {
+          this.$message.error('请设置url.list属性!')
           return
         }
         //加载数据 若传入参数1则加载第一页的内容
         if (arg === 1) {
-          this.pagination.current = 1;
+          this.pagination.current = 1
         }
         this.onClearSelected()
-        var params = this.queryParams();//查询条件
-        this.loading = true;
+        var params = this.queryParams()//查询条件
+        this.loading = true
         getAction(this.url.list, params).then((res) => {
           if (res.success) {
-            this.dataSource = res.result.records;
-            this.pagination.total = res.result.total;
+            this.dataSource = res.result.records
+            this.pagination.total = res.result.total
           }
-          if(res.code===510){
+          if (res.code === 510) {
             this.$message.warning(res.message)
           }
-          this.loading = false;
+          this.loading = false
         })
+        this.selectedRowKeys = this.changeData
+        this.selectedMainId = this.changeData[0]
       },
       clickThenSelect(record) {
         return {
           on: {
             click: () => {
-              this.onSelectChange(record.id.split(","), [record]);
+              this.onSelectChange(record.id.split(','), [record])
             }
           }
         }
       },
       queryParams() {
         let paramTarget = {}
-        if(this.dynamicParam){
+        if (this.dynamicParam) {
           //处理自定义参数
-          Object.keys(this.dynamicParam).map(key=>{
-            paramTarget['self_'+key] = this.dynamicParam[key]
+          Object.keys(this.dynamicParam).map(key => {
+            paramTarget['self_' + key] = this.dynamicParam[key]
           })
         }
-        let param = Object.assign(paramTarget, this.queryParam, this.sorter);
-        param.pageNo = this.pagination.current;
-        param.pageSize = this.pagination.pageSize;
-        return filterObj(param);
+        let param = Object.assign(paramTarget, this.queryParam, this.sorter)
+        param.pageNo = this.pagination.current
+        param.pageSize = this.pagination.pageSize
+        return filterObj(param)
       },
       handleChangeInTableSelect(selectedRowKeys, selectionRows) {
         //update-begin-author:taoyan date:2020902 for:【issue】开源online的几个问题 LOWCOD-844
-        if(!selectedRowKeys || selectedRowKeys.length==0){
+        if (!selectedRowKeys || selectedRowKeys.length == 0) {
           this.table.selectionRows = []
-        }else if(selectedRowKeys.length == selectionRows.length){
+        } else if (selectedRowKeys.length == selectionRows.length) {
           this.table.selectionRows = selectionRows
-        }else{
+        } else {
           //当两者长度不一的时候 需要判断
           let keys = this.table.selectedRowKeys
-          let rows = this.table.selectionRows;
+          let rows = this.table.selectionRows
           //这个循环 添加新的记录
-          for(let i=0;i<selectionRows.length;i++){
+          for (let i = 0; i < selectionRows.length; i++) {
             let combineKey = this.combineRowKey(selectionRows[i])
-            if(keys.indexOf(combineKey)<0){
+            if (keys.indexOf(combineKey) < 0) {
               //如果 原来的key 不包含当前记录 push
               rows.push(selectionRows[i])
             }
           }
           //这个循环 移除取消选中的数据
-          this.table.selectionRows = rows.filter(item=>{
+          this.table.selectionRows = rows.filter(item => {
             let combineKey = this.combineRowKey(item)
-            return selectedRowKeys.indexOf(combineKey)>=0
+            return selectedRowKeys.indexOf(combineKey) >= 0
           })
         }
         //update-end-author:taoyan date:2020902 for:【issue】开源online的几个问题 LOWCOD-844
@@ -345,78 +350,90 @@
         this.close()
       },
       handleSubmit() {
-        if(!this.multi){
-          if(this.selectionRows && this.selectionRows.length>1){
-            this.$message.warning("请选择一条记录")
+        if (this.getFileData) {
+          this.$emit('close')
+          this.visible = false
+          return
+        }
+        if (!this.multi) {
+          if (this.selectionRows && this.selectionRows.length > 1) {
+            this.$message.warning('请选择一条记录')
             return false
           }
         }
-        if(!this.selectionRows || this.selectionRows.length==0){
-          this.$message.warning("请选择一条记录")
+        if (!this.selectionRows || this.selectionRows.length == 0) {
+          this.$message.warning('请选择一条记录')
           return false
         }
         console.log(this.selectionRows)
-        this.$emit('ok', this.selectionRows);
+        this.$emit('ok', this.selectionRows)
         this.close()
       },
       close() {
-        this.$emit('close');
-        this.visible = false;
+        this.$emit('close')
+        this.visible = false
         //this.onClearSelected()
       },
-      show(){
+      show(val) {
+        if (val) {
+          this.getFileData = true
+        }
+        let data = []
+        data.push(val)
+        console.log('这是什么数据', val)
+        this.changeData = data
         this.visible = true
-        this.loadPlan(1);
+        this.loadPlan(1)
       },
-      handleToggleSearch(){
-        this.toggleSearchStatus = !this.toggleSearchStatus;
+      handleToggleSearch() {
+        this.toggleSearchStatus = !this.toggleSearchStatus
       },
-      searchByquery(){
+      searchByquery() {
         //this.loadData(1);
       },
-      onlyReload(){
+      onlyReload() {
         //this.loadData();
       },
-      searchReset(){
-        Object.keys(this.queryParam).forEach(key=>{
-          this.queryParam[key]=""
+      searchReset() {
+        Object.keys(this.queryParam).forEach(key => {
+          this.queryParam[key] = ''
         })
         //this.loadData(1);
       },
-     /* onClearSelected(){
-        this.table.selectedRowKeys = []
-        this.table.selectionRows = []
-      },*/
-      combineRowKey(record){
+      /* onClearSelected(){
+         this.table.selectedRowKeys = []
+         this.table.selectionRows = []
+       },*/
+      combineRowKey(record) {
         let res = ''
-        Object.keys(record).forEach(key=>{
-          res+=record[key]
+        Object.keys(record).forEach(key => {
+          res += record[key]
         })
-        if(res.length>50){
-          res = res.substring(0,50)
+        if (res.length > 50) {
+          res = res.substring(0, 50)
         }
         return res
       },
 
-      clickThenCheck(record){
+      clickThenCheck(record) {
         return {
           on: {
             click: () => {
               let rowKey = this.combineRowKey(record)
-              if(!this.table.selectedRowKeys || this.table.selectedRowKeys.length==0){
-                let arr1=[],arr2=[]
+              if (!this.table.selectedRowKeys || this.table.selectedRowKeys.length == 0) {
+                let arr1 = [], arr2 = []
                 arr1.push(record)
                 arr2.push(rowKey)
-                this.table.selectedRowKeys=arr2
-                this.table.selectionRows=arr1
-              }else{
-                if(this.table.selectedRowKeys.indexOf(rowKey)<0){
+                this.table.selectedRowKeys = arr2
+                this.table.selectionRows = arr1
+              } else {
+                if (this.table.selectedRowKeys.indexOf(rowKey) < 0) {
                   this.table.selectedRowKeys.push(rowKey)
                   this.table.selectionRows.push(record)
-                }else{
+                } else {
                   let rowKey_index = this.table.selectedRowKeys.indexOf(rowKey)
-                  this.table.selectedRowKeys.splice(rowKey_index,1);
-                  this.table.selectionRows.splice(rowKey_index,1);
+                  this.table.selectedRowKeys.splice(rowKey_index, 1)
+                  this.table.selectionRows.splice(rowKey_index, 1)
                 }
               }
             }
@@ -424,15 +441,15 @@
         }
       },
       //防止字典中有垃圾数据
-      initDictOptionData(dictOptions){
+      initDictOptionData(dictOptions) {
         alert(1)
-        let obj = { }
-        Object.keys(dictOptions).map(k=>{
-          obj[k] = dictOptions[k].filter(item=>{
-            return item!=null
-          });
-        });
-        this.dictOptions  = obj
+        let obj = {}
+        Object.keys(dictOptions).map(k => {
+          obj[k] = dictOptions[k].filter(item => {
+            return item != null
+          })
+        })
+        this.dictOptions = obj
       }
 
     }
diff --git a/src/components/jeecg/modal/ProcessPlan.vue b/src/components/jeecg/modal/ProcessPlan.vue
index 7ab23ba..29842c5 100644
--- a/src/components/jeecg/modal/ProcessPlan.vue
+++ b/src/components/jeecg/modal/ProcessPlan.vue
@@ -206,13 +206,13 @@
             title: '顺序号',
             align: 'center',
             dataIndex: 'orderNumber'
-          },
-          {
-            title: '文件id',
-            align: 'center',
-            dataIndex: 'fileId',
-            scopedSlots: { customRender: 'fileSlot' }
           }
+          /* {
+             title: '文件id',
+             align: 'center',
+             dataIndex: 'fileId',
+             scopedSlots: { customRender: 'fileSlot' }
+           }*/
         ],
         url: {
           list: '/hy/processUdgetPlan/list',
@@ -243,7 +243,8 @@
         superFieldList: [],
         selectedRowKeys: [],
         modalWidth: MODAL_WIDTH,
-        changeData: ''
+        changeData: '',
+        getFileData: false
       }
     },
     mounted() {
@@ -291,8 +292,8 @@
           }
           this.loading = false
         })
-        this.selectedRowKeys =this.changeData
-        this.selectedMainId =this.changeData[0];
+        this.selectedRowKeys = this.changeData
+        this.selectedMainId = this.changeData[0]
       },
       clickThenSelect(record) {
         return {
@@ -356,6 +357,11 @@
         this.close()
       },
       handleSubmit() {
+        if (this.getFileData) {
+          this.$emit('close')
+          this.visible = false
+          return
+        }
         if (!this.multi) {
           if (this.selectionRows && this.selectionRows.length > 1) {
             this.$message.warning('请选择一条记录')
@@ -375,11 +381,13 @@
         //this.onClearSelected()
       },
       show(val) {
-        let data=[]
+        if (val) {
+          this.getFileData = true
+        }
+        let data = []
         data.push(val)
-        console.log('这是什么数据',data)
-       this.changeData=data;
-        // this.selectionRows= val
+        console.log('这是什么数据', val)
+        this.changeData = data
         this.visible = true
         this.loadPlan(1)
       },
diff --git a/src/views/activiti/form/ProcessMaterialWarehousingForm.vue b/src/views/activiti/form/ProcessMaterialWarehousingForm.vue
index d2bd85b..7d07ebf 100644
--- a/src/views/activiti/form/ProcessMaterialWarehousingForm.vue
+++ b/src/views/activiti/form/ProcessMaterialWarehousingForm.vue
@@ -4,6 +4,11 @@
       <!-- 主表单区域 -->
       <a-form :form="form" slot="detail">
         <a-row>
+          <a-col :span="8" v-show="false">
+            <a-form-item label="ID" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input v-decorator="['id']" placeholder="" style="width: 100%"/>
+            </a-form-item>
+          </a-col>
           <a-col :span="8" >
             <a-form-item label="流程发起人" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-select-user-by-dep v-decorator="['createBy']" disabled/>
@@ -330,8 +335,7 @@ import JSelectCompany from '../../../components/jeecgbiz/JSelectCompany'
         this.btndisabled = true;
         var r = this.processData;
         this.getAction(this.url.queryById,{
-          tableId:r.tableId,
-          tableName:r.tableName,
+          id:r.tableId
         }).then((res)=>{
           if (res.success){
             let formData = res.result;
@@ -410,7 +414,7 @@ import JSelectCompany from '../../../components/jeecgbiz/JSelectCompany'
           //1、文件回显
           this.data = getRecord(this.data)
         }
-        let fieldval = pick(this.data,'company','createTime','sysOrgCode','createBy','processUdgetPlanId','materialType','targetLibrary','warehousingBatch','fileId')
+        let fieldval = pick(this.data,'id','company','createTime','sysOrgCode','createBy','processUdgetPlanId','materialType','targetLibrary','warehousingBatch','fileId')
         this.$nextTick(() => {
           this.form.setFieldsValue(fieldval)
         })
diff --git a/src/views/activiti/form/ProcessMaterialsAllotForm.vue b/src/views/activiti/form/ProcessMaterialsAllotForm.vue
index d4cd9e6..578a9d5 100644
--- a/src/views/activiti/form/ProcessMaterialsAllotForm.vue
+++ b/src/views/activiti/form/ProcessMaterialsAllotForm.vue
@@ -4,6 +4,11 @@
       <!-- 主表单区域 -->
       <a-form :form="form" slot="detail">
         <a-row>
+          <a-col :span="8" v-show="false">
+            <a-form-item label="ID" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input v-decorator="['id']" placeholder="" style="width: 100%"/>
+            </a-form-item>
+          </a-col>
           <a-col :span="8" v-show="false">
             <a-form-item label="ID" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-input v-decorator="['id']" placeholder="" style="width: 100%"/>
diff --git a/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue b/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue
index 615363d..da2a767 100644
--- a/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue
+++ b/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue
@@ -4,6 +4,11 @@
       <!-- 主表单区域 -->
       <a-form :form="form" slot="detail">
         <a-row>
+          <a-col :span="8" v-show="false">
+            <a-form-item label="ID" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input v-decorator="['id']" placeholder="" style="width: 100%"/>
+            </a-form-item>
+          </a-col>
           <a-col :span="8" v-show="false">
             <a-form-item label="ID" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-input v-decorator="['id']" placeholder="" style="width: 100%" disabled/>
diff --git a/src/views/activiti/form/ProcessPermissionAuthorizationForm.vue b/src/views/activiti/form/ProcessPermissionAuthorizationForm.vue
index 702ed9d..30dd963 100644
--- a/src/views/activiti/form/ProcessPermissionAuthorizationForm.vue
+++ b/src/views/activiti/form/ProcessPermissionAuthorizationForm.vue
@@ -3,6 +3,11 @@
     <j-form-container :disabled="formDisabled">
       <a-form :form="form" slot="detail">
         <a-row>
+          <a-col :span="8" v-show="false">
+            <a-form-item label="ID" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input v-decorator="['id']" placeholder="" style="width: 100%"/>
+            </a-form-item>
+          </a-col>
           <a-col :span="12">
             <a-form-item label="流程发起公司" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-select-company v-decorator="['company']" multi disabled/>
@@ -205,8 +210,7 @@
         this.btndisabled = true;
         var r = this.processData;
         this.getAction(this.url.queryById,{
-          tableId:r.tableId,
-          tableName:r.tableName,
+          id:r.tableId
         }).then((res)=>{
           if (res.success){
             let formData = res.result;
diff --git a/src/views/activiti/form/ProcessSmaterialsScrapForm.vue b/src/views/activiti/form/ProcessSmaterialsScrapForm.vue
index 63cd076..c54adf7 100644
--- a/src/views/activiti/form/ProcessSmaterialsScrapForm.vue
+++ b/src/views/activiti/form/ProcessSmaterialsScrapForm.vue
@@ -322,6 +322,9 @@
       console.log(userInfo)
       // userInfo.company=company;
       this.popupCallback(company, userInfo)
+      if (!this.isNew){
+        this.init();
+      }
     },
     methods: {
       materialType(val) {
@@ -335,8 +338,7 @@
         this.btndisabled = true
         var r = this.processData
         this.getAction(this.url.queryById, {
-          tableId: r.tableId,
-          tableName: r.tableName
+          id: r.tableId
         }).then((res) => {
           if (res.success) {
             let formData = res.result
@@ -431,6 +433,7 @@
           this.data = getRecord(this.data)
 
         }
+        console.log('000000000000>',this.data)
         let fieldval = pick(this.data, 'id', 'company', 'createTime', 'sysOrgCode', 'createBy', 'materialType', 'processOutflowId', 'fileId')
         this.$nextTick(() => {
           this.form.setFieldsValue(fieldval)
diff --git a/src/views/activiti/form/ProcessSpecialMaterialsForm.vue b/src/views/activiti/form/ProcessSpecialMaterialsForm.vue
index 97a8a20..8259bcb 100644
--- a/src/views/activiti/form/ProcessSpecialMaterialsForm.vue
+++ b/src/views/activiti/form/ProcessSpecialMaterialsForm.vue
@@ -304,8 +304,7 @@
         this.btndisabled = true;
         var r = this.processData;
         this.getAction(this.url.getForm,{
-          tableId:r.tableId,
-          tableName:r.tableName,
+          id:r.tableId
         }).then((res)=>{
           if (res.success){
             let formData = res.result;
diff --git a/src/views/processmaterials/ProcessMaterialsDeliveryListList.vue b/src/views/processmaterials/ProcessMaterialsDeliveryListList.vue
index 3a4af62..334b0ad 100644
--- a/src/views/processmaterials/ProcessMaterialsDeliveryListList.vue
+++ b/src/views/processmaterials/ProcessMaterialsDeliveryListList.vue
@@ -128,7 +128,7 @@
           {
             title:'器材编号',
             align:"center",
-            dataIndex: 'equipment_dictText',
+            dataIndex: 'equipment',
           },
           {
             title:'WBS',
@@ -138,12 +138,12 @@
           {
             title:'物料名称及规格型号',
             align:"center",
-            dataIndex: 'materialName_dictText',
+            dataIndex: 'materialName',
           },
           {
             title:'单位',
             align:"center",
-            dataIndex: 'materialUnit_dictText',
+            dataIndex: 'materialUnit',
           },
           {
             title:'请发数',
@@ -158,7 +158,7 @@
           {
             title:'供货商',
             align:"center",
-            dataIndex: 'supplier_dictText',
+            dataIndex: 'supplier',
           },
           {
             title:'单价',
@@ -173,29 +173,18 @@
           {
             title:'用途',
             align:"center",
-            dataIndex: 'purpose'
-          },
-          {
-            title:'删除标志',
-            align:"center",
-            dataIndex: 'delFlag'
-          },
-          {
-            title:'删除时间',
-            align:"center",
-            dataIndex: 'delTime',
-            customRender:function (text) {
-              return !text?"":(text.length>10?text.substr(0,10):text)
-            }
+            dataIndex: 'purpose',
+            fixed:"right",
           },
-          {
+
+          /*{
             title: '操作',
             dataIndex: 'action',
             align:"center",
             fixed:"right",
             width:147,
             scopedSlots: { customRender: 'action' },
-          }
+          }*/
         ],
         url: {
           list: "/hy/processMaterialsDelivery/queryProcessMaterialsDeliveryListByMainId",