java_project
/
hy-vue
4
0
Fork 0
Code Issues Pull Requests Activity
Browse Source

修改账外查询

dev
caoyizhong 2 years ago
parent
eb99f6f4a1
commit
496a734d4e
3 changed files with 36 additions and 36 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/utils/request.js
  2. 15
      src/views/accessrecords/plan/ProcessMaterialsDeliveryPlan.vue
  3. 55
      src/views/wastematerials/ProcessWasteMaterialsLists.vue

2
src/utils/request.js
Unescape View File

@ -17,7 +17,7 @@ let apiBaseUrl = window._CONFIG['domianURL'] || "/jeecg-boot";
const service = axios.create({
//baseURL: '/jeecg-boot',
baseURL: apiBaseUrl, // api base_url
timeout: 20000 // 请求超时时间
timeout: 50000 // 请求超时时间
})
const err = (error) => {

15
src/views/accessrecords/plan/ProcessMaterialsDeliveryPlan.vue
Unescape View File

@ -7,7 +7,7 @@
</a-tab-pane>
<a-tab-pane tab="流程节点图" key="2" forceRender>
<ProcessMaterialsDeliveryFlowChart v-if="isShow" :pictureId="pictureId" :procInstId="procInstId"/>
<process-material-warehousing-flow-chart v-if="ifShow" :pictureId="pictureId" :procInstId="procInstId"/>
</a-tab-pane>
<a-tab-pane tab="制式表格" key="3" forceRender>
<ProcessMaterialsDeliveryStatement />
@ -20,6 +20,7 @@
import ProcessMaterialsDeliveryDetail from '@views/accessrecords/modules/ProcessMaterialsDeliveryDetail'
import ProcessMaterialsDeliveryFlowChart from '@views/accessrecords/flowchart/ProcessMaterialsDeliveryFlowChart'
import ProcessMaterialsDeliveryStatement from '@views/accessrecords/statement/ProcessMaterialsDeliveryStatement'
import ProcessMaterialWarehousingFlowChart from '@views/accessrecords/flowchart/ProcessMaterialWarehousingFlowChart'
import { getAction } from '@api/manage'
export default {
@ -27,13 +28,14 @@ export default {
components: {
ProcessMaterialsDeliveryDetail,
ProcessMaterialsDeliveryFlowChart,
ProcessMaterialsDeliveryStatement
ProcessMaterialsDeliveryStatement,
ProcessMaterialWarehousingFlowChart
},
data() {
return {
isNew:'',
isShow:false,
pictrueId:'',
ifShow:false,
pictureId:'',
procInstId:'',
proMaterListId: this.$route.query.item,
url:{
@ -92,11 +94,12 @@ export default {
callback(key){
if (key==2){
getAction(this.url.getProcessPicture, { id:this.$route.query.item }).then((res) => {
console.log(res,'獲取數據')
if (res.success) {
// this.dataSource = res.result.records;
// this.ipagination.total = res.result.total;
this.pictureId=res.result.procDefId;
this.ifShow=true;
console.log(res,'获取数据')
}
if(res.code===510){
this.$message.warning(res.message)

55
src/views/wastematerials/ProcessWasteMaterialsLists.vue
Unescape View File

@ -9,19 +9,19 @@
<a-input placeholder="请输入供应商" v-model="queryParam.supplier"></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.supplierDescription"></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.supplierDescription"></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.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.materialNumber" ></a-input>
<a-form-item label="物料编号">
<a-input placeholder="请输入物料编号" v-model="queryParam.materialNumber" ></a-input>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
@ -29,15 +29,15 @@
<a-input placeholder="请输入物料描述" v-model="queryParam.materialDescription"></a-input>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="所属工作队">
<a-input placeholder="请输入所属工作队" v-model="queryParam.theirTeam"></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.theirTeam"></a-input>-->
<!-- </a-form-item>-->
<!-- </a-col>-->
<a-col :md="6" :sm="10">
<a-form-item label="生产日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-range-picker
style="width: 210px"
style="width: 250px"
format="YYYY-MM-DD"
:value="createProductTime"
:placeholder="['开始时间', '结束时间']"
@ -53,7 +53,7 @@
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="入库时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-range-picker
style="width: 210px"
style="width: 250px"
format="YYYY-MM-DD"
:value = "createInnerTime"
:placeholder="['开始时间', '结束时间']"
@ -61,11 +61,11 @@
/>
</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.materialsState"></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.materialsState"></a-input>-->
<!-- </a-form-item>-->
<!-- </a-col>-->
</a-row>
</a-form>
</div>
@ -342,16 +342,13 @@
},
initDictConfig(){
},
searchQuery(){
getAction(this.url.list,this.queryParam).then((res)=>{
if(res.success){
// console.log("resultsearch ：")
// console.log(res.result);
// console.log(this.queryParam)
this.dataSource=res.result.records;
}
});
},
// searchQuery(){
// getAction(this.url.list,this.queryParam).then((res)=>{
// if(res.success){
// this.dataSource=res.result.records;
// }
// });
// },
searchReset(){
this.createProductTime = [],
this.createInnerTime = [],

Write Preview
Loading…
Cancel
Save