yunxi
/
SC-MOM
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

业务日期修改

Browse Source
product
杨世强 1 year ago
parent c26ff37754
commit 0abf25ad1c
14 changed files with 100 additions and 15 deletions
Show Stats Download Patch File Download Diff File

2
SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchaseorderitemServiceImpl.java
Unescape View File

@ -974,7 +974,7 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl<PurchaseorderitemM
// 任务集合
if (StringUtil.isNotNull(userInfo.getOrganizeId()) && userInfo.getOrganizeId().equals("400882911877923205")) {
if (StringUtil.isNotNull(userInfo.getOrganizeId()) && userInfo.getOrganizeId().equals("395545258156429509")) {
// 子线程计数器
CountDownLatch countDownLatch = new CountDownLatch(5);
// 创建线程池

2
SC-boot/linkage-scm/src/main/resources/mapper/purchaseorder/PurchaseorderMapper.xml
Unescape View File

@ -129,7 +129,7 @@
3 ELSE 13
END
) AS `rate`,
ROUND(IFNULL( SUM(d.amount)/SUM( CASE b.unit WHEN 0 THEN b.settlement ELSE b.settlement/1000 END ),0), 4 ) AS `price`,
ROUND(IFNULL( SUM(d.amount)/SUM( CASE b.unit WHEN 0 THEN b.settlement ELSE b.settlement/1000 END ),0), 6 ) AS `price`,
ROUND( SUM( CASE b.unit WHEN 0 THEN b.settlement ELSE b.settlement/1000 END ), 2 ) AS `settlement`,
( CASE b.unit WHEN 0 THEN '吨' ELSE '千克' END ) AS `unit`,
ROUND( a.amount, 2 ) `amount`

9
SC-web/src/views/scm/basicInformation/arinvoices/Form.vue
Unescape View File

@ -17,7 +17,7 @@
</el-col>
<el-col :span="8" >
<el-form-item label="业务日期"
prop="businessDate" required>
prop="businessDate" >
<el-date-picker v-model="dataForm.businessDate"
placeholder="请选择" clearable :style='{"width":"100%"}' type="date" format="yyyy-MM-dd" value-format="timestamp" >
@ -370,6 +370,13 @@
activezbtwpv:'0',
rules:
{
businessDate: [
{
required: true,
message: '业务日期不能为空',
trigger: 'blur'
},
],
},
currencyOptions:[{"fullName":"人民币","id":"0"},{"fullName":"美元","id":"1"},{"fullName":"英镑","id":"2"}],
statusOptions:[{"fullName":"已保存","id":"0"},{"fullName":"审批中","id":"1"},{"fullName":"已审批","id":"2"}],

9
SC-web/src/views/scm/basicInformation/collection/Form.vue
Unescape View File

@ -83,7 +83,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="业务日期"
prop="businessDate" required>
prop="businessDate" >
<el-date-picker v-model="dataForm.businessDate" placeholder="请选择" clearable :style='{"width":"100%"}'
type="date" format="yyyy-MM-dd" value-format="timestamp" >
@ -292,6 +292,13 @@
trigger: 'change'
},
],
businessDate: [
{
required: true,
message: '业务日期不能为空',
trigger: 'blur'
},
],
},
customerNamecolumnOptions: [{
"label": "客户编码",

9
SC-web/src/views/scm/basicInformation/poundlist/PurchaseOrderForm.vue
Unescape View File

@ -89,7 +89,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="业务日期"
prop="businessDate" required>
prop="businessDate" >
<el-date-picker v-model="dataForm.businessDate" placeholder="请选择" clearable :style='{"width":"100%"}'
type="date" format="yyyy-MM-dd" value-format="timestamp" >
@ -641,6 +641,13 @@
message: '请选择',
trigger: 'change'
}, ],
businessDate: [
{
required: true,
message: '业务日期不能为空',
trigger: 'blur'
},
],
},
contractCodecolumnOptions: [{
"label": "合同编码",

9
SC-web/src/views/scm/basicInformation/poundlist/salesForm.vue
Unescape View File

@ -125,7 +125,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="业务日期"
prop="businessDate" required>
prop="businessDate" >
<el-date-picker v-model="dataForm.businessDate" placeholder="请选择" clearable :style='{"width":"100%"}'
type="date" format="yyyy-MM-dd" value-format="timestamp" >
@ -792,6 +792,13 @@
// trigger: 'change'
// },
// ],
businessDate: [
{
required: true,
message: '业务日期不能为空',
trigger: 'blur'
},
],
},
contractCodecolumnOptions: [{ 'label': '合同编码', 'value': 'contract_code' }, {
'label': '合同名称',

9
SC-web/src/views/scm/basicInformation/purchaseorder/Form.vue
Unescape View File

@ -93,7 +93,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="业务日期"
prop="businessDate" required>
prop="businessDate" >
<el-date-picker v-model="dataForm.businessDate" placeholder="请选择" clearable :style='{"width":"100%"}'
type="date" format="yyyy-MM-dd" value-format="timestamp" >
@ -623,6 +623,13 @@
message: '请选择',
trigger: 'change'
}, ],
businessDate: [
{
required: true,
message: '业务日期不能为空',
trigger: 'blur'
},
],
},
contractCodecolumnOptions: [{
"label": "合同编码",

12
SC-web/src/views/scm/basicInformation/purchaseorder/InvoicesForm.vue
Unescape View File

@ -12,7 +12,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="业务日期" prop="businessDate" required>
<el-form-item label="业务日期" prop="businessDate" >
<el-date-picker v-model="dataForm.businessDate" placeholder="请选择业务日期" clearable :style='{"width":"100%"}'
type="date" format="yyyy-MM-dd" value-format="timestamp" >
@ -350,7 +350,15 @@
invoicesitem0List: [],
},
activebzsrnx: '0',
rules: {},
rules: {
businessDate: [
{
required: true,
message: '业务日期不能为空',
trigger: 'blur'
},
],
},
invoiceTypeOptions: [{
"fullName": "普通增值税发票",
"id": "1"

9
SC-web/src/views/scm/basicInformation/purchaseorder/receiptinForm.vue
Unescape View File

@ -86,7 +86,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="业务日期" prop="businessDate" required>
<el-form-item label="业务日期" prop="businessDate" >
<el-date-picker v-model="dataForm.businessDate" placeholder="请选择业务日期" clearable :style='{"width":"100%"}'
type="date" format="yyyy-MM-dd" value-format="timestamp" >
@ -363,6 +363,13 @@
message: '请选择',
trigger: 'change'
}],
businessDate: [
{
required: true,
message: '业务日期不能为空',
trigger: 'blur'
},
],
},
typeOptions: [{
"fullName": "采购入库",

9
SC-web/src/views/scm/basicInformation/receiptin/Form.vue
Unescape View File

@ -86,7 +86,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="业务日期" prop="businessDate" required>
<el-form-item label="业务日期" prop="businessDate" >
<el-date-picker v-model="dataForm.businessDate" placeholder="请选择业务日期" clearable :style='{"width":"100%"}'
type="date" format="yyyy-MM-dd" value-format="timestamp" >
@ -324,6 +324,13 @@
message: '请选择',
trigger: 'change'
}],
businessDate: [
{
required: true,
message: '业务日期不能为空',
trigger: 'blur'
},
],
},
typeOptions: [{
"fullName": "采购入库",

9
SC-web/src/views/scm/basicInformation/receiptout/Form.vue
Unescape View File

@ -77,7 +77,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="业务日期"
prop="businessDate" required>
prop="businessDate" >
<el-date-picker v-model="dataForm.businessDate" placeholder="请选择" clearable :style='{"width":"100%"}'
type="date" format="yyyy-MM-dd" value-format="timestamp" >
@ -301,6 +301,13 @@
message: '请至少选择一个',
trigger: 'change'
}, ],
businessDate: [
{
required: true,
message: '业务日期不能为空',
trigger: 'blur'
},
],
},
typeOptions: [{
"fullName": "销售出库",

9
SC-web/src/views/scm/basicInformation/saleorder/Form.vue
Unescape View File

@ -124,7 +124,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="业务日期"
prop="remark" required>
prop="businessDate" >
<el-date-picker v-model="dataForm.businessDate" placeholder="请选择" clearable :style='{"width":"100%"}'
type="date" format="yyyy-MM-dd" value-format="timestamp" >
@ -733,6 +733,13 @@
trigger: 'change'
},
],
businessDate: [
{
required: true,
message: '业务日期不能为空',
trigger: 'blur'
},
],
},
contractCodecolumnOptions: [{"label": "合同编码", "value": "contract_code"}, {
"label": "合同名称",

9
SC-web/src/views/scm/basicInformation/saleorder/arinvoicesForm.vue
Unescape View File

@ -17,7 +17,7 @@
</el-col>
<el-col :span="8" >
<el-form-item label="业务日期"
prop="businessDate" required>
prop="businessDate" >
<el-date-picker v-model="dataForm.businessDate"
placeholder="请选择" clearable :style='{"width":"100%"}' type="date" format="yyyy-MM-dd" value-format="timestamp" >
@ -380,6 +380,13 @@
activezbtwpv:'0',
rules:
{
businessDate: [
{
required: true,
message: '业务日期不能为空',
trigger: 'blur'
},
],
},
currencyOptions:[{"fullName":"人民币","id":"0"},{"fullName":"美元","id":"1"},{"fullName":"英镑","id":"2"}],
statusOptions:[{"fullName":"已保存","id":"0"},{"fullName":"审批中","id":"1"},{"fullName":"已审批","id":"2"}],

9
SC-web/src/views/scm/basicInformation/saleorder/receiptoutForm.vue
Unescape View File

@ -87,7 +87,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="业务日期"
prop="businessDate" required>
prop="businessDate" >
<el-date-picker v-model="dataForm.businessDate" placeholder="请选择" clearable :style='{"width":"100%"}'
type="date" format="yyyy-MM-dd" value-format="timestamp" >
@ -319,6 +319,13 @@
trigger: 'change'
},
],
businessDate: [
{
required: true,
message: '业务日期不能为空',
trigger: 'blur'
},
],
},
typeOptions: [{"fullName": "销售出库", "id": "0"}, {"fullName": "购销出库", "id": "1"}],
salesIdcolumnOptions: [{"label": "单据编号", "value": "document_no"}, {

Write Preview
Loading…
Cancel
Save