yunxi
/
jigangSCM2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://222.71.165.188:3000/yunxi/jigangSCM2

Browse Source
jg-waiwang-pro
XI_TENG\xixi_ 8 months ago
parent eecb212406 02d8dd7e54
commit 0c607662f4
14 changed files with 1334 additions and 148 deletions
Show Stats Download Patch File Download Diff File

15
jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/DeliveryOrderMapper.xml
Unescape View File

@ -5,7 +5,7 @@
<resultMap id="deliveryOrder" type="jnpf.entity.DeliveryOrderEntity">
<id column="id" property="id"></id>
<result column="delivery_type" property="deliveryType"></result>
<result column="delivery_status" property="deliveryStatus"></result>
<result column="deliveryStatus" property="deliveryStatus"></result>
<result column="delivery_code" property="deliveryCode"></result>
<result column="preparation_time" property="preparationTime"></result>
<result column="business_id" property="businessId"></result>
@ -25,7 +25,18 @@
</resultMap>
<select id="queryDeliveryOrderList" resultMap="deliveryOrder">
select * from jg_delivery_order a
select a.*,
case a.delivery_status
when '1' then '待校验'
when '2' then '待审核'
when '3' then '待处理'
when '4' then '待执行'
when '5' then '执行中'
when '6' then '已完成'
when '7' then '校验失败'
when '7' then '已取消'
end as deliveryStatus
from jg_delivery_order a
${ew.customSqlSegment}
<if test="deliveryOrderPagination.sidx != null and deliveryOrderPagination.sidx != ''">
ORDER BY ${deliveryOrderPagination.sidx} ${deliveryOrderPagination.sort}

6
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/BusinessOrderServiceImpl.java
Unescape View File

@ -403,8 +403,8 @@ public class BusinessOrderServiceImpl extends ServiceImpl<BusinessOrderMapper, B
Field declaredField = businessOrderEntity.getClass().getDeclaredField(strs[0]);
declaredField.setAccessible(true);
String value = declaredField.getAnnotation(TableField.class).value();
// businessOrderQueryWrapper="asc".equals(businessOrderPagination.getSort().toLowerCase())?businessOrderQueryWrapper.orderByAsc(value):businessOrderQueryWrapper.orderByDesc(value);
businessOrderPagination.setSidx("a." + value);
businessOrderQueryWrapper="asc".equals(businessOrderPagination.getSort().toLowerCase())?businessOrderQueryWrapper.orderByAsc(value):businessOrderQueryWrapper.orderByDesc(value);
// businessOrderPagination.setSidx("a." + value);
} catch (NoSuchFieldException e) {
e.printStackTrace();
}
@ -414,7 +414,7 @@ public class BusinessOrderServiceImpl extends ServiceImpl<BusinessOrderMapper, B
if((total>0 && AllIdList.size()>0) || total==0){
Page<BusinessOrderEntity> page=new Page<>(businessOrderPagination.getCurrentPage(), businessOrderPagination.getPageSize());
// IPage<BusinessOrderEntity> userIPage=this.page(page, businessOrderQueryWrapper);
IPage<BusinessOrderEntity> userIPage=businessOrderMapper.queryPurchaseOrder(page,businessOrderPagination, businessOrderQueryWrapper);
IPage<BusinessOrderEntity> userIPage=businessOrderMapper.querySaleOrder(page,businessOrderPagination, businessOrderQueryWrapper);
return businessOrderPagination.setData(userIPage.getRecords(),userIPage.getTotal());
}else{
List<BusinessOrderEntity> list = new ArrayList();

4
jnpf-java-boot/jnpf-web/src/components/JNPF-table/index.vue
Unescape View File

@ -5,8 +5,8 @@
v-on="$listeners" :border="border">
<el-table-column prop="selection" type="selection" width="50" v-if="hasC" align="center"
:selectable="checkSelectable" />
<el-table-column prop="index" type="index" width="50" label="序号" v-if="hasNO"
:fixed="hasNOFixed" align="center" />
<el-table-column prop="index" type="index" width="50" label="序号" v-if="hasNO" fixed="left"
align="center" />
<jnpf-table-column :columns="columns" :columnList="columnList" v-if="customColumn" />
<template v-else>
<slot />

8
jnpf-java-boot/jnpf-web/src/settings.js
Unescape View File

@ -1,5 +1,5 @@
module.exports = {
title: 'JNPF快速开发平台',
title: '智慧管家平台',
/**
* @type {boolean} true | false
@ -32,13 +32,13 @@ module.exports = {
* If you want to also use it in dev, you can pass ['production', 'development']
*/
sysConfig: {
sysVersion: '3.4.7',
copyright: 'Copyright @ 2023 引迈信息技术有限公司版权所有',
sysVersion: '1.0.0',
copyright: 'Copyright @ 2023 上海长江云息数字科技有限公司',
navigationIcon: '',
workLogoIcon: '',
logoIcon: '',
loginIcon: '',
sysName: 'JNPF快速开发平台'
sysName: '智慧管家平台'
},
themeClass: 'blue',
layoutType: 'classic',

2
jnpf-java-boot/jnpf-web/src/views/scm/contractL/form.vue
Unescape View File

@ -5,7 +5,7 @@
<template>
<div :style="{ margin: '0 auto', width: '100%' }">
<el-row :gutter="15" class="">
<el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="130px"
<el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="160px"
label-position="right" :disabled="setting.readonly">
<template v-if="!loading && formOperates">
<!-- 具体表单 -->

102
jnpf-java-boot/jnpf-web/src/views/scm/productUnitwarehouse/Detail.vue
Unescape View File

@ -1,62 +1,56 @@
<template>
<transition name="el-zoom-in-center">
<div class="JNPF-preview-main">
<transition name="el-zoom-in-center">
<div class="JNPF-preview-main">
<Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" />
<div class="JNPF-common-page-header">
<el-page-header @back="goBack"
content="详情"/>
<el-page-header @back="goBack" content="详情" />
<div class="options">
<el-button @click="goBack">取 消</el-button>
</div>
</div>
<el-row :gutter="15" class=" main" :style="{margin: '0 auto',width: '100%'}">
<el-form ref="formRef" :model="dataForm" size="small" label-width="100px" label-position="right" >
<el-row :gutter="15" class=" main" :style="{ margin: '0 auto', width: '100%' }">
<el-form ref="formRef" :model="dataForm" size="small" label-width="100px" label-position="right">
<template v-if="!loading">
<el-col :span="24" >
<jnpf-form-tip-item label="单位名称"
prop="unitName" >
<p>{{dataForm.unitName}}</p>
<el-col :span="24">
<jnpf-form-tip-item label="单位名称" prop="unitName">
<p>{{ dataForm.unitName }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" >
<jnpf-form-tip-item label="描述"
prop="remark" >
<p>{{dataForm.remark}}</p>
<el-col :span="24">
<jnpf-form-tip-item label="描述" prop="remark">
<p>{{ dataForm.remark }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" >
<jnpf-form-tip-item label="状态"
prop="status" >
<p>{{dataForm.status}}</p>
<el-col :span="24">
<jnpf-form-tip-item label="状态" prop="status">
<p>{{ dataForm.status }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" >
<jnpf-form-tip-item label="单位类型"
prop="unitType" >
<p>{{dataForm.unitType}}</p>
<el-col :span="24">
<jnpf-form-tip-item label="单位类型" prop="unitType">
<p>{{ dataForm.unitType }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" >
<jnpf-form-tip-item label="来源"
prop="source" >
<p>{{dataForm.source}}</p>
<el-col :span="24">
<jnpf-form-tip-item label="来源" prop="source">
<p>{{ dataForm.source }}</p>
</jnpf-form-tip-item>
</el-col>
</template>
</el-form>
</el-form>
</el-row>
</div>
</transition>
</transition>
</template>
<script>
import request from '@/utils/request'
import request from '@/utils/request'
import { getConfigData } from '@/api/onlineDev/visualDev'
import jnpf from '@/utils/jnpf'
import Detail from '@/views/basic/dynamicModel/list/detail'
import { thousandsFormat } from "@/components/Generator/utils/index"
export default {
components: { Detail},
import { getConfigData } from '@/api/onlineDev/visualDev'
import jnpf from '@/utils/jnpf'
import Detail from '@/views/basic/dynamicModel/list/detail'
import { thousandsFormat } from "@/components/Generator/utils/index"
export default {
components: { Detail },
props: [],
data() {
return {
@ -65,20 +59,20 @@
loading: false,
dataForm: {
id :'',
unitName : '',
remark : '',
status : "1",
unitType : "2",
source : "2",
creatorTime : "",
creatorUserId : "",
lastModifyTime : "",
lastModifyUserId : "",
id: '',
unitName: '',
remark: '',
status: "1",
unitType: "2",
source: "2",
creatorTime: "",
creatorUserId: "",
lastModifyTime: "",
lastModifyUserId: "",
},
statusProps:{"label":"fullName","value":"enCode" },
unitTypeProps:{"label":"fullName","value":"enCode" },
sourceProps:{"label":"fullName","value":"enCode" },
statusProps: { "label": "fullName", "value": "enCode" },
unitTypeProps: { "label": "fullName", "value": "enCode" },
sourceProps: { "label": "fullName", "value": "enCode" },
}
},
@ -87,7 +81,7 @@
created() {
},
mounted() {},
mounted() { },
methods: {
toDetail(defaultValue, modelId) {
if (!defaultValue) return
@ -101,8 +95,8 @@
})
})
},
dataInfo(dataAll){
let _dataAll =dataAll
dataInfo(dataAll) {
let _dataAll = dataAll
this.dataForm = _dataAll
},
@ -113,10 +107,10 @@
this.dataForm.id = id || 0;
this.visible = true;
this.$nextTick(() => {
if(this.dataForm.id){
if (this.dataForm.id) {
this.loading = true
request({
url: '/api/scm/ProductUnitwarehouse/detail/'+this.dataForm.id,
url: '/api/scm/ProductUnitwarehouse/detail/' + this.dataForm.id,
method: 'get'
}).then(res => {
this.dataInfo(res.data)
@ -127,6 +121,6 @@
})
},
},
}
}
</script>

50
jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/purchaseOrder/index.vue
Unescape View File

@ -72,7 +72,7 @@
v-has="'btn_batchRemove'">批量删除
</el-button>
<el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
@click="createSaleOrder()">生成销售订单
@click="addSaleHandle()">生成销售订单
</el-button>
</div>
<div class="JNPF-common-head-right">
@ -227,6 +227,7 @@
<SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
@superQuery="superQuery" />
<SaleOrder v-if="saleOrderVisible" ref="SaleOrder" @refresh="initData" />
<SaleFlowBox v-if="saleFlowVisible" ref="SaleFlowBox" @close="colseFlow" />
</div>
</template>
@ -238,6 +239,7 @@ import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
import { getFormById } from '@/api/workFlow/FormDesign'
import { getFlowList } from '@/api/workFlow/FlowEngine'
import FlowBox from '@/views/workFlow/components/FlowBox'
import SaleFlowBox from '@/views/workFlow/components/SaleFlowBox'
import ExportBox from '@/components/ExportBox'
import ToFormDetail from '@/views/basic/dynamicModel/list/detail'
import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
@ -254,6 +256,7 @@ import SaleOrder from '@/views/scm/saleCenter/saleOrder/form.vue'
export default {
components: {
FlowBox,
SaleFlowBox,
ExportBox, ToFormDetail, SuperQuery, SaleOrder
},
data() {
@ -306,7 +309,9 @@ export default {
formVisible: false,
flowVisible: false,
flowListVisible: false,
saleFlowVisible: false,
flowList: [],
saleFlowList: [],
exportBoxVisible: false,
orderTypeOptions: [{ "fullName": "标准销售", "id": "1" }, { "fullName": "合同销售", "id": "2" }],
orderTypeProps: { "label": "fullName", "value": "id" },
@ -375,9 +380,17 @@ export default {
this.$router.push('/404');
})
})
getFormById("522690032352364805").then(res1 => {
let saleFlowId = res1.data && res1.data.id
getFlowList(saleFlowId, '1').then(res2 => {
this.saleFlowList = res2.data
}).catch((e) => {
this.$message({ type: 'error', message: e.message });
this.$router.push('/404');
})
})
},
methods: {
createSaleOrder() {
if (!this.multipleSelectionItem.length) {
this.$message({
@ -740,6 +753,38 @@ export default {
this.$refs.FlowBox.init(data)
})
},
addSaleHandle() {
if (!this.multipleSelectionItem.length) {
this.$message({
type: 'error',
message: '请选择一条数据',
duration: 1500,
})
return
}
const selectData = this.multipleSelectionItem
if (!this.saleFlowList.length) {
this.$message({ type: 'error', message: '流程不存在' });
} else if (this.saleFlowList.length === 1) {
this.selectSaleFlow(this.saleFlowList[0], selectData)
} else {
this.flowListVisible = true
}
},
selectSaleFlow(item, selectData) {
let data = {
id: '',
formType: 1,
flowId: item.id,
opType: '-1',
selectData: selectData
}
this.flowListVisible = false
this.saleFlowVisible = true
this.$nextTick(() => {
this.$refs.SaleFlowBox.init(data)
})
},
refresh(isrRefresh) {
this.formVisible = false
if (isrRefresh) this.reset()
@ -750,6 +795,7 @@ export default {
},
colseFlow(isrRefresh) {
this.flowVisible = false
this.saleFlowVisible = false
if (isrRefresh) this.reset()
},
}

10
jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryOrder/index.vue
Unescape View File

@ -61,16 +61,18 @@
</div>
</div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
@selection-change="handleSelectionChange" :span-method="arraySpanMethod">
<el-table-column prop="deliveryCode" label="单据编号" align="left">
@selection-change="handleSelectionChange" :span-method="arraySpanMethod" border>
<el-table-column prop="deliveryCode" label="单据编号" align="left" fixed="left">
</el-table-column>
<el-table-column prop="subjectId" label="客户名称" align="left">
<el-table-column prop="subjectId" label="客户名称" align="left" fixed="left">
</el-table-column>
<el-table-column label="单据类型" prop="deliveryType" algin="left">
<el-table-column label="单据类型" prop="deliveryType" algin="left" fixed="left">
<template slot-scope="scope">
{{ scope.row.deliveryType}}
</template>
</el-table-column>
<el-table-column prop="deliveryStatus" label="单据状态" align="left" fixed="left">
</el-table-column>
<el-table-column prop="businessId" label="关联单据号" align="left">
</el-table-column>
<el-table-column prop="deliveryAddress" label="发货数量" align="left">

10
jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryVoucher/index.vue
Unescape View File

@ -78,20 +78,20 @@
</div>
</div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
@selection-change="handleSelectionChange" :span-method="arraySpanMethod">
<el-table-column prop="voucherCode" label="凭证编号" align="left">
@selection-change="handleSelectionChange" :span-method="arraySpanMethod" border>
<el-table-column prop="voucherCode" label="凭证编号" align="left" fixed="left">
</el-table-column>
<el-table-column label="单据类型" prop="documentType" algin="left">
<el-table-column label="单据类型" prop="documentType" algin="left" fixed="left">
<template slot-scope="scope">
{{ scope.row.documentType}}
</template>
</el-table-column>
<el-table-column label="凭证类型" prop="voucherType" algin="left">
<el-table-column label="凭证类型" prop="voucherType" algin="left" fixed="left">
<template slot-scope="scope">
{{ scope.row.voucherType}}
</template>
</el-table-column>
<el-table-column label="凭证状态" prop="voucherStatus" algin="left">
<el-table-column label="凭证状态" prop="voucherStatus" algin="left" fixed="left">
<template slot-scope="scope">
{{ scope.row.voucherStatus}}
</template>

2
jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/receiptOrder/index.vue
Unescape View File

@ -72,7 +72,7 @@
</el-table-column>
<el-table-column prop="enterpriseId" label="机构名称" align="left">
</el-table-column>
<el-table-column prop="warehouseId" label="收货仓库" align="left">
<el-table-column prop="receiptWarehouse" label="收货仓库" align="left">
</el-table-column>
<el-table-column prop="shippingAddress" label="发货地址" align="left">
</el-table-column>

14
jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/form.vue
Unescape View File

@ -1115,6 +1115,7 @@
</el-form>
</el-row>
<UserBox v-if="userBoxVisible" ref="userBox" @submit="submit" />
<FlowBox v-if="flowVisible" ref="FlowBox" />
</div>
</template>
@ -1468,7 +1469,9 @@ export default {
}
this.dataValueAll = JSON.parse(JSON.stringify(this.dataForm))
},
mounted() { },
mounted() {
this.initPurchaseData();
},
methods: {
productInfo(val, val2) {
// this.dataForm.businessOrderProductRelationalList = []
@ -1538,19 +1541,22 @@ export default {
this.getsettlementinfosettlementMethodOptions();
},
selfGetInfo(dataForm) {
debugger
this.dataInfo(dataForm)
},
beforeSubmit() {
const _data = this.dataList()
return _data
},
initPurchaseData(){
console.log("55555555", this.setting)
},
selfInit() {
this.dataAll()
},
getFormById() {
getFormById("522690032352364805").then(res => {
// this.dataForm.flowId = res.data && res.data.flowId
this.dataForm.flowId = "523058114551875973"
this.dataForm.flowId = res.data && res.data.flowId
// this.encode = res.data&&res.data.encode
})
},
@ -1788,9 +1794,11 @@ export default {
},
dataList() {
var _data = this.dataForm;
debugger
return _data;
},
dataInfo(dataAll) {
debugger
let _dataAll = dataAll
this.dataForm = _dataAll
this.isEdit = true

13
jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/index.vue
Unescape View File

@ -92,18 +92,19 @@
</el-tooltip>
</div>
</div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
@selection-change="handleSelectionChange" :span-method="arraySpanMethod">
<el-table-column prop="code" label="单据编号" align="left">
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'
@selection-change="handleSelectionChange" :span-method="arraySpanMethod" border>
<el-table-column prop="code" label="单据编号" align="left" fixed="left">
</el-table-column>
<el-table-column prop="firstSubjectBasicId" label="客户名称" align="left">
<el-table-column prop="firstSubjectBasicId" label="客户名称" align="left" fixed="left">
</el-table-column>
<el-table-column label="单据类型" prop="orderType" algin="left">
<el-table-column label="单据类型" prop="orderType" algin="left" fixed="left">
<template slot-scope="scope">
{{ scope.row.orderType}}
</template>
</el-table-column>
<el-table-column label="单据状态" prop="status" algin="left">
<el-table-column label="单据状态" prop="status" algin="left" fixed="left">
<template slot-scope="scope">
{{ scope.row.status}}
</template>

1
jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/redeliveryOrder.vue
Unescape View File

@ -679,7 +679,6 @@ export default {
this.dataForm.orderNum = data.length
let list = []
data.forEach((item, index) => {
console.log("2", item.businessOrderProductRelationalList);
this.dataForm.redeliveryoriginalorderrelationList.push(item)
this.dataForm.redeliveryproductrelationList = [...item.businessOrderProductRelationalList, ...this.dataForm.redeliveryproductrelationList]
});

1125
jnpf-java-boot/jnpf-web/src/views/workFlow/components/SaleFlowBox.vue
View File

File diff suppressed because it is too large Load Diff
Write Preview
Loading…
Cancel
Save