diff --git a/public/static/废旧物资交接清单.html b/public/static/废旧物资交接清单.html new file mode 100644 index 0000000..6fa86de --- /dev/null +++ b/public/static/废旧物资交接清单.html @@ -0,0 +1,257 @@ + + + + + + + + 回收台账 + + + + + + +
+
废旧物资交接清单
+
+
+
序号
+
大类
+
产品名称、规格、型号
+
单位
+
数量
+
备注
+
+
+
+
+
+ 交接方： +
+
+ 接收方：物质装备公司 +
+
+
+
+
经办人：
+
+ 年      月      日 +
+
+
+
经办人：
+
+ 年      月      日 +
+
+
+
+
+
经办人：
+
+ 年      月      日 +
+
+
+
经办人：
+
+ 年      月      日 +
+
+
+
+ 备注：‘1231231231’123123 +
+
+
+ + + + + + \ No newline at end of file diff --git a/public/static/废旧电缆台账.html b/public/static/废旧电缆台账.html new file mode 100644 index 0000000..8536c7a --- /dev/null +++ b/public/static/废旧电缆台账.html @@ -0,0 +1,195 @@ + + + + + + + 回收台账 + + + + + +
+
新疆分公司2022年度废旧电缆台账
+
+
+
序号
+
报废日期
+
原盘号
+
现盘号
+
电缆规格
+
缴料队组
+
车号
+
原长度（米）
+
现长度（米）
+
缴料人
+
存放地
+
报废原因
+
备注
+
+
+
+
+
+ + + + + + diff --git a/public/static/废旧电缆台账2.html b/public/static/废旧电缆台账2.html new file mode 100644 index 0000000..db33ad7 --- /dev/null +++ b/public/static/废旧电缆台账2.html @@ -0,0 +1,145 @@ + + + + + + + 回收台账 + + + + + +
+
新疆分公司2022年度废旧电缆台账
+
+
+
序号
+
物料码
+
名称
+
型号规格
+
单位
+
数量
+
存放地点
+
报废原因
+
备注
+
+
+
+
+
+ + + + + \ No newline at end of file diff --git a/src/views/accessrecords/ProcessMaterialWarehousingRecord.vue b/src/views/accessrecords/ProcessMaterialWarehousingRecord.vue index 2bda2c6..fba0843 100644 --- a/src/views/accessrecords/ProcessMaterialWarehousingRecord.vue +++ b/src/views/accessrecords/ProcessMaterialWarehousingRecord.vue @@ -30,9 +30,9 @@ - - - + + + @@ -48,11 +48,11 @@ - - - - - + + + + + @@ -165,6 +165,7 @@ import '@/assets/less/TableExpand.less' import JSuperQuery from '@/components/jeecg/JSuperQuery.vue' import { initDictOptions } from '@comp/dict/JDictSelectUtil' + import JSelectDepart from '@/components/jeecgbiz/JSelectDepart' export default { name: "ProcessMaterialWarehousingRecord", @@ -172,7 +173,8 @@ components: { ProcessMaterialWarehousingListList, ProcessMaterialWarehousingModal, - JSuperQuery + JSuperQuery, + JSelectDepart }, data () { return { @@ -217,23 +219,23 @@ align:"center", dataIndex: 'createBy' }, - // { - // title:'关联预算流程', - // align:"center", - // dataIndex: 'processUdgetPlanId' - // }, { - title:'物资类型', + title:'物资信息', align:"center", - dataIndex: 'materialType_dictText' + dataIndex: 'describes' }, { - title:'批次', + title:'物资类型', align:"center", - dataIndex: 'targetLibrary' + dataIndex: 'materialType_dictText' }, + // { + // title:'批次号', + // align:"center", + // dataIndex: 'targetLibrary1' + // }, { - title:'入库总批次', + title:'批次号', align:"center", dataIndex: 'warehousingBatch' }, @@ -363,11 +365,14 @@ console.log("部门ID===》", sessionStorage.getItem('USER_INFORMATION')) let ue= sessionStorage.getItem('USER_INFORMATION'); let res=JSON.parse(ue); - this.queryParam.sysOrgCode = res.departIds; - console.log(res.departIds); + if(res.realname !== "管理员"){ + this.queryParam.sysOrgCode = res.departIds; + } + // console.log("_______________.",res); + // console.log(res.departIds); var params = this.getQueryParams();//查询条件 // console.log("部门Id"+sessionStorage.getItem('PUWWC_Id') )//关联中间表id - console.log("====================>",params) + // console.log("====================>",params) this.loading = true; getAction(this.url.list, params).then((res) => { if (res.success) { diff --git a/src/views/accessrecords/ProcessMaterialsDeliveryRecord.vue b/src/views/accessrecords/ProcessMaterialsDeliveryRecord.vue index c8f4763..ddf68ba 100644 --- a/src/views/accessrecords/ProcessMaterialsDeliveryRecord.vue +++ b/src/views/accessrecords/ProcessMaterialsDeliveryRecord.vue @@ -10,6 +10,11 @@ placeholder="请选择物资类型" /> + + + + + @@ -248,11 +253,21 @@ align:"center", dataIndex: 'createBy' }, + { + title:'物资信息', + align:"center", + dataIndex: 'describes', + }, { title:'物资类型', align:"center", dataIndex: 'materialType_dictText', }, + { + title:'批次号', + align:"center", + dataIndex: 'warehousingBatch', + }, { title:'出库时间', align:"center", @@ -382,7 +397,10 @@ this.onClearSelected() let ue= sessionStorage.getItem('USER_INFORMATION'); let res=JSON.parse(ue); - this.queryParam.sysOrgCode = res.departIds; + if(res.realname !== "管理员"){ + this.queryParam.sysOrgCode = res.departIds; + } + // this.queryParam.sysOrgCode = res.departIds; var params = this.getQueryParams();//查询条件 this.loading = true; getAction(this.url.list, params).then((res) => { diff --git a/src/views/accessrecords/flowchart/LndustrialExplosiveComeFlowChart.vue b/src/views/accessrecords/flowchart/LndustrialExplosiveComeFlowChart.vue index dd14c54..654f8c7 100644 --- a/src/views/accessrecords/flowchart/LndustrialExplosiveComeFlowChart.vue +++ b/src/views/accessrecords/flowchart/LndustrialExplosiveComeFlowChart.vue @@ -1,13 +1,116 @@ + name: "LndustrialExplosiveComeFlowChart", + mixins:[activitiMixin,JeecgListMixin], + props: { + /**/ + procInstId: { + type: String, + default: '', + required: true + }, + pictureId: { + type: String, + default: '', + required: true + }, + lcModa: { + type: Object, + required: false + } + }, + data() { + return { + url:{ + historicFlow:'/actTask/historicFlow/', + getHighlightImg:`${window._CONFIG['domianURL']}/activiti/models/getHighlightImg/`, + getNormalImg:`${window._CONFIG['domianURL']}/activiti/models/getNormalImg/` + }, + type: 0, + loading: false, // 表单加载状态 + loadingImg: false, + data: [], + id: "", + imgUrl: "", + backRoute: "" + }; + }, + created() { + console.log(this.pictureId,'1111111111') + + if (this.pictureId){ + this.initNormal(); + } + + }, + watch: { + procInstId:function(newval ,oldName) { + this.init(); + }, + pictureId:function() { + + } + }, + methods: { + loadData(){ + + }, + init() { + this.id = this.procInstId; + this.imgUrl =this.url.getHighlightImg + this.id + "?time=" + new Date(); + this.getDataList(); + }, + initNormal() { + this.id = this.pictureId; + this.imgUrl =this.url.getNormalImg + this.id + "?time=" + new Date(); + }, + getDataList() { + this.loading = true; + this.getAction(this.url.historicFlow+this.id).then(res => { + this.loading = false; + if (res.success) { + this.data = res.result; + if (!res.result || res.result.length == 0) { + this.$message.info( "未找到该记录审批历史数据,历史数据可能已被删除"); + } + }else { + this.$message.error( res.message); + } + }); + }, + handleTableChange(pagination, filters, sorter) { + //分页、排序、筛选变化时触发 + //TODO 筛选 + if (Object.keys(sorter).length > 0) { + this.isorter.column = sorter.field; + this.isorter.order = "ascend" == sorter.order ? "asc" : "desc" + } + this.ipagination = pagination; + // this.loadData(); + }, + callback(key){ + }, + afterSub(){ - \ No newline at end of file +}; + \ No newline at end of file diff --git a/src/views/accessrecords/flowchart/LndustrialExplosiveEnterFlowChart.vue b/src/views/accessrecords/flowchart/LndustrialExplosiveEnterFlowChart.vue index 348827f..fa5ba20 100644 --- a/src/views/accessrecords/flowchart/LndustrialExplosiveEnterFlowChart.vue +++ b/src/views/accessrecords/flowchart/LndustrialExplosiveEnterFlowChart.vue @@ -1,13 +1,123 @@ + name: "LndustrialExplosiveEnterFlowChart", + mixins:[activitiMixin,JeecgListMixin], + props: { + /**/ + procInstId: { + type: String, + default: '', + required: true + }, + pictureId: { + type: String, + default: '', + required: true + }, + lcModa: { + type: Object, + required: false + } + }, + data() { + return { + url:{ + historicFlow:'/actTask/historicFlow/', + getHighlightImg:`${window._CONFIG['domianURL']}/activiti/models/getHighlightImg/`, + getNormalImg:`${window._CONFIG['domianURL']}/activiti/models/getNormalImg/` + }, + type: 0, + loading: false, // 表单加载状态 + loadingImg: false, + data: [], + id: "", + imgUrl: "", + backRoute: "" + }; + }, + created() { + console.log(this.pictureId,'1111111111') - \ No newline at end of file + } + }, + methods: { + loadData(){ + + }, + init() { + this.id = this.procInstId; + this.imgUrl =this.url.getHighlightImg + this.id + "?time=" + new Date(); + this.getDataList(); + }, + initNormal() { + this.id = this.pictureId; + this.imgUrl =this.url.getNormalImg + this.id + "?time=" + new Date(); + }, + getDataList() { + this.loading = true; + this.getAction(this.url.historicFlow+this.id).then(res => { + this.loading = false; + if (res.success) { + this.data = res.result; + if (!res.result || res.result.length == 0) { + this.$message.info( "未找到该记录审批历史数据,历史数据可能已被删除"); + } + }else { + this.$message.error( res.message); + } + }); + }, + handleTableChange(pagination, filters, sorter) { + //分页、排序、筛选变化时触发 + //TODO 筛选 + if (Object.keys(sorter).length > 0) { + this.isorter.column = sorter.field; + this.isorter.order = "ascend" == sorter.order ? "asc" : "desc" + } + this.ipagination = pagination; + // this.loadData(); + }, + callback(key){ + }, + afterSub(){ + + }, + // pass(v){ + // this.$emit('passTask',v) + // }, + // back(v){ + // this.$emit('backTask',v) + // } + }, + +}; + \ No newline at end of file diff --git a/src/views/accessrecords/flowchart/ProcessMaterialWarehousingFlowChart.vue b/src/views/accessrecords/flowchart/ProcessMaterialWarehousingFlowChart.vue index 24f7f67..5b85b75 100644 --- a/src/views/accessrecords/flowchart/ProcessMaterialWarehousingFlowChart.vue +++ b/src/views/accessrecords/flowchart/ProcessMaterialWarehousingFlowChart.vue @@ -133,12 +133,10 @@ export default { }; }, created() { - console.log(this.procInstId,'1111111111') + console.log(this.pictureId,'1111111111') if (this.pictureId){ this.initNormal(); - }else { - this.init(); } // if (!this.pictrueId){ // diff --git a/src/views/accessrecords/flowchart/ProcessMaterialsDeliveryFlowChart.vue b/src/views/accessrecords/flowchart/ProcessMaterialsDeliveryFlowChart.vue index be05968..874e676 100644 --- a/src/views/accessrecords/flowchart/ProcessMaterialsDeliveryFlowChart.vue +++ b/src/views/accessrecords/flowchart/ProcessMaterialsDeliveryFlowChart.vue @@ -1,386 +1,123 @@ - \ No newline at end of file +}; + \ No newline at end of file diff --git a/src/views/accessrecords/modules/ProcessMaterialWarehousingDetail.vue b/src/views/accessrecords/modules/ProcessMaterialWarehousingDetail.vue index 514d424..4f406e2 100644 --- a/src/views/accessrecords/modules/ProcessMaterialWarehousingDetail.vue +++ b/src/views/accessrecords/modules/ProcessMaterialWarehousingDetail.vue @@ -217,7 +217,7 @@ { title:'规格', align:"center", - dataIndex: 'materialName' + dataIndex: 'specification' }, { title:'型号', diff --git a/src/views/accessrecords/modules/ProcessMaterialsDeliveryDetail.vue b/src/views/accessrecords/modules/ProcessMaterialsDeliveryDetail.vue index b0faed5..72cd498 100644 --- a/src/views/accessrecords/modules/ProcessMaterialsDeliveryDetail.vue +++ b/src/views/accessrecords/modules/ProcessMaterialsDeliveryDetail.vue @@ -187,12 +187,12 @@ export default { { title:'规格', align:"center", - dataIndex: 'materialName1', + dataIndex: 'specification', }, { title:'型号', align:"center", - dataIndex: 'materialName2', + dataIndex: 'type', }, { title:'单位', diff --git a/src/views/accessrecords/plan/LndustrialExplosiveComePlan.vue b/src/views/accessrecords/plan/LndustrialExplosiveComePlan.vue index 44058f6..7823619 100644 --- a/src/views/accessrecords/plan/LndustrialExplosiveComePlan.vue +++ b/src/views/accessrecords/plan/LndustrialExplosiveComePlan.vue @@ -1,13 +1,13 @@