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

总库物资及详情页修改

dev
sensen 2 years ago
parent
784509796f
commit
30abeffe8c
6 changed files with 19136 additions and 49 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. 19040
      package-lock.json
  2. 1
      package.json
  3. 16
      src/views/suppliesstronger/ProcessSuppliesStrongerList.vue
  4. 82
      src/views/suppliesstronger/modules/ProcessSuppliesStrongerForm.vue
  5. 42
      src/views/suppliesstronger/modules/ProcessSuppliesStrongerLists.vue
  6. 2
      yarn.lock

19040
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

1
package.json
Unescape View File

@ -20,6 +20,7 @@
"axios": "^0.18.0",
"clipboard": "^2.0.4",
"codemirror": "^5.46.0",
"core-js": "^3.25.5",
"dayjs": "^1.8.0",
"dom-align": "1.12.0",
"echarts": "^4.8.0",

16
src/views/suppliesstronger/ProcessSuppliesStrongerList.vue
Unescape View File

@ -13,8 +13,8 @@
<!-- </a-form-item>-->
<!-- </a-col>-->
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="供应商信息ID">
<a-input placeholder="请输入供应商信息ID" v-model="queryParam.supplierId"></a-input>
<a-form-item label="供应商">
<a-input placeholder="请输入供应商信息" v-model="queryParam.supplierId"></a-input>
</a-form-item>
</a-col>
@ -61,8 +61,8 @@
<!-- </a-form-item>-->
<!-- </a-col>-->
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="仓储地点_id">
<j-search-select-tag placeholder="请选择仓储地点_id" v-model="queryParam.unitWasteWarehouseCodeId" dict=",,"/>
<a-form-item label="仓储地点">
<j-search-select-tag placeholder="请选择仓储地点" v-model="queryParam.unitWasteWarehouseCodeId" dict=",,"/>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
@ -240,7 +240,7 @@
// dataIndex: 'processId'
// },
{
title:'供应商信息ID',
title:'供应商',
align:"center",
dataIndex: 'supplierId'
},
@ -376,16 +376,16 @@
getSuperFieldList(){
let fieldList=[];
fieldList.push({type:'string',value:'processId',text:'流程表单号',dictCode:''})
fieldList.push({type:'string',value:'supplierId',text:'供应商信息ID',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:'unitMeasurement',text:'计量单位',dictCode:''})
fieldList.push({type:'int',value:'amount',text:'数量',dictCode:''})
fieldList.push({type:'BigDecimal',value:'price',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:'仓储地点_id',dictTable:'', dictText:'', 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:'date',value:'productionTime',text:'生产时间'})
fieldList.push({type:'date',value:'expirationDate',text:'保质期'})

82
src/views/suppliesstronger/modules/ProcessSuppliesStrongerForm.vue
Unescape View File

@ -3,54 +3,99 @@
<j-form-container :disabled="formDisabled">
<a-form :form="form" slot="detail">
<a-row>
<a-col :span="6">
<a-col :span="8">
<a-form-item label="流程表单号" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input v-decorator="['processId']" />
</a-form-item>
</a-col>
<a-col :span="8">
<a-form-item label="供应商" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input v-decorator="['supplierId']" />
</a-form-item>
</a-col>
<a-col :span="8">
<a-form-item label="供应商描述" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-search-select-tag v-decorator="['supplierDescription']" type="list" :trigger-change="true" placeholder="请输入供应商描述" />
</a-form-item>
</a-col>
<a-col :span="8">
<a-form-item label="物料组" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-search-select-tag v-decorator="['itemGroup']" dict="" />
<j-search-select-tag v-decorator="['itemGroup']" type="list" :trigger-change="true" placeholder="请输入物料组" />
</a-form-item>
</a-col>
<a-col :span="6">
<a-col :span="8">
<a-form-item label="物料" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-search-select-tag v-decorator="['item']" dict="" />
<j-search-select-tag v-decorator="['item']" type="list" :trigger-change="true" placeholder="请输入物料" />
</a-form-item>
</a-col>
<a-col :span="6">
<a-col :span="8">
<a-form-item label="物料描述" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-search-select-tag v-decorator="['itemDescription']" dict="" />
<j-search-select-tag v-decorator="['itemDescription']" type="list" :trigger-change="true" placeholder="请输入物料描述" />
</a-form-item>
</a-col>
<a-col :span="8">
<a-form-item label="计量单位" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-search-select-tag v-decorator="['unitMeasurement']" type="list" :trigger-change="true" placeholder="请输入计量单位" />
</a-form-item>
</a-col>
<a-col :span="8">
<a-form-item label="数量" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input v-decorator="['amount']" />
</a-form-item>
</a-col>
<a-col :span="6">
<a-form-item label="仓储地点_id" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-search-select-tag v-decorator="['unitWasteWarehouseCodeId']" dict="" />
<a-col :span="8">
<a-form-item label="单价（元）" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input v-decorator="['price']" />
</a-form-item>
</a-col>
<a-col :span="6">
<a-col :span="8">
<a-form-item label="金额（元）" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input v-decorator="['rates']" />
</a-form-item>
</a-col>
<a-col :span="8">
<a-form-item label="仓储地点" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-search-select-tag v-decorator="['unitWasteWarehouseCodeId']" type="list" :trigger-change="true" placeholder="请输入仓储地点" />
</a-form-item>
</a-col>
<a-col :span="8">
<a-form-item label="存储仓位" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-search-select-tag v-decorator="['freightSpace']" dict="" />
<j-search-select-tag v-decorator="['freightSpace']" type="list" :trigger-change="true" placeholder="请输入储存仓位" />
</a-form-item>
</a-col>
<a-col :span="6">
<a-col :span="8">
<a-form-item label="生产时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-date placeholder="请选择生产时间" v-decorator="['productionTime']" :trigger-change="true" style="width: 100%" />
</a-form-item>
</a-col>
<a-col :span="6">
<a-col :span="8">
<a-form-item label="保质期" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-date placeholder="请选择保质期" v-decorator="['expirationDate']" :trigger-change="true" style="width: 100%" />
</a-form-item>
</a-col>
<a-col :span="6">
<a-col :span="8">
<a-form-item label="批次" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-search-select-tag v-decorator="['batch']" dict="" />
<j-search-select-tag v-decorator="['batch']" type="list" :trigger-change="true" placeholder="请输入批次" />
</a-form-item>
</a-col>
<a-col :span="6">
<a-col :span="8">
<a-form-item label="到货情况" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-search-select-tag v-decorator="['arrivalNotice']" dict="" />
</a-form-item>
</a-col>
<a-col :span="8">
<a-form-item label="入库时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-date placeholder="请选择入库时间" v-decorator="['inboundTime']" :trigger-change="true" style="width: 100%" />
</a-form-item>
</a-col>
<a-col :span="6">
<a-col :span="8">
<a-form-item label="入库人" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-search-select-tag v-decorator="['librarySign']" dict="" />
<j-search-select-tag v-decorator="['librarySign']" type="list" :trigger-change="true" placeholder="请输入入库人" />
</a-form-item>
</a-col>
<a-col :span="8">
<a-form-item label="核算属性" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-search-select-tag v-decorator="['accountingAttributes']" type="list" :trigger-change="true" placeholder="请输入核算属性" />
</a-form-item>
</a-col>
<a-col v-if="showFlowSubmitButton" :span="24" style="text-align: center">
@ -71,6 +116,7 @@
import JDate from '@/components/jeecg/JDate'
import JSearchSelectTag from '@/components/dict/JSearchSelectTag'
export default {
name: 'ProcessSuppliesStrongerForm',
components: {

42
src/views/suppliesstronger/modules/ProcessSuppliesStrongerLists.vue
Unescape View File

@ -12,9 +12,9 @@
<!-- <a-input placeholder="请输入流程表单号" v-model="queryParam.processId"></a-input>-->
<!-- </a-form-item>-->
<!-- </a-col>-->
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="供应商信息ID">
<a-input placeholder="请输入供应商信息ID" v-model="queryParam.supplierId"></a-input>
<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>
@ -23,17 +23,17 @@
<!-- <j-search-select-tag placeholder="请选择供应商描述" v-model="queryParam.supplierDescription" dict=",,"/>-->
<!-- </a-form-item>-->
<!-- </a-col>-->
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-col :xl="4" :lg="7" :md="8" :sm="16">
<a-form-item label="物料组">
<j-search-select-tag placeholder="请选择物料组" v-model="queryParam.itemGroup" dict=",,"/>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-col :xl="4" :lg="7" :md="8" :sm="16">
<a-form-item label="物料">
<j-search-select-tag placeholder="请选择物料" v-model="queryParam.item" dict=",,"/>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-col :xl="4" :lg="7" :md="8" :sm="16">
<a-form-item label="物料描述">
<j-search-select-tag placeholder="请选择物料描述" v-model="queryParam.itemDescription" dict=",,"/>
</a-form-item>
@ -60,27 +60,27 @@
<!-- <a-input placeholder="请输入金额" v-model="queryParam.rates"></a-input>-->
<!-- </a-form-item>-->
<!-- </a-col>-->
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="仓储地点_id">
<j-search-select-tag placeholder="请选择仓储地点_id" v-model="queryParam.unitWasteWarehouseCodeId" dict=",,"/>
<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="6" :lg="7" :md="8" :sm="24">
<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="6" :lg="7" :md="8" :sm="24">
<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="6" :lg="7" :md="8" :sm="24">
<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="6" :lg="7" :md="8" :sm="24">
<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>
@ -90,12 +90,12 @@
<!-- <a-input placeholder="请输入是否到货" v-model="queryParam.arrivalNotice"></a-input>-->
<!-- </a-form-item>-->
<!-- </a-col>-->
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<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="6" :lg="7" :md="8" :sm="24">
<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>
@ -243,7 +243,7 @@
dataIndex: 'processId'
},
{
title:'供应商信息ID',
title:'供应商',
align:"center",
dataIndex: 'supplierId'
},
@ -278,7 +278,7 @@
dataIndex: 'amount'
},
{
title:'价格',
title:'单价',
align:"center",
dataIndex: 'price'
},
@ -288,7 +288,7 @@
dataIndex: 'rates'
},
{
title:'仓储地点_id',
title:'仓储地点',
align:"center",
dataIndex: 'unitWasteWarehouseCodeId_dictText'
},
@ -382,16 +382,16 @@
getSuperFieldList(){
let fieldList=[];
fieldList.push({type:'string',value:'processId',text:'流程表单号',dictCode:''})
fieldList.push({type:'string',value:'supplierId',text:'供应商信息ID',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:'unitMeasurement',text:'计量单位',dictCode:''})
fieldList.push({type:'int',value:'amount',text:'数量',dictCode:''})
fieldList.push({type:'BigDecimal',value:'price',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:'仓储地点_id',dictTable:'', dictText:'', 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:'date',value:'productionTime',text:'生产时间'})
fieldList.push({type:'date',value:'expirationDate',text:'保质期'})

2
yarn.lock
Unescape View File

@ -3595,7 +3595,7 @@ core-js@^2.4.0, core-js@^2.5.0, core-js@^2.6.5:
resolved "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz#38831469f9922bded8ee21c9dc46985e0399308c"
integrity sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==
core-js@^3.6.5:
core-js@^3.25.5, core-js@^3.6.5:
version "3.25.5"
resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.25.5.tgz#e86f651a2ca8a0237a5f064c2fe56cef89646e27"
integrity sha512-nbm6eZSjm+ZuBQxCUPQKQCoUEfFOXjUZ8dTTyikyKaWrTYmAVbykQfwsKE5dBK88u3QCkCrzsx/PPlKfhsvgpw==

Write Preview
Loading…
Cancel
Save