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

Merge remote-tracking branch 'origin/main'

Browse Source
product
chuang 2 years ago
parent 92bc5e236f 2a68c32b93
commit ddaf1c1147
7 changed files with 160 additions and 97 deletions
Show Stats Download Patch File Download Diff File

38
SC-web/src/views/scm/basicInformation/arinvoices/index.vue
Unescape View File

@ -26,6 +26,17 @@
</el-button>
<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()" >批量删除
</el-button>
<el-button type="text" icon="el-icon-plus" @click="1">编辑
</el-button>
<el-button type="text" icon="el-icon-plus" @click="1">删除
</el-button>
<el-button type="text" icon="el-icon-plus" @click="1">审核
</el-button>
<el-button type="text" icon="el-icon-plus" @click="1">弃审
</el-button>
<el-button type="text" icon="el-icon-plus" @click="1">提交
</el-button>
</div>
<div class="JNPF-common-head-right">
<el-tooltip effect="dark" content="刷新" placement="top">
@ -35,36 +46,37 @@
<screenfull isContainer/>
</div>
</div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c @selection-change="handleSelectionChange">
<el-table-column prop="documentNo" label="单据编号" width="0" align="left"
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c :hasNO="false" @selection-change="handleSelectionChange" border>
<el-table-column type="index" width="50" label="序号" fixed="left" align="center" />
<el-table-column prop="documentNo" label="单据编号" sortable width="200" align="center" fixed="left"
/>
<el-table-column prop="customerName" label="客户名称" width="0" align="left"
<el-table-column prop="customerName" label="客户名称" sortable width="150" align="center" fixed="left"
/>
<el-table-column prop="amount" label="金额" width="0" align="left"
<el-table-column prop="amount" label="金额" width="120" sortable align="center"
/>
<el-table-column prop="quantity" label="数量" width="0" align="left"
<el-table-column prop="quantity" label="数量" width="120" sortable align="center"
/>
<el-table-column label="币别 " width="0" prop="currency" algin="left"
<el-table-column label="币别 " width="80" prop="currency" sortable algin="center"
>
<template slot-scope="scope">
{{ scope.row.currency | dynamicText(currencyOptions) }}
</template>
</el-table-column>
<el-table-column prop="invoiceAmount" label="发票金额" width="0" align="left"
<el-table-column prop="invoiceAmount" label="发票金额" sortable width="120" align="center"
/>
<el-table-column prop="invoiceQuantity" label="发票数量" width="0" align="left"
<el-table-column prop="invoiceQuantity" label="发票数量" sortable width="120" align="center"
/>
<el-table-column prop="salesOrderNo" label="销售订单号" width="0" align="left"
<el-table-column prop="salesOrderNo" label="销售订单号" sortable width="200" align="center"
/>
<el-table-column prop="contractName" label="合同名称" width="0" align="left"
<el-table-column prop="contractName" label="合同名称" sortable width="200" align="center"
/>
<el-table-column label="单据状态 " width="0" prop="status" algin="left"
<el-table-column label="单据状态 " width="120" sortable prop="status" algin="center"
>
<template slot-scope="scope">
{{ scope.row.status | dynamicText(statusOptions) }}
</template>
</el-table-column>
<el-table-column prop="creatorUserName" label="制单人" width="0" align="left"
<el-table-column prop="creatorUserName" label="制单人" width="120" sortable align="center"
/>
<el-table-column label="操作" fixed="right"
width="150" >
@ -74,7 +86,7 @@ width="150" >
</el-button>
<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
</el-button>
<el-button type="text"
<el-button type="text"
@click="goDetail(scope.row.id)">详情
</el-button>
</template>

91
SC-web/src/views/scm/basicInformation/paymentdoc/Form.vue
Unescape View File

@ -10,21 +10,21 @@
<el-form-item label="单据编号"
prop="documentNo">
<el-input v-model="dataForm.documentNo"
placeholder="系统自动生成" readonly>
placeholder="系统自动生成" readonly :disabled="true">
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="申请时间"
prop="businessDate">
<el-date-picker v-model="dataForm.businessDate"
placeholder="请选择" clearable :style='{"width":"100%"}' type="datetime"
format="yyyy-MM-dd HH:mm:ss" value-format="timestamp">
<!-- <el-col :span="8">-->
<!-- <el-form-item label="申请时间"-->
<!-- prop="businessDate">-->
<!-- <el-date-picker v-model="dataForm.businessDate"-->
<!-- placeholder="请选择" clearable :style='{"width":"100%"}' type="datetime"-->
<!-- format="yyyy-MM-dd HH:mm:ss" value-format="timestamp">-->
</el-date-picker>
</el-form-item>
</el-col>
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="8">
<el-form-item label="供应商名称"
prop="supplierName">
@ -33,7 +33,7 @@
:columnOptions="supplierNamecolumnOptions" propsValue="supplier_name"
relationField="supplier_name" popupType="dialog"
popupTitle="选择数据" popupWidth="800px"
hasPage :pageSize="20"
hasPage :pageSize="20" @change="popupSelectourceNo">
>
</popupSelect>
@ -54,7 +54,7 @@
<el-form-item label="申请金额"
prop="ramount">
<el-input v-model="dataForm.ramount"
placeholder="请输入" readonly clearable :style='{"width":"100%"}'>
placeholder="请输入" readonly clearable :style='{"width":"100%"}' @input="inputChange()" :disabled="true">
</el-input>
</el-form-item>
@ -155,26 +155,26 @@
<div class="JNPF-common-title">
<h2></h2>
</div>
<el-table :data="dataForm.paymentdoc_item0List" size='mini'>
<el-table :data="dataForm.paymentdoc_item0List" size='mini' >
<el-table-column type="index" width="50" label="序号" align="center"/>
<el-table-column prop="amount" label="申请金额">
<template slot-scope="scope">
<el-input v-model="scope.row.amount"
placeholder="请输入" clearable :style='{"width":"100%"}'>
placeholder="请输入" clearable @input="inputChange()" :style='{"width":"100%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column prop="creatorUserId" label="订单金额">
<template slot-scope="scope">
<el-input v-model="scope.row.creatorUserId"
placeholder="请输入" clearable :style='{"width":"100%"}'>
placeholder="请输入" clearable :style='{"width":"100%"}' :disabled="true">
</el-input>
</template>
</el-table-column>
<el-table-column prop="creatorUserName" label="已付金额">
<template slot-scope="scope">
<el-input v-model="scope.row.creatorUserName"
placeholder="请输入" clearable :style='{"width":"100%"}'>
placeholder="请输入" clearable :style='{"width":"100%"}' :disabled="true">
</el-input>
</template>
</el-table-column>
@ -182,7 +182,7 @@
<template slot-scope="scope">
<popupSelect v-model="scope.row.purchaseorderId"
placeholder="请选择" clearable :field="'purchaseorderId'+scope.$index"
interfaceId="393348986343324485" :bissId="dataForm.supplierName"
interfaceId="393348986343324485" :bissId="dataForm.supplierName" :excludeFields="excludeFields"
:columnOptions="paymentdoc_item0purchaseorderIdcolumnOptions" propsValue="id"
relationField="document_no" popupType="dialog"
popupWidth="800px" @change="popupSelectorder"
@ -190,59 +190,59 @@
</popupSelect>
</template>
</el-table-column>
<el-table-column prop="lastModifyUserId" label="合同编号">
<el-table-column prop="lastModifyUserId" label="合同编号" >
<template slot-scope="scope">
<el-input v-model="scope.row.lastModifyUserId"
placeholder="请输入" clearable :style='{"width":"100%"}'>
placeholder="请输入" clearable :style='{"width":"100%"}' :disabled="true">
</el-input>
</template>
</el-table-column>
<el-table-column prop="lastModifyUserName" label="重量">
<el-table-column prop="lastModifyUserName" label="重量" >
<template slot-scope="scope">
<el-input v-model="scope.row.lastModifyUserName"
placeholder="请输入" clearable :style='{"width":"100%"}'>
placeholder="请输入" clearable :style='{"width":"100%"}':disabled="true">
</el-input>
</template>
</el-table-column>
<el-table-column prop="deleteMark" label="税率(%)">
<template slot-scope="scope">
<el-input v-model="scope.row.deleteMark"
placeholder="请输入" clearable :style='{"width":"100%"}'>
placeholder="请输入" clearable :style='{"width":"100%"}':disabled="true">
</el-input>
</template>
</el-table-column>
<el-table-column prop="departmentId" label="垫资金额">
<template slot-scope="scope">
<el-input v-model="scope.row.departmentId"
placeholder="请输入" clearable :style='{"width":"100%"}'>
placeholder="请输入" clearable :style='{"width":"100%"}':disabled="true">
</el-input>
</template>
</el-table-column>
<el-table-column prop="orgnizeId" label="税额">
<template slot-scope="scope">
<el-input v-model="scope.row.orgnizeId"
placeholder="请输入" clearable :style='{"width":"100%"}'>
placeholder="请输入" clearable :style='{"width":"100%"}':disabled="true">
</el-input>
</template>
</el-table-column>
<el-table-column prop="deleteUserId" label="不含税金额">
<template slot-scope="scope">
<el-input v-model="scope.row.deleteUserId"
placeholder="请输入" clearable :style='{"width":"100%"}'>
placeholder="请输入" clearable :style='{"width":"100%"}':disabled="true">
</el-input>
</template>
</el-table-column>
<el-table-column prop="deleteUserName" label="业务类型">
<template slot-scope="scope">
<el-input v-model="scope.row.deleteUserName"
placeholder="请输入" clearable :style='{"width":"100%"}'>
placeholder="请输入" clearable :style='{"width":"100%"}':disabled="true">
</el-input>
</template>
</el-table-column>
<el-table-column prop="creatorTime" label="业务日期">
<template slot-scope="scope">
<el-input v-model="scope.row.creatorTime"
placeholder="请输入" clearable :style='{"width":"100%"}'>
placeholder="请输入" clearable :style='{"width":"100%"}':disabled="true">
</el-input>
</template>
</el-table-column>
@ -277,10 +277,12 @@
import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
export default {
components: {},
props: [],
data() {
return {
excludeFields: [],
visible: false,
loading: false,
isDetail: false,
@ -308,13 +310,21 @@
activeshpeyb: '0',
rules:
{
collectionAccount: [
supplierName: [
{
required: true,
message: '请输入供应商',
trigger: 'blur'
}
],
dueDate: [
{
required: true,
message: '请输入',
message: '请输入应付日期',
trigger: 'blur'
}
],
amount: [{ required: true, message: '请输入', trigger: 'blur' }]
},
@ -355,8 +365,25 @@
mounted() {
},
methods: {
inputChange(value){
var amount = 0;
for (let i = 0; i < this.dataForm.paymentdoc_item0List.length; i++) {
amount = amount + parseFloat(this.dataForm.paymentdoc_item0List[i].amount);
}
this.dataForm.ramount = amount;
},
popupSelectourceNo(e, d) {
this.excludeFields = [];
this.dataForm.paymentdoc_item0List = [];
},
popupSelectorder(a, b) {
var excludeFields = [];
var amount = 0;
for (let i = 0; i < this.dataForm.paymentdoc_item0List.length; i++) {
excludeFields.push(this.dataForm.paymentdoc_item0List[i].purchaseorderId);
if (a == this.dataForm.paymentdoc_item0List[i].purchaseorderId) {
this.dataForm.paymentdoc_item0List[i].lastModifyUserId = b.contract_code
this.dataForm.paymentdoc_item0List[i].lastModifyUserName = b.num
@ -364,10 +391,12 @@
this.dataForm.paymentdoc_item0List[i].orgnizeId = b.rate
this.dataForm.paymentdoc_item0List[i].deleteUserId = b.not_amount
this.dataForm.ramount = parseFloat(this.dataForm.ramount) + parseFloat(b.amount)
}
amount = amount + parseFloat(this.dataForm.paymentdoc_item0List[i].amount);
}
this.dataForm.ramount = amount;
this.excludeFields = excludeFields;
},
paymentdoc_item0Exist() {

65
SC-web/src/views/scm/basicInformation/paymentdoc/index.vue
Unescape View File

@ -30,12 +30,20 @@
<div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head">
<div>
<el-button type="text" icon="el-icon-check" @click="addOrUpdateHandle(scope.row.id)">编辑
</el-button>
<el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
</el-button>
<el-button type="text" icon="el-icon-download" @click="exportData()">导出
</el-button>
<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
</el-button>
<el-button type="text" icon="el-icon-check" @click="3">审核
</el-button>
<el-button type="text" icon="el-icon-close" @click="3">弃审
</el-button>
<el-button type="success" size="medium" @click="paymentapply()">付款
</el-button>
</div>
@ -47,63 +55,76 @@
<screenfull isContainer/>
</div>
</div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
@selection-change="handleSelectionChange">
<el-table-column prop="documentNo" label="单据编号" width="0" align="left"
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c :hasNO="false"
@selection-change="handleSelectionChange" border>
<el-table-column type="index" width="50" label="序号" fixed="left" align="center"/>
<el-table-column prop="documentNo" label="单据编号" width="200" align="center" sortable fixed="left"
/>
<el-table-column prop="businessDate" label="申请时间" width="0" align="left"
<el-table-column prop="businessDate" label="申请时间" width="150" align="center" sortable fixed="left" sortable="custom"
/>
<el-table-column prop="supplierName" label="供应商名称" width="0" align="left"
<el-table-column prop="supplierName" label="供应商名称" width="200" align="center" sortable fixed="left"
/>
<el-table-column label="币别 " width="0" prop="currency" algin="left"
<el-table-column label="币别 " width="80" prop="currency" algin="center" sortable
>
<template slot-scope="scope">
{{ scope.row.currency | dynamicText(currencyOptions) }}
</template>
</el-table-column>
<el-table-column prop="ramount" label="申请金额" width="0" align="left"
<el-table-column prop="ramount" label="申请金额" width="120" align="center" sortable
/>
<el-table-column prop="paymentAmount" label="付款金额" width="0" align="left"
<el-table-column prop="paymentAmount" label="付款金额" width="120" align="center"sortable
/>
<el-table-column prop="unpaymentAmount" label="未付款金额" width="0" align="left"
<el-table-column prop="unpaymentAmount" label="未付款金额" width="120" align="center"sortable
/>
<el-table-column prop="dueDate" label="应付日期" width="0" align="left"
<el-table-column prop="dueDate" label="应付日期" width="120" align="center"sortable sortable="custom"
/>
<el-table-column prop="collectionAccount" label="收款账户" width="0" align="left"
<el-table-column prop="collectionAccount" label="收款账户" width="120" align="center"sortable
/>
<el-table-column prop="colectionBank" label="收款银行" width="0" align="left"
<el-table-column prop="colectionBank" label="收款银行" width="120" align="center"sortable
/>
<el-table-column label="付款类型" width="0" prop="paymentType" algin="left"
<el-table-column label="付款类型" width="100" prop="paymentType" algin="center"sortable
>
<template slot-scope="scope">
{{ scope.row.paymentType | dynamicText(paymentTypeOptions) }}
</template>
</el-table-column>
<el-table-column label="结算类型" width="0" prop="settlementType" algin="left"
<el-table-column label="结算类型" width="100" prop="settlementType" algin="center"sortable
>
<template slot-scope="scope">
{{ scope.row.settlementType | dynamicText(settlementTypeOptions) }}
</template>
</el-table-column>
<el-table-column label="单据状态 " width="0" prop="status" algin="left"
<el-table-column label="单据状态 " width="100" prop="status" algin="center"sortable
>
<template slot-scope="scope">
{{ scope.row.status | dynamicText(statusOptions) }}
</template>
</el-table-column>
<el-table-column prop="creatorUserName" label="制单人" width="0" align="left"
<el-table-column prop="creatorUserName" label="制单人" width="100" align="center"sortable
/>
<el-table-column label="操作" fixed="right"
width="150">
width="200">
<template slot-scope="scope">
<el-button type="text" @click="addOrUpdateHandle(scope.row.id)">编辑
</el-button>
<el-button type="text"
@click="addOrUpdateHandle(scope.row.id)">编辑
@click="1">撤回申请
</el-button>
<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
<el-button type="text"
@click="1">审核
</el-button>
<el-button type="text"
@click="goDetail(scope.row.id)">详情
@click="1">弃审
</el-button>
<el-button type="text"
@click="1">提交
</el-button>
<!-- <el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除-->
<!-- </el-button>-->
<!-- <el-button type="text"-->
<!-- @click="goDetail(scope.row.id)">详情-->
<!-- </el-button>-->
</template>
</el-table-column>
</JNPF-table>
@ -222,6 +243,10 @@
}).then(res => {
var _list = []
for (let i = 0; i < res.data.list.length; i++) {
res.data.list[i].businessDate = res.data.list[i].businessDate ? res.data.list[i].businessDate.substring(0,
10) : '';
res.data.list[i].dueDate = res.data.list[i].dueDate ? res.data.list[i].dueDate
.substring(0, 10) : '';
let _data = res.data.list[i]
_list.push(_data)
}

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

@ -48,7 +48,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="入库数量" prop="receiptnum">
<el-input v-model="dataForm.receiptnum" placeholder="请输入入库数量" readonly>
<el-input v-model="dataForm.receiptnum" placeholder="请输入入库数量" readonly >
</el-input>
</el-form-item>
@ -118,7 +118,7 @@
<popupSelect v-model="scope.row.reservoirareaId" placeholder="请选择" clearable
:field="'reservoirareaId'+scope.$index" interfaceId="392939299932268421"
:columnOptions="receiptin_item0reservoirareaIdcolumnOptions" propsValue="id"
relationField="areaname" popupType="dialog" popupWidth="800px" @change="popupSelect3">
relationField="areaname" popupType="dialog" popupWidth="800px" @change="popupSelect3">
</popupSelect>
</template>
</el-table-column>

14
SC-web/src/views/scm/basicInformation/reservoirarea/Form.vue
Unescape View File

@ -7,7 +7,7 @@
<el-form ref="elForm" :model="dataForm" :rules="rules" size="small" label-width="100px" label-position="right" >
<template v-if="!loading">
<el-col :span="24" >
<el-form-item label="库区编码"
<el-form-item label="库区编码"
prop="areacode" >
<el-input v-model="dataForm.areacode"
placeholder="请输入" clearable :style='{"width":"100%"}'>
@ -16,7 +16,7 @@
</el-form-item>
</el-col>
<el-col :span="24" >
<el-form-item label="库区名称"
<el-form-item label="库区名称"
prop="areaname" >
<el-input v-model="dataForm.areaname"
placeholder="请输入" clearable :style='{"width":"100%"}'>
@ -25,7 +25,7 @@
</el-form-item>
</el-col>
<el-col :span="24" >
<el-form-item label="最高库存"
<el-form-item label="最高库存"
prop="maximum" >
<el-input-number v-model="dataForm.maximum"
placeholder="数字文本" :step="1" >
@ -34,7 +34,7 @@
</el-form-item>
</el-col>
<el-col :span="24" >
<el-form-item label="安全库存"
<el-form-item label="安全库存"
prop="safety" >
<el-input-number v-model="dataForm.safety"
placeholder="数字文本" :step="1" >
@ -43,7 +43,7 @@
</el-form-item>
</el-col>
<el-col :span="24" >
<el-form-item label="最低库存"
<el-form-item label="最低库存"
prop="minimum" >
<el-input-number v-model="dataForm.minimum"
placeholder="数字文本" :step="1" >
@ -52,7 +52,7 @@
</el-form-item>
</el-col>
<el-col :span="24" >
<el-form-item label="计量单位"
<el-form-item label="计量单位"
prop="unit" >
<el-select v-model="dataForm.unit"
placeholder="请选择" clearable :style='{"width":"100%"}'>
@ -62,7 +62,7 @@
</el-form-item>
</el-col>
<el-col :span="24" >
<el-form-item label="仓库"
<el-form-item label="仓库"
prop="warehouseId" >
<popupSelect v-model="dataForm.warehouseId"
placeholder="请选择" field="warehouseId" interfaceId="394860934465658373" :columnOptions="warehouseIdcolumnOptions" propsValue="id" relationField="NAME" popupType="dialog"

43
SC-web/src/views/scm/basicInformation/vehicle/Form.vue
Unescape View File

@ -22,8 +22,8 @@
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="司机" prop="drivername">
<el-input v-model="dataForm.drivername" placeholder="请输入司机" clearable
<el-form-item label="司机名称" prop="drivername">
<el-input v-model="dataForm.drivername" placeholder="请输入司机名称" clearable
:style='{"width":"100%"}'>
</el-input>
@ -89,7 +89,7 @@
isDetail: false,
dataForm: {
ticketno: '',
drivername: ' ',
drivername: '',
contact: '',
vehiclephotos: [{
"name": "006-1 (3).jpg",
@ -114,29 +114,27 @@
message: '请输入司机名称',
trigger: 'blur'
}, ],
vehiclephotos: [{
required: true,
message: '请输入车辆照片',
trigger: 'blur'
}, ],
contact: [{ required: true, message: '手机号不能为空' },
{ type: 'number',
message: '手机号格式不正确',
trigger: 'blur',
transform(value) {
var contactreg = 11 && /^((13|14|15|16|17|18|19)[0-9]{1}\d{8})$/
if (!contactreg.test(value)) {
return false
} else {
return Number(value)
{ type: 'number',
message: '手机号格式不正确',
trigger: 'blur',
transform(value) {
var contactreg = 11 && /^((13|14|15|16|17|18|19)[0-9]{1}\d{8})$/
if (!contactreg.test(value)) {
return false
} else {
return Number(value)
}
}
}
}],
vehiclephotos: [{
required: true,
message: '请输入车辆图片',
trigger: 'blur'
}, ],
},
}],
},
}
},
@ -231,7 +229,6 @@
_dataAll.vehiclephotos = JSON.parse(_dataAll.vehiclephotos)
this.dataForm = _dataAll
},
},
}
</script>

2
SC-web/src/views/scm/basicInformation/vehicle/index.vue
Unescape View File

@ -41,7 +41,7 @@
</div>
</div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
@selection-change="handleSelectionChange">
@selection-change="handleSelectionChange" >
<el-table-column prop="id" label="ID" width="0" align="left" />
<el-table-column prop="ticketno" label="车牌号" width="0" align="left" />
<el-table-column prop="drivername" label="司机" width="0" align="left" />

Write Preview
Loading…
Cancel
Save