meswork/JY1.0
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://192.168.1.149:10010/r/高精2.0

Browse Source
This commit is contained in:
lixin
2018-11-20 10:54:52 +08:00
parent 6bd5eb565a 6045632874
commit 5692d65e57
19 changed files with 1620 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/index.js
View File

@@ -7,7 +7,7 @@ const os = require('os')
const networkInterfaces = os.networkInterfaces()
const ip = networkInterfaces['WLAN'][1].address
const ip = networkInterfaces['WLAN'][1] ? networkInterfaces['WLAN'][1].address : networkInterfaces['WLAN'][0].address
module.exports = {
dev: {

257
src/api/MarketingCenter/DeliveryManagement.js Normal file
View File

@@ -0,0 +1,257 @@
import request from '@/utils/request'
// 初始化形目名称
export function searchProjectName() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '发货管理_总装箱单_查询'
}
})
}
// 查询装箱单总单据信息
export function searchPackingList() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '发货管理_总装箱单_查询_通过编号',
param: '装箱单编号=' + arguments[0]
}
})
}
// 查询备件
export function searchSparePart() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '发货管理_备件_查询数据',
param: '装箱单编号=' + arguments[0]
}
})
}
// 查询随机文件
export function searchFile() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '发货管理_随机文件_查询数据',
param: '装箱单编号=' + arguments[0]
}
})
}
// 查询主机
export function searchHost() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '发货管理_主机_查询数据',
param: '装箱单编号=' + arguments[0]
}
})
}
// 查询机床所属部件
export function searchParts() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '发货管理_机床所属部件_查询数据',
param: '代号=' + arguments[0]
}
})
}
// 查询发货单
export function searchInvoice() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '发货管理_发货单_查询数据',
param: '装箱单编号=' + arguments[0]
}
})
}
// 收货地址初始化
export function addressSearch(pageCurrent, pageSize) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '发货管理_收货地址查询',
Pagination: pageCurrent + '&' + pageSize
}
})
}
// 省份初始化
export function provinceSearch() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '发货管理_省份查询'
}
})
}
export function citySearch(num1) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '发货管理_市名查询_根据省流水号',
param: '省份流水号=' + num1
}
})
}
export function deleteAdress(num1) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '发货管理_收货地址删除',
param: '收货地址流水号=' + num1
}
})
}
export function addAdress(num1, num2, num3, num4, num5) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '发货管理_收货地址增加',
param: '省份流水号=' + num1 + '&市流水号=' + num2 + '&详细地址=' + num3 + '&联系人=' + num4 + '&联系方式=' + num5
}
})
}
export function editAdress(num1, num2, num3, num4, num5, num6) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '发货管理_收货地址修改',
param: '省份流水号=' + num1 + '&市流水号=' + num2 + '&详细地址=' + num3 + '&联系人=' + num4 + '&联系方式=' + num5 + '&收货地址流水号=' + num6
}
})
}
export function addInvoice() {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '发货管理_发货单_增加数据',
param: '装箱单编号=' + arguments[0] + '&车辆牌号=' + arguments[1] + '&运输状态=' + arguments[2] + '&收货地址流水号=' + arguments[3] + '&发货日期=' + arguments[4]
}
})
}
export function delInvoice() {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '发货管理_发货单_删除数据',
param: '发货单编号=' + arguments[0]
}
})
}
export function editInvoice() {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '发货管理_发货单_修改数据',
param: '车辆牌号=' + arguments[0] + '&运输状态=' + arguments[1] + '&收货地址流水号=' + arguments[2] + '&发货日期=' + arguments[3] + '&发货单编号=' + arguments[4]
}
})
}
export function searchCargoBox() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '发货管理_货箱号_查询数据',
param: '发货单编号=' + arguments[0]
}
})
}
export function addCargoBox() {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '发货管理_货箱号_增加数据',
param: '发货单编号=' + arguments[0]
}
})
}
export function delCargoBox() {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '发货管理_货箱号_删除数据',
param: '货箱号编号=' + arguments[0]
}
})
}
export function submitMoveInto() {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '发货管理_货箱明细_移入',
param: '货箱号编号=' + arguments[0] + '&代号=' + arguments[1] + '&名称=' + arguments[2] + '&规格=' + arguments[3] + '&数量=' + arguments[4] + '&备注=' + arguments[5] + '&部件编号=' + arguments[6] + '&@备件编号=' + arguments[7] + '&文件编号=' + arguments[8]
}
})
}
export function searchCargoBoxDetailed() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '发货管理_货箱明细_查询',
param: '货箱号编号=' + arguments[0]
}
})
}
export function submitRremove() {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '发货管理_货箱明细_移除',
param: '货箱明细编号=' + arguments[0] + '&数量=' + arguments[1] + '&部件编号=' + arguments[2] + '&备件编号=' + arguments[3] + '&文件编号=' + arguments[4] + '&货箱号编号=' + arguments[5]
}
})
}

2
src/api/WorkshopProcurement/ProcurementContractApproval.js
View File

@@ -7,7 +7,7 @@ export function initContract() {
method: 'post',
data: {
type: '1',
name: '采购管理_采购合同_查询_cjn'
name: '车间采购管理_采购合同_查询_cjn'
}
})
}

2
src/api/WorkshopProcurement/ProcurementContractEnquiry.js
View File

@@ -7,7 +7,7 @@ export function initContract() {
method: 'post',
data: {
type: '1',
name: '采购管理_采购合同_查询_cjn'
name: '车间采购管理_采购合同_查询_cjn'
}
})
}

13
src/api/WorkshopProcurement/PurchaseContractChange.js
View File

@@ -11,6 +11,17 @@ export function initContract() {
}
})
}
// 初始化合同号
export function initContract1() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间采购管理_采购合同变更_合同初始化'
}
})
}
// 初始化采购员(考核部门编号：采购部：2)
export function initBuyer() {
return request({
@@ -56,7 +67,7 @@ export function searchTable3(pageCurrent, pageSize, check1, start, end, check2,
data: {
type: '1',
name: '车间采购管理_采购合同变更_查询数据_根据条件_cjn',
param: '时间段_check=' + check1 + '&开始时间=' + start + '=datetime&结束时间=' + end + '=datetime&采购合同流水号_check=' + check2 + '&采购合同流水号=' + contract + '&人员编号_check=' + check3 + '&人员编号=' + name + '&供应商名称_check=' + check4 + '&供应商名称=' + supplier,
param: '时间段_check=' + check1 + '&开始时间=' + start + '=datetime&结束时间=' + end + '=datetime&采购合同变更流水号_check=' + check2 + '&采购合同变更流水号=' + contract + '&人员编号_check=' + check3 + '&人员编号=' + name + '&供应商名称_check=' + check4 + '&供应商名称=' + supplier,
Pagination: pageCurrent + '&' + pageSize
}
})

7
src/icons/svg/DeliveryManagement.svg Normal file
View File

@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Svg Vector Icons : http://www.sfont.cn -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 1000 1000" enable-background="new 0 0 1000 1000" xml:space="preserve">
<metadata> Svg Vector Icons : http://www.sfont.cn </metadata>
<g><g transform="translate(0.000000,511.000000) scale(0.100000,-0.100000)"><path d="M2005.1,2538.4c-82.4-44.1-145.6-122.6-166.7-201.2l-19.2-82.4h-364c-358.3,0-362.1,0-408.1-47.9c-63.2-61.3-65.1-164.8-5.7-220.3c40.2-38.3,61.3-38.3,1212.8-38.3h1172.6l40.2-44.1c59.4-63.2,53.7-137.9-13.4-206.9l-55.6-55.6H1938H480l-46-47.9c-47.9-46-65.1-147.5-32.6-193.5c40.2-63.2,95.8-65.1,1343.1-65.1c1222.4,0,1247.3,0,1285.6-38.3c59.4-59.4,51.7-159-21.1-218.4l-59.4-49.8H1869H786.5l-46-47.9c-67.1-65.1-65.1-164.8,1.9-218.4c49.8-40.2,65.1-40.2,1419.7-40.2c927.3,0,1381.4-5.7,1406.3-21.1c55.6-28.7,76.6-99.6,53.6-170.5c-42.1-118.8,30.7-115-1774.2-115c-1737.8-1.9-1678.4,1.9-1726.3-90.1C89.1,266.1,93,216.3,135.1,164.6l36.4-46l1212.8-9.6l1210.9-9.6l36.4-49.8c53.6-70.9,32.6-160.9-47.9-210.8c-55.6-32.6-101.6-36.4-515.4-36.4c-251,0-456-5.7-456-13.4c0-9.6-23-274-49.8-588.2c-69-793.2-88.1-764.5,473.2-774l356.4-7.7l32.6,137.9c143.7,641.9,860.3,1021.2,1421.7,754.9c160.9-74.7,321.9-235.7,400.4-398.5c63.2-128.4,116.9-362.1,101.5-446.4c-5.7-32.6,51.7-34.5,1544.3-34.5h1550l24.9,124.5c36.4,176.3,126.5,346.8,258.7,488.6c195.4,208.8,429.2,325.7,695.5,346.8c525,46,969.5-360.2,969.5-883.3c0-84.3,1.9-86.2,63.2-86.2c143.7,0,274,76.6,318.1,189.7c30.6,72.8,139.9,1373.7,126.4,1486.8c-21.1,174.4-92,274-578.6,802.8c-400.4,436.8-477.1,513.5-574.8,559.5l-111.1,55.6l-588.2,5.7c-442.6,3.8-590.1,11.5-590.1,28.7c0,13.4,13.4,160.9,28.7,329.6c36.4,388.9,36.4,496.2,0,565.2c-63.2,122.6,118.8,115-2791.6,115C2798.3,2559.5,2031.9,2553.8,2005.1,2538.4z M8613.3,1231.8c47.9-24.9,205-180.1,440.7-436.8c201.2-220.3,367.9-408.1,371.7-417.7c7.7-19.2-1793.3-21.1-1804.8-1.9c-3.8,5.8,9.6,193.5,28.7,413.8c19.2,222.3,36.4,421.5,36.4,446.4v44.1l427.3-5.8C8486.8,1268.2,8548.1,1264.3,8613.3,1231.8z"/><path d="M3250.5-816.4c-321.9-84.3-574.8-348.7-641.9-674.4c-65.1-314.2,90.1-638,371.7-776c385.1-189.7,887.1,1.9,1086.4,415.8c55.6,113,65.1,155.2,70.9,312.3c9.6,235.7-32.6,356.4-180.1,515.4C3781.2-831.8,3505.3-751.3,3250.5-816.4z M3541.7-1215c76.6-28.7,139.9-92,180.1-180.1c47.9-103.5,46-191.6-9.6-308.5c-136-291.2-548-329.5-682.1-65.1c-97.7,191.6-3.8,444.5,201.2,538.4C3317.5-1190,3459.3-1182.4,3541.7-1215z"/><path d="M8281.8-820.2c-419.6-118.8-705.1-538.4-634.2-933.1c88.1-486.7,582.5-726.2,1046.1-505.8c509.7,241.4,661,890.9,295.1,1256.9C8816.3-829.8,8519.4-753.2,8281.8-820.2z M8601.7-1220.7c350.6-183.9,191.6-720.4-214.6-724.2c-111.1-1.9-187.8,30.6-264.4,113c-222.2,233.7-17.2,638,325.7,638C8504-1193.9,8573-1205.4,8601.7-1220.7z"/></g></g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.9 KiB

1
src/utils/request.js
View File

@@ -10,6 +10,7 @@ export const name = `OP8888`
export const upload = `http://123.56.95.229:8411/submit/uploadFile.ashx`
export const download = `http://123.56.95.229:8411/submit/downloadFile.ashx`
const service = axios.create({
// baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`,
baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
timeout: 1500000 // 请求超时时间
})

5
src/views/ManufacturingCenter/PartAssignment/index.vue
View File

@@ -582,6 +582,11 @@ export default {
searchDetailed(row) {
this.RequisitionList = row.请购单流水号
searchDetailed(row.请购单流水号).then(response => {
for (let i = 0; i < response.data.length; i++) {
if (response.data[i].物料计划到货时间 !== '') {
response.data[i].物料计划到货时间 = (response.data[i].物料计划到货时间).split(' ')[0]
}
}
this.tableData5 = response.data
})
},

31
src/views/MarketingCenter/BidBond/index.vue
View File

@@ -5,7 +5,7 @@
<el-radio v-model="radio" label="1">未收回</el-radio>
<el-radio v-model="radio" label="2">已收回</el-radio>
<span style="margin-left: 20px">保金类型：</span>
<el-select v-model="TypeOfGoldDepositValue" clearable filterable placeholder="请选择" size="small" style="margin-left: 10px;width: 130px">
<el-select v-model="TypeOfGoldDepositValue" clearable filterable placeholder="请选择" size="small" style="margin-left: 10px;width: 100px">
<el-option
v-for="item in TypeOfGoldDeposit"
:key="item.value"
@@ -120,7 +120,7 @@
icon="el-icon-edit"
@click.stop="TakeBack(scope.row);flag1 = 1">收回</el-button>
<el-button
:disabled="disabled"
:disabled="scope.row.是否禁用履约"
size="mini"
type="info"
icon="el-icon-edit"
@@ -251,7 +251,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="投标人" prop="投标人">
<el-input v-model="form2.投标人" size="small" placeholder="请输入投标人" style="width: 200px;" readonly @dblclick.native="dialogFormVisiblePeople = true;flag2 = 2" @clear="clear()"/>
<el-input v-model="form2.投标人" size="small" placeholder="请输入投标人" style="width: 200px;" clearable readonly @dblclick.native="dialogFormVisiblePeople = true;flag2 = 2" @clear="clear()"/>
</el-form-item>
</el-col>
</el-row>
@@ -301,8 +301,12 @@
</template>
<script>
import elInput from 'element-ui/packages/input'
import { initType, selectBidBond, getTree, tree, getTablePeople, TakeBack, ComplianceGold, addBidBond, editBidBond, delBidBond } from '@/api/MarketingCenter/BidBond'
export default {
components: {
elInput
},
data() {
return {
disabled: false,
@@ -418,10 +422,16 @@ export default {
const data = response.data.rows
for (let i = 0; i < data.length; i++) {
data[i].履约金 === '1' ? data[i].是否禁用 = true : data[i].是否禁用 = false
data[i].履约金 === '1' ? data[i].是否禁用履约 = true : data[i].是否禁用履约 = false
data[i].投标日期 = data[i].投标日期.substring(0, data[i].投标日期.length - 8)
data[i].预计收回日期 = data[i].预计收回日期.substring(0, data[i].预计收回日期.length - 8)
}
if (this.radio === '2') {
for (let i = 0; i < data.length; i++) {
data[i].是否禁用 = true
data[i].投标日期 = data[i].投标日期.substring(0, data[i].投标日期.length - 8)
data[i].预计收回日期 = data[i].预计收回日期.substring(0, data[i].预计收回日期.length - 8)
data[i].实际收回日期 = data[i].实际收回日期.substring(0, data[i].实际收回日期.length - 8)
}
}
this.tableData1 = data
@@ -507,6 +517,7 @@ export default {
},
callOff() {
this.dialogFormVisible1 = false
this.dialogFormVisible2 = false
},
ComplianceGold(row) {
this.$confirm('此操作会将此投标保证金转为履约保证金, 是否继续?', '提示', {
@@ -517,9 +528,9 @@ export default {
ComplianceGold(row.招标保证金流水号).then(response => {
if (response.data[0].result === '1') {
this.fetchTableData1()
this.$message.success('删除成功')
this.$message.success('操作成功')
} else {
this.$message.error('删除失败')
this.$message.error('操作失败')
}
})
})
@@ -531,13 +542,13 @@ export default {
},
addTableData1() {
addBidBond(this.form2.招标企业, this.form2.联系人, this.form2.联系电话, this.form2.保证金金额, this.peopleid, this.form2.保证金类型, this.form2.投标日期, this.form2.计划收回日期, this.form2.备注, this.form2.提前X天提醒我).then(response => {
this.dialogFormVisible2 = false
if (response.data[0].result === '1') {
this.$message.success('添加成功')
this.title = ''
this.dialogFormVisible2 = false
this.fetchTableData1()
} else {
this.$message.error('添加失败')
this.$message.error('添加失败,请检查金额于提醒天数是否为数字')
}
})
},
@@ -561,13 +572,13 @@ export default {
},
editTableData1() {
editBidBond(this.form2.招标企业, this.form2.联系人, this.form2.联系电话, this.form2.保证金金额, this.peopleid, this.form2.保证金类型, this.form2.投标日期, this.form2.计划收回日期, this.form2.备注, this.form2.提前X天提醒我, this.BidBondCode).then(response => {
this.dialogFormVisible2 = false
if (response.data[0].result === '1') {
this.$message.success('添加成功')
this.$message.success('编辑成功')
this.title = ''
this.dialogFormVisible2 = false
this.fetchTableData1()
} else {
this.$message.error('添加失败')
this.$message.error('编辑失败，请检查金额于提醒天数是否为数字')
}
})
},

20
src/views/MarketingCenter/CRM/index.vue
View File

@@ -9,6 +9,18 @@
:label="item.label"
:value="item.value"/>
</el-select>
<!--<el-input v-model="CustomerName" placeholder="请输入客户名称" size="small"></el-input>-->
<!--<span class="move">销售经理：</span>-->
<!--<el-input clearable v-model="MarketingManagerValue" @dblclick.native="dialogFormVisiblePeople = true" size="small" style="width:200px" placeholder="请选择营销经理" clearable></el-input>-->
<!--<span class="move">信誉等级：</span>-->
<!--<el-select v-model="CreditRatingValue" placeholder="请选择信誉等级" size="small">-->
<!--<el-option-->
<!--v-for="item in CreditRating"-->
<!--:key="item.value"-->
<!--:label="item.label"-->
<!--:value="item.value">-->
<!--</el-option>-->
<!--</el-select>-->
<el-button type="success" icon="el-icon-search" class="move" size="small" @click="selectCustomerOfName">查询</el-button>
</el-card>
<el-row>
@@ -254,7 +266,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="联系地址:" prop="联系地址">
<el-input v-model="form2.联系地址" clearable size="small" style="width:200px" placeholder="请输入联系地址" readonly/>
<el-input v-model="form2.联系地址" clearable size="small" style="width:200px" placeholder="请输入联系地址"/>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -269,7 +281,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="银行账号:" prop="银行账号">
<el-input v-model="form2.银行账号" clearable size="small" style="width:200px" placeholder="请输入银行账号" />
<el-input v-model="form2.银行账号" clearable size="small" style="width:200px" placeholder="请输入银行账号"/>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -299,8 +311,12 @@
</template>
<script>
import elInput from 'element-ui/packages/input'
import { searchValue, selectAdress, selectCustomer, getTree, tree, getTablePeople, selectMarketingManager, selectCustomerOfName, initCustomer, deleteCustomer, deleteMarketingManager, addMarketingManager, editMarketingManager, addCustomer, selectAdressOfID, editCustomer } from '@/api/MarketingCenter/CRM'
export default {
components: {
elInput
},
data() {
return {
a: '', // 营销经理地区流水号

50
src/views/MarketingCenter/ContractCapitalManagement/index.vue
View File

@@ -10,7 +10,7 @@
:value="item.value"/>
</el-select>
<span style="margin-left: 10px">销售经理</span>
<el-input v-model="MarketingManagerValue" clearable size="small" style="width:200px" placeholder="请选择营销经理" readonly @dblclick.native="dialogFormVisiblePeople = true" @clear="clear()"/>
<el-input v-model="MarketingManagerValue" readonly clearable size="small" style="width:200px" placeholder="请双击选择营销经理" @dblclick.native="dialogFormVisiblePeople = true" @clear="clear()"/>
<el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="pageSize = 10;PageCurrent = 1;tableData2=[];getTableData()">查询收款计划</el-button>
<el-button type="primary" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="ADD()">新增收款计划</el-button>
<el-badge :value="value" :max="99" class="item">
@@ -252,6 +252,7 @@
<el-table-column label="操作" fixed="right" align="center" width="280">
<template slot-scope="scope">
<el-button
:disabled="scope.row.是否禁用收款"
size="mini"
type="warning"
icon="el-icon-edit"
@@ -280,7 +281,7 @@
<el-dialog :visible.sync="dialogFormVisible2" title="新增付款计划" center width="380px">
<el-form ref="form2" :model="form2" :rules="rules" label-position="left">
<el-form-item label="项目名称" prop="entryNameValue" label-width="100px">
<el-select v-model="form2.entryNameValue" placeholder="请输入项目名称" style="margin-left: 2px; width: 200px" size="small" clearable filterable @change="searchProjectName">
<el-select v-model="form2.entryNameValue" clearable filterable placeholder="请输入项目名称" style="margin-left: 2px; width: 200px" size="small" @change="searchProjectName">
<el-option
v-for="item in entryName"
:key="item.value"
@@ -304,7 +305,7 @@
<el-dialog :visible.sync="dialogFormVisible4" title="编辑付款计划" center width="400px">
<el-form ref="form2" :model="form2" :rules="rules" label-position="left">
<el-form-item label="项目名称" prop="entryNameValue" label-width="100px">
<el-select v-model="form2.entryNameValue" :disabled="true" clearable placeholder="请输入项目名称" style="width: 200px" size="small" filterable @change="searchProjectName">
<el-select v-model="form2.entryNameValue" :disabled="true" clearable filterable placeholder="请输入项目名称" style="width: 200px" size="small" @change="searchProjectName">
<el-option
v-for="item in entryName"
:key="item.value"
@@ -418,7 +419,7 @@
<el-input-number v-model="form4.转移金额" :min="0" :max="max1" :precision="2" :step="1" controls-position="right" size="small" style="width: 200px" placeholder="请输入本次付款金额" @change="changeMoney"/>
</el-form-item>
<el-form-item label="计划阶段" prop="计划阶段" label-width="110px">
<el-select v-model="form4.计划阶段" clearable placeholder="请选择计划转移到某阶段" style="width: 200px" size="small" filterable>
<el-select v-model="form4.计划阶段" clearable filterable placeholder="请选择计划转移到某阶段" style="width: 200px" size="small">
<el-option
v-for="item in Planning"
:key="item.value"
@@ -484,8 +485,12 @@
</template>
<script>
import elInput from 'element-ui/packages/input'
import { SelectContractFunds, AccountsReceivable, editDay, TransPlanning, selectBatch, editList, delMoney, editTime, selectMax, editFukuan, fukuan, selectProvince, SelectMarketingManager, searchTable1, searchTable2, editBatchCapitalChar, deletechar, searchProjectNumber, searchProjectName, addList, PaymentPhase, dellist, selectMachine, selectBatchFundingDetails } from '@/api//MarketingCenter/ContractCapitalManagement'
export default {
components: {
elInput
},
data() {
const validateValue = (rule, value, callback) => {
if (value === 0) {
@@ -650,7 +655,9 @@ export default {
})
selectBatchFundingDetails(this.id).then(response => {
for (let i = 0; i < response.data.length; i++) {
response.data[i].本次收款时间 = response.data[i].本次收款时间.substring(0, response.data[i].本次收款时间.length - 9)
if (response.data[i].本次收款时间 !== null || response.data[i].本次收款时间 !== '') {
response.data[i].本次收款时间 = response.data[i].本次收款时间.substring(0, response.data[i].本次收款时间.length - 9)
}
}
this.tableData4 = response.data
})
@@ -658,6 +665,8 @@ export default {
this.listLoading2 = false
const data = response.data.rows
for (let i = 0; i < data.length; i++) {
data[i].未收金额 === '0' ? data[i].是否禁用收款 = true : data[i].是否禁用收款 = false
data[i].未收金额 === '0' ? data[i].是否禁用 = true : data[i].是否禁用 = false
if (data[i].计划付款时间 === '' || data[i].计划付款时间 === null) {
data[i].状态 = '无计划'
} else {
@@ -707,6 +716,8 @@ export default {
searchTable2(this.PageCurrent2, this.PageSize2, this.moneyID).then(response => {
const data = response.data.rows
for (let i = 0; i < data.length; i++) {
data[i].未收金额 === '0' ? data[i].是否禁用收款 = true : data[i].是否禁用收款 = false
data[i].未收金额 === '0' ? data[i].是否禁用 = true : data[i].是否禁用 = false
if (data[i].计划付款时间 === '' || data[i].计划付款时间 === null) {
data[i].状态 = '无计划'
} else {
@@ -788,7 +799,9 @@ export default {
this.tableData4 = []
selectBatchFundingDetails(row.批次资金id).then(response => {
for (let i = 0; i < response.data.length; i++) {
response.data[i].本次收款时间 = response.data[i].本次收款时间.substring(0, response.data[i].本次收款时间.length - 9)
if (response.data[i].本次收款时间 !== null || response.data[i].本次收款时间 !== '') {
response.data[i].本次收款时间 = response.data[i].本次收款时间.substring(0, response.data[i].本次收款时间.length - 9)
}
}
this.tableData4 = response.data
})
@@ -873,6 +886,7 @@ export default {
this.listLoading2 = false
const data = response.data.rows
for (let i = 0; i < data.length; i++) {
data[i].未收金额 === '0' ? data[i].是否禁用收款 = true : data[i].是否禁用收款 = false
data[i].未收金额 === '0' ? data[i].是否禁用 = true : data[i].是否禁用 = false
if (data[i].计划付款时间 === '' || data[i].计划付款时间 === null) {
data[i].状态 = '无计划'
@@ -941,6 +955,8 @@ export default {
searchTable2(this.PageCurrent2, this.PageSize2, this.moneyID).then(response => {
const data = response.data.rows
for (let i = 0; i < data.length; i++) {
data[i].未收金额 === '0' ? data[i].是否禁用收款 = true : data[i].是否禁用收款 = false
data[i].未收金额 === '0' ? data[i].是否禁用 = true : data[i].是否禁用 = false
if (data[i].计划付款时间 === '' || data[i].计划付款时间 === null) {
data[i].状态 = '无计划'
} else {
@@ -1003,6 +1019,8 @@ export default {
searchTable2(this.PageCurrent2, this.PageSize2, this.moneyID).then(response => {
const data = response.data.rows
for (let i = 0; i < data.length; i++) {
data[i].未收金额 === '0' ? data[i].是否禁用收款 = true : data[i].是否禁用收款 = false
data[i].未收金额 === '0' ? data[i].是否禁用 = true : data[i].是否禁用 = false
if (data[i].计划付款时间 === '' || data[i].计划付款时间 === null) {
data[i].状态 = '无计划'
} else {
@@ -1107,6 +1125,8 @@ export default {
searchTable2(this.PageCurrent2, this.PageSize2, this.moneyID).then(response => {
const data = response.data.rows
for (let i = 0; i < data.length; i++) {
data[i].未收金额 === '0' ? data[i].是否禁用收款 = true : data[i].是否禁用收款 = false
data[i].未收金额 === '0' ? data[i].是否禁用 = true : data[i].是否禁用 = false
if (data[i].计划付款时间 === '' || data[i].计划付款时间 === null) {
data[i].状态 = '无计划'
} else {
@@ -1146,7 +1166,9 @@ export default {
})
selectBatchFundingDetails(this.id).then(response => {
for (let i = 0; i < response.data.length; i++) {
response.data[i].本次收款时间 = response.data[i].本次收款时间.substring(0, response.data[i].本次收款时间.length - 9)
if (response.data[i].本次收款时间 !== null || response.data[i].本次收款时间 !== '') {
response.data[i].本次收款时间 = response.data[i].本次收款时间.substring(0, response.data[i].本次收款时间.length - 9)
}
}
this.tableData4 = response.data
})
@@ -1178,6 +1200,8 @@ export default {
searchTable2(this.PageCurrent2, this.PageSize2, this.moneyID).then(response => {
const data = response.data.rows
for (let i = 0; i < data.length; i++) {
data[i].未收金额 === '0' ? data[i].是否禁用收款 = true : data[i].是否禁用收款 = false
data[i].未收金额 === '0' ? data[i].是否禁用 = true : data[i].是否禁用 = false
if (data[i].计划付款时间 === '' || data[i].计划付款时间 === null) {
data[i].状态 = '无计划'
} else {
@@ -1203,7 +1227,9 @@ export default {
})
selectBatchFundingDetails(this.id).then(response => {
for (let i = 0; i < response.data.length; i++) {
response.data[i].本次收款时间 = response.data[i].本次收款时间.substring(0, response.data[i].本次收款时间.length - 9)
if (response.data[i].本次收款时间 !== null || response.data[i].本次收款时间 !== '') {
response.data[i].本次收款时间 = response.data[i].本次收款时间.substring(0, response.data[i].本次收款时间.length - 9)
}
}
this.tableData4 = response.data
})
@@ -1237,6 +1263,8 @@ export default {
searchTable2(this.PageCurrent2, this.PageSize2, this.moneyID).then(response => {
const data = response.data.rows
for (let i = 0; i < data.length; i++) {
data[i].未收金额 === '0' ? data[i].是否禁用收款 = true : data[i].是否禁用收款 = false
data[i].未收金额 === '0' ? data[i].是否禁用 = true : data[i].是否禁用 = false
if (data[i].计划付款时间 === '' || data[i].计划付款时间 === null) {
data[i].状态 = '无计划'
} else {
@@ -1309,6 +1337,8 @@ export default {
searchTable2(this.PageCurrent2, this.PageSize2, this.moneyID).then(response => {
const data = response.data.rows
for (let i = 0; i < data.length; i++) {
data[i].未收金额 === '0' ? data[i].是否禁用收款 = true : data[i].是否禁用收款 = false
data[i].未收金额 === '0' ? data[i].是否禁用 = true : data[i].是否禁用 = false
if (data[i].计划付款时间 === '' || data[i].计划付款时间 === null) {
data[i].状态 = '无计划'
} else {
@@ -1365,6 +1395,8 @@ export default {
searchTable2(this.PageCurrent2, this.PageSize2, this.moneyID).then(response => {
const data = response.data.rows
for (let i = 0; i < data.length; i++) {
data[i].未收金额 === '0' ? data[i].是否禁用收款 = true : data[i].是否禁用收款 = false
data[i].未收金额 === '0' ? data[i].是否禁用 = true : data[i].是否禁用 = false
if (data[i].计划付款时间 === '' || data[i].计划付款时间 === null) {
data[i].状态 = '无计划'
} else {
@@ -1434,6 +1466,8 @@ export default {
searchTable2(this.PageCurrent2, this.PageSize2, row.资金ID).then(response => {
const data = response.data.rows
for (let i = 0; i < data.length; i++) {
data[i].未收金额 === '0' ? data[i].是否禁用收款 = true : data[i].是否禁用收款 = false
data[i].未收金额 === '0' ? data[i].是否禁用 = true : data[i].是否禁用 = false
if (data[i].计划付款时间 === '' || data[i].计划付款时间 === null) {
data[i].状态 = '无计划'
} else {

20
src/views/MarketingCenter/ContractInformationManagement/index.vue
View File

@@ -10,7 +10,7 @@
:value="item.value"/>
</el-select>
<span style="margin-left: 10px">销售经理</span>
<el-input v-model="MarketingManagerValue" clearable size="small" style="width:200px" placeholder="请选择营销经理" readonly @dblclick.native="openName();param = 1" @clear="clear()"/>
<el-input v-model="MarketingManagerValue" readonly clearable size="small" style="width:200px" placeholder="请选择营销经理" @dblclick.native="openName();param = 1" @clear="clear()"/>
<el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="pageSize = 10;PageCurrent = 1;fetchTableData1()">查询</el-button>
<el-button type="primary" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="ADD()">增加</el-button>
</el-card>
@@ -172,7 +172,7 @@
<el-button size="small" type="primary">点击上传</el-button>
</el-upload>
</div>
<div v-for="file in hadFile" :key="file.id">
<div v-for="(file, key) in hadFile" :key="key">
<div class="wrapper">
<div class="content">
<div class="action">
@@ -200,7 +200,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="已完成进度" prop="executionProgressID">
<el-select v-model="form.executionProgressID" :disabled="infoDisable" placeholder="请输入目前执行进度" clearable size="small" style="width: 200px">
<el-select v-model="form.executionProgressID" :disabled="infoDisable" placeholder="请输入目前执行进度" size="small" style="width: 200px">
<el-option
v-for="item in executionProgress"
:key="item.value"
@@ -211,7 +211,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="销售经理" prop="MarketingManagerValue">
<el-input v-model="form.MarketingManagerValue" clearable size="small" style="width:200px" placeholder="请选择营销经理" readonly @dblclick.native="openName()" @clear="clear()"/>
<el-input v-model="form.MarketingManagerValue" readonly clearable size="small" style="width:200px" placeholder="请双击选择营销经理" @dblclick.native="openName()" @clear="clear()"/>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -256,12 +256,12 @@
</el-col>
<el-col :span="12">
<el-form-item label="客户名称" prop="customerName">
<el-input v-model="form.customerName" size="small" placeholder="请输入客户名称" style="width:200px" readonly @dblclick.native="CustomerChange()"/>
<el-input v-model="form.customerName" readonly size="small" placeholder="请双击选择客户" style="width:200px" clearable @dblclick.native="CustomerChange()" @clear="clear1()"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="付款方式" prop="付款方式">
<el-select v-model="form.付款方式" :disabled="disabled" placeholder="请选择付款方式" clearable size="small" style="width: 200px">
<el-select v-model="form.付款方式" :disabled="disabled" placeholder="请选择付款方式" size="small" style="width: 200px">
<el-option
v-for="item in money"
:key="item.value"
@@ -417,10 +417,13 @@
</template>
<script>
import elInput from 'element-ui/packages/input'
import { initProject, searchTable1, fetchExecutionProgress, delList, addList, executionProgressID, editchar, getTree, tree, getTablePeople, fetchCustomerData, getFileData, deleteFileData, selectMachine, selectProvince, SelectMarketingManager, submitMachine, editMachine, delMachine, money } from '@/api/MarketingCenter/ContractInformationManagement'
import { upload, download } from '@/utils/request'
export default {
components: {
elInput
},
data() {
return {
a: 1,
@@ -705,6 +708,9 @@ export default {
this.tableData3 = []
this.ProvinceValue = ''
},
clear1() {
this.CustomerCode = ''
},
CustomerChange() {
this.dialogCustomerFormVisible = true
},

104
src/views/MarketingCenter/DeliveryManagement/UploadExcel/index.vue Normal file
View File

@@ -0,0 +1,104 @@
<template>
<div style="display: inline-block;width: 100%;height: 100%;margin: 10px 20px 40px 10px">
<input id="excel-upload-input" ref="excel-upload-input" type="file" multiple="multiple" accept=".xlsx, .xls" class="c-hide" @change="handkeFileChange">
<el-button style="margin-left:16px;" size="small" icon="el-icon-search" type="success" @click="handleUpload">浏览清单</el-button>
<!--<div id="drop" @drop="handleDrop" @dragover="handleDragover" @dragenter="handleDragover">-->
<!--将Excel文件拖到这或-->
<!--<el-button style="margin-left:16px;" size="small" icon="el-icon-search" type="success" @click="handleUpload">浏览</el-button>-->
<!--</div>-->
</div>
</template>
<script>
import XLSX from 'xlsx'
export default {
data() {
return {
loading: false,
excelData: {
itemFile: [],
worksheet: []
}
}
},
methods: {
generateDate({ itemFile, worksheet }) {
this.excelData.itemFile.push(itemFile)
this.excelData.worksheet.push(worksheet)
},
handleDrop(e) {
this.excelData.itemFile = []
this.excelData.worksheet = [] // 每次拖拽都清空一次
e.stopPropagation()
e.preventDefault()
const files = e.dataTransfer.files
for (let i = 0; i < files.length; i++) { // 支持多个文件
const itemFile = files[i]
this.readerData(itemFile)
}
this.$emit('on-selected-file', this.excelData)
e.stopPropagation()
e.preventDefault()
},
handleDragover(e) {
e.stopPropagation()
e.preventDefault()
e.dataTransfer.dropEffect = 'copy'
},
handleUpload() {
this.excelData.itemFile = []
this.excelData.worksheet = [] // 每次点击“浏览”都清空一次
document.getElementById('excel-upload-input').click()
},
handkeFileChange(e) {
const files = e.target.files
for (let i = 0; i < files.length; i++) { // 支持多个文件
const itemFile = files[i]
if (!itemFile) return
this.readerData(itemFile)
}
this.$emit('on-selected-file', this.excelData)
this.$refs['excel-upload-input'].value = null // fix can't select the same excel
},
readerData(itemFile) {
const reader = new FileReader()
reader.onload = e => {
const data = e.target.result
const fixedData = this.fixdata(data)
const workbook = XLSX.read(btoa(fixedData), { type: 'base64' })
const firstSheetName = workbook.SheetNames[0] // cjnsheetname
const worksheet = workbook.Sheets[firstSheetName] // 默认firstsheet
this.generateDate({ itemFile, worksheet })
}
reader.readAsArrayBuffer(itemFile)
},
fixdata(data) {
let o = ''
let l = 0
const w = 10240
for (; l < data.byteLength / w; ++l) o += String.fromCharCode.apply(null, new Uint8Array(data.slice(l * w, l * w + w)))
o += String.fromCharCode.apply(null, new Uint8Array(data.slice(l * w)))
return o
}
}
}
</script>
<style scoped>
#excel-upload-input{
display: none;
z-index: -9999;
}
#drop{
border: 2px dashed #bbb;
width: 600px;
line-height: 160px;
margin: 0;
font-size: 24px;
border-radius: 5px;
text-align: center;
color: #bbb;
position: relative;
}
</style>

1085
src/views/MarketingCenter/DeliveryManagement/index.vue Normal file
View File

File diff suppressed because it is too large Load Diff

8
src/views/MarketingCenter/SafetyMargin/index.vue
View File

@@ -365,8 +365,12 @@
</template>
<script>
import elInput from 'element-ui/packages/input'
import { initProject, searchTable1, searchTable2, addSafetyMargin, editSafetyMargin, delSafetyMargin, Withdrawing, delWithdrawing, edtWithdrawing, TakeBack } from '@/api/MarketingCenter/SafetyMargin'
export default {
components: {
elInput
},
data() {
const validateValue = (rule, value, callback) => {
if (value === 0) {
@@ -581,6 +585,8 @@ export default {
callOff() {
this.dialogFormVisible1 = false
this.dialogFormVisible2 = false
this.dialogFormVisible3 = false
this.dialogFormVisible4 = false
},
delSafetyMargin(row) {
this.deleteRow(delSafetyMargin, row.安全保证金流水号, function() { this.fetchTableData1() })
@@ -598,7 +604,7 @@ export default {
this.dialogFormVisible2 = true
this.code = row.安全保证金流水号
this.projectName = row.项目名称
this.maxMoney = parseFloat(row.保证金金额)
this.maxMoney = parseFloat(row.应收回金额)
this.SurplusAmount = row.应收回金额
this.addForm('form2')
},

1
src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue
View File

@@ -591,6 +591,7 @@ export default {
this.getSelect(initPurchaseOrder, ['请购单编号', '请购单流水号'], 'contractNum')
},
searchSupplier() { // 查询创立日期和注册资本大于符合条件的数据
console.log(this.id)
this.supplierName ? this.supplierCheck1 = 1 : (this.supplierCheck1 = 0, this.supplierName = '')
this.enterpriseNature ? this.supplierCheck2 = 1 : (this.supplierCheck2 = 0, this.enterpriseNature = '')
this.createDate ? this.supplierCheck3 = 1 : (this.supplierCheck3 = 0, this.createDate = '')

29
src/views/WorkshopProcurement/PurchaseContractChange/index.vue
View File

@@ -152,9 +152,9 @@
start-placeholder="开始日期"
end-placeholder="结束日期"/>
<span>合同号:</span>
<el-select v-model="contractNumValue" placeholder="合同号" size="small" style="width:180px" filterable clearable>
<el-select v-model="contractNumValue1" placeholder="合同号" size="small" style="width:180px" filterable clearable>
<el-option
v-for="item in contractNum"
v-for="item in contractNum1"
:key="item.value"
:label="item.label"
:value="item.value">
@@ -167,7 +167,7 @@
</el-row>
<el-row style="margin-top: 10px">
<span>供应商:</span>
<el-input v-model="supplierName" placeholder="供应商" size="small" clearable/>
<el-input v-model="supplierName1" placeholder="供应商" size="small" clearable/>
<el-button
type="success"
size="small"
@@ -331,7 +331,7 @@
</template>
<script>
import { initContract, initBuyer, searchTable1, searchTable2, searchTable3, searchTable4, submitContract } from '@/api/WorkshopProcurement/PurchaseContractChange'
import { initContract, initContract1, initBuyer, searchTable1, searchTable2, searchTable3, searchTable4, submitContract } from '@/api/WorkshopProcurement/PurchaseContractChange'
export default {
data() {
@@ -352,6 +352,8 @@ export default {
freight1: '',
contractNumValue: '',
contractNum: [],
contractNumValue1: '',
contractNum1: [],
ProcurementContractNum: '',
buyer: 0,
Supplier: 0,
@@ -412,6 +414,15 @@ export default {
})
}
})
initContract1().then(response => {
for (let i = 0; i < response.data.length; i++) {
this.contractNum1.push({
label: response.data[i].采购合同编号,
name: response.data[i].采购合同名称,
value: response.data[i].采购合同变更流水号
})
}
})
},
initBuyer() { // 初始化采购人员
initBuyer().then(response => {
@@ -449,7 +460,7 @@ export default {
searchTable1(this.pageCurrent1, this.pageSize1, this.check1, this.startEndDate[0], this.startEndDate[1], this.check2, this.contractNumValue, this.check3, this.buyerValue, this.check4, this.supplierName, this.check5, this.approvalValue).then(response => {
this.loading1 = false
for (let j = 0; j < response.data.rows.length; j++) {
if (response.data.rows[j].规定到货时间 !== null) {
if (response.data.rows[j].规定到货时间 !== null || response.data.rows[j].规定到货时间 !== '') {
response.data.rows[j].规定到货时间 = response.data.rows[j].规定到货时间.substring(0, response.data.rows[j].规定到货时间.indexOf(' '))
}
}
@@ -464,10 +475,10 @@ export default {
this.check1 = 0
this.startEndDate = ''
} else { this.check1 = 1 }
this.contractNumValue ? this.check2 = 1 : this.check2 = 0
this.buyerName ? this.check3 = 1 : this.check3 = 0
this.supplierName ? this.check4 = 1 : this.check4 = 0
searchTable3(this.pageCurrent2, this.pageSize2, this.check1, this.startEndDate[0], this.startEndDate[1], this.check2, this.contractNumValue, this.check3, this.buyerValue, this.check4, this.supplierName).then(response => {
this.contractNumValue1 ? this.check2 = 1 : this.check2 = 0
this.buyerName1 ? this.check3 = 1 : this.check3 = 0
this.supplierName1 ? this.check4 = 1 : this.check4 = 0
searchTable3(this.pageCurrent2, this.pageSize2, this.check1, this.startEndDate[0], this.startEndDate[1], this.check2, this.contractNumValue1, this.check3, this.buyerValue1, this.check4, this.supplierName1).then(response => {
this.loading2 = false
for (let j = 0; j < response.data.rows.length; j++) {
if (response.data.rows[j].规定到货时间 !== null) {

12
src/views/WorkshopProcurement/QualityInspectionQuery/index.vue
View File

@@ -15,8 +15,8 @@
</el-select>
<span>供应商:</span>
<el-input v-model="supplierName" placeholder="供应商" size="small" clearable style="width: 200px"/>
<span>零件号:</span>
<el-select v-model="PartNumberValue" placeholder="零件号" size="small" clearable>
<span>零件名称:</span>
<el-select v-model="PartNumberValue" placeholder="零件名称" size="small" filterable clearable>
<el-option
v-for="item in PartNumber"
:key="item.value"
@@ -161,6 +161,14 @@ export default {
this.PartNumberValue ? this.check3 = 1 : this.check3 = 0
searchParts(this.pageCurrent, this.pageSize, this.check1, this.contractNumValue, this.check2, this.supplierName, this.check3, this.PartNumberValue).then(response => {
this.loading = false
for (let i = 0; i < response.data.rows.length; i++) {
if (response.data.rows[i].交检日期 !== '') {
response.data.rows[i].交检日期 = (response.data.rows[i].交检日期).split(' ')[0]
}
if (response.data.rows[i].检查日期 !== '') {
response.data.rows[i].检查日期 = (response.data.rows[i].检查日期).split(' ')[0]
}
}
this.tableData = response.data.rows
this.total = response.data.total
})

14
vim.exe.stackdump Normal file
View File

@@ -0,0 +1,14 @@
Stack trace:
Frame Function Args
0060002FB40 0018005E579 (00000000000, 000FFFFCE00, 0060002FD48, 000FFFFDE50)
00010000002 0018006056A (00000000064, 00600000000, 00000000000, 00000000000)
0060002FE20 00180125C3B (0018006C74F, 00000000000, 001800F6070, 00000008000)
00600030100 0018012221E (00000000000, 00000000000, 00000000000, 00000000000)
FFFFFFFFFFFFFFFF 00180122714 (00000000002, 00000000000, 0018005F905, 0000000000B)
FFFFFFFFFFFFFFFF 001801228F0 (00600000017, 00000000001, FFFFFFFFFFFFFFFF, 00000000000)
FFFFFFFFFFFFFFFF 0018011DE4B (00600000017, 00000000001, FFFFFFFFFFFFFFFF, 00000000000)
FFFFFFFFFFFFFFFF 001004FAE93 (00100000000, 00000000001, 0017FF7E930, 00600034C60)
FFFFFFFFFFFFFFFF 001005DA5B2 (00000000000, 00000000000, 00000000000, 00000000000)
00000000000 0018005CAFA (00000000000, 00000000000, 00000000000, 000FFFFCE00)
00020000000 00180060782 (00000000000, 00000000000, 00000000000, 000FFFFCE00)
End of stack trace